 @@ -1,14 +1,14 @@
-/*	$NetBSD: ucycom.c,v 1.48 2019/12/01 08:27:54 maxv Exp $	*/
+/*	$NetBSD: ucycom.c,v 1.49 2020/01/01 09:08:28 maxv 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.48 2019/12/01 08:27:54 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucycom.c,v 1.49 2020/01/01 09:08:28 maxv Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/device.h>
 #include <sys/sysctl.h>
 #include <sys/tty.h>
 @@ -111,31 +111,35 @@ int	ucycomdebug = 20;
 #define UCYCOM_ERROR	0x08
 #define UCYCOM_LMASK	0x07
 /* Modem (Output) control byte */
 #define UCYCOM_DTR	0x20
 #define UCYCOM_RTS	0x10
 #define UCYCOM_ORESET	0x08
 struct ucycom_softc {
 	struct uhidev		sc_hdev;
 	struct tty		*sc_tty;
 	enum {
 		UCYCOM_INIT_NONE,
 		UCYCOM_INIT_INITED
 	} sc_init_state;
 	kmutex_t sc_lock;	/* protects refcnt, others */
 	/* uhidev parameters */
 	size_t			sc_flen; /* feature report length */
 	size_t			sc_ilen; /* input report length */
 	size_t			sc_olen; /* output report length */
 	uint8_t			*sc_obuf;
 	int			sc_wlen;
 	/* settings */
 	uint32_t		sc_baud;
 	uint8_t			sc_cfg;	/* Data format */
 	uint8_t			sc_mcr;	/* Modem control */
 	uint8_t			sc_msr;	/* Modem status */
 	int			sc_swflags;
 	/* flags */
 @@ -209,45 +213,52 @@ ucycom_match(device_t parent, cfdata_t m
 static void
 ucycom_attach(device_t parent, device_t self, void *aux)
+{
 	struct ucycom_softc *sc = device_private(self);
 	struct uhidev_attach_arg *uha = aux;
 	int size, repid;
 	void *desc;
 	sc->sc_hdev.sc_dev = self;
 	sc->sc_hdev.sc_intr = ucycom_intr;
 	sc->sc_hdev.sc_parent = uha->parent;
 	sc->sc_hdev.sc_report_id = uha->reportid;
 	sc->sc_init_state = UCYCOM_INIT_NONE;
 	uhidev_get_report_desc(uha->parent, &desc, &size);
 	repid = uha->reportid;
 	sc->sc_ilen = hid_report_size(desc, size, hid_input, repid);
 	sc->sc_olen = hid_report_size(desc, size, hid_output, repid);
 	sc->sc_flen = hid_report_size(desc, size, hid_feature, repid);
 	if (sc->sc_olen != 8 && sc->sc_olen != 32)
 		return;
 	if (sc->sc_flen != 5)
 		return;
 	sc->sc_msr = sc->sc_mcr = 0;
 	/* set up tty */
 	sc->sc_tty = tty_alloc();
 	sc->sc_tty->t_sc = sc;
 	sc->sc_tty->t_oproc = ucycomstart;
 	sc->sc_tty->t_param = ucycomparam;
 	tty_attach(sc->sc_tty);
 	/* Nothing interesting to report */
 	aprint_normal("\n");
 	sc->sc_init_state = UCYCOM_INIT_INITED;
+}
 static int
 ucycom_detach(device_t self, int flags)
+{
 	struct ucycom_softc *sc = device_private(self);
 	struct tty *tp = sc->sc_tty;
 	int maj, mn;
 	int s;
 	DPRINTF(("ucycom_detach: sc=%p flags=%d tp=%p\n", sc, flags, tp));
 @@ -324,30 +335,30 @@ ucycom_shutdown(struct ucycom_softc *sc)
 static int
 ucycomopen(dev_t dev, int flag, int mode, struct lwp *l)
+{
 	struct ucycom_softc *sc =
 	    device_lookup_private(&ucycom_cd, UCYCOMUNIT(dev));
 	struct tty *tp;
 	int s, err;
 	DPRINTF(("ucycomopen: unit=%d\n", UCYCOMUNIT(dev)));
 	DPRINTF(("ucycomopen: sc=%p\n", sc));
 	if (sc == NULL)
 		return ENXIO;
 	if (sc->sc_dying)
 		return EIO;
 	if (sc->sc_init_state != UCYCOM_INIT_INITED)
 		return ENXIO;
 	if (!device_is_active(sc->sc_hdev.sc_dev))
 		return ENXIO;
 	tp = sc->sc_tty;
 	DPRINTF(("ucycomopen: tp=%p\n", tp));
 	if (kauth_authorize_device_tty(l->l_cred, KAUTH_DEVICE_TTY_OPEN, tp))
 		return EBUSY;
 	s = spltty();
 	if (!ISSET(tp->t_state, TS_ISOPEN) && tp->t_wopen == 0) {