X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=converter%2Fpc98_usb%2Fmatrix.c;h=b44d3ef55cd6271d7aab2dcd95a2a232be35a417;hb=1575db9166a21591bed95d4653db4d5d45e534be;hp=54bb30414d7b458859ecf21f7d137386f0c2815a;hpb=9977fd514076651400b088268c1c0b57e6b00772;p=max%2Ftmk_keyboard.git

diff --git a/converter/pc98_usb/matrix.c b/converter/pc98_usb/matrix.c
index 54bb3041..b44d3ef5 100644
--- a/converter/pc98_usb/matrix.c
+++ b/converter/pc98_usb/matrix.c
@@ -68,26 +68,36 @@ static int16_t pc98_wait_response(void)
 static void pc98_inhibit_repeat(void)
 {
     uint16_t code;
-
-    // clear recv buffer
-    while (serial_recv()) ;
 RETRY:
-    _delay_ms(100);
     pc98_send(0x9C);
     code = pc98_wait_response();
-    if (code != -1) xprintf("PC98: send 9C: %02X\n", code);
-    if (code != 0xFA) goto RETRY;
+    if (code != -1) dprintf("send 9C: %02X\n", code);
+    if (code != 0xFA) return;
 
-    _delay_ms(100);
     pc98_send(0x70);
     code = pc98_wait_response();
-    if (code != -1) xprintf("PC98: send 70: %02X\n", code);
+    if (code != -1) dprintf("send 70: %02X\n", code);
+    if (code != 0xFA) goto RETRY;
+}
+
+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;
 }
 
 void matrix_init(void)
 {
-    debug_keyboard = true;
     PC98_RST_DDR |= (1<<PC98_RST_BIT);
     PC98_RDY_DDR |= (1<<PC98_RDY_BIT);
     PC98_RTY_DDR |= (1<<PC98_RTY_BIT);
@@ -99,38 +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 == -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
@@ -143,6 +156,12 @@ uint8_t matrix_scan(void)
             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;
 }
 
@@ -154,15 +173,11 @@ uint8_t matrix_get_row(uint8_t row)
 
 void led_set(uint8_t usb_led)
 {
-#ifdef PC98_LED_CONTROL
-    uint8_t led_state = 0x70;
-    if (usb_led & (1<<USB_LED_NUM_LOCK))    led_state |= (1<<0);
-    if (usb_led & (1<<USB_LED_CAPS_LOCK))   led_state |= (1<<2);
-    xprintf("led_set: %02X\n", led_state);
-
-    pc98_send(0x9D);
-    _delay_ms(100);
-    pc98_send(led_state);
-    // responses(FA or FC) will be ignored in matrix_scan()
-#endif
+    // 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);
 }