From 5b8b2319e50ce9f00b5c2fcb6b9fc1f3d313825e Mon Sep 17 00:00:00 2001
From: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Date: Fri, 21 Aug 2015 13:34:19 -0400
Subject: [PATCH] Add LOGITECH_DEVICE macro for declaring Logitech devices in
 drivers

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
---
 src/driver-hidpp10.c | 23 ++++++++---------------
 src/driver-hidpp20.c | 23 ++++++++---------------
 2 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/src/driver-hidpp10.c b/src/driver-hidpp10.c
index f6b136dd..1abae6c5 100644
--- a/src/driver-hidpp10.c
+++ b/src/driver-hidpp10.c
@@ -135,28 +135,21 @@ hidpp10drv_remove(struct ratbag_device *device)
 }
 
 #define USB_VENDOR_ID_LOGITECH			0x046d
+#define LOGITECH_DEVICE(_bus, _pid)		\
+	{ .bustype = (_bus),			\
+	  .vendor = USB_VENDOR_ID_LOGITECH,	\
+	  .product = (_pid),			\
+	  .version = VERSION_ANY },
 
 static const struct ratbag_id hidpp10drv_table[] = {
 	/* M705 */
-	{.id = { .bustype = BUS_USB,
-		 .vendor = USB_VENDOR_ID_LOGITECH,
-		 .product = 0x101b,
-		 .version = VERSION_ANY },
-	},
+	{ .id = LOGITECH_DEVICE(BUS_USB, 0x101b) },
 
 	/* M570 */
-	{.id = { .bustype = BUS_USB,
-		 .vendor = USB_VENDOR_ID_LOGITECH,
-		 .product = 0x1028,
-		 .version = VERSION_ANY },
-	},
+	{ .id = LOGITECH_DEVICE(BUS_USB, 0x1028) },
 
 	/* G500s */
-	{.id = { .bustype = BUS_USB,
-		 .vendor = USB_VENDOR_ID_LOGITECH,
-		 .product = 0xc24e,
-		 .version = VERSION_ANY },
-	},
+	{ .id = LOGITECH_DEVICE(BUS_USB, 0xc24e) },
 
 	{ },
 };
diff --git a/src/driver-hidpp20.c b/src/driver-hidpp20.c
index 436c2c1d..4849fb86 100644
--- a/src/driver-hidpp20.c
+++ b/src/driver-hidpp20.c
@@ -372,28 +372,21 @@ hidpp20drv_remove(struct ratbag_device *device)
 }
 
 #define USB_VENDOR_ID_LOGITECH			0x046d
+#define LOGITECH_DEVICE(_bus, _pid)		\
+	{ .bustype = (_bus),			\
+	  .vendor = USB_VENDOR_ID_LOGITECH,	\
+	  .product = (_pid),			\
+	  .version = VERSION_ANY },
 
 static const struct ratbag_id hidpp20drv_table[] = {
 	/* MX Master over unifying */
-	{.id = { .bustype = BUS_USB,
-		 .vendor = USB_VENDOR_ID_LOGITECH,
-		 .product = 0x4041,
-		 .version = VERSION_ANY },
-	},
+	{ .id = LOGITECH_DEVICE(BUS_USB, 0x4041) },
 
 	/* MX Master over bluetooth */
-	{.id = { .bustype = BUS_BLUETOOTH,
-		 .vendor = USB_VENDOR_ID_LOGITECH,
-		 .product = 0xb012,
-		 .version = VERSION_ANY },
-	},
+	{ .id = LOGITECH_DEVICE(BUS_BLUETOOTH, 0xb012) },
 
 	/* T650 over unifying */
-	{.id = { .bustype = BUS_USB,
-		 .vendor = USB_VENDOR_ID_LOGITECH,
-		 .product = 0x4101,
-		 .version = VERSION_ANY },
-	},
+	{ .id = LOGITECH_DEVICE(BUS_USB, 0x4101) },
 
 	{ },
 };