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

diff --git a/converter/pc98_usb/matrix.c b/converter/pc98_usb/matrix.c
index b3c11dc2..19cfb0c0 100644
--- a/converter/pc98_usb/matrix.c
+++ b/converter/pc98_usb/matrix.c
@@ -46,26 +46,39 @@ 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_inhibit_repeat(void)
 {
-    return MATRIX_ROWS;
-}
+    uint8_t code;
 
-inline
-uint8_t matrix_cols(void)
-{
-    return MATRIX_COLS;
+    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");
+    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");
+    if (code != 0xFA) goto RETRY;
 }
 
 void matrix_init(void)
 {
-    print_enable = true;
-    debug_enable = true;
-
     PC98_RST_DDR |= (1<<PC98_RST_BIT);
     PC98_RDY_DDR |= (1<<PC98_RDY_BIT);
     PC98_RTY_DDR |= (1<<PC98_RTY_BIT);
@@ -77,11 +90,20 @@ 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);
+    PC98_RDY_PORT &= ~(1<<PC98_RDY_BIT);
+*/
+
+    _delay_ms(500);
+    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;
@@ -92,88 +114,44 @@ void matrix_init(void)
 
 uint8_t matrix_scan(void)
 {
-    is_modified = false;
-
-    uint8_t code;
+    uint16_t code;
     PC98_RDY_PORT |= (1<<PC98_RDY_BIT);
-    code = serial_recv();
+    _delay_us(30);
+    code = serial_recv2();
     PC98_RDY_PORT &= ~(1<<PC98_RDY_BIT);
-    if (!code) return 0;
+    if (code == -1) return 0;
 
-    debug_hex(code); debug(" ");
+if (code == 0x60) {
+    pc98_inhibit_repeat();
 
 /*
-    switch (code) {
-        case 0x7E:  // reset fail
-        case 0xFE:  // layout
-        case 0xFF:  // reset success
-            _delay_ms(500);
-            // ignore response byte
-            debug("(response ignored:");
-            while ((code = serial_recv())) { debug(" "); debug_hex(code); }
-            debug(") ");
-            // FALL THROUGH
-        case 0x7F:
-            // all keys up
-            for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00;
-            return 0;
-    }
+    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)
-{
-    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");
-    }
-}
-
-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;
-}