X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=converter%2Fibmpc_usb%2Fibmpc_usb.c;h=99e65a4a3bfbb29654cae43572fe4ea1a604e3e5;hb=9f041460313bc16e3f8a9677faced4d38d343d9a;hp=099875357047c55d6f8ecc4f8d1449d8535bd9ae;hpb=0c80bfca714e953f2575c35e21c0549b679b3d56;p=max%2Ftmk_keyboard.git diff --git a/converter/ibmpc_usb/ibmpc_usb.c b/converter/ibmpc_usb/ibmpc_usb.c index 09987535..99e65a4a 100644 --- a/converter/ibmpc_usb/ibmpc_usb.c +++ b/converter/ibmpc_usb/ibmpc_usb.c @@ -1,5 +1,5 @@ /* -Copyright 2019 Jun Wako +Copyright 2019,2020 Jun Wako This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -68,6 +68,7 @@ static uint16_t read_keyboard_id(void) if (code == -1) { id = 0x0000; goto DONE; } // AT id = (code & 0xFF)<<8; + // Mouse responds with one-byte 00, this returns 00FF [y] p.14 code = read_wait(500); id |= code & 0xFF; @@ -125,7 +126,7 @@ uint8_t matrix_scan(void) if (ibmpc_error) { - xprintf("\nERR: %02X\n", ibmpc_error); + xprintf("\nERR:%02X\n", ibmpc_error); // when recv error, neither send error nor buffer full if (!(ibmpc_error & (IBMPC_ERR_SEND | IBMPC_ERR_FULL))) { @@ -183,9 +184,11 @@ uint8_t matrix_scan(void) // 2) Read key typed by user or anything after error on protocol or scan code // This can happen in case of keyboard hotswap, unstable hardware, signal integrity problem or bug + /* wait until keyboard sends any code without 10000ms timeout if (timer_elapsed(init_time) > 10000) { state = READ_ID; } + */ if (ibmpc_host_recv() != -1) { // wait for AA xprintf("W%u ", timer_read()); init_time = timer_read(); @@ -216,25 +219,50 @@ uint8_t matrix_scan(void) case READ_ID: xprintf("R%u ", timer_read()); + // SKIDATA-2-DE(and some other keyboards?) stores 'Code Set' setting in nonvlatile memory + // and keeps it until receiving reset. Sending reset here may be useful to clear it, perhaps. + // https://github.com/tmk/tmk_keyboard/wiki/IBM-PC-AT-Keyboard-Protocol#select-alternate-scan-codesf0 + //ibmpc_host_send(0xFF); // reset command + //read_wait(500); // BAT takes 600-900ms(84-key) or 300-500ms(101/102-key) [8] 4-7, 4-39 + keyboard_id = read_keyboard_id(); if (ibmpc_error) { - xprintf("\nERR: %02X\n", ibmpc_error); + xprintf("\nERR:%02X\n", ibmpc_error); ibmpc_error = IBMPC_ERR_NONE; } - if (0xAB00 == (keyboard_id & 0xFF00)) { // CodeSet2 PS/2 + if (0x0000 == keyboard_id) { // CodeSet2 AT(IBM PC AT 84-key) keyboard_kind = PC_AT; - } else if (0xBF00 == (keyboard_id & 0xFF00)) { // CodeSet3 Terminal - keyboard_kind = PC_TERMINAL; - } else if (0x0000 == keyboard_id) { // CodeSet2 AT - keyboard_kind = PC_AT; - } else if (0xFFFF == keyboard_id) { // CodeSet1 XT + } else if (0xFFFF == keyboard_id) { // CodeSet1 XT keyboard_kind = PC_XT; - } else if (0xFFFE == keyboard_id) { // CodeSet2 PS/2 fails to response? + } else if (0xFFFE == keyboard_id) { // CodeSet2 PS/2 fails to response? keyboard_kind = PC_AT; - } else if (0x00FF == keyboard_id) { // Mouse is not supported + } else if (0x00FF == keyboard_id) { // Mouse is not supported xprintf("Mouse: not supported\n"); keyboard_kind = NONE; +#ifdef G80_2551_SUPPORT + } else if (0xAB86 == keyboard_id || + 0xAB85 == keyboard_id) { // For G80-2551 and other 122-key terminal + // https://github.com/tmk/tmk_keyboard/wiki/IBM-PC-AT-Keyboard-Protocol#ab86 + // https://github.com/tmk/tmk_keyboard/wiki/IBM-PC-AT-Keyboard-Protocol#ab85 + + if ((0xFA == ibmpc_host_send(0xF0)) && + (0xFA == ibmpc_host_send(0x03))) { + // switch to code set 3 + keyboard_kind = PC_TERMINAL; + } else { + keyboard_kind = PC_AT; + } +#endif + } else if (0xBFB0 == keyboard_id) { // IBM RT Keyboard + // https://github.com/tmk/tmk_keyboard/wiki/IBM-PC-AT-Keyboard-Protocol#bfb0 + // TODO: LED indicator fix + //keyboard_kind = PC_TERMINAL_IBM_RT; + keyboard_kind = PC_TERMINAL; + } else if (0xAB00 == (keyboard_id & 0xFF00)) { // CodeSet2 PS/2 + keyboard_kind = PC_AT; + } else if (0xBF00 == (keyboard_id & 0xFF00)) { // CodeSet3 Terminal + keyboard_kind = PC_TERMINAL; } else { keyboard_kind = PC_AT; } @@ -252,6 +280,7 @@ uint8_t matrix_scan(void) led_set(host_keyboard_leds()); break; case PC_TERMINAL: + // Set all keys to make/break type ibmpc_host_send(0xF8); break; default: @@ -325,7 +354,7 @@ void matrix_clear(void) void led_set(uint8_t usb_led) { - if (keyboard_kind != PC_AT) return; + //if (keyboard_kind != PC_AT) return; uint8_t ibmpc_led = 0; if (usb_led & (1<= 0x62) { + xprintf("!CS1_INV!\n"); + state = INIT; + return -1; + } + switch (state) { case INIT: switch (code) { case 0x00: case 0xFF: // Error/Overrun [3]p.26 - xprintf("!CS1_%02X!\n", code); + xprintf("!CS1_ERR!\n"); return -1; break; case 0xE0: @@ -595,12 +632,12 @@ static uint8_t cs2_e0code(uint8_t code) { case 0x75: return 0x4F; // cursor up case 0x7A: return 0x56; // page down case 0x7D: return 0x5E; // page up - case 0x7C: return 0x6F; // Print Screen + case 0x7C: return 0x7F; // Print Screen case 0x7E: return 0x00; // Control'd Pause case 0x21: return 0x65; // volume down case 0x32: return 0x6E; // volume up - case 0x23: return 0x7F; // mute + case 0x23: return 0x6F; // mute case 0x10: return 0x08; // (WWW search) -> F13 case 0x18: return 0x10; // (WWW favourites) -> F14 case 0x20: return 0x18; // (WWW refresh) -> F15 @@ -657,9 +694,13 @@ static int8_t process_cs2(void) case INIT: switch (code) { case 0x00: // Error/Overrun [3]p.26 + xprintf("!CS2_OVR!\n"); + matrix_clear(); + clear_keyboard(); + break; case 0xFF: matrix_clear(); - xprintf("!CS2_%02X!\n", code); + xprintf("!CS2_ERR!\n"); state = INIT; return -1; break; @@ -677,7 +718,7 @@ static int8_t process_cs2(void) state = INIT; break; case 0x84: // Alt'd PrintScreen - matrix_make(0x6F); + matrix_make(0x7F); state = INIT; break; case 0xAA: // Self-test passed @@ -724,7 +765,7 @@ static int8_t process_cs2(void) state = INIT; break; case 0x84: // Alt'd PrintScreen - matrix_break(0x6F); + matrix_break(0x7F); state = INIT; break; default: @@ -816,15 +857,19 @@ static int8_t process_cs2(void) /* * Terminal: Scan Code Set 3 * - * See [3], [7] - * - * Scan code 0x83 and 0x84 are handled exceptioanally to fit into 1-byte range index. + * See [3], [7] and + * https://github.com/tmk/tmk_keyboard/wiki/IBM-PC-AT-Keyboard-Protocol#scan-code-set-3 */ static int8_t process_cs3(void) { static enum { READY, F0, +#ifdef G80_2551_SUPPORT + // G80-2551 four extra keys around cursor keys + G80, + G80_F0, +#endif } state = READY; uint16_t code = ibmpc_host_recv(); @@ -836,54 +881,162 @@ static int8_t process_cs3(void) case READY: switch (code) { case 0x00: // Error/Overrun [3]p.26 + xprintf("!CS3_OVR!\n"); + matrix_clear(); + clear_keyboard(); + break; case 0xFF: - xprintf("!CS3_%02X!\n", code); + xprintf("!CS3_ERR!\n"); return -1; break; case 0xF0: state = F0; break; - case 0x83: // F7 + case 0x83: // PrintScreen matrix_make(0x02); break; - case 0x84: // keypad - + case 0x84: // Keypad * matrix_make(0x7F); break; + case 0x85: // Muhenkan + matrix_make(0x0B); + break; + case 0x86: // Henkan + matrix_make(0x06); + break; + case 0x87: // Hiragana + matrix_make(0x00); + break; + case 0x8B: // Left GUI + matrix_make(0x01); + break; + case 0x8C: // Right GUI + matrix_make(0x09); + break; + case 0x8D: // Application + matrix_make(0x0A); + break; +#ifdef G80_2551_SUPPORT + case 0x80: // G80-2551 four extra keys around cursor keys + state = G80; + break; +#endif default: // normal key make if (code < 0x80) { matrix_make(code); } else { - xprintf("!CS3_%02X!\n", code); - return -1; + xprintf("!CS3_READY!\n"); + //return -1; } } break; case F0: // Break code switch (code) { case 0x00: + xprintf("!CS3_F0_OVR!\n"); + matrix_clear(); + clear_keyboard(); + state = READY; + break; case 0xFF: - xprintf("!CS3_F0_%02X!\n", code); + xprintf("!CS3_F0_ERR!\n"); state = READY; return -1; break; - case 0x83: // F7 + case 0x83: // PrintScreen matrix_break(0x02); state = READY; break; - case 0x84: // keypad - + case 0x84: // Keypad * matrix_break(0x7F); state = READY; break; + case 0x85: // Muhenkan + matrix_break(0x0B); + state = READY; + break; + case 0x86: // Henkan + matrix_break(0x06); + state = READY; + break; + case 0x87: // Hiragana + matrix_break(0x00); + state = READY; + break; + case 0x8B: // Left GUI + matrix_break(0x01); + state = READY; + break; + case 0x8C: // Right GUI + matrix_break(0x09); + state = READY; + break; + case 0x8D: // Application + matrix_break(0x0A); + state = READY; + break; default: state = READY; if (code < 0x80) { matrix_break(code); } else { - xprintf("!CS3_F0_%02X!\n", code); - return -1; + xprintf("!CS3_F0!\n"); + //return -1; } } break; +#ifdef G80_2551_SUPPORT + /* + * G80-2551 terminal keyboard support + * https://deskthority.net/wiki/Cherry_G80-2551 + * https://github.com/tmk/tmk_keyboard/wiki/IBM-PC-AT-Keyboard-Protocol#g80-2551-in-code-set-3 + */ + case G80: // G80-2551 four extra keys around cursor keys + switch (code) { + case (0x26): // TD= -> JYEN + matrix_make(0x5D); + break; + case (0x25): // page with edge -> NUHS + matrix_make(0x53); + break; + case (0x16): // two pages -> RO + matrix_make(0x51); + break; + case (0x1E): // calc -> KANA + matrix_make(0x00); + break; + case (0xF0): + state = G80_F0; + return 0; + default: + // Not supported + matrix_clear(); + break; + } + state = READY; + break; + case G80_F0: + switch (code) { + case (0x26): // TD= -> JYEN + matrix_break(0x5D); + break; + case (0x25): // page with edge -> NUHS + matrix_break(0x53); + break; + case (0x16): // two pages -> RO + matrix_break(0x51); + break; + case (0x1E): // calc -> KANA + matrix_break(0x00); + break; + default: + // Not supported + matrix_clear(); + break; + } + state = READY; + break; +#endif } return 0; } @@ -918,6 +1071,9 @@ static int8_t process_cs3(void) * [7] The IBM 6110344 Keyboard - Scan Code Set 3 of 122-key terminal keyboard * https://www.seasip.info/VintagePC/ibm_6110344.html * + * [8] IBM PC AT Technical Reference 1986 + * http://bitsavers.org/pdf/ibm/pc/at/6183355_PC_AT_Technical_Reference_Mar86.pdf + * * [y] TrackPoint Engineering Specifications for version 3E * https://web.archive.org/web/20100526161812/http://wwwcssrv.almaden.ibm.com/trackpoint/download.html *