more otus(4) ids

3 files changed, 53 insertions, 23 deletions

diff --git a/sys/dev/usb/if_otus.c b/sys/dev/usb/if_otus.c
index 41fb8b8f715..777bdc16423 100644
--- a/sys/dev/usb/if_otus.c
+++ b/sys/dev/usb/if_otus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_otus.c,v 1.15 2010/03/20 09:18:34 damien Exp $	*/
+/*	$OpenBSD: if_otus.c,v 1.16 2010/04/14 20:01:07 damien Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -78,24 +78,29 @@ int otus_debug = 1;
 #endif
 
 static const struct usb_devno otus_devs[] = {
-	{ USB_VENDOR_ACCTON,	USB_PRODUCT_ACCTON_WN7512 },
-	{ USB_VENDOR_ATHEROS2,	USB_PRODUCT_ATHEROS2_TG121N },
-	{ USB_VENDOR_ATHEROS2,	USB_PRODUCT_ATHEROS2_AR9170 },
-	{ USB_VENDOR_ATHEROS2,	USB_PRODUCT_ATHEROS2_WN821NV2 },
-	{ USB_VENDOR_AVM,	USB_PRODUCT_AVM_FRITZWLAN },
-	{ USB_VENDOR_CACE,	USB_PRODUCT_CACE_AIRPCAPNX },
-	{ USB_VENDOR_DLINK2,	USB_PRODUCT_DLINK2_DWA130D1 },
-	{ USB_VENDOR_DLINK2,	USB_PRODUCT_DLINK2_DWA160A1 },
-	{ USB_VENDOR_DLINK2,	USB_PRODUCT_DLINK2_DWA160A2 },
-	{ USB_VENDOR_IODATA,	USB_PRODUCT_IODATA_WNGDNUS2 },
-	{ USB_VENDOR_NEC,	USB_PRODUCT_NEC_WL300NUG },
-	{ USB_VENDOR_NETGEAR,	USB_PRODUCT_NETGEAR_WN111V2 },
-	{ USB_VENDOR_NETGEAR,	USB_PRODUCT_NETGEAR_WNDA3100 },
-	{ USB_VENDOR_PLANEX2,	USB_PRODUCT_PLANEX2_GW_US300 },
-	{ USB_VENDOR_ZCOM,	USB_PRODUCT_ZCOM_UB81 },
-	{ USB_VENDOR_ZCOM,	USB_PRODUCT_ZCOM_UB82 },
-	{ USB_VENDOR_ZYDAS,	USB_PRODUCT_ZYDAS_ZD1221 },
-	{ USB_VENDOR_ZYXEL,	USB_PRODUCT_ZYXEL_NWD271N }
+	{ USB_VENDOR_ACCTON,		USB_PRODUCT_ACCTON_WN7512 },
+	{ USB_VENDOR_ATHEROS2,		USB_PRODUCT_ATHEROS2_3CRUSBN275 },
+	{ USB_VENDOR_ATHEROS2,		USB_PRODUCT_ATHEROS2_TG121N },
+	{ USB_VENDOR_ATHEROS2,		USB_PRODUCT_ATHEROS2_AR9170 },
+	{ USB_VENDOR_ATHEROS2,		USB_PRODUCT_ATHEROS2_WN612 },
+	{ USB_VENDOR_ATHEROS2,		USB_PRODUCT_ATHEROS2_WN821NV2 },
+	{ USB_VENDOR_AVM,		USB_PRODUCT_AVM_FRITZWLAN },
+	{ USB_VENDOR_CACE,		USB_PRODUCT_CACE_AIRPCAPNX },
+	{ USB_VENDOR_DLINK2,		USB_PRODUCT_DLINK2_DWA130D1 },
+	{ USB_VENDOR_DLINK2,		USB_PRODUCT_DLINK2_DWA160A1 },
+	{ USB_VENDOR_DLINK2,		USB_PRODUCT_DLINK2_DWA160A2 },
+	{ USB_VENDOR_IODATA,		USB_PRODUCT_IODATA_WNGDNUS2 },
+	{ USB_VENDOR_NEC,		USB_PRODUCT_NEC_WL300NUG },
+	{ USB_VENDOR_NETGEAR,		USB_PRODUCT_NETGEAR_WN111V2 },
+	{ USB_VENDOR_NETGEAR,		USB_PRODUCT_NETGEAR_WNA1000 },
+	{ USB_VENDOR_NETGEAR,		USB_PRODUCT_NETGEAR_WNDA3100 },
+	{ USB_VENDOR_PLANEX2,		USB_PRODUCT_PLANEX2_GW_US300 },
+	{ USB_VENDOR_WISTRONNEWEB,	USB_PRODUCT_WISTRONNEWEB_O8494 },
+	{ USB_VENDOR_WISTRONNEWEB,	USB_PRODUCT_WISTRONNEWEB_WNC0600 },
+	{ USB_VENDOR_ZCOM,		USB_PRODUCT_ZCOM_UB81 },
+	{ USB_VENDOR_ZCOM,		USB_PRODUCT_ZCOM_UB82 },
+	{ USB_VENDOR_ZYDAS,		USB_PRODUCT_ZYDAS_ZD1221 },
+	{ USB_VENDOR_ZYXEL,		USB_PRODUCT_ZYXEL_NWD271N }
 };
 
 int		otus_match(struct device *, void *, void *);
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 917fe933d52..58bed0dfb74 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.498 2010/04/14 02:48:48 kevlo Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.499 2010/04/14 20:01:07 damien Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.488 2010/04/14 02:47:58 kevlo Exp 
+ *	OpenBSD: usbdevs,v 1.489 2010/04/14 19:59:09 damien Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -930,6 +930,8 @@
 #define	USB_PRODUCT_ATHEROS2_AR5523_3_NF	0x0006		/* AR5523 */
 #define	USB_PRODUCT_ATHEROS2_TG121N	0x1001		/* TG121N */
 #define	USB_PRODUCT_ATHEROS2_WN821NV2	0x1002		/* WN821NV2 */
+#define	USB_PRODUCT_ATHEROS2_3CRUSBN275	0x1010		/* 3CRUSBN275 */
+#define	USB_PRODUCT_ATHEROS2_WN612	0x1011		/* WN612 */
 #define	USB_PRODUCT_ATHEROS2_AR9170	0x9170		/* AR9170 */
 
 /* ATI products */
@@ -2693,6 +2695,7 @@
 #define	USB_PRODUCT_NETGEAR_WG111V2	0x6a00		/* WG111v2 */
 #define	USB_PRODUCT_NETGEAR_WN111V2	0x9001		/* WN111V2 */
 #define	USB_PRODUCT_NETGEAR_WNDA3100	0x9010		/* WNDA3100 */
+#define	USB_PRODUCT_NETGEAR_WNA1000	0x9040		/* WNA1000 */
 
 /* Netgear(2) products */
 #define	USB_PRODUCT_NETGEAR2_MA101	0x4100		/* MA101 */
@@ -3671,8 +3674,10 @@
 #define	USB_PRODUCT_WACOM_INTUOSA5	0x0021		/* Intuos A5 */
 
 /* Wistron NeWeb products */
+#define	USB_PRODUCT_WISTRONNEWEB_WNC0600	0x0326		/* WNC-0600USB */
 #define	USB_PRODUCT_WISTRONNEWEB_UR045G	0x0427		/* PrismGT USB 2.0 WLAN */
 #define	USB_PRODUCT_WISTRONNEWEB_UR055G	0x0711		/* UR055G */
+#define	USB_PRODUCT_WISTRONNEWEB_O8494	0x0804		/* ORiNOCO 802.11n */
 #define	USB_PRODUCT_WISTRONNEWEB_AR5523_1	0x0826		/* AR5523 */
 #define	USB_PRODUCT_WISTRONNEWEB_AR5523_1_NF	0x0827		/* AR5523 */
 #define	USB_PRODUCT_WISTRONNEWEB_AR5523_2	0x082a		/* AR5523 */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index e495833c3c6..9be51472777 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.492 2010/04/14 02:48:48 kevlo Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.493 2010/04/14 20:01:07 damien Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.488 2010/04/14 02:47:58 kevlo Exp 
+ *	OpenBSD: usbdevs,v 1.489 2010/04/14 19:59:09 damien Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -886,6 +886,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "WN821NV2",
 	},
 	{
+	    USB_VENDOR_ATHEROS2, USB_PRODUCT_ATHEROS2_3CRUSBN275,
+	    "3CRUSBN275",
+	},
+	{
+	    USB_VENDOR_ATHEROS2, USB_PRODUCT_ATHEROS2_WN612,
+	    "WN612",
+	},
+	{
 	    USB_VENDOR_ATHEROS2, USB_PRODUCT_ATHEROS2_AR9170,
 	    "AR9170",
 	},
@@ -6302,6 +6310,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "WNDA3100",
 	},
 	{
+	    USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_WNA1000,
+	    "WNA1000",
+	},
+	{
 	    USB_VENDOR_NETGEAR2, USB_PRODUCT_NETGEAR2_MA101,
 	    "MA101",
 	},
@@ -8966,6 +8978,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "Intuos A5",
 	},
 	{
+	    USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_WNC0600,
+	    "WNC-0600USB",
+	},
+	{
 	    USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_UR045G,
 	    "PrismGT USB 2.0 WLAN",
 	},
@@ -8974,6 +8990,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "UR055G",
 	},
 	{
+	    USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_O8494,
+	    "ORiNOCO 802.11n",
+	},
+	{
 	    USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_AR5523_1,
 	    "AR5523",
 	},