From 9bfc21c2dd0b865097093582192ccb5f1dd4ffe2 Mon Sep 17 00:00:00 2001
From: Daniel Wagner <daniel.wagner@bmw-carit.de>
Date: Thu, 31 May 2012 15:43:36 +0200
Subject: [PATCH] core: Move UUID string definition to lib

---
 lib/uuid.h    | 3 +++
 src/device.c  | 1 -
 src/storage.c | 1 +
 src/storage.h | 2 --
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/uuid.h b/lib/uuid.h
index 3dfb00baf..2c2b3511c 100644
--- a/lib/uuid.h
+++ b/lib/uuid.h
@@ -80,6 +80,9 @@ extern "C" {
 
 #define DUN_GW_UUID		"00001103-0000-1000-8000-00805f9b34fb"
 
+#define GAP_SVC_UUID		"00001800-0000-1000-8000-00805f9b34fb"
+#define PNP_UUID		"00001200-0000-1000-8000-00805f9b34fb"
+
 typedef struct {
 	enum {
 		BT_UUID_UNSPEC = 0,
diff --git a/src/device.c b/src/device.c
index 7ff09aafd..39aa0cb88 100644
--- a/src/device.c
+++ b/src/device.c
@@ -71,7 +71,6 @@
 /* When all services should trust a remote device */
 #define GLOBAL_TRUST "[all]"
 
-#define GAP_SVC_UUID "00001800-0000-1000-8000-00805f9b34fb"
 #define APPEARANCE_CHR_UUID 0x2a01
 
 struct btd_disconnect_data {
diff --git a/src/storage.c b/src/storage.c
index 7d65fe130..17e80016c 100644
--- a/src/storage.c
+++ b/src/storage.c
@@ -41,6 +41,7 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
+#include <bluetooth/uuid.h>
 
 #include "textfile.h"
 #include "glib-helper.h"
diff --git a/src/storage.h b/src/storage.h
index c541807f9..cc00e9776 100644
--- a/src/storage.h
+++ b/src/storage.h
@@ -100,5 +100,3 @@ void delete_device_ccc(bdaddr_t *local, bdaddr_t *peer);
 int write_longtermkeys(bdaddr_t *local, bdaddr_t *peer, uint8_t bdaddr_type,
 							const char *key);
 gboolean has_longtermkeys(bdaddr_t *local, bdaddr_t *peer, uint8_t bdaddr_type);
-
-#define PNP_UUID		"00001200-0000-1000-8000-00805f9b34fb"
-- 
2.47.3