git.ucc.asn.au
/
uccvend-snackrom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup gcc compile warnings
[uccvend-snackrom.git]
/
ROM2
/
keypad.c
diff --git
a/ROM2/keypad.c
b/ROM2/keypad.c
index
8f50c19
..
cc6093d
100644
(file)
--- 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;
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;
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);
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;
key = keymap1[key];
else
key = 0;
UCC
git Repository :: git.ucc.asn.au