X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=converter%2Fpc98_usb%2Fmatrix.c;h=54bb30414d7b458859ecf21f7d137386f0c2815a;hb=effdef418747406b81e3b4545fa3e911d0931d2f;hp=8833e0a851badc6cc1693771a48fe64e5f07554b;hpb=83a3de38b710d0eb5a752ffded6da2e8bf818b22;p=max%2Ftmk_keyboard.git

diff --git a/converter/pc98_usb/matrix.c b/converter/pc98_usb/matrix.c
index 8833e0a8..54bb3041 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"
 
@@ -46,53 +47,47 @@ static uint8_t matrix[MATRIX_ROWS];
 #define ROW(code)      ((code>>3)&0xF)
 #define COL(code)      (code&0x07)
 
-static bool is_modified = false;
 
-
-inline
-uint8_t matrix_rows(void)
+static void pc98_send(uint8_t data)
 {
-    return MATRIX_ROWS;
+    PC98_RDY_PORT |= (1<<PC98_RDY_BIT);
+    _delay_ms(1);
+    serial_send(data);
+    _delay_ms(1);
+    PC98_RDY_PORT &= ~(1<<PC98_RDY_BIT);
 }
 
-inline
-uint8_t matrix_cols(void)
+static int16_t pc98_wait_response(void)
 {
-    return MATRIX_COLS;
+    int16_t code = -1;
+    uint8_t timeout = 255;
+    while (timeout-- && (code = serial_recv2()) == -1) _delay_ms(1);
+    return code;
 }
 
 static void pc98_inhibit_repeat(void)
 {
-    uint8_t code;
+    uint16_t code;
 
+    // clear recv buffer
     while (serial_recv()) ;
 RETRY:
-    PC98_RDY_PORT |= (1<<PC98_RDY_BIT);
-    _delay_ms(500);
-    serial_send(0x9C);
-
-    PC98_RDY_PORT &= ~(1<<PC98_RDY_BIT);
     _delay_ms(100);
-    while (!(code = serial_recv())) ;
-    print("PC98: send 9C: "); print_hex8(code); print("\n");
+    pc98_send(0x9C);
+    code = pc98_wait_response();
+    if (code != -1) xprintf("PC98: send 9C: %02X\n", code);
     if (code != 0xFA) goto RETRY;
 
-
-
-    PC98_RDY_PORT |= (1<<PC98_RDY_BIT);
-    _delay_ms(100);
-    serial_send(0x70);
-
-    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");
+    pc98_send(0x70);
+    code = pc98_wait_response();
+    if (code != -1) xprintf("PC98: send 70: %02X\n", 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);
@@ -128,84 +123,46 @@ void matrix_init(void)
 
 uint8_t matrix_scan(void)
 {
-    is_modified = false;
-
     uint16_t code;
     PC98_RDY_PORT |= (1<<PC98_RDY_BIT);
-    _delay_us(30);
+    //_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;
-}
-
     print_hex8(code); print(" ");
 
     if (code&0x80) {
         // break code
         if (matrix_is_on(ROW(code), COL(code))) {
             matrix[ROW(code)] &= ~(1<<COL(code));
-            is_modified = true;
         }
     } else {
         // make code
         if (!matrix_is_on(ROW(code), COL(code))) {
             matrix[ROW(code)] |=  (1<<COL(code));
-            is_modified = true;
         }
     }
     return code;
 }
 
-bool matrix_is_modified(void)
-{
-    return is_modified;
-}
-
-inline
-bool matrix_has_ghost(void)
-{
-    return false;
-}
-
-inline
-bool matrix_is_on(uint8_t row, uint8_t col)
-{
-    return (matrix[row] & (1<<col));
-}
-
 inline
 uint8_t matrix_get_row(uint8_t row)
 {
     return matrix[row];
 }
 
-void matrix_print(void)
+void led_set(uint8_t usb_led)
 {
-    print("\nr/c 01234567\n");
-    for (uint8_t row = 0; row < matrix_rows(); row++) {
-        phex(row); print(": ");
-        pbin_reverse(matrix_get_row(row));
-        print("\n");
-    }
-}
+#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);
 
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += bitpop(matrix[i]);
-    }
-    return count;
+    pc98_send(0x9D);
+    _delay_ms(100);
+    pc98_send(led_state);
+    // responses(FA or FC) will be ignored in matrix_scan()
+#endif
 }