diff --git a/converter/adb_usb/matrix.c b/converter/adb_usb/matrix.c
index a1dddf9f..d49adfb2 100644
--- a/converter/adb_usb/matrix.c
+++ b/converter/adb_usb/matrix.c
@@ -21,7 +21,6 @@ along with this program. If not, see .
#include
#include
#include
-#include
#include "print.h"
#include "util.h"
#include "debug.h"
@@ -31,6 +30,7 @@ along with this program. If not, see .
#include "host.h"
#include "led.h"
#include "timer.h"
+#include "wait.h"
@@ -38,31 +38,49 @@ along with this program. If not, see .
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)
+static uint16_t mouse_cpi = 100;
+static void mouse_init(uint8_t addr);
+#endif
+
// matrix state buffer(1:on, 0:off)
static matrix_row_t matrix[MATRIX_ROWS];
static void register_key(uint8_t key);
+static void device_scan(void)
+{
+ xprintf("\nScan:\n");
+ for (uint8_t addr = 0; addr < 16; addr++) {
+ uint16_t reg3 = adb_host_talk(addr, ADB_REG_3);
+ if (reg3) {
+ xprintf(" addr:%d, reg3:%04X\n", addr, reg3);
+ }
+ }
+}
void matrix_init(void)
{
+ debug_enable = true;
+ //debug_matrix = true;
+ //debug_keyboard = true;
+ //debug_mouse = true;
+
// LED on
DDRD |= (1<<6); PORTD |= (1<<6);
adb_host_init();
- // wait for keyboard to boot up and receive command
- _delay_ms(2000);
- // device scan
- xprintf("Before init:\n");
- for (uint8_t addr = 1; addr < 16; addr++) {
- uint16_t reg3 = adb_host_talk(addr, ADB_REG_3);
- if (reg3) {
- xprintf("Scan: addr:%d, reg3:%04X\n", addr, reg3);
- }
- _delay_ms(20);
- }
+ // wait for line and device to be stable
+ wait_ms(100);
+ device_scan();
+
+ //
+ // Keyboard
+ //
+ xprintf("\nKeyboard:\n");
// Determine ISO keyboard by handler id
// http://lxr.free-electrons.com/source/drivers/macintosh/adbhid.c?v=4.4#L815
uint8_t handler_id = (uint8_t) adb_host_talk(ADB_ADDR_KEYBOARD, ADB_REG_3);
@@ -76,47 +94,169 @@ void matrix_init(void)
is_iso_layout = false;
break;
}
- xprintf("hadler_id: %02X, is_iso_layout: %s\n", handler_id, (is_iso_layout ? "yes" : "no"));
+ xprintf("hadler: %02X, ISO: %s\n", handler_id, (is_iso_layout ? "yes" : "no"));
// Adjustable keyboard media keys: address=0x07 and handlerID=0x02
has_media_keys = (0x02 == (adb_host_talk(ADB_ADDR_APPLIANCE, ADB_REG_3) & 0xff));
if (has_media_keys) {
- xprintf("Found: media keys\n");
+ xprintf("Media keys\n");
}
// Enable keyboard left/right modifier distinction
// Listen Register3
// upper byte: reserved bits 0000, keyboard address 0010
// lower byte: device handler 00000011
- adb_host_listen(ADB_ADDR_KEYBOARD, ADB_REG_3, ADB_ADDR_KEYBOARD, ADB_HANDLER_EXTENDED_PROTOCOL);
+ adb_host_listen(ADB_ADDR_KEYBOARD, ADB_REG_3, ADB_ADDR_KEYBOARD, ADB_HANDLER_EXTENDED_KEYBOARD);
- // device scan
- xprintf("After init:\n");
- for (uint8_t addr = 1; addr < 16; addr++) {
- uint16_t reg3 = adb_host_talk(addr, ADB_REG_3);
- if (reg3) {
- xprintf("Scan: addr:%d, reg3:%04X\n", addr, reg3);
- }
- _delay_ms(20);
- }
+
+ //
+ // 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;
led_set(host_keyboard_leds());
- debug_enable = true;
- //debug_matrix = true;
- //debug_keyboard = true;
- //debug_mouse = true;
- print("debug enabled.\n");
-
// LED off
DDRD |= (1<<6); PORTD &= ~(1<<6);
return;
}
#ifdef ADB_MOUSE_ENABLE
+static void mouse_init(uint8_t orig_addr)
+{
+ uint16_t reg3;
+ uint8_t mouse_handler;
+ uint8_t addr;
+
+again:
+ mouse_handler = (reg3 = adb_host_talk(orig_addr, ADB_REG_3)) & 0xFF;
+ if (!reg3) return;
+ dmprintf("addr%d reg3: %02X\n", orig_addr, reg3);
+
+ // Move device to tmp address
+ adb_host_flush(orig_addr);
+ adb_host_listen(orig_addr, ADB_REG_3, ((reg3 >> 8) & 0xF0) | ADB_ADDR_TMP, 0xFE);
+ adb_host_flush(ADB_ADDR_TMP);
+
+ mouse_handler = (reg3 = adb_host_talk(ADB_ADDR_TMP, ADB_REG_3)) & 0xFF;
+ if (!reg3) {
+ dmprintf("move fail\n");
+ goto again;
+ }
+ addr = ADB_ADDR_TMP;
+ dmprintf("addr%d reg3: %02X\n", addr, reg3);
+
+
+detect_again:
+ 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);
+
+ mouse_handler = (reg3 = adb_host_talk(addr, ADB_REG_3)) & 0xFF;
+
+
+ if (mouse_handler == ADB_HANDLER_CLASSIC1_MOUSE) {
+ adb_host_flush(addr);
+ adb_host_listen(addr, ADB_REG_3, (reg3 >> 8), ADB_HANDLER_CLASSIC2_MOUSE);
+
+ mouse_handler = (reg3 = adb_host_talk(addr, ADB_REG_3)) & 0xFF;
+ }
+
+ 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;
+ }
+ }
+
+ // Extended Mouse Protocol
+ if (mouse_handler == ADB_HANDLER_EXTENDED_MOUSE) {
+ // Device info format(reg1 8-byte data)
+ // 0-3: device id
+ // 4-5: resolution in units/inch (0xC8=200upi)
+ // 6 : device class (0: Tablet, 1: Mouse, 2: Trackball)
+ // 7 : num of buttons
+ uint8_t len;
+ uint8_t buf[8];
+ len = adb_host_talk_buf(addr, ADB_REG_1, buf, sizeof(buf));
+
+ if (len > 5) {
+ mouse_cpi = (buf[4]<<8) | buf[5];
+ } else {
+ mouse_cpi = 100;
+ }
+
+ if (len) {
+ xprintf("Ext: [", len);
+ for (int8_t i = 0; i < len; i++) xprintf("%02X ", buf[i]);
+ xprintf("] cpi=%d\n", mouse_cpi);
+ }
+
+
+ // Kensington Turbo Mouse 5: default device
+ if (buf[0] == 0x4B && buf[1] == 0x4D && buf[2] == 0x4C && buf[3] == 0x31) {
+ xprintf("TM5: default\n");
+ // Move it to addr0 to remove this device and get new device with handle id 50 on addr 3
+ // and the new device on address 3 should be handled with command sequence later.
+ //
+ // Turbo Mouse 5 has one default device on addr3 as normal mouse at first, and another device
+ // with hander id 50 appears after the default device is moved from addr3.
+ // The mouse has the two devices at same time transiently in the result. The default device is
+ // removed automatically after the another device receives command sequence.
+ // NOTE: The mouse hangs if you try moving the two deivces to same address.
+ adb_host_flush(addr);
+ adb_host_listen(addr, ADB_REG_3, ((reg3 >> 8) & 0xF0) | ADB_ADDR_0, 0xFE);
+ } else {
+ xprintf("Unknown\n");
+ }
+ }
+
+ if (mouse_handler == ADB_HANDLER_TURBO_MOUSE) {
+ xprintf("TM5: ext\n");
+
+ // Kensington Turbo Mouse 5 command sequence to enable four buttons
+ // https://elixir.bootlin.com/linux/v4.4/source/drivers/macintosh/adbhid.c#L1176
+ // https://github.com/NetBSD/src/blob/64b8a48e1288eb3902ed73113d157af50b2ec596/sys/arch/macppc/dev/ams.c#L261
+ static uint8_t cmd1[] = { 0xE7, 0x8C, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x94 };
+ static uint8_t cmd2[] = { 0xA5, 0x14, 0x00, 0x00, 0x69, 0xFF, 0xFF, 0x27 };
+
+ adb_host_flush(addr);
+ adb_host_listen_buf(addr, ADB_REG_2, cmd1, sizeof(cmd1));
+ adb_host_flush(addr);
+ adb_host_listen_buf(addr, ADB_REG_2, cmd2, sizeof(cmd2));
+ }
+
+
+ // Move all mouses to a address after init to be polled
+ 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);
+
+ mouse_handler = (reg3 = adb_host_talk(addr, ADB_REG_3)) & 0xFF;
+ if (reg3) {
+ dmprintf("detect again\n");
+ goto detect_again;
+ }
+
+ goto again;
+
+// dmprintf("handler: %d\n", mouse_handler);
+// dmprintf("cpi: %d\n", mouse_cpi);
+}
#ifdef MAX
#undef MAX
@@ -127,7 +267,8 @@ static report_mouse_t mouse_report = {};
void adb_mouse_task(void)
{
- uint16_t codes;
+ uint8_t len;
+ uint8_t buf[5];
int16_t x, y;
static int8_t mouseacc;
@@ -138,47 +279,92 @@ void adb_mouse_task(void)
if (timer_elapsed(tick_ms) < 12) return;
tick_ms = timer_read();
- codes = adb_host_mouse_recv();
+ static uint16_t detect_ms;
+ if (timer_elapsed(detect_ms) > 1000) {
+ detect_ms = timer_read();
+ // check new device on addr3
+ mouse_init(ADB_ADDR_MOUSE);
+ }
+
+ // Extended Mouse Protocol data can be 2-5 bytes
+ // https://developer.apple.com/library/archive/technotes/hw/hw_01.html#Extended
+ //
+ // Byte 0: b00 y06 y05 y04 y03 y02 y01 y00
+ // Byte 1: b01 x06 x05 x04 x03 x02 x01 x00
+ // Byte 2: b02 y09 y08 y07 b03 x09 x08 x07
+ // Byte 3: b04 y12 y11 y10 b05 x12 x11 x10
+ // Byte 4: b06 y15 y14 y13 b07 x15 x14 x13
+ //
+ // b--: Button state.(0: on, 1: off)
+ // x--: X axis movement.
+ // y--: Y axis movement.
+ len = adb_host_talk_buf(ADB_ADDR_MOUSE_POLL, ADB_REG_0, buf, sizeof(buf));
+
// If nothing received reset mouse acceleration, and quit.
- if (!codes) {
+ if (len < 2) {
mouseacc = 1;
return;
};
- // Bit sixteen is button.
- if (~codes & (1 << 15))
- mouse_report.buttons |= MOUSE_BTN1;
- if (codes & (1 << 15))
- mouse_report.buttons &= ~MOUSE_BTN1;
- // lower seven bits are movement, as signed int_7.
- // low byte is X-axis, high byte is Y.
- y = (codes>>8 & 0x3F);
- x = (codes>>0 & 0x3F);
- // bit seven and fifteen is negative
- // usb does not use int_8, but int_7 (measuring distance) with sign-bit.
- if (codes & (1 << 6))
- x = (x-0x40);
- if (codes & (1 << 14))
- y = (y-0x40);
+
+ // Store off-buttons and 0-movements in unused bytes
+ bool xneg = false;
+ bool yneg = false;
+ if (len == 2) {
+ if (buf[0] & 0x40) yneg = true;
+ if (buf[1] & 0x40) xneg = true;
+ } else {
+ if (buf[len - 1] & 0x40) yneg = true;
+ if (buf[len - 1] & 0x04) xneg = true;
+ }
+
+ for (int8_t i = len; i < sizeof(buf); i++) {
+ buf[i] = 0x88;
+ if (yneg) buf[i] |= 0x70;
+ if (xneg) buf[i] |= 0x07;
+ }
+
+ // 8 buttons at max
+ // TODO: Fix HID report descriptor for mouse to support button6-8
+ uint8_t buttons = 0;
+ if (!(buf[4] & 0x08)) buttons |= MOUSE_BTN8;
+ if (!(buf[4] & 0x80)) buttons |= MOUSE_BTN7;
+ if (!(buf[3] & 0x08)) buttons |= MOUSE_BTN6;
+ if (!(buf[3] & 0x80)) buttons |= MOUSE_BTN5;
+ if (!(buf[2] & 0x08)) buttons |= MOUSE_BTN4;
+ if (!(buf[2] & 0x80)) buttons |= MOUSE_BTN3;
+ if (!(buf[1] & 0x80)) buttons |= MOUSE_BTN2;
+ if (!(buf[0] & 0x80)) buttons |= MOUSE_BTN1;
+ mouse_report.buttons = buttons;
+
+ int16_t xx, yy;
+ yy = (buf[0] & 0x7F) | (buf[2] & 0x70) << 3 | (buf[3] & 0x70) << 6 | (buf[4] & 0x70) << 9;
+ xx = (buf[1] & 0x7F) | (buf[2] & 0x07) << 7 | (buf[3] & 0x07) << 10 | (buf[4] & 0x07) << 13;
+
// Accelerate mouse. (They weren't meant to be used on screens larger than 320x200).
- x *= mouseacc;
- y *= mouseacc;
+ x = xx * mouseacc;
+ y = yy * mouseacc;
+
+ // TODO: Fix HID report descriptor for mouse to support finer resolution
// Cap our two bytes per axis to one byte.
// Easier with a MIN-function, but since -MAX(-a,-b) = MIN(a,b)...
- // I.E. MIN(MAX(x,-127),127) = -MAX(-MAX(x, -127), -127) = MIN(-MIN(-x,127),127)
+ // I.E. MIN(MAX(x,-127),127) = -MAX(-MAX(x, -127), -127) = MIN(-MIN(-x,127),127)
mouse_report.x = -MAX(-MAX(x, -127), -127);
mouse_report.y = -MAX(-MAX(y, -127), -127);
+
if (debug_mouse) {
- print("adb_host_mouse_recv: "); print_bin16(codes); print("\n");
- print("adb_mouse raw: [");
- phex(mouseacc); print(" ");
- phex(mouse_report.buttons); print("|");
- print_decs(mouse_report.x); print(" ");
- print_decs(mouse_report.y); print("]\n");
+ 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);
}
+
// Send result by usb.
host_mouse_send(&mouse_report);
+
+ // TODO: acceleration curve is needed for precise operation?
// increase acceleration of mouse
- mouseacc += ( mouseacc < ADB_MOUSE_MAXACC ? 1 : 0 );
+ mouseacc += ( mouseacc < (mouse_cpi < 200 ? ADB_MOUSE_MAXACC : ADB_MOUSE_MAXACC/2) ? 1 : 0 );
+
return;
}
#endif
diff --git a/tmk_core/common/report.h b/tmk_core/common/report.h
index f21e84ee..2a2ff2de 100644
--- a/tmk_core/common/report.h
+++ b/tmk_core/common/report.h
@@ -33,6 +33,9 @@ along with this program. If not, see .
#define MOUSE_BTN3 (1<<2)
#define MOUSE_BTN4 (1<<3)
#define MOUSE_BTN5 (1<<4)
+#define MOUSE_BTN6 (1<<5)
+#define MOUSE_BTN7 (1<<6)
+#define MOUSE_BTN8 (1<<7)
/* Consumer Page(0x0C)
* following are supported by Windows: http://msdn.microsoft.com/en-us/windows/hardware/gg463372.aspx
diff --git a/tmk_core/protocol/adb.c b/tmk_core/protocol/adb.c
index 164255ef..36005951 100644
--- a/tmk_core/protocol/adb.c
+++ b/tmk_core/protocol/adb.c
@@ -1,5 +1,5 @@
/*
-Copyright 2011 Jun WAKO
+Copyright 2011-19 Jun WAKO
Copyright 2013 Shay Green
This software is licensed with a Modified BSD License.
@@ -41,6 +41,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include
#include
#include "adb.h"
+#include "print.h"
// GCC doesn't inline functions normally
@@ -92,81 +93,164 @@ uint16_t adb_host_kbd_recv(uint8_t addr)
}
#ifdef ADB_MOUSE_ENABLE
+__attribute__ ((weak))
void adb_mouse_init(void) {
- return;
+ return;
}
-uint16_t adb_host_mouse_recv(void)
-{
- return adb_host_talk(ADB_ADDR_MOUSE, ADB_REG_0);
+__attribute__ ((weak))
+void adb_mouse_task(void) {
+ return;
}
#endif
-uint16_t adb_host_talk(uint8_t addr, uint8_t reg)
+// This sends Talk command to read data from register and returns length of the data.
+uint8_t adb_host_talk_buf(uint8_t addr, uint8_t reg, uint8_t *buf, uint8_t len)
{
- uint16_t data = 0;
+ for (int8_t i =0; i < len; i++) buf[i] = 0;
+
cli();
attention();
- send_byte((addr<<4) | (ADB_CMD_TALK<<2) | reg);
+ send_byte((addr<<4) | ADB_CMD_TALK | reg);
place_bit0(); // Stopbit(0)
+ // TODO: Service Request(Srq):
+ // Device holds low part of comannd stopbit for 140-260us
+ //
+ // Command:
+ // ......._ ______________________ ___ ............_ -------
+ // | | | | | | |
+ // Command | | | | | Data bytes | |
+ // ........|___| | 140-260 |__| |_............|___|
+ // |stop0 | Tlt Stop-to-Start |start1| |stop0 |
+ //
+ // Command without data:
+ // ......._ __________________________
+ // | |
+ // Command | |
+ // ........|___| | 140-260 |
+ // |stop0 | Tlt Stop-to-Start |
+ //
+ // Service Request:
+ // ......._ ______ ___ ............_ -------
+ // | 140-260 | | | | | |
+ // Command | Service Request | | | | Data bytes | |
+ // ........|___________________| |__| |_............|___|
+ // |stop0 | |start1| |stop0 |
+ // ......._ __________
+ // | 140-260 |
+ // Command | Service Request |
+ // ........|___________________|
+ // |stop0 |
+ // This can be happened?
+ // ......._ ______________________ ___ ............_ -----
+ // | | | | | | 140-260 |
+ // Command | | | | | Data bytes | Service Request |
+ // ........|___| | 140-260 |__| |_............|_________________|
+ // |stop0 | Tlt Stop-to-Start |start1| |stop0 |
+ //
+ // "Service requests are issued by the devices during a very specific time at the
+ // end of the reception of the command packet.
+ // If a device in need of service issues a service request, it must do so within
+ // the 65 µs of the Stop Bit’s low time and maintain the line low for a total of 300 µs."
+ //
+ // "A device sends a Service Request signal by holding the bus low during the low
+ // portion of the stop bit of any command or data transaction. The device must lengthen
+ // the stop by a minimum of 140 J.lS beyond its normal duration, as shown in Figure 8-15."
+ // http://ww1.microchip.com/downloads/en/AppNotes/00591b.pdf
if (!wait_data_hi(500)) { // Service Request(310us Adjustable Keyboard): just ignored
+ xprintf("R");
sei();
- return -30; // something wrong
+ return 0;
}
if (!wait_data_lo(500)) { // Tlt/Stop to Start(140-260us)
sei();
- return 0; // No data to send
+ return 0; // No data from device(not error);
}
- uint8_t n = 17; // start bit + 16 data bits
+ // start bit(1)
+ if (!wait_data_hi(40)) {
+ xprintf("S");
+ sei();
+ return 0;
+ }
+ if (!wait_data_lo(100)) {
+ xprintf("s");
+ sei();
+ return 0;
+ }
+
+ uint8_t n = 0; // bit count
do {
+ //
+ // |<- bit_cell_max(130) ->|
+ // | |<- lo ->|
+ // | | |<-hi->|
+ // _______
+ // | | |
+ // | 130-lo | lo-hi |
+ // |________| |
+ //
uint8_t lo = (uint8_t) wait_data_hi(130);
if (!lo)
- goto error;
+ goto error; // no more bit or after stop bit
uint8_t hi = (uint8_t) wait_data_lo(lo);
if (!hi)
- goto error;
+ goto error; // stop bit extedned by Srq?
- hi = lo - hi;
- lo = 130 - lo;
+ if (n/8 >= len) continue; // can't store in buf
- data <<= 1;
- if (lo < hi) {
- data |= 1;
- }
- else if (n == 17) {
- sei();
- return -20;
+ buf[n/8] <<= 1;
+ if ((130 - lo) < (lo - hi)) {
+ buf[n/8] |= 1;
}
}
- while ( --n );
-
- // Stop bit can't be checked normally since it could have service request lenghtening
- // and its high state never goes low.
- if (!wait_data_hi(351) || wait_data_lo(91)) {
- sei();
- return -21;
- }
- sei();
- return data;
+ while ( ++n );
error:
sei();
- return -n;
+ return n/8;
+}
+
+uint16_t adb_host_talk(uint8_t addr, uint8_t reg)
+{
+ uint8_t len;
+ uint8_t buf[8];
+ len = adb_host_talk_buf(addr, reg, buf, 8);
+ if (len != 2) return 0;
+ return (buf[0]<<8 | buf[1]);
+}
+
+void adb_host_listen_buf(uint8_t addr, uint8_t reg, uint8_t *buf, uint8_t len)
+{
+ cli();
+ attention();
+ send_byte((addr<<4) | ADB_CMD_LISTEN | reg);
+ place_bit0(); // Stopbit(0)
+ // TODO: Service Request
+ _delay_us(200); // Tlt/Stop to Start
+ place_bit1(); // Startbit(1)
+ for (int8_t i = 0; i < len; i++) {
+ send_byte(buf[i]);
+ //xprintf("%02X ", buf[i]);
+ }
+ place_bit0(); // Stopbit(0);
+ sei();
}
void adb_host_listen(uint8_t addr, uint8_t reg, uint8_t data_h, uint8_t data_l)
+{
+ uint8_t buf[2] = { data_h, data_l };
+ adb_host_listen_buf(addr, reg, buf, 2);
+}
+
+void adb_host_flush(uint8_t addr)
{
cli();
attention();
- send_byte((addr<<4) | (ADB_CMD_LISTEN<<2) | reg);
+ send_byte((addr<<4) | ADB_CMD_FLUSH);
place_bit0(); // Stopbit(0)
_delay_us(200); // Tlt/Stop to Start
- place_bit1(); // Startbit(1)
- send_byte(data_h);
- send_byte(data_l);
- place_bit0(); // Stopbit(0);
sei();
}
diff --git a/tmk_core/protocol/adb.h b/tmk_core/protocol/adb.h
index a8b97ea5..5e155cbc 100644
--- a/tmk_core/protocol/adb.h
+++ b/tmk_core/protocol/adb.h
@@ -1,5 +1,5 @@
/*
-Copyright 2011 Jun WAKO
+Copyright 2011-19 Jun WAKO
This software is licensed with a Modified BSD License.
All of this is supposed to be Free Software, Open Source, DFSG-free,
@@ -54,16 +54,28 @@ POSSIBILITY OF SUCH DAMAGE.
/* ADB commands */
// Default Address
+#define ADB_ADDR_0 0
#define ADB_ADDR_DONGLE 1
#define ADB_ADDR_KEYBOARD 2
#define ADB_ADDR_MOUSE 3
#define ADB_ADDR_TABLET 4
#define ADB_ADDR_APPLIANCE 7
+#define ADB_ADDR_8 8
+#define ADB_ADDR_9 9
+#define ADB_ADDR_10 10
+#define ADB_ADDR_11 11
+#define ADB_ADDR_12 12
+#define ADB_ADDR_13 13
+#define ADB_ADDR_14 14
+#define ADB_ADDR_15 15
+// for temporary purpose, do not use for polling
+#define ADB_ADDR_TMP 15
+#define ADB_ADDR_MOUSE_POLL 10
// Command Type
#define ADB_CMD_RESET 0
#define ADB_CMD_FLUSH 1
-#define ADB_CMD_LISTEN 2
-#define ADB_CMD_TALK 3
+#define ADB_CMD_LISTEN 8
+#define ADB_CMD_TALK 12
// Register
#define ADB_REG_0 0
#define ADB_REG_1 1
@@ -76,16 +88,22 @@ POSSIBILITY OF SUCH DAMAGE.
#define ADB_HANDLER_M0115 0x02
#define ADB_HANDLER_M3501 0x02
#define ADB_HANDLER_M1242_ANSI 0x10
-#define ADB_HANDLER_EXTENDED_PROTOCOL 0x03
+#define ADB_HANDLER_EXTENDED_KEYBOARD 0x03
+#define ADB_HANDLER_CLASSIC1_MOUSE 0x01
+#define ADB_HANDLER_CLASSIC2_MOUSE 0x02
+#define ADB_HANDLER_EXTENDED_MOUSE 0x04
+#define ADB_HANDLER_TURBO_MOUSE 0x32
// ADB host
void adb_host_init(void);
bool adb_host_psw(void);
uint16_t adb_host_kbd_recv(uint8_t addr);
-uint16_t adb_host_mouse_recv(void);
uint16_t adb_host_talk(uint8_t addr, uint8_t reg);
+uint8_t adb_host_talk_buf(uint8_t addr, uint8_t reg, uint8_t *buf, uint8_t len);
void adb_host_listen(uint8_t addr, uint8_t reg, uint8_t data_h, uint8_t data_l);
+void adb_host_listen_buf(uint8_t addr, uint8_t reg, uint8_t *buf, uint8_t len);
+void adb_host_flush(uint8_t addr);
void adb_host_kbd_led(uint8_t addr, uint8_t led);
void adb_mouse_task(void);
void adb_mouse_init(void);