[G29 emulation] Allow to use the G920 and G29 wheels #361

matlo · Nov 14, 2015 · 0aa25d2 · 0aa25d2
1 parent f311613
commit 0aa25d2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 31 deletions.
diff --git a/core/adapter.c b/core/adapter.c
@@ -563,39 +563,9 @@ void adapter_set_usb_ids(int controller, unsigned short vendor, unsigned short p
   }
 }
 
-static unsigned short lg_wheel_products[] = {
-  USB_DEVICE_ID_LOGITECH_WINGMAN_FFG,
-  USB_DEVICE_ID_LOGITECH_WHEEL,
-  USB_DEVICE_ID_LOGITECH_MOMO_WHEEL,
-  USB_DEVICE_ID_LOGITECH_DFP_WHEEL,
-  USB_DEVICE_ID_LOGITECH_G25_WHEEL,
-  USB_DEVICE_ID_LOGITECH_DFGT_WHEEL,
-  USB_DEVICE_ID_LOGITECH_G27_WHEEL,
-  USB_DEVICE_ID_LOGITECH_WII_WHEEL,
-  USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2,
-  USB_DEVICE_ID_LOGITECH_VIBRATION_WHEEL,
-};
-
-static int is_logitech_wheel(unsigned short vendor, unsigned short product) {
-
-  if(vendor != USB_VENDOR_ID_LOGITECH)
-  {
-    return 0;
-  }
-  unsigned int i;
-  for(i = 0; i < sizeof(lg_wheel_products) / sizeof(*lg_wheel_products); ++i)
-  {
-    if(lg_wheel_products[i] == product)
-    {
-      return 1;
-    }
-  }
-  return 0;
-}
-
 static int start_hid(int id)
 {
-  if(is_logitech_wheel(adapter[id].usb_ids.vendor, adapter[id].usb_ids.product))
+  if(ffb_logitech_is_logitech_wheel(adapter[id].usb_ids.vendor, adapter[id].usb_ids.product))
   {
     adapter[id].hid_id = hidasync_open_ids(adapter[id].usb_ids.vendor, adapter[id].usb_ids.product);
     if(adapter[id].hid_id >= 0)

diff --git a/core/ffb_logitech.c b/core/ffb_logitech.c
@@ -673,6 +673,8 @@ static unsigned short lg_wheel_products[] = {
     USB_DEVICE_ID_LOGITECH_WII_WHEEL,
     USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2,
     USB_DEVICE_ID_LOGITECH_VIBRATION_WHEEL,
+    USB_DEVICE_ID_LOGITECH_G920_WHEEL,
+    USB_DEVICE_ID_LOGITECH_G29_WHEEL,
 };
 
 int ffb_logitech_is_logitech_wheel(unsigned short vendor, unsigned short product) {

diff --git a/shared/async/include/hidasync.h b/shared/async/include/hidasync.h
@@ -24,6 +24,8 @@ extern "C" {
 #define USB_DEVICE_ID_LOGITECH_WII_WHEEL    0xc29c
 #define USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2      0xca03
 #define USB_DEVICE_ID_LOGITECH_VIBRATION_WHEEL  0xca04
+#define USB_DEVICE_ID_LOGITECH_G920_WHEEL       0xc262
+#define USB_DEVICE_ID_LOGITECH_G29_WHEEL        0xc24f
 
 struct hid_device;