regen

2 files changed, 143 insertions, 4 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 90316bb4ab9..3702c2febd8 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.207 2006/06/26 22:12:38 miod Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.208 2006/06/27 09:19:58 jsg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.203 2006/06/26 22:11:59 miod Exp 
+ *	OpenBSD: usbdevs,v 1.204 2006/06/27 09:19:09 jsg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -233,6 +233,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 */
@@ -395,6 +396,7 @@
 #define	USB_VENDOR_CONCEPTRONIC	0x0d8e		/* Conceptronic */
 #define	USB_VENDOR_MSI	0x0db0		/* Micro Star International */
 #define	USB_VENDOR_ELCON	0x0db7		/* ELCON Systemtechnik */
+#define	USB_VENDOR_SITECOMEU	0x0df6		/* Sitecom Europe */
 #define	USB_VENDOR_MOBILEACTION	0x0df7		/* Mobile Action */
 #define	USB_VENDOR_SPEEDDRAGON	0x0e55		/* Speed Dragon Multimedia */
 #define	USB_VENDOR_HAWKING	0x0e66		/* Hawking */
@@ -429,7 +431,9 @@
 #define	USB_VENDOR_TSUNAMI	0x1241		/* Tsunami */
 #define	USB_VENDOR_PHEENET	0x124a		/* Pheenet */
 #define	USB_VENDOR_RAPTORGAMING	0x1267		/* Raptor Gaming */
+#define	USB_VENDOR_TWINMOS	0x126f		/* TwinMOS */
 #define	USB_VENDOR_BELKIN2	0x1293		/* Belkin Components */
+#define	USB_VENDOR_CYBERTAN	0x129b		/* CyberTAN Technology */
 #define	USB_VENDOR_ARANEUS	0x12d8		/* Araneus Information Systems */
 #define	USB_VENDOR_TAPWAVE	0x12ef		/* Tapwave */
 #define	USB_VENDOR_AINCOMM	0x12fd		/* Aincomm */
@@ -438,12 +442,15 @@
 #define	USB_VENDOR_CISCOLINKSYS	0x13b1		/* Cisco-Linksys */
 #define	USB_VENDOR_SHARK	0x13d2		/* Shark */
 #define	USB_VENDOR_NOVATEL	0x1410		/* Novatel Wireless */
+#define	USB_VENDOR_WISTRONNEWEB	0x1435		/* Wistron NeWeb */
 #define	USB_VENDOR_RADIOSHACK	0x1453		/* Radio Shack */
 #define	USB_VENDOR_SILICOM	0x1485		/* Silicom */
 #define	USB_VENDOR_RALINK	0x148f		/* Ralink Technology */
 #define	USB_VENDOR_CONCEPTRONIC2	0x14b2		/* Conceptronic */
+#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_SOHOWARE	0x15e8		/* SOHOware */
 #define	USB_VENDOR_UMAX	0x1606		/* UMAX Data Systems */
 #define	USB_VENDOR_INSIDEOUT	0x1608		/* Inside Out Networks */
@@ -472,9 +479,11 @@
 #define	USB_VENDOR_DELL	0x413c		/* Dell */
 #define	USB_VENDOR_ACEECA	0x4766		/* Aceeca */
 #define	USB_VENDOR_AVERATEC	0x50c2		/* Averatec */
+#define	USB_VENDOR_SWEEX	0x5173		/* Sweex */
 #define	USB_VENDOR_ONSPEC2	0x55aa		/* OnSpec */
 #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_SITECOM2	0x9016		/* Sitecom */
 #define	USB_VENDOR_HP2	0xf003		/* Hewlett Packard */
@@ -491,6 +500,7 @@
 #define	USB_PRODUCT_3COM_3C460	0x11f8		/* HomeConnect 3C460 */
 #define	USB_PRODUCT_3COM_USR56K	0x3021		/* U.S.Robotics 56000 */
 #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 */
@@ -510,6 +520,7 @@
 #define	USB_PRODUCT_ABOCOM_XX7	0x400c		/* XX7 */
 #define	USB_PRODUCT_ABOCOM_XX8	0x4102		/* XX8 */
 #define	USB_PRODUCT_ABOCOM_XX9	0x4104		/* XX9 */
+#define	USB_PRODUCT_ABOCOM_WL54	0x6001		/* WL54 */
 #define	USB_PRODUCT_ABOCOM_XX10	0xabc1		/* XX10 */
 #define	USB_PRODUCT_ABOCOM_BWU613	0xb000		/* BWU613 */
 
@@ -669,6 +680,7 @@
 /* ASUS products */
 #define	USB_PRODUCT_ASUS_RT2570	0x1706		/* RT2570 */
 #define	USB_PRODUCT_ASUS_RT2570_2	0x1707		/* RT2570 */
+#define	USB_PRODUCT_ASUS_WL159G	0x170c		/* WL-159g */
 #define	USB_PRODUCT_ASUS_MYPAL_A730	0x4202		/* MyPal A730 */
 
 /* ASUSTeK Computer products */
@@ -845,6 +857,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 */
@@ -906,6 +921,9 @@
 /* DMI products */
 #define	USB_PRODUCT_DMI_SA2_0	0xb001		/* Storage Adapter */
 
+/* DrayTek products */
+#define	USB_PRODUCT_DRAYTEK_VIGOR550	0x0550		/* Vigor550 */
+
 /* Dynastream Innovations */
 #define	USB_PRODUCT_DYNASTREAM_ANTDEVBOARD	0x1003		/* ANT dev board */
 
@@ -1624,6 +1642,8 @@
 /* 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_PLANEX3_GWUS54MINI	0xab13		/* GW-US54Mini */
+#define	USB_PRODUCT_PLANEX2_GWUS54GZL	0xc007		/* GW-US54GZL */
 
 /* Plantronics products */
 #define	USB_PRODUCT_PLANTRONICS_HEADSET	0x0ca1		/* Platronics DSP-400 Headset */
@@ -1727,6 +1747,7 @@
 
 /* Sagem products */
 #define	USB_PRODUCT_SAGEM_SERIAL	0x0027		/* Serial */
+#define	USB_PRODUCT_SAGEM_XG760A	0x004a		/* XG-760A */
 
 /* Saitek products */
 #define	USB_PRODUCT_SAITEK_CYBORG_3D_GOLD	0x0006		/* Cyborg 3D Gold Joystick */
@@ -1833,6 +1854,9 @@
 #define	USB_PRODUCT_SITECOM2_WL022	0x182d		/* WL-022 */
 #define	USB_PRODUCT_SITECOM_CN104	0x2068		/* CN104 */
 
+/* Sitecom Europe products */
+#define	USB_PRODUCT_SITECOMEU_WL113	0x9071		/* WL-113 */
+
 /* SmartBridges products */
 #define	USB_PRODUCT_SMARTBRIDGES_SMARTLINK	0x0001		/* SmartLink Ethernet */
 #define	USB_PRODUCT_SMARTBRIDGES_SMARTNIC	0x0003		/* smartNIC 2 PnP */
@@ -1921,6 +1945,9 @@
 /* Susteen, Inc. products */
 #define	USB_PRODUCT_SUSTEEN_DCU11	0x0528		/* Ericsson DCU-10/11 */
 
+/* Sweex products */
+#define	USB_PRODUCT_SWEEX_ZD1211	0x1809		/* ZD1211 */
+
 /* Syntech Information products */
 #define	USB_PRODUCT_SYNTECH_SERIAL	0x0001		/* Serial */
 
@@ -1946,6 +1973,8 @@
 #define	USB_PRODUCT_TEKRAM_0193	0x1601		/* ALLNET 0193 WLAN */
 #define	USB_PRODUCT_TEKRAM_ZYAIR_B200	0x1602		/* ZyXEL ZyAIR B200 WLAN */
 #define	USB_PRODUCT_TEKRAM_U300C	0x1612		/* U-300C */
+#define	USB_PRODUCT_TEKRAM_QUICKWLAN	0x1630		/* QuickWLAN */
+#define	USB_PRODUCT_TEKRAM_ZD1211	0x5630		/* ZD1211 */
 
 /* Telex Communications products */
 #define	USB_PRODUCT_TELEX_MIC1	0x0001		/* Microphone */
@@ -1975,6 +2004,12 @@
 /* Tsunami products */
 #define	USB_PRODUCT_TSUNAMI_SM2000	0x1111		/* SM-2000 */
 
+/* TwinMOS products */
+#define	USB_PRODUCT_TWINMOS_G240	0xa006		/* G240 */
+
+/* U-MEDIA Communications products */
+#define	USB_PRODUCT_UMEDIA_TEW429UB	0x300b		/* TEW-429UB */
+
 /* Ultima products */
 #define	USB_PRODUCT_ULTIMA_1200UBPLUS	0x4002		/* 1200 UB Plus */
 
@@ -2039,6 +2074,9 @@
 #define	USB_PRODUCT_WACOM_GRAPHIRE4_4X5	0x0015		/* Graphire4 Classic A6 */
 #define	USB_PRODUCT_WACOM_INTUOSA5	0x0021		/* Intuos A5 */
 
+/* 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 */
@@ -2077,3 +2115,4 @@
 /* ZyXEL Communication Co. products */
 #define	USB_PRODUCT_ZYXEL_OMNI56K	0x1500		/* Omni 56K Plus */
 #define	USB_PRODUCT_ZYXEL_980N	0x2011		/* Scorpion-980N */
+#define	USB_PRODUCT_ZYXEL_ZYAIRG220	0x3401		/* ZyAIR G-220 */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 40f159d085d..06d772ec27a 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs_data.h,v 1.207 2006/06/26 22:12:38 miod Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.208 2006/06/27 09:19:58 jsg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.203 2006/06/26 22:11:59 miod Exp 
+ *	OpenBSD: usbdevs,v 1.204 2006/06/27 09:19:09 jsg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -75,6 +75,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "HomeConnect 3C460B",
 	},
 	{
+	    USB_VENDOR_3COM2, USB_PRODUCT_3COM2_3CRUSB10075,
+	    "3CRUSB10075",
+	},
+	{
 	    USB_VENDOR_3COMUSR, USB_PRODUCT_3COMUSR_OFFICECONN,
 	    "3Com OfficeConnect Analog Modem",
 	},
@@ -139,6 +143,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "XX9",
 	},
 	{
+	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_WL54,
+	    "WL54",
+	},
+	{
 	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX10,
 	    "XX10",
 	},
@@ -483,6 +491,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "RT2570",
 	},
 	{
+	    USB_VENDOR_ASUS, USB_PRODUCT_ASUS_WL159G,
+	    "WL-159g",
+	},
+	{
 	    USB_VENDOR_ASUS, USB_PRODUCT_ASUS_MYPAL_A730,
 	    "MyPal A730",
 	},
@@ -907,6 +919,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "Ex1300 hub",
 	},
 	{
+	    USB_VENDOR_CYBERTAN, USB_PRODUCT_CYBERTAN_TG54USB,
+	    "TG54USB",
+	},
+	{
 	    USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_MOUSE,
 	    "mouse",
 	},
@@ -1059,6 +1075,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "Storage Adapter",
 	},
 	{
+	    USB_VENDOR_DRAYTEK, USB_PRODUCT_DRAYTEK_VIGOR550,
+	    "Vigor550",
+	},
+	{
 	    USB_VENDOR_DYNASTREAM, USB_PRODUCT_DYNASTREAM_ANTDEVBOARD,
 	    "ANT dev board",
 	},
@@ -2971,6 +2991,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "GW-US11S WLAN",
 	},
 	{
+	    USB_VENDOR_PLANEX3, USB_PRODUCT_PLANEX3_GWUS54MINI,
+	    "GW-US54Mini",
+	},
+	{
+	    USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUS54GZL,
+	    "GW-US54GZL",
+	},
+	{
 	    USB_VENDOR_PLANTRONICS, USB_PRODUCT_PLANTRONICS_HEADSET,
 	    "Platronics DSP-400 Headset",
 	},
@@ -3231,6 +3259,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "Serial",
 	},
 	{
+	    USB_VENDOR_SAGEM, USB_PRODUCT_SAGEM_XG760A,
+	    "XG-760A",
+	},
+	{
 	    USB_VENDOR_SAITEK, USB_PRODUCT_SAITEK_CYBORG_3D_GOLD,
 	    "Cyborg 3D Gold Joystick",
 	},
@@ -3483,6 +3515,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "CN104",
 	},
 	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL113,
+	    "WL-113",
+	},
+	{
 	    USB_VENDOR_SMARTBRIDGES, USB_PRODUCT_SMARTBRIDGES_SMARTLINK,
 	    "SmartLink Ethernet",
 	},
@@ -3695,6 +3731,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "Ericsson DCU-10/11",
 	},
 	{
+	    USB_VENDOR_SWEEX, USB_PRODUCT_SWEEX_ZD1211,
+	    "ZD1211",
+	},
+	{
 	    USB_VENDOR_SYNTECH, USB_PRODUCT_SYNTECH_SERIAL,
 	    "Serial",
 	},
@@ -3743,6 +3783,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "U-300C",
 	},
 	{
+	    USB_VENDOR_TEKRAM, USB_PRODUCT_TEKRAM_QUICKWLAN,
+	    "QuickWLAN",
+	},
+	{
+	    USB_VENDOR_TEKRAM, USB_PRODUCT_TEKRAM_ZD1211,
+	    "ZD1211",
+	},
+	{
 	    USB_VENDOR_TELEX, USB_PRODUCT_TELEX_MIC1,
 	    "Microphone",
 	},
@@ -3791,6 +3839,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "SM-2000",
 	},
 	{
+	    USB_VENDOR_TWINMOS, USB_PRODUCT_TWINMOS_G240,
+	    "G240",
+	},
+	{
+	    USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_TEW429UB,
+	    "TEW-429UB",
+	},
+	{
 	    USB_VENDOR_ULTIMA, USB_PRODUCT_ULTIMA_1200UBPLUS,
 	    "1200 UB Plus",
 	},
@@ -3951,6 +4007,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "Intuos A5",
 	},
 	{
+	    USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_UR055G,
+	    "UR055G",
+	},
+	{
 	    USB_VENDOR_XIRLINK, USB_PRODUCT_XIRLINK_IMAGING,
 	    "Imaging Device",
 	},
@@ -4034,6 +4094,10 @@ const struct usb_known_product usb_known_products[] = {
 	    USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_980N,
 	    "Scorpion-980N",
 	},
+	{
+	    USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_ZYAIRG220,
+	    "ZyAIR G-220",
+	},
 	{ 0, 0, NULL }
 };
 
@@ -4715,6 +4779,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Sigmatel",
 	},
 	{
+	    USB_VENDOR_DRAYTEK,
+	    "DrayTek",
+	},
+	{
 	    USB_VENDOR_AIWA,
 	    "Aiwa",
 	},
@@ -5363,6 +5431,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "ELCON Systemtechnik",
 	},
 	{
+	    USB_VENDOR_SITECOMEU,
+	    "Sitecom Europe",
+	},
+	{
 	    USB_VENDOR_MOBILEACTION,
 	    "Mobile Action",
 	},
@@ -5499,10 +5571,18 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Raptor Gaming",
 	},
 	{
+	    USB_VENDOR_TWINMOS,
+	    "TwinMOS",
+	},
+	{
 	    USB_VENDOR_BELKIN2,
 	    "Belkin Components",
 	},
 	{
+	    USB_VENDOR_CYBERTAN,
+	    "CyberTAN Technology",
+	},
+	{
 	    USB_VENDOR_ARANEUS,
 	    "Araneus Information Systems",
 	},
@@ -5535,6 +5615,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Novatel Wireless",
 	},
 	{
+	    USB_VENDOR_WISTRONNEWEB,
+	    "Wistron NeWeb",
+	},
+	{
 	    USB_VENDOR_RADIOSHACK,
 	    "Radio Shack",
 	},
@@ -5551,6 +5635,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Conceptronic",
 	},
 	{
+	    USB_VENDOR_PLANEX3,
+	    "Planex Communications",
+	},
+	{
 	    USB_VENDOR_SILICONPORTALS,
 	    "Silicon Portals",
 	},
@@ -5559,6 +5647,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "OQO",
 	},
 	{
+	    USB_VENDOR_UMEDIA,
+	    "U-MEDIA Communications",
+	},
+	{
 	    USB_VENDOR_SOHOWARE,
 	    "SOHOware",
 	},
@@ -5671,6 +5763,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Averatec",
 	},
 	{
+	    USB_VENDOR_SWEEX,
+	    "Sweex",
+	},
+	{
 	    USB_VENDOR_ONSPEC2,
 	    "OnSpec",
 	},
@@ -5683,6 +5779,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Sitecom",
 	},
 	{
+	    USB_VENDOR_3COM2,
+	    "3Com",
+	},
+	{
 	    USB_VENDOR_INTEL,
 	    "Intel",
 	},