[PATCH 3/3] HID: Support Conceptronic CLLRCMCE (added to hid-topseed)

[Kees Bakker <kees.bakker@xxxxxxxxx>]

Signed-off-by: Kees Bakker <kees.bakker@xxxxxxxxx>
---
 drivers/hid/hid-core.c    |    1 +
 drivers/hid/hid-ids.h     |    3 +++
 drivers/hid/hid-topseed.c |   32 ++++++++++++++++++--------------
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index aa0f7dc..f07fc64 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1357,6 +1357,7 @@ static const struct hid_device_id hid_blacklist[] = {
 	{ 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_TOPSEED2, USB_DEVICE_ID_TOPSEED2_RF_COMBO) },
 	{ 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) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index a3ce8ff..b2ff7b4 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -461,6 +461,9 @@
 #define USB_VENDOR_ID_TOPSEED		0x0766
 #define USB_DEVICE_ID_TOPSEED_CYBERLINK	0x0204
 
+#define USB_VENDOR_ID_TOPSEED2		0x1784
+#define USB_DEVICE_ID_TOPSEED2_RF_COMBO	0x0004
+
 #define USB_VENDOR_ID_TOUCHPACK		0x1bfd
 #define USB_DEVICE_ID_TOUCHPACK_RTS	0x1688
 
diff --git a/drivers/hid/hid-topseed.c b/drivers/hid/hid-topseed.c
index 2eebdcc..f8a001b 100644
--- a/drivers/hid/hid-topseed.c
+++ b/drivers/hid/hid-topseed.c
@@ -6,6 +6,9 @@
  *
  *  Modified to also support BTC "Emprex 3009URF III Vista MCE Remote" by
  *  Wayne Thomas 2010.
+ *
+ *  Modified to support Conceptronic CLLRCMCE by
+ *  Kees Bakker 2010.
  */
 
 /*
@@ -31,25 +34,26 @@ static int ts_input_mapping(struct hid_device *hdev, struct hid_input *hi,
 		return 0;
 
 	switch (usage->hid & HID_USAGE) {
-	case 0x00d: ts_map_key_clear(KEY_MEDIA);	break;
-	case 0x024: ts_map_key_clear(KEY_MENU);		break;
-	case 0x025: ts_map_key_clear(KEY_TV);		break;
+	case 0x00d: ts_map_key_clear(KEY_MEDIA);	break;		/* Show Main Menu */
+	case 0x024: ts_map_key_clear(KEY_MENU);		break;		/* DVD menu */
+	case 0x025: ts_map_key_clear(KEY_TV);		break;		/* Live TV */
+	case 0x027: ts_map_key_clear(KEY_MODE);		break;		/* Toggle display ratios */
 	case 0x031: ts_map_key_clear(KEY_AUDIO);	break;
 	case 0x032: ts_map_key_clear(KEY_TEXT);		break;
 	case 0x033: ts_map_key_clear(KEY_CHANNEL);	break;
-	case 0x047: ts_map_key_clear(KEY_MP3);		break;
-	case 0x048: ts_map_key_clear(KEY_TV2);		break;
-	case 0x049: ts_map_key_clear(KEY_CAMERA);	break;
-	case 0x04a: ts_map_key_clear(KEY_VIDEO);	break;
+	case 0x047: ts_map_key_clear(KEY_MP3);		break;		/* Direct Library: Music */
+	case 0x048: ts_map_key_clear(KEY_TV2);		break;		/* Direct Library: Recorded TV */
+	case 0x049: ts_map_key_clear(KEY_CAMERA);	break;		/* Direct Library: Picture */
+	case 0x04a: ts_map_key_clear(KEY_VIDEO);	break;		/* Direct Library: Video */
 	case 0x04b: ts_map_key_clear(KEY_ANGLE);	break;
 	case 0x04c: ts_map_key_clear(KEY_LANGUAGE);	break;
 	case 0x04d: ts_map_key_clear(KEY_SUBTITLE);	break;
-	case 0x050: ts_map_key_clear(KEY_RADIO);	break;
-	case 0x05a: ts_map_key_clear(KEY_TEXT);		break;
-	case 0x05b: ts_map_key_clear(KEY_RED);		break;
-	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 0x050: ts_map_key_clear(KEY_RADIO);	break;		/* Direct Library: Radio */
+	case 0x05a: ts_map_key_clear(KEY_TEXT);		break;		/* Teletext */
+	case 0x05b: ts_map_key_clear(KEY_RED);		break;		/* Teletext shortcut Red */
+	case 0x05c: ts_map_key_clear(KEY_GREEN);	break;		/* Teletext shortcut Green */
+	case 0x05d: ts_map_key_clear(KEY_YELLOW);	break;		/* Teletext shortcut Yellow */
+	case 0x05e: ts_map_key_clear(KEY_BLUE);		break;		/* Teletext shortcut Blue */
 	default:
 		return 0;
 	}
@@ -59,7 +63,7 @@ static int ts_input_mapping(struct hid_device *hdev, struct hid_input *hi,
 
 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_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED2, USB_DEVICE_ID_TOPSEED2_RF_COMBO) },
 	{ }
 };
 MODULE_DEVICE_TABLE(hid, ts_devices);
-- 
1.6.3.3

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html