Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Wed, 10 Jun 2020 09:22:04 -0700
Message-Id: <20200610092045.BlueZ.1.I27c2620cfdc8ec07adf16dad54579cefcde65aea@changeid>
Mime-Version: 1.0
Subject: [BlueZ PATCH] Move HOG UUID definition to lib/uuid.h
From:   Manish Mandlik <mmandlik@google.com>
To:     marcel@holtmann.org, luiz.dentz@gmail.com
Cc:     linux-bluetooth@vger.kernel.org,
        chromeos-bluetooth-upstreaming@chromium.org,
        Abhishek Pandit-Subedi <abhishekpandit@chromium.org>,
        Alain Michaud <alainm@chromium.org>,
        Manish Mandlik <mmandlik@google.com>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-bluetooth-owner@vger.kernel.org
Precedence: bulk

HOG UUID is defined at multiple places in the code. Move that
definition to lib/uuid.h where all other UUIDs are defined.

Reviewed-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
Reviewed-by: Alain Michaud <alainm@chromium.org>
---

 android/hidhost.c        | 2 --
 lib/uuid.h               | 1 +
 profiles/input/hog-lib.c | 1 -
 profiles/input/hog.c     | 2 --
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/android/hidhost.c b/android/hidhost.c
index fe0ea2f61..7bc484f11 100644
--- a/android/hidhost.c
+++ b/android/hidhost.c
@@ -87,8 +87,6 @@
 /* HID Virtual Cable Unplug */
 #define HID_VIRTUAL_CABLE_UNPLUG	0x05
 
-#define HOG_UUID		"00001812-0000-1000-8000-00805f9b34fb"
-
 static bdaddr_t adapter_addr;
 
 static GIOChannel *ctrl_io = NULL;
diff --git a/lib/uuid.h b/lib/uuid.h
index ebdcf729c..c7e6269f1 100644
--- a/lib/uuid.h
+++ b/lib/uuid.h
@@ -88,6 +88,7 @@ extern "C" {
 #define HDP_SINK_UUID		"00001402-0000-1000-8000-00805f9b34fb"
 
 #define HID_UUID		"00001124-0000-1000-8000-00805f9b34fb"
+#define HOG_UUID		"00001812-0000-1000-8000-00805f9b34fb"
 
 #define DUN_GW_UUID		"00001103-0000-1000-8000-00805f9b34fb"
 
diff --git a/profiles/input/hog-lib.c b/profiles/input/hog-lib.c
index a544e062c..e96c969b7 100644
--- a/profiles/input/hog-lib.c
+++ b/profiles/input/hog-lib.c
@@ -61,7 +61,6 @@
 #include "profiles/battery/bas.h"
 #include "profiles/input/hog-lib.h"
 
-#define HOG_UUID		"00001812-0000-1000-8000-00805f9b34fb"
 #define HOG_UUID16		0x1812
 
 #define HOG_INFO_UUID		0x2A4A
diff --git a/profiles/input/hog.c b/profiles/input/hog.c
index 327a1d1c3..9335b7e8b 100644
--- a/profiles/input/hog.c
+++ b/profiles/input/hog.c
@@ -60,8 +60,6 @@
 #include "attrib/gatt.h"
 #include "hog-lib.h"
 
-#define HOG_UUID		"00001812-0000-1000-8000-00805f9b34fb"
-
 struct hog_device {
 	struct btd_device	*device;
 	struct bt_hog		*hog;
-- 
2.27.0.278.ge193c7cf3a9-goog