summaryrefslogtreecommitdiff
path: root/src/adapter.c
diff options
context:
space:
mode:
authorChen Ganir <chen.ganir@ti.com>2012-03-26 09:35:58 +0200
committerJohan Hedberg <johan.hedberg@intel.com>2012-03-26 12:16:44 +0300
commit48c82115a2739881877fa857390ff2eca4dc73e0 (patch)
tree5d55bef8de7b7c56ce1734d6eedfb6720aba23bf /src/adapter.c
parentafb04979ee7b986f9351ca19565d3b0d7ac4c181 (diff)
downloadbluez-48c82115a2739881877fa857390ff2eca4dc73e0.tar.gz
GATT: Rename service and char structs
Rename the att_primary to gatt_primary and att_char to gatt_char. Characteristic and Service do not exist in the ATT spec, only in GATT.
Diffstat (limited to 'src/adapter.c')
-rw-r--r--src/adapter.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/adapter.c b/src/adapter.c
index 13f368352..563cb90c9 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -58,6 +58,7 @@
#include "storage.h"
#include "gattrib.h"
#include "att.h"
+#include "gatt.h"
#include "attrib-server.h"
#include "eir.h"
@@ -1893,10 +1894,10 @@ static GSList *string_to_primary_list(char *str)
return NULL;
for (i = 0; services[i]; i++) {
- struct att_primary *prim;
+ struct gatt_primary *prim;
int ret;
- prim = g_new0(struct att_primary, 1);
+ prim = g_new0(struct gatt_primary, 1);
ret = sscanf(services[i], "%04hX#%04hX#%s", &prim->start,
&prim->end, prim->uuid);
@@ -1938,7 +1939,7 @@ static void create_stored_device_from_primary(char *key, char *value,
return;
for (l = services, uuids = NULL; l; l = l->next) {
- struct att_primary *prim = l->data;
+ struct gatt_primary *prim = l->data;
uuids = g_slist_append(uuids, prim->uuid);
}