aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-ids.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2012-03-27 10:32:29 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-03-27 10:32:29 -0400
commit50953e0640b3473dcb409d5d0d938c2742c93b0d (patch)
tree3b0dc374e61564fbbd8adff92c8fae16fdeb423a /drivers/hid/hid-ids.h
parentf92c97c8bd77992ff8bd6ef29a23dc82dca799cb (diff)
parent626cf236608505d376e4799adb4f7eb00a8594af (diff)
Merge branch 'poll' into staging/for_v3.4
* poll: (5970 commits) poll: add poll_requested_events() and poll_does_not_wait() functions crc32: select an algorithm via Kconfig crc32: add self-test code for crc32c crypto: crc32c should use library implementation crc32: bolt on crc32c crc32: add note about this patchset to crc32.c crc32: optimize loop counter for x86 crc32: add slice-by-8 algorithm to existing code crc32: make CRC_*_BITS definition correspond to actual bit counts crc32: fix mixing of endian-specific types crc32: miscellaneous cleanups crc32: simplify unit test code crc32: move long comment about crc32 fundamentals to Documentation/ crc32: remove two instances of trailing whitespaces checkpatch: check for quoted strings broken across lines checkpatch: whitespace - add/remove blank lines checkpatch: warn on use of yield() checkpatch: add --strict tests for braces, comments and casts checkpatch: add [] to type extensions checkpatch: high precedence operators do not require additional parentheses in #defines ...
Diffstat (limited to 'drivers/hid/hid-ids.h')
-rw-r--r--drivers/hid/hid-ids.h43
1 files changed, 42 insertions, 1 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index ea1c6177f18f..e39aecb1f9f2 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -41,7 +41,7 @@
41#define USB_VENDOR_ID_ACTIONSTAR 0x2101 41#define USB_VENDOR_ID_ACTIONSTAR 0x2101
42#define USB_DEVICE_ID_ACTIONSTAR_1011 0x1011 42#define USB_DEVICE_ID_ACTIONSTAR_1011 0x1011
43 43
44#define USB_VENDOR_ID_ADS_TECH 0x06e1 44#define USB_VENDOR_ID_ADS_TECH 0x06e1
45#define USB_DEVICE_ID_ADS_TECH_RADIO_SI470X 0xa155 45#define USB_DEVICE_ID_ADS_TECH_RADIO_SI470X 0xa155
46 46
47#define USB_VENDOR_ID_AFATECH 0x15a4 47#define USB_VENDOR_ID_AFATECH 0x15a4
@@ -152,6 +152,7 @@
152 152
153#define USB_VENDOR_ID_ATMEL 0x03eb 153#define USB_VENDOR_ID_ATMEL 0x03eb
154#define USB_DEVICE_ID_ATMEL_MULTITOUCH 0x211c 154#define USB_DEVICE_ID_ATMEL_MULTITOUCH 0x211c
155#define USB_DEVICE_ID_ATMEL_MXT_DIGITIZER 0x2118
155 156
156#define USB_VENDOR_ID_AVERMEDIA 0x07ca 157#define USB_VENDOR_ID_AVERMEDIA 0x07ca
157#define USB_DEVICE_ID_AVER_FM_MR800 0xb800 158#define USB_DEVICE_ID_AVER_FM_MR800 0xb800
@@ -176,6 +177,7 @@
176#define USB_VENDOR_ID_CH 0x068e 177#define USB_VENDOR_ID_CH 0x068e
177#define USB_DEVICE_ID_CH_PRO_THROTTLE 0x00f1 178#define USB_DEVICE_ID_CH_PRO_THROTTLE 0x00f1
178#define USB_DEVICE_ID_CH_PRO_PEDALS 0x00f2 179#define USB_DEVICE_ID_CH_PRO_PEDALS 0x00f2
180#define USB_DEVICE_ID_CH_FIGHTERSTICK 0x00f3
179#define USB_DEVICE_ID_CH_COMBATSTICK 0x00f4 181#define USB_DEVICE_ID_CH_COMBATSTICK 0x00f4
180#define USB_DEVICE_ID_CH_FLIGHT_SIM_ECLIPSE_YOKE 0x0051 182#define USB_DEVICE_ID_CH_FLIGHT_SIM_ECLIPSE_YOKE 0x0051
181#define USB_DEVICE_ID_CH_FLIGHT_SIM_YOKE 0x00ff 183#define USB_DEVICE_ID_CH_FLIGHT_SIM_YOKE 0x00ff
@@ -193,6 +195,7 @@
193#define USB_DEVICE_ID_CHICONY_TACTICAL_PAD 0x0418 195#define USB_DEVICE_ID_CHICONY_TACTICAL_PAD 0x0418
194#define USB_DEVICE_ID_CHICONY_MULTI_TOUCH 0xb19d 196#define USB_DEVICE_ID_CHICONY_MULTI_TOUCH 0xb19d
195#define USB_DEVICE_ID_CHICONY_WIRELESS 0x0618 197#define USB_DEVICE_ID_CHICONY_WIRELESS 0x0618
198#define USB_DEVICE_ID_CHICONY_WIRELESS2 0x1123
196 199
197#define USB_VENDOR_ID_CHUNGHWAT 0x2247 200#define USB_VENDOR_ID_CHUNGHWAT 0x2247
198#define USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH 0x0001 201#define USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH 0x0001
@@ -240,11 +243,18 @@
240#define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER 0x0001 243#define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER 0x0001
241#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480D 0x480d 244#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480D 0x480d
242#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E 0x480e 245#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E 0x480e
246#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7207 0x7207
243#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C 0x720c 247#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C 0x720c
248#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224 0x7224
249#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_722A 0x722A
250#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_725E 0x725e
251#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7262 0x7262
244#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B 0x726b 252#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B 0x726b
253#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72AA 0x72aa
245#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1 0x72a1 254#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1 0x72a1
246#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72FA 0x72fa 255#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72FA 0x72fa
247#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7302 0x7302 256#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7302 0x7302
257#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7349 0x7349
248#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001 0xa001 258#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001 0xa001
249 259
250#define USB_VENDOR_ID_ELECOM 0x056e 260#define USB_VENDOR_ID_ELECOM 0x056e
@@ -272,6 +282,9 @@
272#define USB_VENDOR_ID_EZKEY 0x0518 282#define USB_VENDOR_ID_EZKEY 0x0518
273#define USB_DEVICE_ID_BTC_8193 0x0002 283#define USB_DEVICE_ID_BTC_8193 0x0002
274 284
285#define USB_VENDOR_ID_FRUCTEL 0x25B6
286#define USB_DEVICE_ID_GAMETEL_MT_MODE 0x0002
287
275#define USB_VENDOR_ID_GAMERON 0x0810 288#define USB_VENDOR_ID_GAMERON 0x0810
276#define USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR 0x0001 289#define USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR 0x0001
277#define USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR 0x0002 290#define USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR 0x0002
@@ -377,6 +390,7 @@
377 390
378#define USB_VENDOR_ID_IDEACOM 0x1cb6 391#define USB_VENDOR_ID_IDEACOM 0x1cb6
379#define USB_DEVICE_ID_IDEACOM_IDC6650 0x6650 392#define USB_DEVICE_ID_IDEACOM_IDC6650 0x6650
393#define USB_DEVICE_ID_IDEACOM_IDC6651 0x6651
380 394
381#define USB_VENDOR_ID_ILITEK 0x222a 395#define USB_VENDOR_ID_ILITEK 0x222a
382#define USB_DEVICE_ID_ILITEK_MULTITOUCH 0x0001 396#define USB_DEVICE_ID_ILITEK_MULTITOUCH 0x0001
@@ -408,6 +422,9 @@
408#define USB_VENDOR_ID_KYE 0x0458 422#define USB_VENDOR_ID_KYE 0x0458
409#define USB_DEVICE_ID_KYE_ERGO_525V 0x0087 423#define USB_DEVICE_ID_KYE_ERGO_525V 0x0087
410#define USB_DEVICE_ID_KYE_GPEN_560 0x5003 424#define USB_DEVICE_ID_KYE_GPEN_560 0x5003
425#define USB_DEVICE_ID_KYE_EASYPEN_I405X 0x5010
426#define USB_DEVICE_ID_KYE_MOUSEPEN_I608X 0x5011
427#define USB_DEVICE_ID_KYE_EASYPEN_M610X 0x5013
411 428
412#define USB_VENDOR_ID_LABTEC 0x1020 429#define USB_VENDOR_ID_LABTEC 0x1020
413#define USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD 0x0006 430#define USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD 0x0006
@@ -569,6 +586,10 @@
569#define USB_DEVICE_ID_ORTEK_PKB1700 0x1700 586#define USB_DEVICE_ID_ORTEK_PKB1700 0x1700
570#define USB_DEVICE_ID_ORTEK_WKB2000 0x2000 587#define USB_DEVICE_ID_ORTEK_WKB2000 0x2000
571 588
589#define USB_VENDOR_ID_PANASONIC 0x04da
590#define USB_DEVICE_ID_PANABOARD_UBT780 0x1044
591#define USB_DEVICE_ID_PANABOARD_UBT880 0x104d
592
572#define USB_VENDOR_ID_PANJIT 0x134c 593#define USB_VENDOR_ID_PANJIT 0x134c
573 594
574#define USB_VENDOR_ID_PANTHERLORD 0x0810 595#define USB_VENDOR_ID_PANTHERLORD 0x0810
@@ -617,6 +638,7 @@
617 638
618#define USB_VENDOR_ID_SAITEK 0x06a3 639#define USB_VENDOR_ID_SAITEK 0x06a3
619#define USB_DEVICE_ID_SAITEK_RUMBLEPAD 0xff17 640#define USB_DEVICE_ID_SAITEK_RUMBLEPAD 0xff17
641#define USB_DEVICE_ID_SAITEK_PS1000 0x0621
620 642
621#define USB_VENDOR_ID_SAMSUNG 0x0419 643#define USB_VENDOR_ID_SAMSUNG 0x0419
622#define USB_DEVICE_ID_SAMSUNG_IR_REMOTE 0x0001 644#define USB_DEVICE_ID_SAMSUNG_IR_REMOTE 0x0001
@@ -656,13 +678,29 @@
656#define USB_DEVICE_ID_SYMBOL_SCANNER_1 0x0800 678#define USB_DEVICE_ID_SYMBOL_SCANNER_1 0x0800
657#define USB_DEVICE_ID_SYMBOL_SCANNER_2 0x1300 679#define USB_DEVICE_ID_SYMBOL_SCANNER_2 0x1300
658 680
681#define USB_VENDOR_ID_SYNAPTICS 0x06cb
682#define USB_DEVICE_ID_SYNAPTICS_TP 0x0001
683#define USB_DEVICE_ID_SYNAPTICS_INT_TP 0x0002
684#define USB_DEVICE_ID_SYNAPTICS_CPAD 0x0003
685#define USB_DEVICE_ID_SYNAPTICS_TS 0x0006
686#define USB_DEVICE_ID_SYNAPTICS_STICK 0x0007
687#define USB_DEVICE_ID_SYNAPTICS_WP 0x0008
688#define USB_DEVICE_ID_SYNAPTICS_COMP_TP 0x0009
689#define USB_DEVICE_ID_SYNAPTICS_WTP 0x0010
690#define USB_DEVICE_ID_SYNAPTICS_DPAD 0x0013
691
659#define USB_VENDOR_ID_THRUSTMASTER 0x044f 692#define USB_VENDOR_ID_THRUSTMASTER 0x044f
660 693
694#define USB_VENDOR_ID_TIVO 0x150a
695#define USB_DEVICE_ID_TIVO_SLIDE_BT 0x1200
696#define USB_DEVICE_ID_TIVO_SLIDE 0x1201
697
661#define USB_VENDOR_ID_TOPSEED 0x0766 698#define USB_VENDOR_ID_TOPSEED 0x0766
662#define USB_DEVICE_ID_TOPSEED_CYBERLINK 0x0204 699#define USB_DEVICE_ID_TOPSEED_CYBERLINK 0x0204
663 700
664#define USB_VENDOR_ID_TOPSEED2 0x1784 701#define USB_VENDOR_ID_TOPSEED2 0x1784
665#define USB_DEVICE_ID_TOPSEED2_RF_COMBO 0x0004 702#define USB_DEVICE_ID_TOPSEED2_RF_COMBO 0x0004
703#define USB_DEVICE_ID_TOPSEED2_PERIPAD_701 0x0016
666 704
667#define USB_VENDOR_ID_TOPMAX 0x0663 705#define USB_VENDOR_ID_TOPMAX 0x0663
668#define USB_DEVICE_ID_TOPMAX_COBRAPAD 0x0103 706#define USB_DEVICE_ID_TOPMAX_COBRAPAD 0x0103
@@ -707,6 +745,8 @@
707#define USB_VENDOR_ID_WALTOP 0x172f 745#define USB_VENDOR_ID_WALTOP 0x172f
708#define USB_DEVICE_ID_WALTOP_SLIM_TABLET_5_8_INCH 0x0032 746#define USB_DEVICE_ID_WALTOP_SLIM_TABLET_5_8_INCH 0x0032
709#define USB_DEVICE_ID_WALTOP_SLIM_TABLET_12_1_INCH 0x0034 747#define USB_DEVICE_ID_WALTOP_SLIM_TABLET_12_1_INCH 0x0034
748#define USB_DEVICE_ID_WALTOP_Q_PAD 0x0037
749#define USB_DEVICE_ID_WALTOP_PID_0038 0x0038
710#define USB_DEVICE_ID_WALTOP_MEDIA_TABLET_10_6_INCH 0x0501 750#define USB_DEVICE_ID_WALTOP_MEDIA_TABLET_10_6_INCH 0x0501
711#define USB_DEVICE_ID_WALTOP_MEDIA_TABLET_14_1_INCH 0x0500 751#define USB_DEVICE_ID_WALTOP_MEDIA_TABLET_14_1_INCH 0x0500
712 752
@@ -715,6 +755,7 @@
715#define USB_DEVICE_ID_1_PHIDGETSERVO_20 0x8101 755#define USB_DEVICE_ID_1_PHIDGETSERVO_20 0x8101
716#define USB_DEVICE_ID_4_PHIDGETSERVO_20 0x8104 756#define USB_DEVICE_ID_4_PHIDGETSERVO_20 0x8104
717#define USB_DEVICE_ID_8_8_4_IF_KIT 0x8201 757#define USB_DEVICE_ID_8_8_4_IF_KIT 0x8201
758#define USB_DEVICE_ID_SUPER_JOY_BOX_3 0x8888
718#define USB_DEVICE_ID_QUAD_USB_JOYPAD 0x8800 759#define USB_DEVICE_ID_QUAD_USB_JOYPAD 0x8800
719#define USB_DEVICE_ID_DUAL_USB_JOYPAD 0x8866 760#define USB_DEVICE_ID_DUAL_USB_JOYPAD 0x8866
720 761