summaryrefslogtreecommitdiff
path: root/firmware/target
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target')
-rw-r--r--firmware/target/arm/rk27xx/hm801/button-hm801.c4
-rw-r--r--firmware/target/arm/sandisk/sansa-c200/button-c200.c2
-rw-r--r--firmware/target/coldfire/mpio/hd300/button-hd300.c4
3 files changed, 8 insertions, 2 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
138int button_read_device(void) { 138int 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
diff --git a/firmware/target/coldfire/mpio/hd300/button-hd300.c b/firmware/target/coldfire/mpio/hd300/button-hd300.c
index e84b8d442b..2fdde6f641 100644
--- a/firmware/target/coldfire/mpio/hd300/button-hd300.c
+++ b/firmware/target/coldfire/mpio/hd300/button-hd300.c
@@ -194,13 +194,15 @@ int button_read_device(void)
194 int data = 0; 194 int data = 0;
195 static bool hold_button = false; 195 static bool hold_button = false;
196 196
197#ifndef BOOTLOADER
197 bool hold_button_old; 198 bool hold_button_old;
198 199
199 200
200 /* read hold buttons status */ 201 /* read hold buttons status */
201 hold_button_old = hold_button; 202 hold_button_old = hold_button;
203#endif
202 hold_button = button_hold(); 204 hold_button = button_hold();
203 205
204#ifndef BOOTLOADER 206#ifndef BOOTLOADER
205 /* Only main hold affects backlight */ 207 /* Only main hold affects backlight */
206 if (hold_button != hold_button_old) 208 if (hold_button != hold_button_old)