From 2eda66eb475e356a6cb852db3cc60e30a860b068 Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Thu, 31 May 2012 15:43:28 +0200 Subject: [PATCH] deviceinfo: Move UUID string definition to lib --- deviceinfo/deviceinfo.c | 2 -- deviceinfo/manager.c | 2 -- lib/uuid.h | 3 +++ 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/deviceinfo/deviceinfo.c b/deviceinfo/deviceinfo.c index 5dd92938e..8c3af93cb 100644 --- a/deviceinfo/deviceinfo.c +++ b/deviceinfo/deviceinfo.c @@ -37,8 +37,6 @@ #include "log.h" #include "deviceinfo.h" -#define PNPID_UUID "00002a50-0000-1000-8000-00805f9b34fb" - struct deviceinfo { struct btd_device *dev; /* Device reference */ GAttrib *attrib; /* GATT connection */ diff --git a/deviceinfo/manager.c b/deviceinfo/manager.c index c2378c238..1d5991871 100644 --- a/deviceinfo/manager.c +++ b/deviceinfo/manager.c @@ -32,8 +32,6 @@ #include "deviceinfo.h" #include "manager.h" -#define DEVICE_INFORMATION_UUID "0000180a-0000-1000-8000-00805f9b34fb" - static gint primary_uuid_cmp(gconstpointer a, gconstpointer b) { const struct gatt_primary *prim = a; diff --git a/lib/uuid.h b/lib/uuid.h index 848baed38..713075e06 100644 --- a/lib/uuid.h +++ b/lib/uuid.h @@ -53,6 +53,9 @@ extern "C" { #define GN_UUID "00001117-0000-1000-8000-00805f9b34fb" #define BNEP_SVC_UUID "0000000f-0000-1000-8000-00805f9b34fb" +#define PNPID_UUID "00002a50-0000-1000-8000-00805f9b34fb" +#define DEVICE_INFORMATION_UUID "0000180a-0000-1000-8000-00805f9b34fb" + typedef struct { enum { BT_UUID_UNSPEC = 0, -- 2.47.3