diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-10-13 17:09:13 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-10-13 17:23:56 -0400 |
commit | 09785a8499b601abc9eac7640060c12eba962b56 (patch) | |
tree | 5ff5f1fa2e7f9927a9e45a7e1ca586bab93d7563 /firmware/target/arm | |
parent | b94db707fb7a8ace5c8821ea47d85ec48ca48e26 (diff) | |
download | rockbox-09785a8499.tar.gz rockbox-09785a8499.zip |
fix more yellow
Change-Id: I74bad58707d05ea167169d4315c05eb0cd1c8b7b
Diffstat (limited to 'firmware/target/arm')
-rw-r--r-- | firmware/target/arm/rk27xx/hm801/button-hm801.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/sandisk/sansa-c200/button-c200.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/firmware/target/arm/rk27xx/hm801/button-hm801.c b/firmware/target/arm/rk27xx/hm801/button-hm801.c index 0ac1b3b0aa..5f01a7bd14 100644 --- a/firmware/target/arm/rk27xx/hm801/button-hm801.c +++ b/firmware/target/arm/rk27xx/hm801/button-hm801.c @@ -137,9 +137,11 @@ static int button_read_device_v2(void) { int button_read_device(void) { static bool hold_button = false; +#ifndef BOOTLOADER bool hold_button_old; hold_button_old = hold_button; +#endif hold_button = button_hold(); #ifndef BOOTLOADER @@ -147,7 +149,7 @@ int button_read_device(void) { backlight_hold_changed(hold_button); } #endif - + if (hold_button) { return 0; } else if (kbd_type == KEYBOARD_V1) { diff --git a/firmware/target/arm/sandisk/sansa-c200/button-c200.c b/firmware/target/arm/sandisk/sansa-c200/button-c200.c index c19d19c1df..e42577fab3 100644 --- a/firmware/target/arm/sandisk/sansa-c200/button-c200.c +++ b/firmware/target/arm/sandisk/sansa-c200/button-c200.c @@ -40,10 +40,12 @@ int button_read_device(void) { int btn = BUTTON_NONE; static bool hold_button = false; +#ifndef BOOTLOADER bool hold_button_old; /* Hold */ hold_button_old = hold_button; +#endif hold_button = button_hold(); #ifndef BOOTLOADER |