[PATCH v2 04/15] deviceinfo: Move UUID defintion to core

[Daniel Wagner <wagi@xxxxxxxxx>]

From: Daniel Wagner <daniel.wagner@xxxxxxxxxxxx>

---
 deviceinfo/deviceinfo.c |    4 ++--
 deviceinfo/manager.c    |    4 ++--
 src/uuid.h              |    3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/deviceinfo/deviceinfo.c b/deviceinfo/deviceinfo.c
index 5dd9293..410b8ff 100644
--- a/deviceinfo/deviceinfo.c
+++ b/deviceinfo/deviceinfo.c
@@ -27,6 +27,8 @@
 #include <glib.h>
 #include <bluetooth/uuid.h>
 
+#include "../src/uuid.h"
+
 #include "adapter.h"
 #include "device.h"
 #include "gattrib.h"
@@ -37,8 +39,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 c2378c2..52fdf46 100644
--- a/deviceinfo/manager.c
+++ b/deviceinfo/manager.c
@@ -24,6 +24,8 @@
 #include <errno.h>
 #include <bluetooth/uuid.h>
 
+#include "../src/uuid.h"
+
 #include "adapter.h"
 #include "device.h"
 #include "att.h"
@@ -32,8 +34,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/src/uuid.h b/src/uuid.h
index 61ea6e5..7ef19cc 100644
--- a/src/uuid.h
+++ b/src/uuid.h
@@ -41,3 +41,6 @@
 #define NAP_UUID		"00001116-0000-1000-8000-00805f9b34fb"
 #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"
-- 
1.7.10.130.g36e6c

--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html