 @@ -1,14 +1,14 @@
-/*	$NetBSD: ms.c,v 1.34 2014/07/25 08:10:35 dholland Exp $ */
+/*	$NetBSD: ms.c,v 1.35 2021/02/07 16:13:56 tsutsui Exp $ */
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Lawrence Berkeley Laboratory.
 @@ -35,27 +35,27 @@
  * 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.
+ *
  *	@(#)ms.c	8.1 (Berkeley) 6/11/93
  */
 /*
  * X68k mouse driver.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.34 2014/07/25 08:10:35 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.35 2021/02/07 16:13:56 tsutsui Exp $");
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/syslog.h>
 #include <sys/systm.h>
 #include <sys/tty.h>
 #include <sys/device.h>
 #include <sys/signalvar.h>
 #include <sys/mutex.h>
 @@ -346,28 +346,28 @@ mskqfilter(dev_t dev, struct knote *kn)
 /****************************************************************
  * Middle layer (translator)
  ****************************************************************/
 /*
  * Called by our ms_softint() routine on input.
  */
 static void
 ms_input(struct ms_softc *ms, int c)
+{
 	struct firm_event *fe;
 	int mb, ub, d, get, put, any;
-	static const char to_one[] = { 1, 2, 3 };
+	static const char to_one[] = { 1, 2, 2 };
-	static const int to_id[] = { MS_LEFT, MS_RIGHT, MS_MIDDLE };
+	static const int to_id[] = { MS_LEFT, MS_RIGHT };
 	/*
 	 * Discard input if not ready.  Drop sync on parity or framing
 	 * error; gain sync on button byte.
 	 */
 	if (ms->ms_ready == 0)
 		return;
 	ms->ms_nodata = 0;
 	/*
 	 * Run the decode loop, adding to the current information.
 	 * We add, rather than replace, deltas, so that if the event queue
 	 * fills, we accumulate data for when it opens up again.
 @@ -392,27 +392,27 @@ ms_input(struct ms_softc *ms, int c)
 	case 2:
 		/* delta-y */
 		ms->ms_byteno = -1;
 		ms->ms_dy += (char)c;
 		break;
 	default:
 		panic("ms_input");
 		/* NOTREACHED */
+	}
 	/*
 	 * We have at least one event (mouse button, delta-X, or
-	 * delta-Y; possibly all three, and possibly three separate
+	 * delta-Y; possibly all three, and possibly two separate
 	 * button events).  Deliver these events until we are out
 	 * of changes or out of room.  As events get delivered,
 	 * mark them `unchanged'.
 	 */
 	any = 0;
 	get = ms->ms_events.ev_get;
 	put = ms->ms_events.ev_put;
 	fe = &ms->ms_events.ev_q[put];
 	/* NEXT prepares to put the next event, backing off if necessary */
 #define	NEXT \
 	if ((++put) % EV_QSIZE == get) { \
 		put--; \
 @@ -420,32 +420,32 @@ ms_input(struct ms_softc *ms, int c)
+	}
 	/* ADVANCE completes the `put' of the event */
 #define	ADVANCE \
 	fe++; \
 	if (put >= EV_QSIZE) { \
 		put = 0; \
 		fe = &ms->ms_events.ev_q[0]; \
 	} \
 	mb = ms->ms_mb;
 	ub = ms->ms_ub;
 	while ((d = mb ^ ub) != 0) {
 		/*
-		 * Mouse button change.  Convert up to three changes
+		 * Mouse button change.  Convert up to two changes
 		 * to the `first' change, and drop it into the event queue.
 		 */
 		NEXT;
-		d = to_one[d - 1];		/* from 1..7 to {1,2,4} */
+		d = to_one[d - 1];		/* from 1..3 to {1,2} */
-		fe->id = to_id[d - 1];		/* from {1,2,4} to ID */
+		fe->id = to_id[d - 1];		/* from {1,2} to ID */
 		fe->value = mb & d ? VKEY_DOWN : VKEY_UP;
 		firm_gettime(fe);
 		ADVANCE;
 		ub ^= d;
 		any++;
+	}
 	if (ms->ms_dx) {
 		NEXT;
 		fe->id = LOC_X_DELTA;
 		fe->value = ms->ms_dx;
 		firm_gettime(fe);
 		ADVANCE;
 		ms->ms_dx = 0;