Module Name:    src
Committed By:   bouyer
Date:           Tue Mar 24 21:28:29 UTC 2009

Modified Files:
        src/sys/dev/usb [netbsd-4]: usbdevs.h usbdevs_data.h

Log Message:
Pullup the following revisions (requested by msaitoh in ticket #1284):
        distrib/sets/lists/base/mi              1.706-707,1.797
        distrib/sets/lists/man/mi               1.1006
        etc/mtree/NetBSD.dist                   1.340
        share/man/man4/Makefile                 1.432
        sys/arch/amd64/conf/GENERIC             1.149 via patch
        sys/arch/i386/conf/ALL                  1.103
        sys/arch/i386/conf/GENERIC              1.832
        sys/arch/i386/conf/GENERIC_LAPTOP       1.237
        sys/arch/macppc/conf/GENERIC            1.257
        sys/arch/sparc64/conf/GENERIC           1.86
        sys/dev/usb/usbdevs                     1.468,1.479-480 via patch
        sys/dev/usb/usbdevs.h                   regen
        sys/dev/usb/usbdevs_data.h              regen
        sys/dev/microcode/Makefile              1.7
        sys/dev/usb/files.usb                   patch
        share/man/man4/zyd.4                    1.1 via patch
        sys/dev/microcode/zyd/Makefile          1.1-1.2
        sys/dev/microcode/zyd/build.c           1.1
        sys/dev/microcode/zyd/microcode.h       1.1
        sys/dev/microcode/zyd/zd1211-license    1.1
        sys/dev/microcode/zyd/zyd-zd1211        1.1
        sys/dev/microcode/zyd/zyd-zd1211b       1.1
        sys/dev/usb/if_zyd.c                    patch
        sys/dev/usb/if_zydreg.h                 1.1-1.2

Add ZyDAS ZD1211/ZD1211B USB IEEE 802.11b/g wireless network device
support


To generate a diff of this commit:
cvs rdiff -u -r1.445.2.8 -r1.445.2.9 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.446.2.8 -r1.446.2.9 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.445.2.8 src/sys/dev/usb/usbdevs.h:1.445.2.9
--- src/sys/dev/usb/usbdevs.h:1.445.2.8	Fri Feb 22 22:06:35 2008
+++ src/sys/dev/usb/usbdevs.h	Tue Mar 24 21:28:28 2009
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs.h,v 1.445.2.8 2008/02/22 22:06:35 bouyer Exp $	*/
+/*	$NetBSD: usbdevs.h,v 1.445.2.9 2009/03/24 21:28:28 bouyer Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.443.2.8 2008/02/22 22:05:58 bouyer Exp
+ *	NetBSD: usbdevs,v 1.443.2.9 2009/03/24 21:25:04 bouyer Exp
  */
 
 /*
@@ -239,6 +239,7 @@
 #define	USB_VENDOR_LINKSYS	0x066b		/* Linksys */
 #define	USB_VENDOR_ACERSA	0x066e		/* Acer Semiconductor America */
 #define	USB_VENDOR_SIGMATEL	0x066f		/* Sigmatel */
+#define	USB_VENDOR_DRAYTEK	0x0675		/* DrayTek */
 #define	USB_VENDOR_AIWA	0x0677		/* Aiwa */
 #define	USB_VENDOR_ACARD	0x0678		/* ACARD Technology */
 #define	USB_VENDOR_PROLIFIC	0x067b		/* Prolific Technology */
@@ -281,6 +282,7 @@
 #define	USB_VENDOR_BRIMAX	0x078e		/* Brimax */
 #define	USB_VENDOR_AXIS	0x0792		/* Axis Communications */
 #define	USB_VENDOR_ABL	0x0794		/* ABL Electronics */
+#define	USB_VENDOR_SAGEM	0x079b		/* Sagem */
 #define	USB_VENDOR_SUNCOMM	0x079c		/* Sun Communications, Inc. */
 #define	USB_VENDOR_ALFADATA	0x079d		/* Alfadata Computer */
 #define	USB_VENDOR_NATIONALTECH	0x07a2		/* National Technical Systems */
@@ -435,14 +437,17 @@
 #define	USB_VENDOR_NETINDEX	0x11f6		/* NetIndex */
 #define	USB_VENDOR_TSUNAMI	0x1241		/* Tsunami */
 #define	USB_VENDOR_TARGUS	0x1267		/* Targus */
+#define	USB_VENDOR_TWINMOS	0x126f		/* TwinMOS */
 #define	USB_VENDOR_CREATIVE2	0x1292		/* Creative Labs */
 #define	USB_VENDOR_BELKIN2	0x1293		/* Belkin Components */
+#define	USB_VENDOR_CYBERTAN	0x129b		/* CyberTAN Technology */
 #define	USB_VENDOR_AINCOMM	0x12fd		/* Aincomm */
 #define	USB_VENDOR_MOBILITY	0x1342		/* Mobility */
 #define	USB_VENDOR_DICKSMITH	0x1371		/* Dick Smith Electronics */
 #define	USB_VENDOR_BALTECH	0x13ad		/* Baltech */
 #define	USB_VENDOR_CISCOLINKSYS	0x13b1		/* Cisco-Linksys */
 #define	USB_VENDOR_SHARK	0x13d2		/* Shark */
+#define	USB_VENDOR_WISTRONNEWEB	0x1435		/* Wistron NeWeb */
 #define	USB_VENDOR_HUAWEI3COM	0x1472		/* Huawei 3Com */
 #define	USB_VENDOR_SILICOM	0x1485		/* Silicom */
 #define	USB_VENDOR_RALINK	0x1485		/* Ralink Technology */
@@ -451,6 +456,8 @@
 #define	USB_VENDOR_PLANEX3	0x14ea		/* Planex Communications */
 #define	USB_VENDOR_SILICONPORTALS	0x1527		/* Silicon Portals */
 #define	USB_VENDOR_OQO	0x1557		/* OQO */
+#define	USB_VENDOR_UMEDIA	0x157e		/* U-MEDIA Communications */
+#define	USB_VENDOR_FIBERLINE	0x1582		/* Fiberline */
 #define	USB_VENDOR_SOHOWARE	0x15e8		/* SOHOware */
 #define	USB_VENDOR_UMAX	0x1606		/* UMAX Data Systems */
 #define	USB_VENDOR_INSIDEOUT	0x1608		/* Inside Out Networks */
@@ -460,6 +467,7 @@
 #define	USB_VENDOR_GIGASET	0x1690		/* Gigaset */
 #define	USB_VENDOR_ANYDATA	0x16d5		/* AnyDATA Inc. */
 #define	USB_VENDOR_JABLOTRON	0x16d6		/* Jablotron */
+#define	USB_VENDOR_SENAO	0x1740		/* Senao */
 #define	USB_VENDOR_AMIT	0x18c5		/* AMIT */
 #define	USB_VENDOR_QCOM	0x18e8		/* Qcom */
 #define	USB_VENDOR_LINKSYS3	0x1915		/* Linksys */
@@ -482,9 +490,11 @@
 #define	USB_VENDOR_IRIVER	0x4102		/* iRiver */
 #define	USB_VENDOR_DELL	0x413c		/* Dell */
 #define	USB_VENDOR_AVERATEC	0x50c2		/* Averatec */
+#define	USB_VENDOR_SWEEX	0x5173		/* Sweex */
 #define	USB_VENDOR_ONSPEC2	0x55aa		/* OnSpec Electronic Inc. */
 #define	USB_VENDOR_ZINWELL	0x5a57		/* Zinwell */
 #define	USB_VENDOR_SITECOM	0x6189		/* Sitecom */
+#define	USB_VENDOR_3COM2	0x6891		/* 3Com */
 #define	USB_VENDOR_INTEL	0x8086		/* Intel */
 #define	USB_VENDOR_MOSCHIP	0x9710		/* MosChip Semiconductor */
 #define	USB_VENDOR_HP2	0xf003		/* Hewlett Packard */
@@ -501,6 +511,7 @@
 #define	USB_PRODUCT_3COM_USR56K	0x3021		/* U.S.Robotics 56000 Voice Faxmodem Pro */
 #define	USB_PRODUCT_3COM_3C460	0x11f8		/* HomeConnect 3C460 */
 #define	USB_PRODUCT_3COM_3C460B	0x4601		/* HomeConnect 3C460B */
+#define	USB_PRODUCT_3COM2_3CRUSB10075	0xa727		/* 3CRUSB10075 */
 
 #define	USB_PRODUCT_3COMUSR_OFFICECONN	0x0082		/* 3Com OfficeConnect Analog Modem */
 #define	USB_PRODUCT_3COMUSR_USRISDN	0x008f		/* 3Com U.S. Robotics Pro ISDN TA */
@@ -526,6 +537,7 @@
 #define	USB_PRODUCT_ABOCOM_XX8	0x4102		/* XX8 */
 #define	USB_PRODUCT_ABOCOM_XX9	0x4104		/* XX9 */
 #define	USB_PRODUCT_ABOCOM_UFE2000	0x420a		/* UFE2000 USB2.0 Fast Ethernet Adapter */
+#define	USB_PRODUCT_ABOCOM_WL54	0x6001		/* WL54 */
 #define	USB_PRODUCT_ABOCOM_XX10	0xabc1		/* XX10 */
 #define	USB_PRODUCT_ABOCOM_HWU54DM	0xb21b		/* HWU54DM */
 #define	USB_PRODUCT_ABOCOM_RT2573_2	0xb21c		/* RT2573 */
@@ -536,7 +548,9 @@
 /* Accton products */
 #define	USB_PRODUCT_ACCTON_USB320_EC	0x1046		/* USB320-EC Ethernet Adapter */
 #define	USB_PRODUCT_ACCTON_111	0x3503		/* T-Sinus 111 WLAN */
+#define	USB_PRODUCT_ACCTON_SMCWUSBG	0x4505		/* SMCWUSB-G */
 #define	USB_PRODUCT_ACCTON_SS1001	0x5046		/* SpeedStream Ethernet Adapter */
+#define	USB_PRODUCT_ACCTON_ZD1211B	0xe501		/* ZD1211B */
 
 /* Acer Peripherals, Inc. products */
 #define	USB_PRODUCT_ACERP_ACERSCAN_C310U	0x12a6		/* Acerscan C310U */
@@ -653,6 +667,8 @@
 
 /* ASUSTeK computer products */
 #define	USB_PRODUCT_ASUSTEK_WL167G	0x1707		/* WL-167g USB2.0 WLAN Adapter */
+#define	USB_PRODUCT_ASUSTEK_WL159G	0x170c		/* WL-159g */
+#define	USB_PRODUCT_ASUSTEK_A9T_WIFI	0x171b		/* A9T wireless */
 #define	USB_PRODUCT_ASUSTEK_WL167G_2	0x1723		/* WL-167g USB2.0 WLAN Adapter (version 2) */
 #define	USB_PRODUCT_ASUSTEK_WL167G_3	0x1724		/* WL-167g USB2.0 WLAN Adapter (version 2) */
 
@@ -706,8 +722,10 @@
 #define	USB_PRODUCT_BELKIN_F5U237	0x0237		/* F5U237 USB 2.0 7-Port Hub */
 #define	USB_PRODUCT_BELKIN_UPS	0x0980		/* UPS */
 #define	USB_PRODUCT_BELKIN_F5U120	0x1203		/* F5U120-PC Hub */
+#define	USB_PRODUCT_BELKIN_ZD1211B	0x4050		/* ZD1211B */
 #define	USB_PRODUCT_BELKIN_F5D7050	0x7050		/* F5D7050 54g USB Network Adapter */
 #define	USB_PRODUCT_BELKIN_F5D7050A	0x705a		/* F5D705A 54g USB Network Adapter */
+#define	USB_PRODUCT_BELKIN_F5D7050C	0x705c		/* F5D705C 54g USB Network Adapter */
 #define	USB_PRODUCT_BELKIN_F5D9050V3	0x905b		/* F5D9050 ver 3 */
 
 /* Billionton products */
@@ -830,6 +848,9 @@
 /* CTX products */
 #define	USB_PRODUCT_CTX_EX1300	0x9999		/* Ex1300 hub */
 
+/* CyberTAN Technology products */
+#define	USB_PRODUCT_CYBERTAN_TG54USB	0x1666		/* TG54USB */
+
 /* Cypress Semiconductor products */
 #define	USB_PRODUCT_CYPRESS_MOUSE	0x0001		/* mouse */
 #define	USB_PRODUCT_CYPRESS_THERMO	0x0002		/* thermometer */
@@ -888,6 +909,9 @@
 #define	USB_PRODUCT_DLINK_DSB650TX2	0x4102		/* 10/100 ethernet adapter */
 #define	USB_PRODUCT_DLINK_DSB650	0xabc1		/* 10/100 ethernet adapter */
 
+/* DrayTek products */
+#define	USB_PRODUCT_DRAYTEK_VIGOR550	0x0550		/* Vigor550 */
+
 /* Dynastream Innovations */
 #define	USB_PRODUCT_DYNASTREAM_ANTDEVBOARD	0x1003		/* ANT dev board */
 
@@ -968,6 +992,9 @@
 #define	USB_PRODUCT_FALCOM_TWIST	0x0001		/* Twist GSM/GPRS modem */
 #define	USB_PRODUCT_FALCOM_SAMBA	0x0005		/* Samba 55/56 GSM/GPRS modem */
 
+/* Fiberline */
+#define	USB_PRODUCT_FIBERLINE_WL430U	0x6003		/* WL-430U */
+
 /* Freecom products */
 #define	USB_PRODUCT_FREECOM_DVD	0xfc01		/* Connector for DVD drive */
 
@@ -1638,6 +1665,7 @@
 #define	USB_PRODUCT_PHILIPS_PCVC740K	0x0311		/* PCVC740K ToUCam Pro PC Camera */
 #define	USB_PRODUCT_PHILIPS_PCVC750K	0x0312		/* PCVC750K ToUCam Pro Scan PC Camera */
 #define	USB_PRODUCT_PHILIPS_DSS150	0x0471		/* DSS 150 Digital Speaker System */
+#define	USB_PRODUCT_PHILIPS_SNU5600	0x1236		/* SNU5600 */
 #define	USB_PRODUCT_PHILIPS_DIVAUSB	0x1801		/* DIVA USB mp3 player */
 
 /* Philips Semiconductor products */
@@ -1654,7 +1682,9 @@
 /* Planex Communications products */
 #define	USB_PRODUCT_PLANEX_GW_US11H	0x14ea		/* GW-US11H WLAN */
 #define	USB_PRODUCT_PLANEX2_GW_US11S	0x3220		/* GW-US11S WLAN */
+#define	USB_PRODUCT_PLANEX2_GWUS54GXS	0x5303		/* GW-US54GXS */
 #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 */
@@ -1790,6 +1820,10 @@
 /* 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 */
+
 /* Saitek products */
 #define	USB_PRODUCT_SAITEK_CYBORG_3D_GOLD	0x0006		/* Cyborg 3D Gold Joystick */
 
@@ -1819,6 +1853,9 @@
 /* Sealevel products */
 #define	USB_PRODUCT_SEALEVEL_USBSERIAL	0x2101		/* USB-Serial converter */
 
+/* Senao products */
+#define	USB_PRODUCT_SENAO_NUB8301	0x2000		/* NUB-8301 */
+
 /* ArkMicroChips products */
 #define	USB_PRODUCT_ARKMICROCHIPS_USBSERIAL	0x0232		/* USB-UART Controller */
 
@@ -1903,6 +1940,7 @@
 
 /* Sitecom Europe products */
 #define	USB_PRODUCT_SITECOMEU_WL113	0x9071		/* WL-113 */
+#define	USB_PRODUCT_SITECOMEU_ZD1211B	0x9075		/* ZD1211B */
 #define	USB_PRODUCT_SITECOMEU_WL172	0x90ac		/* WL-172 */
 #define	USB_PRODUCT_SITECOMEU_WL113R2	0x9712		/* WL-113 rev 2 */
 
@@ -1984,6 +2022,9 @@
 /* Susteen products */
 #define	USB_PRODUCT_SUSTEEN_DCU10	0x0528		/* USB Cable */
 
+/* Sweex products */
+#define	USB_PRODUCT_SWEEX_ZD1211	0x1809		/* ZD1211 */
+
 /* System TALKS, Inc. */
 #define	USB_PRODUCT_SYSTEMTALKS_SGCX2UL	0x1920		/* SGC-X2UL */
 
@@ -2016,6 +2057,9 @@
 /* Tekram Technology products */
 #define	USB_PRODUCT_TEKRAM_0193	0x1601		/* ALLNET 0193 WLAN */
 #define	USB_PRODUCT_TEKRAM_ZYAIR_B200	0x1602		/* ZyXEL ZyAIR B200 WLAN */
+#define	USB_PRODUCT_TEKRAM_QUICKWLAN	0x1630		/* QuickWLAN */
+#define	USB_PRODUCT_TEKRAM_ZD1211_1	0x5630		/* ZD1211 */
+#define	USB_PRODUCT_TEKRAM_ZD1211_2	0x6630		/* ZD1211 */
 
 /* Telex Communications products */
 #define	USB_PRODUCT_TELEX_MIC1	0x0001		/* Enhanced USB Microphone */
@@ -2051,6 +2095,9 @@
 /* Tsunami products */
 #define	USB_PRODUCT_TSUNAMI_SM2000	0x1111		/* SM-2000 */
 
+/* TwinMOS products */
+#define	USB_PRODUCT_TWINMOS_G240	0xa006		/* G240 */
+
 /* Ultima products */
 #define	USB_PRODUCT_ULTIMA_1200UBPLUS	0x4002		/* 1200 UB Plus scanner */
 
@@ -2062,11 +2109,18 @@
 #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 */
+#define	USB_PRODUCT_UMEDIA_TEW429UB	0x300b		/* TEW-429UB */
+#define	USB_PRODUCT_UMEDIA_TEW429UBC1	0x300d		/* TEW-429UB C1 */
+#define	USB_PRODUCT_UMEDIA_ALL0298V2	0x3204		/* ALL0298 v2 */
+
 /* Universal Access products */
 #define	USB_PRODUCT_UNIACCESS_PANACHE	0x0101		/* Panache Surf USB ISDN Adapter */
 
 /* U.S. Robotics products */
 #define	USB_PRODUCT_USR_USR1120	0x00eb		/* USR1120 WLAN */
+#define	USB_PRODUCT_USR_USR5423	0x0121		/* USR5423 WLAN */
 
 /* USI products */
 #define	USB_PRODUCT_USI_MC60	0x10c5		/* MC60 Serial */
@@ -2104,6 +2158,7 @@
 
 /* VTech products */
 #define	USB_PRODUCT_VTECH_RT2570	0x3012		/* RT2570 */
+#define	USB_PRODUCT_VTECH_ZD1211B	0x3014		/* ZD1211B */
 
 /* Wacom products */
 #define	USB_PRODUCT_WACOM_CT0405U	0x0000		/* CT-0405-U Tablet */
@@ -2114,6 +2169,9 @@
 #define	USB_PRODUCT_WACOM_INTUOSA5	0x0021		/* Intuos A5 */
 #define	USB_PRODUCT_WACOM_GD0912U	0x0022		/* Intuos 9x12 Graphics Tablet */
 
+/* Wistron NeWeb products */
+#define	USB_PRODUCT_WISTRONNEWEB_UR055G	0x0711		/* UR055G */
+
 /* Xirlink products */
 #define	USB_PRODUCT_XIRLINK_IMAGING	0x800d		/* IMAGING DEVICE */
 #define	USB_PRODUCT_XIRLINK_PCCAM	0x8080		/* IBM PC Camera */
@@ -2149,6 +2207,8 @@
 
 /* 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 */
 
 /* Zinwell products */
 #define	USB_PRODUCT_ZINWELL_ZWXG261	0x0260		/* ZWX-G261 */
@@ -2158,7 +2218,12 @@
 
 /* Zydas Technology Corporation products */
 #define	USB_PRODUCT_ZYDAS_ZD1211	0x1211		/* ZD1211 WLAN abg */
+#define	USB_PRODUCT_ZYDAS_ZD1211B	0x1215		/* ZD1211B */
 
 /* 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_ZYAIRG220	0x3401		/* ZyAIR G-220 */
+#define	USB_PRODUCT_ZYXEL_AG225H	0x3409		/* AG-225H */
+#define	USB_PRODUCT_ZYXEL_M202	0x340a		/* M-202 */
+#define	USB_PRODUCT_ZYXEL_G220V2	0x340f		/* G-220 v2 */

Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.446.2.8 src/sys/dev/usb/usbdevs_data.h:1.446.2.9
--- src/sys/dev/usb/usbdevs_data.h:1.446.2.8	Fri Feb 22 22:06:36 2008
+++ src/sys/dev/usb/usbdevs_data.h	Tue Mar 24 21:28:28 2009
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs_data.h,v 1.446.2.8 2008/02/22 22:06:36 bouyer Exp $	*/
+/*	$NetBSD: usbdevs_data.h,v 1.446.2.9 2009/03/24 21:28:28 bouyer Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.443.2.8 2008/02/22 22:05:58 bouyer Exp
+ *	NetBSD: usbdevs,v 1.443.2.9 2009/03/24 21:25:04 bouyer Exp
  */
 
 /*
@@ -730,6 +730,10 @@
 	    "Sigmatel",
 	},
 	{
+	    USB_VENDOR_DRAYTEK,
+	    "DrayTek",
+	},
+	{
 	    USB_VENDOR_AIWA,
 	    "Aiwa",
 	},
@@ -898,6 +902,10 @@
 	    "ABL Electronics",
 	},
 	{
+	    USB_VENDOR_SAGEM,
+	    "Sagem",
+	},
+	{
 	    USB_VENDOR_SUNCOMM,
 	    "Sun Communications, Inc.",
 	},
@@ -1514,6 +1522,10 @@
 	    "Targus",
 	},
 	{
+	    USB_VENDOR_TWINMOS,
+	    "TwinMOS",
+	},
+	{
 	    USB_VENDOR_CREATIVE2,
 	    "Creative Labs",
 	},
@@ -1522,6 +1534,10 @@
 	    "Belkin Components",
 	},
 	{
+	    USB_VENDOR_CYBERTAN,
+	    "CyberTAN Technology",
+	},
+	{
 	    USB_VENDOR_AINCOMM,
 	    "Aincomm",
 	},
@@ -1546,6 +1562,10 @@
 	    "Shark",
 	},
 	{
+	    USB_VENDOR_WISTRONNEWEB,
+	    "Wistron NeWeb",
+	},
+	{
 	    USB_VENDOR_HUAWEI3COM,
 	    "Huawei 3Com",
 	},
@@ -1578,6 +1598,14 @@
 	    "OQO",
 	},
 	{
+	    USB_VENDOR_UMEDIA,
+	    "U-MEDIA Communications",
+	},
+	{
+	    USB_VENDOR_FIBERLINE,
+	    "Fiberline",
+	},
+	{
 	    USB_VENDOR_SOHOWARE,
 	    "SOHOware",
 	},
@@ -1614,6 +1642,10 @@
 	    "Jablotron",
 	},
 	{
+	    USB_VENDOR_SENAO,
+	    "Senao",
+	},
+	{
 	    USB_VENDOR_AMIT,
 	    "AMIT",
 	},
@@ -1702,6 +1734,10 @@
 	    "Averatec",
 	},
 	{
+	    USB_VENDOR_SWEEX,
+	    "Sweex",
+	},
+	{
 	    USB_VENDOR_ONSPEC2,
 	    "OnSpec Electronic Inc.",
 	},
@@ -1714,6 +1750,10 @@
 	    "Sitecom",
 	},
 	{
+	    USB_VENDOR_3COM2,
+	    "3Com",
+	},
+	{
 	    USB_VENDOR_INTEL,
 	    "Intel",
 	},
@@ -1730,7 +1770,7 @@
 	    "GNU Radio USRP",
 	},
 };
-const int usb_nvendors = 421;
+const int usb_nvendors = 431;
 
 const struct usb_product usb_products[] = {
 	{
@@ -1758,6 +1798,10 @@
 	    "HomeConnect 3C460B",
 	},
 	{
+	    USB_VENDOR_3COM2, USB_PRODUCT_3COM2_3CRUSB10075,
+	    "3CRUSB10075",
+	},
+	{
 	    USB_VENDOR_3COMUSR, USB_PRODUCT_3COMUSR_OFFICECONN,
 	    "3Com OfficeConnect Analog Modem",
 	},
@@ -1838,6 +1882,10 @@
 	    "UFE2000 USB2.0 Fast Ethernet Adapter",
 	},
 	{
+	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_WL54,
+	    "WL54",
+	},
+	{
 	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX10,
 	    "XX10",
 	},
@@ -1870,10 +1918,18 @@
 	    "T-Sinus 111 WLAN",
 	},
 	{
+	    USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_SMCWUSBG,
+	    "SMCWUSB-G",
+	},
+	{
 	    USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_SS1001,
 	    "SpeedStream Ethernet Adapter",
 	},
 	{
+	    USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_ZD1211B,
+	    "ZD1211B",
+	},
+	{
 	    USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_C310U,
 	    "Acerscan C310U",
 	},
@@ -2118,6 +2174,14 @@
 	    "WL-167g USB2.0 WLAN Adapter",
 	},
 	{
+	    USB_VENDOR_ASUSTEK, USB_PRODUCT_ASUSTEK_WL159G,
+	    "WL-159g",
+	},
+	{
+	    USB_VENDOR_ASUSTEK, USB_PRODUCT_ASUSTEK_A9T_WIFI,
+	    "A9T wireless",
+	},
+	{
 	    USB_VENDOR_ASUSTEK, USB_PRODUCT_ASUSTEK_WL167G_2,
 	    "WL-167g USB2.0 WLAN Adapter (version 2)",
 	},
@@ -2246,6 +2310,10 @@
 	    "F5U120-PC Hub",
 	},
 	{
+	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_ZD1211B,
+	    "ZD1211B",
+	},
+	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D7050,
 	    "F5D7050 54g USB Network Adapter",
 	},
@@ -2254,6 +2322,10 @@
 	    "F5D705A 54g USB Network Adapter",
 	},
 	{
+	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D7050C,
+	    "F5D705C 54g USB Network Adapter",
+	},
+	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D9050V3,
 	    "F5D9050 ver 3",
 	},
@@ -2554,6 +2626,10 @@
 	    "Ex1300 hub",
 	},
 	{
+	    USB_VENDOR_CYBERTAN, USB_PRODUCT_CYBERTAN_TG54USB,
+	    "TG54USB",
+	},
+	{
 	    USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_MOUSE,
 	    "mouse",
 	},
@@ -2702,6 +2778,10 @@
 	    "10/100 ethernet adapter",
 	},
 	{
+	    USB_VENDOR_DRAYTEK, USB_PRODUCT_DRAYTEK_VIGOR550,
+	    "Vigor550",
+	},
+	{
 	    USB_VENDOR_DYNASTREAM, USB_PRODUCT_DYNASTREAM_ANTDEVBOARD,
 	    "ANT dev board",
 	},
@@ -2910,6 +2990,10 @@
 	    "Samba 55/56 GSM/GPRS modem",
 	},
 	{
+	    USB_VENDOR_FIBERLINE, USB_PRODUCT_FIBERLINE_WL430U,
+	    "WL-430U",
+	},
+	{
 	    USB_VENDOR_FREECOM, USB_PRODUCT_FREECOM_DVD,
 	    "Connector for DVD drive",
 	},
@@ -4754,6 +4838,10 @@
 	    "DSS 150 Digital Speaker System",
 	},
 	{
+	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_SNU5600,
+	    "SNU5600",
+	},
+	{
 	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_DIVAUSB,
 	    "DIVA USB mp3 player",
 	},
@@ -4786,10 +4874,18 @@
 	    "GW-US11S WLAN",
 	},
 	{
+	    USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUS54GXS,
+	    "GW-US54GXS",
+	},
+	{
 	    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",
 	},
@@ -5154,6 +5250,14 @@
 	    "USB serial adapter REX-USB60",
 	},
 	{
+	    USB_VENDOR_SAGEM, USB_PRODUCT_SAGEM_XG760A,
+	    "XG-760A",
+	},
+	{
+	    USB_VENDOR_SAGEM, USB_PRODUCT_SAGEM_XG76NA,
+	    "XG-76NA",
+	},
+	{
 	    USB_VENDOR_SAITEK, USB_PRODUCT_SAITEK_CYBORG_3D_GOLD,
 	    "Cyborg 3D Gold Joystick",
 	},
@@ -5214,6 +5318,10 @@
 	    "USB-Serial converter",
 	},
 	{
+	    USB_VENDOR_SENAO, USB_PRODUCT_SENAO_NUB8301,
+	    "NUB-8301",
+	},
+	{
 	    USB_VENDOR_ARKMICROCHIPS, USB_PRODUCT_ARKMICROCHIPS_USBSERIAL,
 	    "USB-UART Controller",
 	},
@@ -5422,6 +5530,10 @@
 	    "WL-113",
 	},
 	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_ZD1211B,
+	    "ZD1211B",
+	},
+	{
 	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL172,
 	    "WL-172",
 	},
@@ -5626,6 +5738,10 @@
 	    "USB Cable",
 	},
 	{
+	    USB_VENDOR_SWEEX, USB_PRODUCT_SWEEX_ZD1211,
+	    "ZD1211",
+	},
+	{
 	    USB_VENDOR_SYSTEMTALKS, USB_PRODUCT_SYSTEMTALKS_SGCX2UL,
 	    "SGC-X2UL",
 	},
@@ -5694,6 +5810,18 @@
 	    "ZyXEL ZyAIR B200 WLAN",
 	},
 	{
+	    USB_VENDOR_TEKRAM, USB_PRODUCT_TEKRAM_QUICKWLAN,
+	    "QuickWLAN",
+	},
+	{
+	    USB_VENDOR_TEKRAM, USB_PRODUCT_TEKRAM_ZD1211_1,
+	    "ZD1211",
+	},
+	{
+	    USB_VENDOR_TEKRAM, USB_PRODUCT_TEKRAM_ZD1211_2,
+	    "ZD1211",
+	},
+	{
 	    USB_VENDOR_TELEX, USB_PRODUCT_TELEX_MIC1,
 	    "Enhanced USB Microphone",
 	},
@@ -5750,6 +5878,10 @@
 	    "SM-2000",
 	},
 	{
+	    USB_VENDOR_TWINMOS, USB_PRODUCT_TWINMOS_G240,
+	    "G240",
+	},
+	{
 	    USB_VENDOR_ULTIMA, USB_PRODUCT_ULTIMA_1200UBPLUS,
 	    "1200 UB Plus scanner",
 	},
@@ -5778,6 +5910,22 @@
 	    "Astra 3400 Scanner",
 	},
 	{
+	    USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_TEW429UB_A,
+	    "TEW-429UB_A",
+	},
+	{
+	    USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_TEW429UB,
+	    "TEW-429UB",
+	},
+	{
+	    USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_TEW429UBC1,
+	    "TEW-429UB C1",
+	},
+	{
+	    USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_ALL0298V2,
+	    "ALL0298 v2",
+	},
+	{
 	    USB_VENDOR_UNIACCESS, USB_PRODUCT_UNIACCESS_PANACHE,
 	    "Panache Surf USB ISDN Adapter",
 	},
@@ -5786,6 +5934,10 @@
 	    "USR1120 WLAN",
 	},
 	{
+	    USB_VENDOR_USR, USB_PRODUCT_USR_USR5423,
+	    "USR5423 WLAN",
+	},
+	{
 	    USB_VENDOR_USI, USB_PRODUCT_USI_MC60,
 	    "MC60 Serial",
 	},
@@ -5862,6 +6014,10 @@
 	    "RT2570",
 	},
 	{
+	    USB_VENDOR_VTECH, USB_PRODUCT_VTECH_ZD1211B,
+	    "ZD1211B",
+	},
+	{
 	    USB_VENDOR_WACOM, USB_PRODUCT_WACOM_CT0405U,
 	    "CT-0405-U Tablet",
 	},
@@ -5890,6 +6046,10 @@
 	    "Intuos 9x12 Graphics Tablet",
 	},
 	{
+	    USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_UR055G,
+	    "UR055G",
+	},
+	{
 	    USB_VENDOR_XIRLINK, USB_PRODUCT_XIRLINK_IMAGING,
 	    "IMAGING DEVICE",
 	},
@@ -5986,6 +6146,14 @@
 	    "725/726 Prism2.5 WLAN",
 	},
 	{
+	    USB_VENDOR_ZCOM, USB_PRODUCT_ZCOM_ZD1211,
+	    "ZD1211",
+	},
+	{
+	    USB_VENDOR_ZCOM, USB_PRODUCT_ZCOM_ZD1211B,
+	    "ZD1211B",
+	},
+	{
 	    USB_VENDOR_ZINWELL, USB_PRODUCT_ZINWELL_ZWXG261,
 	    "ZWX-G261",
 	},
@@ -5998,6 +6166,10 @@
 	    "ZD1211 WLAN abg",
 	},
 	{
+	    USB_VENDOR_ZYDAS, USB_PRODUCT_ZYDAS_ZD1211B,
+	    "ZD1211B",
+	},
+	{
 	    USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_OMNI56K,
 	    "Omni 56K Plus",
 	},
@@ -6005,5 +6177,21 @@
 	    USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_980N,
 	    "Scorpion-980N keyboard",
 	},
+	{
+	    USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_ZYAIRG220,
+	    "ZyAIR G-220",
+	},
+	{
+	    USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_AG225H,
+	    "AG-225H",
+	},
+	{
+	    USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_M202,
+	    "M-202",
+	},
+	{
+	    USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_G220V2,
+	    "G-220 v2",
+	},
 };
-const int usb_nproducts = 1068;
+const int usb_nproducts = 1105;

Reply via email to