svn commit: r211473 - stable/7/sys/dev/usb

[Gavin Atkinson]

Author: gavin
Date: Wed Aug 18 21:51:05 2010
New Revision: 211473
URL: http://svn.freebsd.org/changeset/base/211473

Log:
  Merge r210571 from head:
    Add support for the Corega CG-USBRS232R to uplcom(4)
  
  PR:		usb/129173
  Submitted by:	SHIMAOKA Shunsuke <shimaoka.shunsuke gmail.com>

Modified:
  stable/7/sys/dev/usb/uplcom.c
  stable/7/sys/dev/usb/usbdevs

Modified: stable/7/sys/dev/usb/uplcom.c
==============================================================================
--- stable/7/sys/dev/usb/uplcom.c	Wed Aug 18 21:44:50 2010	(r211472)
+++ stable/7/sys/dev/usb/uplcom.c	Wed Aug 18 21:51:05 2010	(r211473)
@@ -275,6 +275,9 @@ static const struct uplcom_product {
 	/* Mobile Action MA-620 Infrared Adapter */
 	{ USB_VENDOR_MOBILEACTION, USB_PRODUCT_MOBILEACTION_MA620, -1,
 	  TYPE_PL2303X },
+	/* Corega CG-USBRS232R */
+	{ USB_VENDOR_COREGA, USB_PRODUCT_COREGA_CGUSBRS232R, -1,
+	  TYPE_PL2303X },
 	{ 0, 0 }
 };
 

Modified: stable/7/sys/dev/usb/usbdevs
==============================================================================
--- stable/7/sys/dev/usb/usbdevs	Wed Aug 18 21:44:50 2010	(r211472)
+++ stable/7/sys/dev/usb/usbdevs	Wed Aug 18 21:51:05 2010	(r211473)
@@ -1073,6 +1073,7 @@ product COREGA FETHER_USB_TXS	0x000d	FEt
 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 CGUSBRS232R	0x002a	CG-USBRS232R
 product COREGA CGWLUSB2GL	0x002d	CG-WLUSB2GL
 product COREGA CGWLUSB2GPX	0x002e	CG-WLUSB2GPX
 product COREGA WLUSB_11_STICK	0x7613	WLAN USB Stick 11