 @@ -1,14 +1,14 @@
-/*	$NetBSD: vhci.c,v 1.11 2020/03/24 07:11:07 maxv Exp $ */
+/*	$NetBSD: vhci.c,v 1.12 2020/03/24 17:20:55 maxv Exp $ */
 /*
  * Copyright (c) 2019-2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Maxime Villard.
+ *
  * 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: vhci.c,v 1.11 2020/03/24 07:11:07 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vhci.c,v 1.12 2020/03/24 17:20:55 maxv Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 @@ -794,72 +794,62 @@ struct vhci_ioc_get_info {
 	/* Current addr. */
 	uint8_t addr;
 };
 struct vhci_ioc_set_port {
 	u_int port;
 };
 struct vhci_ioc_set_addr {
 	uint8_t addr;
 };
 struct vhci_ioc_usb_attach {
 	u_int port;
 };
 struct vhci_ioc_usb_detach {
 	u_int port;
 };
 #define VHCI_IOC_GET_INFO	_IOR('V', 0, struct vhci_ioc_get_info)
 #define VHCI_IOC_SET_PORT	_IOW('V', 1, struct vhci_ioc_set_port)
 #define VHCI_IOC_SET_ADDR	_IOW('V', 2, struct vhci_ioc_set_addr)
-#define VHCI_IOC_USB_ATTACH	_IOW('V', 10, struct vhci_ioc_usb_attach)
+#define VHCI_IOC_USB_ATTACH	_IO ('V', 10)
-#define VHCI_IOC_USB_DETACH	_IOW('V', 11, struct vhci_ioc_usb_detach)
+#define VHCI_IOC_USB_DETACH	_IO ('V', 11)
 static int
-vhci_usb_attach(vhci_fd_t *vfd, struct vhci_ioc_usb_attach *args)
+vhci_usb_attach(vhci_fd_t *vfd)
+{
 	vhci_softc_t *sc = vfd->softc;
 	vhci_port_t *port;
 	struct usbd_xfer *xfer;
 	u_char *p;
 	int ret = 0;
-	if (args->port == 0 || args->port >= sc->sc_nports)
+	port = &sc->sc_port[vfd->port];
 		return EINVAL;
 	port = &sc->sc_port[args->port];
 	mutex_enter(&sc->sc_lock);
 	mutex_enter(&port->lock);
 	port->status = UPS_CURRENT_CONNECT_STATUS | UPS_PORT_ENABLED |
 	    UPS_PORT_POWER;
 	port->change = UPS_C_CONNECT_STATUS | UPS_C_PORT_RESET;
 	mutex_exit(&port->lock);
 	xfer = sc->sc_intrxfer;
 	if (xfer == NULL) {
 		ret = ENOBUFS;
 		goto done;
+	}
 	KASSERT(xfer->ux_status == USBD_IN_PROGRESS);
 	p = xfer->ux_buf;
 	memset(p, 0, xfer->ux_length);
-	p[0] = __BIT(args->port);
+	p[0] = __BIT(vfd->port);
 	xfer->ux_actlen = xfer->ux_length;
 	xfer->ux_status = USBD_NORMAL_COMPLETION;
 	usb_transfer_complete(xfer);
 done:
 	mutex_exit(&sc->sc_lock);
 	return ret;
+}
 static void
 vhci_port_flush(vhci_softc_t *sc, vhci_port_t *port)
+{
 @@ -899,54 +889,52 @@ vhci_port_flush(vhci_softc_t *sc, vhci_p
 		/* Terminate all the xfers collected. */
 		while ((vxfer = TAILQ_FIRST(&vxferlist)) != NULL) {
 			struct usbd_xfer *xfer = &vxfer->xfer;
 			TAILQ_REMOVE(&vxferlist, vxfer, freelist);
 			xfer->ux_status = USBD_TIMEOUT;
 			usb_transfer_complete(xfer);
+		}
+	}
+}
 static int
-vhci_usb_detach(vhci_fd_t *vfd, struct vhci_ioc_usb_detach *args)
+vhci_usb_detach(vhci_fd_t *vfd)
+{
 	vhci_softc_t *sc = vfd->softc;
 	vhci_port_t *port;
 	struct usbd_xfer *xfer;
 	u_char *p;
-	if (args->port == 0 || args->port >= sc->sc_nports)
+	port = &sc->sc_port[vfd->port];
 		return EINVAL;
 	port = &sc->sc_port[args->port];
 	mutex_enter(&sc->sc_lock);
 	xfer = sc->sc_intrxfer;
 	if (xfer == NULL) {
 		mutex_exit(&sc->sc_lock);
 		return ENOBUFS;
+	}
 	KASSERT(xfer->ux_status == USBD_IN_PROGRESS);
 	mutex_enter(&port->lock);
 	port->status = 0;
 	port->change = UPS_C_CONNECT_STATUS | UPS_C_PORT_RESET;
 	p = xfer->ux_buf;
 	memset(p, 0, xfer->ux_length);
-	p[0] = __BIT(args->port);
+	p[0] = __BIT(vfd->port);
 	xfer->ux_actlen = xfer->ux_length;
 	xfer->ux_status = USBD_NORMAL_COMPLETION;
 	usb_transfer_complete(xfer);
 	vhci_port_flush(sc, port);
 	mutex_exit(&port->lock);
 	mutex_exit(&sc->sc_lock);
 	return 0;
+}
 static int
 vhci_get_info(vhci_fd_t *vfd, struct vhci_ioc_get_info *args)
 @@ -1041,34 +1029,31 @@ vhci_fd_open(dev_t dev, int flags, int t
 		return error;
 	vfd = kmem_alloc(sizeof(*vfd), KM_SLEEP);
 	vfd->port = 1;
 	vfd->addr = 0;
 	vfd->softc = device_lookup_private(&vhci_cd, minor(dev));
 	return fd_clone(fp, fd, flags, &vhci_fileops, vfd);
+}
 static int
 vhci_fd_close(file_t *fp)
+{
 	struct vhci_ioc_usb_detach args;
 	vhci_fd_t *vfd = fp->f_data;
 	int ret __diagused;
 	KASSERT(vfd != NULL);
 	ret = vhci_usb_detach(vfd);
 	args.port = vfd->port;
 	ret = vhci_usb_detach(vfd, &args);
 	KASSERT(ret == 0);
 	kmem_free(vfd, sizeof(*vfd));
 	fp->f_data = NULL;
 	return 0;
+}
 static int
 vhci_fd_read(struct file *fp, off_t *offp, struct uio *uio, kauth_cred_t cred,
     int flags)
+{
 	vhci_fd_t *vfd = fp->f_data;
 @@ -1218,29 +1203,29 @@ vhci_fd_ioctl(file_t *fp, u_long cmd, vo
+{
 	vhci_fd_t *vfd = fp->f_data;
 	KASSERT(vfd != NULL);
 	switch (cmd) {
 	case VHCI_IOC_GET_INFO:
 		return vhci_get_info(vfd, data);
 	case VHCI_IOC_SET_PORT:
 		return vhci_set_port(vfd, data);
 	case VHCI_IOC_SET_ADDR:
 		return vhci_set_addr(vfd, data);
 	case VHCI_IOC_USB_ATTACH:
-		return vhci_usb_attach(vfd, data);
+		return vhci_usb_attach(vfd);
 	case VHCI_IOC_USB_DETACH:
-		return vhci_usb_detach(vfd, data);
+		return vhci_usb_detach(vfd);
 	default:
 		return EINVAL;
+	}
+}
 /* -------------------------------------------------------------------------- */
 static int vhci_match(device_t, cfdata_t, void *);
 static void vhci_attach(device_t, device_t, void *);
 static int vhci_activate(device_t, enum devact);
 CFATTACH_DECL_NEW(vhci, sizeof(vhci_softc_t), vhci_match, vhci_attach,
     NULL, vhci_activate);