PERFORCE change 168985 for review

[Hans Petter Selasky]

http://perforce.freebsd.org/chv.cgi?CH=168985

Change 168985 by hselasky at hselasky_laptop001 on 2009/09/28 19:22:03

	
	USB serial:
	 - fix panic with uchcom at attach.
	 - add new USB ID (Not working yet - use uch341 driver until further)

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/serial/uchcom.c#13 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/serial/uchcom.c#13 (text+ko) ====

@@ -206,6 +206,7 @@
 
 static const struct usb_device_id uchcom_devs[] = {
 	{USB_VPI(USB_VENDOR_WCH, USB_PRODUCT_WCH_CH341SER, 0)},
+	{USB_VPI(0x1a86, 0x7523, 0)},
 };
 
 /* protypes */
@@ -213,6 +214,7 @@
 static int	uchcom_pre_param(struct ucom_softc *, struct termios *);
 static void	uchcom_cfg_get_status(struct ucom_softc *, uint8_t *,
 		    uint8_t *);
+static void	uchcom_cfg_open(struct ucom_softc *ucom);
 static void	uchcom_cfg_param(struct ucom_softc *, struct termios *);
 static void	uchcom_cfg_set_break(struct ucom_softc *, uint8_t);
 static void	uchcom_cfg_set_dtr(struct ucom_softc *, uint8_t);
@@ -275,6 +277,7 @@
 	.ucom_cfg_set_dtr = &uchcom_cfg_set_dtr,
 	.ucom_cfg_set_rts = &uchcom_cfg_set_rts,
 	.ucom_cfg_set_break = &uchcom_cfg_set_break,
+	.ucom_cfg_open = &uchcom_cfg_open,
 	.ucom_cfg_param = &uchcom_cfg_param,
 	.ucom_pre_param = &uchcom_pre_param,
 	.ucom_start_read = &uchcom_start_read,
@@ -341,14 +344,6 @@
 		    "error=%s\n", usbd_errstr(error));
 		goto detach;
 	}
-	/*
-	 * Do the initialization during attach so that the system does not
-	 * sleep during open:
-	 */
-	uchcom_update_version(sc);
-	uchcom_clear_chip(sc);
-	uchcom_reset_chip(sc);
-	uchcom_update_status(sc);
 
 	sc->sc_dtr = 1;
 	sc->sc_rts = 1;
@@ -713,18 +708,29 @@
 	uchcom_set_dtrrts(sc);
 }
 
+static void
+uchcom_cfg_open(struct ucom_softc *ucom)
+{
+	struct uchcom_softc *sc = ucom->sc_parent;
+
+	DPRINTF("\n");
+
+	uchcom_update_version(sc);
+	uchcom_clear_chip(sc);
+	uchcom_reset_chip(sc);
+	uchcom_update_status(sc);
+}
+
 static int
 uchcom_pre_param(struct ucom_softc *ucom, struct termios *t)
 {
 	struct uchcom_divider dv;
 
 	switch (t->c_cflag & CSIZE) {
-	case CS5:
-	case CS6:
-	case CS7:
+	case CS8:
+		break;
+	default:
 		return (EIO);
-	default:
-		break;
 	}
 
 	if (uchcom_calc_divider_settings(&dv, t->c_ospeed)) {