summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorDamien Bergamini <damien@cvs.openbsd.org>2009-03-14 15:40:30 +0000
committerDamien Bergamini <damien@cvs.openbsd.org>2009-03-14 15:40:30 +0000
commit78c7b9140fe3b387e79e7e3ff6da1b0edeef2535 (patch)
tree06289d118de08db357d9128173918c8de7f02056 /sys/dev
parenta446bf9293a3d2e42177cb2f2f0a4767780e0238 (diff)
add more run(4) USB ids, clarify some.
from FUKAUMI Naoki. add a HARDWARE section to the run(4) man page to start listing known run(4) devices while i'm at it.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/if_run.c10
-rw-r--r--sys/dev/usb/usbdevs8
2 files changed, 13 insertions, 5 deletions
diff --git a/sys/dev/usb/if_run.c b/sys/dev/usb/if_run.c
index abfdbf21db6..b6056a5695a 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.10 2009/03/14 06:25:24 jsg Exp $ */
+/* $OpenBSD: if_run.c,v 1.11 2009/03/14 15:40:29 damien Exp $ */
/*-
* Copyright (c) 2008,2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -105,7 +105,6 @@ static const struct usb_devno run_devs[] = {
USB_ID(CONCEPTRONIC2, RT2870_6),
USB_ID(PLANEX2, RT2870),
USB_ID(PLANEX2, RT3070),
- USB_ID(PLANEX2, RT3070_2),
USB_ID(DLINK2, RT2870_1),
USB_ID(DLINK2, RT2870_2),
USB_ID(DLINK, RT2870),
@@ -162,7 +161,12 @@ static const struct usb_devno run_devs[] = {
/* Entries not in the Ralink Linux driver. */
USB_ID(DLINK2, DWA130),
- USB_ID(LINKSYS4, WUSB600N)
+ USB_ID(LINKSYS4, WUSB600N),
+ USB_ID(MELCO, WLIUCAG300N),
+ USB_ID(MELCO, WLIUCGN),
+ USB_ID(PLANEX2, GWUS300MINIS),
+ USB_ID(PLANEX2, GWUSBMICRON),
+ USB_ID(COREGA, CGWLUSB300GNM)
};
int run_match(struct device *, void *, void *);
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 4a757b60592..68d6448cc9b 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.411 2009/03/14 06:23:46 jsg Exp $
+$OpenBSD: usbdevs,v 1.412 2009/03/14 15:40:29 damien Exp $
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
/*
@@ -1073,6 +1073,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 CGWLUSB300GNM 0x0042 CG-WLUSB300GNM
product COREGA WLUSB_11_STICK 0x7613 WLAN USB Stick 11
product COREGA FETHER_USB_TXC 0x9601 FEther USB-TXC
@@ -1963,6 +1964,8 @@ product MELCO SG54HP 0x00d8 WLI-U2-SG54HP
product MELCO G54HP 0x00d9 WLI-U2-G54HP
product MELCO KG54L 0x00da WLI-U2-KG54L
product MELCO SG54HG 0x00f4 WLI-U2-SG54HG
+product MELCO WLIUCAG300N 0x012e WLI-UC-AG300N
+product MELCO WLIUCGN 0x015d WLI-UC-GN
/* MetaGeek products */
product METAGEEK WISPY 0x083e Wi-Spy
@@ -2324,8 +2327,9 @@ product PLANEX2 GWUS54GZL 0xc007 GW-US54GZL
product PLANEX2 GWUS54GD 0xed01 GW-US54GD
product PLANEX2 GWUSMM 0xed02 GW-USMM
product PLANEX2 RT2870 0xed06 RT2870
-product PLANEX2 RT3070_2 0xed14 RT3070_2
+product PLANEX2 GWUSBMICRON 0xed14 GW-USMicroN
product PLANEX3 GWUS54GZ 0xab10 GW-US54GZ
+product PLANEX2 GWUS300MINIS 0xab24 GW-US300MiniS
product PLANEX2 RT3070 0xab25 RT3070
/* Plantronics products */