X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=ROM2%2Fkeypad.c;h=4105b24fc3a040375592e5f1fc8f1a638b369535;hb=6f17e7d0c5d83ffca7376a1cff0ea5ff355dba8f;hp=b36b326d6054aa74d7e816124e47baf7bcbc8cd4;hpb=9366107abfbfbe85f00b27449c79284d0e1aa59e;p=uccvend-snackrom.git

diff --git a/ROM2/keypad.c b/ROM2/keypad.c
index b36b326..4105b24 100644
--- 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;
+}