Reworking of the assembly

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

diff --git a/ROM2/keypad.c b/ROM2/keypad.c
index 5ab9b45..e87715d 100644 (file)
--- a/ROM2/keypad.c
+++ b/ROM2/keypad.c
@@ -1,19 +1,44 @@
 #include "vend.h"
 
-int keypad_read_row() {
-       bclr_misc_output(A3800_DISPLAY_WRITE);  /* disable the display clock */
+u8 last_key; /* the last key registered */
+u8 curr_key; /* the key currently being held down */
 
-       _io_ports[M6811_SPDR] = 0;
-       while(!(_io_ports[M6811_SPDR]&M6811_SPIE)); /* wait for completion */
+/* 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};
 
-       return _io_ports[M6811_SPDR];
-}
-
-/* row is 0 or 1 */
-void keypad_select_row(int row) {
+extern inline int keypad_read_row(int row) {
+       int i, num;
        if (row)
                _io_ports[M6811_PORTD] |= PORTD_KEYPAD_ROW;
        else
                _io_ports[M6811_PORTD] &= ~PORTD_KEYPAD_ROW;
+
+       bclr_misc_output(A3800_DISPLAY_WRITE);  /* disable the display clock */
+
+       _io_ports[M6811_SPDR] = 0;
+       while(!(_io_ports[M6811_SPDR]&M6811_SPIE)); /* wait for completion */
+
+       for (i = _io_ports[M6811_SPDR], num = 0;
+               (i&0x1) == 0;
+               i=i>>1, num++);
+
+       return num;
 }
 
+/* returns a key 0..9 or 11 for reset */
+void keypad_read() {
+       /* FIXME: need to do debouncing of some sort? */
+       int key;
+       key = keypad_read_row(0);
+       if (!key) {
+               key = keypad_read_row(1);
+               curr_key = keymap0[key];
+       }
+       curr_key = keymap1[key];
+
+       if (curr_key != last_key) {
+               last_key = curr_key;
+       }
+}