Commit 1e093206734568e780c2717da1c89b97e9471954
1 parent
022b7024d4
Exists in
master
and in
7 other branches
HID: add support for another Gyration remote control
There is a slightly different Gyration remote control, which requires the quirks we already have in place for the 0x0002 PID, plus KEY_MEDIA mapping is different. Reported-by: Marc Randolph <mrand@pobox.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Showing 3 changed files with 5 additions and 1 deletions Side-by-side Diff
drivers/hid/hid-core.c
| ... | ... | @@ -1264,6 +1264,7 @@ |
| 1264 | 1264 | { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_SK8115) }, |
| 1265 | 1265 | { HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) }, |
| 1266 | 1266 | { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) }, |
| 1267 | + { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) }, | |
| 1267 | 1268 | { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) }, |
| 1268 | 1269 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER) }, |
| 1269 | 1270 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER) }, |
drivers/hid/hid-gyration.c
| ... | ... | @@ -4,9 +4,9 @@ |
| 4 | 4 | * Copyright (c) 1999 Andreas Gal |
| 5 | 5 | * Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz> |
| 6 | 6 | * Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc |
| 7 | - * Copyright (c) 2006-2007 Jiri Kosina | |
| 8 | 7 | * Copyright (c) 2007 Paul Walmsley |
| 9 | 8 | * Copyright (c) 2008 Jiri Slaby |
| 9 | + * Copyright (c) 2006-2008 Jiri Kosina | |
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | 12 | /* |
| ... | ... | @@ -40,6 +40,7 @@ |
| 40 | 40 | case 0x025: gy_map_key_clear(KEY_PVR); break; |
| 41 | 41 | case 0x046: gy_map_key_clear(KEY_MEDIA); break; |
| 42 | 42 | case 0x047: gy_map_key_clear(KEY_MP3); break; |
| 43 | + case 0x048: gy_map_key_clear(KEY_MEDIA); break; | |
| 43 | 44 | case 0x049: gy_map_key_clear(KEY_CAMERA); break; |
| 44 | 45 | case 0x04a: gy_map_key_clear(KEY_VIDEO); break; |
| 45 | 46 | |
| ... | ... | @@ -68,6 +69,7 @@ |
| 68 | 69 | |
| 69 | 70 | static const struct hid_device_id gyration_devices[] = { |
| 70 | 71 | { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) }, |
| 72 | + { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) }, | |
| 71 | 73 | { } |
| 72 | 74 | }; |
| 73 | 75 | MODULE_DEVICE_TABLE(hid, gyration_devices); |
drivers/hid/hid-ids.h