svn commit: r240567 - in stable/9/sys/dev/usb: . serial

[Gavin Atkinson]

Author: gavin
Date: Sun Sep 16 18:17:39 2012
New Revision: 240567
URL: http://svn.freebsd.org/changeset/base/240567

Log:
  Merge r240118 from head:
  
    Support another uchcom(4) device.

Modified:
  stable/9/sys/dev/usb/serial/uchcom.c
  stable/9/sys/dev/usb/usbdevs
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/usb/serial/uchcom.c
==============================================================================
--- stable/9/sys/dev/usb/serial/uchcom.c	Sun Sep 16 16:58:49 2012	(r240566)
+++ stable/9/sys/dev/usb/serial/uchcom.c	Sun Sep 16 18:17:39 2012	(r240567)
@@ -207,6 +207,7 @@ static const struct uchcom_divider_recor
 static const STRUCT_USB_HOST_ID uchcom_devs[] = {
 	{USB_VPI(USB_VENDOR_WCH, USB_PRODUCT_WCH_CH341SER, 0)},
 	{USB_VPI(USB_VENDOR_WCH2, USB_PRODUCT_WCH2_CH341SER, 0)},
+	{USB_VPI(USB_VENDOR_WCH2, USB_PRODUCT_WCH2_CH341SER_2, 0)},
 };
 
 /* protypes */

Modified: stable/9/sys/dev/usb/usbdevs
==============================================================================
--- stable/9/sys/dev/usb/usbdevs	Sun Sep 16 16:58:49 2012	(r240566)
+++ stable/9/sys/dev/usb/usbdevs	Sun Sep 16 18:17:39 2012	(r240567)
@@ -3456,6 +3456,7 @@ product WAVESENSE JAZZ		0xaaaa	Jazz bloo
 
 /* WCH products */
 product WCH CH341SER		0x5523	CH341/CH340 USB-Serial Bridge
+product WCH2 CH341SER_2		0x5523	CH341/CH340 USB-Serial Bridge
 product WCH2 CH341SER		0x7523	CH341/CH340 USB-Serial Bridge
 
 /* Western Digital products */