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

diff --git a/ROM2/keypad.c b/ROM2/keypad.c
index 359e189..4105b24 100644
--- a/ROM2/keypad.c
+++ b/ROM2/keypad.c
@@ -15,7 +15,7 @@ extern inline u8 keypad_read_row(u8 row) {
 	if (row)
 		bset((void*)&_io_ports[M6811_PORTD], PORTD_KEYPAD_ROW);
 	else
-		bclr((void*)&_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 */
 
@@ -36,9 +36,9 @@ void keypad_read() {
 	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;