summaryrefslogtreecommitdiff
path: root/firmware/target/arm/as3525
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target/arm/as3525')
-rw-r--r--firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c16
-rw-r--r--firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c8
-rw-r--r--firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c9
3 files changed, 8 insertions, 25 deletions
diff --git a/firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c b/firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c
index 640f6694c9..0689779af0 100644
--- a/firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c
+++ b/firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c
@@ -160,22 +160,6 @@ void lcd_set_flip(bool yesno)
160} 160}
161 161
162#ifdef HAVE_LCD_ENABLE 162#ifdef HAVE_LCD_ENABLE
163static void (*lcd_activation_hook)(void) = NULL;
164
165void lcd_activation_set_hook(void (*func)(void))
166{
167 lcd_activation_hook = func;
168}
169
170void lcd_activation_call_hook(void)
171{
172 void (*func)(void) = lcd_activation_hook;
173
174 if (func != NULL)
175 func();
176}
177
178
179void lcd_enable(bool enable) 163void lcd_enable(bool enable)
180{ 164{
181 if(display_on == enable) 165 if(display_on == enable)
diff --git a/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c b/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c
index 8715622717..517aa6a979 100644
--- a/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c
+++ b/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c
@@ -321,6 +321,7 @@ void lcd_init_device(void)
321 _display_on(); 321 _display_on();
322} 322}
323 323
324#if defined(HAVE_LCD_ENABLE)
324void lcd_enable(bool on) 325void lcd_enable(bool on)
325{ 326{
326 if(display_on!=on) 327 if(display_on!=on)
@@ -337,16 +338,15 @@ void lcd_enable(bool on)
337 } 338 }
338 } 339 }
339} 340}
341#endif
340 342
343#if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP)
341bool lcd_active(void) 344bool lcd_active(void)
342{ 345{
343 return display_on; 346 return display_on;
344} 347}
345 348
346void lcd_sleep(void) 349#endif
347{
348 /* TODO */
349}
350 350
351/*** update functions ***/ 351/*** update functions ***/
352 352
diff --git a/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c b/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c
index 5196784a2f..db69c9763a 100644
--- a/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c
+++ b/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c
@@ -185,6 +185,7 @@ static void _display_on(void)
185 lcd_update(); 185 lcd_update();
186} 186}
187 187
188#if defined(HAVE_LCD_ENABLE)
188void lcd_enable(bool on) 189void lcd_enable(bool on)
189{ 190{
190 if (display_on == on) 191 if (display_on == on)
@@ -217,16 +218,14 @@ void lcd_enable(bool on)
217 display_on = false; 218 display_on = false;
218 } 219 }
219} 220}
221#endif
220 222
223#if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP)
221bool lcd_active(void) 224bool lcd_active(void)
222{ 225{
223 return display_on; 226 return display_on;
224} 227}
225 228#endif
226void lcd_sleep(void)
227{
228 /* TODO */
229}
230 229
231/*** update functions ***/ 230/*** update functions ***/
232 231