 @@ -1,14 +1,14 @@
-/*	$NetBSD: adb_ktm.c,v 1.5 2022/04/06 17:37:31 macallan Exp $	*/
+/*	$NetBSD: adb_ktm.c,v 1.6 2022/10/06 19:38:54 andvar Exp $	*/
 /*-
  * Copyright (c) 2019 Michael Lorenz
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,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: adb_ktm.c,v 1.5 2022/04/06 17:37:31 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adb_ktm.c,v 1.6 2022/10/06 19:38:54 andvar Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/fcntl.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <machine/autoconf.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsmousevar.h>
 @@ -240,33 +240,33 @@ ktm_init(struct ktm_softc *sc)
 		for (i = 0; i < sc->sc_msg_len; i++)
 			printf(" %02x", sc->sc_buffer[i]);
 		printf("\n");
+	}
 #endif
 	ret = sysctl_createv(NULL, 0, NULL, &me,
 	    CTLFLAG_READWRITE,
 	    CTLTYPE_NODE, device_xname(sc->sc_dev), NULL,
 	    NULL, 0, NULL, 0,
 	    CTL_MACHDEP, CTL_CREATE, CTL_EOL);
 	ret = sysctl_createv(NULL, 0, NULL, &node,
 	    CTLFLAG_READWRITE | CTLFLAG_OWNDESC,
-	    CTLTYPE_INT, "left", "left button assigmnent",
+	    CTLTYPE_INT, "left", "left button assignment",
 	    sysctl_ktm_left, 1, (void *)sc, 0,
 	    CTL_MACHDEP, me->sysctl_num, CTL_CREATE, CTL_EOL);
 	ret = sysctl_createv(NULL, 0, NULL, &node,
 	    CTLFLAG_READWRITE | CTLFLAG_OWNDESC,
-	    CTLTYPE_INT, "right", "right button assigmnent",
+	    CTLTYPE_INT, "right", "right button assignment",
 	    sysctl_ktm_right, 1, (void *)sc, 0,
 	    CTL_MACHDEP, me->sysctl_num, CTL_CREATE, CTL_EOL);
 	__USE(ret);
+}
 static void
 ktm_handler(void *cookie, int len, uint8_t *data)
+{
 	struct ktm_softc *sc = cookie;
 #ifdef KTM_DEBUG
 	int i;
 	printf("%s: %02x - ", device_xname(sc->sc_dev), sc->sc_us);

 @@ -1,34 +1,34 @@
-/*	$NetBSD: scmd.c,v 1.2 2022/03/31 19:30:16 pgoyette Exp $	*/
+/*	$NetBSD: scmd.c,v 1.3 2022/10/06 19:38:54 andvar Exp $	*/
 /*
  * Copyright (c) 2021 Brad Spencer <brad@anduin.eldar.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scmd.c,v 1.2 2022/03/31 19:30:16 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scmd.c,v 1.3 2022/10/06 19:38:54 andvar Exp $");
 /*
  * Common driver for the Sparkfun Serial motor controller.
  * Calls out to specific frontends to move bits.
 */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/module.h>
 #include <sys/conf.h>
 #include <sys/sysctl.h>
 @@ -264,27 +264,27 @@ scmd_attach(struct scmd_sc *sc)
  */
 static int
 scmd_open(dev_t dev, int flags, int fmt, struct lwp *l)
+{
 	struct scmd_sc *sc;
 	sc = device_lookup_private(&scmd_cd, minor(dev));
 	if (!sc)
 		return ENXIO;
 	if (sc->sc_opened)
 		return EBUSY;
-	/* This is a meaningless assigment to keep GCC from
+	/* This is a meaningless assignment to keep GCC from
 	 * complaining.
 	 */
 	sc->sc_func_attach = &scmd_attach;
 	mutex_enter(&sc->sc_mutex);
 	sc->sc_opened = true;
 	mutex_exit(&sc->sc_mutex);
 	return 0;
+}
 static int
 scmd_maxregister(int topaddr)
 @@ -511,27 +511,27 @@ scmd_write(dev_t dev, struct uio *uio, i
 		if (reg_addr <= SCMD_LAST_REG) {
 			if ((error = scmd_local_write(sc, (uint8_t)reg_addr, buf)) != 0) {
 				(*(sc->sc_func_release_bus))(sc);
 				aprint_error_dev(sc->sc_dev,
 				    "%s: local write failed at 0x%02x: %d\n",
 				    __func__, reg_addr, error);
 				return error;
+			}
 			/* If this was a local command to the control register that
 			 * can perform re-enumeration, then do the wait thing.
 			 * It is not as important that this be done for remote module
 			 * access as the only thing that you could really do there is
-			 * a restart and not re-emumeration, which is really what the wait
+			 * a restart and not re-enumeration, which is really what the wait
 			 * is all about.
 			 */
 			if (reg_addr == SCMD_REG_CONTROL_1) {
 				scmd_wait_restart(sc, false);
 				sc->sc_topaddr = scmd_get_topaddr(sc);
 				aprint_normal_dev(sc->sc_dev, "Highest I2C address on expansion bus is: %02x\n",
 				    sc->sc_topaddr);
+			}
 		} else {
 			if ((error = scmd_remote_write(sc, reg_addr, buf)) != 0) {
 				(*(sc->sc_func_release_bus))(sc);
 				aprint_error_dev(sc->sc_dev,