I-O Data USB-RSAQ5 serial from Masao Uebayashi in NetBSD.

Corega CG-WLUSB2GL WLAN from KIYOHARA Takashi in NetBSD.

5 files changed, 13 insertions, 7 deletions

diff --git a/share/man/man4/rum.4 b/share/man/man4/rum.4
index 35bede232d8..0e38be74a5f 100644
--- a/share/man/man4/rum.4
+++ b/share/man/man4/rum.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rum.4,v 1.30 2007/12/10 10:32:54 jmc Exp $
+.\" $OpenBSD: rum.4,v 1.31 2008/02/22 10:46:57 jsg Exp $
 .\"
 .\" Copyright (c) 2005-2007
 .\"	Damien Bergamini <damien.bergamini@free.fr>
@@ -15,7 +15,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: December 10 2007 $
+.Dd $Mdocdate: February 22 2008 $
 .Os
 .Dt RUM 4
 .Sh NAME
@@ -268,6 +268,7 @@ The following adapters should work:
 .It Buffalo WLI-U2-G54HP
 .It CNet CWD-854 ver F
 .It Conceptronic C54RU ver 2
+.It Corega CG-WLUSB2GL
 .It Corega CG-WLUSB2GO
 .It "D-Link DWL-G122 rev C1"
 .It D-Link WUA-1340
diff --git a/share/man/man4/uplcom.4 b/share/man/man4/uplcom.4
index 7e4ee40a9a6..8f6e8fec741 100644
--- a/share/man/man4/uplcom.4
+++ b/share/man/man4/uplcom.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: uplcom.4,v 1.22 2007/06/01 16:56:26 jmc Exp $
+.\" $OpenBSD: uplcom.4,v 1.23 2008/02/22 10:46:57 jsg Exp $
 .\" $NetBSD: uplcom.4,v 1.6 2001/05/22 00:21:25 jhawk Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 1 2007 $
+.Dd $Mdocdate: February 22 2008 $
 .Dt UPLCOM 4
 .Os
 .Sh NAME
@@ -69,6 +69,7 @@ driver supports the following adapters:
 .It I/O DATA USB-RSAQ
 .It I/O DATA USB-RSAQ2
 .It I/O DATA USB-RSAQ3
+.It I/O DATA USB-RSAQ5
 .It IOGEAR UC-232A
 .It iTegno WM1080A
 .It Leadtek 9531 GPS
diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c
index 07694b6e3ff..fc65669d0e8 100644
--- a/sys/dev/usb/if_rum.c
+++ b/sys/dev/usb/if_rum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rum.c,v 1.67 2008/01/05 04:57:59 deraadt Exp $	*/
+/*	$OpenBSD: if_rum.c,v 1.68 2008/02/22 10:46:57 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr>
@@ -94,6 +94,7 @@ static const struct usb_devno rum_devs[] = {
 	{ USB_VENDOR_CISCOLINKSYS,	USB_PRODUCT_CISCOLINKSYS_WUSB54GC },
 	{ USB_VENDOR_CISCOLINKSYS,	USB_PRODUCT_CISCOLINKSYS_WUSB54GR },
 	{ USB_VENDOR_CONCEPTRONIC2,	USB_PRODUCT_CONCEPTRONIC2_C54RU2 },
+	{ USB_VENDOR_COREGA,		USB_PRODUCT_COREGA_CGWLUSB2GL },
 	{ USB_VENDOR_DICKSMITH,		USB_PRODUCT_DICKSMITH_CWD854F },
 	{ USB_VENDOR_DICKSMITH,		USB_PRODUCT_DICKSMITH_RT2573 },
 	{ USB_VENDOR_DLINK2,		USB_PRODUCT_DLINK2_DWLG122C1 },
diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c
index 64f970c5ef4..3b0fffa4e68 100644
--- a/sys/dev/usb/uplcom.c
+++ b/sys/dev/usb/uplcom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uplcom.c,v 1.48 2008/01/22 17:53:05 okan Exp $	*/
+/*	$OpenBSD: uplcom.c,v 1.49 2008/02/22 10:46:57 jsg Exp $	*/
 /*	$NetBSD: uplcom.c,v 1.29 2002/09/23 05:51:23 simonb Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -159,6 +159,7 @@ static const struct usb_devno uplcom_devs[] = {
 	{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_UCSGT0 },
 	{ USB_VENDOR_HAL, USB_PRODUCT_HAL_IMR001 },
 	{ USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBRSAQ },
+	{ USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBRSAQ5 },
 	{ USB_VENDOR_LEADTEK, USB_PRODUCT_LEADTEK_9531 },
 	{ USB_VENDOR_MOBILEACTION, USB_PRODUCT_MOBILEACTION_MA620 },
 	{ USB_VENDOR_NOKIA, USB_PRODUCT_NOKIA_CA42 },
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 77cbb4d38e8..1a5ea8623bc 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.334 2008/02/19 10:54:24 jsg Exp $
+$OpenBSD: usbdevs,v 1.335 2008/02/22 10:45:15 jsg Exp $
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
 /*
@@ -982,6 +982,7 @@ product COREGA FETHER_USB_TXS	0x000d	FEther USB-TXS
 product COREGA WLANUSB		0x0012	Wireless LAN Stick-11
 product COREGA FETHER_USB2_TX	0x0017	FEther USB2-TX
 product COREGA WLUSB_11_KEY	0x001a	ULUSB-11 Key
+product COREGA CGWLUSB2GL	0x002d	CG-WLUSB2GL
 product COREGA RT2870_1		0x002f	RT2870
 product COREGA RT2870_2		0x003c	RT2870
 product COREGA RT2870_3		0x003f	RT2870
@@ -1440,6 +1441,7 @@ product IODATA ETGUS2		0x0930	ETG-US2
 product IODATA FT232R		0x093c	FT232R
 product IODATA USBRSAQ		0x0a03	RSAQ1 Serial
 product IODATA2 USB2SC		0x0a09	USB2.0-SCSI Bridge USB2-SC
+product IODATA USBRSAQ5		0x0a0e	RSAQ5 Serial
 
 /* Iomega products */
 product IOMEGA ZIP100		0x0001	Zip 100