diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h index e49a58167223..9461d6886ca7 100644 --- a/sys/dev/usb/usbdevs.h +++ b/sys/dev/usb/usbdevs.h @@ -1,10 +1,10 @@ -/* $NetBSD: usbdevs.h,v 1.475 2007/06/24 10:07:05 veego Exp $ */ +/* $NetBSD: usbdevs.h,v 1.476 2007/06/24 10:56:32 itohy Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: usbdevs,v 1.475 2007/06/24 10:02:45 veego Exp + * NetBSD: usbdevs,v 1.476 2007/06/24 10:43:23 itohy Exp */ /* @@ -142,9 +142,9 @@ #define USB_VENDOR_SCANLOGIC 0x04ce /* ScanLogic */ #define USB_VENDOR_MYSON 0x04cf /* Myson Technology */ #define USB_VENDOR_DIGI2 0x04d0 /* Digi */ -#define USB_VENDOR_HOLTEK 0x04d9 /* Holtek Semiconductor */ #define USB_VENDOR_ITTCANON 0x04d1 /* ITT Canon */ #define USB_VENDOR_ALTEC 0x04d2 /* Altec Lansing */ +#define USB_VENDOR_HOLTEK 0x04d9 /* Holtek Semiconductor */ #define USB_VENDOR_PANASONIC 0x04da /* Panasonic (Matsushita) */ #define USB_VENDOR_SHARP 0x04dd /* Sharp */ #define USB_VENDOR_IIYAMA 0x04e1 /* Iiyama */ @@ -230,12 +230,11 @@ #define USB_VENDOR_MACALLY 0x0618 /* Macally */ #define USB_VENDOR_ACTLABS 0x061c /* Act Labs */ #define USB_VENDOR_ALARIS 0x0620 /* Alaris */ -#define USB_VENDOR_CREATIVE3 0x062a /* Creative Labs */ #define USB_VENDOR_APEX 0x0624 /* Apex */ +#define USB_VENDOR_CREATIVE3 0x062a /* Creative Labs */ #define USB_VENDOR_VIVITAR 0x0636 /* Vivitar */ #define USB_VENDOR_AVISION 0x0638 /* Avision */ #define USB_VENDOR_TEAC 0x0644 /* TEAC */ -#define USB_VENDOR_ARKMICROCHIPS 0x6547 /* ArkMicroChips */ #define USB_VENDOR_SGI 0x065e /* Silicon Graphics */ #define USB_VENDOR_SANWASUPPLY 0x0663 /* Sanwa Supply */ #define USB_VENDOR_LINKSYS 0x066b /* Linksys */ @@ -402,8 +401,8 @@ #define USB_VENDOR_CHICONY2 0x0c45 /* Chicony Electronics */ #define USB_VENDOR_SEALEVEL 0x0c52 /* Sealevel System */ #define USB_VENDOR_LUWEN 0x0c76 /* EasyDisk */ -#define USB_VENDOR_ZCOM 0x0cde /* Z-Com */ #define USB_VENDOR_QUALCOMM_K 0x0c88 /* Qualcomm Kyocera */ +#define USB_VENDOR_ZCOM 0x0cde /* Z-Com */ #define USB_VENDOR_TANGTOP 0x0d3d /* Tangtop */ #define USB_VENDOR_SMC3 0x0d5c /* Standard Microsystems */ #define USB_VENDOR_PEN 0x0d7d /* Pen Drive */ @@ -431,12 +430,12 @@ #define USB_VENDOR_SILABS2 0x10a6 /* SILABS2 */ #define USB_VENDOR_USI 0x10ab /* USI */ #define USB_VENDOR_PLX 0x10b5 /* PLX */ -#define USB_VENDOR_SILABS 0x10c4 /* Silicon Labs */ #define USB_VENDOR_ASANTE 0x10bd /* Asante */ +#define USB_VENDOR_SILABS 0x10c4 /* Silicon Labs */ #define USB_VENDOR_JRC 0x1145 /* Japan Radio Company */ #define USB_VENDOR_SPHAIRON 0x114b /* Sphairon Access Systems GmbH */ -#define USB_VENDOR_SERVERWORKS 0x1166 /* ServerWorks */ #define USB_VENDOR_DELORME 0x1163 /* DeLorme */ +#define USB_VENDOR_SERVERWORKS 0x1166 /* ServerWorks */ #define USB_VENDOR_ACERCM 0x1189 /* Acer Communications & Multimedia */ #define USB_VENDOR_SIERRA 0x1199 /* Sierra Wireless */ #define USB_VENDOR_TOPFIELD 0x11db /* Topfield Co., Ltd */ @@ -489,10 +488,10 @@ #define USB_VENDOR_PLANEX 0x2c02 /* Planex Communications */ #define USB_VENDOR_VIDZMEDIA 0x3275 /* VidzMedia Pte Ltd */ #define USB_VENDOR_AEI 0x3334 /* AEI */ +#define USB_VENDOR_HANK 0x3353 /* Hank Connection */ #define USB_VENDOR_PQI 0x3538 /* PQI */ #define USB_VENDOR_DAISY 0x3579 /* Daisy Technology */ #define USB_VENDOR_NI 0x3923 /* National Instruments */ -#define USB_VENDOR_HANK 0x3353 /* Hank Connection */ #define USB_VENDOR_MICRONET 0x3980 /* Micronet Communications */ #define USB_VENDOR_IODATA2 0x40bb /* I-O Data */ #define USB_VENDOR_IRIVER 0x4102 /* iRiver */ @@ -502,6 +501,7 @@ #define USB_VENDOR_ONSPEC2 0x55aa /* OnSpec Electronic Inc. */ #define USB_VENDOR_ZINWELL 0x5a57 /* Zinwell */ #define USB_VENDOR_SITECOM 0x6189 /* Sitecom */ +#define USB_VENDOR_ARKMICROCHIPS 0x6547 /* ArkMicroChips */ #define USB_VENDOR_3COM2 0x6891 /* 3Com */ #define USB_VENDOR_INTEL 0x8086 /* Intel */ #define USB_VENDOR_MOSCHIP 0x9710 /* MosChip Semiconductor */ @@ -528,8 +528,8 @@ /* ACDC products */ #define USB_PRODUCT_ACDC_HUB 0x2315 /* USB Pen Drive HUB */ -#define USB_PRODUCT_ACDC_PEN 0x2317 /* USB Pen Drive with Secure Write */ #define USB_PRODUCT_ACDC_SECWRITE 0x2316 /* USB Pen Drive Secure Write */ +#define USB_PRODUCT_ACDC_PEN 0x2317 /* USB Pen Drive with Secure Write */ /* AboCom products */ #define USB_PRODUCT_ABOCOM_XX1 0x110c /* XX1 */ @@ -540,7 +540,6 @@ #define USB_PRODUCT_ABOCOM_XX4 0x4004 /* XX4 */ #define USB_PRODUCT_ABOCOM_XX5 0x4007 /* XX5 */ #define USB_PRODUCT_ABOCOM_XX6 0x400b /* XX6 */ -#define USB_PRODUCT_ABOCOM_RTL8151 0x401a /* RTL8151 */ #define USB_PRODUCT_ABOCOM_XX7 0x400c /* XX7 */ #define USB_PRODUCT_ABOCOM_LCS8138TX 0x401a /* LCS-8138TX */ #define USB_PRODUCT_ABOCOM_XX8 0x4102 /* XX8 */ @@ -713,11 +712,10 @@ #define USB_PRODUCT_ATMEL_UHB124 0x3301 /* UHB124 hub */ #define USB_PRODUCT_ATMEL_DWL900AP 0x5601 /* DWL-900AP Wireless access point */ #define USB_PRODUCT_ATMEL_DWL120 0x7602 /* DWL-120 Wireless adapter */ +#define USB_PRODUCT_ATMEL_AT76C503A 0x7603 /* AT76C503A */ #define USB_PRODUCT_ATMEL_BW002 0x7605 /* BW002 Wireless adapter */ -#define USB_PRODUCT_ATMEL_BW002 0x7605 /* BW002 */ #define USB_PRODUCT_ATMEL_WL1130 0x7613 /* WL-1130 */ #define USB_PRODUCT_ATMEL_AT76C505A 0x7614 /* AT76C505A */ -#define USB_PRODUCT_ATMEL_AT76C503A 0x7603 /* AT76C503A */ /* Audio-Technica products */ #define USB_PRODUCT_AUDIOTECHNICA_ATCHA4USB 0x0009 /* ATC-HA4USB USB headphone */ @@ -743,11 +741,11 @@ #define USB_PRODUCT_BELKIN_F5D6050 0x0050 /* F5D6050 802.11b Wireless adapter */ #define USB_PRODUCT_BELKIN_F5U103 0x0103 /* F5U103 Serial adapter */ #define USB_PRODUCT_BELKIN_F5U109 0x0109 /* F5U109 Serial adapter */ -#define USB_PRODUCT_BELKIN_F5U409 0x0409 /* F5U409 Serial */ #define USB_PRODUCT_BELKIN_SCSI 0x0115 /* SCSI Adaptor */ #define USB_PRODUCT_BELKIN_USB2LAN 0x0121 /* USB to LAN Converter */ #define USB_PRODUCT_BELKIN_F5U208 0x0208 /* F5U208 VideoBus II */ #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_F5U120 0x1203 /* F5U120-PC Hub */ #define USB_PRODUCT_BELKIN_ZD1211B 0x4050 /* ZD1211B */ @@ -827,10 +825,10 @@ #define USB_PRODUCT_CISCOLINKSYS_WUSB54G 0x000d /* WUSB54G Wireless-G USB Network Adapter */ #define USB_PRODUCT_CISCOLINKSYS_WUSB54GP 0x0011 /* WUSB54GP Wireless-G USB Network Adapter */ #define USB_PRODUCT_CISCOLINKSYS_USB200MV2 0x0018 /* USB200M v2 */ +#define USB_PRODUCT_CISCOLINKSYS_HU200TS 0x001a /* HU200-TS */ #define USB_PRODUCT_CISCOLINKSYS_WUSB54GC 0x0020 /* WUSB54GC */ #define USB_PRODUCT_CISCOLINKSYS_WUSB54GR 0x0023 /* WUSB54GR */ #define USB_PRODUCT_CISCOLINKSYS_WUSBF54G 0x0024 /* WUSBF54G */ -#define USB_PRODUCT_CISCOLINKSYS_HU200TS 0x001a /* HU200-TS */ /* Compaq products */ #define USB_PRODUCT_COMPAQ_IPAQPOCKETPC 0x0003 /* iPAQ PocketPC */ @@ -1366,9 +1364,9 @@ #define USB_PRODUCT_KYOCERA_AHK3001V 0x0203 /* AH-K3001V */ /* LaCie products */ +#define USB_PRODUCT_LACIE_PKTDRV 0x0211 /* PocketDrive */ #define USB_PRODUCT_LACIE_HD 0xa601 /* Hard Disk */ #define USB_PRODUCT_LACIE_CDRW 0xa602 /* CD R/W */ -#define USB_PRODUCT_LACIE_PKTDRV 0x0211 /* PocketDrive */ /* Lexar products */ #define USB_PRODUCT_LEXAR_JUMPSHOT 0x0001 /* jumpSHOT CompactFlash Reader */ @@ -1418,11 +1416,10 @@ #define USB_PRODUCT_LOGITECH_USBPS2MOUSE 0xc00e /* USB-PS/2 Optical Mouse */ #define USB_PRODUCT_LOGITECH_MUV55A 0xc016 /* M-UV55a */ #define USB_PRODUCT_LOGITECH_UN58A 0xc030 /* iFeel Mouse */ -#define USB_PRODUCT_LOGITECH_WMRPAD 0xc20a /* WingMan RumblePad */ -#define USB_PRODUCT_LOGITECH_WMFFGP 0xc293 /* WingMan Formula Force GP (GT-Force) */ #define USB_PRODUCT_LOGITECH_WMPAD 0xc208 /* WingMan GamePad Extreme */ #define USB_PRODUCT_LOGITECH_WMRPAD 0xc20a /* WingMan RumblePad */ #define USB_PRODUCT_LOGITECH_WMJOY 0xc281 /* WingMan Force joystick */ +#define USB_PRODUCT_LOGITECH_WMFFGP 0xc293 /* WingMan Formula Force GP (GT-Force) */ #define USB_PRODUCT_LOGITECH_BB13 0xc401 /* USB-PS/2 Trackball */ #define USB_PRODUCT_LOGITECH_BB18 0xc404 /* TrackMan Wheel */ #define USB_PRODUCT_LOGITECH_MARBLEMOUSE 0xc408 /* Marble Mouse */ @@ -1454,7 +1451,6 @@ /* Melco, Inc products */ #define USB_PRODUCT_MELCO_LUATX1 0x0001 /* LUA-TX Ethernet */ #define USB_PRODUCT_MELCO_LUATX5 0x0005 /* LUA-TX Ethernet */ -#define USB_PRODUCT_MELCO_NINWIFI 0x008b /* Nintendo Wi-Fi */ #define USB_PRODUCT_MELCO_LUA2TX5 0x0009 /* LUA2-TX Ethernet */ #define USB_PRODUCT_MELCO_LUAKTX 0x0012 /* LUA-KTX Ethernet */ #define USB_PRODUCT_MELCO_S11 0x0016 /* WLI-USB-S11 */ @@ -1466,6 +1462,7 @@ #define USB_PRODUCT_MELCO_KG54YB 0x005e /* WLI-U2-KG54-YB WLAN */ #define USB_PRODUCT_MELCO_KG54 0x0066 /* WLI-U2-KG54 WLAN */ #define USB_PRODUCT_MELCO_KG54AI 0x0067 /* WLI-U2-KG54-AI WLAN */ +#define USB_PRODUCT_MELCO_NINWIFI 0x008b /* Nintendo Wi-Fi */ #define USB_PRODUCT_MELCO_SG54HP 0x00d8 /* WLI-U2-SG54HP */ #define USB_PRODUCT_MELCO_G54HP 0x00d9 /* WLI-U2-G54HP */ #define USB_PRODUCT_MELCO_KG54L 0x00da /* WLI-U2-KG54L */ @@ -1748,13 +1745,13 @@ #define USB_PRODUCT_PLANEX_GW_US11H 0x14ea /* GW-US11H WLAN */ #define USB_PRODUCT_PLANEX2_GW_US11S 0x3220 /* GW-US11S WLAN */ #define USB_PRODUCT_PLANEX2_GWUS54HP 0xab01 /* GW-US54HP */ -#define USB_PRODUCT_PLANEX3_GWUS54GZ 0xab10 /* GW-US54GZ */ -#define USB_PRODUCT_PLANEX3_GU1000T 0xab11 /* GU-1000T */ -#define USB_PRODUCT_PLANEX3_GWUS54MINI 0xab13 /* GW-US54Mini */ #define USB_PRODUCT_PLANEX2_GWUS54MINI2 0xab50 /* GW-US54Mini2 */ #define USB_PRODUCT_PLANEX2_GWUS54SG 0xc002 /* GW-US54SG */ #define USB_PRODUCT_PLANEX2_GWUS54GZL 0xc007 /* GW-US54GZL */ #define USB_PRODUCT_PLANEX2_GWUSMM 0xed02 /* GW-USMM */ +#define USB_PRODUCT_PLANEX3_GWUS54GZ 0xab10 /* GW-US54GZ */ +#define USB_PRODUCT_PLANEX3_GU1000T 0xab11 /* GU-1000T */ +#define USB_PRODUCT_PLANEX3_GWUS54MINI 0xab13 /* GW-US54Mini */ /* Plantronics products */ #define USB_PRODUCT_PLANTRONICS_HEADSET 0x0ca1 /* Platronics DSP-400 Headset */ @@ -1800,12 +1797,12 @@ #define USB_PRODUCT_PROLIFIC_PL2301 0x0000 /* PL2301 Host-Host interface */ #define USB_PRODUCT_PROLIFIC_PL2302 0x0001 /* PL2302 Host-Host interface */ #define USB_PRODUCT_PROLIFIC_RSAQ2 0x04bb /* PL2303 Serial adapter (IODATA USB-RSAQ2) */ -#define USB_PRODUCT_PROLIFIC_RSAQ3 0xaaa2 /* PL2303 Serial adapter (IODATA USB-RSAQ3) */ #define USB_PRODUCT_PROLIFIC_PL2303 0x2303 /* PL2303 Serial adapter (ATEN/IOGEAR UC232A) */ #define USB_PRODUCT_PROLIFIC_PL2305 0x2305 /* Parallel printer adapter */ #define USB_PRODUCT_PROLIFIC_ATAPI4 0x2307 /* ATAPI-4 Bridge Controller */ #define USB_PRODUCT_PROLIFIC_PL2501 0x2501 /* PL2501 Host-Host interface */ #define USB_PRODUCT_PROLIFIC_PL2303X 0xaaa0 /* PL2303 Serial adapter (Pharos GPS) */ +#define USB_PRODUCT_PROLIFIC_RSAQ3 0xaaa2 /* PL2303 Serial adapter (IODATA USB-RSAQ3) */ /* Putercom products */ #define USB_PRODUCT_PUTERCOM_UPA100 0x047e /* USB-1284 BRIDGE */ @@ -1821,6 +1818,7 @@ #define USB_PRODUCT_QUALCOMM_CDMA_MSM 0x6000 /* CDMA Technologies MSM phone */ #define USB_PRODUCT_QUALCOMM2_CDMA_MSM 0x3196 /* CDMA Technologies MSM modem */ +/* Qualcomm Kyocera products */ #define USB_PRODUCT_QUALCOMM_K_CDMA_MSM_K 0x17da /* Qualcomm Kyocera CDMA Technologies MSM */ /* Quickshot products */ @@ -1832,11 +1830,11 @@ /* Ralink Technology products */ #define USB_PRODUCT_RALINK_RT2570 0x1706 /* RT2570 */ #define USB_PRODUCT_RALINK_RT2570_2 0x2570 /* RT2570 */ +#define USB_PRODUCT_RALINK_RT2573 0x2573 /* RT2573 */ +#define USB_PRODUCT_RALINK_RT2671 0x2671 /* RT2671 */ #define USB_PRODUCT_RALINK_RT2570_3 0x9020 /* RT2570 */ #define USB_PRODUCT_RALINK_2_RT2570 0x2570 /* RT2570 */ -#define USB_PRODUCT_RALINK_RT2573 0x2573 /* RT2573 */ #define USB_PRODUCT_RALINK_2_RT2573 0x2573 /* RT2573 */ -#define USB_PRODUCT_RALINK_RT2671 0x2671 /* RT2671 */ /* RATOC Systems products */ #define USB_PRODUCT_RATOC_REXUSB60 0xb000 /* USB serial adapter REX-USB60 */ @@ -1892,8 +1890,8 @@ #define USB_PRODUCT_SAITEK_CYBORG_3D_GOLD 0x0006 /* Cyborg 3D Gold Joystick */ /* Samsung products */ -#define USB_PRODUCT_SAMSUNG_ML6060 0x3008 /* ML-6060 laser printer */ #define USB_PRODUCT_SAMSUNG_MIGHTYDRIVE 0x1623 /* Mighty Drive */ +#define USB_PRODUCT_SAMSUNG_ML6060 0x3008 /* ML-6060 laser printer */ /* SanDisk products */ #define USB_PRODUCT_SANDISK_SDDR05A 0x0001 /* ImageMate SDDR-05a */ @@ -1901,8 +1899,8 @@ #define USB_PRODUCT_SANDISK_SDDR05 0x0005 /* ImageMate SDDR-05 */ #define USB_PRODUCT_SANDISK_SDDR12 0x0100 /* ImageMate SDDR-12 */ #define USB_PRODUCT_SANDISK_SDDR09 0x0200 /* ImageMate SDDR-09 */ -#define USB_PRODUCT_SANDISK_SDDR75 0x0810 /* ImageMate SDDR-75 */ #define USB_PRODUCT_SANDISK_SDDR86 0x0621 /* ImageMate SDDR-86 */ +#define USB_PRODUCT_SANDISK_SDDR75 0x0810 /* ImageMate SDDR-75 */ /* Sanwa Supply products */ #define USB_PRODUCT_SANWASUPPLY_JYDV9USB 0x9806 /* JY-DV9USB gamepad */ @@ -1961,8 +1959,8 @@ #define USB_PRODUCT_SIERRA_AIRCARD580 0x0112 /* Sierra Wireless AirCard 580 */ /* Sigmatel products */ -#define USB_PRODUCT_SIGMATEL_IRDA 0x4200 /* IrDA */ #define USB_PRODUCT_SIGMATEL_SIR4116 0x4116 /* StIR4116 SIR */ +#define USB_PRODUCT_SIGMATEL_IRDA 0x4200 /* IrDA */ #define USB_PRODUCT_SIGMATEL_FIR4210 0x4210 /* StIR4210 FIR */ #define USB_PRODUCT_SIGMATEL_VFIR4220 0x4220 /* StIR4220 VFIR */ #define USB_PRODUCT_SIGMATEL_I_BEAD100 0x8008 /* i-Bead 100 MP3 Player */ @@ -1973,8 +1971,8 @@ #define USB_PRODUCT_SIIG_UISDMC2S 0x0200 /* MULTICARDREADER */ #define USB_PRODUCT_SIIG_MULTICARDREADER 0x0201 /* MULTICARDREADER */ -#define USB_PRODUCT_SIIG2_US2308 0x0421 /* Serial */ #define USB_PRODUCT_SIIG2_USBTOETHER 0x0109 /* USB TO Ethernet */ +#define USB_PRODUCT_SIIG2_US2308 0x0421 /* Serial */ /* Silicom products */ #define USB_PRODUCT_SILICOM_U2E 0x0001 /* U2E */ @@ -2058,8 +2056,8 @@ #define USB_PRODUCT_SONY_CLIE_TJ25 0x0169 /* Sony Clie tj25 */ /* SOURCENEXT products */ -#define USB_PRODUCT_SOURCENEXT_KEIKAI8 0x039f /* KeikaiDenwa 8 */ #define USB_PRODUCT_SOURCENEXT_KEIKAI8_CHG 0x012e /* KeikaiDenwa 8 with charger */ +#define USB_PRODUCT_SOURCENEXT_KEIKAI8 0x039f /* KeikaiDenwa 8 */ /* Sphairon Access Systems GmbH products */ #define USB_PRODUCT_SPHAIRON_UB801R 0x0110 /* UB801R */ @@ -2180,9 +2178,9 @@ #define USB_PRODUCT_UMAX_ASTRA1236U 0x0002 /* Astra 1236U Scanner */ #define USB_PRODUCT_UMAX_ASTRA1220U 0x0010 /* Astra 1220U Scanner */ #define USB_PRODUCT_UMAX_ASTRA2000U 0x0030 /* Astra 2000U Scanner */ +#define USB_PRODUCT_UMAX_ASTRA3400 0x0060 /* Astra 3400 Scanner */ #define USB_PRODUCT_UMAX_ASTRA2100U 0x0130 /* Astra 2100U Scanner */ #define USB_PRODUCT_UMAX_ASTRA2200U 0x0230 /* Astra 2200U Scanner */ -#define USB_PRODUCT_UMAX_ASTRA3400 0x0060 /* Astra 3400 Scanner */ /* U-MEDIA Communications products */ #define USB_PRODUCT_UMEDIA_TEW429UB_A 0x300a /* TEW-429UB_A */ diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h index c9e5d101b4da..883655740f6c 100644 --- a/sys/dev/usb/usbdevs_data.h +++ b/sys/dev/usb/usbdevs_data.h @@ -1,10 +1,10 @@ -/* $NetBSD: usbdevs_data.h,v 1.476 2007/06/24 10:07:05 veego Exp $ */ +/* $NetBSD: usbdevs_data.h,v 1.477 2007/06/24 10:56:32 itohy Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: usbdevs,v 1.475 2007/06/24 10:02:45 veego Exp + * NetBSD: usbdevs,v 1.476 2007/06/24 10:43:23 itohy Exp */ /* @@ -341,10 +341,6 @@ const struct usb_vendor usb_vendors[] = { USB_VENDOR_DIGI2, "Digi", }, - { - USB_VENDOR_HOLTEK, - "Holtek Semiconductor", - }, { USB_VENDOR_ITTCANON, "ITT Canon", @@ -353,6 +349,10 @@ const struct usb_vendor usb_vendors[] = { USB_VENDOR_ALTEC, "Altec Lansing", }, + { + USB_VENDOR_HOLTEK, + "Holtek Semiconductor", + }, { USB_VENDOR_PANASONIC, "Panasonic (Matsushita)", @@ -693,14 +693,14 @@ const struct usb_vendor usb_vendors[] = { USB_VENDOR_ALARIS, "Alaris", }, - { - USB_VENDOR_CREATIVE3, - "Creative Labs", - }, { USB_VENDOR_APEX, "Apex", }, + { + USB_VENDOR_CREATIVE3, + "Creative Labs", + }, { USB_VENDOR_VIVITAR, "Vivitar", @@ -713,10 +713,6 @@ const struct usb_vendor usb_vendors[] = { USB_VENDOR_TEAC, "TEAC", }, - { - USB_VENDOR_ARKMICROCHIPS, - "ArkMicroChips", - }, { USB_VENDOR_SGI, "Silicon Graphics", @@ -1381,14 +1377,14 @@ const struct usb_vendor usb_vendors[] = { USB_VENDOR_LUWEN, "EasyDisk", }, - { - USB_VENDOR_ZCOM, - "Z-Com", - }, { USB_VENDOR_QUALCOMM_K, "Qualcomm Kyocera", }, + { + USB_VENDOR_ZCOM, + "Z-Com", + }, { USB_VENDOR_TANGTOP, "Tangtop", @@ -1497,14 +1493,14 @@ const struct usb_vendor usb_vendors[] = { USB_VENDOR_PLX, "PLX", }, - { - USB_VENDOR_SILABS, - "Silicon Labs", - }, { USB_VENDOR_ASANTE, "Asante", }, + { + USB_VENDOR_SILABS, + "Silicon Labs", + }, { USB_VENDOR_JRC, "Japan Radio Company", @@ -1513,14 +1509,14 @@ const struct usb_vendor usb_vendors[] = { USB_VENDOR_SPHAIRON, "Sphairon Access Systems GmbH", }, - { - USB_VENDOR_SERVERWORKS, - "ServerWorks", - }, { USB_VENDOR_DELORME, "DeLorme", }, + { + USB_VENDOR_SERVERWORKS, + "ServerWorks", + }, { USB_VENDOR_ACERCM, "Acer Communications & Multimedia", @@ -1729,6 +1725,10 @@ const struct usb_vendor usb_vendors[] = { USB_VENDOR_AEI, "AEI", }, + { + USB_VENDOR_HANK, + "Hank Connection", + }, { USB_VENDOR_PQI, "PQI", @@ -1741,10 +1741,6 @@ const struct usb_vendor usb_vendors[] = { USB_VENDOR_NI, "National Instruments", }, - { - USB_VENDOR_HANK, - "Hank Connection", - }, { USB_VENDOR_MICRONET, "Micronet Communications", @@ -1781,6 +1777,10 @@ const struct usb_vendor usb_vendors[] = { USB_VENDOR_SITECOM, "Sitecom", }, + { + USB_VENDOR_ARKMICROCHIPS, + "ArkMicroChips", + }, { USB_VENDOR_3COM2, "3Com", @@ -1853,14 +1853,14 @@ const struct usb_product usb_products[] = { USB_VENDOR_ACDC, USB_PRODUCT_ACDC_HUB, "USB Pen Drive HUB", }, - { - USB_VENDOR_ACDC, USB_PRODUCT_ACDC_PEN, - "USB Pen Drive with Secure Write", - }, { USB_VENDOR_ACDC, USB_PRODUCT_ACDC_SECWRITE, "USB Pen Drive Secure Write", }, + { + USB_VENDOR_ACDC, USB_PRODUCT_ACDC_PEN, + "USB Pen Drive with Secure Write", + }, { USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX1, "XX1", @@ -1893,10 +1893,6 @@ const struct usb_product usb_products[] = { USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX6, "XX6", }, - { - USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_RTL8151, - "RTL8151", - }, { USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX7, "XX7", @@ -2294,12 +2290,12 @@ const struct usb_product usb_products[] = { "DWL-120 Wireless adapter", }, { - USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_BW002, - "BW002 Wireless adapter", + USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C503A, + "AT76C503A", }, { USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_BW002, - "BW002", + "BW002 Wireless adapter", }, { USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_WL1130, @@ -2309,10 +2305,6 @@ const struct usb_product usb_products[] = { USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C505A, "AT76C505A", }, - { - USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C503A, - "AT76C503A", - }, { USB_VENDOR_AUDIOTECHNICA, USB_PRODUCT_AUDIOTECHNICA_ATCHA4USB, "ATC-HA4USB USB headphone", @@ -2353,10 +2345,6 @@ const struct usb_product usb_products[] = { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U109, "F5U109 Serial adapter", }, - { - USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U409, - "F5U409 Serial", - }, { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_SCSI, "SCSI Adaptor", @@ -2373,6 +2361,10 @@ const struct usb_product usb_products[] = { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U237, "F5U237 USB 2.0 7-Port Hub", }, + { + USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U409, + "F5U409 Serial", + }, { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_UPS, "UPS", @@ -2585,6 +2577,10 @@ const struct usb_product usb_products[] = { USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_USB200MV2, "USB200M v2", }, + { + USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_HU200TS, + "HU200-TS", + }, { USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSB54GC, "WUSB54GC", @@ -2597,10 +2593,6 @@ const struct usb_product usb_products[] = { USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSBF54G, "WUSBF54G", }, - { - USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_HU200TS, - "HU200-TS", - }, { USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQPOCKETPC, "iPAQ PocketPC", @@ -4001,6 +3993,10 @@ const struct usb_product usb_products[] = { USB_VENDOR_KYOCERA, USB_PRODUCT_KYOCERA_AHK3001V, "AH-K3001V", }, + { + USB_VENDOR_LACIE, USB_PRODUCT_LACIE_PKTDRV, + "PocketDrive", + }, { USB_VENDOR_LACIE, USB_PRODUCT_LACIE_HD, "Hard Disk", @@ -4009,10 +4005,6 @@ const struct usb_product usb_products[] = { USB_VENDOR_LACIE, USB_PRODUCT_LACIE_CDRW, "CD R/W", }, - { - USB_VENDOR_LACIE, USB_PRODUCT_LACIE_PKTDRV, - "PocketDrive", - }, { USB_VENDOR_LEXAR, USB_PRODUCT_LEXAR_JUMPSHOT, "jumpSHOT CompactFlash Reader", @@ -4169,14 +4161,6 @@ const struct usb_product usb_products[] = { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_UN58A, "iFeel Mouse", }, - { - USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMRPAD, - "WingMan RumblePad", - }, - { - USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMFFGP, - "WingMan Formula Force GP (GT-Force)", - }, { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMPAD, "WingMan GamePad Extreme", @@ -4189,6 +4173,10 @@ const struct usb_product usb_products[] = { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMJOY, "WingMan Force joystick", }, + { + USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMFFGP, + "WingMan Formula Force GP (GT-Force)", + }, { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_BB13, "USB-PS/2 Trackball", @@ -4265,10 +4253,6 @@ const struct usb_product usb_products[] = { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX5, "LUA-TX Ethernet", }, - { - USB_VENDOR_MELCO, USB_PRODUCT_MELCO_NINWIFI, - "Nintendo Wi-Fi", - }, { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUA2TX5, "LUA2-TX Ethernet", @@ -4313,6 +4297,10 @@ const struct usb_product usb_products[] = { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KG54AI, "WLI-U2-KG54-AI WLAN", }, + { + USB_VENDOR_MELCO, USB_PRODUCT_MELCO_NINWIFI, + "Nintendo Wi-Fi", + }, { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_SG54HP, "WLI-U2-SG54HP", @@ -5073,18 +5061,6 @@ const struct usb_product usb_products[] = { USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUS54HP, "GW-US54HP", }, - { - USB_VENDOR_PLANEX3, USB_PRODUCT_PLANEX3_GWUS54GZ, - "GW-US54GZ", - }, - { - USB_VENDOR_PLANEX3, USB_PRODUCT_PLANEX3_GU1000T, - "GU-1000T", - }, - { - USB_VENDOR_PLANEX3, USB_PRODUCT_PLANEX3_GWUS54MINI, - "GW-US54Mini", - }, { USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUS54MINI2, "GW-US54Mini2", @@ -5101,6 +5077,18 @@ const struct usb_product usb_products[] = { USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUSMM, "GW-USMM", }, + { + USB_VENDOR_PLANEX3, USB_PRODUCT_PLANEX3_GWUS54GZ, + "GW-US54GZ", + }, + { + USB_VENDOR_PLANEX3, USB_PRODUCT_PLANEX3_GU1000T, + "GU-1000T", + }, + { + USB_VENDOR_PLANEX3, USB_PRODUCT_PLANEX3_GWUS54MINI, + "GW-US54Mini", + }, { USB_VENDOR_PLANTRONICS, USB_PRODUCT_PLANTRONICS_HEADSET, "Platronics DSP-400 Headset", @@ -5209,10 +5197,6 @@ const struct usb_product usb_products[] = { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_RSAQ2, "PL2303 Serial adapter (IODATA USB-RSAQ2)", }, - { - USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_RSAQ3, - "PL2303 Serial adapter (IODATA USB-RSAQ3)", - }, { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2303, "PL2303 Serial adapter (ATEN/IOGEAR UC232A)", @@ -5233,6 +5217,10 @@ const struct usb_product usb_products[] = { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2303X, "PL2303 Serial adapter (Pharos GPS)", }, + { + USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_RSAQ3, + "PL2303 Serial adapter (IODATA USB-RSAQ3)", + }, { USB_VENDOR_PUTERCOM, USB_PRODUCT_PUTERCOM_UPA100, "USB-1284 BRIDGE", @@ -5277,6 +5265,14 @@ const struct usb_product usb_products[] = { USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570_2, "RT2570", }, + { + USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2573, + "RT2573", + }, + { + USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2671, + "RT2671", + }, { USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570_3, "RT2570", @@ -5285,18 +5281,10 @@ const struct usb_product usb_products[] = { USB_VENDOR_RALINK_2, USB_PRODUCT_RALINK_2_RT2570, "RT2570", }, - { - USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2573, - "RT2573", - }, { USB_VENDOR_RALINK_2, USB_PRODUCT_RALINK_2_RT2573, "RT2573", }, - { - USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2671, - "RT2671", - }, { USB_VENDOR_RATOC, USB_PRODUCT_RATOC_REXUSB60, "USB serial adapter REX-USB60", @@ -5453,14 +5441,14 @@ const struct usb_product usb_products[] = { USB_VENDOR_SAITEK, USB_PRODUCT_SAITEK_CYBORG_3D_GOLD, "Cyborg 3D Gold Joystick", }, - { - USB_VENDOR_SAMSUNG, USB_PRODUCT_SAMSUNG_ML6060, - "ML-6060 laser printer", - }, { USB_VENDOR_SAMSUNG, USB_PRODUCT_SAMSUNG_MIGHTYDRIVE, "Mighty Drive", }, + { + USB_VENDOR_SAMSUNG, USB_PRODUCT_SAMSUNG_ML6060, + "ML-6060 laser printer", + }, { USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR05A, "ImageMate SDDR-05a", @@ -5481,14 +5469,14 @@ const struct usb_product usb_products[] = { USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR09, "ImageMate SDDR-09", }, - { - USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR75, - "ImageMate SDDR-75", - }, { USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR86, "ImageMate SDDR-86", }, + { + USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR75, + "ImageMate SDDR-75", + }, { USB_VENDOR_SANWASUPPLY, USB_PRODUCT_SANWASUPPLY_JYDV9USB, "JY-DV9USB gamepad", @@ -5617,14 +5605,14 @@ const struct usb_product usb_products[] = { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD580, "Sierra Wireless AirCard 580", }, - { - USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_IRDA, - "IrDA", - }, { USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_SIR4116, "StIR4116 SIR", }, + { + USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_IRDA, + "IrDA", + }, { USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_FIR4210, "StIR4210 FIR", @@ -5653,14 +5641,14 @@ const struct usb_product usb_products[] = { USB_VENDOR_SIIG, USB_PRODUCT_SIIG_MULTICARDREADER, "MULTICARDREADER", }, - { - USB_VENDOR_SIIG2, USB_PRODUCT_SIIG2_US2308, - "Serial", - }, { USB_VENDOR_SIIG2, USB_PRODUCT_SIIG2_USBTOETHER, "USB TO Ethernet", }, + { + USB_VENDOR_SIIG2, USB_PRODUCT_SIIG2_US2308, + "Serial", + }, { USB_VENDOR_SILICOM, USB_PRODUCT_SILICOM_U2E, "U2E", @@ -5889,14 +5877,14 @@ const struct usb_product usb_products[] = { USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_TJ25, "Sony Clie tj25", }, - { - USB_VENDOR_SOURCENEXT, USB_PRODUCT_SOURCENEXT_KEIKAI8, - "KeikaiDenwa 8", - }, { USB_VENDOR_SOURCENEXT, USB_PRODUCT_SOURCENEXT_KEIKAI8_CHG, "KeikaiDenwa 8 with charger", }, + { + USB_VENDOR_SOURCENEXT, USB_PRODUCT_SOURCENEXT_KEIKAI8, + "KeikaiDenwa 8", + }, { USB_VENDOR_SPHAIRON, USB_PRODUCT_SPHAIRON_UB801R, "UB801R", @@ -6125,6 +6113,10 @@ const struct usb_product usb_products[] = { USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2000U, "Astra 2000U Scanner", }, + { + USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA3400, + "Astra 3400 Scanner", + }, { USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2100U, "Astra 2100U Scanner", @@ -6133,10 +6125,6 @@ const struct usb_product usb_products[] = { USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2200U, "Astra 2200U Scanner", }, - { - USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA3400, - "Astra 3400 Scanner", - }, { USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_TEW429UB_A, "TEW-429UB_A", @@ -6414,4 +6402,4 @@ const struct usb_product usb_products[] = { "Prestige", }, }; -const int usb_nproducts = 1152; +const int usb_nproducts = 1149;