/* first 8 from the first row, then 3 from the second row */
/* keys are 1-9, 0, reset */
/* first 8 from the first row, then 3 from the second row */
/* keys are 1-9, 0, reset */
-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};
+const u8 keymap0[8] = {KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8};
+const u8 keymap1[3] = {KEY_9, KEY_0, KEY_RESET};
#define NO_KEY 8
/* reads the keypad and returns the bit number that was turned on in the shift
* register (from 0..7). If no bits were turned on, it returns 8 (aka NO_KEY)
*/
#define NO_KEY 8
/* reads the keypad and returns the bit number that was turned on in the shift
* register (from 0..7). If no bits were turned on, it returns 8 (aka NO_KEY)
*/
if (row)
bset((void*)&_io_ports[M6811_PORTD], PORTD_KEYPAD_ROW);
else
bclr((void*)&_io_ports[M6811_PORTD], PORTD_KEYPAD_ROW);
if (row)
bset((void*)&_io_ports[M6811_PORTD], PORTD_KEYPAD_ROW);
else
bclr((void*)&_io_ports[M6811_PORTD], PORTD_KEYPAD_ROW);
- _io_ports[M6811_SPDR] = 0;
- while(!(_io_ports[M6811_SPDR]&M6811_SPIE)); /* wait for completion */
+ _io_ports[M6811_SPDR] = 0x55; /* doesn't matter what we send. */
+ while(!(_io_ports[M6811_SPSR]&M6811_SPIF)); /* wait for completion */
+
+ /* SPDR read to clear SPIF flag is performed below: */
+ i = _io_ports[M6811_SPDR];
+
+ num = 0;
+ while (((i & 0x80) == 0) && (num < 8)) {
+ i = i << 1;
+ num++;
+ }