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

---
 audio/avctp.c     |  1 +
 audio/avdtp.c     |  1 +
 audio/avrcp.c     |  1 +
 audio/device.h    | 16 ----------------
 audio/manager.c   |  1 +
 audio/media.c     |  2 ++
 audio/transport.c |  2 ++
 lib/uuid.h        | 16 ++++++++++++++++
 8 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/audio/avctp.c b/audio/avctp.c
index 5f9afa1e1..ae3c04efa 100644
--- a/audio/avctp.c
+++ b/audio/avctp.c
@@ -40,6 +40,7 @@
 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/sdp.h>
+#include <bluetooth/uuid.h>
 
 #include <glib.h>
 
diff --git a/audio/avdtp.c b/audio/avdtp.c
index 34d49d20d..eb3f2132c 100644
--- a/audio/avdtp.c
+++ b/audio/avdtp.c
@@ -38,6 +38,7 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
+#include <bluetooth/uuid.h>
 
 #include <glib.h>
 #include <dbus/dbus.h>
diff --git a/audio/avrcp.c b/audio/avrcp.c
index a040099a9..89ee112ba 100644
--- a/audio/avrcp.c
+++ b/audio/avrcp.c
@@ -40,6 +40,7 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
+#include <bluetooth/uuid.h>
 
 #include <glib.h>
 #include <dbus/dbus.h>
diff --git a/audio/device.h b/audio/device.h
index 5117fcaf6..75f1da9f3 100644
--- a/audio/device.h
+++ b/audio/device.h
@@ -22,22 +22,6 @@
  *
  */
 
-#define GENERIC_AUDIO_UUID	"00001203-0000-1000-8000-00805f9b34fb"
-
-#define HSP_HS_UUID		"00001108-0000-1000-8000-00805f9b34fb"
-#define HSP_AG_UUID		"00001112-0000-1000-8000-00805f9b34fb"
-
-#define HFP_HS_UUID		"0000111e-0000-1000-8000-00805f9b34fb"
-#define HFP_AG_UUID		"0000111f-0000-1000-8000-00805f9b34fb"
-
-#define ADVANCED_AUDIO_UUID	"0000110d-0000-1000-8000-00805f9b34fb"
-
-#define A2DP_SOURCE_UUID	"0000110a-0000-1000-8000-00805f9b34fb"
-#define A2DP_SINK_UUID		"0000110b-0000-1000-8000-00805f9b34fb"
-
-#define AVRCP_REMOTE_UUID	"0000110e-0000-1000-8000-00805f9b34fb"
-#define AVRCP_TARGET_UUID	"0000110c-0000-1000-8000-00805f9b34fb"
-
 struct source;
 struct control;
 struct target;
diff --git a/audio/manager.c b/audio/manager.c
index 0b2132226..d442d1da4 100644
--- a/audio/manager.c
+++ b/audio/manager.c
@@ -41,6 +41,7 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
+#include <bluetooth/uuid.h>
 
 #include <glib.h>
 #include <dbus/dbus.h>
diff --git a/audio/media.c b/audio/media.c
index 147538cb1..195665332 100644
--- a/audio/media.c
+++ b/audio/media.c
@@ -29,6 +29,8 @@
 
 #include <errno.h>
 
+#include <bluetooth/uuid.h>
+
 #include <glib.h>
 #include <gdbus.h>
 
diff --git a/audio/transport.c b/audio/transport.c
index 40d093b0a..1fccff839 100644
--- a/audio/transport.c
+++ b/audio/transport.c
@@ -28,6 +28,8 @@
 
 #include <errno.h>
 
+#include <bluetooth/uuid.h>
+
 #include <glib.h>
 #include <gdbus.h>
 
diff --git a/lib/uuid.h b/lib/uuid.h
index 9c082d304..a44426aac 100644
--- a/lib/uuid.h
+++ b/lib/uuid.h
@@ -32,6 +32,22 @@ extern "C" {
 #include <stdint.h>
 #include <bluetooth/bluetooth.h>
 
+#define GENERIC_AUDIO_UUID	"00001203-0000-1000-8000-00805f9b34fb"
+
+#define HSP_HS_UUID		"00001108-0000-1000-8000-00805f9b34fb"
+#define HSP_AG_UUID		"00001112-0000-1000-8000-00805f9b34fb"
+
+#define HFP_HS_UUID		"0000111e-0000-1000-8000-00805f9b34fb"
+#define HFP_AG_UUID		"0000111f-0000-1000-8000-00805f9b34fb"
+
+#define ADVANCED_AUDIO_UUID	"0000110d-0000-1000-8000-00805f9b34fb"
+
+#define A2DP_SOURCE_UUID	"0000110a-0000-1000-8000-00805f9b34fb"
+#define A2DP_SINK_UUID		"0000110b-0000-1000-8000-00805f9b34fb"
+
+#define AVRCP_REMOTE_UUID	"0000110e-0000-1000-8000-00805f9b34fb"
+#define AVRCP_TARGET_UUID	"0000110c-0000-1000-8000-00805f9b34fb"
+
 typedef struct {
 	enum {
 		BT_UUID_UNSPEC = 0,
-- 
2.47.3