Module Name: src Committed By: skrll Date: Wed Sep 7 08:20:24 UTC 2016
Modified Files: src/sys/dev/usb [netbsd-7-nhusb]: usbdevs.h usbdevs_data.h Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.672.2.4 -r1.672.2.4.2.1 src/sys/dev/usb/usbdevs.h cvs rdiff -u -r1.673.2.4 -r1.673.2.4.2.1 src/sys/dev/usb/usbdevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/usb/usbdevs.h diff -u src/sys/dev/usb/usbdevs.h:1.672.2.4 src/sys/dev/usb/usbdevs.h:1.672.2.4.2.1 --- src/sys/dev/usb/usbdevs.h:1.672.2.4 Sun Oct 18 09:03:22 2015 +++ src/sys/dev/usb/usbdevs.h Wed Sep 7 08:20:24 2016 @@ -1,10 +1,10 @@ -/* $NetBSD: usbdevs.h,v 1.672.2.4 2015/10/18 09:03:22 martin Exp $ */ +/* ??? */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: usbdevs,v 1.680.2.4 2015/10/18 09:01:58 martin Exp + * NetBSD: usbdevs,v 1.680.2.4.2.1 2016/09/06 20:33:09 skrll Exp */ /* @@ -324,6 +324,7 @@ #define USB_VENDOR_ARASAN 0x07da /* Arasan Chip Systems */ #define USB_VENDOR_ALLIEDCABLE 0x07e6 /* Allied Cable */ #define USB_VENDOR_STSN 0x07ef /* STSN */ +#define USB_VENDOR_CENTURY 0x07f7 /* CENTURY Corporation */ #define USB_VENDOR_BEWAN 0x07fa /* Bewan */ #define USB_VENDOR_ZOOM 0x0803 /* Zoom Telephonics */ #define USB_VENDOR_BROADLOGIC 0x0827 /* BroadLogic */ @@ -493,6 +494,7 @@ #define USB_VENDOR_MOBILITY 0x1342 /* Mobility */ #define USB_VENDOR_DICKSMITH 0x1371 /* Dick Smith Electronics */ #define USB_VENDOR_NETGEAR3 0x1385 /* Netgear */ +#define USB_VENDOR_VALIDITY 0x138a /* Validity Sensors, Inc. */ #define USB_VENDOR_BALTECH 0x13ad /* Baltech */ #define USB_VENDOR_CISCOLINKSYS 0x13b1 /* Cisco-Linksys */ #define USB_VENDOR_SHARK 0x13d2 /* Shark */ @@ -557,9 +559,12 @@ #define USB_VENDOR_PARA 0x20b8 /* PARA Industrial */ #define USB_VENDOR_TRENDNET 0x20f4 /* TRENDnet */ #define USB_VENDOR_DLINK3 0x2101 /* D-Link */ +#define USB_VENDOR_VIALABS 0x2109 /* VIA Labs */ #define USB_VENDOR_ERICSSON 0x2282 /* Ericsson */ #define USB_VENDOR_MOTOROLA2 0x22b8 /* Motorola */ #define USB_VENDOR_PINNACLE 0x2304 /* Pinnacle Systems */ +#define USB_VENDOR_ARDUINO 0x2341 /* Arduino SA */ +#define USB_VENDOR_TPLINK 0x2357 /* TP-Link */ #define USB_VENDOR_TRIPPLITE 0x2478 /* Tripp-Lite */ #define USB_VENDOR_HIROSE 0x2631 /* Hirose Electric */ #define USB_VENDOR_NHJ 0x2770 /* NHJ */ @@ -580,6 +585,7 @@ #define USB_VENDOR_SWEEX 0x5173 /* Sweex */ #define USB_VENDOR_ONSPEC2 0x55aa /* OnSpec Electronic Inc. */ #define USB_VENDOR_ZINWELL 0x5a57 /* Zinwell */ +#define USB_VENDOR_INGENIC 0x601a /* Ingenic Semiconductor Ltd. */ #define USB_VENDOR_SITECOM 0x6189 /* Sitecom */ #define USB_VENDOR_SPRINGERDESIGN 0x6400 /* Springer Design, Inc. */ #define USB_VENDOR_ARKMICROCHIPS 0x6547 /* ArkMicroChips */ @@ -592,6 +598,9 @@ #define USB_VENDOR_NETGEAR4 0x9846 /* Netgear */ #define USB_VENDOR_xxFTDI 0x9e88 /* FTDI */ #define USB_VENDOR_CACE 0xcace /* CACE Technologies */ +#define USB_VENDOR_COMPARE 0xcdab /* Compare */ +#define USB_VENDOR_DATAAPEX 0xdaae /* DataApex */ +#define USB_VENDOR_EVOLUTION 0xdeee /* Evolution Robotics */ #define USB_VENDOR_EMPIA 0xeb1a /* eMPIA Technology */ #define USB_VENDOR_HP2 0xf003 /* Hewlett Packard */ #define USB_VENDOR_USRP 0xfffe /* GNU Radio USRP */ @@ -863,10 +872,23 @@ #define USB_PRODUCT_APPLE_IPOD_TOUCH_4G 0x129e /* iPod Touch 4G */ #define USB_PRODUCT_APPLE_IPHONE_3G 0x1292 /* iPhone 3G */ #define USB_PRODUCT_APPLE_IPHONE_3GS 0x1294 /* iPhone 3GS */ +#define USB_PRODUCT_APPLE_IPHONE_4 0x1297 /* iPhone 4 */ +#define USB_PRODUCT_APPLE_IPHONE_4_VZW 0x129c /* iPhone 4 (VZW) */ +#define USB_PRODUCT_APPLE_IPHONE_4S 0x12a0 /* iPhone 4S */ +#define USB_PRODUCT_APPLE_IPHONE_5 0x12a8 /* iPhone 5 */ #define USB_PRODUCT_APPLE_IPAD 0x129a /* Apple iPad */ +#define USB_PRODUCT_APPLE_IPAD_2 0x12a2 /* Apple iPad 2 */ +#define USB_PRODUCT_APPLE_IPAD_3 0x12a6 /* Apple iPad 3 */ +#define USB_PRODUCT_APPLE_IPAD_MINI 0x12ab /* Apple iPad Mini */ #define USB_PRODUCT_APPLE_ETHERNET 0x1402 /* Apple USB to Ethernet */ #define USB_PRODUCT_APPLE_BLUETOOTH2 0x8205 /* Bluetooth */ -#define USB_PRODUCT_APPLE_BLUETOOTH_HOST_C 0x821f /* Bluetooth USB Host Controller */ +#define USB_PRODUCT_APPLE_BLUETOOTH_HOST_1 0x8213 /* Bluetooth USB Host Controller MacBookPro 7,1 */ +#define USB_PRODUCT_APPLE_BLUETOOTH_HOST_2 0x8215 /* Bluetooth USB Host Controller iMac 11,1 */ +#define USB_PRODUCT_APPLE_BLUETOOTH_HOST_3 0x821a /* Bluetooth USB Host Controller MacBookPro 8,2 */ +#define USB_PRODUCT_APPLE_BLUETOOTH_HOST_4 0x821b /* Bluetooth USB Host Controller MacBookAir 3,1 3,2 */ +#define USB_PRODUCT_APPLE_BLUETOOTH_HOST_5 0x821f /* Bluetooth USB Host Controller MacBookAir 4,1 */ +#define USB_PRODUCT_APPLE_BLUETOOTH_HOST_6 0x8281 /* Bluetooth USB Host Controller MacMini 5,1 */ +#define USB_PRODUCT_APPLE_BLUETOOTH_HOST_7 0x828f /* Bluetooth USB Host Controller MacBookAir 6,1 */ #define USB_PRODUCT_APPLE_BLUETOOTH 0x8300 /* Bluetooth */ /* ArkMicroChips products */ @@ -912,8 +934,11 @@ #define USB_PRODUCT_ASUSTEK_USBN10 0x1786 /* USB-N10 */ #define USB_PRODUCT_ASUSTEK_RT3070_1 0x1790 /* RT3070 */ #define USB_PRODUCT_ASUSTEK_RTL8192SU_1 0x1791 /* RTL8192SU */ +#define USB_PRODUCT_ASUSTEK_USBN53 0x179d /* USB-N53 */ #define USB_PRODUCT_ASUSTEK_RTL8192CU 0x17ab /* RTL8192CU */ +#define USB_PRODUCT_ASUSTEK_USBN66 0x17ad /* USB-N66 */ #define USB_PRODUCT_ASUSTEK_USBN10NANO 0x17ba /* USB-N10 Nano */ +#define USB_PRODUCT_ASUSTEK_RTL8192CU_3 0x17c0 /* RTL8192CU_3 */ #define USB_PRODUCT_ASUSTEK_MYPAL_A730 0x4202 /* MyPal A730 */ #define USB_PRODUCT_ASUSTEK2_USBN11 0x0b05 /* USB-N11 */ @@ -942,6 +967,7 @@ #define USB_PRODUCT_ATHEROS2_3CRUSBN275 0x1010 /* 3CRUSBN275 */ #define USB_PRODUCT_ATHEROS2_WN612 0x1011 /* WN612 */ #define USB_PRODUCT_ATHEROS2_AR3011 0x3000 /* AR3011 */ +#define USB_PRODUCT_ATHEROS2_AR3012 0x3004 /* AR3012 */ #define USB_PRODUCT_ATHEROS2_AR9280 0x7010 /* AR9280+AR7010 */ #define USB_PRODUCT_ATHEROS2_AR9287 0x7015 /* AR9287+AR7010 */ #define USB_PRODUCT_ATHEROS2_AR9170 0x9170 /* AR9170 */ @@ -1024,9 +1050,13 @@ #define USB_PRODUCT_BELKIN_F5U237 0x0237 /* F5U237 USB 2.0 7-Port Hub */ #define USB_PRODUCT_BELKIN_F5U409 0x0409 /* F5U409 Serial */ #define USB_PRODUCT_BELKIN_UPS 0x0980 /* UPS */ +#define USB_PRODUCT_BELKIN_RTL8192CU_2 0x1004 /* RTL8192CU */ #define USB_PRODUCT_BELKIN_RTL8188CU 0x1102 /* RTL8188CU */ +#define USB_PRODUCT_BELKIN_RTL8188CUS 0x11f2 /* RTL8188CUS */ #define USB_PRODUCT_BELKIN_F5U120 0x1203 /* F5U120-PC Hub */ #define USB_PRODUCT_BELKIN_RTL8192CU 0x2102 /* RTL8192CU */ +#define USB_PRODUCT_BELKIN_F7D2102 0x2103 /* F7D2102 */ +#define USB_PRODUCT_BELKIN_RTL8192CU_1 0x21f2 /* RTL8192CU */ #define USB_PRODUCT_BELKIN_ZD1211B 0x4050 /* ZD1211B */ #define USB_PRODUCT_BELKIN_F5D5055 0x5055 /* F5D5055 Ethernet adapter */ #define USB_PRODUCT_BELKIN_F5D7050 0x7050 /* F5D7050 54g USB Network Adapter */ @@ -1048,6 +1078,9 @@ #define USB_PRODUCT_BELKIN_RTL8192SU_3 0x945a /* RTL8192SU */ #define USB_PRODUCT_BELKIN_F7D1101V2 0x945b /* F7D1101 v2 */ +/* CENTURY Corporation products */ +#define USB_PRODUCT_CENTURY_CTUSB1HUB 0x0023 /* CT-USB1HUB */ + /* Bewan products */ #define USB_PRODUCT_BEWAN_BWIFI_USB54AR 0x1196 /* BWIFI-USB54AR */ #define USB_PRODUCT_BEWAN_RT3070 0x7712 /* RT3070 */ @@ -1118,6 +1151,7 @@ #define USB_PRODUCT_CHICONY_RTL8188CUS_3 0xaff9 /* RTL8188CUS */ #define USB_PRODUCT_CHICONY_RTL8188CUS_4 0xaffa /* RTL8188CUS */ #define USB_PRODUCT_CHICONY_RTL8188CUS_5 0xaffb /* RTL8188CUS */ +#define USB_PRODUCT_CHICONY_RTL8188CUS_6 0xaffc /* RTL8188CUS */ #define USB_PRODUCT_CHICONY2_TWINKLECAM 0x600d /* TwinkleCam USB camera */ /* CH Products */ @@ -1152,6 +1186,9 @@ #define USB_PRODUCT_COMPAQ_IPAQLINUX 0x505a /* iPAQ Linux */ #define USB_PRODUCT_COMPAQ_HNE200 0x8511 /* HNE-200 USB Ethernet adapter */ +/* Compare products */ +#define USB_PRODUCT_COMPARE_RTL8192CU 0x8010 /* RTL8192CU */ + /* Composite Corp products looks the same as "TANGTOP" */ #define USB_PRODUCT_COMPOSITE_USBPS2 0x0001 /* USB to PS2 Adaptor */ @@ -1203,7 +1240,7 @@ #define USB_PRODUCT_COREGA_RT2870_2 0x003c /* RT2870 */ #define USB_PRODUCT_COREGA_RT2870_3 0x003f /* RT2870 */ #define USB_PRODUCT_COREGA_RT3070 0x0041 /* RT3070 */ -#define USB_PRODUCT_COREGA_RTL8192SU 0x0047 /* RTL8192SU */ +#define USB_PRODUCT_COREGA_CGWLUSBNM 0x0047 /* CG-WLUSBNM */ #define USB_PRODUCT_COREGA_RTL8192CU 0x0056 /* RTL8192CU */ #define USB_PRODUCT_COREGA_CGWLUSB300GNM 0x0042 /* CG-WLUSB300GNM */ #define USB_PRODUCT_COREGA_WLUSB_11_STICK 0x7613 /* WLAN USB Stick 11 */ @@ -1291,6 +1328,7 @@ #define USB_PRODUCT_DISPLAYLINK_LD220 0x0100 /* Samsung LD220 */ #define USB_PRODUCT_DISPLAYLINK_LD190 0x0102 /* Samsung LD190 */ #define USB_PRODUCT_DISPLAYLINK_U70 0x0103 /* Samsung U70 */ +#define USB_PRODUCT_DISPLAYLINK_POLARIS2 0x0117 /* Polaris2 USB dock */ #define USB_PRODUCT_DISPLAYLINK_VCUD60 0x0136 /* Rextron DVI */ #define USB_PRODUCT_DISPLAYLINK_CONV 0x0138 /* StarTech CONV-USB2DVI */ #define USB_PRODUCT_DISPLAYLINK_DLDVI 0x0141 /* DisplayLink DVI */ @@ -1312,6 +1350,8 @@ #define USB_PRODUCT_DISPLAYLINK_LUM70 0x02a9 /* Lilliput UM-70 */ #define USB_PRODUCT_DISPLAYLINK_LCD8000UD_DVI 0x02b8 /* LCD-8000UD-DVI */ #define USB_PRODUCT_DISPLAYLINK_LDEWX015U 0x02e3 /* Logitec LDE-WX015U */ +#define USB_PRODUCT_DISPLAYLINK_MIMO 0x0335 /* DisplayLink MIMO */ +#define USB_PRODUCT_DISPLAYLINK_PLUGABLE 0x0377 /* Plugable docking station */ #define USB_PRODUCT_DISPLAYLINK_LT1421WIDE 0x03e0 /* Lenovo ThinkVision LT1421 Wide */ #define USB_PRODUCT_DISPLAYLINK_SD_U2VDH 0x046d /* AREA SD-U2VDH */ #define USB_PRODUCT_DISPLAYLINK_UM7X0 0x401a /* nanovision MiMo */ @@ -1327,6 +1367,8 @@ #define USB_PRODUCT_DLINK_RTL8188CU 0x3308 /* RTL8188CU */ #define USB_PRODUCT_DLINK_RTL8192CU_2 0x3309 /* RTL8192CU */ #define USB_PRODUCT_DLINK_RTL8192CU_3 0x330a /* RTL8192CU */ +#define USB_PRODUCT_DLINK_RTL8192CU_4 0x330b /* RTL8192CU */ +#define USB_PRODUCT_DLINK_DWA131B 0x330d /* DWA-131 rev B */ #define USB_PRODUCT_DLINK_DWL122 0x3700 /* Wireless DWL122 */ #define USB_PRODUCT_DLINK_DWLG120 0x3701 /* DWL-G120 */ #define USB_PRODUCT_DLINK_DWL120F 0x3702 /* DWL-120 rev F */ @@ -1339,12 +1381,13 @@ #define USB_PRODUCT_DLINK_DWLAG122_NF 0x3a05 /* DWL-AG122 */ #define USB_PRODUCT_DLINK_DWLG122 0x3c00 /* AirPlus G Wireless USB Adapter */ /* product DLINK RT2570 0x3c00 RT2570 */ -#define USB_PRODUCT_DLINK2_DWLG122C1 0x3c03 /* DWL-G122 rev C1 */ -#define USB_PRODUCT_DLINK2_WUA1340 0x3c04 /* WUA-1340 */ #define USB_PRODUCT_DLINK_DUBE100B1 0x3c05 /* DUB-E100 rev B1 */ -#define USB_PRODUCT_DLINK2_DWA111 0x3c06 /* DWA-111 */ #define USB_PRODUCT_DLINK_RT2870 0x3c09 /* RT2870 */ #define USB_PRODUCT_DLINK_RT3072 0x3c0a /* RT3072 */ +#define USB_PRODUCT_DLINK_DWA140B3 0x3c15 /* DWA-140 rev B3 */ +#define USB_PRODUCT_DLINK_DWA160B2 0x3c1a /* DWA-160 rev B2 */ +#define USB_PRODUCT_DLINK_DWA127 0x3c1b /* DWA-127 */ +#define USB_PRODUCT_DLINK_DWA162 0x3c1f /* DWA-162 Wireless Adapter */ #define USB_PRODUCT_DLINK_DSB650C 0x4000 /* 10Mbps ethernet adapter */ #define USB_PRODUCT_DLINK_DSB650TX1 0x4001 /* 10/100 ethernet adapter */ #define USB_PRODUCT_DLINK_DSB650TX 0x4002 /* 10/100 ethernet adapter */ @@ -1364,6 +1407,7 @@ #define USB_PRODUCT_DLINK2_AR9271 0x3a10 /* AR9271 */ #define USB_PRODUCT_DLINK2_DWLG122C1 0x3c03 /* DWL-G122 rev C1 */ #define USB_PRODUCT_DLINK2_WUA1340 0x3c04 /* WUA-1340 */ +#define USB_PRODUCT_DLINK2_DUBE100B1 0x3c05 /* DUB-E100 rev B1 */ #define USB_PRODUCT_DLINK2_DWA111 0x3c06 /* DWA-111 */ #define USB_PRODUCT_DLINK2_DWA110 0x3c07 /* DWA-110 */ #define USB_PRODUCT_DLINK2_RT2870_1 0x3c09 /* RT2870 */ @@ -1433,6 +1477,7 @@ #define USB_PRODUCT_ELECOM_LDUSBLTX 0x4005 /* LD-USBL/TX */ #define USB_PRODUCT_ELECOM_WDC150SU2M 0x4008 /* WDC-150SU2M */ #define USB_PRODUCT_ELECOM_LDUSBTX2 0x400b /* LD-USB/TX */ +#define USB_PRODUCT_ELECOM_WDC433SU2M2 0x400e /* WDC-433SU2M2 */ #define USB_PRODUCT_ELECOM_LDUSB20 0x4010 /* LD-USB20 */ #define USB_PRODUCT_ELECOM_UCSGT 0x5003 /* UC-SGT serial adapter */ #define USB_PRODUCT_ELECOM_UCSGT0 0x5004 /* UC-SGT0 Serial */ @@ -1632,6 +1677,7 @@ #define USB_PRODUCT_GUILLEMOT_HWNUM300 0xe031 /* HWNUm-300 */ #define USB_PRODUCT_GUILLEMOT_HWGUN54 0xe032 /* HWGUn-54 */ #define USB_PRODUCT_GUILLEMOT_HWNUP150 0xe033 /* HWNUP-150 */ +#define USB_PRODUCT_GUILLEMOT_RTL8192CU 0xe035 /* RTL8192CU */ /* Hagiwara products */ #define USB_PRODUCT_HAGIWARA_FGSM 0x0002 /* FlashGate SmartMedia Card Reader */ @@ -1667,6 +1713,7 @@ #define USB_PRODUCT_HAWKING_RT2870_4 0x0017 /* RT2870 */ #define USB_PRODUCT_HAWKING_RT2870_5 0x0018 /* RT2870 */ #define USB_PRODUCT_HAWKING_RTL8192CU 0x0019 /* RTL8192CU */ +#define USB_PRODUCT_HAWKING_RTL8192CU_2 0x0020 /* RTL8192CU */ #define USB_PRODUCT_HAWKING_UF100 0x400c /* 10/100 USB Ethernet */ /* Hitachi, Ltd. products */ @@ -1735,6 +1782,7 @@ /* Huawei Technologies products */ #define USB_PRODUCT_HUAWEI_MOBILE 0x1001 /* Huawei Mobile */ #define USB_PRODUCT_HUAWEI_E220 0x1003 /* Huawei E220 */ +#define USB_PRODUCT_HUAWEI_U8150 0x1037 /* Huawei U8150 */ #define USB_PRODUCT_HUAWEI_EM770W 0x1404 /* Huawei EM770W */ #define USB_PRODUCT_HUAWEI_E1750 0x140c /* Huawei E1750 */ #define USB_PRODUCT_HUAWEI_E1750INIT 0x1446 /* Huawei E1750 USB CD */ @@ -1834,6 +1882,8 @@ #define USB_PRODUCT_IODATA_RT3072_2 0x0945 /* RT3072 */ #define USB_PRODUCT_IODATA_RT3072_3 0x0947 /* RT3072 */ #define USB_PRODUCT_IODATA_RT3072_4 0x0948 /* RT3072 */ +#define USB_PRODUCT_IODATA_WNG150UM 0x094c /* WN-G150UM */ +#define USB_PRODUCT_IODATA_RTL8192CU 0x0950 /* RTL8192CU */ #define USB_PRODUCT_IODATA_USBRSAQ 0x0a03 /* USB serial adapter USB-RSAQ1 */ #define USB_PRODUCT_IODATA_USBRSAQ5 0x0a0e /* USB serial adapter USB-RSAQ5 */ @@ -1960,8 +2010,9 @@ #define USB_PRODUCT_LACIE_CDRW 0xa602 /* CD R/W */ /* Lenovo products */ -#define USB_PRODUCT_LENOVO_ETHERNET 0x7203 /* USB 2.0 Ethernet */ #define USB_PRODUCT_LENOVO_AX88179 0x304b /* AX88179 USB 3.0 gigabit ethernet controller */ +#define USB_PRODUCT_LENOVO_COMPACTKBDWTP 0x6047 /* ThinkPad Compact USB keyboard with TrackPoint */ +#define USB_PRODUCT_LENOVO_ETHERNET 0x7203 /* USB 2.0 Ethernet */ /* Lexar products */ #define USB_PRODUCT_LEXAR_JUMPSHOT 0x0001 /* jumpSHOT CompactFlash Reader */ @@ -2008,6 +2059,7 @@ #define USB_PRODUCT_LOGITEC_RT2870_3 0x0164 /* RT2870 */ #define USB_PRODUCT_LOGITEC_LANW300NU2 0x0166 /* LAN-W300N/U2 */ #define USB_PRODUCT_LOGITEC_RT3020 0x0168 /* RT3020 */ +#define USB_PRODUCT_LOGITEC_LANW300NU2S 0x0169 /* LAN-W300N/U2S */ #define USB_PRODUCT_LOGITEC_LAN_W450ANU2E 0x016b /* LAN-W450ANU2E */ #define USB_PRODUCT_LOGITEC_LAN_W300ANU2 0x0170 /* LAN-W300AN/U2 */ @@ -2105,6 +2157,7 @@ #define USB_PRODUCT_MELCO_WLIUCG301N 0x016f /* WLI-UC-G301N */ #define USB_PRODUCT_MELCO_WLIUCGNM 0x01a2 /* WLI-UC-GNM */ #define USB_PRODUCT_MELCO_WLIUCGNM2T 0x01ee /* WLI-UC-GNM2T */ +#define USB_PRODUCT_MELCO_WIU2300D 0x0241 /* WI-U2-300D */ /* Merlin products */ #define USB_PRODUCT_MERLIN_V620 0x1110 /* Merlin V620 */ @@ -2174,8 +2227,11 @@ #define USB_PRODUCT_MICROSOFT_XBOX_CONTROLLER_S10 0x0285 /* Xbox Controller S (1.0) */ #define USB_PRODUCT_MICROSOFT_XBOX_CONTROLLER_HUB 0x0288 /* Xbox Controller Hub */ #define USB_PRODUCT_MICROSOFT_XBOX_CONTROLLER_S12 0x0289 /* Xbox Controller S (1.2) */ +#define USB_PRODUCT_MICROSOFT_XBOX_360_WIRELESS_RECEIVER 0x0291 /* Xbox 360 Wireless Receiver */ #define USB_PRODUCT_MICROSOFT_24GHZ_XCVR10 0x071d /* 2.4GHz Transceiver V1.0 */ #define USB_PRODUCT_MICROSOFT_24GHZ_XCVR20 0x071f /* 2.4GHz Transceiver V2.0 */ +#define USB_PRODUCT_MICROSOFT_CM6000 0x077d /* Comfort Mouse 6000 */ + /* Microtech products */ #define USB_PRODUCT_MICROTECH_SCSIDB25 0x0004 /* USB-SCSI-DB25 */ @@ -2227,12 +2283,13 @@ /* MosChip Semiconductor */ #define USB_PRODUCT_MOSCHIP_MCS7703 0x7703 /* MCS7703 USB Serial Adapter */ -#define USB_PRODUCT_MOSCHIP_MCS7780 0x7780 /* Fast IrDA Adapter */ -#define USB_PRODUCT_MOSCHIP_MCS7781 0x7781 /* Fast IrDA Adapter */ -#define USB_PRODUCT_MOSCHIP_MCS7784 0x7784 /* Slow IrDA Adapter */ +#define USB_PRODUCT_MOSCHIP_MCS7780 0x7780 /* MCS7780 Fast IrDA Adapter */ +#define USB_PRODUCT_MOSCHIP_MCS7781 0x7781 /* MCS7781 Fast IrDA Adapter */ +#define USB_PRODUCT_MOSCHIP_MCS7784 0x7784 /* MCS7784 Slow IrDA Adapter */ #define USB_PRODUCT_MOSCHIP_MCS7810 0x7810 /* MCS7810 USB Serial Adapter */ #define USB_PRODUCT_MOSCHIP_MCS7820 0x7820 /* MCS7820 USB Serial Adapter */ -#define USB_PRODUCT_MOSCHIP_MCS7830 0x7830 /* Ethernet Adapter */ +#define USB_PRODUCT_MOSCHIP_MCS7830 0x7830 /* MCS7830 Ethernet Adapter */ +#define USB_PRODUCT_MOSCHIP_MCS7832 0x7832 /* MCS7832 Ethernet Adapter */ #define USB_PRODUCT_MOSCHIP_MCS7840 0x7840 /* MCS7840 USB Serial Adapter */ /* Motorola products */ @@ -2294,6 +2351,7 @@ #define USB_PRODUCT_NETCHIP_TURBOCONNECT 0x1080 /* Turbo-Connect */ #define USB_PRODUCT_NETCHIP_CLIK40 0xa140 /* Clik! 40 */ #define USB_PRODUCT_NETCHIP_ETHERNETGADGET 0xa4a2 /* Linux Ethernet/RNDIS gadget on pxa210/25x/26x */ +#define USB_PRODUCT_NETCHIP_NET2270 0xa612 /* USB-IDE Bridge */ /* Netgear products */ #define USB_PRODUCT_NETGEAR_EA101 0x1001 /* Ethernet adapter */ @@ -2456,6 +2514,7 @@ #define USB_PRODUCT_PANASONIC_KXLCB20AN 0x0d0a /* CD-R Drive KXL-CB20AN */ #define USB_PRODUCT_PANASONIC_KXLCB35AN 0x0d0e /* DVD-ROM & CD-R/RW */ #define USB_PRODUCT_PANASONIC_SDCAAE 0x1b00 /* MultiMediaCard Adapter */ +#define USB_PRODUCT_PANASONIC_DMCFS45 0x2372 /* Lumix Camera DMC-FS45 */ #define USB_PRODUCT_PANASONIC_TYTP50P6S 0x3900 /* TY-TP50P6-S 50in Touch Panel */ /* PARA Industrial products */ @@ -2623,6 +2682,8 @@ /* Qualcomm products */ #define USB_PRODUCT_QUALCOMM_CDMA_MSM 0x6000 /* CDMA Technologies MSM phone */ +#define USB_PRODUCT_QUALCOMM_NTT_DOCOMO_L05A_MODEM 0x6124 /* NTT DOCOMO L-05A */ +#define USB_PRODUCT_QUALCOMM_NTT_DOCOMO_L05A_STORAGE 0x613a /* NTT DOCOMO L-05A */ #define USB_PRODUCT_QUALCOMM_NTT_DOCOMO_L02C_MODEM 0x618f /* NTT DOCOMO L-02C */ #define USB_PRODUCT_QUALCOMM_NTT_DOCOMO_L02C_STORAGE 0x61dd /* NTT DOCOMO L-02C */ #define USB_PRODUCT_QUALCOMM_MSM_HSDPA 0x6613 /* HSDPA MSM */ @@ -2657,7 +2718,9 @@ #define USB_PRODUCT_RALINK_RT3072 0x3072 /* RT3072 */ #define USB_PRODUCT_RALINK_RT3370 0x3370 /* RT3370 */ #define USB_PRODUCT_RALINK_RT3572 0x3572 /* RT3572 */ +#define USB_PRODUCT_RALINK_RT3573 0x3573 /* RT3573 */ #define USB_PRODUCT_RALINK_RT5370 0x5370 /* RT5370 */ +#define USB_PRODUCT_RALINK_RT5572 0x5572 /* RT5572 */ #define USB_PRODUCT_RALINK_MT7610U 0x7610 /* MT7610U */ #define USB_PRODUCT_RALINK_RT8070 0x8070 /* RT8070 */ #define USB_PRODUCT_RALINK_RT2570_3 0x9020 /* RT2570 */ @@ -2672,6 +2735,8 @@ #define USB_PRODUCT_REALTEK_RTL8188RU_2 0x317f /* RTL8188RU */ #define USB_PRODUCT_REALTEK_RTL8150L 0x8150 /* RTL8150L USB-Ethernet Bridge */ #define USB_PRODUCT_REALTEK_RTL8151 0x8151 /* RTL8151 PNA */ +#define USB_PRODUCT_REALTEK_RTL8152 0x8152 /* RTL8152 */ +#define USB_PRODUCT_REALTEK_RTL8153 0x8153 /* RTL8153 */ #define USB_PRODUCT_REALTEK_RTL8188CE_0 0x8170 /* RTL8188CE */ #define USB_PRODUCT_REALTEK_RTL8171 0x8171 /* RTL8171 */ #define USB_PRODUCT_REALTEK_RTL8172 0x8172 /* RTL8172 */ @@ -2686,9 +2751,11 @@ #define USB_PRODUCT_REALTEK_RTL8192CE 0x817c /* RTL8192CE */ #define USB_PRODUCT_REALTEK_RTL8188RU 0x817d /* RTL8188RU */ #define USB_PRODUCT_REALTEK_RTL8188CE_1 0x817e /* RTL8188CE */ +#define USB_PRODUCT_REALTEK_RTL8188RU_3 0x817f /* RTL8188RU */ #define USB_PRODUCT_REALTEK_RTL8187 0x8187 /* RTL8187 */ #define USB_PRODUCT_REALTEK_RTL8187B_0 0x8189 /* RTL8187B */ #define USB_PRODUCT_REALTEK_RTL8188CUS 0x818a /* RTL8188CUS */ +#define USB_PRODUCT_REALTEK_RTL8188CU_3 0x8191 /* RTL8188CU */ #define USB_PRODUCT_REALTEK_RTL8187B_1 0x8197 /* RTL8187B */ #define USB_PRODUCT_REALTEK_RTL8187B_2 0x8198 /* RTL8187B */ #define USB_PRODUCT_REALTEK_RTL8712 0x8712 /* RTL8712 */ @@ -2768,6 +2835,7 @@ #define USB_PRODUCT_SANDISK_SDDR09 0x0200 /* ImageMate SDDR-09 */ #define USB_PRODUCT_SANDISK_SDDR86 0x0621 /* ImageMate SDDR-86 */ #define USB_PRODUCT_SANDISK_SDDR75 0x0810 /* ImageMate SDDR-75 */ +#define USB_PRODUCT_SANDISK_CRUZER 0x5530 /* Cruzer */ #define USB_PRODUCT_SANDISK_SANSA_CLIP 0x7433 /* Sansa Clip */ /* Sanwa Supply products */ @@ -2916,6 +2984,7 @@ #define USB_PRODUCT_SILABS2_DCU11CLONE 0xaa26 /* DCU-11 clone */ #define USB_PRODUCT_SILABS_CP210X_1 0xea60 /* CP210x Serial */ #define USB_PRODUCT_SILABS_CP210X_2 0xea61 /* CP210x Serial */ +#define USB_PRODUCT_SILABS_EC3 0x8044 /* EC3 USB Debug Adapter */ /* Silicon Portals Inc. */ #define USB_PRODUCT_SILICONPORTALS_YAPPH_NF 0x0200 /* YAP Phone (no firmware) */ @@ -2952,6 +3021,7 @@ #define USB_PRODUCT_SITECOMEU_RT3072_3 0x0047 /* RT3072 */ #define USB_PRODUCT_SITECOMEU_RT3072_4 0x0048 /* RT3072 */ #define USB_PRODUCT_SITECOMEU_WL349V1 0x004b /* WL-349 v1 */ +#define USB_PRODUCT_SITECOMEU_RT3072_6 0x004d /* RT3072 */ #define USB_PRODUCT_SITECOMEU_WL349V4 0x0050 /* WL-349 v4 */ #define USB_PRODUCT_SITECOMEU_RT3070_1 0x0051 /* RT3070 */ #define USB_PRODUCT_SITECOMEU_RTL8188CU 0x0052 /* RTL8188CU */ @@ -2986,10 +3056,14 @@ /* SMSC products */ #define USB_PRODUCT_SMSC_2020HUB 0x2020 /* USB Hub */ +#define USB_PRODUCT_SMSC_2512HUB 0x2512 /* USB 2.0 2-Port Hub */ +#define USB_PRODUCT_SMSC_2513HUB 0x2513 /* USB 2.0 3-Port Hub */ +#define USB_PRODUCT_SMSC_2514HUB 0x2514 /* USB 2.0 4-Port Hub */ #define USB_PRODUCT_SMSC_LAN7500 0x7500 /* LAN7500 USB 2.0 gigabit ethernet device */ #define USB_PRODUCT_SMSC_SMSC9500 0x9500 /* SMSC9500 Ethernet device */ #define USB_PRODUCT_SMSC_SMSC9505 0x9505 /* SMSC9505 Ethernet device */ -#define USB_PRODUCT_SMSC_SMSC9512 0x9512 /* SMSC9512 USB Hub */ +#define USB_PRODUCT_SMSC_SMSC9512 0x9512 /* SMSC9512 USB Hub & Ethernet device */ +#define USB_PRODUCT_SMSC_SMSC9514 0x9514 /* SMSC9514 USB Hub & Ethernet device */ #define USB_PRODUCT_SMSC_LAN9530 0x9530 /* LAN9530 Ethernet Device */ #define USB_PRODUCT_SMSC_LAN9730 0x9730 /* LAN9730 Ethernet Device */ #define USB_PRODUCT_SMSC_SMSC9500_SAL10 0x9900 /* SMSC9500 Ethernet device (SAL10) */ @@ -3145,10 +3219,13 @@ #define USB_PRODUCT_TENX_MISSILE 0x0202 /* Missile Launcher */ #define USB_PRODUCT_TENX_TEMPER 0x660c /* TEMPer sensor */ -/* Texas Intel products */ +/* Texas Instruments products */ #define USB_PRODUCT_TI_UTUSB41 0x1446 /* UT-USB41 hub */ #define USB_PRODUCT_TI_TUSB2046 0x2046 /* TUSB2046 hub */ +#define USB_PRODUCT_TI_TUSB3410 0x3410 /* TUSB3410 */ #define USB_PRODUCT_TI_NEXII 0x5409 /* Nex II Digital */ +#define USB_PRODUCT_TI_MSP430_JTAG 0xf430 /* MSP-FET430UIF JTAG */ +#define USB_PRODUCT_TI_MSP430 0xf432 /* MSP-FET430UIF */ /* Thrustmaster products */ #define USB_PRODUCT_THRUST_FUSION_PAD 0xa0a3 /* Fusion Digital Gamepad */ @@ -3168,6 +3245,9 @@ #define USB_PRODUCT_TOSHIBA_AX88179 0x0a13 /* AX88179 USB 3.0 gigabit ethernet controller */ #define USB_PRODUCT_TOSHIBA_HSDPA_MODEM_EU870DT1 0x1302 /* HSDPA 3G Modem Card */ +/* TP-Link products */ +#define USB_PRODUCT_TPLINK_RTL8192CU 0x0100 /* RTL8192CU */ + /* Trek Technology products */ #define USB_PRODUCT_TREK_THUMBDRIVE 0x1111 /* ThumbDrive */ #define USB_PRODUCT_TREK_THUMBDRIVE_8MB 0x9988 /* ThumbDrive 8MB */ @@ -3240,6 +3320,14 @@ /* GNU Radio USRP */ #define USB_PRODUCT_USRP_USRPv2 0x0002 /* USRP Revision 2 */ +/* Validity */ +#define USB_PRODUCT_VALIDITY_VFS101 0x0001 /* VFS101 Fingerprint Reader */ +#define USB_PRODUCT_VALIDITY_VFS301 0x0005 /* VFS301 Fingerprint Reader */ +#define USB_PRODUCT_VALIDITY_VFS451 0x0007 /* VFS451 Fingerprint Reader */ +#define USB_PRODUCT_VALIDITY_VFS300 0x0008 /* VFS300 Fingerprint Reader */ +#define USB_PRODUCT_VALIDITY_VFS5011 0x0011 /* VFS5011 Fingerprint Reader */ +#define USB_PRODUCT_VALIDITY_VFS471 0x003c /* VFS471 Fingerprint Reader */ + /* VidzMedia products */ #define USB_PRODUCT_VIDZMEDIA_MONSTERTV 0x4fb1 /* MonsterTV P2H */ @@ -3305,6 +3393,7 @@ #define USB_PRODUCT_XIRLINK_PCCAM 0x8080 /* IBM PC Camera */ /* Conexant */ +#define USB_PRODUCT_CONEXANT_MODEM_1 0x1329 /* USB Modem */ #define USB_PRODUCT_CONEXANT_PRISM_GT_1 0x2000 /* PrismGT USB 2.0 WLAN */ #define USB_PRODUCT_CONEXANT_PRISM_GT_2 0x2002 /* PrismGT USB 2.0 WLAN */ @@ -3385,7 +3474,6 @@ /* ZyXEL Communication Co. products */ #define USB_PRODUCT_ZYXEL_OMNI56K 0x1500 /* Omni 56K Plus */ #define USB_PRODUCT_ZYXEL_980N 0x2011 /* Scorpion-980N keyboard */ -#define USB_PRODUCT_ZYXEL_G200V2 0x3407 /* G-200 v2 */ #define USB_PRODUCT_ZYXEL_ZYAIRG220 0x3401 /* ZyAIR G-220 */ #define USB_PRODUCT_ZYXEL_G200V2 0x3407 /* G-200 v2 */ #define USB_PRODUCT_ZYXEL_AG225H 0x3409 /* AG-225H */ Index: src/sys/dev/usb/usbdevs_data.h diff -u src/sys/dev/usb/usbdevs_data.h:1.673.2.4 src/sys/dev/usb/usbdevs_data.h:1.673.2.4.2.1 --- src/sys/dev/usb/usbdevs_data.h:1.673.2.4 Sun Oct 18 09:03:22 2015 +++ src/sys/dev/usb/usbdevs_data.h Wed Sep 7 08:20:24 2016 @@ -1,10 +1,10 @@ -/* $NetBSD: usbdevs_data.h,v 1.673.2.4 2015/10/18 09:03:22 martin Exp $ */ +/* ??? */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: usbdevs,v 1.680.2.4 2015/10/18 09:01:58 martin Exp + * NetBSD: usbdevs,v 1.680.2.4.2.1 2016/09/06 20:33:09 skrll Exp */ /* @@ -1075,6 +1075,10 @@ const struct usb_vendor usb_vendors[] = "STSN", }, { + USB_VENDOR_CENTURY, + "CENTURY Corporation", + }, + { USB_VENDOR_BEWAN, "Bewan", }, @@ -1751,6 +1755,10 @@ const struct usb_vendor usb_vendors[] = "Netgear", }, { + USB_VENDOR_VALIDITY, + "Validity Sensors, Inc.", + }, + { USB_VENDOR_BALTECH, "Baltech", }, @@ -2007,6 +2015,10 @@ const struct usb_vendor usb_vendors[] = "D-Link", }, { + USB_VENDOR_VIALABS, + "VIA Labs", + }, + { USB_VENDOR_ERICSSON, "Ericsson", }, @@ -2019,6 +2031,14 @@ const struct usb_vendor usb_vendors[] = "Pinnacle Systems", }, { + USB_VENDOR_ARDUINO, + "Arduino SA", + }, + { + USB_VENDOR_TPLINK, + "TP-Link", + }, + { USB_VENDOR_TRIPPLITE, "Tripp-Lite", }, @@ -2099,6 +2119,10 @@ const struct usb_vendor usb_vendors[] = "Zinwell", }, { + USB_VENDOR_INGENIC, + "Ingenic Semiconductor Ltd.", + }, + { USB_VENDOR_SITECOM, "Sitecom", }, @@ -2147,6 +2171,18 @@ const struct usb_vendor usb_vendors[] = "CACE Technologies", }, { + USB_VENDOR_COMPARE, + "Compare", + }, + { + USB_VENDOR_DATAAPEX, + "DataApex", + }, + { + USB_VENDOR_EVOLUTION, + "Evolution Robotics", + }, + { USB_VENDOR_EMPIA, "eMPIA Technology", }, @@ -2159,7 +2195,7 @@ const struct usb_vendor usb_vendors[] = "GNU Radio USRP", }, }; -const int usb_nvendors = 530; +const int usb_nvendors = 539; const struct usb_product usb_products[] = { { @@ -2907,10 +2943,38 @@ const struct usb_product usb_products[] "iPhone 3GS", }, { + USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_4, + "iPhone 4", + }, + { + USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_4_VZW, + "iPhone 4 (VZW)", + }, + { + USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_4S, + "iPhone 4S", + }, + { + USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_5, + "iPhone 5", + }, + { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPAD, "Apple iPad", }, { + USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPAD_2, + "Apple iPad 2", + }, + { + USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPAD_3, + "Apple iPad 3", + }, + { + USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPAD_MINI, + "Apple iPad Mini", + }, + { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_ETHERNET, "Apple USB to Ethernet", }, @@ -2919,8 +2983,32 @@ const struct usb_product usb_products[] "Bluetooth", }, { - USB_VENDOR_APPLE, USB_PRODUCT_APPLE_BLUETOOTH_HOST_C, - "Bluetooth USB Host Controller", + USB_VENDOR_APPLE, USB_PRODUCT_APPLE_BLUETOOTH_HOST_1, + "Bluetooth USB Host Controller MacBookPro 7,1", + }, + { + USB_VENDOR_APPLE, USB_PRODUCT_APPLE_BLUETOOTH_HOST_2, + "Bluetooth USB Host Controller iMac 11,1", + }, + { + USB_VENDOR_APPLE, USB_PRODUCT_APPLE_BLUETOOTH_HOST_3, + "Bluetooth USB Host Controller MacBookPro 8,2", + }, + { + USB_VENDOR_APPLE, USB_PRODUCT_APPLE_BLUETOOTH_HOST_4, + "Bluetooth USB Host Controller MacBookAir 3,1 3,2", + }, + { + USB_VENDOR_APPLE, USB_PRODUCT_APPLE_BLUETOOTH_HOST_5, + "Bluetooth USB Host Controller MacBookAir 4,1", + }, + { + USB_VENDOR_APPLE, USB_PRODUCT_APPLE_BLUETOOTH_HOST_6, + "Bluetooth USB Host Controller MacMini 5,1", + }, + { + USB_VENDOR_APPLE, USB_PRODUCT_APPLE_BLUETOOTH_HOST_7, + "Bluetooth USB Host Controller MacBookAir 6,1", }, { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_BLUETOOTH, @@ -3055,14 +3143,26 @@ const struct usb_product usb_products[] "RTL8192SU", }, { + USB_VENDOR_ASUSTEK, USB_PRODUCT_ASUSTEK_USBN53, + "USB-N53", + }, + { USB_VENDOR_ASUSTEK, USB_PRODUCT_ASUSTEK_RTL8192CU, "RTL8192CU", }, { + USB_VENDOR_ASUSTEK, USB_PRODUCT_ASUSTEK_USBN66, + "USB-N66", + }, + { USB_VENDOR_ASUSTEK, USB_PRODUCT_ASUSTEK_USBN10NANO, "USB-N10 Nano", }, { + USB_VENDOR_ASUSTEK, USB_PRODUCT_ASUSTEK_RTL8192CU_3, + "RTL8192CU_3", + }, + { USB_VENDOR_ASUSTEK, USB_PRODUCT_ASUSTEK_MYPAL_A730, "MyPal A730", }, @@ -3151,6 +3251,10 @@ const struct usb_product usb_products[] "AR3011", }, { + USB_VENDOR_ATHEROS2, USB_PRODUCT_ATHEROS2_AR3012, + "AR3012", + }, + { USB_VENDOR_ATHEROS2, USB_PRODUCT_ATHEROS2_AR9280, "AR9280+AR7010", }, @@ -3379,10 +3483,18 @@ const struct usb_product usb_products[] "UPS", }, { + USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_RTL8192CU_2, + "RTL8192CU", + }, + { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_RTL8188CU, "RTL8188CU", }, { + USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_RTL8188CUS, + "RTL8188CUS", + }, + { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U120, "F5U120-PC Hub", }, @@ -3391,6 +3503,14 @@ const struct usb_product usb_products[] "RTL8192CU", }, { + USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F7D2102, + "F7D2102", + }, + { + USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_RTL8192CU_1, + "RTL8192CU", + }, + { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_ZD1211B, "ZD1211B", }, @@ -3471,6 +3591,10 @@ const struct usb_product usb_products[] "F7D1101 v2", }, { + USB_VENDOR_CENTURY, USB_PRODUCT_CENTURY_CTUSB1HUB, + "CT-USB1HUB", + }, + { USB_VENDOR_BEWAN, USB_PRODUCT_BEWAN_BWIFI_USB54AR, "BWIFI-USB54AR", }, @@ -3651,6 +3775,10 @@ const struct usb_product usb_products[] "RTL8188CUS", }, { + USB_VENDOR_CHICONY, USB_PRODUCT_CHICONY_RTL8188CUS_6, + "RTL8188CUS", + }, + { USB_VENDOR_CHICONY2, USB_PRODUCT_CHICONY2_TWINKLECAM, "TwinkleCam USB camera", }, @@ -3759,6 +3887,10 @@ const struct usb_product usb_products[] "HNE-200 USB Ethernet adapter", }, { + USB_VENDOR_COMPARE, USB_PRODUCT_COMPARE_RTL8192CU, + "RTL8192CU", + }, + { USB_VENDOR_COMPOSITE, USB_PRODUCT_COMPOSITE_USBPS2, "USB to PS2 Adaptor", }, @@ -3927,8 +4059,8 @@ const struct usb_product usb_products[] "RT3070", }, { - USB_VENDOR_COREGA, USB_PRODUCT_COREGA_RTL8192SU, - "RTL8192SU", + USB_VENDOR_COREGA, USB_PRODUCT_COREGA_CGWLUSBNM, + "CG-WLUSBNM", }, { USB_VENDOR_COREGA, USB_PRODUCT_COREGA_RTL8192CU, @@ -4151,6 +4283,10 @@ const struct usb_product usb_products[] "Samsung U70", }, { + USB_VENDOR_DISPLAYLINK, USB_PRODUCT_DISPLAYLINK_POLARIS2, + "Polaris2 USB dock", + }, + { USB_VENDOR_DISPLAYLINK, USB_PRODUCT_DISPLAYLINK_VCUD60, "Rextron DVI", }, @@ -4235,6 +4371,14 @@ const struct usb_product usb_products[] "Logitec LDE-WX015U", }, { + USB_VENDOR_DISPLAYLINK, USB_PRODUCT_DISPLAYLINK_MIMO, + "DisplayLink MIMO", + }, + { + USB_VENDOR_DISPLAYLINK, USB_PRODUCT_DISPLAYLINK_PLUGABLE, + "Plugable docking station", + }, + { USB_VENDOR_DISPLAYLINK, USB_PRODUCT_DISPLAYLINK_LT1421WIDE, "Lenovo ThinkVision LT1421 Wide", }, @@ -4283,6 +4427,14 @@ const struct usb_product usb_products[] "RTL8192CU", }, { + USB_VENDOR_DLINK, USB_PRODUCT_DLINK_RTL8192CU_4, + "RTL8192CU", + }, + { + USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWA131B, + "DWA-131 rev B", + }, + { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWL122, "Wireless DWL122", }, @@ -4327,22 +4479,10 @@ const struct usb_product usb_products[] "AirPlus G Wireless USB Adapter", }, { - USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_DWLG122C1, - "DWL-G122 rev C1", - }, - { - USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_WUA1340, - "WUA-1340", - }, - { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DUBE100B1, "DUB-E100 rev B1", }, { - USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_DWA111, - "DWA-111", - }, - { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_RT2870, "RT2870", }, @@ -4351,6 +4491,22 @@ const struct usb_product usb_products[] "RT3072", }, { + USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWA140B3, + "DWA-140 rev B3", + }, + { + USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWA160B2, + "DWA-160 rev B2", + }, + { + USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWA127, + "DWA-127", + }, + { + USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWA162, + "DWA-162 Wireless Adapter", + }, + { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650C, "10Mbps ethernet adapter", }, @@ -4419,6 +4575,10 @@ const struct usb_product usb_products[] "WUA-1340", }, { + USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_DUBE100B1, + "DUB-E100 rev B1", + }, + { USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_DWA111, "DWA-111", }, @@ -4599,6 +4759,10 @@ const struct usb_product usb_products[] "LD-USB/TX", }, { + USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_WDC433SU2M2, + "WDC-433SU2M2", + }, + { USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSB20, "LD-USB20", }, @@ -5131,6 +5295,10 @@ const struct usb_product usb_products[] "HWNUP-150", }, { + USB_VENDOR_GUILLEMOT, USB_PRODUCT_GUILLEMOT_RTL8192CU, + "RTL8192CU", + }, + { USB_VENDOR_HAGIWARA, USB_PRODUCT_HAGIWARA_FGSM, "FlashGate SmartMedia Card Reader", }, @@ -5223,6 +5391,10 @@ const struct usb_product usb_products[] "RTL8192CU", }, { + USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_RTL8192CU_2, + "RTL8192CU", + }, + { USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_UF100, "10/100 USB Ethernet", }, @@ -5439,6 +5611,10 @@ const struct usb_product usb_products[] "Huawei E220", }, { + USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_U8150, + "Huawei U8150", + }, + { USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_EM770W, "Huawei EM770W", }, @@ -5743,6 +5919,14 @@ const struct usb_product usb_products[] "RT3072", }, { + USB_VENDOR_IODATA, USB_PRODUCT_IODATA_WNG150UM, + "WN-G150UM", + }, + { + USB_VENDOR_IODATA, USB_PRODUCT_IODATA_RTL8192CU, + "RTL8192CU", + }, + { USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBRSAQ, "USB serial adapter USB-RSAQ1", }, @@ -6071,14 +6255,18 @@ const struct usb_product usb_products[] "CD R/W", }, { - USB_VENDOR_LENOVO, USB_PRODUCT_LENOVO_ETHERNET, - "USB 2.0 Ethernet", - }, - { USB_VENDOR_LENOVO, USB_PRODUCT_LENOVO_AX88179, "AX88179 USB 3.0 gigabit ethernet controller", }, { + USB_VENDOR_LENOVO, USB_PRODUCT_LENOVO_COMPACTKBDWTP, + "ThinkPad Compact USB keyboard with TrackPoint", + }, + { + USB_VENDOR_LENOVO, USB_PRODUCT_LENOVO_ETHERNET, + "USB 2.0 Ethernet", + }, + { USB_VENDOR_LEXAR, USB_PRODUCT_LEXAR_JUMPSHOT, "jumpSHOT CompactFlash Reader", }, @@ -6223,6 +6411,10 @@ const struct usb_product usb_products[] "RT3020", }, { + USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_LANW300NU2S, + "LAN-W300N/U2S", + }, + { USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_LAN_W450ANU2E, "LAN-W450ANU2E", }, @@ -6531,6 +6723,10 @@ const struct usb_product usb_products[] "WLI-UC-GNM2T", }, { + USB_VENDOR_MELCO, USB_PRODUCT_MELCO_WIU2300D, + "WI-U2-300D", + }, + { USB_VENDOR_MERLIN, USB_PRODUCT_MERLIN_V620, "Merlin V620", }, @@ -6743,6 +6939,10 @@ const struct usb_product usb_products[] "Xbox Controller S (1.2)", }, { + USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_XBOX_360_WIRELESS_RECEIVER, + "Xbox 360 Wireless Receiver", + }, + { USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_24GHZ_XCVR10, "2.4GHz Transceiver V1.0", }, @@ -6751,6 +6951,10 @@ const struct usb_product usb_products[] "2.4GHz Transceiver V2.0", }, { + USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_CM6000, + "Comfort Mouse 6000", + }, + { USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_SCSIDB25, "USB-SCSI-DB25", }, @@ -6884,15 +7088,15 @@ const struct usb_product usb_products[] }, { USB_VENDOR_MOSCHIP, USB_PRODUCT_MOSCHIP_MCS7780, - "Fast IrDA Adapter", + "MCS7780 Fast IrDA Adapter", }, { USB_VENDOR_MOSCHIP, USB_PRODUCT_MOSCHIP_MCS7781, - "Fast IrDA Adapter", + "MCS7781 Fast IrDA Adapter", }, { USB_VENDOR_MOSCHIP, USB_PRODUCT_MOSCHIP_MCS7784, - "Slow IrDA Adapter", + "MCS7784 Slow IrDA Adapter", }, { USB_VENDOR_MOSCHIP, USB_PRODUCT_MOSCHIP_MCS7810, @@ -6904,7 +7108,11 @@ const struct usb_product usb_products[] }, { USB_VENDOR_MOSCHIP, USB_PRODUCT_MOSCHIP_MCS7830, - "Ethernet Adapter", + "MCS7830 Ethernet Adapter", + }, + { + USB_VENDOR_MOSCHIP, USB_PRODUCT_MOSCHIP_MCS7832, + "MCS7832 Ethernet Adapter", }, { USB_VENDOR_MOSCHIP, USB_PRODUCT_MOSCHIP_MCS7840, @@ -7071,6 +7279,10 @@ const struct usb_product usb_products[] "Linux Ethernet/RNDIS gadget on pxa210/25x/26x", }, { + USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_NET2270, + "USB-IDE Bridge", + }, + { USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_EA101, "Ethernet adapter", }, @@ -7547,6 +7759,10 @@ const struct usb_product usb_products[] "MultiMediaCard Adapter", }, { + USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_DMCFS45, + "Lumix Camera DMC-FS45", + }, + { USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_TYTP50P6S, "TY-TP50P6-S 50in Touch Panel", }, @@ -8015,6 +8231,14 @@ const struct usb_product usb_products[] "CDMA Technologies MSM phone", }, { + USB_VENDOR_QUALCOMM, USB_PRODUCT_QUALCOMM_NTT_DOCOMO_L05A_MODEM, + "NTT DOCOMO L-05A", + }, + { + USB_VENDOR_QUALCOMM, USB_PRODUCT_QUALCOMM_NTT_DOCOMO_L05A_STORAGE, + "NTT DOCOMO L-05A", + }, + { USB_VENDOR_QUALCOMM, USB_PRODUCT_QUALCOMM_NTT_DOCOMO_L02C_MODEM, "NTT DOCOMO L-02C", }, @@ -8103,10 +8327,18 @@ const struct usb_product usb_products[] "RT3572", }, { + USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT3573, + "RT3573", + }, + { USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT5370, "RT5370", }, { + USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT5572, + "RT5572", + }, + { USB_VENDOR_RALINK, USB_PRODUCT_RALINK_MT7610U, "MT7610U", }, @@ -8147,6 +8379,14 @@ const struct usb_product usb_products[] "RTL8151 PNA", }, { + USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8152, + "RTL8152", + }, + { + USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8153, + "RTL8153", + }, + { USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188CE_0, "RTL8188CE", }, @@ -8203,6 +8443,10 @@ const struct usb_product usb_products[] "RTL8188CE", }, { + USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188RU_3, + "RTL8188RU", + }, + { USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8187, "RTL8187", }, @@ -8215,6 +8459,10 @@ const struct usb_product usb_products[] "RTL8188CUS", }, { + USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188CU_3, + "RTL8188CU", + }, + { USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8187B_1, "RTL8187B", }, @@ -8475,6 +8723,10 @@ const struct usb_product usb_products[] "ImageMate SDDR-75", }, { + USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_CRUZER, + "Cruzer", + }, + { USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SANSA_CLIP, "Sansa Clip", }, @@ -8927,6 +9179,10 @@ const struct usb_product usb_products[] "CP210x Serial", }, { + USB_VENDOR_SILABS, USB_PRODUCT_SILABS_EC3, + "EC3 USB Debug Adapter", + }, + { USB_VENDOR_SILICONPORTALS, USB_PRODUCT_SILICONPORTALS_YAPPH_NF, "YAP Phone (no firmware)", }, @@ -9031,6 +9287,10 @@ const struct usb_product usb_products[] "WL-349 v1", }, { + USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3072_6, + "RT3072", + }, + { USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL349V4, "WL-349 v4", }, @@ -9135,6 +9395,18 @@ const struct usb_product usb_products[] "USB Hub", }, { + USB_VENDOR_SMSC, USB_PRODUCT_SMSC_2512HUB, + "USB 2.0 2-Port Hub", + }, + { + USB_VENDOR_SMSC, USB_PRODUCT_SMSC_2513HUB, + "USB 2.0 3-Port Hub", + }, + { + USB_VENDOR_SMSC, USB_PRODUCT_SMSC_2514HUB, + "USB 2.0 4-Port Hub", + }, + { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_LAN7500, "LAN7500 USB 2.0 gigabit ethernet device", }, @@ -9148,7 +9420,11 @@ const struct usb_product usb_products[] }, { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9512, - "SMSC9512 USB Hub", + "SMSC9512 USB Hub & Ethernet device", + }, + { + USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9514, + "SMSC9514 USB Hub & Ethernet device", }, { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_LAN9530, @@ -9555,10 +9831,22 @@ const struct usb_product usb_products[] "TUSB2046 hub", }, { + USB_VENDOR_TI, USB_PRODUCT_TI_TUSB3410, + "TUSB3410", + }, + { USB_VENDOR_TI, USB_PRODUCT_TI_NEXII, "Nex II Digital", }, { + USB_VENDOR_TI, USB_PRODUCT_TI_MSP430_JTAG, + "MSP-FET430UIF JTAG", + }, + { + USB_VENDOR_TI, USB_PRODUCT_TI_MSP430, + "MSP-FET430UIF", + }, + { USB_VENDOR_THRUST, USB_PRODUCT_THRUST_FUSION_PAD, "Fusion Digital Gamepad", }, @@ -9591,6 +9879,10 @@ const struct usb_product usb_products[] "HSDPA 3G Modem Card", }, { + USB_VENDOR_TPLINK, USB_PRODUCT_TPLINK_RTL8192CU, + "RTL8192CU", + }, + { USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE, "ThumbDrive", }, @@ -9743,6 +10035,30 @@ const struct usb_product usb_products[] "USRP Revision 2", }, { + USB_VENDOR_VALIDITY, USB_PRODUCT_VALIDITY_VFS101, + "VFS101 Fingerprint Reader", + }, + { + USB_VENDOR_VALIDITY, USB_PRODUCT_VALIDITY_VFS301, + "VFS301 Fingerprint Reader", + }, + { + USB_VENDOR_VALIDITY, USB_PRODUCT_VALIDITY_VFS451, + "VFS451 Fingerprint Reader", + }, + { + USB_VENDOR_VALIDITY, USB_PRODUCT_VALIDITY_VFS300, + "VFS300 Fingerprint Reader", + }, + { + USB_VENDOR_VALIDITY, USB_PRODUCT_VALIDITY_VFS5011, + "VFS5011 Fingerprint Reader", + }, + { + USB_VENDOR_VALIDITY, USB_PRODUCT_VALIDITY_VFS471, + "VFS471 Fingerprint Reader", + }, + { USB_VENDOR_VIDZMEDIA, USB_PRODUCT_VIDZMEDIA_MONSTERTV, "MonsterTV P2H", }, @@ -9895,6 +10211,10 @@ const struct usb_product usb_products[] "IBM PC Camera", }, { + USB_VENDOR_CONEXANT, USB_PRODUCT_CONEXANT_MODEM_1, + "USB Modem", + }, + { USB_VENDOR_CONEXANT, USB_PRODUCT_CONEXANT_PRISM_GT_1, "PrismGT USB 2.0 WLAN", }, @@ -10135,10 +10455,6 @@ const struct usb_product usb_products[] "Scorpion-980N keyboard", }, { - USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_G200V2, - "G-200 v2", - }, - { USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_ZYAIRG220, "ZyAIR G-220", }, @@ -10203,4 +10519,4 @@ const struct usb_product usb_products[] "Prestige", }, }; -const int usb_nproducts = 2010; +const int usb_nproducts = 2080;