From 7d053c92ba0dec1bbf3159e8558d5ea2dd628478 Mon Sep 17 00:00:00 2001 From: itohy Date: Fri, 22 Jun 2007 16:37:46 +0000 Subject: [PATCH] Regen from usbdevs rev 1.473. --- sys/dev/usb/usbdevs.h | 119 +++++++++++---------- sys/dev/usb/usbdevs_data.h | 212 ++++++++++++++++++------------------- 2 files changed, 163 insertions(+), 168 deletions(-) diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h index 62a412a94f84..518d8cd5a51a 100644 --- a/sys/dev/usb/usbdevs.h +++ b/sys/dev/usb/usbdevs.h @@ -1,10 +1,10 @@ -/* $NetBSD: usbdevs.h,v 1.473 2007/06/18 12:24:48 dsainty Exp $ */ +/* $NetBSD: usbdevs.h,v 1.474 2007/06/22 16:37:46 itohy Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: usbdevs,v 1.471 2007/06/18 12:24:04 dsainty Exp + * NetBSD: usbdevs,v 1.473 2007/06/22 16:32:38 itohy Exp */ /* @@ -436,7 +436,7 @@ #define USB_VENDOR_ACERCM 0x1189 /* Acer Communications & Multimedia */ #define USB_VENDOR_SIERRA 0x1199 /* Sierra Wireless */ #define USB_VENDOR_TOPFIELD 0x11db /* Topfield Co., Ltd */ -#define USB_VENDOR_PROLIFIC2 0x11f6 /* Prolific Technology */ +#define USB_VENDOR_NETINDEX 0x11f6 /* NetIndex */ #define USB_VENDOR_TSUNAMI 0x1241 /* Tsunami */ #define USB_VENDOR_TARGUS 0x1267 /* Targus */ #define USB_VENDOR_TWINMOS 0x126f /* TwinMOS */ @@ -614,14 +614,14 @@ #define USB_PRODUCT_AGFA_SNAPSCANE26 0x2097 /* SnapScan e26 */ #define USB_PRODUCT_AGFA_SNAPSCANE52 0x20fd /* SnapScan e52 */ -/* AirPrime products */ -#define USB_PRODUCT_AIRPRIME_PC5220 0x0112 /* CDMA Wireless PC Card */ +/* Aincomm products */ +#define USB_PRODUCT_AINCOMM_AWU2000B 0x1001 /* AWU2000B */ /* AIPTEK International products */ #define USB_PRODUCT_AIPTEK2_PENCAM_MEGA_1_3 0x504a /* PenCam Mega 1.3 */ -/* Aincomm products */ -#define USB_PRODUCT_AINCOMM_AWU2000B 0x1001 /* AWU2000B */ +/* AirPrime products */ +#define USB_PRODUCT_AIRPRIME_PC5220 0x0112 /* CDMA Wireless PC Card */ /* AKS products */ #define USB_PRODUCT_AKS_USBHASP 0x0001 /* USB-HASP 0.06 */ @@ -661,6 +661,9 @@ #define USB_PRODUCT_APPLE_EXT_KBD_HUB 0x1003 /* Hub in Apple Extended USB Keyboard */ #define USB_PRODUCT_APPLE_SPEAKERS 0x1101 /* Speakers */ +/* ArkMicroChips products */ +#define USB_PRODUCT_ARKMICROCHIPS_USBSERIAL 0x0232 /* USB-UART Controller */ + /* Asahi Optical products */ #define USB_PRODUCT_ASAHIOPTICAL_OPTIO230 0x0004 /* PENTAX Optio230 */ #define USB_PRODUCT_ASAHIOPTICAL_OPTIO330 0x0006 /* Digital camera */ @@ -710,12 +713,12 @@ /* Avision products */ #define USB_PRODUCT_AVISION_1200U 0x0268 /* 1200U scanner */ -/* B&B Electronics products */ -#define USB_PRODUCT_BBELECTRONICS_USOTL4 0xAC01 /* uLinks RS-422/485 */ - /* Baltech products */ #define USB_PRODUCT_BALTECH_CARDREADER 0x9999 /* Card reader */ +/* B&B Electronics products */ +#define USB_PRODUCT_BBELECTRONICS_USOTL4 0xAC01 /* uLinks RS-422/485 */ + /* Belkin products */ /*product BELKIN F5U111 0x???? F5U111 Ethernet adapter*/ #define USB_PRODUCT_BELKIN2_F5U002 0x0002 /* F5U002 Parallel printer adapter */ @@ -766,17 +769,17 @@ #define USB_PRODUCT_CANON_EOS300D 0x3084 /* EOS 300D / Digital Rebel */ #define USB_PRODUCT_CANON_SD630 0x30fe /* PowerShot SD630 */ +/* CASIO products */ +#define USB_PRODUCT_CASIO_QV 0x1001 /* QV DigitalCamera */ +#define USB_PRODUCT_CASIO_BE300 0x2002 /* BE-300 PDA */ +#define USB_PRODUCT_CASIO_NAMELAND 0x4001 /* CASIO Nameland EZ-USB */ + /* CATC products */ #define USB_PRODUCT_CATC_NETMATE 0x000a /* Netmate ethernet adapter */ #define USB_PRODUCT_CATC_NETMATE2 0x000c /* Netmate2 ethernet adapter */ #define USB_PRODUCT_CATC_CHIEF 0x000d /* USB Chief Bus & Protocol Analyzer */ #define USB_PRODUCT_CATC_ANDROMEDA 0x1237 /* Andromeda hub */ -/* CASIO products */ -#define USB_PRODUCT_CASIO_QV 0x1001 /* QV DigitalCamera */ -#define USB_PRODUCT_CASIO_BE300 0x2002 /* BE-300 PDA */ -#define USB_PRODUCT_CASIO_NAMELAND 0x4001 /* CASIO Nameland EZ-USB */ - /* CCYU Technology products */ #define USB_PRODUCT_CCYU_EASYDISK 0x2136 /* EasyDisk Portable Device */ @@ -918,12 +921,12 @@ #define USB_PRODUCT_DLINK_DSB650TX2 0x4102 /* 10/100 ethernet adapter */ #define USB_PRODUCT_DLINK_DSB650 0xabc1 /* 10/100 ethernet adapter */ +/* DMI products */ +#define USB_PRODUCT_DMI_SA2_0 0xb001 /* Storage Adapter */ + /* DrayTek products */ #define USB_PRODUCT_DRAYTEK_VIGOR550 0x0550 /* Vigor550 */ -/* Research In Motion */ -#define USB_PRODUCT_RIM_BLACKBERRY 0x0001 /* BlackBerry */ - /* Dynastream Innovations */ #define USB_PRODUCT_DYNASTREAM_ANTDEVBOARD 0x1003 /* ANT dev board */ @@ -932,9 +935,6 @@ #define USB_PRODUCT_EGALAX_TPANEL2 0x0002 /* Touch Panel */ #define USB_PRODUCT_EGALAX2_TPANEL 0x0001 /* Touch Panel */ -/* DMI products */ -#define USB_PRODUCT_DMI_SA2_0 0xb001 /* Storage Adapter */ - /* Eicon Networks */ #define USB_PRODUCT_EICON_DIVA852 0x4905 /* Diva 852 ISDN TA */ @@ -1528,6 +1528,11 @@ #define USB_PRODUCT_MOTOROLA2_T720C 0x2822 /* T720c */ #define USB_PRODUCT_MOTOROLA2_A920 0x4002 /* A920 */ +/* M-Systems products */ +#define USB_PRODUCT_MSYSTEMS_DISKONKEY 0x0010 /* DiskOnKey */ +#define USB_PRODUCT_MSYSTEMS_DISKONKEY2 0x0011 /* DiskOnKey */ +#define USB_PRODUCT_MSYSTEMS_DISKONKEY3 0x0012 /* DiskOnKey */ + /* MultiTech products */ #define USB_PRODUCT_MULTITECH_ATLAS 0xf101 /* MT5634ZBA-USB modem */ @@ -1544,11 +1549,6 @@ #define USB_PRODUCT_MUSTEK_MDC800 0xa800 /* MDC-800 digital camera */ #define USB_PRODUCT_MUSTEK_DV2000 0xc441 /* DV2000 digital camera */ -/* M-Systems products */ -#define USB_PRODUCT_MSYSTEMS_DISKONKEY 0x0010 /* DiskOnKey */ -#define USB_PRODUCT_MSYSTEMS_DISKONKEY2 0x0011 /* DiskOnKey */ -#define USB_PRODUCT_MSYSTEMS_DISKONKEY3 0x0012 /* DiskOnKey */ - /* National Instruments */ #define USB_PRODUCT_NI_GPIB_USB_A 0xc920 /* GPIB-USB-A */ @@ -1587,14 +1587,17 @@ #define USB_PRODUCT_NETGEAR2_MA101 0x4100 /* MA101 */ #define USB_PRODUCT_NETGEAR2_MA101B 0x4102 /* MA101 Rev B */ +/* NetIndex products */ +#define USB_PRODUCT_NETINDEX_WS002IN 0x2001 /* Willcom WS002IN (DD) */ + +/* NHJ product */ +#define USB_PRODUCT_NHJ_CAM2 0x9120 /* Camera */ + /* Nikon products */ #define USB_PRODUCT_NIKON_E990 0x0102 /* Digital Camera E990 */ #define USB_PRODUCT_NIKON_E880 0x0103 /* Digital Camera E880 */ #define USB_PRODUCT_NIKON_E885 0x0105 /* Digital Camera E885 */ -/* NHJ product */ -#define USB_PRODUCT_NHJ_CAM2 0x9120 /* Camera */ - /* Nokia products */ #define USB_PRODUCT_NOKIA_CA42 0x0802 /* Mobile Phone adapter */ @@ -1628,6 +1631,11 @@ #define USB_PRODUCT_ONSPEC2_8IN2 0xb012 /* 8In2 */ +/* Option N.V. products */ +#define USB_PRODUCT_OPTIONNV_MC3G 0x5000 /* Mobile Connect 3G datacard */ +#define USB_PRODUCT_OPTIONNV_QUADUMTS2 0x6000 /* GlobeTrotter Fusion Quad Lite UMTS/GPRS */ +#define USB_PRODUCT_OPTIONNV_QUADUMTS 0x6300 /* GlobeTrotter Fusion Quad Lite 3D */ + /* OQO */ #define USB_PRODUCT_OQO_WIFI01 0x0002 /* model 01 WiFi interface */ #define USB_PRODUCT_OQO_ETHER01 0x8150 /* model 01 Ethernet interface */ @@ -1759,7 +1767,6 @@ #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_PROLIFIC2_PL2303X 0x2001 /* Willcom WS002IN (DD) */ /* Putercom products */ #define USB_PRODUCT_PUTERCOM_UPA100 0x047e /* USB-1284 BRIDGE */ @@ -1793,11 +1800,17 @@ #define USB_PRODUCT_RALINK_RT2671 0x2671 /* RT2671 */ /* RATOC Systems products */ -#define USB_PRODUCT_RATOC_REXUSB60 0xb000 /* USB serial REX-USB60 */ +#define USB_PRODUCT_RATOC_REXUSB60 0xb000 /* USB serial adapter REX-USB60 */ /* Realtek products */ #define USB_PRODUCT_REALTEK_RTL8150L 0x8150 /* Realtek RTL8150L USB-Ethernet Bridge */ +/* Research In Motion */ +#define USB_PRODUCT_RIM_BLACKBERRY 0x0001 /* BlackBerry */ + +/* Rockfire products */ +#define USB_PRODUCT_ROCKFIRE_GAMEPAD 0x2033 /* gamepad 203USB */ + /* Roland products */ #define USB_PRODUCT_ROLAND_UA100 0x0000 /* UA-100 USB Audio I/F */ #define USB_PRODUCT_ROLAND_UM4 0x0002 /* UM-4 MIDI I/F */ @@ -1831,12 +1844,6 @@ #define USB_PRODUCT_ROLAND_UA1EX 0x0096 /* EDIROL UA-1EX */ #define USB_PRODUCT_ROLAND_UM3 0x009A /* EDIROL UM-3 */ -/* Rockfire products */ -#define USB_PRODUCT_ROCKFIRE_GAMEPAD 0x2033 /* gamepad 203USB */ - -/* RATOC Systems products */ -#define USB_PRODUCT_RATOC_REXUSB60 0xb000 /* USB serial adapter REX-USB60 */ - /* Sagem products */ #define USB_PRODUCT_SAGEM_XG760A 0x004a /* XG-760A */ #define USB_PRODUCT_SAGEM_XG76NA 0x0062 /* XG-76NA */ @@ -1873,9 +1880,6 @@ /* Senao products */ #define USB_PRODUCT_SENAO_NUB8301 0x2000 /* NUB-8301 */ -/* ArkMicroChips products */ -#define USB_PRODUCT_ARKMICROCHIPS_USBSERIAL 0x0232 /* USB-UART Controller */ - /* SGI products */ #define USB_PRODUCT_SGI_SN1_L1_SC 0x1234 /* SN1 L1 System Controller */ @@ -1952,12 +1956,12 @@ #define USB_PRODUCT_SILICONPORTALS_YAPPH_NF 0x0200 /* YAP Phone (no firmware) */ #define USB_PRODUCT_SILICONPORTALS_YAPPHONE 0x0201 /* YAP Phone */ -/* Sirius Technologies products */ -#define USB_PRODUCT_SIRIUS_ROADSTER 0x0001 /* NetComm Roadster II 56 USB */ - /* Silicon Integrated Systems products */ #define USB_PRODUCT_SIS_SIS_163U 0x0163 /* 802.11g Wireless LAN Adapter */ +/* Sirius Technologies products */ +#define USB_PRODUCT_SIRIUS_ROADSTER 0x0001 /* NetComm Roadster II 56 USB */ + /* Sitecom products */ #define USB_PRODUCT_SITECOM_LN029 0x182d /* LN029 */ #define USB_PRODUCT_SITECOM_CN104 0x2068 /* CN104 serial */ @@ -2039,6 +2043,13 @@ /* XXX The above is a North American PC style keyboard possibly */ #define USB_PRODUCT_SUN_MOUSE 0x0100 /* Type 6 USB mouse */ +/* Supra products */ +#define USB_PRODUCT_DIAMOND2_SUPRAEXPRESS56K 0x07da /* Supra Express 56K modem */ +#define USB_PRODUCT_DIAMOND2_SUPRA2890 0x0b4a /* SupraMax 2890 56K Modem */ +#define USB_PRODUCT_DIAMOND2_RIO600USB 0x5001 /* Rio 600 USB */ +#define USB_PRODUCT_DIAMOND2_RIO800USB 0x5002 /* Rio 800 USB */ +#define USB_PRODUCT_DIAMOND2_PSAPLAY120 0x5003 /* Nike psa[play 120 */ + /* Surecom Technology products */ #define USB_PRODUCT_SURECOM_EP9001G 0x11f3 /* EP-9001-g */ #define USB_PRODUCT_SURECOM_RT2573 0x31f3 /* RT2573 */ @@ -2052,13 +2063,6 @@ /* System TALKS, Inc. */ #define USB_PRODUCT_SYSTEMTALKS_SGCX2UL 0x1920 /* SGC-X2UL */ -/* Supra products */ -#define USB_PRODUCT_DIAMOND2_SUPRAEXPRESS56K 0x07da /* Supra Express 56K modem */ -#define USB_PRODUCT_DIAMOND2_SUPRA2890 0x0b4a /* SupraMax 2890 56K Modem */ -#define USB_PRODUCT_DIAMOND2_RIO600USB 0x5001 /* Rio 600 USB */ -#define USB_PRODUCT_DIAMOND2_RIO800USB 0x5002 /* Rio 800 USB */ -#define USB_PRODUCT_DIAMOND2_PSAPLAY120 0x5003 /* Nike psa[play 120 */ - /* Tangtop products */ #define USB_PRODUCT_TANGTOP_USBPS2 0x0001 /* USBPS2 */ @@ -2178,11 +2182,6 @@ /* Vivitar products */ #define USB_PRODUCT_VIVITAR_DSC350 0x0003 /* DSC350 Camera */ -/* Option N.V. products */ -#define USB_PRODUCT_OPTIONNV_MC3G 0x5000 /* Mobile Connect 3G datacard */ -#define USB_PRODUCT_OPTIONNV_QUADUMTS2 0x6000 /* GlobeTrotter Fusion Quad Lite UMTS/GPRS */ -#define USB_PRODUCT_OPTIONNV_QUADUMTS 0x6300 /* GlobeTrotter Fusion Quad Lite 3D */ - /* VTech products */ #define USB_PRODUCT_VTECH_RT2570 0x3012 /* RT2570 */ #define USB_PRODUCT_VTECH_ZD1211B 0x3014 /* ZD1211B */ @@ -2203,9 +2202,6 @@ #define USB_PRODUCT_XIRLINK_IMAGING 0x800d /* IMAGING DEVICE */ #define USB_PRODUCT_XIRLINK_PCCAM 0x8080 /* IBM PC Camera */ -/* Y-E Data products */ -#define USB_PRODUCT_YEDATA_FLASHBUSTERU 0x0000 /* Flashbuster-U */ - /* Yamaha products */ #define USB_PRODUCT_YAMAHA_UX256 0x1000 /* UX256 MIDI I/F */ #define USB_PRODUCT_YAMAHA_MU1000 0x1001 /* MU1000 MIDI Synth. */ @@ -2229,14 +2225,17 @@ /* Yano products */ #define USB_PRODUCT_YANO_U640MO 0x0101 /* U640MO-03 */ -/* Zeevo, Inc. products */ -#define USB_PRODUCT_ZEEVO_BLUETOOTH 0x07d0 /* BT-500 Bluetooth USB Adapter */ +/* Y-E Data products */ +#define USB_PRODUCT_YEDATA_FLASHBUSTERU 0x0000 /* Flashbuster-U */ /* Z-Com products */ #define USB_PRODUCT_ZCOM_725 0x0002 /* 725/726 Prism2.5 WLAN */ #define USB_PRODUCT_ZCOM_ZD1211 0x0011 /* ZD1211 */ #define USB_PRODUCT_ZCOM_ZD1211B 0x001a /* ZD1211B */ +/* Zeevo, Inc. products */ +#define USB_PRODUCT_ZEEVO_BLUETOOTH 0x07d0 /* BT-500 Bluetooth USB Adapter */ + /* Zinwell products */ #define USB_PRODUCT_ZINWELL_ZWXG261 0x0260 /* ZWX-G261 */ diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h index 64eeeeea892e..597268304548 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.474 2007/06/18 12:24:48 dsainty Exp $ */ +/* $NetBSD: usbdevs_data.h,v 1.475 2007/06/22 16:37:46 itohy Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: usbdevs,v 1.471 2007/06/18 12:24:04 dsainty Exp + * NetBSD: usbdevs,v 1.473 2007/06/22 16:32:38 itohy Exp */ /* @@ -1518,8 +1518,8 @@ const struct usb_vendor usb_vendors[] = { "Topfield Co., Ltd", }, { - USB_VENDOR_PROLIFIC2, - "Prolific Technology", + USB_VENDOR_NETINDEX, + "NetIndex", }, { USB_VENDOR_TSUNAMI, @@ -2082,16 +2082,16 @@ const struct usb_product usb_products[] = { "SnapScan e52", }, { - USB_VENDOR_AIRPRIME, USB_PRODUCT_AIRPRIME_PC5220, - "CDMA Wireless PC Card", + USB_VENDOR_AINCOMM, USB_PRODUCT_AINCOMM_AWU2000B, + "AWU2000B", }, { USB_VENDOR_AIPTEK2, USB_PRODUCT_AIPTEK2_PENCAM_MEGA_1_3, "PenCam Mega 1.3", }, { - USB_VENDOR_AINCOMM, USB_PRODUCT_AINCOMM_AWU2000B, - "AWU2000B", + USB_VENDOR_AIRPRIME, USB_PRODUCT_AIRPRIME_PC5220, + "CDMA Wireless PC Card", }, { USB_VENDOR_AKS, USB_PRODUCT_AKS_USBHASP, @@ -2169,6 +2169,10 @@ const struct usb_product usb_products[] = { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_SPEAKERS, "Speakers", }, + { + USB_VENDOR_ARKMICROCHIPS, USB_PRODUCT_ARKMICROCHIPS_USBSERIAL, + "USB-UART Controller", + }, { USB_VENDOR_ASAHIOPTICAL, USB_PRODUCT_ASAHIOPTICAL_OPTIO230, "PENTAX Optio230", @@ -2277,14 +2281,14 @@ const struct usb_product usb_products[] = { USB_VENDOR_AVISION, USB_PRODUCT_AVISION_1200U, "1200U scanner", }, - { - USB_VENDOR_BBELECTRONICS, USB_PRODUCT_BBELECTRONICS_USOTL4, - "uLinks RS-422/485", - }, { USB_VENDOR_BALTECH, USB_PRODUCT_BALTECH_CARDREADER, "Card reader", }, + { + USB_VENDOR_BBELECTRONICS, USB_PRODUCT_BBELECTRONICS_USOTL4, + "uLinks RS-422/485", + }, { USB_VENDOR_BELKIN2, USB_PRODUCT_BELKIN2_F5U002, "F5U002 Parallel printer adapter", @@ -2433,6 +2437,18 @@ const struct usb_product usb_products[] = { USB_VENDOR_CANON, USB_PRODUCT_CANON_SD630, "PowerShot SD630", }, + { + USB_VENDOR_CASIO, USB_PRODUCT_CASIO_QV, + "QV DigitalCamera", + }, + { + USB_VENDOR_CASIO, USB_PRODUCT_CASIO_BE300, + "BE-300 PDA", + }, + { + USB_VENDOR_CASIO, USB_PRODUCT_CASIO_NAMELAND, + "CASIO Nameland EZ-USB", + }, { USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE, "Netmate ethernet adapter", @@ -2449,18 +2465,6 @@ const struct usb_product usb_products[] = { USB_VENDOR_CATC, USB_PRODUCT_CATC_ANDROMEDA, "Andromeda hub", }, - { - USB_VENDOR_CASIO, USB_PRODUCT_CASIO_QV, - "QV DigitalCamera", - }, - { - USB_VENDOR_CASIO, USB_PRODUCT_CASIO_BE300, - "BE-300 PDA", - }, - { - USB_VENDOR_CASIO, USB_PRODUCT_CASIO_NAMELAND, - "CASIO Nameland EZ-USB", - }, { USB_VENDOR_CCYU, USB_PRODUCT_CCYU_EASYDISK, "EasyDisk Portable Device", @@ -2806,12 +2810,12 @@ const struct usb_product usb_products[] = { "10/100 ethernet adapter", }, { - USB_VENDOR_DRAYTEK, USB_PRODUCT_DRAYTEK_VIGOR550, - "Vigor550", + USB_VENDOR_DMI, USB_PRODUCT_DMI_SA2_0, + "Storage Adapter", }, { - USB_VENDOR_RIM, USB_PRODUCT_RIM_BLACKBERRY, - "BlackBerry", + USB_VENDOR_DRAYTEK, USB_PRODUCT_DRAYTEK_VIGOR550, + "Vigor550", }, { USB_VENDOR_DYNASTREAM, USB_PRODUCT_DYNASTREAM_ANTDEVBOARD, @@ -2829,10 +2833,6 @@ const struct usb_product usb_products[] = { USB_VENDOR_EGALAX2, USB_PRODUCT_EGALAX2_TPANEL, "Touch Panel", }, - { - USB_VENDOR_DMI, USB_PRODUCT_DMI_SA2_0, - "Storage Adapter", - }, { USB_VENDOR_EICON, USB_PRODUCT_EICON_DIVA852, "Diva 852 ISDN TA", @@ -4485,6 +4485,18 @@ const struct usb_product usb_products[] = { USB_VENDOR_MOTOROLA2, USB_PRODUCT_MOTOROLA2_A920, "A920", }, + { + USB_VENDOR_MSYSTEMS, USB_PRODUCT_MSYSTEMS_DISKONKEY, + "DiskOnKey", + }, + { + USB_VENDOR_MSYSTEMS, USB_PRODUCT_MSYSTEMS_DISKONKEY2, + "DiskOnKey", + }, + { + USB_VENDOR_MSYSTEMS, USB_PRODUCT_MSYSTEMS_DISKONKEY3, + "DiskOnKey", + }, { USB_VENDOR_MULTITECH, USB_PRODUCT_MULTITECH_ATLAS, "MT5634ZBA-USB modem", @@ -4533,18 +4545,6 @@ const struct usb_product usb_products[] = { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_DV2000, "DV2000 digital camera", }, - { - USB_VENDOR_MSYSTEMS, USB_PRODUCT_MSYSTEMS_DISKONKEY, - "DiskOnKey", - }, - { - USB_VENDOR_MSYSTEMS, USB_PRODUCT_MSYSTEMS_DISKONKEY2, - "DiskOnKey", - }, - { - USB_VENDOR_MSYSTEMS, USB_PRODUCT_MSYSTEMS_DISKONKEY3, - "DiskOnKey", - }, { USB_VENDOR_NI, USB_PRODUCT_NI_GPIB_USB_A, "GPIB-USB-A", @@ -4637,6 +4637,14 @@ const struct usb_product usb_products[] = { USB_VENDOR_NETGEAR2, USB_PRODUCT_NETGEAR2_MA101B, "MA101 Rev B", }, + { + USB_VENDOR_NETINDEX, USB_PRODUCT_NETINDEX_WS002IN, + "Willcom WS002IN (DD)", + }, + { + USB_VENDOR_NHJ, USB_PRODUCT_NHJ_CAM2, + "Camera", + }, { USB_VENDOR_NIKON, USB_PRODUCT_NIKON_E990, "Digital Camera E990", @@ -4649,10 +4657,6 @@ const struct usb_product usb_products[] = { USB_VENDOR_NIKON, USB_PRODUCT_NIKON_E885, "Digital Camera E885", }, - { - USB_VENDOR_NHJ, USB_PRODUCT_NHJ_CAM2, - "Camera", - }, { USB_VENDOR_NOKIA, USB_PRODUCT_NOKIA_CA42, "Mobile Phone adapter", @@ -4733,6 +4737,18 @@ const struct usb_product usb_products[] = { USB_VENDOR_ONSPEC2, USB_PRODUCT_ONSPEC2_8IN2, "8In2", }, + { + USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_MC3G, + "Mobile Connect 3G datacard", + }, + { + USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_QUADUMTS2, + "GlobeTrotter Fusion Quad Lite UMTS/GPRS", + }, + { + USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_QUADUMTS, + "GlobeTrotter Fusion Quad Lite 3D", + }, { USB_VENDOR_OQO, USB_PRODUCT_OQO_WIFI01, "model 01 WiFi interface", @@ -5101,10 +5117,6 @@ const struct usb_product usb_products[] = { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2303X, "PL2303 Serial adapter (Pharos GPS)", }, - { - USB_VENDOR_PROLIFIC2, USB_PRODUCT_PROLIFIC2_PL2303X, - "Willcom WS002IN (DD)", - }, { USB_VENDOR_PUTERCOM, USB_PRODUCT_PUTERCOM_UPA100, "USB-1284 BRIDGE", @@ -5171,12 +5183,20 @@ const struct usb_product usb_products[] = { }, { USB_VENDOR_RATOC, USB_PRODUCT_RATOC_REXUSB60, - "USB serial REX-USB60", + "USB serial adapter REX-USB60", }, { USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8150L, "Realtek RTL8150L USB-Ethernet Bridge", }, + { + USB_VENDOR_RIM, USB_PRODUCT_RIM_BLACKBERRY, + "BlackBerry", + }, + { + USB_VENDOR_ROCKFIRE, USB_PRODUCT_ROCKFIRE_GAMEPAD, + "gamepad 203USB", + }, { USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UA100, "UA-100 USB Audio I/F", @@ -5301,14 +5321,6 @@ const struct usb_product usb_products[] = { USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UM3, "EDIROL UM-3", }, - { - USB_VENDOR_ROCKFIRE, USB_PRODUCT_ROCKFIRE_GAMEPAD, - "gamepad 203USB", - }, - { - USB_VENDOR_RATOC, USB_PRODUCT_RATOC_REXUSB60, - "USB serial adapter REX-USB60", - }, { USB_VENDOR_SAGEM, USB_PRODUCT_SAGEM_XG760A, "XG-760A", @@ -5381,10 +5393,6 @@ const struct usb_product usb_products[] = { USB_VENDOR_SENAO, USB_PRODUCT_SENAO_NUB8301, "NUB-8301", }, - { - USB_VENDOR_ARKMICROCHIPS, USB_PRODUCT_ARKMICROCHIPS_USBSERIAL, - "USB-UART Controller", - }, { USB_VENDOR_SGI, USB_PRODUCT_SGI_SN1_L1_SC, "SN1 L1 System Controller", @@ -5589,14 +5597,14 @@ const struct usb_product usb_products[] = { USB_VENDOR_SILICONPORTALS, USB_PRODUCT_SILICONPORTALS_YAPPHONE, "YAP Phone", }, - { - USB_VENDOR_SIRIUS, USB_PRODUCT_SIRIUS_ROADSTER, - "NetComm Roadster II 56 USB", - }, { USB_VENDOR_SIS, USB_PRODUCT_SIS_SIS_163U, "802.11g Wireless LAN Adapter", }, + { + USB_VENDOR_SIRIUS, USB_PRODUCT_SIRIUS_ROADSTER, + "NetComm Roadster II 56 USB", + }, { USB_VENDOR_SITECOM, USB_PRODUCT_SITECOM_LN029, "LN029", @@ -5805,26 +5813,6 @@ const struct usb_product usb_products[] = { USB_VENDOR_SUN, USB_PRODUCT_SUN_MOUSE, "Type 6 USB mouse", }, - { - USB_VENDOR_SURECOM, USB_PRODUCT_SURECOM_EP9001G, - "EP-9001-g", - }, - { - USB_VENDOR_SURECOM, USB_PRODUCT_SURECOM_RT2573, - "RT2573", - }, - { - USB_VENDOR_SUSTEEN, USB_PRODUCT_SUSTEEN_DCU10, - "USB Cable", - }, - { - USB_VENDOR_SWEEX, USB_PRODUCT_SWEEX_ZD1211, - "ZD1211", - }, - { - USB_VENDOR_SYSTEMTALKS, USB_PRODUCT_SYSTEMTALKS_SGCX2UL, - "SGC-X2UL", - }, { USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_SUPRAEXPRESS56K, "Supra Express 56K modem", @@ -5845,6 +5833,26 @@ const struct usb_product usb_products[] = { USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_PSAPLAY120, "Nike psa[play 120", }, + { + USB_VENDOR_SURECOM, USB_PRODUCT_SURECOM_EP9001G, + "EP-9001-g", + }, + { + USB_VENDOR_SURECOM, USB_PRODUCT_SURECOM_RT2573, + "RT2573", + }, + { + USB_VENDOR_SUSTEEN, USB_PRODUCT_SUSTEEN_DCU10, + "USB Cable", + }, + { + USB_VENDOR_SWEEX, USB_PRODUCT_SWEEX_ZD1211, + "ZD1211", + }, + { + USB_VENDOR_SYSTEMTALKS, USB_PRODUCT_SYSTEMTALKS_SGCX2UL, + "SGC-X2UL", + }, { USB_VENDOR_TANGTOP, USB_PRODUCT_TANGTOP_USBPS2, "USBPS2", @@ -6081,18 +6089,6 @@ const struct usb_product usb_products[] = { USB_VENDOR_VIVITAR, USB_PRODUCT_VIVITAR_DSC350, "DSC350 Camera", }, - { - USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_MC3G, - "Mobile Connect 3G datacard", - }, - { - USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_QUADUMTS2, - "GlobeTrotter Fusion Quad Lite UMTS/GPRS", - }, - { - USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_QUADUMTS, - "GlobeTrotter Fusion Quad Lite 3D", - }, { USB_VENDOR_VTECH, USB_PRODUCT_VTECH_RT2570, "RT2570", @@ -6141,10 +6137,6 @@ const struct usb_product usb_products[] = { USB_VENDOR_XIRLINK, USB_PRODUCT_XIRLINK_PCCAM, "IBM PC Camera", }, - { - USB_VENDOR_YEDATA, USB_PRODUCT_YEDATA_FLASHBUSTERU, - "Flashbuster-U", - }, { USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UX256, "UX256 MIDI I/F", @@ -6222,8 +6214,8 @@ const struct usb_product usb_products[] = { "U640MO-03", }, { - USB_VENDOR_ZEEVO, USB_PRODUCT_ZEEVO_BLUETOOTH, - "BT-500 Bluetooth USB Adapter", + USB_VENDOR_YEDATA, USB_PRODUCT_YEDATA_FLASHBUSTERU, + "Flashbuster-U", }, { USB_VENDOR_ZCOM, USB_PRODUCT_ZCOM_725, @@ -6237,6 +6229,10 @@ const struct usb_product usb_products[] = { USB_VENDOR_ZCOM, USB_PRODUCT_ZCOM_ZD1211B, "ZD1211B", }, + { + USB_VENDOR_ZEEVO, USB_PRODUCT_ZEEVO_BLUETOOTH, + "BT-500 Bluetooth USB Adapter", + }, { USB_VENDOR_ZINWELL, USB_PRODUCT_ZINWELL_ZWXG261, "ZWX-G261", @@ -6278,4 +6274,4 @@ const struct usb_product usb_products[] = { "G-220 v2", }, }; -const int usb_nproducts = 1123; +const int usb_nproducts = 1122;