X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=converter%2Fibm4704_usb%2Fmatrix.c;h=acba17dc1dcf556c7fe3600dbd4b835fa0220810;hb=f664a993d2ab876435eccf25d1ec126d1f5e3191;hp=155df9c38f26f5fa2d9a610e4773436c75dd1fdc;hpb=81137b7a61ef11df023e1f542840a80bfc1ca090;p=max%2Ftmk_keyboard.git

diff --git a/converter/ibm4704_usb/matrix.c b/converter/ibm4704_usb/matrix.c
index 155df9c3..acba17dc 100644
--- a/converter/ibm4704_usb/matrix.c
+++ b/converter/ibm4704_usb/matrix.c
@@ -29,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 static void matrix_make(uint8_t code);
 static void matrix_break(uint8_t code);
-static void matrix_clear(void);
 
 
 /*
@@ -53,23 +52,12 @@ static uint8_t matrix[MATRIX_ROWS];
 #define COL(code)      (code&0x07)
 
 
-inline
-uint8_t matrix_rows(void)
-{
-    return MATRIX_ROWS;
-}
-
-inline
-uint8_t matrix_cols(void)
-{
-    return MATRIX_COLS;
-}
-
 static void enable_break(void)
 {
     print("Enable break: ");
+    while (ibm4704_send(0xFC)) { _delay_ms(10); }
     // valid scancode: 00-79h
-    for (uint8_t code = 0; code < 0x7A; code++) {
+    for (uint8_t code = 0; code < 0x7F; code++) {
         while (ibm4704_send(0x80|code)) _delay_ms(10);
         _delay_ms(5);   // wait for response
         // No response(FF) when ok, FD when out of bound
@@ -92,7 +80,8 @@ void matrix_init(void)
     print("IBM 4704 converter\n");
     matrix_clear();
     _delay_ms(2000);    // wait for keyboard starting up
-    xprintf("Keyboard ID: %02X\n", ibm4704_recv());
+    uint8_t keyboard_id = ibm4704_recv();
+    xprintf("Keyboard ID: %02X\n", keyboard_id);
     enable_break();
 }
 
@@ -105,8 +94,8 @@ uint8_t matrix_scan(void)
     if (code==0xFF) {
         // Not receivd
         return 0;
-    } else if ((code&0x7F) >= 0x7A) {
-        // 0xFF-FA and 0x7F-7A is not scancode
+    } else if ((code&0x7F) >= 0x7C) {
+        // 0xFF-FC and 0x7F-7C is not scancode
         xprintf("Error: %02X\n", code);
         matrix_clear();
         return 0;
@@ -120,28 +109,12 @@ uint8_t matrix_scan(void)
     return 1;
 }
 
-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++) {
-        xprintf("%02X: %08b\n", row, bitrev(matrix_get_row(row)));
-    }
-}
-
-
-
 inline
 static void matrix_make(uint8_t code)
 {
@@ -154,8 +127,7 @@ static void matrix_break(uint8_t code)
     matrix[ROW(code)] &= ~(1<<COL(code));
 }
 
-inline
-static void matrix_clear(void)
+void matrix_clear(void)
 {
     for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00;
 }