aboutsummaryrefslogtreecommitdiffstats
path: root/converter
diff options
context:
space:
mode:
authortmk <wakojun@gmail.com>2013-11-27 23:35:38 -0800
committertmk <wakojun@gmail.com>2013-11-27 23:35:38 -0800
commitd2a83dae8f69f966b47db0316f1580793a810078 (patch)
tree33c30ddbe16fdf25e2f946020d3649ce66ab7290 /converter
parentfd9ee507a557e17b5af9fcd8892868ddf07bbb7a (diff)
parent263c462656646a90295b4368d96e3ea09739bedf (diff)
downloadfirmware-d2a83dae8f69f966b47db0316f1580793a810078.tar.gz
firmware-d2a83dae8f69f966b47db0316f1580793a810078.tar.bz2
firmware-d2a83dae8f69f966b47db0316f1580793a810078.zip
Merge pull request #80 from gblargg/master
Fixed handling of ADB event with key down and key up for same key all in...
Diffstat (limited to 'converter')
-rw-r--r--converter/adb_usb/matrix.c20
1 files changed, 17 insertions, 3 deletions
diff --git a/converter/adb_usb/matrix.c b/converter/adb_usb/matrix.c
index d1b67d38d..405391865 100644
--- a/converter/adb_usb/matrix.c
+++ b/converter/adb_usb/matrix.c
@@ -88,12 +88,26 @@ void matrix_init(void)
uint8_t matrix_scan(void)
{
+ /* extra_key is volatile and more convoluted than necessary because gcc refused
+ to generate valid code otherwise. Making extra_key uint8_t and constructing codes
+ here via codes = extra_key<<8 | 0xFF; would consistently fail to even LOAD
+ extra_key from memory, and leave garbage in the high byte of codes. I tried
+ dozens of code variations and it kept generating broken assembly output. So
+ beware if attempting to make extra_key code more logical and efficient. */
+ static volatile uint16_t extra_key = 0xFFFF;
uint16_t codes;
uint8_t key0, key1;
is_modified = false;
- _delay_ms(12); // delay for preventing overload of poor ADB keyboard controller
- codes = adb_host_kbd_recv();
+
+ codes = extra_key;
+ extra_key = 0xFFFF;
+
+ if ( codes == 0xFFFF )
+ {
+ _delay_ms(12); // delay for preventing overload of poor ADB keyboard controller
+ codes = adb_host_kbd_recv();
+ }
key0 = codes>>8;
key1 = codes&0xFF;
@@ -113,7 +127,7 @@ uint8_t matrix_scan(void)
} else {
register_key(key0);
if (key1 != 0xFF) // key1 is 0xFF when no second key.
- register_key(key1);
+ extra_key = key1<<8 | 0xFF; // process in a separate call
}
return 1;