diff options
| author | Claudio Takahasi <claudio.takahasi@openbossa.org> | 2012-05-29 10:58:12 -0300 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-05-30 10:39:03 +0300 |
| commit | 932bc368ef5c774fda1e028029a5061e0d5eadfb (patch) | |
| tree | d1128da14625d7152f1579a3a9dd65a3a5c3d0db /attrib | |
| parent | 66a0ce723b6cc30211acdc09254521f59b5fb814 (diff) | |
GATT: Move GATT assigned numbers to GATT header
Diffstat (limited to 'attrib')
| -rw-r--r-- | attrib/att.h | 27 | ||||
| -rw-r--r-- | attrib/gatt-service.c | 3 | ||||
| -rw-r--r-- | attrib/gatt.h | 28 |
3 files changed, 30 insertions, 28 deletions
diff --git a/attrib/att.h b/attrib/att.h index 9bf9092f..d12a7f22 100644 --- a/attrib/att.h +++ b/attrib/att.h @@ -22,29 +22,6 @@ * */ -/* GATT Profile Attribute types */ -#define GATT_PRIM_SVC_UUID 0x2800 -#define GATT_SND_SVC_UUID 0x2801 -#define GATT_INCLUDE_UUID 0x2802 -#define GATT_CHARAC_UUID 0x2803 - -/* GATT Characteristic Types */ -#define GATT_CHARAC_DEVICE_NAME 0x2A00 -#define GATT_CHARAC_APPEARANCE 0x2A01 -#define GATT_CHARAC_PERIPHERAL_PRIV_FLAG 0x2A02 -#define GATT_CHARAC_RECONNECTION_ADDRESS 0x2A03 -#define GATT_CHARAC_PERIPHERAL_PREF_CONN 0x2A04 -#define GATT_CHARAC_SERVICE_CHANGED 0x2A05 - -/* GATT Characteristic Descriptors */ -#define GATT_CHARAC_EXT_PROPER_UUID 0x2900 -#define GATT_CHARAC_USER_DESC_UUID 0x2901 -#define GATT_CLIENT_CHARAC_CFG_UUID 0x2902 -#define GATT_SERVER_CHARAC_CFG_UUID 0x2903 -#define GATT_CHARAC_FMT_UUID 0x2904 -#define GATT_CHARAC_AGREG_FMT_UUID 0x2905 -#define GATT_CHARAC_VALID_RANGE_UUID 0x2906 - /* Attribute Protocol Opcodes */ #define ATT_OP_ERROR 0x01 #define ATT_OP_MTU_REQ 0x02 @@ -106,10 +83,6 @@ #define ATT_CHAR_PROPER_AUTH 0x40 #define ATT_CHAR_PROPER_EXT_PROPER 0x80 -/* Client Characteristic Configuration bit field */ -#define GATT_CLIENT_CHARAC_CFG_NOTIF_BIT 0x0001 -#define GATT_CLIENT_CHARAC_CFG_IND_BIT 0x0002 - #define ATT_MAX_MTU 256 #define ATT_DEFAULT_L2CAP_MTU 48 #define ATT_DEFAULT_LE_MTU 23 diff --git a/attrib/gatt-service.c b/attrib/gatt-service.c index d8f7b37d..a9de98c9 100644 --- a/attrib/gatt-service.c +++ b/attrib/gatt-service.c @@ -31,9 +31,10 @@ #include <bluetooth/sdp.h> #include <adapter.h> +#include "gattrib.h" #include "att.h" +#include "gatt.h" #include "att-database.h" -#include "gattrib.h" #include "attrib-server.h" #include "gatt-service.h" #include "log.h" diff --git a/attrib/gatt.h b/attrib/gatt.h index 1732270f..9ffe58f6 100644 --- a/attrib/gatt.h +++ b/attrib/gatt.h @@ -21,8 +21,36 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * */ + #include <bluetooth/sdp.h> +/* GATT Profile Attribute types */ +#define GATT_PRIM_SVC_UUID 0x2800 +#define GATT_SND_SVC_UUID 0x2801 +#define GATT_INCLUDE_UUID 0x2802 +#define GATT_CHARAC_UUID 0x2803 + +/* GATT Characteristic Types */ +#define GATT_CHARAC_DEVICE_NAME 0x2A00 +#define GATT_CHARAC_APPEARANCE 0x2A01 +#define GATT_CHARAC_PERIPHERAL_PRIV_FLAG 0x2A02 +#define GATT_CHARAC_RECONNECTION_ADDRESS 0x2A03 +#define GATT_CHARAC_PERIPHERAL_PREF_CONN 0x2A04 +#define GATT_CHARAC_SERVICE_CHANGED 0x2A05 + +/* GATT Characteristic Descriptors */ +#define GATT_CHARAC_EXT_PROPER_UUID 0x2900 +#define GATT_CHARAC_USER_DESC_UUID 0x2901 +#define GATT_CLIENT_CHARAC_CFG_UUID 0x2902 +#define GATT_SERVER_CHARAC_CFG_UUID 0x2903 +#define GATT_CHARAC_FMT_UUID 0x2904 +#define GATT_CHARAC_AGREG_FMT_UUID 0x2905 +#define GATT_CHARAC_VALID_RANGE_UUID 0x2906 + +/* Client Characteristic Configuration bit field */ +#define GATT_CLIENT_CHARAC_CFG_NOTIF_BIT 0x0001 +#define GATT_CLIENT_CHARAC_CFG_IND_BIT 0x0002 + typedef void (*gatt_cb_t) (GSList *l, guint8 status, gpointer user_data); struct gatt_primary { |