From 2d77f5a4a0c73da983c9383ceb6c49ac2dcfd80d Mon Sep 17 00:00:00 2001
From: avg <avg@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Mon, 25 Jun 2018 08:47:54 +0000
Subject: [PATCH] MFC r333997: uchcom: report detected product based on USB
 product ID

git-svn-id: svn://svn.freebsd.org/base/stable/10@335617 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 sys/dev/usb/serial/uchcom.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/sys/dev/usb/serial/uchcom.c b/sys/dev/usb/serial/uchcom.c
index b9de2d279..32b1996ae 100644
--- a/sys/dev/usb/serial/uchcom.c
+++ b/sys/dev/usb/serial/uchcom.c
@@ -320,13 +320,17 @@ uchcom_attach(device_t dev)
 
 	sc->sc_udev = uaa->device;
 
-	switch (uaa->info.bcdDevice) {
-	case UCHCOM_REV_CH340:
+	switch (uaa->info.idProduct) {
+	case USB_PRODUCT_WCH2_CH341SER:
 		device_printf(dev, "CH340 detected\n");
 		break;
-	default:
+	case USB_PRODUCT_WCH2_CH341SER_2:
 		device_printf(dev, "CH341 detected\n");
 		break;
+	default:
+		device_printf(dev, "New CH340/CH341 product 0x%04x detected\n",
+		    uaa->info.idProduct);
+		break;
 	}
 
 	iface_index = UCHCOM_IFACE_INDEX;
-- 
2.45.0