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-09785a8499b601abc9eac7640060c12eba962b56.tar.gz rockbox-09785a8499b601abc9eac7640060c12eba962b56.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) { | |||
137 | 137 | ||
138 | int button_read_device(void) { | 138 | int button_read_device(void) { |
139 | static bool hold_button = false; | 139 | static bool hold_button = false; |
140 | #ifndef BOOTLOADER | ||
140 | bool hold_button_old; | 141 | bool hold_button_old; |
141 | 142 | ||
142 | hold_button_old = hold_button; | 143 | hold_button_old = hold_button; |
144 | #endif | ||
143 | hold_button = button_hold(); | 145 | hold_button = button_hold(); |
144 | 146 | ||
145 | #ifndef BOOTLOADER | 147 | #ifndef BOOTLOADER |
@@ -147,7 +149,7 @@ int button_read_device(void) { | |||
147 | backlight_hold_changed(hold_button); | 149 | backlight_hold_changed(hold_button); |
148 | } | 150 | } |
149 | #endif | 151 | #endif |
150 | 152 | ||
151 | if (hold_button) { | 153 | if (hold_button) { |
152 | return 0; | 154 | return 0; |
153 | } else if (kbd_type == KEYBOARD_V1) { | 155 | } 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) | |||
40 | { | 40 | { |
41 | int btn = BUTTON_NONE; | 41 | int btn = BUTTON_NONE; |
42 | static bool hold_button = false; | 42 | static bool hold_button = false; |
43 | #ifndef BOOTLOADER | ||
43 | bool hold_button_old; | 44 | bool hold_button_old; |
44 | 45 | ||
45 | /* Hold */ | 46 | /* Hold */ |
46 | hold_button_old = hold_button; | 47 | hold_button_old = hold_button; |
48 | #endif | ||
47 | hold_button = button_hold(); | 49 | hold_button = button_hold(); |
48 | 50 | ||
49 | #ifndef BOOTLOADER | 51 | #ifndef BOOTLOADER |