max/tmk_keyboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

adb_usb: Clean keyboard setup code

Browse source
This commit is contained in:
tmk 2022-04-14 09:27:28 +09:00
parent 1d3e9a2e59
commit 373706875e
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
converter/adb_usb/matrix.c
View file

@ -68,18 +68,17 @@ static void keyboard_init(void)
// Check if there is keyboard at default address // Check if there is keyboard at default address
reg3 = adb_host_talk(ADB_ADDR_KEYBOARD, ADB_REG_3); reg3 = adb_host_talk(ADB_ADDR_KEYBOARD, ADB_REG_3);
if (!reg3) return;
if (reg3) { if (reg3) {
xprintf("K:found: addr:" xstr(ADB_ADDR_KEYBOARD) " reg3:%04X\n", reg3); xprintf("K:found: reg3:%04X\n", reg3);
adb_host_listen(ADB_ADDR_KEYBOARD, ADB_REG_3, ((reg3 >> 8) & 0xF0) | ADB_ADDR_KBD_TMP, 0xFE); adb_host_listen(ADB_ADDR_KEYBOARD, ADB_REG_3, ((reg3 >> 8) & 0xF0) | ADB_ADDR_KBD_TMP, 0xFE);
} }
// Check if there is device to setup at temporary address // Check if there is device to setup at temporary address
reg3 = adb_host_talk(ADB_ADDR_KBD_TMP, ADB_REG_3); reg3 = adb_host_talk(ADB_ADDR_KBD_TMP, ADB_REG_3);
if (!reg3) { if (!reg3) {
xprintf("K:fail: move\n");
return; return;
} }
xprintf("K:TMP: reg3:%04X\n", reg3);
// Determine ISO keyboard by handler id // Determine ISO keyboard by handler id
// http://lxr.free-electrons.com/source/drivers/macintosh/adbhid.c?v=4.4#L815 // http://lxr.free-electrons.com/source/drivers/macintosh/adbhid.c?v=4.4#L815
@ -94,6 +93,7 @@ static void keyboard_init(void)
is_iso_layout = false; is_iso_layout = false;
break; break;
} }
xprintf("K:ISO: %s\n", (is_iso_layout ? "yes" : "no"));
// Adjustable keyboard media keys: address=0x07 and handlerID=0x02 // Adjustable keyboard media keys: address=0x07 and handlerID=0x02
has_media_keys = (0x02 == (adb_host_talk(ADB_ADDR_APPLIANCE, ADB_REG_3) & 0xff)); has_media_keys = (0x02 == (adb_host_talk(ADB_ADDR_APPLIANCE, ADB_REG_3) & 0xff));
@ -112,11 +112,14 @@ static void keyboard_init(void)
// Move to keyboard polling address // Move to keyboard polling address
adb_host_listen(ADB_ADDR_KBD_TMP, ADB_REG_3, ((reg3 >> 8) & 0xF0) | ADB_ADDR_KBD_POLL, 0xFE); adb_host_listen(ADB_ADDR_KBD_TMP, ADB_REG_3, ((reg3 >> 8) & 0xF0) | ADB_ADDR_KBD_POLL, 0xFE);
if (adb_host_talk(ADB_ADDR_KBD_TMP, ADB_REG_3)) { reg3 = adb_host_talk(ADB_ADDR_KBD_TMP, ADB_REG_3);
xprintf("K:fail: move\n"); if (reg3) {
xprintf("K:POL: fail reg3:%04X\n", reg3);
} else {
xprintf("K:POL: done\n");
} }
xprintf("K:setup: addr:" xstr(ADB_ADDR_KBD_POLL) " reg3:%04X, ISO:%s\n",
reg3, (is_iso_layout ? "yes" : "no")); device_scan();
} }
void matrix_init(void) void matrix_init(void)