another shitload of run(4) usb ids

we have 159 ids now just for run(4)

2 files changed, 88 insertions, 17 deletions

diff --git a/sys/dev/usb/if_run.c b/sys/dev/usb/if_run.c
index e898b564ddc..5b2f063926a 100644
--- a/sys/dev/usb/if_run.c
+++ b/sys/dev/usb/if_run.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_run.c,v 1.33 2009/11/03 17:36:58 damien Exp $	*/
+/*	$OpenBSD: if_run.c,v 1.34 2009/11/17 20:13:42 damien Exp $	*/
 
 /*-
  * Copyright (c) 2008,2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -92,7 +92,10 @@ static const struct usb_devno run_devs[] = {
 	USB_ID(ACCTON,		RT2870_3),
 	USB_ID(ACCTON,		RT2870_4),
 	USB_ID(ACCTON,		RT2870_5),
-	USB_ID(ACCTON,		RT3070),
+	USB_ID(ACCTON,		RT3070_1),
+	USB_ID(ACCTON,		RT3070_2),
+	USB_ID(ACCTON,		RT3070_3),
+	USB_ID(ACCTON,		RT3070_4),
 	USB_ID(AIRTIES,		RT3070),
 	USB_ID(AMIGO,		RT2870_1),
 	USB_ID(AMIGO,		RT2870_2),
@@ -104,15 +107,19 @@ static const struct usb_devno run_devs[] = {
 	USB_ID(ASUS,		RT2870_3),
 	USB_ID(ASUS,		RT2870_4),
 	USB_ID(ASUS,		RT2870_5),
+	USB_ID(ASUS,		RT3070),
 	USB_ID(ASUS2,		USBN11),
 	USB_ID(AZUREWAVE,	RT2870_1),
 	USB_ID(AZUREWAVE,	RT2870_2),
-	USB_ID(AZUREWAVE,	RT3070),
+	USB_ID(AZUREWAVE,	RT3070_1),
+	USB_ID(AZUREWAVE,	RT3070_2),
+	USB_ID(AZUREWAVE,	RT3070_3),
 	USB_ID(BELKIN,		F5D8053V3),
 	USB_ID(BELKIN,		F5D8055),
 	USB_ID(BELKIN,		F6D4050V1),
 	USB_ID(BELKIN,		RT2870_1),
 	USB_ID(BELKIN,		RT2870_2),
+	USB_ID(CISCOLINKSYS2,	RT3070),
 	USB_ID(CONCEPTRONIC2,	RT2870_1),
 	USB_ID(CONCEPTRONIC2,	RT2870_2),
 	USB_ID(CONCEPTRONIC2,	RT2870_3),
@@ -126,6 +133,7 @@ static const struct usb_devno run_devs[] = {
 	USB_ID(COREGA,		RT2870_1),
 	USB_ID(COREGA,		RT2870_2),
 	USB_ID(COREGA,		RT2870_3),
+	USB_ID(COREGA,		RT3070),
 	USB_ID(CYBERTAN,	RT2870),
 	USB_ID(DLINK,		RT2870),
 	USB_ID(DLINK,		RT3072),
@@ -135,20 +143,28 @@ static const struct usb_devno run_devs[] = {
 	USB_ID(DLINK2,		RT3070_1),
 	USB_ID(DLINK2,		RT3070_2),
 	USB_ID(DLINK2,		RT3070_3),
+	USB_ID(DLINK2,		RT3070_4),
 	USB_ID(DLINK2,		RT3072),
 	USB_ID(EDIMAX,		EW7717),
 	USB_ID(EDIMAX,		EW7718),
 	USB_ID(EDIMAX,		RT2870_1),
-	USB_ID(ENCORE,		RT3070),
+	USB_ID(ENCORE,		RT3070_1),
+	USB_ID(ENCORE,		RT3070_2),
+	USB_ID(ENCORE,		RT3070_3),
 	USB_ID(GIGABYTE,	GNWB31N),
 	USB_ID(GIGABYTE,	GNWB32L),
 	USB_ID(GIGABYTE,	RT2870_1),
+	USB_ID(GIGASET,		RT3070_1),
+	USB_ID(GIGASET,		RT3070_2),
 	USB_ID(GUILLEMOT,	HWNU300),
 	USB_ID(HAWKING,		HWUN2),
 	USB_ID(HAWKING,		RT2870_1),
 	USB_ID(HAWKING,		RT2870_2),
 	USB_ID(HAWKING,		RT3070),
-	USB_ID(IODATA,		RT3072),
+	USB_ID(IODATA,		RT3072_1),
+	USB_ID(IODATA,		RT3072_2),
+	USB_ID(IODATA,		RT3072_3),
+	USB_ID(IODATA,		RT3072_4),
 	USB_ID(LINKSYS4,	WUSB100),
 	USB_ID(LINKSYS4,	WUSB54GCV3),
 	USB_ID(LINKSYS4,	WUSB600N),
@@ -158,7 +174,14 @@ static const struct usb_devno run_devs[] = {
 	USB_ID(MELCO,		WLIUCAG300N),
 	USB_ID(MELCO,		WLIUCG300N),
 	USB_ID(MELCO,		WLIUCGN),
-	USB_ID(MSI,		RT3070),
+	USB_ID(MSI,		RT3070_1),
+	USB_ID(MSI,		RT3070_2),
+	USB_ID(MSI,		RT3070_3),
+	USB_ID(MSI,		RT3070_4),
+	USB_ID(MSI,		RT3070_5),
+	USB_ID(MSI,		RT3070_6),
+	USB_ID(MSI,		RT3070_7),
+	USB_ID(PARA,		RT3070),
 	USB_ID(PEGATRON,	RT2870),
 	USB_ID(PEGATRON,	RT3070),
 	USB_ID(PEGATRON,	RT3070_2),
@@ -182,7 +205,11 @@ static const struct usb_devno run_devs[] = {
 	USB_ID(SENAO,		RT2870_4),
 	USB_ID(SENAO,		RT3070),
 	USB_ID(SENAO,		RT3071),
-	USB_ID(SENAO,		RT3072),
+	USB_ID(SENAO,		RT3072_1),
+	USB_ID(SENAO,		RT3072_2),
+	USB_ID(SENAO,		RT3072_3),
+	USB_ID(SENAO,		RT3072_4),
+	USB_ID(SENAO,		RT3072_5),
 	USB_ID(SITECOMEU,	RT2770),
 	USB_ID(SITECOMEU,	RT2870_1),
 	USB_ID(SITECOMEU,	RT2870_2),
@@ -192,7 +219,12 @@ static const struct usb_devno run_devs[] = {
 	USB_ID(SITECOMEU,	RT3070_2),
 	USB_ID(SITECOMEU,	RT3070_3),
 	USB_ID(SITECOMEU,	RT3070_4),
-	USB_ID(SITECOMEU,	RT3072),
+	USB_ID(SITECOMEU,	RT3072_1),
+	USB_ID(SITECOMEU,	RT3072_2),
+	USB_ID(SITECOMEU,	RT3072_3),
+	USB_ID(SITECOMEU,	RT3072_4),
+	USB_ID(SITECOMEU,	RT3072_5),
+	USB_ID(SITECOMEU,	RT3072_6),
 	USB_ID(SITECOMEU,	WL608),
 	USB_ID(SPARKLAN,	RT2870_1),
 	USB_ID(SPARKLAN,	RT3070),
@@ -204,7 +236,8 @@ static const struct usb_devno run_devs[] = {
 	USB_ID(ZINWELL,		RT2870_1),
 	USB_ID(ZINWELL,		RT2870_2),
 	USB_ID(ZINWELL,		RT3070),
-	USB_ID(ZINWELL,		RT3072),
+	USB_ID(ZINWELL,		RT3072_1),
+	USB_ID(ZINWELL,		RT3072_2),
 	USB_ID(ZYXEL,		RT2870_1)
 };
 
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index e06427047c0..7a0a2764959 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.454 2009/11/17 18:07:09 damien Exp $
+$OpenBSD: usbdevs,v 1.455 2009/11/17 20:13:42 damien Exp $
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
 /*
@@ -508,6 +508,7 @@ vendor ENTREGA		0x1645	Entrega
 vendor ACTIONTEC	0x1668	Actiontec Electronics
 vendor CLIPSAL		0x166a	Clipsal
 vendor ATHEROS		0x168c	Atheros Communications
+vendor CISCOLINKSYS2	0x167b	Cisco-Linksys
 vendor GIGASET		0x1690	Gigaset
 vendor GLOBALSUN	0x16ab	Global Sun Technology
 vendor ANYDATA		0x16d5	AnyDATA Inc.
@@ -534,6 +535,7 @@ vendor AIRTIES		0x1eda	AirTies
 vendor DLINK		0x2001	D-Link
 vendor PLANEX2		0x2019	Planex Communications
 vendor ENCORE		0x203d	Encore
+vendor PARA		0x20b8	PARA Industrial
 vendor DLINK3		0x2101	D-Link
 vendor MOTOROLA2	0x22b8	Motorola
 vendor TRIPPLITE	0x2478	Tripp-Lite
@@ -640,8 +642,12 @@ product ACCTON RT3070		0x7511	RT3070
 product ACCTON RT2770		0x7512	RT2770
 product ACCTON RT2870_3		0x7522	RT2870
 product ACCTON RT2870_5		0x8522	RT2870
+product ACCTON RT3070_4		0xa512	RT3070
 product ACCTON RT2870_4		0xa618	RT2870
+product ACCTON RT3070_1		0xa701	RT3070
+product ACCTON RT3070_2		0xa702	RT3070
 product ACCTON RT2870_1		0xb522	RT2870
+product ACCTON RT3070_3		0xc522	RT3070
 product ACCTON ZD1211B		0xe501	ZD1211B
 product ACCTON WN7512		0xf522	WN7512
 
@@ -844,6 +850,7 @@ product ASUS RT2870_2		0x1732	RT2870
 product ASUS RT2870_3		0x1742	RT2870
 product ASUS RT2870_4		0x1760	RT2870
 product ASUS RT2870_5		0x1761	RT2870
+product ASUS RT3070		0x1784	RT3070
 product ASUS MYPAL_A730		0x4202	MyPal A730
 
 /* ASUSTeK Computer products */
@@ -909,7 +916,9 @@ product AXESSTEL DATAMODEM	0x1000	Data Modem
 /* AsureWave products */
 product AZUREWAVE RT2870_1	0x3247	RT2870
 product AZUREWAVE RT2870_2	0x3262	RT2870
-product AZUREWAVE RT3070	0x3273	RT3070
+product AZUREWAVE RT3070_1	0x3273	RT3070
+product AZUREWAVE RT3070_2	0x3284	RT3070
+product AZUREWAVE RT3070_3	0x3305	RT3070
 
 /* B&B Electronics products */
 product BBELECTR USOTL4		0xac01	USOTL4 RS-422/485
@@ -1045,6 +1054,7 @@ product CISCOLINKSYS WUSB54GC	0x0020	WUSB54GC
 product CISCOLINKSYS WUSB54GR	0x0023	WUSB54GR
 product CISCOLINKSYS WUSBF54G	0x0024	WUSBF54G
 product CISCOLINKSYS WUSB200	0x0028	WUSB200
+product CISCOLINKSYS2 RT3070	0x4001	RT3070
 
 /* Clipsal products */
 product CLIPSAL 5500PCU		0x0303	5500PCU C-Bus
@@ -1111,6 +1121,7 @@ product COREGA CGWLUSB2GPX	0x002e	CG-WLUSB2GPX
 product COREGA RT2870_1		0x002f	RT2870
 product COREGA RT2870_2		0x003c	RT2870
 product COREGA RT2870_3		0x003f	RT2870
+product COREGA RT3070		0x0041	RT3070
 product COREGA CGWLUSB300GNM	0x0042	CG-WLUSB300GNM
 product COREGA WLUSB_11_STICK	0x7613	WLAN USB Stick 11
 product COREGA FETHER_USB_TXC	0x9601	FEther USB-TXC
@@ -1235,6 +1246,7 @@ product DLINK2 RT3070_3		0x3c0f	RT3070
 product DLINK2 DWA160A1		0x3c10	DWA-160 A1
 product DLINK2 RT2870_2		0x3c11	RT2870
 product DLINK2 DWA130		0x3c13	DWA-130
+product DLINK2 RT3070_4		0x3c15	RT3070
 
 /* D-Link(3) products */
 product DLINK3 KVM221		0x020f	KVM-221
@@ -1308,7 +1320,9 @@ product ELSA USB2ETHERNET	0x3000	Microlink USB2Ethernet
 product EMPIA EEEPC701_VIDEO	0x2761	EeePC701 camera
 
 /* Encore products */
-product ENCORE RT3070		0x1480	RT3070
+product ENCORE RT3070_1		0x1480	RT3070
+product ENCORE RT3070_2		0x14a1	RT3070
+product ENCORE RT3070_3		0x14a9	RT3070
 
 /* Entrega products */
 product ENTREGA 1S		0x0001	1S serial
@@ -1567,6 +1581,8 @@ product GIGASET SMCWUSBTG_NF	0x0711	SMCWUSBT-G
 product GIGASET AR5523		0x0712	AR5523
 product GIGASET AR5523_NF	0x0713	AR5523
 product GIGASET RT2573		0x0722	RT2573
+product GIGASET RT3070_1	0x0740	RT3070
+product GIGASET RT3070_2	0x0744	RT3070
 
 /* Global Sun Technology product */
 product GLOBALSUN AR5523_1	0x7801	AR5523
@@ -1791,7 +1807,10 @@ product IODATA USBWNG54US_NF	0x0929	USB WN-G54/US
 product IODATA ETGUS2		0x0930	ETG-US2
 product IODATA FT232R		0x093c	FT232R
 product IODATA WNGDNUS2		0x093f	WN-GDN/US2
-product IODATA RT3072		0x0945	RT3072
+product IODATA RT3072_1		0x0944	RT3072
+product IODATA RT3072_2		0x0945	RT3072
+product IODATA RT3072_3		0x0947	RT3072
+product IODATA RT3072_4		0x0948	RT3072
 product IODATA USBRSAQ		0x0a03	RSAQ1 Serial
 product IODATA2 USB2SC		0x0a09	USB2.0-SCSI Bridge USB2-SC
 product IODATA USBRSAQ5		0x0a0e	RSAQ5 Serial
@@ -2066,13 +2085,19 @@ product MGE UPS2		0xffff	Protection Center 2 UPS
 /* Micro Star International products */
 product MSI WLAN		0x1020	WLAN
 product MSI BLUETOOTH		0x1967	Bluetooth
-product MSI RT3070		0x3820	RT3070
+product MSI RT3070_1		0x3820	RT3070
+product MSI RT3070_2		0x3821	RT3070
+product MSI RT3070_3		0x3870	RT3070
 product MSI RT2570		0x6861	RT2570
 product MSI RT2570_2		0x6865	RT2570
 product MSI RT2570_3		0x6869	RT2570
 product MSI RT2573_1		0x6874	RT2573
 product MSI RT2573_2		0x6877	RT2573
+product MSI RT3070_4		0x6899	RT3070
+product MSI RT3070_5		0x821a	RT3070
 product MSI RT2573_3		0xa861	RT2573
+product MSI RT3070_6		0x870a	RT3070
+product MSI RT3070_7		0x899a	RT3070
 product MSI RT2573_4		0xa874	RT2573
 product MSI BLUETOOTH_2		0xa970	Bluetooth
 product MSI BLUETOOTH_3		0xa97a	Bluetooth
@@ -2359,6 +2384,9 @@ product PAPOUCH AD4USB		0x8003	AD4USB
 product PAPOUCH GOLIATH_MUX	0x8004	GOLIATH MUX
 product PAPOUCH GOLIATH_MSR	0x8005	GOLIATH MSR
 
+/* PARA Industrial products */
+product PARA RT3070		0x8888	RT3070
+
 /* Pegatron products */
 product PEGATRON RT2870		0x0002	RT2870
 product PEGATRON RT3070		0x000c	RT3070
@@ -2676,7 +2704,11 @@ product SENAO RT2870_1		0x9701	RT2870
 product SENAO RT2870_2		0x9702	RT2870
 product SENAO RT3070		0x9703	RT3070
 product SENAO RT3071		0x9705	RT3071
-product SENAO RT3072		0x9706	RT3072
+product SENAO RT3072_1		0x9706	RT3072
+product SENAO RT3072_2		0x9707	RT3072
+product SENAO RT3072_3		0x9708	RT3072
+product SENAO RT3072_4		0x9709	RT3072
+product SENAO RT3072_5		0x9801	RT3072
 
 /* Serverworks */
 product SERVERWORKS HUB		0x0000	Root Hub
@@ -2823,7 +2855,12 @@ product SITECOMEU RT3070_3	0x003c	RT3070
 product SITECOMEU RT3070_4	0x003d	RT3070
 product SITECOMEU RT3070	0x003e	RT3070
 product SITECOMEU WL608		0x003f	WL-608
-product SITECOMEU RT3072	0x0042	RT3072
+product SITECOMEU RT3072_1	0x0041	RT3072
+product SITECOMEU RT3072_2	0x0042	RT3072
+product SITECOMEU RT3072_3	0x0047	RT3072
+product SITECOMEU RT3072_4	0x0048	RT3072
+product SITECOMEU RT3072_5	0x004a	RT3072
+product SITECOMEU RT3072_6	0x004d	RT3072
 product SITECOMEU LN028		0x061c	LN-028
 product SITECOMEU LN030		0x0021	LN-030
 product SITECOMEU WL113		0x9071	WL-113
@@ -3192,7 +3229,8 @@ product ZCOM UB82		0x0026	UB82
 product ZINWELL RT2570		0x0260	RT2570
 product ZINWELL RT2870_1	0x0280	RT2870
 product ZINWELL RT2870_2	0x0282	RT2870
-product ZINWELL RT3072		0x0283	RT3072
+product ZINWELL RT3072_1	0x0283	RT3072
+product ZINWELL RT3072_2	0x0284	RT3072
 product ZINWELL RT3070		0x5257	RT3070
 
 /* Zoom Telephonics, Inc. products */