 @@ -1,14 +1,14 @@
-/*	$NetBSD: uftdi.c,v 1.40 2009/04/21 16:26:01 taca Exp $	*/
+/*	$NetBSD: uftdi.c,v 1.41 2009/05/24 16:24:25 nisimura Exp $	*/
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net).
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -19,32 +19,28 @@
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * FTDI FT8U100AX serial adapter driver
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.40 2009/04/21 16:26:01 taca Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.41 2009/05/24 16:24:25 nisimura Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdevs.h>
 @@ -54,52 +50,54 @@ __KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.
 #include <dev/usb/uftdireg.h>
 #ifdef UFTDI_DEBUG
 #define DPRINTF(x)	if (uftdidebug) printf x
 #define DPRINTFN(n,x)	if (uftdidebug>(n)) printf x
 int uftdidebug = 0;
 #else
 #define DPRINTF(x)
 #define DPRINTFN(n,x)
 #endif
 #define UFTDI_CONFIG_INDEX	0
 #define UFTDI_IFACE_INDEX	0
-#define UFTDI_MAX_PORTS		2
+#define UFTDI_MAX_PORTS		4
 /*
  * These are the maximum number of bytes transferred per frame.
  * The output buffer size cannot be increased due to the size encoding.
  */
 #define UFTDIIBUFSIZE 64
 #define UFTDIOBUFSIZE 64
 struct uftdi_softc {
 	USBBASEDEVICE		sc_dev;		/* base device */
 	usbd_device_handle	sc_udev;	/* device */
 	usbd_interface_handle	sc_iface[UFTDI_MAX_PORTS];	/* interface */
 	enum uftdi_type		sc_type;
 	u_int			sc_hdrlen;
 	u_int			sc_numports;
 	u_int			sc_chiptype;
 	u_char			sc_msr;
 	u_char			sc_lsr;
 	device_ptr_t		sc_subdev[UFTDI_MAX_PORTS];
 	u_char			sc_dying;
 	u_int			last_lcr;
 };
 Static void	uftdi_get_status(void *, int portno, u_char *lsr, u_char *msr);
 Static void	uftdi_set(void *, int, int, int);
 Static int	uftdi_param(void *, int, struct termios *);
 Static int	uftdi_open(void *sc, int portno);
 Static void	uftdi_read(void *sc, int portno, u_char **ptr,u_int32_t *count);
 Static void	uftdi_write(void *sc, int portno, u_char *to, u_char *from,
 			    u_int32_t *count);
 Static void	uftdi_break(void *sc, int portno, int onoff);
 struct ucom_methods uftdi_methods = {
 	uftdi_get_status,
 @@ -169,70 +167,76 @@ USB_MATCH(uftdi)
 	DPRINTFN(20,("uftdi: vendor=0x%x, product=0x%x\n",
 		     uaa->vendor, uaa->product));
         return (uftdi_lookup(uaa->vendor, uaa->product) != NULL ?
                 UMATCH_VENDOR_PRODUCT : UMATCH_NONE);
+}
 USB_ATTACH(uftdi)
+{
 	USB_ATTACH_START(uftdi, sc, uaa);
 	usbd_device_handle dev = uaa->device;
 	usbd_interface_handle iface;
 	usb_device_descriptor_t *ddesc;
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
 	char *devinfop;
 	const char *devname = device_xname(self);
 	int i,idx;
 	usbd_status err;
 	struct ucom_attach_args uca;
 	DPRINTFN(10,("\nuftdi_attach: sc=%p\n", sc));
 	/* Move the device into the configured state. */
 	err = usbd_set_config_index(dev, UFTDI_CONFIG_INDEX, 1);
 	if (err) {
 		aprint_error("\n%s: failed to set configuration, err=%s\n",
 		       devname, usbd_errstr(err));
 		goto bad;
+	}
 	devinfop = usbd_devinfo_alloc(dev, 0);
 	USB_ATTACH_SETUP;
 	aprint_normal_dev(self, "%s\n", devinfop);
 	usbd_devinfo_free(devinfop);
 	sc->sc_dev = self;
 	sc->sc_udev = dev;
 	sc->sc_numports = 1;
-	switch( uaa->vendor ) {
+	sc->sc_type = UFTDI_TYPE_8U232AM; /* most devices are post-8U232AM */
-	case USB_VENDOR_FTDI:
+	sc->sc_hdrlen = 0;
-		switch (uaa->product) {
+	if (uaa->vendor == USB_VENDOR_FTDI
-		case USB_PRODUCT_FTDI_SERIAL_8U100AX:
+	    && uaa->product == USB_PRODUCT_FTDI_SERIAL_8U100AX) {
-			sc->sc_type = UFTDI_TYPE_SIO;
+		sc->sc_type = UFTDI_TYPE_SIO;
-			sc->sc_hdrlen = 1;
+		sc->sc_hdrlen = 1;
 			break;
 		case USB_PRODUCT_FTDI_SERIAL_2232C:
-			sc->sc_numports = 2;
+	ddesc = usbd_get_device_descriptor(dev);
-			/* FALLTHROUGH */
+	sc->sc_chiptype = UGETW(ddesc->bcdDevice);
-		default:		/* Most uftdi devices are 8U232AM */
+	switch (sc->sc_chiptype) {
-			sc->sc_type = UFTDI_TYPE_8U232AM;
+	case 0x500: /* 2232D */
-			sc->sc_hdrlen = 0;
+	case 0x700: /* 2232H */
 		sc->sc_numports = 2;
 		break;
 	case 0x800: /* 4232H */
 		sc->sc_numports = 4;
 		break;
 	case 0x200: /* 232/245AM */
 	case 0x400: /* 232/245BL */
 	case 0x600: /* 232/245R */
 	default:
 		break;
 	default:		/* Most uftdi devices are 8U232AM */
 		sc->sc_type = UFTDI_TYPE_8U232AM;
 		sc->sc_hdrlen = 0;
+	}
 	for (idx = UFTDI_IFACE_INDEX; idx < sc->sc_numports; idx++) {
 		err = usbd_device2interface_handle(dev, idx, &iface);
 		if (err) {
 			aprint_error(
 			    "\n%s: failed to get interface idx=%d, err=%s\n",
 			    devname, idx, usbd_errstr(err));
 			goto bad;
+		}
 		id = usbd_get_interface_descriptor(iface);
 @@ -276,28 +280,28 @@ USB_ATTACH(uftdi)
 		uca.portno = FTDI_PIT_SIOA + idx;
 		/* bulkin, bulkout set above */
 		uca.ibufsize = UFTDIIBUFSIZE;
 		uca.obufsize = UFTDIOBUFSIZE - sc->sc_hdrlen;
 		uca.ibufsizepad = UFTDIIBUFSIZE;
 		uca.opkthdrlen = sc->sc_hdrlen;
 		uca.device = dev;
 		uca.iface = iface;
 		uca.methods = &uftdi_methods;
 		uca.arg = sc;
 		uca.info = NULL;
 		DPRINTF(("uftdi: in=0x%x out=0x%x\n", uca.bulkin, uca.bulkout));
-		sc->sc_subdev[idx] = config_found_sm_loc(self, "ucombus", NULL, &uca,
+		sc->sc_subdev[idx] = config_found_sm_loc(self, "ucombus", NULL,
-											ucomprint, ucomsubmatch);
+		    &uca, ucomprint, ucomsubmatch);
+	}
 	usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev,
 			   USBDEV(sc->sc_dev));
 	USB_ATTACH_SUCCESS_RETURN;
 bad:
 	DPRINTF(("uftdi_attach: ATTACH ERROR\n"));
 	sc->sc_dying = 1;
 	USB_ATTACH_ERROR_RETURN;
+}