diff mbox

HID: expand hid-topseed driver to support TopSeed RF Combo Device

Message ID 4C2D0CB1.4070404@5137.org (mailing list archive)
State New, archived
Delegated to: Jiri Kosina
Headers show

Commit Message

Pieter Hoekstra July 1, 2010, 9:46 p.m. UTC 
None
diff mbox

Patch

--- linux-2.6-518adaa/hid-topseed.c	2010-06-26 19:36:08.000000000 +0200
+++ hid/hid-topseed.c	2010-06-26 20:04:06.816617201 +0200
@@ -6,6 +6,8 @@ 
  *
  *  Modified to also support BTC "Emprex 3009URF III Vista MCE Remote" by
  *  Wayne Thomas 2010.
+ *  Added support for Topseed RF Combo (like Conceptronic CLLRCMCE remote)
+ *  by Pieter Hoekstra 2010.
  */
 
 /*
@@ -50,6 +52,7 @@  static int ts_input_mapping(struct hid_d
 	case 0x05c: ts_map_key_clear(KEY_GREEN);	break;
 	case 0x05d: ts_map_key_clear(KEY_YELLOW);	break;
 	case 0x05e: ts_map_key_clear(KEY_BLUE);		break;
+	case 0x027: ts_map_key_clear(KEY_SCREEN);	break;
 	default:
 		return 0;
 	}
@@ -59,6 +62,7 @@  static int ts_input_mapping(struct hid_d
 
 static const struct hid_device_id ts_devices[] = {
 	{ HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED, USB_DEVICE_ID_TOPSEED_CYBERLINK) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_TOPSEEDTECH, USB_DEVICE_ID_TOPSEEDTECH_RFCOMBO) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE) },
 	{ }
 };
--- linux-2.6-518adaa/hid-ids.h	2010-06-26 19:36:08.000000000 +0200
+++ hid/hid-ids.h	2010-06-26 19:53:54.957856940 +0200
@@ -460,6 +460,9 @@ 
 #define USB_VENDOR_ID_TOPSEED		0x0766
 #define USB_DEVICE_ID_TOPSEED_CYBERLINK	0x0204
 
+#define USB_VENDOR_ID_TOPSEEDTECH      0x1784
+#define USB_DEVICE_ID_TOPSEEDTECH_RFCOMBO      0x0004
+
 #define USB_VENDOR_ID_TURBOX		0x062a
 #define USB_DEVICE_ID_TURBOX_KEYBOARD	0x0201
 
--- linux-2.6-518adaa/hid-core.c	2010-06-26 19:36:08.000000000 +0200
+++ hid/hid-core.c	2010-07-01 23:40:18.588363154 +0200
@@ -1357,6 +1357,7 @@  static const struct hid_device_id hid_bl
 	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb653) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED, USB_DEVICE_ID_TOPSEED_CYBERLINK) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_TOPSEEDTECH, USB_DEVICE_ID_TOPSEEDTECH_RFCOMBO) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_TWINHAN, USB_DEVICE_ID_TWINHAN_IR_REMOTE) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) },
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH) },