diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-10-20 21:54:59 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-10-20 21:54:59 +0000 |
commit | d85c3ec41020a6c56b0d5d95a9ed790f57d73c6e (patch) | |
tree | 2f51ed47fee689024ed8c145634044362c8ed7d5 /firmware | |
parent | 774bacc692b4d5c7b769bb88d24e182db9e4656f (diff) | |
download | rockbox-d85c3ec41020a6c56b0d5d95a9ed790f57d73c6e.tar.gz rockbox-d85c3ec41020a6c56b0d5d95a9ed790f57d73c6e.zip |
Convert lcd_activation callbacks to use the event system to allow for multiple parallel callbacks (for custom statusbar).
Increase maximum event count as we need more (I actually had a report about it during custom statusbar testing).
Removed corresponding functions from the core and plugin api. Bump min version and sort.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23302 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
25 files changed, 28 insertions, 84 deletions
diff --git a/firmware/drivers/lcd-16bit-vert.c b/firmware/drivers/lcd-16bit-vert.c index 887505766c..1e49bb354d 100644 --- a/firmware/drivers/lcd-16bit-vert.c +++ b/firmware/drivers/lcd-16bit-vert.c | |||
@@ -75,27 +75,6 @@ static struct viewport* current_vp IDATA_ATTR = &default_vp; | |||
75 | struct viewport* current_vp IDATA_ATTR = &default_vp; | 75 | struct viewport* current_vp IDATA_ATTR = &default_vp; |
76 | #endif | 76 | #endif |
77 | 77 | ||
78 | |||
79 | /*** Helpers - consolidate optional code ***/ | ||
80 | #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) | ||
81 | static void (*lcd_activation_hook)(void) = NULL; | ||
82 | |||
83 | void lcd_activation_set_hook(void (*func)(void)) | ||
84 | { | ||
85 | lcd_activation_hook = func; | ||
86 | } | ||
87 | |||
88 | /* To be called by target driver after enabling display and refreshing it */ | ||
89 | void lcd_activation_call_hook(void) | ||
90 | { | ||
91 | void (*func)(void) = lcd_activation_hook; | ||
92 | |||
93 | if (func != NULL) | ||
94 | func(); | ||
95 | } | ||
96 | |||
97 | #endif | ||
98 | |||
99 | /* LCD init */ | 78 | /* LCD init */ |
100 | void lcd_init(void) | 79 | void lcd_init(void) |
101 | { | 80 | { |
diff --git a/firmware/drivers/lcd-16bit.c b/firmware/drivers/lcd-16bit.c index 7238d7a923..d1b417a00a 100644 --- a/firmware/drivers/lcd-16bit.c +++ b/firmware/drivers/lcd-16bit.c | |||
@@ -74,27 +74,6 @@ static struct viewport* current_vp IDATA_ATTR = &default_vp; | |||
74 | struct viewport* current_vp IDATA_ATTR = &default_vp; | 74 | struct viewport* current_vp IDATA_ATTR = &default_vp; |
75 | #endif | 75 | #endif |
76 | 76 | ||
77 | |||
78 | /*** Helpers - consolidate optional code ***/ | ||
79 | #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) | ||
80 | static void (*lcd_activation_hook)(void) = NULL; | ||
81 | |||
82 | void lcd_activation_set_hook(void (*func)(void)) | ||
83 | { | ||
84 | lcd_activation_hook = func; | ||
85 | } | ||
86 | |||
87 | /* To be called by target driver after enabling display and refreshing it */ | ||
88 | void lcd_activation_call_hook(void) | ||
89 | { | ||
90 | void (*func)(void) = lcd_activation_hook; | ||
91 | |||
92 | if (func != NULL) | ||
93 | func(); | ||
94 | } | ||
95 | |||
96 | #endif | ||
97 | |||
98 | /* LCD init */ | 77 | /* LCD init */ |
99 | void lcd_init(void) | 78 | void lcd_init(void) |
100 | { | 79 | { |
diff --git a/firmware/drivers/lcd-1bit-vert.c b/firmware/drivers/lcd-1bit-vert.c index dd6c7cd354..9607f284aa 100644 --- a/firmware/drivers/lcd-1bit-vert.c +++ b/firmware/drivers/lcd-1bit-vert.c | |||
@@ -91,25 +91,6 @@ void LCDFN(init)(void) | |||
91 | #endif | 91 | #endif |
92 | } | 92 | } |
93 | 93 | ||
94 | #ifdef MAIN_LCD | ||
95 | #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) | ||
96 | static void (*lcd_activation_hook)(void) = NULL; | ||
97 | |||
98 | void lcd_activation_set_hook(void (*func)(void)) | ||
99 | { | ||
100 | lcd_activation_hook = func; | ||
101 | } | ||
102 | |||
103 | void lcd_activation_call_hook(void) | ||
104 | { | ||
105 | void (*func)(void) = lcd_activation_hook; | ||
106 | |||
107 | if (func != NULL) | ||
108 | func(); | ||
109 | } | ||
110 | #endif | ||
111 | #endif | ||
112 | |||
113 | /*** parameter handling ***/ | 94 | /*** parameter handling ***/ |
114 | 95 | ||
115 | void LCDFN(set_drawmode)(int mode) | 96 | void LCDFN(set_drawmode)(int mode) |
diff --git a/firmware/events.c b/firmware/events.c index dca612bc7b..74172e1fa0 100644 --- a/firmware/events.c +++ b/firmware/events.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include "events.h" | 23 | #include "events.h" |
24 | #include "panic.h" | 24 | #include "panic.h" |
25 | 25 | ||
26 | #define MAX_SYS_EVENTS 20 | 26 | #define MAX_SYS_EVENTS 28 |
27 | 27 | ||
28 | struct sysevent { | 28 | struct sysevent { |
29 | unsigned short id; | 29 | unsigned short id; |
diff --git a/firmware/export/events.h b/firmware/export/events.h index 694566a43e..42ddf58441 100644 --- a/firmware/export/events.h +++ b/firmware/export/events.h | |||
@@ -37,6 +37,7 @@ | |||
37 | #define EVENT_CLASS_PLAYBACK 0x0200 | 37 | #define EVENT_CLASS_PLAYBACK 0x0200 |
38 | #define EVENT_CLASS_BUFFERING 0x0400 | 38 | #define EVENT_CLASS_BUFFERING 0x0400 |
39 | #define EVENT_CLASS_GUI 0x0800 | 39 | #define EVENT_CLASS_GUI 0x0800 |
40 | #define EVENT_CLASS_LCD 0xf000 | ||
40 | 41 | ||
41 | bool add_event(unsigned short id, bool oneshot, void (*handler)(void *data)); | 42 | bool add_event(unsigned short id, bool oneshot, void (*handler)(void *data)); |
42 | void remove_event(unsigned short id, void (*handler)(void *data)); | 43 | void remove_event(unsigned short id, void (*handler)(void *data)); |
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index 91217ff76c..89f39437a0 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <stdbool.h> | 25 | #include <stdbool.h> |
26 | #include "cpu.h" | 26 | #include "cpu.h" |
27 | #include "config.h" | 27 | #include "config.h" |
28 | #include "events.h" | ||
28 | 29 | ||
29 | #define VP_FLAG_ALIGN_RIGHT 0x01 | 30 | #define VP_FLAG_ALIGN_RIGHT 0x01 |
30 | #define VP_FLAG_ALIGN_CENTER 0x02 | 31 | #define VP_FLAG_ALIGN_CENTER 0x02 |
@@ -426,13 +427,16 @@ extern void lcd_sleep(void); | |||
426 | * framebuffer data is synchronized */ | 427 | * framebuffer data is synchronized */ |
427 | /* Sansa Clip has these function in it's lcd driver, since it's the only | 428 | /* Sansa Clip has these function in it's lcd driver, since it's the only |
428 | * 1-bit display featuring lcd_active, so far */ | 429 | * 1-bit display featuring lcd_active, so far */ |
430 | |||
431 | enum { | ||
432 | LCD_EVENT_ACTIVATION = (EVENT_CLASS_LCD|1), | ||
433 | }; | ||
434 | |||
429 | extern bool lcd_active(void); | 435 | extern bool lcd_active(void); |
430 | extern void lcd_activation_set_hook(void (*enable_hook)(void)); | ||
431 | extern void lcd_activation_call_hook(void); | ||
432 | #endif | 436 | #endif |
433 | 437 | ||
434 | #ifdef HAVE_LCD_SHUTDOWN | 438 | #ifdef HAVE_LCD_SHUTDOWN |
435 | void lcd_shutdown(void); | 439 | extern void lcd_shutdown(void); |
436 | #endif | 440 | #endif |
437 | 441 | ||
438 | /* Bitmap formats */ | 442 | /* Bitmap formats */ |
diff --git a/firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c b/firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c index edc1d9810e..1ca26dd1a1 100644 --- a/firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c +++ b/firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c | |||
@@ -172,7 +172,7 @@ void lcd_enable(bool enable) | |||
172 | ascodec_write(AS3514_DCDC15, 1); | 172 | ascodec_write(AS3514_DCDC15, 1); |
173 | 173 | ||
174 | lcd_write_command(LCD_SET_DISPLAY_ON); | 174 | lcd_write_command(LCD_SET_DISPLAY_ON); |
175 | lcd_activation_call_hook(); | 175 | send_event(LCD_EVENT_ACTIVATION, NULL); |
176 | } | 176 | } |
177 | else { | 177 | else { |
178 | lcd_write_command(LCD_SET_DISPLAY_OFF); | 178 | lcd_write_command(LCD_SET_DISPLAY_OFF); |
diff --git a/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c b/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c index a063ae4db8..7c3ccc2c0b 100644 --- a/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c +++ b/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c | |||
@@ -372,7 +372,7 @@ void lcd_enable(bool on) | |||
372 | if(on) | 372 | if(on) |
373 | { | 373 | { |
374 | _display_on(); | 374 | _display_on(); |
375 | lcd_activation_call_hook(); | 375 | send_event(LCD_EVENT_ACTIVATION, NULL); |
376 | } | 376 | } |
377 | else | 377 | else |
378 | { | 378 | { |
diff --git a/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c b/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c index d8cec6435b..21ecdf8afa 100644 --- a/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c +++ b/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c | |||
@@ -217,7 +217,7 @@ void lcd_enable(bool on) | |||
217 | lcd_write_reg(0x07, 0x17); | 217 | lcd_write_reg(0x07, 0x17); |
218 | display_on = true; | 218 | display_on = true; |
219 | lcd_update(); /* Resync display */ | 219 | lcd_update(); /* Resync display */ |
220 | lcd_activation_call_hook(); | 220 | send_event(LCD_EVENT_ACTIVATION, NULL); |
221 | sleep(0); | 221 | sleep(0); |
222 | 222 | ||
223 | } | 223 | } |
diff --git a/firmware/target/arm/imx31/gigabeat-s/lcd-imx31.c b/firmware/target/arm/imx31/gigabeat-s/lcd-imx31.c index c8d8b8a81e..fa1aed0fd6 100644 --- a/firmware/target/arm/imx31/gigabeat-s/lcd-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/lcd-imx31.c | |||
@@ -122,7 +122,7 @@ void lcd_enable(bool state) | |||
122 | lcd_powered = true; | 122 | lcd_powered = true; |
123 | lcd_on = true; | 123 | lcd_on = true; |
124 | lcd_update(); | 124 | lcd_update(); |
125 | lcd_activation_call_hook(); | 125 | send_event(LCD_EVENT_ACTIVATION, NULL); |
126 | } | 126 | } |
127 | else | 127 | else |
128 | { | 128 | { |
diff --git a/firmware/target/arm/ipod/video/lcd-video.c b/firmware/target/arm/ipod/video/lcd-video.c index ecd28bb7c3..ea9738b3a4 100644 --- a/firmware/target/arm/ipod/video/lcd-video.c +++ b/firmware/target/arm/ipod/video/lcd-video.c | |||
@@ -618,7 +618,7 @@ void lcd_awake(void) | |||
618 | tick_add_task(&lcd_tick); | 618 | tick_add_task(&lcd_tick); |
619 | wakeup_wait(&(lcd_state.initwakeup), TIMEOUT_BLOCK); | 619 | wakeup_wait(&(lcd_state.initwakeup), TIMEOUT_BLOCK); |
620 | 620 | ||
621 | lcd_activation_call_hook(); | 621 | send_event(LCD_EVENT_ACTIVATION, NULL); |
622 | } | 622 | } |
623 | } | 623 | } |
624 | 624 | ||
diff --git a/firmware/target/arm/iriver/h10/lcd-h10_20gb.c b/firmware/target/arm/iriver/h10/lcd-h10_20gb.c index 4e6aebadd2..f6cf4cbcbb 100644 --- a/firmware/target/arm/iriver/h10/lcd-h10_20gb.c +++ b/firmware/target/arm/iriver/h10/lcd-h10_20gb.c | |||
@@ -380,7 +380,7 @@ void lcd_enable(bool on) | |||
380 | /* Probably out of sync and we don't wanna pepper the code with | 380 | /* Probably out of sync and we don't wanna pepper the code with |
381 | lcd_update() calls for this. */ | 381 | lcd_update() calls for this. */ |
382 | lcd_update(); | 382 | lcd_update(); |
383 | lcd_activation_call_hook(); | 383 | send_event(LCD_EVENT_ACTIVATION, NULL); |
384 | } | 384 | } |
385 | else | 385 | else |
386 | { | 386 | { |
diff --git a/firmware/target/arm/lcd-c200_c200v2.c b/firmware/target/arm/lcd-c200_c200v2.c index 3ba1bf0f07..62f1dc20f6 100644 --- a/firmware/target/arm/lcd-c200_c200v2.c +++ b/firmware/target/arm/lcd-c200_c200v2.c | |||
@@ -320,7 +320,7 @@ void lcd_enable(bool yesno) | |||
320 | { | 320 | { |
321 | lcd_send_command(R_STANDBY_OFF, 0); | 321 | lcd_send_command(R_STANDBY_OFF, 0); |
322 | lcd_send_command(R_DISPLAY_ON, 0); | 322 | lcd_send_command(R_DISPLAY_ON, 0); |
323 | lcd_activation_call_hook(); | 323 | send_event(LCD_EVENT_ACTIVATION, NULL); |
324 | } | 324 | } |
325 | else | 325 | else |
326 | { | 326 | { |
diff --git a/firmware/target/arm/philips/sa9200/lcd-sa9200.c b/firmware/target/arm/philips/sa9200/lcd-sa9200.c index 3937c078c6..51a3cf0f71 100755 --- a/firmware/target/arm/philips/sa9200/lcd-sa9200.c +++ b/firmware/target/arm/philips/sa9200/lcd-sa9200.c | |||
@@ -339,7 +339,7 @@ void lcd_enable(bool on) | |||
339 | /* Probably out of sync and we don't wanna pepper the code with | 339 | /* Probably out of sync and we don't wanna pepper the code with |
340 | lcd_update() calls for this. */ | 340 | lcd_update() calls for this. */ |
341 | lcd_update(); | 341 | lcd_update(); |
342 | lcd_activation_call_hook(); | 342 | send_event(LCD_EVENT_ACTIVATION, NULL); |
343 | } | 343 | } |
344 | else | 344 | else |
345 | { | 345 | { |
diff --git a/firmware/target/arm/s3c2440/lcd-s3c2440.c b/firmware/target/arm/s3c2440/lcd-s3c2440.c index b9f76b7400..d702b5713a 100644 --- a/firmware/target/arm/s3c2440/lcd-s3c2440.c +++ b/firmware/target/arm/s3c2440/lcd-s3c2440.c | |||
@@ -323,7 +323,7 @@ void lcd_enable(bool state) | |||
323 | 323 | ||
324 | lcd_on = true; | 324 | lcd_on = true; |
325 | lcd_update(); | 325 | lcd_update(); |
326 | lcd_activation_call_hook(); | 326 | send_event(LCD_EVENT_ACTIVATION, NULL); |
327 | } | 327 | } |
328 | else | 328 | else |
329 | { | 329 | { |
diff --git a/firmware/target/arm/samsung/yh820/lcd-yh820.c b/firmware/target/arm/samsung/yh820/lcd-yh820.c index 76ecdd293e..f7d971ab76 100644 --- a/firmware/target/arm/samsung/yh820/lcd-yh820.c +++ b/firmware/target/arm/samsung/yh820/lcd-yh820.c | |||
@@ -226,7 +226,7 @@ void lcd_enable(bool yesno) | |||
226 | { | 226 | { |
227 | lcd_send_command(R_STANDBY_OFF); | 227 | lcd_send_command(R_STANDBY_OFF); |
228 | lcd_send_command(R_DISPLAY_ON); | 228 | lcd_send_command(R_DISPLAY_ON); |
229 | lcd_activation_call_hook(); | 229 | send_event(LCD_EVENT_ACTIVATION, NULL); |
230 | } | 230 | } |
231 | else | 231 | else |
232 | { | 232 | { |
diff --git a/firmware/target/arm/samsung/yh925/lcd-yh925.c b/firmware/target/arm/samsung/yh925/lcd-yh925.c index 7509deff36..9ffcddf33a 100644 --- a/firmware/target/arm/samsung/yh925/lcd-yh925.c +++ b/firmware/target/arm/samsung/yh925/lcd-yh925.c | |||
@@ -492,7 +492,7 @@ void lcd_enable(bool on) | |||
492 | /* Probably out of sync and we don't wanna pepper the code with | 492 | /* Probably out of sync and we don't wanna pepper the code with |
493 | lcd_update() calls for this. */ | 493 | lcd_update() calls for this. */ |
494 | lcd_update(); | 494 | lcd_update(); |
495 | lcd_activation_call_hook(); | 495 | send_event(LCD_EVENT_ACTIVATION, NULL); |
496 | } | 496 | } |
497 | else | 497 | else |
498 | { | 498 | { |
diff --git a/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c b/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c index f31e0792a9..03f6a1b971 100644 --- a/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c +++ b/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c | |||
@@ -448,7 +448,7 @@ void lcd_enable(bool on) | |||
448 | DEV_EN |= DEV_LCD; /* Enable LCD controller */ | 448 | DEV_EN |= DEV_LCD; /* Enable LCD controller */ |
449 | lcd_display_on(); /* Turn on display */ | 449 | lcd_display_on(); /* Turn on display */ |
450 | lcd_update(); /* Resync display */ | 450 | lcd_update(); /* Resync display */ |
451 | lcd_activation_call_hook(); | 451 | send_event(LCD_EVENT_ACTIVATION, NULL); |
452 | LCD_REG_6 |= 1; /* Restart DMA */ | 452 | LCD_REG_6 |= 1; /* Restart DMA */ |
453 | sleep(HZ/50); /* Wait for a frame to be written */ | 453 | sleep(HZ/50); /* Wait for a frame to be written */ |
454 | } | 454 | } |
diff --git a/firmware/target/arm/tcc77x/iaudio7/lcd-iaudio7.c b/firmware/target/arm/tcc77x/iaudio7/lcd-iaudio7.c index 6da0d2c083..5d2a2b8194 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_activation_call_hook(); | 146 | send_event(LCD_EVENT_ACTIVATION, NULL); |
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 */ |
diff --git a/firmware/target/arm/tcc780x/cowond2/lcd-cowond2.c b/firmware/target/arm/tcc780x/cowond2/lcd-cowond2.c index 034a53a022..d5a7e2f142 100644 --- a/firmware/target/arm/tcc780x/cowond2/lcd-cowond2.c +++ b/firmware/target/arm/tcc780x/cowond2/lcd-cowond2.c | |||
@@ -209,7 +209,7 @@ void lcd_enable(bool on) | |||
209 | lcd_display_on(); | 209 | lcd_display_on(); |
210 | LCDC_CTRL |= 1; /* controller enable */ | 210 | LCDC_CTRL |= 1; /* controller enable */ |
211 | lcd_update(); /* Resync display */ | 211 | lcd_update(); /* Resync display */ |
212 | lcd_activation_call_hook(); | 212 | send_event(LCD_EVENT_ACTIVATION, NULL); |
213 | } | 213 | } |
214 | else | 214 | else |
215 | { | 215 | { |
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c index e77c3a2311..3f1e621b54 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_activation_call_hook(); | 240 | send_event(LCD_EVENT_ACTIVATION, NULL); |
241 | } | 241 | } |
242 | else | 242 | else |
243 | { | 243 | { |
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c index 201b6e8063..ac7754f5e9 100644 --- a/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c +++ b/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c | |||
@@ -98,7 +98,7 @@ void lcd_awake(void) | |||
98 | sleep(HZ/10); | 98 | sleep(HZ/10); |
99 | 99 | ||
100 | 100 | ||
101 | lcd_activation_call_hook(); | 101 | send_event(LCD_EVENT_ACTIVATION, NULL); |
102 | } | 102 | } |
103 | } | 103 | } |
104 | #endif | 104 | #endif |
diff --git a/firmware/target/coldfire/iaudio/x5/lcd-x5.c b/firmware/target/coldfire/iaudio/x5/lcd-x5.c index 98eb5deb94..e1504b6e98 100644 --- a/firmware/target/coldfire/iaudio/x5/lcd-x5.c +++ b/firmware/target/coldfire/iaudio/x5/lcd-x5.c | |||
@@ -397,7 +397,7 @@ void lcd_enable(bool on) | |||
397 | /* Probably out of sync and we don't wanna pepper the code with | 397 | /* Probably out of sync and we don't wanna pepper the code with |
398 | lcd_update() calls for this. */ | 398 | lcd_update() calls for this. */ |
399 | lcd_update(); | 399 | lcd_update(); |
400 | lcd_activation_call_hook(); | 400 | send_event(LCD_EVENT_ACTIVATION, NULL); |
401 | } | 401 | } |
402 | else | 402 | else |
403 | { | 403 | { |
diff --git a/firmware/target/coldfire/iriver/h300/lcd-h300.c b/firmware/target/coldfire/iriver/h300/lcd-h300.c index 36f340eab7..ea0819aa3e 100644 --- a/firmware/target/coldfire/iriver/h300/lcd-h300.c +++ b/firmware/target/coldfire/iriver/h300/lcd-h300.c | |||
@@ -280,7 +280,7 @@ void lcd_enable(bool on) | |||
280 | if (on) | 280 | if (on) |
281 | { | 281 | { |
282 | _display_on(); | 282 | _display_on(); |
283 | lcd_activation_call_hook(); | 283 | send_event(LCD_EVENT_ACTIVATION, NULL); |
284 | } | 284 | } |
285 | else | 285 | else |
286 | { | 286 | { |
diff --git a/firmware/target/mips/ingenic_jz47xx/lcd-jz4740.c b/firmware/target/mips/ingenic_jz47xx/lcd-jz4740.c index edde538c99..99ffcf2981 100644 --- a/firmware/target/mips/ingenic_jz47xx/lcd-jz4740.c +++ b/firmware/target/mips/ingenic_jz47xx/lcd-jz4740.c | |||
@@ -55,7 +55,7 @@ void lcd_enable(bool state) | |||
55 | { | 55 | { |
56 | lcd_on(); | 56 | lcd_on(); |
57 | #ifdef HAVE_LCD_ENABLE | 57 | #ifdef HAVE_LCD_ENABLE |
58 | lcd_activation_call_hook(); | 58 | send_event(LCD_EVENT_ACTIVATION, NULL); |
59 | #endif | 59 | #endif |
60 | } | 60 | } |
61 | else | 61 | else |