 @@ -1,14 +1,14 @@
-/*	$NetBSD: adb_ms.c,v 1.17 2019/08/30 19:24:03 macallan Exp $	*/
+/*	$NetBSD: adb_ms.c,v 1.18 2019/08/31 02:14:51 macallan Exp $	*/
 /*
  * Copyright (C) 1998	Colin Wood
  * Copyright (C) 2006, 2007 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
 @@ -22,27 +22,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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_ms.c,v 1.17 2019/08/30 19:24:03 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adb_ms.c,v 1.18 2019/08/31 02:14:51 macallan Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/fcntl.h>
 #include <sys/poll.h>
 #include <sys/select.h>
 #include <sys/proc.h>
 #include <sys/signalvar.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <machine/autoconf.h>
 @@ -316,38 +316,92 @@ adbms_init_uspeed(struct adbms_softc *sc
 				 */
 	adbms_send_sync(sc, cmd, 4, buffer);
 	sc->sc_buttons = 3;
 	sc->sc_res = 200;
+}
 static void
 adbms_init_turbo(struct adbms_softc *sc)
+{
 	uint8_t addr;
 	/* Found Kensington Turbo Mouse */
 /*
  * byte 1 assigns what which button does
  - 0x08 - button 1 - 1, button 2 - nothing
  - 0x09 - both buttons - 1
  - 0x0a - butoon 1 - 1, button 2 - toggle 1
  - 0x0b - button 1 - 1, button 2 - nothing
  - 0x0c - button 1 - 1, button 2 - 2
  - 0x0e - button 1 - 1, button 2 - 3
  - 0x0f - button 1 - 1, button 2 - toggle 3
  - 0x10 - button 1 toggle 1, button 2 nothing
  - 0x11 - button 1 - toggle 1, button 2 - 1
  - 0x12 - both toggle 1
  - 0x14 - button 1 toggle 1, button 2 - 2
  - 0x21 - button 1 - 2, button 2 - 1
  - 0x31 - button 1 - 3, button 2 - 1
  * byte 4 programs a delay for button presses, apparently in 1/100 seconds
  * byte 7 is some sort of checksum, writes will only stick if it's valid
           no idea how exactly it works yet, can't be too complicated considering
           the device's age
  */
 /*
  * XXX
  * I doubt the first command is actually necessary. Leave in for now since it
  * doesn't do any harm either
  */
 	static u_char data1[] =
 		{ 0xe7, 0x8c, 0, 0, 0, 0xff, 0xff, 0x94 };
 	/* this seems to be the most reasonable default */
 	static u_char data2[] =
-		{ 0xa5, 0x14, 0, 0, 0x69, 0xff, 0xff, 0x27 };
+		{ 0xa5, 0x0e, 0, 0, 1, 0xff, 0xff, 0x55 };
 	addr = sc->sc_adbdev->current_addr;
 #ifdef ADBMS_DEBUG
+	{
 		int i;
 		adbms_send_sync(sc, ADBTALK(addr, 2), 0, NULL);
 		printf("reg *");
 		for (i = 0; i < sc->sc_msg_len; i++)
 			printf(" %02x", sc->sc_buffer[i]);
 		printf("\n");
+	}
 #endif
 	adbms_send_sync(sc, ADBFLUSH(addr), 0, NULL);
 	adbms_send_sync(sc, ADBLISTEN(addr, 2), 8, data1);
 	adbms_send_sync(sc, ADBFLUSH(addr), 0, NULL);
 	adbms_send_sync(sc, ADBLISTEN(addr, 2), 8, data2);
 #ifdef ADBMS_BRUTEFORCE
 	sc->sc_buffer[1] = 0;
 	int y = 0;
 	while ((sc->sc_buffer[1] != data2[1]) && (y < 0x100)) {
 		data2[7] = y;
 		y++;
 		adbms_send_sync(sc, ADBFLUSH(addr), 0, NULL);
 		adbms_send_sync(sc, ADBLISTEN(addr, 2), 8, data2);
 		adbms_send_sync(sc, ADBFLUSH(addr), 0, NULL);
 		adbms_send_sync(sc, ADBTALK(addr, 2), 0, NULL);
+	}
 	printf("y %02x\n", data2[7]);
 #endif
 #ifdef ADBMS_DEBUG
 	int i, reg;
 	for (reg = 1; reg < 4; reg++) {
 		adbms_send_sync(sc, ADBTALK(addr, reg), 0, NULL);
 		printf("reg %d", reg);
 		for (i = 0; i < sc->sc_msg_len; i++)
 			printf(" %02x", sc->sc_buffer[i]);
 		printf("\n");
+	}
 #endif
+}
 static void
 @@ -597,29 +651,26 @@ adbms_process_event(struct adbms_softc *
 			dx |= (ddx << shift);
 			dy |= (ddy << shift);
 			shift += 3;
+		}
 		sign = 1 << (shift - 1);
 		smask = 0xffffffff << shift;
 		if (dx & sign)
 			dx |= smask;
 		if (dy & sign)
 			dy |= smask;
 #ifdef ADBMS_DEBUG
 		printf("%d %d %08x %d\n", dx, dy, smask, shift);
 #endif
 		if (sc->sc_adbdev->handler_id == ADBMS_TURBO) {
 			buttons = (buttons != 0) ? 1 : 0;
+	}
 	if (sc->sc_class == MSCLASS_TRACKPAD) {
 		if (sc->sc_tapping == 1) {
 			if (sc->sc_down) {
 				/* finger is down - collect motion data */
 				sc->sc_x += dx;
 				sc->sc_y += dy;
+			}
 			DPRINTF("buttons: %02x\n", buttons);
 			switch (sc->sc_buttons) {
 				case 2: