From: tmk <hasu@tmk-kbd.com>
Date: Tue, 4 Feb 2020 05:52:00 +0000 (+0900)
Subject: adb_usb: Fix mouse init and debug print
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=a4abe50f18769d4da9c001dc7388513ca8591288;p=max%2Ftmk_keyboard.git

adb_usb: Fix mouse init and debug print
---

diff --git a/converter/adb_usb/matrix.c b/converter/adb_usb/matrix.c
index 67ed3d79..e8ed2da6 100644
--- a/converter/adb_usb/matrix.c
+++ b/converter/adb_usb/matrix.c
@@ -39,7 +39,7 @@ static bool has_media_keys = false;
 static bool is_iso_layout = false;
 
 #if ADB_MOUSE_ENABLE
-#define dmprintf(fmt, ...)  do { if (debug_mouse) xprintf(fmt, ##__VA_ARGS__); } while (0)
+#define dmprintf(fmt, ...)  do { /* if (debug_mouse) */ xprintf("M:" fmt, ##__VA_ARGS__); } while (0)
 static uint16_t mouse_cpi = 100;
 static void mouse_init(uint8_t addr);
 #endif
@@ -108,20 +108,6 @@ void matrix_init(void)
     //  lower byte: device handler 00000011
     adb_host_listen(ADB_ADDR_KEYBOARD, ADB_REG_3, ADB_ADDR_KEYBOARD, ADB_HANDLER_EXTENDED_KEYBOARD);
 
-
-    //
-    // Mouse
-    //
-    // https://developer.apple.com/library/archive/technotes/hw/hw_01.html#Extended
-    #ifdef ADB_MOUSE_ENABLE
-    xprintf("\nMouse:\n");
-
-    // Check device on addr3
-    mouse_init(ADB_ADDR_MOUSE);
-    #endif
-
-    device_scan();
-
     // initialize matrix state: all keys off
     for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00;
 
@@ -140,9 +126,10 @@ static void mouse_init(uint8_t orig_addr)
     uint8_t addr;
 
 again:
+    // Move to tmp address 15 to setup mouse function
     mouse_handler = (reg3  = adb_host_talk(orig_addr, ADB_REG_3)) & 0xFF;
     if (!reg3) return;
-    dmprintf("addr%d reg3: %02X\n", orig_addr, reg3);
+    dmprintf("addr%d reg3: %04X\n", orig_addr, reg3);
 
     // Move device to tmp address
     adb_host_flush(orig_addr);
@@ -155,10 +142,10 @@ again:
         goto again;
     }
     addr = ADB_ADDR_TMP;
-    dmprintf("addr%d reg3: %02X\n", addr, reg3);
 
 
 detect_again:
+    // Try to escalate into extended/classic2 protocol
     if (mouse_handler == ADB_HANDLER_CLASSIC1_MOUSE || mouse_handler == ADB_HANDLER_CLASSIC2_MOUSE) {
         adb_host_flush(addr);
         adb_host_listen(addr, ADB_REG_3, (reg3 >> 8), ADB_HANDLER_EXTENDED_MOUSE);
@@ -172,15 +159,20 @@ detect_again:
 
             mouse_handler = (reg3  = adb_host_talk(addr, ADB_REG_3)) & 0xFF;
         }
+        dmprintf("addr%d reg3: %04X\n", addr, reg3);
 
-        if (mouse_handler == ADB_HANDLER_CLASSIC1_MOUSE) {
-            xprintf("Classic 100cpi\n");
-            mouse_cpi = 100;
-        }
-        if (mouse_handler == ADB_HANDLER_CLASSIC2_MOUSE) {
-            xprintf("Classic 200cpi\n");
-            mouse_cpi = 200;
-        }
+    }
+
+    // Classic Protocol 100cpi
+    if (mouse_handler == ADB_HANDLER_CLASSIC1_MOUSE) {
+        xprintf("Classic 100cpi\n");
+        mouse_cpi = 100;
+    }
+
+    // Classic Protocol 200cpi
+    if (mouse_handler == ADB_HANDLER_CLASSIC2_MOUSE) {
+        xprintf("Classic 200cpi\n");
+        mouse_cpi = 200;
     }
 
     // Extended Mouse Protocol
@@ -225,6 +217,7 @@ detect_again:
         }
     }
 
+    // Kensington Turbo Mouse 5: setup
     if (mouse_handler == ADB_HANDLER_TURBO_MOUSE) {
         xprintf("TM5: ext\n");
 
@@ -241,7 +234,7 @@ detect_again:
     }
 
 
-    // Move all mouses to a address after init to be polled
+    // Move to address 10 for mouse polling
     adb_host_flush(addr);
     adb_host_listen(addr, ADB_REG_3, ((reg3 >> 8) & 0xF0) | ADB_ADDR_MOUSE_POLL, 0xFE);
     adb_host_flush(ADB_ADDR_MOUSE_POLL);
@@ -253,9 +246,6 @@ detect_again:
     }
 
     goto again;
-
-//    dmprintf("handler: %d\n", mouse_handler);
-//    dmprintf("cpi: %d\n", mouse_cpi);
 }
 
 #ifdef MAX
@@ -305,6 +295,7 @@ void adb_mouse_task(void)
         mouseacc = 1;
         return;
     };
+    dmprintf("[%02X %02X %02X %02X %02X]\n", buf[0], buf[1], buf[2], buf[3], buf[4]);
 
     // Store off-buttons and 0-movements in unused bytes
     bool xneg = false;
@@ -351,12 +342,7 @@ void adb_mouse_task(void)
     mouse_report.x = -MAX(-MAX(x, -127), -127);
     mouse_report.y = -MAX(-MAX(y, -127), -127);
 
-    if (debug_mouse) {
-        xprintf("Mouse: [");
-        for (int8_t i = 0; i < len; i++) xprintf("%02X ", buf[i]);
-        xprintf("] ");
-        xprintf("[B:%02X, X:%d(%d), Y:%d(%d), A:%d]\n", mouse_report.buttons, mouse_report.x, xx, mouse_report.y, yy, mouseacc);
-    }
+    dmprintf("[B:%02X X:%d(%d) Y:%d(%d) A:%d]\n", mouse_report.buttons, mouse_report.x, xx, mouse_report.y, yy, mouseacc);
 
     // Send result by usb.
     host_mouse_send(&mouse_report);