diff options
author | Don Prince <dhprince.devel@yahoo.co.uk> | 2010-05-14 12:30:59 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-05-17 04:37:04 -0400 |
commit | a9885c8f7bf62e251fc178f838b9f0ee897c158a (patch) | |
tree | 5eee76da6440a878f6d0aac30f006f81cf0432b1 /drivers/hid | |
parent | 1721a238ba5df9e870ed952464d38714261f5be9 (diff) |
HID: Zydacron Remote Control driver
A specialised HID driver for the Zydacron Remote Control (usb id: 13ec:0006).
The specialised HID driver adds support for the buttons which are not
currently handled by the default HID driver.
Signed-off-by: Don Prince <dhprince-devel@yahoo.co.uk>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r-- | drivers/hid/Kconfig | 7 | ||||
-rw-r--r-- | drivers/hid/Makefile | 1 | ||||
-rw-r--r-- | drivers/hid/hid-core.c | 1 | ||||
-rw-r--r-- | drivers/hid/hid-ids.h | 3 |
4 files changed, 12 insertions, 0 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 631ede69c012..3cf69a0a8b77 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig | |||
@@ -380,6 +380,13 @@ config ZEROPLUS_FF | |||
380 | Say Y here if you have a Zeroplus based game controller and want | 380 | Say Y here if you have a Zeroplus based game controller and want |
381 | to have force feedback support for it. | 381 | to have force feedback support for it. |
382 | 382 | ||
383 | config HID_ZYDACRON | ||
384 | tristate "Zydacron remote control support" if EMBEDDED | ||
385 | depends on USB_HID | ||
386 | default !EMBEDDED | ||
387 | ---help--- | ||
388 | Support for Zydacron remote control. | ||
389 | |||
383 | endmenu | 390 | endmenu |
384 | 391 | ||
385 | endif # HID_SUPPORT | 392 | endif # HID_SUPPORT |
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile index 0b2618f092ca..d1f1b448977d 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile | |||
@@ -54,6 +54,7 @@ obj-$(CONFIG_HID_THRUSTMASTER) += hid-tmff.o | |||
54 | obj-$(CONFIG_HID_TOPSEED) += hid-topseed.o | 54 | obj-$(CONFIG_HID_TOPSEED) += hid-topseed.o |
55 | obj-$(CONFIG_HID_TWINHAN) += hid-twinhan.o | 55 | obj-$(CONFIG_HID_TWINHAN) += hid-twinhan.o |
56 | obj-$(CONFIG_HID_ZEROPLUS) += hid-zpff.o | 56 | obj-$(CONFIG_HID_ZEROPLUS) += hid-zpff.o |
57 | obj-$(CONFIG_HID_ZYDACRON) += hid-zydacron.o | ||
57 | obj-$(CONFIG_HID_WACOM) += hid-wacom.o | 58 | obj-$(CONFIG_HID_WACOM) += hid-wacom.o |
58 | 59 | ||
59 | obj-$(CONFIG_USB_HID) += usbhid/ | 60 | obj-$(CONFIG_USB_HID) += usbhid/ |
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index c9eb2d08f396..7c77c64d3e99 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -1364,6 +1364,7 @@ static const struct hid_device_id hid_blacklist[] = { | |||
1364 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH) }, | 1364 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH) }, |
1365 | { HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) }, | 1365 | { HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) }, |
1366 | { HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) }, | 1366 | { HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) }, |
1367 | { HID_USB_DEVICE(USB_VENDOR_ID_ZYDACRON, USB_DEVICE_ID_ZYDACRON_REMOTE_CONTROL) }, | ||
1367 | 1368 | ||
1368 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT) }, | 1369 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT) }, |
1369 | { } | 1370 | { } |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 513e75e0f65d..30cba94cfb0c 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -481,6 +481,9 @@ | |||
481 | 481 | ||
482 | #define USB_VENDOR_ID_ZEROPLUS 0x0c12 | 482 | #define USB_VENDOR_ID_ZEROPLUS 0x0c12 |
483 | 483 | ||
484 | #define USB_VENDOR_ID_ZYDACRON 0x13EC | ||
485 | #define USB_DEVICE_ID_ZYDACRON_REMOTE_CONTROL 0x0006 | ||
486 | |||
484 | #define USB_VENDOR_ID_KYE 0x0458 | 487 | #define USB_VENDOR_ID_KYE 0x0458 |
485 | #define USB_DEVICE_ID_KYE_ERGO_525V 0x0087 | 488 | #define USB_DEVICE_ID_KYE_ERGO_525V 0x0087 |
486 | #define USB_DEVICE_ID_KYE_GPEN_560 0x5003 | 489 | #define USB_DEVICE_ID_KYE_GPEN_560 0x5003 |