aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-core.c20
-rw-r--r--drivers/hid/hid-ids.h21
2 files changed, 39 insertions, 2 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 4140fd271417..c957c4b4fe70 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1775,19 +1775,37 @@ static const struct hid_device_id hid_ignore_list[] = {
1775 { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_GPEN_560) }, 1775 { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_GPEN_560) },
1776 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_KYE, 0x0058) }, 1776 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_KYE, 0x0058) },
1777 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CASSY) }, 1777 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CASSY) },
1778 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CASSY2) },
1778 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POCKETCASSY) }, 1779 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POCKETCASSY) },
1780 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POCKETCASSY2) },
1779 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MOBILECASSY) }, 1781 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MOBILECASSY) },
1782 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MOBILECASSY2) },
1783 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MICROCASSYVOLTAGE) },
1784 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MICROCASSYCURRENT) },
1785 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MICROCASSYTIME) },
1786 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MICROCASSYTEMPERATURE) },
1787 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MICROCASSYPH) },
1780 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_JWM) }, 1788 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_JWM) },
1781 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_DMMP) }, 1789 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_DMMP) },
1782 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_UMIP) }, 1790 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_UMIP) },
1783 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_XRAY1) }, 1791 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_UMIC) },
1792 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_UMIB) },
1793 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_XRAY) },
1784 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_XRAY2) }, 1794 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_XRAY2) },
1785 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_VIDEOCOM) }, 1795 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_VIDEOCOM) },
1796 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MOTOR) },
1786 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_COM3LAB) }, 1797 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_COM3LAB) },
1787 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_TELEPORT) }, 1798 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_TELEPORT) },
1788 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_NETWORKANALYSER) }, 1799 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_NETWORKANALYSER) },
1789 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POWERCONTROL) }, 1800 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POWERCONTROL) },
1790 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MACHINETEST) }, 1801 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MACHINETEST) },
1802 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MOSTANALYSER) },
1803 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MOSTANALYSER2) },
1804 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_ABSESP) },
1805 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_AUTODATABUS) },
1806 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MCT) },
1807 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HYBRID) },
1808 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HEATCONTROL) },
1791 { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1024LS) }, 1809 { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1024LS) },
1792 { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS) }, 1810 { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS) },
1793 { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1) }, 1811 { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index e715c43aa013..0b374a6d6db0 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -380,19 +380,38 @@
380 380
381#define USB_VENDOR_ID_LD 0x0f11 381#define USB_VENDOR_ID_LD 0x0f11
382#define USB_DEVICE_ID_LD_CASSY 0x1000 382#define USB_DEVICE_ID_LD_CASSY 0x1000
383#define USB_DEVICE_ID_LD_CASSY2 0x1001
383#define USB_DEVICE_ID_LD_POCKETCASSY 0x1010 384#define USB_DEVICE_ID_LD_POCKETCASSY 0x1010
385#define USB_DEVICE_ID_LD_POCKETCASSY2 0x1011
384#define USB_DEVICE_ID_LD_MOBILECASSY 0x1020 386#define USB_DEVICE_ID_LD_MOBILECASSY 0x1020
387#define USB_DEVICE_ID_LD_MOBILECASSY2 0x1021
388#define USB_DEVICE_ID_LD_MICROCASSYVOLTAGE 0x1031
389#define USB_DEVICE_ID_LD_MICROCASSYCURRENT 0x1032
390#define USB_DEVICE_ID_LD_MICROCASSYTIME 0x1033
391#define USB_DEVICE_ID_LD_MICROCASSYTEMPERATURE 0x1035
392#define USB_DEVICE_ID_LD_MICROCASSYPH 0x1038
385#define USB_DEVICE_ID_LD_JWM 0x1080 393#define USB_DEVICE_ID_LD_JWM 0x1080
386#define USB_DEVICE_ID_LD_DMMP 0x1081 394#define USB_DEVICE_ID_LD_DMMP 0x1081
387#define USB_DEVICE_ID_LD_UMIP 0x1090 395#define USB_DEVICE_ID_LD_UMIP 0x1090
388#define USB_DEVICE_ID_LD_XRAY1 0x1100 396#define USB_DEVICE_ID_LD_UMIC 0x10A0
397#define USB_DEVICE_ID_LD_UMIB 0x10B0
398#define USB_DEVICE_ID_LD_XRAY 0x1100
389#define USB_DEVICE_ID_LD_XRAY2 0x1101 399#define USB_DEVICE_ID_LD_XRAY2 0x1101
400#define USB_DEVICE_ID_LD_XRAYCT 0x1110
390#define USB_DEVICE_ID_LD_VIDEOCOM 0x1200 401#define USB_DEVICE_ID_LD_VIDEOCOM 0x1200
402#define USB_DEVICE_ID_LD_MOTOR 0x1210
391#define USB_DEVICE_ID_LD_COM3LAB 0x2000 403#define USB_DEVICE_ID_LD_COM3LAB 0x2000
392#define USB_DEVICE_ID_LD_TELEPORT 0x2010 404#define USB_DEVICE_ID_LD_TELEPORT 0x2010
393#define USB_DEVICE_ID_LD_NETWORKANALYSER 0x2020 405#define USB_DEVICE_ID_LD_NETWORKANALYSER 0x2020
394#define USB_DEVICE_ID_LD_POWERCONTROL 0x2030 406#define USB_DEVICE_ID_LD_POWERCONTROL 0x2030
395#define USB_DEVICE_ID_LD_MACHINETEST 0x2040 407#define USB_DEVICE_ID_LD_MACHINETEST 0x2040
408#define USB_DEVICE_ID_LD_MOSTANALYSER 0x2050
409#define USB_DEVICE_ID_LD_MOSTANALYSER2 0x2051
410#define USB_DEVICE_ID_LD_ABSESP 0x2060
411#define USB_DEVICE_ID_LD_AUTODATABUS 0x2070
412#define USB_DEVICE_ID_LD_MCT 0x2080
413#define USB_DEVICE_ID_LD_HYBRID 0x2090
414#define USB_DEVICE_ID_LD_HEATCONTROL 0x20A0
396 415
397#define USB_VENDOR_ID_LOGITECH 0x046d 416#define USB_VENDOR_ID_LOGITECH 0x046d
398#define USB_DEVICE_ID_LOGITECH_RECEIVER 0xc101 417#define USB_DEVICE_ID_LOGITECH_RECEIVER 0xc101