 @@ -1,14 +1,14 @@
-/*	$NetBSD: ucycom.c,v 1.26 2009/07/24 06:50:40 skrll Exp $	*/
+/*	$NetBSD: ucycom.c,v 1.27 2009/07/24 06:54:10 skrll Exp $	*/
 /*
  * Copyright (c) 2005 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Nick Hudson
+ *
  * 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.
 @@ -28,27 +28,27 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * This code is based on the ucom driver.
  */
 /*
  * Device driver for Cypress CY7C637xx and CY7C640/1xx series USB to
  * RS232 bridges.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ucycom.c,v 1.26 2009/07/24 06:50:40 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucycom.c,v 1.27 2009/07/24 06:54:10 skrll Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/sysctl.h>
 #include <sys/tty.h>
 #include <sys/file.h>
 #include <sys/vnode.h>
 #include <sys/kauth.h>
 @@ -342,38 +342,38 @@ ucycomopen(dev_t dev, int flag, int mode
 		/*
 		 * Initialize the termios status to the defaults.  Add in the
 		 * sticky bits from TIOCSFLAGS.
 		 */
 		t.c_ispeed = 0;
 		t.c_ospeed = TTYDEF_SPEED;
 		t.c_cflag = TTYDEF_CFLAG;
 		if (ISSET(sc->sc_swflags, TIOCFLAG_CLOCAL))
 			SET(t.c_cflag, CLOCAL);
 		if (ISSET(sc->sc_swflags, TIOCFLAG_CRTSCTS))
 			SET(t.c_cflag, CRTSCTS);
 		if (ISSET(sc->sc_swflags, TIOCFLAG_MDMBUF))
 			SET(t.c_cflag, MDMBUF);
 		tp->t_ospeed = 0;
 		(void) ucycomparam(tp, &t);
 		tp->t_iflag = TTYDEF_IFLAG;
 		tp->t_oflag = TTYDEF_OFLAG;
 		tp->t_lflag = TTYDEF_LFLAG;
 		ttychars(tp);
 		ttsetwater(tp);
 		/* Allocate an output report buffer */
 		sc->sc_obuf = malloc(sc->sc_olen, M_USBDEV, M_WAITOK);
 		DPRINTF(("ucycomopen: sc->sc_obuf=%p\n", sc->sc_obuf));
 #if 0
 		/* XXX Don't do this as for some reason trying to do an
 		 * XXX interrupt out transfer at this point means everything
 		 * XXX gets stuck!?!
 		 */
 		/*
 		 * Turn on DTR.  We must always do this, even if carrier is not
 		 * present, because otherwise we'd have to use TIOCSDTR
 		 * immediately after setting CLOCAL, which applications do not
 		 * expect.  We always assert DTR while the device is open
 		 * unless explicitly requested to deassert it.
 @@ -465,86 +465,86 @@ ucycomstart(struct tty *tp)
 	if (ttypull(tp) == 0)
 		goto out;
 	/* Grab the first contiguous region of buffer space. */
 	data = tp->t_outq.c_cf;
 	cnt = ndqb(&tp->t_outq, 0);
 	if (cnt == 0) {
 		DPRINTF(("ucycomstart: cnt == 0\n"));
 		goto out;
+	}
 	SET(tp->t_state, TS_BUSY);
 	/*
 	 * The 8 byte output report uses byte 0 for control and byte
 	 * count.
+	 *
 	 * The 32 byte output report uses byte 0 for control. Byte 1
 	 * is used for byte count.
 	 */
 	memset(sc->sc_obuf, 0, sc->sc_olen);
 	len = cnt;
 	switch (sc->sc_olen) {
 	case 8:
 		if (cnt > sc->sc_olen - 1) {
 			DPRINTF(("ucycomstart(8): big buffer %d chars\n", len));
 			len = sc->sc_olen - 1;
+		}
 		memcpy(sc->sc_obuf + 1, data, len);
 		sc->sc_obuf[0] = len | sc->sc_mcr;
 		DPRINTF(("ucycomstart(8): sc->sc_obuf[0] = %d | %d = %d\n", len,
 		    sc->sc_mcr, sc->sc_obuf[0]));
 #ifdef UCYCOM_DEBUG
 		if (ucycomdebug > 10) {
 			u_int32_t i;
 			u_int8_t *d = data;
 			DPRINTF(("ucycomstart(8): data ="));
 			for (i = 0; i < len; i++)
 				DPRINTF((" %02x", d[i]));
 			DPRINTF(("\n"));
+		}
 #endif
 		break;
 	case 32:
 		if (cnt > sc->sc_olen - 2) {
 			DPRINTF(("ucycomstart(32): big buffer %d chars\n",
 			    len));
 			len = sc->sc_olen - 2;
+		}
 		memcpy(sc->sc_obuf + 2, data, len);
 		sc->sc_obuf[0] = sc->sc_mcr;
 		sc->sc_obuf[1] = len;
 		DPRINTF(("ucycomstart(32): sc->sc_obuf[0] = %d\n"
 		    "sc->sc_obuf[1] = %d\n", sc->sc_obuf[0], sc->sc_obuf[1]));
 #ifdef UCYCOM_DEBUG
 		if (ucycomdebug > 10) {
 			u_int32_t i;
 			u_int8_t *d = data;
 			DPRINTF(("ucycomstart(32): data ="));
 			for (i = 0; i < len; i++)
 				DPRINTF((" %02x", d[i]));
 			DPRINTF(("\n"));
+		}
 #endif
 		break;
 	default:
         	DPRINTFN(2,("ucycomstart: unknown output report size (%zd)\n",
 		    sc->sc_olen));
 		goto out;
+	}
 	splx(s);
 #ifdef UCYCOM_DEBUG
 	if (ucycomdebug > 5) {
 		int i;
 		if (len != 0) {
 			DPRINTF(("ucycomstart: sc->sc_obuf[0..%zd) =",
 @@ -789,27 +789,27 @@ ucycomioctl(dev_t dev, u_long cmd, void
 	splx(s);
 	return (err);
+}
 int
 ucycompoll(dev_t dev, int events, struct lwp *l)
+{
 	struct ucycom_softc *sc =
 	    device_lookup_private(&ucycom_cd, UCYCOMUNIT(dev));
 	struct tty *tp = sc->sc_tty;
 	int err;
 	DPRINTF(("ucycompoll: sc=%p, tp=%p, events=%d, lwp=%p\n", sc, tp,
 	    events, l));
 	if (sc->sc_dying)
 		return (EIO);
 	err = ((*tp->t_linesw->l_poll)(tp, events, l));
 	return (err);
+}
 Static int
 ucycom_configure(struct ucycom_softc *sc, uint32_t baud, uint8_t cfg)
+{
 @@ -860,27 +860,27 @@ ucycom_configure(struct ucycom_softc *sc
 	sc->sc_cfg = cfg;
 	return 0;
+}
 Static void
 ucycom_intr(struct uhidev *addr, void *ibuf, u_int len)
+{
 	struct ucycom_softc *sc = (struct ucycom_softc *)addr;
 	struct tty *tp = sc->sc_tty;
 	int (*rint)(int , struct tty *) = tp->t_linesw->l_rint;
 	uint8_t *cp = ibuf;
 	int s, n, st, chg;
 	/* We understand 8 byte and 32 byte input records */
 	switch (len) {
 	case 8:
 		n = cp[0] & UCYCOM_LMASK;
 		st = cp[0] & ~UCYCOM_LMASK;
 		cp++;
 		break;
 	case 32:
 		st = cp[0];
 		n = cp[1];
 		cp += 2;
 		break;
 @@ -974,83 +974,83 @@ ucycom_to_tiocm(struct ucycom_softc *sc)
 		SET(ttybits, TIOCM_CTS);
 	if (ISSET(combits, UCYCOM_DSR))
 		SET(ttybits, TIOCM_DSR);
 	if (ISSET(combits, UCYCOM_RI))
 		SET(ttybits, TIOCM_RI);
 	return (ttybits);
+}
 Static void
 ucycom_dtr(struct ucycom_softc *sc, int set)
+{
 	uint8_t old;
 	old = sc->sc_mcr;
 	if (set)
 		SET(sc->sc_mcr, UCYCOM_DTR);
 	else
 		CLR(sc->sc_mcr, UCYCOM_DTR);
 	if (old ^ sc->sc_mcr)
 		ucycom_set_status(sc);
+}
 #if 0
 Static void
 ucycom_rts(struct ucycom_softc *sc, int set)
+{
 	uint8_t old;
 	old = sc->sc_msr;
 	if (set)
 		SET(sc->sc_mcr, UCYCOM_RTS);
 	else
 		CLR(sc->sc_mcr, UCYCOM_RTS);
 	if (old ^ sc->sc_mcr)
 		ucycom_set_status(sc);
+}
 #endif
 Static void
 ucycom_set_status(struct ucycom_softc *sc)
+{
 	int err;
 	if (sc->sc_olen != 8 && sc->sc_olen != 32) {
 		DPRINTFN(2,("ucycom_set_status: unknown output report "
 		    "size (%zd)\n", sc->sc_olen));
 		return;
+	}
 	DPRINTF(("ucycom_set_status: %d\n", sc->sc_mcr));
 	memset(sc->sc_obuf, 0, sc->sc_olen);
 	sc->sc_obuf[0] = sc->sc_mcr;
 	err = uhidev_write(sc->sc_hdev.sc_parent, sc->sc_obuf, sc->sc_olen);
 	if (err) {
 		DPRINTF(("ucycom_set_status: err=%d\n", err));
+	}
+}
 #ifdef UCYCOM_DEBUG
 Static void
 ucycom_get_cfg(struct ucycom_softc *sc)
+{
 	int err, cfg, baud;
 	uint8_t report[5];
 	err = uhidev_get_report(&sc->sc_hdev, UHID_FEATURE_REPORT,
 	    report, sc->sc_flen);
 	cfg = report[4];
 	baud = (report[3] << 24) + (report[2] << 16) + (report[1] << 8) +
 	    report[0];
 	DPRINTF(("ucycom_configure: device reports %d baud, %d-%c-%d (%d)\n",
 	    baud, 5 + (cfg & UCYCOM_DATA_MASK),
 	    (cfg & UCYCOM_PARITY_MASK) ?
 		((cfg & UCYCOM_PARITY_TYPE_MASK) ? 'O' : 'E') : 'N',
 	    (cfg & UCYCOM_STOP_MASK) ? 2 : 1, cfg));
+}
 #endif