 @@ -1,14 +1,14 @@
-/* $NetBSD: pms.c,v 1.40 2022/10/28 23:40:37 riastradh Exp $ */
+/* $NetBSD: pms.c,v 1.41 2023/09/05 05:55:12 mrg Exp $ */
 /*-
  * Copyright (c) 2004 Kentaro Kurahone.
  * Copyright (c) 2004 Ales Krenek.
  * Copyright (c) 1994 Charles M. Hannum.
  * Copyright (c) 1992, 1993 Erik Forsberg.
  * 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.
 @@ -16,27 +16,27 @@
  * THIS SOFTWARE IS PROVIDED BY ``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 I 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: pms.c,v 1.40 2022/10/28 23:40:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pms.c,v 1.41 2023/09/05 05:55:12 mrg Exp $");
 #include "opt_pms.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/bus.h>
 #include <dev/pckbport/pckbportvar.h>
 @@ -551,26 +551,28 @@ pmsinput(void *vsc, int data)
+		}
+	}
 	sc->last = sc->current;
 	if (sc->inputstate == 0) {
 		/*
 		 * Some devices (seen on trackballs anytime, and on
 		 * some mice shortly after reset) output garbage bytes
 		 * between packets.  Just ignore them.
 		 */
 		if ((data & 0xc0) != 0)
 			return;	/* not in sync yet, discard input */
+	}
 	if (sc->inputstate >= sizeof(sc->packet))
 		panic("inputstate should never be %d", sc->inputstate);
 	sc->packet[sc->inputstate++] = data & 0xff;
 	switch (sc->inputstate) {
 	case 0:
 		/* no useful processing can be done yet */
 		break;
 	case 1:
 		/*
 		 * Why should we test for bit 0x8 and insist on it here?
 		 * The old (psm.c and psm_intelli.c) drivers didn't do
 		 * it, and there are devices where it does harm (that's
 		 * why it is not used if using PMS_STANDARD protocol).

 @@ -1,14 +1,14 @@
-/*	$NetBSD: synaptics.c,v 1.81 2022/09/28 16:43:00 nia Exp $	*/
+/*	$NetBSD: synaptics.c,v 1.82 2023/09/05 05:55:12 mrg Exp $	*/
 /*
  * Copyright (c) 2005, Steve C. Woodford
  * Copyright (c) 2004, Ales Krenek
  * Copyright (c) 2004, Kentaro A. Kurahone
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  *   * Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
 @@ -38,27 +38,27 @@
 /*
  * TODO:
  *	- Make the sysctl values per-instance instead of global.
  *	- Consider setting initial scaling factors at runtime according
  *	  to the values returned by the 'Read Resolutions' command.
  *	- Support the serial protocol (we only support PS/2 for now)
  *	- Support auto-repeat for up/down button Z-axis emulation.
  *	- Maybe add some more gestures (can we use Palm support somehow?)
  */
 #include "opt_pms.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.81 2022/09/28 16:43:00 nia Exp $");
+__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.82 2023/09/05 05:55:12 mrg Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/sysctl.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/bus.h>
 #include <dev/pckbport/pckbportvar.h>
 @@ -1749,26 +1749,28 @@ pms_synaptics_input(void *vsc, int data)
 		/*FALLTHROUGH*/
 	case -6:
 	case 3:
 		if ((data & 8) == 8) {
 			aprint_debug_dev(psc->sc_dev,
 			    "pms_synaptics_input: dropped in relative mode, reset\n");
 			psc->inputstate = 0;
 			psc->sc_enabled = 0;
 			wakeup(&psc->sc_enabled);
 			return;
+		}
+	}
 	if (psc->inputstate >= sizeof(psc->packet))
 		panic("inputstate should never be %d", psc->inputstate);
 	psc->packet[psc->inputstate++] = data & 0xff;
 	if (psc->inputstate == 6) {
 		/*
 		 * We have a complete packet.
 		 * Extract the pertinent details.
 		 */
 		psc->inputstate = 0;
 		if ((psc->packet[0] & 0xfc) == 0x84 &&
 		    (psc->packet[3] & 0xcc) == 0xc4) {
 			/* W = SYNAPTICS_WIDTH_PASSTHROUGH, PS/2 passthrough */
 			pms_synaptics_passthrough(psc);
 		} else {