diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-04-26 01:23:39 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-04-26 01:23:39 +0000 |
commit | 6abae1f124367a2936c91b651a360f21532705d1 (patch) | |
tree | 0d8ee65f85cac92f9ff9bf416845c9adb28754a6 | |
parent | c40af94d128d90ba837d6b9c420a1f7fb1905f0d (diff) | |
download | rockbox-6abae1f124367a2936c91b651a360f21532705d1.tar.gz rockbox-6abae1f124367a2936c91b651a360f21532705d1.zip |
Remove the calls to backlight_lcd_sleep_countdown from target specific code and move it into backlight.c
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20793 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/backlight.c | 22 | ||||
-rw-r--r-- | firmware/export/backlight.h | 5 | ||||
-rw-r--r-- | firmware/target/arm/as3525/backlight-e200v2-fuze.c | 6 | ||||
-rw-r--r-- | firmware/target/arm/as3525/sansa-c200v2/backlight-c200v2.c | 6 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/backlight-imx31.c | 8 | ||||
-rw-r--r-- | firmware/target/arm/iriver/h10/backlight-h10.c | 6 | ||||
-rw-r--r-- | firmware/target/arm/philips/sa9200/backlight-sa9200.c | 6 | ||||
-rw-r--r-- | firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c | 7 | ||||
-rw-r--r-- | firmware/target/arm/sandisk/backlight-c200_e200.c | 6 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/mrobe-500/backlight-mr500.c | 7 | ||||
-rw-r--r-- | firmware/target/coldfire/iaudio/x5/backlight-x5.c | 6 |
11 files changed, 20 insertions, 65 deletions
diff --git a/firmware/backlight.c b/firmware/backlight.c index 7e7f745298..07c55c6bca 100644 --- a/firmware/backlight.c +++ b/firmware/backlight.c | |||
@@ -210,7 +210,7 @@ static int lcd_sleep_timeout = 10*HZ; | |||
210 | 210 | ||
211 | static int lcd_sleep_timer SHAREDDATA_ATTR = 0; | 211 | static int lcd_sleep_timer SHAREDDATA_ATTR = 0; |
212 | 212 | ||
213 | void backlight_lcd_sleep_countdown(bool start) | 213 | static void backlight_lcd_sleep_countdown(bool start) |
214 | { | 214 | { |
215 | if (!start) | 215 | if (!start) |
216 | { | 216 | { |
@@ -223,8 +223,8 @@ void backlight_lcd_sleep_countdown(bool start) | |||
223 | if (lcd_sleep_timeout < 0) | 223 | if (lcd_sleep_timeout < 0) |
224 | { | 224 | { |
225 | lcd_sleep_timer = 0; /* Setting == Always */ | 225 | lcd_sleep_timer = 0; /* Setting == Always */ |
226 | #if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_PWM) | ||
227 | /* Ensure lcd_sleep() is called from backlight_thread() */ | 226 | /* Ensure lcd_sleep() is called from backlight_thread() */ |
227 | #if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_PWM) | ||
228 | queue_post(&backlight_queue, LCD_SLEEP, 0); | 228 | queue_post(&backlight_queue, LCD_SLEEP, 0); |
229 | #else | 229 | #else |
230 | lcd_sleep(); | 230 | lcd_sleep(); |
@@ -504,11 +504,19 @@ static void backlight_update_state(void) | |||
504 | queue_post(&backlight_queue, SYS_TIMEOUT, 0); | 504 | queue_post(&backlight_queue, SYS_TIMEOUT, 0); |
505 | #else | 505 | #else |
506 | _backlight_off(); | 506 | _backlight_off(); |
507 | #ifdef HAVE_LCD_SLEEP | ||
508 | backlight_lcd_sleep_countdown(true); /* start sleep countdown */ | ||
509 | #endif | ||
507 | #endif | 510 | #endif |
508 | } | 511 | } |
509 | else | 512 | else |
510 | { | 513 | { |
511 | backlight_timer = timeout; | 514 | backlight_timer = timeout; |
515 | |||
516 | #ifdef HAVE_LCD_SLEEP | ||
517 | backlight_lcd_sleep_countdown(false); /* wake up lcd */ | ||
518 | #endif | ||
519 | |||
512 | #if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_SETTING) \ | 520 | #if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_SETTING) \ |
513 | || (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_HW_REG) | 521 | || (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_HW_REG) |
514 | backlight_setup_fade_up(); | 522 | backlight_setup_fade_up(); |
@@ -670,7 +678,15 @@ void backlight_thread(void) | |||
670 | if (backlight_fading_state != NOT_FADING) | 678 | if (backlight_fading_state != NOT_FADING) |
671 | { | 679 | { |
672 | if ((_backlight_fade_step(backlight_fading_state))) | 680 | if ((_backlight_fade_step(backlight_fading_state))) |
673 | backlight_fading_state = NOT_FADING; /* finished fading */ | 681 | { /* finished fading */ |
682 | #ifdef HAVE_LCD_SLEEP | ||
683 | if (backlight_fading_state == FADING_DOWN) | ||
684 | { /* start sleep countdown */ | ||
685 | backlight_lcd_sleep_countdown(true); | ||
686 | } | ||
687 | #endif | ||
688 | backlight_fading_state = NOT_FADING; | ||
689 | } | ||
674 | } | 690 | } |
675 | else | 691 | else |
676 | #endif /* CONFIG_BACKLIGHT_FADING */ | 692 | #endif /* CONFIG_BACKLIGHT_FADING */ |
diff --git a/firmware/export/backlight.h b/firmware/export/backlight.h index a281b9ede0..c440db4668 100644 --- a/firmware/export/backlight.h +++ b/firmware/export/backlight.h | |||
@@ -56,12 +56,9 @@ void backlight_hold_changed(bool hold_button); | |||
56 | void backlight_set_on_button_hold(int index); | 56 | void backlight_set_on_button_hold(int index); |
57 | #endif | 57 | #endif |
58 | 58 | ||
59 | #ifdef HAVE_LCD_SLEEP | 59 | #if defined(HAVE_LCD_SLEEP) && defined(HAVE_LCD_SLEEP_SETTING) |
60 | void backlight_lcd_sleep_countdown(bool start); | ||
61 | #ifdef HAVE_LCD_SLEEP_SETTING | ||
62 | void lcd_set_sleep_after_backlight_off(int index); | 60 | void lcd_set_sleep_after_backlight_off(int index); |
63 | #endif | 61 | #endif |
64 | #endif | ||
65 | 62 | ||
66 | #else /* !HAVE_BACKLIGHT */ | 63 | #else /* !HAVE_BACKLIGHT */ |
67 | #define backlight_init() | 64 | #define backlight_init() |
diff --git a/firmware/target/arm/as3525/backlight-e200v2-fuze.c b/firmware/target/arm/as3525/backlight-e200v2-fuze.c index 465713a1fc..30c6d4b22f 100644 --- a/firmware/target/arm/as3525/backlight-e200v2-fuze.c +++ b/firmware/target/arm/as3525/backlight-e200v2-fuze.c | |||
@@ -33,9 +33,6 @@ void _backlight_set_brightness(int brightness) | |||
33 | 33 | ||
34 | void _backlight_on(void) | 34 | void _backlight_on(void) |
35 | { | 35 | { |
36 | #ifdef HAVE_LCD_SLEEP | ||
37 | backlight_lcd_sleep_countdown(false); /* stop counter */ | ||
38 | #endif | ||
39 | #ifdef HAVE_LCD_ENABLE | 36 | #ifdef HAVE_LCD_ENABLE |
40 | lcd_enable(true); /* power on lcd + visible display */ | 37 | lcd_enable(true); /* power on lcd + visible display */ |
41 | #endif | 38 | #endif |
@@ -52,9 +49,6 @@ void _backlight_off(void) | |||
52 | #ifdef HAVE_LCD_ENABLE | 49 | #ifdef HAVE_LCD_ENABLE |
53 | lcd_enable(false); /* power off visible display */ | 50 | lcd_enable(false); /* power off visible display */ |
54 | #endif | 51 | #endif |
55 | #ifdef HAVE_LCD_SLEEP | ||
56 | backlight_lcd_sleep_countdown(true); /* start countdown */ | ||
57 | #endif | ||
58 | } | 52 | } |
59 | 53 | ||
60 | void _buttonlight_on(void) | 54 | void _buttonlight_on(void) |
diff --git a/firmware/target/arm/as3525/sansa-c200v2/backlight-c200v2.c b/firmware/target/arm/as3525/sansa-c200v2/backlight-c200v2.c index ba9db6a1f5..f036792fc0 100644 --- a/firmware/target/arm/as3525/sansa-c200v2/backlight-c200v2.c +++ b/firmware/target/arm/as3525/sansa-c200v2/backlight-c200v2.c | |||
@@ -38,9 +38,6 @@ void _backlight_set_brightness(int brightness) | |||
38 | 38 | ||
39 | void _backlight_on(void) | 39 | void _backlight_on(void) |
40 | { | 40 | { |
41 | #ifdef HAVE_LCD_SLEEP | ||
42 | backlight_lcd_sleep_countdown(false); /* stop counter */ | ||
43 | #endif | ||
44 | #ifdef HAVE_LCD_ENABLE | 41 | #ifdef HAVE_LCD_ENABLE |
45 | lcd_enable(true); /* power on lcd + visible display */ | 42 | lcd_enable(true); /* power on lcd + visible display */ |
46 | #endif | 43 | #endif |
@@ -53,9 +50,6 @@ void _backlight_off(void) | |||
53 | #ifdef HAVE_LCD_ENABLE | 50 | #ifdef HAVE_LCD_ENABLE |
54 | lcd_enable(false); /* power off visible display */ | 51 | lcd_enable(false); /* power off visible display */ |
55 | #endif | 52 | #endif |
56 | #ifdef HAVE_LCD_SLEEP | ||
57 | backlight_lcd_sleep_countdown(true); /* start countdown */ | ||
58 | #endif | ||
59 | } | 53 | } |
60 | 54 | ||
61 | void _buttonlight_on(void) | 55 | void _buttonlight_on(void) |
diff --git a/firmware/target/arm/imx31/gigabeat-s/backlight-imx31.c b/firmware/target/arm/imx31/gigabeat-s/backlight-imx31.c index 8457d06a77..ec7bf7e8a9 100644 --- a/firmware/target/arm/imx31/gigabeat-s/backlight-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/backlight-imx31.c | |||
@@ -127,9 +127,6 @@ void _backlight_on(void) | |||
127 | 127 | ||
128 | mutex_lock(&backlight_mutex); | 128 | mutex_lock(&backlight_mutex); |
129 | 129 | ||
130 | #ifdef HAVE_LCD_SLEEP | ||
131 | backlight_lcd_sleep_countdown(false); /* stop counter */ | ||
132 | #endif | ||
133 | #ifdef HAVE_LCD_ENABLE | 130 | #ifdef HAVE_LCD_ENABLE |
134 | lcd_enable(true); | 131 | lcd_enable(true); |
135 | #endif | 132 | #endif |
@@ -180,11 +177,6 @@ void _backlight_off(void) | |||
180 | 0 << MC13783_LEDMDDC_POS, | 177 | 0 << MC13783_LEDMDDC_POS, |
181 | MC13783_LEDMDDC); | 178 | MC13783_LEDMDDC); |
182 | 179 | ||
183 | #ifdef HAVE_LCD_SLEEP | ||
184 | /* Disable lcd after fade completes (when lcd_sleep timeout expires) */ | ||
185 | backlight_lcd_sleep_countdown(true); /* start countdown */ | ||
186 | #endif | ||
187 | |||
188 | mutex_unlock(&backlight_mutex); | 180 | mutex_unlock(&backlight_mutex); |
189 | } | 181 | } |
190 | 182 | ||
diff --git a/firmware/target/arm/iriver/h10/backlight-h10.c b/firmware/target/arm/iriver/h10/backlight-h10.c index 9d9ebe8295..e74f2b8d43 100644 --- a/firmware/target/arm/iriver/h10/backlight-h10.c +++ b/firmware/target/arm/iriver/h10/backlight-h10.c | |||
@@ -26,9 +26,6 @@ | |||
26 | 26 | ||
27 | void _backlight_on(void) | 27 | void _backlight_on(void) |
28 | { | 28 | { |
29 | #ifdef HAVE_LCD_SLEEP | ||
30 | backlight_lcd_sleep_countdown(false); /* stop counter */ | ||
31 | #endif | ||
32 | #ifdef HAVE_LCD_ENABLE | 29 | #ifdef HAVE_LCD_ENABLE |
33 | lcd_enable(true); /* power on lcd + visible display */ | 30 | lcd_enable(true); /* power on lcd + visible display */ |
34 | #endif | 31 | #endif |
@@ -41,7 +38,4 @@ void _backlight_off(void) | |||
41 | #ifdef HAVE_LCD_ENABLE | 38 | #ifdef HAVE_LCD_ENABLE |
42 | lcd_enable(false); /* power off visible display */ | 39 | lcd_enable(false); /* power off visible display */ |
43 | #endif | 40 | #endif |
44 | #ifdef HAVE_LCD_SLEEP | ||
45 | backlight_lcd_sleep_countdown(true); /* start countdown */ | ||
46 | #endif | ||
47 | } | 41 | } |
diff --git a/firmware/target/arm/philips/sa9200/backlight-sa9200.c b/firmware/target/arm/philips/sa9200/backlight-sa9200.c index 5c967a84ea..a0acaa0abd 100644 --- a/firmware/target/arm/philips/sa9200/backlight-sa9200.c +++ b/firmware/target/arm/philips/sa9200/backlight-sa9200.c | |||
@@ -33,9 +33,6 @@ void _backlight_set_brightness(int brightness) | |||
33 | 33 | ||
34 | void _backlight_on(void) | 34 | void _backlight_on(void) |
35 | { | 35 | { |
36 | #ifdef HAVE_LCD_SLEEP | ||
37 | backlight_lcd_sleep_countdown(false); /* stop counter */ | ||
38 | #endif | ||
39 | #ifdef HAVE_LCD_ENABLE | 36 | #ifdef HAVE_LCD_ENABLE |
40 | lcd_enable(true); /* power on lcd + visible display */ | 37 | lcd_enable(true); /* power on lcd + visible display */ |
41 | #endif | 38 | #endif |
@@ -52,9 +49,6 @@ void _backlight_off(void) | |||
52 | #ifdef HAVE_LCD_ENABLE | 49 | #ifdef HAVE_LCD_ENABLE |
53 | lcd_enable(false); /* power off visible display */ | 50 | lcd_enable(false); /* power off visible display */ |
54 | #endif | 51 | #endif |
55 | #ifdef HAVE_LCD_SLEEP | ||
56 | backlight_lcd_sleep_countdown(true); /* start countdown */ | ||
57 | #endif | ||
58 | } | 52 | } |
59 | 53 | ||
60 | void _buttonlight_on(void) | 54 | void _buttonlight_on(void) |
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c index b38f18d4f9..97372acdd5 100644 --- a/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c +++ b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c | |||
@@ -337,9 +337,6 @@ static void __backlight_dim(bool dim_now) | |||
337 | 337 | ||
338 | void _backlight_on(void) | 338 | void _backlight_on(void) |
339 | { | 339 | { |
340 | #ifdef HAVE_LCD_SLEEP | ||
341 | backlight_lcd_sleep_countdown(false); /* stop counter */ | ||
342 | #endif | ||
343 | #ifdef HAVE_LCD_ENABLE | 340 | #ifdef HAVE_LCD_ENABLE |
344 | lcd_enable(true); /* power on lcd + visible display */ | 341 | lcd_enable(true); /* power on lcd + visible display */ |
345 | #endif | 342 | #endif |
@@ -349,10 +346,6 @@ void _backlight_on(void) | |||
349 | void _backlight_off(void) | 346 | void _backlight_off(void) |
350 | { | 347 | { |
351 | __backlight_dim(true); | 348 | __backlight_dim(true); |
352 | #ifdef HAVE_LCD_SLEEP | ||
353 | /* Disable lcd after fade completes (when lcd_sleep timeout expires) */ | ||
354 | backlight_lcd_sleep_countdown(true); /* start countdown */ | ||
355 | #endif | ||
356 | } | 349 | } |
357 | 350 | ||
358 | static inline void __buttonlight_on(void) | 351 | static inline void __buttonlight_on(void) |
diff --git a/firmware/target/arm/sandisk/backlight-c200_e200.c b/firmware/target/arm/sandisk/backlight-c200_e200.c index 5a2e98a278..0280604526 100644 --- a/firmware/target/arm/sandisk/backlight-c200_e200.c +++ b/firmware/target/arm/sandisk/backlight-c200_e200.c | |||
@@ -33,9 +33,6 @@ void _backlight_set_brightness(int brightness) | |||
33 | 33 | ||
34 | void _backlight_on(void) | 34 | void _backlight_on(void) |
35 | { | 35 | { |
36 | #ifdef HAVE_LCD_SLEEP | ||
37 | backlight_lcd_sleep_countdown(false); /* stop counter */ | ||
38 | #endif | ||
39 | #ifdef HAVE_LCD_ENABLE | 36 | #ifdef HAVE_LCD_ENABLE |
40 | lcd_enable(true); /* power on lcd + visible display */ | 37 | lcd_enable(true); /* power on lcd + visible display */ |
41 | #endif | 38 | #endif |
@@ -52,9 +49,6 @@ void _backlight_off(void) | |||
52 | #ifdef HAVE_LCD_ENABLE | 49 | #ifdef HAVE_LCD_ENABLE |
53 | lcd_enable(false); /* power off visible display */ | 50 | lcd_enable(false); /* power off visible display */ |
54 | #endif | 51 | #endif |
55 | #ifdef HAVE_LCD_SLEEP | ||
56 | backlight_lcd_sleep_countdown(true); /* start countdown */ | ||
57 | #endif | ||
58 | } | 52 | } |
59 | 53 | ||
60 | void _buttonlight_on(void) | 54 | void _buttonlight_on(void) |
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/backlight-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/backlight-mr500.c index 2c188a584e..bdd91e2e20 100644 --- a/firmware/target/arm/tms320dm320/mrobe-500/backlight-mr500.c +++ b/firmware/target/arm/tms320dm320/mrobe-500/backlight-mr500.c | |||
@@ -38,9 +38,6 @@ static void _backlight_write_brightness(int brightness) | |||
38 | 38 | ||
39 | void _backlight_on(void) | 39 | void _backlight_on(void) |
40 | { | 40 | { |
41 | #if defined(HAVE_LCD_SLEEP) && !defined(BOOTLOADER) | ||
42 | backlight_lcd_sleep_countdown(false); /* stop counter */ | ||
43 | #endif | ||
44 | #ifdef HAVE_LCD_ENABLE | 41 | #ifdef HAVE_LCD_ENABLE |
45 | lcd_enable(true); /* power on lcd + visible display */ | 42 | lcd_enable(true); /* power on lcd + visible display */ |
46 | #endif | 43 | #endif |
@@ -50,10 +47,6 @@ void _backlight_on(void) | |||
50 | void _backlight_off(void) | 47 | void _backlight_off(void) |
51 | { | 48 | { |
52 | _backlight_write_brightness(0); | 49 | _backlight_write_brightness(0); |
53 | #if defined(HAVE_LCD_SLEEP) && !defined(BOOTLOADER) | ||
54 | /* Disable lcd after fade completes (when lcd_sleep timeout expires) */ | ||
55 | backlight_lcd_sleep_countdown(true); /* start countdown */ | ||
56 | #endif | ||
57 | } | 50 | } |
58 | 51 | ||
59 | /* Assumes that the backlight has been initialized */ | 52 | /* Assumes that the backlight has been initialized */ |
diff --git a/firmware/target/coldfire/iaudio/x5/backlight-x5.c b/firmware/target/coldfire/iaudio/x5/backlight-x5.c index fcf2adeade..8a06c7d653 100644 --- a/firmware/target/coldfire/iaudio/x5/backlight-x5.c +++ b/firmware/target/coldfire/iaudio/x5/backlight-x5.c | |||
@@ -37,9 +37,6 @@ bool _backlight_init(void) | |||
37 | void _backlight_on(void) | 37 | void _backlight_on(void) |
38 | { | 38 | { |
39 | int level; | 39 | int level; |
40 | #ifdef HAVE_LCD_SLEEP | ||
41 | backlight_lcd_sleep_countdown(false); /* stop counter */ | ||
42 | #endif | ||
43 | #ifdef HAVE_LCD_ENABLE | 40 | #ifdef HAVE_LCD_ENABLE |
44 | lcd_enable(true); /* power on lcd + visible display */ | 41 | lcd_enable(true); /* power on lcd + visible display */ |
45 | #endif | 42 | #endif |
@@ -56,9 +53,6 @@ void _backlight_off(void) | |||
56 | #ifdef HAVE_LCD_ENABLE | 53 | #ifdef HAVE_LCD_ENABLE |
57 | lcd_enable(false); /* power off visible display */ | 54 | lcd_enable(false); /* power off visible display */ |
58 | #endif | 55 | #endif |
59 | #ifdef HAVE_LCD_SLEEP | ||
60 | backlight_lcd_sleep_countdown(true); /* start countdown */ | ||
61 | #endif | ||
62 | } | 56 | } |
63 | 57 | ||
64 | /* set brightness by changing the PWM */ | 58 | /* set brightness by changing the PWM */ |