FIX: when reading key, was always getting key from keymap1.

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

diff --git a/ROM2/keypad.c b/ROM2/keypad.c
index b36b326..4105b24 100644 (file)
--- a/ROM2/keypad.c
+++ b/ROM2/keypad.c
@@ -7,15 +7,15 @@ bool new_key = 0;
 
 /* first 8 from the first row, then 3 from the second row */
 /* keys are 1-9, 0, reset */
-const u8 keymap0[8] = {8, 7, 6, 5, 4, 3, 2, 1};
-const u8 keymap1[3] = {11, 10, 9};
+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};
 
-extern inline int keypad_read_row(int row) {
-       int i, num;
+extern inline u8 keypad_read_row(u8 row) {
+       u8 i, num;
        if (row)
-               _io_ports[M6811_PORTD] |= PORTD_KEYPAD_ROW;
+               bset((void*)&_io_ports[M6811_PORTD], PORTD_KEYPAD_ROW);
        else
-               _io_ports[M6811_PORTD] &= ~PORTD_KEYPAD_ROW;
+               bclr((void*)&_io_ports[M6811_PORTD], PORTD_KEYPAD_ROW);
 
        bclr_misc_output(A3800_DISPLAY_WRITE);  /* disable the display clock */
 
@@ -32,13 +32,13 @@ extern inline int keypad_read_row(int row) {
 /* returns a key 1..10 or 11 for reset */
 void keypad_read() {
        /* FIXME: need to do debouncing of some sort? */
-       int key;
+       u8 key;
        key = keypad_read_row(0);
        if (!key) {
                key = keypad_read_row(1);
+               key = keymap1[key];
+       } else
                key = keymap0[key];
-       }
-       key = keymap1[key];
 
        if (key != last_key) {
                last_key = key;
@@ -54,3 +54,9 @@ bool keypad_pressed() {
        new_key = 0;
        return 1;
 }
+
+u8 keypad_getkey() {
+       while (!keypad_pressed())
+               keypad_read();
+       return last_key;
+}