X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=ROM2%2Fkeypad.c;h=cc6093d8f95196ce5d9612de187c622ad112b151;hb=db23b975a50ba026e1455852f4b656f18095aeb3;hp=8f50c193dd0a1c239052634363810903a0373373;hpb=4ce97d7a672372f9d13383e40397fa6b51d840ca;p=uccvend-snackrom.git diff --git a/ROM2/keypad.c b/ROM2/keypad.c index 8f50c19..cc6093d 100644 --- a/ROM2/keypad.c +++ b/ROM2/keypad.c @@ -28,7 +28,7 @@ extern inline u8 keypad_read_row(u8 row) { while(!(_io_ports[M6811_SPDR]&M6811_SPIE)); /* wait for completion */ for (i = _io_ports[M6811_SPDR], num = 0; - (i&0x1 == 0) && (num < 7); + ((i&0x1) == 0) && (num < 7); i=i>>1, num++); return num; @@ -41,7 +41,7 @@ void keypad_read() { key = keypad_read_row(0); if (NO_KEY == key) { key = keypad_read_row(1); - if (key >= 0 && key <= 2) + if (key <= 2) key = keymap1[key]; else key = 0;