diff options
Diffstat (limited to 'firmware')
18 files changed, 81 insertions, 63 deletions
diff --git a/firmware/drivers/lcd-16bit.c b/firmware/drivers/lcd-16bit.c index c3e076b392..0aa62f66b4 100644 --- a/firmware/drivers/lcd-16bit.c +++ b/firmware/drivers/lcd-16bit.c | |||
@@ -51,10 +51,6 @@ fb_data lcd_framebuffer[LCD_FBHEIGHT][LCD_FBWIDTH] | |||
51 | static fb_data* lcd_backdrop = NULL; | 51 | static fb_data* lcd_backdrop = NULL; |
52 | static long lcd_backdrop_offset IDATA_ATTR = 0; | 52 | static long lcd_backdrop_offset IDATA_ATTR = 0; |
53 | 53 | ||
54 | #ifdef HAVE_LCD_ENABLE | ||
55 | static void (*lcd_enable_hook)(void) = NULL; | ||
56 | #endif | ||
57 | |||
58 | static struct viewport default_vp = | 54 | static struct viewport default_vp = |
59 | { | 55 | { |
60 | .x = 0, | 56 | .x = 0, |
@@ -78,33 +74,36 @@ static struct viewport* current_vp IDATA_ATTR = &default_vp; | |||
78 | struct viewport* current_vp IDATA_ATTR = &default_vp; | 74 | struct viewport* current_vp IDATA_ATTR = &default_vp; |
79 | #endif | 75 | #endif |
80 | 76 | ||
81 | /* LCD init */ | ||
82 | void lcd_init(void) | ||
83 | { | ||
84 | lcd_clear_display(); | ||
85 | |||
86 | /* Call device specific init */ | ||
87 | lcd_init_device(); | ||
88 | scroll_init(); | ||
89 | } | ||
90 | 77 | ||
91 | /*** Helpers - consolidate optional code ***/ | 78 | /*** Helpers - consolidate optional code ***/ |
92 | #ifdef HAVE_LCD_ENABLE | 79 | #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) |
93 | void lcd_set_enable_hook(void (*enable_hook)(void)) | 80 | static void (*lcd_activation_hook)(void) = NULL; |
81 | |||
82 | void lcd_activation_set_hook(void (*func)(void)) | ||
94 | { | 83 | { |
95 | lcd_enable_hook = enable_hook; | 84 | lcd_activation_hook = func; |
96 | } | 85 | } |
97 | 86 | ||
98 | /* To be called by target driver after enabling display and refreshing it */ | 87 | /* To be called by target driver after enabling display and refreshing it */ |
99 | void lcd_call_enable_hook(void) | 88 | void lcd_activation_call_hook(void) |
100 | { | 89 | { |
101 | void (*enable_hook)(void) = lcd_enable_hook; | 90 | void (*func)(void) = lcd_activation_hook; |
102 | 91 | ||
103 | if (enable_hook != NULL) | 92 | if (func != NULL) |
104 | enable_hook(); | 93 | func(); |
105 | } | 94 | } |
95 | |||
106 | #endif | 96 | #endif |
107 | 97 | ||
98 | /* LCD init */ | ||
99 | void lcd_init(void) | ||
100 | { | ||
101 | lcd_clear_display(); | ||
102 | |||
103 | /* Call device specific init */ | ||
104 | lcd_init_device(); | ||
105 | scroll_init(); | ||
106 | } | ||
108 | /*** Viewports ***/ | 107 | /*** Viewports ***/ |
109 | 108 | ||
110 | void lcd_set_viewport(struct viewport* vp) | 109 | void lcd_set_viewport(struct viewport* vp) |
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index e435d174f2..e34fac5d31 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h | |||
@@ -341,21 +341,21 @@ void lcd_poweroff(void); | |||
341 | #ifdef HAVE_LCD_ENABLE | 341 | #ifdef HAVE_LCD_ENABLE |
342 | /* Enable/disable the main display. */ | 342 | /* Enable/disable the main display. */ |
343 | extern void lcd_enable(bool on); | 343 | extern void lcd_enable(bool on); |
344 | extern bool lcd_enabled(void); | ||
345 | |||
346 | #ifdef HAVE_LCD_COLOR | ||
347 | /* Register a hook that is called when the lcd is powered and after the | ||
348 | * framebuffer data is synchronized */ | ||
349 | void lcd_set_enable_hook(void (*enable_hook)(void)); | ||
350 | #endif /* HAVE_LCD_COLOR */ | ||
351 | |||
352 | #endif /* HAVE_LCD_ENABLE */ | 344 | #endif /* HAVE_LCD_ENABLE */ |
353 | void lcd_call_enable_hook(void); | ||
354 | 345 | ||
355 | #ifdef HAVE_LCD_SLEEP | 346 | #ifdef HAVE_LCD_SLEEP |
356 | /* Put the LCD into a power saving state deeper than lcd_enable(false). */ | 347 | /* Put the LCD into a power saving state deeper than lcd_enable(false). */ |
357 | extern void lcd_sleep(void); | 348 | extern void lcd_sleep(void); |
358 | #endif /* HAVE_LCD_SLEEP */ | 349 | #endif /* HAVE_LCD_SLEEP */ |
350 | #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) | ||
351 | /* Register a hook that is called when the lcd is powered and after the | ||
352 | * framebuffer data is synchronized */ | ||
353 | /* Sansa Clip has these function in it's lcd driver, since it's the only | ||
354 | * 1-bit display featuring lcd_active, so far */ | ||
355 | extern bool lcd_active(void); | ||
356 | extern void lcd_activation_set_hook(void (*enable_hook)(void)); | ||
357 | extern void lcd_activation_call_hook(void); | ||
358 | #endif | ||
359 | 359 | ||
360 | #ifdef HAVE_LCD_SHUTDOWN | 360 | #ifdef HAVE_LCD_SHUTDOWN |
361 | void lcd_shutdown(void); | 361 | void lcd_shutdown(void); |
diff --git a/firmware/scroll_engine.c b/firmware/scroll_engine.c index 6c7f7e6eb0..8d84c797e9 100644 --- a/firmware/scroll_engine.c +++ b/firmware/scroll_engine.c | |||
@@ -305,8 +305,8 @@ static void scroll_thread(void) | |||
305 | 305 | ||
306 | if (scroll & SCROLL_LCD) | 306 | if (scroll & SCROLL_LCD) |
307 | { | 307 | { |
308 | #ifdef HAVE_LCD_ENABLE | 308 | #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) |
309 | if (lcd_enabled()) | 309 | if (lcd_active()) |
310 | #endif | 310 | #endif |
311 | lcd_scroll_fn(); | 311 | lcd_scroll_fn(); |
312 | lcd_scroll_info.last_scroll = current_tick; | 312 | lcd_scroll_info.last_scroll = current_tick; |
@@ -328,8 +328,8 @@ static void scroll_thread(void) | |||
328 | while (1) | 328 | while (1) |
329 | { | 329 | { |
330 | sleep(lcd_scroll_info.ticks); | 330 | sleep(lcd_scroll_info.ticks); |
331 | #ifdef HAVE_LCD_ENABLE | 331 | #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) |
332 | if (lcd_enabled()) | 332 | if (lcd_active()) |
333 | #endif | 333 | #endif |
334 | lcd_scroll_fn(); | 334 | lcd_scroll_fn(); |
335 | } | 335 | } |
diff --git a/firmware/target/arm/as3525/sansa-c200v2/lcd-c200v2.c b/firmware/target/arm/as3525/sansa-c200v2/lcd-c200v2.c index 2fc3e1f6c5..88adcd9d96 100644 --- a/firmware/target/arm/as3525/sansa-c200v2/lcd-c200v2.c +++ b/firmware/target/arm/as3525/sansa-c200v2/lcd-c200v2.c | |||
@@ -322,7 +322,7 @@ void lcd_enable(bool on) | |||
322 | if(on) | 322 | if(on) |
323 | { | 323 | { |
324 | _display_on(); | 324 | _display_on(); |
325 | lcd_call_enable_hook(); | 325 | lcd_activation_call_hook(); |
326 | } | 326 | } |
327 | else | 327 | else |
328 | { | 328 | { |
@@ -332,7 +332,7 @@ void lcd_enable(bool on) | |||
332 | } | 332 | } |
333 | } | 333 | } |
334 | 334 | ||
335 | bool lcd_enabled(void) | 335 | bool lcd_active(void) |
336 | { | 336 | { |
337 | return display_on; | 337 | return display_on; |
338 | } | 338 | } |
diff --git a/firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c b/firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c index bfa02e796d..640f6694c9 100644 --- a/firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c +++ b/firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c | |||
@@ -159,22 +159,43 @@ void lcd_set_flip(bool yesno) | |||
159 | } | 159 | } |
160 | } | 160 | } |
161 | 161 | ||
162 | #ifdef HAVE_LCD_ENABLE | ||
163 | static void (*lcd_activation_hook)(void) = NULL; | ||
164 | |||
165 | void lcd_activation_set_hook(void (*func)(void)) | ||
166 | { | ||
167 | lcd_activation_hook = func; | ||
168 | } | ||
169 | |||
170 | void lcd_activation_call_hook(void) | ||
171 | { | ||
172 | void (*func)(void) = lcd_activation_hook; | ||
173 | |||
174 | if (func != NULL) | ||
175 | func(); | ||
176 | } | ||
177 | |||
178 | |||
162 | void lcd_enable(bool enable) | 179 | void lcd_enable(bool enable) |
163 | { | 180 | { |
164 | if(display_on == enable) | 181 | if(display_on == enable) |
165 | return; | 182 | return; |
166 | 183 | ||
167 | if( (display_on = enable) ) /* simple '=' is not a typo ! */ | 184 | if( (display_on = enable) ) /* simple '=' is not a typo ! */ |
185 | { | ||
168 | lcd_write_command(LCD_SET_DISPLAY_ON); | 186 | lcd_write_command(LCD_SET_DISPLAY_ON); |
187 | lcd_activation_call_hook(); | ||
188 | } | ||
169 | else | 189 | else |
170 | lcd_write_command(LCD_SET_DISPLAY_OFF); | 190 | lcd_write_command(LCD_SET_DISPLAY_OFF); |
171 | } | 191 | } |
172 | 192 | ||
173 | bool lcd_enabled(void) | 193 | bool lcd_active(void) |
174 | { | 194 | { |
175 | return display_on; | 195 | return display_on; |
176 | } | 196 | } |
177 | 197 | ||
198 | #endif | ||
178 | 199 | ||
179 | /* LCD init, largely based on what OF does */ | 200 | /* LCD init, largely based on what OF does */ |
180 | void lcd_init_device(void) | 201 | void lcd_init_device(void) |
diff --git a/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c b/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c index 57d5649570..8715622717 100644 --- a/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c +++ b/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c | |||
@@ -328,7 +328,7 @@ void lcd_enable(bool on) | |||
328 | if(on) | 328 | if(on) |
329 | { | 329 | { |
330 | _display_on(); | 330 | _display_on(); |
331 | lcd_call_enable_hook(); | 331 | lcd_activation_call_hook(); |
332 | } | 332 | } |
333 | else | 333 | else |
334 | { | 334 | { |
@@ -338,7 +338,7 @@ void lcd_enable(bool on) | |||
338 | } | 338 | } |
339 | } | 339 | } |
340 | 340 | ||
341 | bool lcd_enabled(void) | 341 | bool lcd_active(void) |
342 | { | 342 | { |
343 | return display_on; | 343 | return display_on; |
344 | } | 344 | } |
diff --git a/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c b/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c index 44451133ca..5196784a2f 100644 --- a/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c +++ b/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c | |||
@@ -206,6 +206,7 @@ void lcd_enable(bool on) | |||
206 | /* a bit of delay before returning to | 206 | /* a bit of delay before returning to |
207 | * avoid irritating flash on backlight on */ | 207 | * avoid irritating flash on backlight on */ |
208 | while(delay--); | 208 | while(delay--); |
209 | lcd_activation_call_hook(); | ||
209 | 210 | ||
210 | } | 211 | } |
211 | else | 212 | else |
@@ -217,7 +218,7 @@ void lcd_enable(bool on) | |||
217 | } | 218 | } |
218 | } | 219 | } |
219 | 220 | ||
220 | bool lcd_enabled(void) | 221 | bool lcd_active(void) |
221 | { | 222 | { |
222 | return display_on; | 223 | return display_on; |
223 | } | 224 | } |
diff --git a/firmware/target/arm/imx31/gigabeat-s/lcd-imx31.c b/firmware/target/arm/imx31/gigabeat-s/lcd-imx31.c index 47834b3b19..bddf03c5f6 100644 --- a/firmware/target/arm/imx31/gigabeat-s/lcd-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/lcd-imx31.c | |||
@@ -121,7 +121,7 @@ void lcd_enable(bool state) | |||
121 | lcd_powered = true; | 121 | lcd_powered = true; |
122 | lcd_on = true; | 122 | lcd_on = true; |
123 | lcd_update(); | 123 | lcd_update(); |
124 | lcd_call_enable_hook(); | 124 | lcd_activation_call_hook(); |
125 | } | 125 | } |
126 | else | 126 | else |
127 | { | 127 | { |
@@ -129,7 +129,7 @@ void lcd_enable(bool state) | |||
129 | } | 129 | } |
130 | } | 130 | } |
131 | 131 | ||
132 | bool lcd_enabled(void) | 132 | bool lcd_active(void) |
133 | { | 133 | { |
134 | return lcd_on; | 134 | return lcd_on; |
135 | } | 135 | } |
diff --git a/firmware/target/arm/ipod/video/lcd-video.c b/firmware/target/arm/ipod/video/lcd-video.c index d1701ea3d7..c0e98cf53c 100644 --- a/firmware/target/arm/ipod/video/lcd-video.c +++ b/firmware/target/arm/ipod/video/lcd-video.c | |||
@@ -575,10 +575,7 @@ void lcd_awake(void) | |||
575 | lcd_state.state = LCD_INITIAL; | 575 | lcd_state.state = LCD_INITIAL; |
576 | tick_add_task(&lcd_tick); | 576 | tick_add_task(&lcd_tick); |
577 | lcd_state.display_on = true; | 577 | lcd_state.display_on = true; |
578 | /* Note that only the RGB data from lcd_framebuffer has been | 578 | lcd_activation_call_hook(); |
579 | displayed. If YUV data was displayed, it needs to be updated | ||
580 | now. (eg. see lcd_call_enable_hook()) | ||
581 | */ | ||
582 | } | 579 | } |
583 | mutex_unlock(&lcdstate_lock); | 580 | mutex_unlock(&lcdstate_lock); |
584 | } | 581 | } |
diff --git a/firmware/target/arm/iriver/h10/lcd-h10_20gb.c b/firmware/target/arm/iriver/h10/lcd-h10_20gb.c index ffd8ab69ec..03a398af8d 100644 --- a/firmware/target/arm/iriver/h10/lcd-h10_20gb.c +++ b/firmware/target/arm/iriver/h10/lcd-h10_20gb.c | |||
@@ -363,7 +363,7 @@ void lcd_enable(bool on) | |||
363 | /* Probably out of sync and we don't wanna pepper the code with | 363 | /* Probably out of sync and we don't wanna pepper the code with |
364 | lcd_update() calls for this. */ | 364 | lcd_update() calls for this. */ |
365 | lcd_update(); | 365 | lcd_update(); |
366 | lcd_call_enable_hook(); | 366 | lcd_activation_call_hook(); |
367 | } | 367 | } |
368 | else | 368 | else |
369 | { | 369 | { |
@@ -371,7 +371,7 @@ void lcd_enable(bool on) | |||
371 | } | 371 | } |
372 | } | 372 | } |
373 | 373 | ||
374 | bool lcd_enabled(void) | 374 | bool lcd_active(void) |
375 | { | 375 | { |
376 | return display_on; | 376 | return display_on; |
377 | } | 377 | } |
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c index d9a28d152f..fd52eda5e9 100644 --- a/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c +++ b/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c | |||
@@ -42,7 +42,7 @@ extern struct viewport* current_vp; | |||
42 | extern void lcd_copy_buffer_rect(fb_data *dst, const fb_data *src, | 42 | extern void lcd_copy_buffer_rect(fb_data *dst, const fb_data *src, |
43 | int width, int height); | 43 | int width, int height); |
44 | 44 | ||
45 | bool lcd_enabled(void) | 45 | bool lcd_active(void) |
46 | { | 46 | { |
47 | return lcd_on; | 47 | return lcd_on; |
48 | } | 48 | } |
@@ -308,7 +308,7 @@ void lcd_enable(bool state) | |||
308 | 308 | ||
309 | lcd_on = true; | 309 | lcd_on = true; |
310 | lcd_update(); | 310 | lcd_update(); |
311 | lcd_call_enable_hook(); | 311 | lcd_activation_call_hook(); |
312 | } | 312 | } |
313 | else | 313 | else |
314 | { | 314 | { |
diff --git a/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c b/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c index e477f4fd45..e1a4d738d7 100644 --- a/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c +++ b/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c | |||
@@ -438,7 +438,7 @@ void lcd_enable(bool on) | |||
438 | DEV_EN |= DEV_LCD; /* Enable LCD controller */ | 438 | DEV_EN |= DEV_LCD; /* Enable LCD controller */ |
439 | lcd_display_on(); /* Turn on display */ | 439 | lcd_display_on(); /* Turn on display */ |
440 | lcd_update(); /* Resync display */ | 440 | lcd_update(); /* Resync display */ |
441 | lcd_call_enable_hook(); | 441 | lcd_activation_call_hook(); |
442 | LCD_REG_6 |= 1; /* Restart DMA */ | 442 | LCD_REG_6 |= 1; /* Restart DMA */ |
443 | sleep(HZ/50); /* Wait for a frame to be written */ | 443 | sleep(HZ/50); /* Wait for a frame to be written */ |
444 | } | 444 | } |
@@ -451,7 +451,7 @@ void lcd_enable(bool on) | |||
451 | } | 451 | } |
452 | } | 452 | } |
453 | 453 | ||
454 | bool lcd_enabled(void) | 454 | bool lcd_active(void) |
455 | { | 455 | { |
456 | return display_on; | 456 | return display_on; |
457 | } | 457 | } |
diff --git a/firmware/target/arm/tcc77x/iaudio7/lcd-iaudio7.c b/firmware/target/arm/tcc77x/iaudio7/lcd-iaudio7.c index 0ca18bee67..134d936e7b 100644 --- a/firmware/target/arm/tcc77x/iaudio7/lcd-iaudio7.c +++ b/firmware/target/arm/tcc77x/iaudio7/lcd-iaudio7.c | |||
@@ -143,7 +143,7 @@ void lcd_enable(bool on) | |||
143 | 143 | ||
144 | if (on) { | 144 | if (on) { |
145 | _display_on(); | 145 | _display_on(); |
146 | lcd_call_enable_hook(); | 146 | lcd_activation_call_hook(); |
147 | } else { | 147 | } else { |
148 | /** Off sequence according to datasheet, p. 130 **/ | 148 | /** Off sequence according to datasheet, p. 130 **/ |
149 | lcd_write_reg(R_FRAME_CYCLE_CONTROL, 0x0002); /* EQ=0, 18 clks/line */ | 149 | lcd_write_reg(R_FRAME_CYCLE_CONTROL, 0x0002); /* EQ=0, 18 clks/line */ |
@@ -166,7 +166,7 @@ void lcd_enable(bool on) | |||
166 | } | 166 | } |
167 | } | 167 | } |
168 | 168 | ||
169 | bool lcd_enabled(void) | 169 | bool lcd_active(void) |
170 | { | 170 | { |
171 | return display_on; | 171 | return display_on; |
172 | } | 172 | } |
diff --git a/firmware/target/arm/tcc780x/cowond2/lcd-cowond2.c b/firmware/target/arm/tcc780x/cowond2/lcd-cowond2.c index d6ee5f3649..7b64493c0a 100644 --- a/firmware/target/arm/tcc780x/cowond2/lcd-cowond2.c +++ b/firmware/target/arm/tcc780x/cowond2/lcd-cowond2.c | |||
@@ -230,7 +230,7 @@ void lcd_enable(bool on) | |||
230 | lcd_display_on(); | 230 | lcd_display_on(); |
231 | LCDC_CTRL |= 1; /* controller enable */ | 231 | LCDC_CTRL |= 1; /* controller enable */ |
232 | lcd_update(); /* Resync display */ | 232 | lcd_update(); /* Resync display */ |
233 | lcd_call_enable_hook(); | 233 | lcd_activation_call_hook(); |
234 | } | 234 | } |
235 | else | 235 | else |
236 | { | 236 | { |
@@ -239,7 +239,7 @@ void lcd_enable(bool on) | |||
239 | } | 239 | } |
240 | } | 240 | } |
241 | 241 | ||
242 | bool lcd_enabled(void) | 242 | bool lcd_active(void) |
243 | { | 243 | { |
244 | return display_on; | 244 | return display_on; |
245 | } | 245 | } |
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c index f34e43687a..cd07fa9e6f 100644 --- a/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c +++ b/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c | |||
@@ -237,7 +237,7 @@ return; | |||
237 | { | 237 | { |
238 | lcd_display_on(false); /* Turn on display */ | 238 | lcd_display_on(false); /* Turn on display */ |
239 | lcd_update(); /* Resync display */ | 239 | lcd_update(); /* Resync display */ |
240 | lcd_call_enable_hook(); | 240 | lcd_activation_call_hook(); |
241 | } | 241 | } |
242 | else | 242 | else |
243 | { | 243 | { |
@@ -245,7 +245,7 @@ return; | |||
245 | } | 245 | } |
246 | } | 246 | } |
247 | 247 | ||
248 | bool lcd_enabled(void) | 248 | bool lcd_active(void) |
249 | { | 249 | { |
250 | return display_on; | 250 | return display_on; |
251 | } | 251 | } |
diff --git a/firmware/target/coldfire/iaudio/x5/lcd-x5.c b/firmware/target/coldfire/iaudio/x5/lcd-x5.c index fca39e6e26..4737f31bc8 100644 --- a/firmware/target/coldfire/iaudio/x5/lcd-x5.c +++ b/firmware/target/coldfire/iaudio/x5/lcd-x5.c | |||
@@ -385,7 +385,7 @@ void lcd_enable(bool on) | |||
385 | /* Probably out of sync and we don't wanna pepper the code with | 385 | /* Probably out of sync and we don't wanna pepper the code with |
386 | lcd_update() calls for this. */ | 386 | lcd_update() calls for this. */ |
387 | lcd_update(); | 387 | lcd_update(); |
388 | lcd_call_enable_hook(); | 388 | lcd_activation_call_hook(); |
389 | } | 389 | } |
390 | else | 390 | else |
391 | { | 391 | { |
@@ -393,7 +393,7 @@ void lcd_enable(bool on) | |||
393 | } | 393 | } |
394 | } | 394 | } |
395 | 395 | ||
396 | bool lcd_enabled(void) | 396 | bool lcd_active(void) |
397 | { | 397 | { |
398 | return display_on; | 398 | return display_on; |
399 | } | 399 | } |
diff --git a/firmware/target/coldfire/iriver/h300/lcd-h300.c b/firmware/target/coldfire/iriver/h300/lcd-h300.c index 3c70e5be17..867bc5ab74 100644 --- a/firmware/target/coldfire/iriver/h300/lcd-h300.c +++ b/firmware/target/coldfire/iriver/h300/lcd-h300.c | |||
@@ -263,7 +263,7 @@ void lcd_enable(bool on) | |||
263 | if(on) | 263 | if(on) |
264 | { | 264 | { |
265 | _display_on(); | 265 | _display_on(); |
266 | lcd_call_enable_hook(); | 266 | lcd_activation_call_hook(); |
267 | } | 267 | } |
268 | else | 268 | else |
269 | { | 269 | { |
@@ -290,7 +290,7 @@ void lcd_enable(bool on) | |||
290 | } | 290 | } |
291 | } | 291 | } |
292 | 292 | ||
293 | bool lcd_enabled(void) | 293 | bool lcd_active(void) |
294 | { | 294 | { |
295 | return display_on; | 295 | return display_on; |
296 | } | 296 | } |
diff --git a/firmware/target/mips/ingenic_jz47xx/lcd-jz4740.c b/firmware/target/mips/ingenic_jz47xx/lcd-jz4740.c index d9eb3ecdef..783621c88b 100644 --- a/firmware/target/mips/ingenic_jz47xx/lcd-jz4740.c +++ b/firmware/target/mips/ingenic_jz47xx/lcd-jz4740.c | |||
@@ -54,7 +54,7 @@ void lcd_enable(bool state) | |||
54 | { | 54 | { |
55 | lcd_on(); | 55 | lcd_on(); |
56 | #ifdef HAVE_LCD_ENABLE | 56 | #ifdef HAVE_LCD_ENABLE |
57 | lcd_call_enable_hook(); | 57 | lcd_activation_call_hook(); |
58 | #endif | 58 | #endif |
59 | } | 59 | } |
60 | else | 60 | else |
@@ -63,7 +63,7 @@ void lcd_enable(bool state) | |||
63 | lcd_is_on = state; | 63 | lcd_is_on = state; |
64 | } | 64 | } |
65 | 65 | ||
66 | bool lcd_enabled(void) | 66 | bool lcd_active(void) |
67 | { | 67 | { |
68 | return lcd_is_on; | 68 | return lcd_is_on; |
69 | } | 69 | } |