X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=converter%2Fpc98_usb%2Fmatrix.c;h=b44d3ef55cd6271d7aab2dcd95a2a232be35a417;hb=f5e487bc3850161bf4b78d9eafef11b78fd02bce;hp=19cfb0c0845556d66958d6c02c1672fd0db4712a;hpb=74019c8e417dbfac0b925effa1b29769d04bd8d5;p=max%2Ftmk_keyboard.git

diff --git a/converter/pc98_usb/matrix.c b/converter/pc98_usb/matrix.c
index 19cfb0c0..b44d3ef5 100644
--- a/converter/pc98_usb/matrix.c
+++ b/converter/pc98_usb/matrix.c
@@ -22,6 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "print.h"
 #include "util.h"
 #include "matrix.h"
+#include "led.h"
 #include "debug.h"
 #include "protocol/serial.h"
 
@@ -47,33 +48,51 @@ static uint8_t matrix[MATRIX_ROWS];
 #define COL(code)      (code&0x07)
 
 
-static void pc98_inhibit_repeat(void)
+static void pc98_send(uint8_t data)
 {
-    uint8_t code;
-
-    while (serial_recv()) ;
-RETRY:
     PC98_RDY_PORT |= (1<<PC98_RDY_BIT);
-    _delay_ms(500);
-    serial_send(0x9C);
-
+    _delay_ms(1);
+    serial_send(data);
+    _delay_ms(1);
     PC98_RDY_PORT &= ~(1<<PC98_RDY_BIT);
-    _delay_ms(100);
-    while (!(code = serial_recv())) ;
-    print("PC98: send 9C: "); print_hex8(code); print("\n");
-    if (code != 0xFA) goto RETRY;
-
+}
 
+static int16_t pc98_wait_response(void)
+{
+    int16_t code = -1;
+    uint8_t timeout = 255;
+    while (timeout-- && (code = serial_recv2()) == -1) _delay_ms(1);
+    return code;
+}
 
-    PC98_RDY_PORT |= (1<<PC98_RDY_BIT);
-    _delay_ms(100);
-    serial_send(0x70);
+static void pc98_inhibit_repeat(void)
+{
+    uint16_t code;
+RETRY:
+    pc98_send(0x9C);
+    code = pc98_wait_response();
+    if (code != -1) dprintf("send 9C: %02X\n", code);
+    if (code != 0xFA) return;
+
+    pc98_send(0x70);
+    code = pc98_wait_response();
+    if (code != -1) dprintf("send 70: %02X\n", code);
+    if (code != 0xFA) goto RETRY;
+}
 
-    PC98_RDY_PORT &= ~(1<<PC98_RDY_BIT);
-    _delay_ms(100);
-    //code = serial_recv();
-    while (!(code = serial_recv())) ;
-    print("PC98: send 70: "); print_hex8(code); print("\n");
+static uint8_t pc98_led = 0;
+static void pc98_led_set(void)
+{
+    uint16_t code;
+RETRY:
+    pc98_send(0x9D);
+    code = pc98_wait_response();
+    if (code != -1) dprintf("send 9D: %02X\n", code);
+    if (code != 0xFA) return;
+
+    pc98_send(pc98_led);
+    code = pc98_wait_response();
+    if (code != -1) dprintf("send %02X: %02X\n", pc98_led, code);
     if (code != 0xFA) goto RETRY;
 }
 
@@ -90,51 +109,41 @@ void matrix_init(void)
     serial_init();
 
     // PC98 reset
-/*
-    PC98_RST_PORT &= ~(1<<PC98_RST_BIT);
-    _delay_us(15);
-    PC98_RST_PORT |= (1<<PC98_RST_BIT);
-    _delay_us(13);
-    PC98_RDY_PORT &= ~(1<<PC98_RDY_BIT);
-*/
+    // https://archive.org/stream/PC9800TechnicalDataBookHARDWARE1993/PC-9800TechnicalDataBook_HARDWARE1993#page/n359
+    PC98_RDY_PORT |=  (1<<PC98_RDY_BIT);    // RDY: high
+    PC98_RST_PORT &= ~(1<<PC98_RST_BIT);    // RST: low
+    _delay_us(15);                          // > 13us
+    PC98_RST_PORT |= (1<<PC98_RST_BIT);     // RST: high
 
-    _delay_ms(500);
+    _delay_ms(50);
     pc98_inhibit_repeat();
 
-
-    // PC98 ready
-    PC98_RDY_PORT &= ~(1<<PC98_RDY_BIT);
-
     // initialize matrix state: all keys off
     for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00;
 
-    debug("init\n");
+    // ready to receive from keyboard
+    PC98_RDY_PORT &= ~(1<<PC98_RDY_BIT);    // RDY: low
+
     return;
 }
 
 uint8_t matrix_scan(void)
 {
     uint16_t code;
-    PC98_RDY_PORT |= (1<<PC98_RDY_BIT);
-    _delay_us(30);
     code = serial_recv2();
-    PC98_RDY_PORT &= ~(1<<PC98_RDY_BIT);
-    if (code == -1) return 0;
-
-if (code == 0x60) {
-    pc98_inhibit_repeat();
-
-/*
-    PC98_RDY_PORT |= (1<<PC98_RDY_BIT);
-    _delay_ms(100);
-    serial_send(0x96);
-    PC98_RDY_PORT &= ~(1<<PC98_RDY_BIT);
-*/
-
-    return 0;
-}
+    if (code == -1) {
+#ifdef PC98_LED_CONTROL
+        // Before sending command  we have to make sure that there is no unprocessed key in queue
+        // otherwise keys will be missed during sending command
+        if (pc98_led) {
+            pc98_led_set();
+            pc98_led = 0;
+        }
+#endif
+        return 0;
+    }
 
-    print_hex8(code); print(" ");
+    dprintf("%02X ", code);
 
     if (code&0x80) {
         // break code
@@ -147,6 +156,12 @@ if (code == 0x60) {
             matrix[ROW(code)] |=  (1<<COL(code));
         }
     }
+
+    // PC-9801V keyboard requires RDY pulse.
+    // This is not optimal place though, it works.
+    PC98_RDY_PORT |=  (1<<PC98_RDY_BIT);    // RDY: high
+    _delay_us(20);
+    PC98_RDY_PORT &= ~(1<<PC98_RDY_BIT);    // RDY: low
     return code;
 }
 
@@ -155,3 +170,14 @@ uint8_t matrix_get_row(uint8_t row)
 {
     return matrix[row];
 }
+
+void led_set(uint8_t usb_led)
+{
+    // https://archive.org/stream/PC9800TechnicalDataBookHARDWARE1993/PC-9800TechnicalDataBook_HARDWARE1993#page/n161
+    // http://www.webtech.co.jp/company/doc/undocumented_mem/io_kb.txt
+    pc98_led = 0x70;
+    if (usb_led & (1<<USB_LED_NUM_LOCK))    pc98_led |= (1<<0);
+    if (usb_led & (1<<USB_LED_CAPS_LOCK))   pc98_led |= (1<<2);
+    dprintf("usb_led: %02X\n", usb_led);
+    dprintf("pc98_led: %02X\n", pc98_led);
+}