Module Name: src
Committed By: riz
Date: Wed Oct 24 03:46:50 UTC 2012
Modified Files:
src/sys/dev/usb [netbsd-6]: usbdevs.h usbdevs_data.h
Log Message:
Regen for ticket 634.
To generate a diff of this commit:
cvs rdiff -u -r1.600.2.5 -r1.600.2.6 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.601.2.5 -r1.601.2.6 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.600.2.5 src/sys/dev/usb/usbdevs.h:1.600.2.6
--- src/sys/dev/usb/usbdevs.h:1.600.2.5 Tue Oct 23 20:01:41 2012
+++ src/sys/dev/usb/usbdevs.h Wed Oct 24 03:46:49 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdevs.h,v 1.600.2.5 2012/10/23 20:01:41 riz Exp $ */
+/* $NetBSD: usbdevs.h,v 1.600.2.6 2012/10/24 03:46:49 riz Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -191,6 +191,7 @@
#define USB_VENDOR_BAFO 0x0576 /* BAFO/Quality Computer Accessories */
#define USB_VENDOR_YEDATA 0x057b /* Y-E Data */
#define USB_VENDOR_AVM 0x057c /* AVM */
+#define USB_VENDOR_NINTENDO 0x057e /* Nintendo */
#define USB_VENDOR_QUICKSHOT 0x057f /* Quickshot */
#define USB_VENDOR_ROLAND 0x0582 /* Roland */
#define USB_VENDOR_ROCKFIRE 0x0583 /* Rockfire */
@@ -521,6 +522,7 @@
#define USB_VENDOR_MEINBERG 0x1938 /* Meinberg Funkuhren */
#define USB_VENDOR_QUALCOMMINC 0x19d2 /* Qualcomm, Incorporated */
#define USB_VENDOR_QUANTA 0x1a32 /* Quanta */
+#define USB_VENDOR_TERMINUS 0x1a40 /* Terminus Technology */
#define USB_VENDOR_WINCHIPHEAD2 0x1a86 /* QinHeng Electronics */
#define USB_VENDOR_MPMAN 0x1cae /* MPMan */
#define USB_VENDOR_4GSYSTEMS 0x1c9e /* 4G Systems */
@@ -556,6 +558,7 @@
#define USB_VENDOR_ONSPEC2 0x55aa /* OnSpec Electronic Inc. */
#define USB_VENDOR_ZINWELL 0x5a57 /* Zinwell */
#define USB_VENDOR_SITECOM 0x6189 /* Sitecom */
+#define USB_VENDOR_SPRINGERDESIGN 0x6400 /* Springer Design, Inc. */
#define USB_VENDOR_ARKMICROCHIPS 0x6547 /* ArkMicroChips */
#define USB_VENDOR_3COM2 0x6891 /* 3Com */
#define USB_VENDOR_EDIMAX 0x7392 /* EDIMAX */
@@ -699,6 +702,7 @@
/* ADS products */
#define USB_PRODUCT_ADS_UBS10BT 0x0008 /* UBS-10BT Ethernet */
#define USB_PRODUCT_ADS_UBS10BTX 0x0009 /* UBS-10BT Ethernet */
+#define USB_PRODUCT_ADS_RDX155 0xa155 /* InstantFM Music */
/* AEI products */
#define USB_PRODUCT_AEI_USBTOLAN 0x1701 /* AEI USB to Lan adapter */
@@ -807,12 +811,15 @@
#define USB_PRODUCT_APPLE_BLUETOOTH_HIDMODE 0x1000 /* Bluetooth HCI (HID-proxy mode) */
#define USB_PRODUCT_APPLE_EXT_KBD_HUB 0x1003 /* Hub in Apple Extended USB Keyboard */
#define USB_PRODUCT_APPLE_SPEAKERS 0x1101 /* Speakers */
+#define USB_PRODUCT_APPLE_SHUFFLE2 0x1301 /* iPod Shuffle (2nd generation) */
#define USB_PRODUCT_APPLE_IPHONE 0x1290 /* iPhone */
#define USB_PRODUCT_APPLE_IPOD_TOUCH 0x1291 /* iPod Touch */
+#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_IPAD 0x129a /* Apple iPad */
#define USB_PRODUCT_APPLE_ETHERNET 0x1402 /* Apple USB to Ethernet */
+#define USB_PRODUCT_APPLE_BLUETOOTH_HOST_C 0x821f /* Bluetooth USB Host Controller */
/* ArkMicroChips products */
#define USB_PRODUCT_ARKMICROCHIPS_USBSERIAL 0x0232 /* USB-UART Controller */
@@ -1365,8 +1372,10 @@
/* Future Technology Devices products */
#define USB_PRODUCT_FTDI_SERIAL_8U232AM 0x6001 /* 8U232AM Serial converter */
+#define USB_PRODUCT_FTDI_SERIAL_232RL 0x6006 /* FT232RL Serial converter */
#define USB_PRODUCT_FTDI_SERIAL_2232C 0x6010 /* 2232C USB dual FAST SERIAL ADAPTER */
#define USB_PRODUCT_FTDI_SERIAL_4232H 0x6011 /* 2232H USB quad FAST SERIAL ADAPTER */
+#define USB_PRODUCT_FTDI_SERIAL_232H 0x6014 /* C232HM USB Multipurpose UART */
#define USB_PRODUCT_FTDI_PS2KBDMS 0x8371 /* PS/2 Keyboard/Mouse */
#define USB_PRODUCT_FTDI_SERIAL_8U100AX 0x8372 /* 8U100AX Serial converter */
#define USB_PRODUCT_FTDI_OPENRD_JTAGKEY 0x9e90 /* OpenRD JTAGKey FT2232D B */
@@ -1568,6 +1577,7 @@
/* Huawei Technologies products */
#define USB_PRODUCT_HUAWEI_MOBILE 0x1001 /* Huawei Mobile */
#define USB_PRODUCT_HUAWEI_E220 0x1003 /* Huawei E220 */
+#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 */
#define USB_PRODUCT_HUAWEI_K3765 0x1465 /* Huawei K3765 */
@@ -1895,6 +1905,7 @@
#define USB_PRODUCT_MELCO_WLIUCAG300N 0x012e /* WLI-UC-AG300N */
#define USB_PRODUCT_MELCO_WLIUCG 0x0137 /* WLI-UC-G */
#define USB_PRODUCT_MELCO_WLIUCGN 0x015d /* WLI-UC-GN */
+#define USB_PRODUCT_MELCO_WLIUCGNM2T 0x01ee /* WLI-UC-GNM2T */
/* Merlin products */
#define USB_PRODUCT_MERLIN_V620 0x1110 /* Merlin V620 */
@@ -2107,6 +2118,13 @@
#define USB_PRODUCT_NIKON_E880 0x0103 /* Digital Camera E880 */
#define USB_PRODUCT_NIKON_E885 0x0105 /* Digital Camera E885 */
+/* Nintendo products */
+#define USB_PRODUCT_NINTENDO_BCM2045A 0x0305 /* Broadcom BCM2045A Bluetooth Radio */
+#define USB_PRODUCT_NINTENDO_RVLCNT01 0x0306 /* Wii Remote RVL-CNT-01 (BT-HID) */
+/* product NINTENDO WIIMIC1 0x0308 Wii Party-Mic */
+/* product NINTENDO WIIMIC2 0x0309 USB Microphone for Wii */
+#define USB_PRODUCT_NINTENDO_RVLCNT01TR 0x0330 /* Wii Remote Plus RVL-CNT-01-TR (BT-HID) */
+
/* Nokia products */
#define USB_PRODUCT_NOKIA_CA42 0x0802 /* Mobile Phone adapter */
@@ -2301,6 +2319,7 @@
#define USB_PRODUCT_PLANEX2_RT3070 0xab25 /* RT3070 */
#define USB_PRODUCT_PLANEX2_GWUS300MINIX 0xed06 /* GW-US300Mini-X/MiniW */
#define USB_PRODUCT_PLANEX2_RTL8188CU_2 0xed17 /* RTL8188CU */
+#define USB_PRODUCT_PLANEX2_GWUSH300N 0xed18 /* GW-USH300N */
/* Plantronics products */
#define USB_PRODUCT_PLANTRONICS_HEADSET 0x0ca1 /* Platronics DSP-400 Headset */
@@ -2368,6 +2387,8 @@
/* Qualcomm products */
#define USB_PRODUCT_QUALCOMM_CDMA_MSM 0x6000 /* CDMA Technologies MSM phone */
+#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 */
#define USB_PRODUCT_QUALCOMM2_RWT_FCT 0x3100 /* RWT FCT-CDMA 2000 1xRTT modem */
#define USB_PRODUCT_QUALCOMM2_CDMA_MSM 0x3196 /* CDMA Technologies MSM modem */
@@ -2552,6 +2573,7 @@
#define USB_PRODUCT_SHARP_RUITZ1016YCZZ 0x90fd /* WS003SH WLAN */
#define USB_PRODUCT_SHARP_WS007SH 0x9123 /* WS007SH */
#define USB_PRODUCT_SHARP_WS011SH 0x91ac /* WS011SH */
+#define USB_PRODUCT_SHARP_NWKBD 0x92E7 /* NetWalker Keyboard */
/* Shuttle Technology products */
#define USB_PRODUCT_SHUTTLE_EUSB 0x0001 /* E-USB Bridge */
@@ -2587,6 +2609,7 @@
#define USB_PRODUCT_SIERRA_AC595U 0x0120 /* Sierra Wireless AirCard 595U */
#define USB_PRODUCT_SIERRA_MC5720 0x0218 /* MC5720 Wireless Modem */
#define USB_PRODUCT_SIERRA_MINI5725 0x0220 /* Sierra Wireless miniPCI 5275 */
+#define USB_PRODUCT_SIERRA_250U 0x0301 /* Sieral Wireless 250U 3G */
#define USB_PRODUCT_SIERRA_INSTALLER 0x0fff /* Aircard Driver Installer */
#define USB_PRODUCT_SIERRA_MC8755_2 0x6802 /* MC8755 */
#define USB_PRODUCT_SIERRA_MC8765 0x6803 /* MC8765 */
@@ -2603,6 +2626,7 @@
#define USB_PRODUCT_SIERRA_AC881E 0x6853 /* Sierra Wireless AirCard 881E */
#define USB_PRODUCT_SIERRA_AC880U 0x6855 /* Sierra Wireless AirCard 880U */
#define USB_PRODUCT_SIERRA_AC881U 0x6856 /* Sierra Wireless AirCard 881U */
+#define USB_PRODUCT_SIERRA_AC885U 0x6880 /* Sierra Wireless AirCard 885U */
#define USB_PRODUCT_SIERRA_USB305 0x68a3 /* Sierra Wireless AirCard USB 305 */
/* Sigmatel products */
@@ -2756,6 +2780,9 @@
#define USB_PRODUCT_SPARKLAN_RT2870_1 0x0006 /* RT2870 */
#define USB_PRODUCT_SPARKLAN_RT3070 0x0010 /* RT3070 */
+/*Springer Design Systems Inc.*/
+#define USB_PRODUCT_SPRINGERDESIGN_TTSMP3PLAYER 0x1111 /* Springer Design TTSMP3Player */
+
/* Sphairon Access Systems GmbH products */
#define USB_PRODUCT_SPHAIRON_UB801R 0x0110 /* UB801R */
#define USB_PRODUCT_SPHAIRON_RTL8187 0x0150 /* RTL8187 */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.601.2.5 src/sys/dev/usb/usbdevs_data.h:1.601.2.6
--- src/sys/dev/usb/usbdevs_data.h:1.601.2.5 Tue Oct 23 20:01:41 2012
+++ src/sys/dev/usb/usbdevs_data.h Wed Oct 24 03:46:49 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdevs_data.h,v 1.601.2.5 2012/10/23 20:01:41 riz Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.601.2.6 2012/10/24 03:46:49 riz Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -543,6 +543,10 @@ const struct usb_vendor usb_vendors[] =
"AVM",
},
{
+ USB_VENDOR_NINTENDO,
+ "Nintendo",
+ },
+ {
USB_VENDOR_QUICKSHOT,
"Quickshot",
},
@@ -1863,6 +1867,10 @@ const struct usb_vendor usb_vendors[] =
"Quanta",
},
{
+ USB_VENDOR_TERMINUS,
+ "Terminus Technology",
+ },
+ {
USB_VENDOR_WINCHIPHEAD2,
"QinHeng Electronics",
},
@@ -2003,6 +2011,10 @@ const struct usb_vendor usb_vendors[] =
"Sitecom",
},
{
+ USB_VENDOR_SPRINGERDESIGN,
+ "Springer Design, Inc.",
+ },
+ {
USB_VENDOR_ARKMICROCHIPS,
"ArkMicroChips",
},
@@ -2047,7 +2059,7 @@ const struct usb_vendor usb_vendors[] =
"GNU Radio USRP",
},
};
-const int usb_nvendors = 502;
+const int usb_nvendors = 505;
const struct usb_product usb_products[] = {
{
@@ -2431,6 +2443,10 @@ const struct usb_product usb_products[]
"UBS-10BT Ethernet",
},
{
+ USB_VENDOR_ADS, USB_PRODUCT_ADS_RDX155,
+ "InstantFM Music",
+ },
+ {
USB_VENDOR_AEI, USB_PRODUCT_AEI_USBTOLAN,
"AEI USB to Lan adapter",
},
@@ -2699,6 +2715,10 @@ const struct usb_product usb_products[]
"Speakers",
},
{
+ USB_VENDOR_APPLE, USB_PRODUCT_APPLE_SHUFFLE2,
+ "iPod Shuffle (2nd generation)",
+ },
+ {
USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE,
"iPhone",
},
@@ -2707,6 +2727,10 @@ const struct usb_product usb_products[]
"iPod Touch",
},
{
+ USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPOD_TOUCH_4G,
+ "iPod Touch 4G",
+ },
+ {
USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_3G,
"iPhone 3G",
},
@@ -2723,6 +2747,10 @@ const struct usb_product usb_products[]
"Apple USB to Ethernet",
},
{
+ USB_VENDOR_APPLE, USB_PRODUCT_APPLE_BLUETOOTH_HOST_C,
+ "Bluetooth USB Host Controller",
+ },
+ {
USB_VENDOR_ARKMICROCHIPS, USB_PRODUCT_ARKMICROCHIPS_USBSERIAL,
"USB-UART Controller",
},
@@ -4263,6 +4291,10 @@ const struct usb_product usb_products[]
"8U232AM Serial converter",
},
{
+ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_232RL,
+ "FT232RL Serial converter",
+ },
+ {
USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_2232C,
"2232C USB dual FAST SERIAL ADAPTER",
},
@@ -4271,6 +4303,10 @@ const struct usb_product usb_products[]
"2232H USB quad FAST SERIAL ADAPTER",
},
{
+ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_232H,
+ "C232HM USB Multipurpose UART",
+ },
+ {
USB_VENDOR_FTDI, USB_PRODUCT_FTDI_PS2KBDMS,
"PS/2 Keyboard/Mouse",
},
@@ -4827,6 +4863,10 @@ const struct usb_product usb_products[]
"Huawei E220",
},
{
+ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_EM770W,
+ "Huawei EM770W",
+ },
+ {
USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E1750,
"Huawei E1750",
},
@@ -5791,6 +5831,10 @@ const struct usb_product usb_products[]
"WLI-UC-GN",
},
{
+ USB_VENDOR_MELCO, USB_PRODUCT_MELCO_WLIUCGNM2T,
+ "WLI-UC-GNM2T",
+ },
+ {
USB_VENDOR_MERLIN, USB_PRODUCT_MERLIN_V620,
"Merlin V620",
},
@@ -6363,6 +6407,18 @@ const struct usb_product usb_products[]
"Digital Camera E885",
},
{
+ USB_VENDOR_NINTENDO, USB_PRODUCT_NINTENDO_BCM2045A,
+ "Broadcom BCM2045A Bluetooth Radio",
+ },
+ {
+ USB_VENDOR_NINTENDO, USB_PRODUCT_NINTENDO_RVLCNT01,
+ "Wii Remote RVL-CNT-01 (BT-HID)",
+ },
+ {
+ USB_VENDOR_NINTENDO, USB_PRODUCT_NINTENDO_RVLCNT01TR,
+ "Wii Remote Plus RVL-CNT-01-TR (BT-HID)",
+ },
+ {
USB_VENDOR_NOKIA, USB_PRODUCT_NOKIA_CA42,
"Mobile Phone adapter",
},
@@ -6971,6 +7027,10 @@ const struct usb_product usb_products[]
"RTL8188CU",
},
{
+ USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUSH300N,
+ "GW-USH300N",
+ },
+ {
USB_VENDOR_PLANTRONICS, USB_PRODUCT_PLANTRONICS_HEADSET,
"Platronics DSP-400 Headset",
},
@@ -7135,6 +7195,14 @@ const struct usb_product usb_products[]
"CDMA Technologies MSM phone",
},
{
+ USB_VENDOR_QUALCOMM, USB_PRODUCT_QUALCOMM_NTT_DOCOMO_L02C_MODEM,
+ "NTT DOCOMO L-02C",
+ },
+ {
+ USB_VENDOR_QUALCOMM, USB_PRODUCT_QUALCOMM_NTT_DOCOMO_L02C_STORAGE,
+ "NTT DOCOMO L-02C",
+ },
+ {
USB_VENDOR_QUALCOMM, USB_PRODUCT_QUALCOMM_MSM_HSDPA,
"HSDPA MSM",
},
@@ -7679,6 +7747,10 @@ const struct usb_product usb_products[]
"WS011SH",
},
{
+ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_NWKBD,
+ "NetWalker Keyboard",
+ },
+ {
USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSB,
"E-USB Bridge",
},
@@ -7787,6 +7859,10 @@ const struct usb_product usb_products[]
"Sierra Wireless miniPCI 5275",
},
{
+ USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_250U,
+ "Sieral Wireless 250U 3G",
+ },
+ {
USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_INSTALLER,
"Aircard Driver Installer",
},
@@ -7851,6 +7927,10 @@ const struct usb_product usb_products[]
"Sierra Wireless AirCard 881U",
},
{
+ USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC885U,
+ "Sierra Wireless AirCard 885U",
+ },
+ {
USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_USB305,
"Sierra Wireless AirCard USB 305",
},
@@ -8319,6 +8399,10 @@ const struct usb_product usb_products[]
"RT3070",
},
{
+ USB_VENDOR_SPRINGERDESIGN, USB_PRODUCT_SPRINGERDESIGN_TTSMP3PLAYER,
+ "Springer Design TTSMP3Player",
+ },
+ {
USB_VENDOR_SPHAIRON, USB_PRODUCT_SPHAIRON_UB801R,
"UB801R",
},
@@ -9051,4 +9135,4 @@ const struct usb_product usb_products[]
"Prestige",
},
};
-const int usb_nproducts = 1750;
+const int usb_nproducts = 1768;
