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

diff --git a/converter/pc98_usb/matrix.c b/converter/pc98_usb/matrix.c
index ef2bc381..8833e0a8 100644
--- a/converter/pc98_usb/matrix.c
+++ b/converter/pc98_usb/matrix.c
@@ -61,11 +61,38 @@ uint8_t matrix_cols(void)
     return MATRIX_COLS;
 }
 
-void matrix_init(void)
+static void pc98_inhibit_repeat(void)
 {
-    print_enable = true;
-    debug_enable = true;
+    uint8_t code;
+
+    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)
+{
     PC98_RST_DDR |= (1<<PC98_RST_BIT);
     PC98_RDY_DDR |= (1<<PC98_RDY_BIT);
     PC98_RTY_DDR |= (1<<PC98_RTY_BIT);
@@ -73,17 +100,21 @@ void matrix_init(void)
     PC98_RDY_PORT |= (1<<PC98_RDY_BIT);
     PC98_RTY_PORT |= (1<<PC98_RTY_BIT);
 
-    DDRD |= 1<<7;
-
 
     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);
@@ -99,31 +130,27 @@ uint8_t matrix_scan(void)
 {
     is_modified = false;
 
-    uint8_t code;
+    uint16_t code;
     PC98_RDY_PORT |= (1<<PC98_RDY_BIT);
     _delay_us(30);
-    code = serial_recv();
+    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
@@ -138,7 +165,6 @@ uint8_t matrix_scan(void)
             is_modified = true;
         }
     }
-*/
     return code;
 }