summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorDamien Bergamini <damien@cvs.openbsd.org>2008-12-15 16:57:11 +0000
committerDamien Bergamini <damien@cvs.openbsd.org>2008-12-15 16:57:11 +0000
commitd3b1d4a21c442dd54c774b213df95aba1097d2de (patch)
treeddb7aea6f4dbb6301afe8f0b390e608511bc9e16 /sys
parentcbe2b27c0c6a091a0f85e7a63132eeba34984091 (diff)
regen
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/usb/usbdevs.h42
-rw-r--r--sys/dev/usb/usbdevs_data.h112
2 files changed, 133 insertions, 21 deletions
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 0e9fc99f126..c3e34b1a009 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/* $OpenBSD: usbdevs.h,v 1.410 2008/12/14 00:36:06 brad Exp $ */
+/* $OpenBSD: usbdevs.h,v 1.411 2008/12/15 16:57:10 damien Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * OpenBSD: usbdevs,v 1.400 2008/12/14 00:34:45 brad Exp
+ * OpenBSD: usbdevs,v 1.401 2008/12/15 16:54:05 damien Exp
*/
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
@@ -492,6 +492,7 @@
#define USB_VENDOR_RADIOSHACK 0x1453 /* Radio Shack */
#define USB_VENDOR_OPENMOKO 0x1457 /* OpenMoko */
#define USB_VENDOR_HUAWEI3COM 0x1472 /* Huawei 3Com */
+#define USB_VENDOR_ABOCOM2 0x1482 /* AboCom Systems */
#define USB_VENDOR_SILICOM 0x1485 /* Silicom */
#define USB_VENDOR_RALINK 0x148f /* Ralink Technology */
#define USB_VENDOR_CONCEPTRONIC2 0x14b2 /* Conceptronic */
@@ -555,6 +556,7 @@
#define USB_VENDOR_SITECOM 0x6189 /* Sitecom */
#define USB_VENDOR_ARKMICRO 0x6547 /* Arkmicro */
#define USB_VENDOR_3COM2 0x6891 /* 3Com */
+#define USB_VENDOR_EDIMAX 0x7392 /* EDIMAX */
#define USB_VENDOR_INTEL 0x8086 /* Intel */
#define USB_VENDOR_SITECOM2 0x9016 /* Sitecom */
#define USB_VENDOR_MOSCHIP 0x9710 /* MosChip */
@@ -594,6 +596,11 @@
/* AboCom products */
#define USB_PRODUCT_ABOCOM_XX1 0x110c /* XX1 */
#define USB_PRODUCT_ABOCOM_XX2 0x200c /* XX2 */
+#define USB_PRODUCT_ABOCOM_RT2770 0x2770 /* RT2770 */
+#define USB_PRODUCT_ABOCOM_RT2870 0x2870 /* RT2870 */
+#define USB_PRODUCT_ABOCOM_RT3070 0x3070 /* RT3070 */
+#define USB_PRODUCT_ABOCOM_RT3071 0x3071 /* RT3071 */
+#define USB_PRODUCT_ABOCOM2_RT2870_1 0x3c09 /* RT2870 */
#define USB_PRODUCT_ABOCOM_URE450 0x4000 /* URE450 Ethernet */
#define USB_PRODUCT_ABOCOM_UFE1000 0x4002 /* UFE1000 Fast Ethernet */
#define USB_PRODUCT_ABOCOM_DSB650TX_PNA 0x4003 /* 1/10/100 ethernet */
@@ -614,7 +621,6 @@
#define USB_PRODUCT_ABOCOM_WUG2700 0xb21f /* WUG2700 */
/* Accton products */
-#define USB_PRODUCT_ACCTON_RT2870_1 0x083a /* RT2870 */
#define USB_PRODUCT_ACCTON_USB320_EC 0x1046 /* USB320-EC Ethernet */
#define USB_PRODUCT_ACCTON_2664W 0x3501 /* 2664W */
#define USB_PRODUCT_ACCTON_111 0x3503 /* T-Sinus 111 WLAN */
@@ -626,6 +632,7 @@
#define USB_PRODUCT_ACCTON_RT2870_2 0x6618 /* RT2870 */
#define USB_PRODUCT_ACCTON_RT2870_3 0x7522 /* RT2870 */
#define USB_PRODUCT_ACCTON_RT2870_4 0xa618 /* RT2870 */
+#define USB_PRODUCT_ACCTON_RT2870_1 0xb522 /* RT2870 */
#define USB_PRODUCT_ACCTON_ZD1211B 0xe501 /* ZD1211B */
#define USB_PRODUCT_ACCTON_WN7512 0xf522 /* WN7512 */
@@ -744,6 +751,7 @@
/* AMIT products */
#define USB_PRODUCT_AMIT_CGWLUSB2GO 0x0002 /* CG-WLUSB2GO */
+#define USB_PRODUCT_AMIT_RT2870_1 0x0012 /* RT2870 */
/* AMIT(2) products */
#define USB_PRODUCT_AMIT2_RT2870 0x0008 /* RT2870 */
@@ -874,7 +882,7 @@
#define USB_PRODUCT_AXESSTEL_DATAMODEM 0x1000 /* Data Modem */
/* AsureWave products */
-#define USB_PRODUCT_AZUREWAVE_RT2870 0x3247 /* RT2870 */
+#define USB_PRODUCT_AZUREWAVE_RT2870_1 0x3247 /* RT2870 */
/* B&B Electronics products */
#define USB_PRODUCT_BBELECTR_USOTL4 0xac01 /* USOTL4 RS-422/485 */
@@ -915,7 +923,8 @@
#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_RT2870 0x8053 /* RT2870 */
+#define USB_PRODUCT_BELKIN_RT2870_1 0x8053 /* RT2870 */
+#define USB_PRODUCT_BELKIN_RT2870_2 0x805c /* RT2870 */
#define USB_PRODUCT_BELKIN_F5D9050C 0x905c /* F5D9050C */
#define USB_PRODUCT_BELKIN_F5D9050V3 0x905b /* F5D9050 ver 3 */
@@ -1031,6 +1040,8 @@
#define USB_PRODUCT_CONCEPTRONIC2_C54RU2 0x3c22 /* C54RU */
#define USB_PRODUCT_CONCEPTRONIC2_RT2870_1 0x3c06 /* RT2870 */
#define USB_PRODUCT_CONCEPTRONIC2_RT2870_2 0x3c07 /* RT2870 */
+#define USB_PRODUCT_CONCEPTRONIC2_RT2870_7 0x3c09 /* RT2870 */
+#define USB_PRODUCT_CONCEPTRONIC2_RT2870_8 0x3c12 /* RT2870 */
#define USB_PRODUCT_CONCEPTRONIC2_RT2870_3 0x3c23 /* RT2870 */
#define USB_PRODUCT_CONCEPTRONIC2_RT2573 0x3c24 /* RT2573M */
#define USB_PRODUCT_CONCEPTRONIC2_RT2870_4 0x3c25 /* RT2870 */
@@ -1163,8 +1174,9 @@
#define USB_PRODUCT_DLINK2_WUA1340 0x3c04 /* WUA-1340 */
#define USB_PRODUCT_DLINK2_DWA111 0x3c06 /* DWA-111 */
#define USB_PRODUCT_DLINK2_DWA110 0x3c07 /* DWA-110 */
-#define USB_PRODUCT_DLINK2_RT2870 0x3c09 /* RT2870 */
+#define USB_PRODUCT_DLINK2_RT2870_1 0x3c09 /* RT2870 */
#define USB_PRODUCT_DLINK2_DWA160A 0x3c10 /* DWA-160A */
+#define USB_PRODUCT_DLINK2_RT2870_2 0x3c11 /* RT2870 */
/* D-Link(3) products */
#define USB_PRODUCT_DLINK3_KVM221 0x020f /* KVM-221 */
@@ -1183,6 +1195,9 @@
/* EasyDisk products */
#define USB_PRODUCT_EASYDISK_EASYDISK 0x0005 /* Flash Disk */
+/* EDIMAX products */
+#define USB_PRODUCT_EDIMAX_RT2870_1 0x7711 /* RT2870 */
+
/* eGalax Products */
#define USB_PRODUCT_EGALAX_TPANEL 0x0001 /* Touch Panel */
#define USB_PRODUCT_EGALAX_TPANEL2 0x0002 /* Touch Panel */
@@ -1461,7 +1476,7 @@
#define USB_PRODUCT_GIGABYTE_GNWBKG 0x8007 /* GN-WBKG */
#define USB_PRODUCT_GIGABYTE_GNWB01GS 0x8008 /* GN-WB01GS */
#define USB_PRODUCT_GIGABYTE_GNWI05GS 0x800a /* GN-WI05GS */
-#define USB_PRODUCT_GIGABYTE_RT2870 0x800b /* RT2870 */
+#define USB_PRODUCT_GIGABYTE_RT2870_1 0x800b /* RT2870 */
/* Gigaset products */
#define USB_PRODUCT_GIGASET_WLAN 0x0701 /* WLAN */
@@ -1838,6 +1853,9 @@
/* Logitec products */
#define USB_PRODUCT_LOGITEC_LAN_GTJU2 0x0102 /* LAN-GTJ/U2 */
#define USB_PRODUCT_LOGITEC_LANTX 0x0105 /* LAN-TX */
+#define USB_PRODUCT_LOGITEC_RT2870_1 0x0162 /* RT2870 */
+#define USB_PRODUCT_LOGITEC_RT2870_2 0x0163 /* RT2870 */
+#define USB_PRODUCT_LOGITEC_RT2870_3 0x0164 /* RT2870 */
/* Logitech products */
#define USB_PRODUCT_LOGITECH_M2452 0x0203 /* M2452 keyboard */
@@ -2283,6 +2301,7 @@
#define USB_PRODUCT_PLANEX2_GWUSMM 0xed02 /* GW-USMM */
#define USB_PRODUCT_PLANEX2_RT2870 0xed06 /* RT2870 */
#define USB_PRODUCT_PLANEX3_GWUS54GZ 0xab10 /* GW-US54GZ */
+#define USB_PRODUCT_PLANEX2_RT3070 0xab25 /* RT3070 */
/* Plantronics products */
#define USB_PRODUCT_PLANTRONICS_HEADSET 0x0ca1 /* DSP-400 Headset */
@@ -2380,6 +2399,7 @@
#define USB_PRODUCT_RALINK_RT2671 0x2671 /* RT2671 */
#define USB_PRODUCT_RALINK_RT2770 0x2770 /* RT2770 */
#define USB_PRODUCT_RALINK_RT2870 0x2870 /* RT2870 */
+#define USB_PRODUCT_RALINK_RT3070 0x3070 /* RT3070 */
#define USB_PRODUCT_RALINK_RT2570_3 0x9020 /* RT2570 */
#define USB_PRODUCT_RALINK_RT2573_2 0x9021 /* RT2573 */
@@ -2453,6 +2473,7 @@
#define USB_PRODUCT_SANYO_SCP4900 0x0701 /* Sanyo SCP-4900 Phone */
/* Samsung products */
+#define USB_PRODUCT_SAMSUNG2_RT2870_1 0x2018 /* RT2870 */
#define USB_PRODUCT_SAMSUNG2_I330 0x8001 /* I330 */
#define USB_PRODUCT_SAMSUNG_SWL2100W 0xa000 /* SWL-2100U */
@@ -2692,7 +2713,7 @@
/* SparkLAN products */
#define USB_PRODUCT_SPARKLAN_RT2573 0x0004 /* RT2573 */
-#define USB_PRODUCT_SPARKLAN_RT2870 0x0006 /* RT2870 */
+#define USB_PRODUCT_SPARKLAN_RT2870_1 0x0006 /* RT2870 */
/* Speed Dragon Multimedia products */
#define USB_PRODUCT_SPEEDDRAGON_MS3303H 0x110b /* MS3303H Serial */
@@ -2848,6 +2869,7 @@
#define USB_PRODUCT_UMEDIA_TEW444UBEU 0x3006 /* TEW-444UB EU */
#define USB_PRODUCT_UMEDIA_TEW444UBEU_NF 0x3007 /* TEW-444UB EU */
#define USB_PRODUCT_UMEDIA_TEW429UBC1 0x300d /* TEW-429UB C1 */
+#define USB_PRODUCT_UMEDIA_RT2870_1 0x300e /* RT2870 */
#define USB_PRODUCT_UMEDIA_ALL0298V2 0x3204 /* ALL0298 v2 */
#define USB_PRODUCT_UMEDIA_AR5523_2 0x3205 /* AR5523 */
#define USB_PRODUCT_UMEDIA_AR5523_2_NF 0x3206 /* AR5523 */
@@ -2990,6 +3012,8 @@
/* Zinwell products */
#define USB_PRODUCT_ZINWELL_RT2570 0x0260 /* RT2570 */
+#define USB_PRODUCT_ZINWELL_RT2870_1 0x0280 /* RT2870 */
+#define USB_PRODUCT_ZINWELL_RT2870_2 0x0282 /* RT2870 */
/* Zoom Telephonics, Inc. products */
#define USB_PRODUCT_ZOOM_2986L 0x9700 /* 2986L Fax Modem */
@@ -3011,5 +3035,5 @@
#define USB_PRODUCT_ZYXEL_G220V2 0x340f /* G-220 v2 */
#define USB_PRODUCT_ZYXEL_G202 0x3410 /* G-202 */
#define USB_PRODUCT_ZYXEL_RT2573 0x3415 /* RT2573 */
-#define USB_PRODUCT_ZYXEL_RT2870 0x3416 /* RT2870 */
+#define USB_PRODUCT_ZYXEL_RT2870_1 0x3416 /* RT2870 */
#define USB_PRODUCT_ZYXEL_PRESTIGE 0x401a /* Prestige */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 3439ea18a58..a02ddf81cdf 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.404 2008/12/14 00:36:06 brad Exp $ */
+/* $OpenBSD: usbdevs_data.h,v 1.405 2008/12/15 16:57:10 damien Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * OpenBSD: usbdevs,v 1.400 2008/12/14 00:34:45 brad Exp
+ * OpenBSD: usbdevs,v 1.401 2008/12/15 16:54:05 damien Exp
*/
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
@@ -126,6 +126,26 @@ const struct usb_known_product usb_known_products[] = {
"XX2",
},
{
+ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_RT2770,
+ "RT2770",
+ },
+ {
+ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_RT2870,
+ "RT2870",
+ },
+ {
+ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_RT3070,
+ "RT3070",
+ },
+ {
+ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_RT3071,
+ "RT3071",
+ },
+ {
+ USB_VENDOR_ABOCOM2, USB_PRODUCT_ABOCOM2_RT2870_1,
+ "RT2870",
+ },
+ {
USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_URE450,
"URE450 Ethernet",
},
@@ -198,10 +218,6 @@ const struct usb_known_product usb_known_products[] = {
"WUG2700",
},
{
- USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_RT2870_1,
- "RT2870",
- },
- {
USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_USB320_EC,
"USB320-EC Ethernet",
},
@@ -246,6 +262,10 @@ const struct usb_known_product usb_known_products[] = {
"RT2870",
},
{
+ USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_RT2870_1,
+ "RT2870",
+ },
+ {
USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_ZD1211B,
"ZD1211B",
},
@@ -486,6 +506,10 @@ const struct usb_known_product usb_known_products[] = {
"CG-WLUSB2GO",
},
{
+ USB_VENDOR_AMIT, USB_PRODUCT_AMIT_RT2870_1,
+ "RT2870",
+ },
+ {
USB_VENDOR_AMIT2, USB_PRODUCT_AMIT2_RT2870,
"RT2870",
},
@@ -798,7 +822,7 @@ const struct usb_known_product usb_known_products[] = {
"Data Modem",
},
{
- USB_VENDOR_AZUREWAVE, USB_PRODUCT_AZUREWAVE_RT2870,
+ USB_VENDOR_AZUREWAVE, USB_PRODUCT_AZUREWAVE_RT2870_1,
"RT2870",
},
{
@@ -934,7 +958,11 @@ const struct usb_known_product usb_known_products[] = {
"F5D705C 54g USB Network Adapter",
},
{
- USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_RT2870,
+ USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_RT2870_1,
+ "RT2870",
+ },
+ {
+ USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_RT2870_2,
"RT2870",
},
{
@@ -1230,6 +1258,14 @@ const struct usb_known_product usb_known_products[] = {
"RT2870",
},
{
+ USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_RT2870_7,
+ "RT2870",
+ },
+ {
+ USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_RT2870_8,
+ "RT2870",
+ },
+ {
USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_RT2870_3,
"RT2870",
},
@@ -1594,7 +1630,7 @@ const struct usb_known_product usb_known_products[] = {
"DWA-110",
},
{
- USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_RT2870,
+ USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_RT2870_1,
"RT2870",
},
{
@@ -1602,6 +1638,10 @@ const struct usb_known_product usb_known_products[] = {
"DWA-160A",
},
{
+ USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_RT2870_2,
+ "RT2870",
+ },
+ {
USB_VENDOR_DLINK3, USB_PRODUCT_DLINK3_KVM221,
"KVM-221",
},
@@ -1630,6 +1670,10 @@ const struct usb_known_product usb_known_products[] = {
"Flash Disk",
},
{
+ USB_VENDOR_EDIMAX, USB_PRODUCT_EDIMAX_RT2870_1,
+ "RT2870",
+ },
+ {
USB_VENDOR_EGALAX, USB_PRODUCT_EGALAX_TPANEL,
"Touch Panel",
},
@@ -2538,7 +2582,7 @@ const struct usb_known_product usb_known_products[] = {
"GN-WI05GS",
},
{
- USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_RT2870,
+ USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_RT2870_1,
"RT2870",
},
{
@@ -3542,6 +3586,18 @@ const struct usb_known_product usb_known_products[] = {
"LAN-TX",
},
{
+ USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_RT2870_1,
+ "RT2870",
+ },
+ {
+ USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_RT2870_2,
+ "RT2870",
+ },
+ {
+ USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_RT2870_3,
+ "RT2870",
+ },
+ {
USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_M2452,
"M2452 keyboard",
},
@@ -4822,6 +4878,10 @@ const struct usb_known_product usb_known_products[] = {
"GW-US54GZ",
},
{
+ USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_RT3070,
+ "RT3070",
+ },
+ {
USB_VENDOR_PLANTRONICS, USB_PRODUCT_PLANTRONICS_HEADSET,
"DSP-400 Headset",
},
@@ -5050,6 +5110,10 @@ const struct usb_known_product usb_known_products[] = {
"RT2870",
},
{
+ USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT3070,
+ "RT3070",
+ },
+ {
USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570_3,
"RT2570",
},
@@ -5246,6 +5310,10 @@ const struct usb_known_product usb_known_products[] = {
"Sanyo SCP-4900 Phone",
},
{
+ USB_VENDOR_SAMSUNG2, USB_PRODUCT_SAMSUNG2_RT2870_1,
+ "RT2870",
+ },
+ {
USB_VENDOR_SAMSUNG2, USB_PRODUCT_SAMSUNG2_I330,
"I330",
},
@@ -5970,7 +6038,7 @@ const struct usb_known_product usb_known_products[] = {
"RT2573",
},
{
- USB_VENDOR_SPARKLAN, USB_PRODUCT_SPARKLAN_RT2870,
+ USB_VENDOR_SPARKLAN, USB_PRODUCT_SPARKLAN_RT2870_1,
"RT2870",
},
{
@@ -6294,6 +6362,10 @@ const struct usb_known_product usb_known_products[] = {
"TEW-429UB C1",
},
{
+ USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_RT2870_1,
+ "RT2870",
+ },
+ {
USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_ALL0298V2,
"ALL0298 v2",
},
@@ -6662,6 +6734,14 @@ const struct usb_known_product usb_known_products[] = {
"RT2570",
},
{
+ USB_VENDOR_ZINWELL, USB_PRODUCT_ZINWELL_RT2870_1,
+ "RT2870",
+ },
+ {
+ USB_VENDOR_ZINWELL, USB_PRODUCT_ZINWELL_RT2870_2,
+ "RT2870",
+ },
+ {
USB_VENDOR_ZOOM, USB_PRODUCT_ZOOM_2986L,
"2986L Fax Modem",
},
@@ -6722,7 +6802,7 @@ const struct usb_known_product usb_known_products[] = {
"RT2573",
},
{
- USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_RT2870,
+ USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_RT2870_1,
"RT2870",
},
{
@@ -8474,6 +8554,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
"Huawei 3Com",
},
{
+ USB_VENDOR_ABOCOM2,
+ "AboCom Systems",
+ },
+ {
USB_VENDOR_SILICOM,
"Silicom",
},
@@ -8726,6 +8810,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
"3Com",
},
{
+ USB_VENDOR_EDIMAX,
+ "EDIMAX",
+ },
+ {
USB_VENDOR_INTEL,
"Intel",
},