Add more devices from the hps tree. These appear to have come from

OpenBSD's if_ral.c.

I didn't make the LINKSYS4 -> CISCOLINKSYS name change, nor did I
include the RALINK RT2573 that's supported by the rum(4) driver.  I
didn't merge any code changes either.

2 files changed, 17 insertions, 1 deletions

diff --git a/sys/dev/usb/if_ural.c b/sys/dev/usb/if_ural.c
index 1cc40ac13ba3..6bede61e9f9e 100644
--- a/sys/dev/usb/if_ural.c
+++ b/sys/dev/usb/if_ural.c
@@ -78,9 +78,11 @@ static const struct usb_devno ural_devs[] = {
 	{ USB_VENDOR_ASUS,		USB_PRODUCT_ASUS_WL167G },
 	{ USB_VENDOR_ASUS,		USB_PRODUCT_RALINK_RT2570 },
 	{ USB_VENDOR_BELKIN,		USB_PRODUCT_BELKIN_F5D7050 },
+	{ USB_VENDOR_BELKIN,		USB_PRODUCT_BELKIN_F5D7051 },
 	{ USB_VENDOR_CONCEPTRONIC2,	USB_PRODUCT_CONCEPTRONIC2_C54RU },
 	{ USB_VENDOR_DLINK,		USB_PRODUCT_DLINK_DWLG122 },
 	{ USB_VENDOR_GIGABYTE,		USB_PRODUCT_GIGABYTE_GNWBKG },
+	{ USB_VENDOR_GIGABYTE,		USB_PRODUCT_GIGABYTE_GN54G },
 	{ USB_VENDOR_GUILLEMOT,		USB_PRODUCT_GUILLEMOT_HWGUSB254 },
 	{ USB_VENDOR_LINKSYS4,		USB_PRODUCT_LINKSYS4_WUSB54G },
 	{ USB_VENDOR_LINKSYS4,		USB_PRODUCT_LINKSYS4_WUSB54GP },
@@ -95,6 +97,10 @@ static const struct usb_devno ural_devs[] = {
 	{ USB_VENDOR_NOVATECH,		USB_PRODUCT_NOVATECH_NV902 },
 	{ USB_VENDOR_RALINK,		USB_PRODUCT_RALINK_RT2570 },
 	{ USB_VENDOR_RALINK,		USB_PRODUCT_RALINK_RT2570_2 },
+	{ USB_VENDOR_RALINK,		USB_PRODUCT_RALINK_RT2570_3 },
+	{ USB_VENDOR_SIEMENS3,		USB_PRODUCT_SIEMENS3_WL54G },
+	{ USB_VENDOR_SMC,		USB_PRODUCT_SMC_2862WG },
+	{ USB_VENDOR_SPAIRON,		USB_PRODUCT_SPAIRON_WL54G },
 	{ USB_VENDOR_VTECH,		USB_PRODUCT_VTECH_RT2570 },
 	{ USB_VENDOR_ZINWELL,		USB_PRODUCT_ZINWELL_RT2570 }
 };
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 0fc02c8bd447..2f45cddb34dd 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -330,6 +330,7 @@ vendor ACARD		0x0678	ACARD
 vendor PROLIFIC		0x067b	Prolific
 vendor SIEMENS		0x067c	Siemens
 vendor AVANCELOGIC	0x0680	Avance Logic
+vendor SIEMENS3		0x0681	Siemens
 vendor MINOLTA		0x0686	Minolta
 vendor CHPRODUCTS	0x068e	CH Products
 vendor HAGIWARA		0x0693	Hagiwara Sys-Com
@@ -510,6 +511,7 @@ vendor CURITEL		0x106c	Curitel Communications Inc
 vendor PLX		0x10b5	PLX
 vendor ASANTE		0x10bd	Asante
 vendor JRC		0x1145	JRC
+vendor SPAIRON		0x114b	Spairon
 vendor DELORME		0x1163	DeLorme
 vendor SERVERWORKS	0x1166	ServerWorks
 vendor ACERCM		0x1189	Acer Communications & Multimedia
@@ -769,7 +771,9 @@ product BELKIN F5U409		0x0409	F5U409 Serial
 product BELKIN F6C550AVR	0x0551	F6C550-AVR UPS
 product BELKIN F5U120		0x1203	F5U120-PC Hub
 product BELKIN F5D7050		0x7050	F5D7050 wireless adapter
-product BELKIN F5D7050A		0x705a	F5D705A wireless adapter
+product BELKIN F5D7051		0x7051	F5D7051 54g USB Network Adapter
+product BELKIN F5D7050A		0x705a	F5D7050A wireless adapter
+product BELKIN F5D7050_V4000	0x705c	F5D7050 v4000 wireless adapter
 product BELKIN F5D9050V3	0x905b	F5D9050 ver 3 wireless adapter
 
 /* Billionton products */
@@ -1038,6 +1042,7 @@ product GENESYS GL641USB2IDE	0x0702	GL641USB USB-IDE Bridge
 product GENESYS GL641USB_2	0x0760	GL641USB 6-in-1 Card Reader
 
 /* GIGABYTE products */
+product GIGABYTE GN54G		0x8001	GN-54G
 product GIGABYTE GNBR402W	0x8002	GN-BR402W
 product GIGABYTE GNWLBM101	0x8003	GN-WLBM101
 product GIGABYTE GNWBKG		0x8007	GN-WBKG
@@ -1596,6 +1601,7 @@ product RALINK RT2570		0x1706	RT2500USB wireless adapter
 product RALINK RT2570_2		0x2570	RT2500USB wireless adapter
 product RALINK RT2573		0x2573	RT2501USB wireless adapter
 product RALINK RT2671		0x2671	RT2601USB wireless adapter
+product RALINK RT2570_3		0x9020	RT2500USB wireless adapter
 product RALINK RT2573_2		0x9021	RT2501USB wireless adapter
 
 /* ReakTek products */
@@ -1659,6 +1665,7 @@ product SHUTTLE EUSBORCA	0x0325	eUSB ORCA Quad Reader
 
 /* Siemens products */
 product SIEMENS SPEEDSTREAM	0x1001	SpeedStream USB
+product SIEMENS3 WL54G		0x3c06	54g USB Network Adapter
 
 /* Sierra Wireless products */
 product SIERRA MC5720		0x0218	MC5720 Wireless Modem
@@ -1728,6 +1735,9 @@ product SONYERICSSON DCU10	0x0528	USB Cable
 product SOURCENEXT KEIKAI8	0x039f	KeikaiDenwa 8
 product SOURCENEXT KEIKAI8_CHG	0x012e	KeikaiDenwa 8 with charger
 
+/* Spairon */
+product SPAIRON WL54G		0x0110	54g Wireless Network Adapter
+
 /* STMicroelectronics products */
 product STMICRO BIOCPU		0x2016	Biometric Coprocessor
 product STMICRO COMMUNICATOR	0x7554	USB Communicator