add a bunch of run devices found in the linux driver

3 files changed, 74 insertions, 5 deletions

diff --git a/share/man/man4/run.4 b/share/man/man4/run.4
index ac9221ed234..32983cff896 100644
--- a/share/man/man4/run.4
+++ b/share/man/man4/run.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: run.4,v 1.33 2011/01/10 16:59:05 damien Exp $
+.\" $OpenBSD: run.4,v 1.34 2012/03/24 15:11:04 jsg Exp $
 .\"
 .\" Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: January 10 2011 $
+.Dd $Mdocdate: March 24 2012 $
 .Dt RUN 4
 .Os
 .Sh NAME
@@ -98,11 +98,14 @@ The following adapters should work:
 .It Belkin F5D8055
 .It Belkin F6D4050 ver 1
 .It Belkin F6D4050 ver 2
+.It Belkin F7D1101 ver 2
 .It Buffalo WLI-UC-AG300N
 .It Buffalo WLI-UC-G300N
+.It Buffalo WLI-UC-G301N
 .It Buffalo WLI-UC-GN
 .It Buffalo WLI-UC-GNHP
 .It Buffalo WLI-UC-GNM
+.It Cisco AM10
 .It Corega CG-WLUSB2GNL
 .It Corega CG-WLUSB2GNR
 .It Corega CG-WLUSB300AGN
@@ -114,6 +117,7 @@ The following adapters should work:
 .It Edimax EW-7711UTn
 .It Edimax EW-7717Un
 .It Edimax EW-7718Un
+.It Edimax EW-7722UTn
 .It Gigabyte GN-WB30N
 .It Gigabyte GN-WB31N
 .It Gigabyte GN-WB32L
@@ -121,9 +125,11 @@ The following adapters should work:
 .It Hawking HWUN1
 .It Hawking HWUN2
 .It Hercules HWNU-300
+.It Linksys AE1000
 .It Linksys WUSB54GC v3
 .It Linksys WUSB600N
 .It Logitec gLAN-W150NU2BK
+.It Logitec LAN-W300N/U2
 .It Mvix Nubbin MS-811N
 .It Planex GW-USMicroN
 .It Planex GW-US300MiniS
@@ -132,12 +138,18 @@ The following adapters should work:
 .It Sitecom WL-301
 .It Sitecom WL-302
 .It Sitecom WL-315
+.It Sitecom WLA-4000
+.It Sitecom WLA-5000
 .It SMC SMCWUSBS-N2
 .It Sweex LW153
 .It Sweex LW303
 .It Sweex LW313
+.It TRENDnet TEW-645UB
 .It Unex DNUR-81
 .It Unex DNUR-82
+.It ZyXEL NWD-211AN
+.It ZyXEL NWD-271N
+.It ZyXEL NWD2105
 .It ZyXEL NWD210N
 .It ZyXEL NWD2205
 .It ZyXEL NWD270N
diff --git a/sys/dev/usb/if_run.c b/sys/dev/usb/if_run.c
index 2165ec04c93..c07feb924d8 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.89 2011/07/03 15:47:17 matthew Exp $	*/
+/*	$OpenBSD: if_run.c,v 1.90 2012/03/24 15:11:04 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2008-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -97,7 +97,9 @@ static const struct usb_devno run_devs[] = {
 	USB_ID(ACCTON,		RT3070_3),
 	USB_ID(ACCTON,		RT3070_4),
 	USB_ID(ACCTON,		RT3070_5),
+	USB_ID(ACCTON,		RT3070_6),
 	USB_ID(AIRTIES,		RT3070),
+	USB_ID(AIRTIES,		RT3070_2),
 	USB_ID(ALLWIN,		RT2070),
 	USB_ID(ALLWIN,		RT2770),
 	USB_ID(ALLWIN,		RT2870),
@@ -123,13 +125,19 @@ static const struct usb_devno run_devs[] = {
 	USB_ID(AZUREWAVE,	RT3070_1),
 	USB_ID(AZUREWAVE,	RT3070_2),
 	USB_ID(AZUREWAVE,	RT3070_3),
+	USB_ID(AZUREWAVE,	RT3070_4),
+	USB_ID(AZUREWAVE,	RT3070_5),
 	USB_ID(BELKIN,		F5D8053V3),
 	USB_ID(BELKIN,		F5D8055),
 	USB_ID(BELKIN,		F5D8055V2),
 	USB_ID(BELKIN,		F6D4050V1),
 	USB_ID(BELKIN,		F6D4050V2),
+	USB_ID(BELKIN,		F7D1101V2),
 	USB_ID(BELKIN,		RT2870_1),
 	USB_ID(BELKIN,		RT2870_2),
+	USB_ID(BEWAN,		RT3070),
+	USB_ID(CISCOLINKSYS,	AE1000),
+	USB_ID(CISCOLINKSYS,	AM10),
 	USB_ID(CISCOLINKSYS2,	RT3070),
 	USB_ID(CISCOLINKSYS3,	RT3070),
 	USB_ID(CONCEPTRONIC2,	RT2870_1),
@@ -162,8 +170,10 @@ static const struct usb_devno run_devs[] = {
 	USB_ID(DLINK2,		RT3070_5),
 	USB_ID(DLINK2,		RT3072),
 	USB_ID(DLINK2,		RT3072_1),
+	USB_ID(DVICO,		RT3070),
 	USB_ID(EDIMAX,		EW7717),
 	USB_ID(EDIMAX,		EW7718),
+	USB_ID(EDIMAX,		EW7722UTN),
 	USB_ID(EDIMAX,		RT2870_1),
 	USB_ID(ENCORE,		RT3070_1),
 	USB_ID(ENCORE,		RT3070_2),
@@ -190,6 +200,7 @@ static const struct usb_devno run_devs[] = {
 	USB_ID(LINKSYS4,	WUSB54GCV3),
 	USB_ID(LINKSYS4,	WUSB600N),
 	USB_ID(LINKSYS4,	WUSB600NV2),
+	USB_ID(LOGITEC,		LANW300NU2),
 	USB_ID(LOGITEC,		RT2870_1),
 	USB_ID(LOGITEC,		RT2870_2),
 	USB_ID(LOGITEC,		RT2870_3),
@@ -198,6 +209,7 @@ static const struct usb_devno run_devs[] = {
 	USB_ID(MELCO,		RT2870_2),
 	USB_ID(MELCO,		WLIUCAG300N),
 	USB_ID(MELCO,		WLIUCG300N),
+	USB_ID(MELCO,		WLIUCG301N),
 	USB_ID(MELCO,		WLIUCGN),
 	USB_ID(MELCO,		WLIUCGNHP),
 	USB_ID(MELCO,		WLIUCGNM),
@@ -214,12 +226,18 @@ static const struct usb_devno run_devs[] = {
 	USB_ID(MSI,		RT3070_9),
 	USB_ID(MSI,		RT3070_10),
 	USB_ID(MSI,		RT3070_11),
+	USB_ID(MSI,		RT3070_12),
+	USB_ID(MSI,		RT3070_13),
+	USB_ID(MSI,		RT3070_14),
+	USB_ID(MSI,		RT3070_15),
+	USB_ID(OVISLINK,	RT3071),
 	USB_ID(OVISLINK,	RT3072),
 	USB_ID(PARA,		RT3070),
 	USB_ID(PEGATRON,	RT2870),
 	USB_ID(PEGATRON,	RT3070),
 	USB_ID(PEGATRON,	RT3070_2),
 	USB_ID(PEGATRON,	RT3070_3),
+	USB_ID(PEGATRON,	RT3072),
 	USB_ID(PHILIPS,		RT2870),
 	USB_ID(PLANEX2,		GWUS300MINIS),
 	USB_ID(PLANEX2,		GWUSMICRO300),
@@ -252,8 +270,10 @@ static const struct usb_devno run_devs[] = {
 	USB_ID(SITECOMEU,	RT2870_1),
 	USB_ID(SITECOMEU,	RT2870_2),
 	USB_ID(SITECOMEU,	RT2870_3),
+	USB_ID(SITECOMEU,	RT3070_1),
 	USB_ID(SITECOMEU,	RT3072_3),
 	USB_ID(SITECOMEU,	RT3072_4),
+	USB_ID(SITECOMEU,	RT3072_5),
 	USB_ID(SITECOMEU,	WL302),
 	USB_ID(SITECOMEU,	WL315),
 	USB_ID(SITECOMEU,	WL321),
@@ -264,13 +284,17 @@ static const struct usb_devno run_devs[] = {
 	USB_ID(SITECOMEU,	WL345),
 	USB_ID(SITECOMEU,	WL349V4),
 	USB_ID(SITECOMEU,	WL608),
+	USB_ID(SITECOMEU,	WLA4000),
+	USB_ID(SITECOMEU,	WLA5000),
 	USB_ID(SPARKLAN,	RT2870_1),
+	USB_ID(SPARKLAN,	RT2870_2),
 	USB_ID(SPARKLAN,	RT3070),
 	USB_ID(SWEEX2,		LW153),
 	USB_ID(SWEEX2,		LW303),
 	USB_ID(SWEEX2,		LW313),
 	USB_ID(TOSHIBA,		RT3070),
 	USB_ID(UMEDIA,		RT2870_1),
+	USB_ID(UMEDIA,		TEW645UB),
 	USB_ID(ZCOM,		RT2870_1),
 	USB_ID(ZCOM,		RT2870_2),
 	USB_ID(ZINWELL,		RT2870_1),
@@ -278,8 +302,11 @@ static const struct usb_devno run_devs[] = {
 	USB_ID(ZINWELL,		RT3070),
 	USB_ID(ZINWELL,		RT3072_1),
 	USB_ID(ZINWELL,		RT3072_2),
+	USB_ID(ZYXEL,		NWD2105),
+	USB_ID(ZYXEL,		NWD211AN),
 	USB_ID(ZYXEL,		RT2870_1),
-	USB_ID(ZYXEL,		RT2870_2)
+	USB_ID(ZYXEL,		RT2870_2),
+	USB_ID(ZYXEL,		RT3070)
 };
 
 int		run_match(struct device *, void *, void *);
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 11808971961..059f2c722a0 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.575 2012/03/24 08:30:31 fgsch Exp $
+$OpenBSD: usbdevs,v 1.576 2012/03/24 15:07:47 jsg Exp $
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
 /*
@@ -454,6 +454,7 @@ vendor VTECH		0x0f88	VTech
 vendor FALCOM		0x0f94	Falcom Wireless Communications
 vendor RIM		0x0fca	Research In Motion
 vendor DYNASTREAM	0x0fcf	Dynastream Innovations
+vendor DVICO		0x0fe9	DViCO
 vendor QUALCOMM2	0x1004	Qualcomm
 vendor MOTOROLA4	0x100d	Motorola
 vendor HP3		0x103c	Hewlett Packard
@@ -700,6 +701,7 @@ 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 RT3070_6		0xa703	RT3070
 product ACCTON AR9280		0xa704	AR9280+AR7010
 product ACCTON RT2870_1		0xb522	RT2870
 product ACCTON RTL8192SU	0xc512	RTL8192SU
@@ -790,6 +792,7 @@ product AIRPRIME PC5220		0x0112	AirPrime CDMA Wireless EVDO card
 product AINCOMM AWU2000B	0x1001	AWU2000B
 
 /* AirTies products */
+product AIRTIES RT3070_2	0x2012	RT3070
 product AIRTIES RT3070		0x2310	RT3070
 
 /* AirVast Technology products */
@@ -1027,9 +1030,11 @@ product AZUREWAVE RT3070_1	0x3273	RT3070
 product AZUREWAVE RT3070_2	0x3284	RT3070
 product AZUREWAVE RT3070_3	0x3305	RT3070
 product AZUREWAVE RTL8192SU_1	0x3306	RTL8192SU
+product AZUREWAVE RT3070_4	0x3307	RT3070
 product AZUREWAVE RTL8192SU_2	0x3309	RTL8192SU
 product AZUREWAVE RTL8192SU_3	0x3310	RTL8192SU
 product AZUREWAVE RTL8192SU_4	0x3311	RTL8192SU
+product AZUREWAVE RT3070_5	0x3321	RT3070
 product AZUREWAVE RTL8192SU_5	0x3325	RTL8192SU
 product AZUREWAVE AR9271_1	0x3327	AR9271
 product AZUREWAVE AR9271_2	0x3328	AR9271
@@ -1108,12 +1113,14 @@ product BELKIN F5D9050V3	0x905b	F5D9050 ver 3
 product BELKIN F6D4050V1	0x935a	F6D4050 ver 1
 product BELKIN F6D4050V2	0x935b	F6D4050 ver 2
 product BELKIN RTL8192SU_3	0x945a	RTL8192SU
+product BELKIN F7D1101V2	0x945b	F7D1101 v2
 
 /* Belkin(2) products */
 product BELKIN2 F5U002		0x0002	F5U002 Parallel
 
 /* Bewan products */
 product BEWAN BWIFI_USB54AR	0x1196	BWIFI-USB54AR
+product BEWAN RT3070		0x7712	RT3070
 
 /* Billionton products */
 product BILLIONTON USB100	0x0986	USB100N 10/100 Ethernet
@@ -1199,6 +1206,8 @@ product CISCOLINKSYS WUSB54GC	0x0020	WUSB54GC
 product CISCOLINKSYS WUSB54GR	0x0023	WUSB54GR
 product CISCOLINKSYS WUSBF54G	0x0024	WUSBF54G
 product CISCOLINKSYS WUSB200	0x0028	WUSB200
+product CISCOLINKSYS AE1000	0x002f	AE1000
+product CISCOLINKSYS AM10	0x0031	AM10
 product CISCOLINKSYS2 RT3070	0x4001	RT3070
 product CISCOLINKSYS3 RT3070	0x0101	RT3070
 
@@ -1457,6 +1466,9 @@ product DREAMLINK ULMB1		0x0013	USB LED Message Board v1.0
 product DRESDENELEC STB		0x0001	Sensor Terminal
 product DRESDENELEC WHT		0x0004	Wireless Terminal
 
+/* DViCO products */
+product DVICO RT3070		0xb307	RT3070
+
 /* Dynastream Innovations */
 product DYNASTREAM ANTDEVBOARD	0x1003	ANT dev board
 product DYNASTREAM ANT2USB	0x1004	ANT2USB
@@ -1473,6 +1485,7 @@ product EDIMAX RTL8192SU_3	0x7622	RTL8192SU
 product EDIMAX RT2870_1		0x7711	RT2870
 product EDIMAX EW7717		0x7717	EW-7717
 product EDIMAX EW7718		0x7718	EW-7718
+product EDIMAX EW7722UTN	0x7722	EW-7722UTn
 product EDIMAX RTL8188CU	0x7811	RTL8188CU
 product EDIMAX RTL8192CU	0x7822	RTL8192CU
 
@@ -2293,6 +2306,7 @@ product LOGITEC	RTL8187		0x010c	RTL8187
 product LOGITEC RT2870_1	0x0162	RT2870
 product LOGITEC RT2870_2	0x0163	RT2870
 product LOGITEC RT2870_3	0x0164	RT2870
+product LOGITEC LANW300NU2	0x0166	LAN-W300N/U2
 product LOGITEC RT3020		0x0168	RT3020
 
 /* Logitech products */
@@ -2663,6 +2677,7 @@ product MELCO RT2870_1		0x0148	RT2870
 product MELCO RT2870_2		0x0150	RT2870
 product MELCO WLIUCGNHP		0x0158	WLI-UC-GNHP
 product MELCO WLIUCGN		0x015d	WLI-UC-GN
+product MELCO WLIUCG301N	0x016f	WLI-UC-G301N
 product MELCO WLIUCGNM		0x01a2	WLI-UC-GNM
 
 /* MetaGeek tagged products */
@@ -2698,9 +2713,13 @@ product MSI RT2573_2		0x6877	RT2573
 product MSI RT3070_4		0x6899	RT3070
 product MSI RT3070_5		0x821a	RT3070
 product MSI RT3070_10		0x822a	RT3070
+product MSI RT3070_12		0x822b	RT3070
+product MSI RT3070_13		0x822c	RT3070
 product MSI RT2573_3		0xa861	RT2573
 product MSI RT3070_6		0x870a	RT3070
 product MSI RT3070_11		0x871a	RT3070
+product MSI RT3070_14		0x871b	RT3070
+product MSI RT3070_15		0x871c	RT3070
 product MSI RT3070_7		0x899a	RT3070
 product MSI RT2573_4		0xa874	RT2573
 product MSI AX88772A		0xa877	AX88772A
@@ -2966,6 +2985,7 @@ product OTI SOLID		0x6803	Solid state disk
 product OTI DKU5		0x6858	DKU-5 Serial
 
 /* OvisLink product */
+product OVISLINK RT3071		0x3071	RT3071
 product OVISLINK RT3072		0x3072	RT3072
 
 /* Palm Computing, Inc. product */
@@ -3025,6 +3045,7 @@ product PEGATRON RT2870		0x0002	RT2870
 product PEGATRON RT3070		0x000c	RT3070
 product PEGATRON RT3070_2	0x000e	RT3070
 product PEGATRON RT3070_3	0x0010	RT3070
+product PEGATRON RT3072		0x0011	RT3072
 
 /* Pen Driver */
 product PEN USBREADER		0x0240	6 in 1
@@ -3548,7 +3569,11 @@ product SITECOMEU RT3072_3	0x0047	RT3072
 product SITECOMEU RT3072_4	0x0048	RT3072
 product SITECOMEU WL349V1	0x004b	WL-349 v1
 product SITECOMEU WL349V4	0x0050	WL-349 v4
+product SITECOMEU RT3070_1	0x0051	RT3070
 product SITECOMEU RTL8188CU	0x0052	RTL8188CU
+product SITECOMEU RT3072_5	0x005f	RT3072
+product SITECOMEU WLA4000	0x0060	WLA-4000
+product SITECOMEU WLA5000	0x0062	WLA-5000
 product SITECOMEU LN028		0x061c	LN-028
 product SITECOMEU LN030		0x0021	LN-030
 product SITECOMEU WL113		0x9071	WL-113
@@ -3627,6 +3652,7 @@ product SOURCENEXT KEIKAI8_CHG	0x012e	KeikaiDenwa 8 with charger
 product SPARKLAN RT2573		0x0004	RT2573
 product SPARKLAN RT2870_1	0x0006	RT2870
 product SPARKLAN RT3070		0x0010	RT3070
+product SPARKLAN RT2870_2	0x0012	RT2870
 
 /* Speed Dragon Multimedia products */
 product SPEEDDRAGON MS3303H	0x110b	MS3303H Serial
@@ -3812,6 +3838,7 @@ product UMEDIA TEW429UB_A	0x300a	TEW-429UB_A
 product UMEDIA TEW429UB		0x300b	TEW-429UB
 product UMEDIA TEW429UBC1	0x300d	TEW-429UB C1
 product UMEDIA RT2870_1		0x300e	RT2870
+product UMEDIA TEW645UB		0x3013	TEW-645UB
 product UMEDIA ALL0298V2	0x3204	ALL0298 v2
 product UMEDIA AR5523_2		0x3205	AR5523
 product UMEDIA AR5523_2_NF	0x3206	AR5523
@@ -4018,6 +4045,9 @@ product ZYXEL G202		0x3410	G-202
 product ZYXEL RT2573		0x3415	RT2573
 product ZYXEL RT2870_1		0x3416	RT2870
 product ZYXEL NWD271N		0x3417	NWD-271N
+product ZYXEL NWD211AN		0x3418	NWD-211AN
 product ZYXEL RT2870_2		0x341a	RT2870
+product ZYXEL NWD2105		0x341e	NWD2105
 product ZYXEL RTL8192CU		0x341f	RTL8192CU
+product ZYXEL RT3070		0x343e	RT3070
 product ZYXEL PRESTIGE		0x401a	Prestige