Quick Fix: read scan code from PC98

3 files changed, 46 insertions, 11 deletions

diff --git a/converter/pc98_usb/config.h b/converter/pc98_usb/config.h
index 8bcaa26db..6f9f8fc3c 100644
--- a/converter/pc98_usb/config.h
+++ b/converter/pc98_usb/config.h
@@ -55,7 +55,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define SERIAL_BAUD 19200
 #define SERIAL_PARITY_ODD
-#define SERIAL_BIT_ORDER_MSB
+#define SERIAL_BIT_ORDER_LSB
 
 #define SERIAL_RXD_DDR  DDRD
 #define SERIAL_RXD_PORT PORTD
@@ -67,7 +67,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     SERIAL_RXD_DDR &= ~(1<<SERIAL_RXD_BIT);     \
     SERIAL_RXD_PORT |= (1<<SERIAL_RXD_BIT);     \
     /* enable interrupt: INT2(rising edge) */   \
-    EICRA |= ((1<<ISC21)|(1<<ISC20));           \
+    /*EICRA |= ((1<<ISC21)|(1<<ISC20));*/           \
+    /* enable interrupt: INT2(falling edge) */  \
+    EICRA |= ((1<<ISC21)|(0<<ISC20));           \
     EIMSK |= (1<<INT2);                         \
 } while (0)
 #define SERIAL_RXD_INT_ENTER()
@@ -75,7 +77,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     /* clear interrupt  flag */     \
     EIFR = (1<<INTF2);              \
 } while (0)
-#define SERIAL_RXD_READ()    (~SERIAL_RXD_PIN&(1<<SERIAL_RXD_BIT))
+//#define SERIAL_RXD_READ()    (~SERIAL_RXD_PIN&(1<<SERIAL_RXD_BIT))
+#define SERIAL_RXD_READ()    ((SERIAL_RXD_PIN&(1<<SERIAL_RXD_BIT)))
 
 #define SERIAL_TXD_DDR  DDRD
 #define SERIAL_TXD_PORT PORTD
diff --git a/converter/pc98_usb/matrix.c b/converter/pc98_usb/matrix.c
index b3c11dc21..ef2bc3818 100644
--- a/converter/pc98_usb/matrix.c
+++ b/converter/pc98_usb/matrix.c
@@ -73,6 +73,8 @@ void matrix_init(void)
     PC98_RDY_PORT |= (1<<PC98_RDY_BIT);
     PC98_RTY_PORT |= (1<<PC98_RTY_BIT);
 
+    DDRD |= 1<<7;
+
 
     serial_init();
 
@@ -83,6 +85,9 @@ void matrix_init(void)
     _delay_us(13);
     PC98_RDY_PORT |= (1<<PC98_RDY_BIT);
 
+    // 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;
 
@@ -96,6 +101,7 @@ uint8_t matrix_scan(void)
 
     uint8_t code;
     PC98_RDY_PORT |= (1<<PC98_RDY_BIT);
+    _delay_us(30);
     code = serial_recv();
     PC98_RDY_PORT &= ~(1<<PC98_RDY_BIT);
     if (!code) return 0;
diff --git a/protocol/serial_soft.c b/protocol/serial_soft.c
index e0661c3aa..47b1e4571 100644
--- a/protocol/serial_soft.c
+++ b/protocol/serial_soft.c
@@ -48,6 +48,23 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #define WAIT_US     (1000000/SERIAL_BAUD)
 
+#if 1
+#define WAIT_TICK     (1000000/SERIAL_BAUD)
+#define WAIT4(tick) _delay_us(tick)
+#else
+#define WAIT_TICK   ((16000000/SERIAL_BAUD)/4 - 5)
+static inline void  WAIT4(uint8_t tick)
+{
+	__asm__ __volatile__ (
+		"1: dec %0" "\n\t"
+                "nop"       "\n\t"
+		"brne 1b"
+		: 
+		: "r" (tick)
+	);
+}
+#endif
+
 void serial_init(void)
 {
     SERIAL_RXD_INIT();
@@ -60,6 +77,7 @@ static uint8_t rbuf[RBUF_SIZE];
 static uint8_t rbuf_head = 0;
 static uint8_t rbuf_tail = 0;
 
+
 uint8_t serial_recv(void)
 {
     uint8_t data = 0;
@@ -103,6 +121,7 @@ void serial_send(uint8_t data)
 /* detect edge of start bit */
 ISR(SERIAL_RXD_VECT)
 {
+PORTD ^= 1<<7;
     SERIAL_RXD_INT_ENTER()
 
     uint8_t data = 0;
@@ -120,11 +139,15 @@ ISR(SERIAL_RXD_VECT)
 #endif
 
     /* to center of start bit */
-    _delay_us(WAIT_US/2);
+    //_delay_us(WAIT_US/2);
+    WAIT4(WAIT_TICK/2);
+PORTD ^= 1<<7;
     do {
         /* to center of next bit */
-        _delay_us(WAIT_US);
+        //_delay_us(WAIT_US);
+        WAIT4(WAIT_TICK);
 
+PORTD ^= 1<<7;
         if (SERIAL_RXD_READ()) {
             data |= mask;
             parity ^= 1;
@@ -137,19 +160,22 @@ ISR(SERIAL_RXD_VECT)
     } while (mask);
 
     /* to center of parity bit */
-    _delay_us(WAIT_US);
-    parity ^= SERIAL_RXD_READ();
+    //_delay_us(WAIT_US);
+    WAIT4(WAIT_TICK);
+    if (SERIAL_RXD_READ()) { parity ^= 1; }
+PORTD ^= 1<<7;
 
     /* to center of stop bit */
-    _delay_us(WAIT_US);
-    _delay_us(WAIT_US/2);
+    //_delay_us(WAIT_US);
+    WAIT4(WAIT_TICK);
 
-    parity = 1;
     uint8_t next = (rbuf_head + 1) % RBUF_SIZE;
-    if (parity && next != rbuf_tail) {
+    //if (parity && next != rbuf_tail) {
+    if (next != rbuf_tail) {
         rbuf[rbuf_head] = data;
         rbuf_head = next;
     }
 
     SERIAL_RXD_INT_EXIT();
+PORTD ^= 1<<7;
 }