aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLionel Vaux <lionel.vaux@free.fr>2012-07-22 05:32:20 -0400
committerJiri Kosina <jkosina@suse.cz>2012-07-22 05:32:24 -0400
commit76c9d8fe2c7fc34ffc387d8022c5828d6ff9df48 (patch)
tree10689e7f7eb815b92d11d16441eb0a07f7d82dd6
parent4bc19f62c57b8ccdd1c48e875752bd59abfb7aae (diff)
HID: add support for Cypress barcode scanner 04B4:ED81
Add yet another device to the list of Cypress barcode scanners needing the CP_RDESC_SWAPPED_MIN_MAX quirk. Signed-off-by: Lionel Vaux (iouri) <lionel.vaux@free.fr> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/hid/hid-core.c1
-rw-r--r--drivers/hid/hid-cypress.c2
-rw-r--r--drivers/hid/hid-ids.h1
3 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index de8220c3fb5f..0b386b976460 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1524,6 +1524,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
1524 { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) }, 1524 { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) },
1525 { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) }, 1525 { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) },
1526 { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_3) }, 1526 { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_3) },
1527 { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_4) },
1527 { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE) }, 1528 { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE) },
1528 { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0006) }, 1529 { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0006) },
1529 { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0011) }, 1530 { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0011) },
diff --git a/drivers/hid/hid-cypress.c b/drivers/hid/hid-cypress.c
index 2f0be4c66af7..9e43aaca9774 100644
--- a/drivers/hid/hid-cypress.c
+++ b/drivers/hid/hid-cypress.c
@@ -129,6 +129,8 @@ static const struct hid_device_id cp_devices[] = {
129 .driver_data = CP_RDESC_SWAPPED_MIN_MAX }, 129 .driver_data = CP_RDESC_SWAPPED_MIN_MAX },
130 { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_3), 130 { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_3),
131 .driver_data = CP_RDESC_SWAPPED_MIN_MAX }, 131 .driver_data = CP_RDESC_SWAPPED_MIN_MAX },
132 { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_4),
133 .driver_data = CP_RDESC_SWAPPED_MIN_MAX },
132 { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE), 134 { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE),
133 .driver_data = CP_2WHEEL_MOUSE_HACK }, 135 .driver_data = CP_2WHEEL_MOUSE_HACK },
134 { } 136 { }
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index a139d9619ad1..9b26a41ae978 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -231,6 +231,7 @@
231#define USB_DEVICE_ID_CYPRESS_BARCODE_1 0xde61 231#define USB_DEVICE_ID_CYPRESS_BARCODE_1 0xde61
232#define USB_DEVICE_ID_CYPRESS_BARCODE_2 0xde64 232#define USB_DEVICE_ID_CYPRESS_BARCODE_2 0xde64
233#define USB_DEVICE_ID_CYPRESS_BARCODE_3 0xbca1 233#define USB_DEVICE_ID_CYPRESS_BARCODE_3 0xbca1
234#define USB_DEVICE_ID_CYPRESS_BARCODE_4 0xed81
234#define USB_DEVICE_ID_CYPRESS_TRUETOUCH 0xc001 235#define USB_DEVICE_ID_CYPRESS_TRUETOUCH 0xc001
235 236
236#define USB_VENDOR_ID_DEALEXTREAME 0x10c5 237#define USB_VENDOR_ID_DEALEXTREAME 0x10c5