Date: Wed, 18 Aug 2010 21:44:50 +0000 (UTC) From: Gavin Atkinson <gavin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r211472 - in stable/8/sys/dev/usb: . serial Message-ID: <201008182144.o7ILiolN081266@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gavin Date: Wed Aug 18 21:44:50 2010 New Revision: 211472 URL: http://svn.freebsd.org/changeset/base/211472 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/8/sys/dev/usb/serial/uplcom.c stable/8/sys/dev/usb/usbdevs Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cam/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) Modified: stable/8/sys/dev/usb/serial/uplcom.c ============================================================================== --- stable/8/sys/dev/usb/serial/uplcom.c Wed Aug 18 21:39:42 2010 (r211471) +++ stable/8/sys/dev/usb/serial/uplcom.c Wed Aug 18 21:44:50 2010 (r211472) @@ -292,6 +292,8 @@ static const struct usb_device_id uplcom UPLCOM_DEV(PROLIFIC2, WSIM, 0, 0xFFFF, PL2303X), /* Mobile Action MA-620 Infrared Adapter */ UPLCOM_DEV(MOBILEACTION, MA620, 0, 0xFFFF, PL2303X), + /* Corega CG-USBRS232R */ + UPLCOM_DEV(COREGA, CGUSBRS232R, 0, 0xFFFF, PL2303X), }; #undef UPLCOM_DEV Modified: stable/8/sys/dev/usb/usbdevs ============================================================================== --- stable/8/sys/dev/usb/usbdevs Wed Aug 18 21:39:42 2010 (r211471) +++ stable/8/sys/dev/usb/usbdevs Wed Aug 18 21:44:50 2010 (r211472) @@ -1248,6 +1248,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 RT2870_1 0x002f RT2870
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008182144.o7ILiolN081266>