Enough wacky little fixes to get motors turning and keypad functional.

[uccvend-snackrom.git] / ROM2 / keypad.c

diff --git a/ROM2/keypad.c b/ROM2/keypad.c
index 8ffa664..6c04754 100644 (file)
--- a/ROM2/keypad.c
+++ b/ROM2/keypad.c
@@ -8,6 +8,8 @@ volatile bool new_key;
 
 /* first 8 from the first row, then 3 from the second row */
 /* keys are 1-9, 0, reset */
+//const u8 keymap0[8] = {KEY_8, KEY_7, KEY_6, KEY_5, KEY_4, KEY_3, KEY_2, KEY_1};
+//const u8 keymap1[3] = {KEY_RESET, KEY_0, KEY_9};
 const u8 keymap0[8] = {KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8};
 const u8 keymap1[3] = {KEY_9, KEY_0, KEY_RESET};
 
@@ -17,7 +19,7 @@ const u8 keymap1[3] = {KEY_9, KEY_0, KEY_RESET};
  * register (from 0..7). If no bits were turned on, it returns 8 (aka NO_KEY)
  */
 extern inline u8 keypad_read_row(u8 row) {
-       u8 i, j, num;
+       u8 i, num;
 
        if (row)
                bset((void*)&_io_ports[M6811_PORTD], PORTD_KEYPAD_ROW);
@@ -31,30 +33,15 @@ extern inline u8 keypad_read_row(u8 row) {
 
        bclr_misc_output(A3800_DISPLAY_WRITE);  /* disable the display clock */
 
-       /* _io_ports[M6811_SPDR] = 0; */
-       asm volatile (
-               "ldab #0\n"
-               "stab %0\n"
-               : "=m" (_io_ports[M6811_SPDR])
-               :
-               : "b"
-                       );
+       _io_ports[M6811_SPDR] = 0x55; /* doesn't matter what we send. */
        while(!(_io_ports[M6811_SPSR]&M6811_SPIF)); /* wait for completion */
 
        /* SPDR read to clear SPIF flag is performed below: */
        i = _io_ports[M6811_SPDR];
 
-       /* print out the row & read in key in binary */
-       char msg_buf[11] = "XKXXXXXXXX";
-       msg_buf[0] = row?'1':'0';
-       for (j = 1, num = 0; num < 8; j = j << 1, num++) {
-               msg_buf[num+2] = (i & j)?'1':'0';
-       }
-       set_msg(msg_buf);
-
        num = 0;
-       while (((i & 0x01) == 0) && (num < 8)) {
-               i = i >> 1;
+       while (((i & 0x80) == 0) && (num < 8)) {
+               i = i << 1;
                num++;
        }