X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=converter%2Fibm4704_usb%2Fmatrix.c;h=acba17dc1dcf556c7fe3600dbd4b835fa0220810;hb=15ab461f4448372f3f92ff847be87eda68b60c6e;hp=0bfda2b1581e11eb04c8fe5aa4598c562e576db8;hpb=c4efadf68a5b1853f253dd9f28afb54c26bff796;p=max%2Ftmk_keyboard.git
diff --git a/converter/ibm4704_usb/matrix.c b/converter/ibm4704_usb/matrix.c
index 0bfda2b1..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 .
static void matrix_make(uint8_t code);
static void matrix_break(uint8_t code);
-static void matrix_clear(void);
/*
@@ -53,57 +52,36 @@ 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)
{
- uint8_t ret;
print("Enable break: ");
- // valid scancode: 00-77h
- for (uint8_t code = 0; code < 0x78; code++) {
- while (ibm4704_send(0x80|code) != 0) {
- print("z");
- _delay_us(500);
- }
- _delay_us(2000);
- ret = ibm4704_recv();
- if (ret != 0xff) {
- xprintf("c%02X:r%02X ", code, ret);
- }
- _delay_us(1000);
+ while (ibm4704_send(0xFC)) { _delay_ms(10); }
+ // valid scancode: 00-79h
+ 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
+ xprintf("s%02X:r%02X ", code, ibm4704_recv());
}
- _delay_us(1000);
- while (ibm4704_send(0xFF) != 0) { _delay_us(500); } // End
+ while (ibm4704_send(0xFF)) { _delay_ms(10); } // End
print("End\n");
}
-void matrix_init(void)
-{
- uint8_t ret;
- debug_enable = true;
+void matrix_setup(void)
+{
ibm4704_init();
- matrix_clear();
+}
- // read keyboard id
- while ((ret = ibm4704_recv()) == 0xFF) {
- ibm4704_send(0xFE);
- _delay_us(100);
- }
+void matrix_init(void)
+{
+ debug_enable = true;
- _delay_ms(2000); // wait for starting up debug console
print("IBM 4704 converter\n");
- xprintf("Keyboard ID: %02X\n", ret);
+ matrix_clear();
+ _delay_ms(2000); // wait for keyboard starting up
+ uint8_t keyboard_id = ibm4704_recv();
+ xprintf("Keyboard ID: %02X\n", keyboard_id);
enable_break();
}
@@ -116,41 +94,27 @@ uint8_t matrix_scan(void)
if (code==0xFF) {
// Not receivd
return 0;
- } else if ((code&0x78)==0x78) {
- // 0xFF-F8 and 0x7F-78 is not scancode
- xprintf("Error: %0X\n", code);
+ } else if ((code&0x7F) >= 0x7C) {
+ // 0xFF-FC and 0x7F-7C is not scancode
+ xprintf("Error: %02X\n", code);
matrix_clear();
return 0;
} else if (code&0x80) {
+ dprintf("%02X\n", code);
matrix_make(code);
} else {
+ dprintf("%02X\n", code);
matrix_break(code);
}
return 1;
}
-inline
-bool matrix_is_on(uint8_t row, uint8_t col)
-{
- return (matrix[row] & (1<