diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2010-02-20 11:44:57 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2010-02-20 11:44:57 +0000 |
| commit | 0a0e9bf0d0a9d2daab6d5ece6de88b79574510f9 (patch) | |
| tree | 7deeebd5cc82952972e2936f4e5520c666aa2d50 | |
| parent | f9e48941852aef6911630ca6a293fc4ba080f4f6 (diff) | |
Match on new CH341A in uchcom and correctly name the CH340 device,
from looking at the windows driver.
| -rw-r--r-- | sys/dev/usb/uchcom.c | 5 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/usb/uchcom.c b/sys/dev/usb/uchcom.c index 8cc4813e5e9..a79c59d3e02 100644 --- a/sys/dev/usb/uchcom.c +++ b/sys/dev/usb/uchcom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uchcom.c,v 1.9 2009/10/13 19:33:17 pirofti Exp $ */ +/* $OpenBSD: uchcom.c,v 1.10 2010/02/20 11:44:56 jsg Exp $ */ /* $NetBSD: uchcom.c,v 1.1 2007/09/03 17:57:37 tshiozak Exp $ */ /* @@ -222,7 +222,8 @@ struct ucom_methods uchcom_methods = { static const struct usb_devno uchcom_devs[] = { { USB_VENDOR_WCH, USB_PRODUCT_WCH_CH341 }, - { USB_VENDOR_WCH2, USB_PRODUCT_WCH2_CH341 }, + { USB_VENDOR_WCH2, USB_PRODUCT_WCH2_CH340 }, + { USB_VENDOR_WCH2, USB_PRODUCT_WCH2_CH341A } }; #define uchcom_lookup(v, p) usb_lookup(uchcom_devs, v, p) diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 8d3b65a57a3..ff542346b17 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -1,4 +1,4 @@ -$OpenBSD: usbdevs,v 1.470 2010/02/08 22:22:09 mpf Exp $ +$OpenBSD: usbdevs,v 1.471 2010/02/20 11:44:56 jsg Exp $ /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */ /* @@ -3226,7 +3226,8 @@ product OPTION GTICON322 0xd033 GlobeTrotter Icon322 storage /* WCH/QinHeng Electronics */ product WCH CH341 0x5523 CH341 serial/parallel -product WCH2 CH341 0x7523 CH341 serial/parallel +product WCH2 CH341A 0x5523 CH341A serial/parallel +product WCH2 CH340 0x7523 CH340 serial/parallel /* Wacom products */ product WACOM CT0405U 0x0000 CT-0405-U Tablet |