 @@ -1,14 +1,14 @@
-/*	$NetBSD: uftdi.c,v 1.55 2013/01/20 13:43:24 reinoud Exp $	*/
+/*	$NetBSD: uftdi.c,v 1.56 2013/01/21 19:08:42 mlelstv 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.
 @@ -20,27 +20,27 @@
  * ``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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.55 2013/01/20 13:43:24 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.56 2013/01/21 19:08:42 mlelstv 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>
 @@ -116,26 +116,27 @@ struct ucom_methods uftdi_methods = {
 	uftdi_read,
 	uftdi_write,
 };
 /*
  * The devices default to UFTDI_TYPE_8U232AM.
  * Remember to update uftdi_attach() if it should be UFTDI_TYPE_SIO instead
  */
 static const struct usb_devno uftdi_devs[] = {
 	{ USB_VENDOR_BBELECTRONICS, USB_PRODUCT_BBELECTRONICS_USOTL4 },
 	{ USB_VENDOR_FALCOM, USB_PRODUCT_FALCOM_TWIST },
 	{ USB_VENDOR_FALCOM, USB_PRODUCT_FALCOM_SAMBA },
 	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_232H },
 	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_232RL },
 	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_2232C },
 	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_4232H },
 	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_8U100AX },
 	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_8U232AM },
 	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MHAM_KW },
 	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MHAM_YS },
 	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MHAM_Y6 },
 	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MHAM_Y8 },
 	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MHAM_IC },
 	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MHAM_DB9 },
 	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MHAM_RS232 },
 	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MHAM_Y9 },
 	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_COASTAL_TNCX },
 @@ -515,26 +516,35 @@ uftdi_set(void *vsc, int portno, int reg
 Static int
 uftdi_param(void *vsc, int portno, struct termios *t)
+{
 	struct uftdi_softc *sc = vsc;
 	usb_device_request_t req;
 	usbd_status err;
 	int rate, data, flow;
 	DPRINTF(("uftdi_param: sc=%p\n", sc));
 	if (sc->sc_dying)
 		return (EIO);
 	req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
 	req.bRequest = FTDI_SIO_SET_BITMODE;
 	USETW(req.wValue, FTDI_BITMODE_RESET << 8 | 0x00);
 	USETW(req.wIndex, portno);
 	USETW(req.wLength, 0);
 	err = usbd_do_request(sc->sc_udev, &req, NULL);
 	if (err)
 		return (EIO);
 	switch (sc->sc_type) {
 	case UFTDI_TYPE_SIO:
 		switch (t->c_ospeed) {
 		case 300: rate = ftdi_sio_b300; break;
 		case 600: rate = ftdi_sio_b600; break;
 		case 1200: rate = ftdi_sio_b1200; break;
 		case 2400: rate = ftdi_sio_b2400; break;
 		case 4800: rate = ftdi_sio_b4800; break;
 		case 9600: rate = ftdi_sio_b9600; break;
 		case 19200: rate = ftdi_sio_b19200; break;
 		case 38400: rate = ftdi_sio_b38400; break;
 		case 57600: rate = ftdi_sio_b57600; break;
 		case 115200: rate = ftdi_sio_b115200; break;

 @@ -1,40 +1,41 @@
-/*	$NetBSD: uftdireg.h,v 1.7 2012/08/24 01:36:14 msaitoh Exp $ */
+/*	$NetBSD: uftdireg.h,v 1.8 2013/01/21 19:08:42 mlelstv Exp $ */
 /*
  * Definitions for the FTDI USB Single Port Serial Converter -
  * known as FTDI_SIO (Serial Input/Output application of the chipset)
+ *
  * The device is based on the FTDI FT8U100AX chip. It has a DB25 on one side,
  * USB on the other.
+ *
  * Thanx to FTDI (http://www.ftdi.co.uk) for so kindly providing details
  * of the protocol required to talk to the device and ongoing assistence
  * during development.
+ *
  * Bill Ryder - bryder@sgi.com of Silicon Graphics, Inc. is the original
  * author of this file.
  */
 /* Modified by Lennart Augustsson */
 /* Vendor Request Interface */
-#define FTDI_SIO_RESET 		0 /* Reset the port */
+#define FTDI_SIO_RESET 		0   /* Reset the port */
-#define FTDI_SIO_MODEM_CTRL 	1 /* Set the modem control register */
+#define FTDI_SIO_MODEM_CTRL 	1   /* Set the modem control register */
-#define FTDI_SIO_SET_FLOW_CTRL	2 /* Set flow control register */
+#define FTDI_SIO_SET_FLOW_CTRL	2   /* Set flow control register */
-#define FTDI_SIO_SET_BAUD_RATE	3 /* Set baud rate */
+#define FTDI_SIO_SET_BAUD_RATE	3   /* Set baud rate */
-#define FTDI_SIO_SET_DATA	4 /* Set the data characteristics of the port */
+#define FTDI_SIO_SET_DATA	4   /* Set the data characteristics of the port */
-#define FTDI_SIO_GET_STATUS	5 /* Retrieve current value of status reg */
+#define FTDI_SIO_GET_STATUS	5   /* Retrieve current value of status reg */
-#define FTDI_SIO_SET_EVENT_CHAR	6 /* Set the event character */
+#define FTDI_SIO_SET_EVENT_CHAR	6   /* Set the event character */
-#define FTDI_SIO_SET_ERROR_CHAR	7 /* Set the error character */
+#define FTDI_SIO_SET_ERROR_CHAR	7   /* Set the error character */
 #define FTDI_SIO_SET_BITMODE    11  /* Set FIFO/Serial mode */
 /* Port Identifier Table */
 #define FTDI_PIT_DEFAULT 	0 /* SIOA */
 #define FTDI_PIT_SIOA		1 /* SIOA */
 #define FTDI_PIT_SIOB		2 /* SIOB */
 #define FTDI_PIT_PARALLEL	3 /* Parallel */
 enum uftdi_type {
 	UFTDI_TYPE_SIO,
 	UFTDI_TYPE_8U232AM
 };
 /*
 @@ -335,13 +336,34 @@ enum {
  * Byte 0: Port & length
+ *
  * Offset	Description
  * B0..1	Port
  * B2..7	Length of message - (not including Byte 0)
+ *
  */
 #define FTDI_PORT_MASK 0x0f
 #define FTDI_MSR_MASK 0xf0
 #define FTDI_GET_MSR(p) (((p)[0]) & FTDI_MSR_MASK)
 #define FTDI_GET_LSR(p) ((p)[1])
 #define FTDI_LSR_MASK (~0x60) /* interesting bits */
 #define FTDI_OUT_TAG(len, port) (((len) << 2) | (port))
 /*
  * BmRequestType:  0100 0000B
  * bRequest:       FTDI_SIO_SET_BITMODE
  * wValue:         Bitmode value - see below
  * wIndex:         Port
  * wLength:        0
  * Data:           None
+ *
  * Not all modes are available on all chips
  */
 /* FTDI_SIO_SET_BITMODE */
 #define FTDI_BITMODE_RESET   0x00 /* UART mode */
 #define FTDI_BITMODE_BITBANG 0x01 /* asynchrounous bitbang mode */
 #define FTDI_BITMODE_MPSSE   0x02 /* MPSSE mode */
 #define FTDI_BITMODE_SYNCBB  0x04 /* synchronous bitbang mode */
 #define FTDI_BITMODE_MCU     0x08 /* MCU Host Bus Emulation mode */
 #define FTDI_BITMODE_OPTO    0x10 /* Fast Opto-Isolated Serial Interface Mode */
 #define FTDI_BITMODE_CBUS    0x20 /* Bitbang on CBUS pins */
 #define FTDI_BITMODE_SYNCFF  0x40 /* Synchronous FIFO mode */