diff options
author | Jens Arnold <amiconn@rockbox.org> | 2007-11-12 18:49:53 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2007-11-12 18:49:53 +0000 |
commit | ef12b3b5c678e4fa44d60061b0c1bc312e589ba1 (patch) | |
tree | 4c2572d7bf3d995be16b33fa2e46ccccad34f4ee /bootloader | |
parent | 8537cbf091634efa57768dccff39049afdf6d288 (diff) | |
download | rockbox-ef12b3b5c678e4fa44d60061b0c1bc312e589ba1.tar.gz rockbox-ef12b3b5c678e4fa44d60061b0c1bc312e589ba1.zip |
Hardware controlled backlight brightness for iPod Video and Nano, retaining the software PWM fade in/ fade out. * Backlight handling cleanup, getting rid of one layer of 'lowlevelness'. * Use atomic GPIO bit manipulation for PP502x backlight handling.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15599 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'bootloader')
-rw-r--r-- | bootloader/iaudio_x5.c | 4 | ||||
-rw-r--r-- | bootloader/ipod.c | 2 | ||||
-rw-r--r-- | bootloader/iriver_h300.c | 10 | ||||
-rw-r--r-- | bootloader/main-e200r-installer.c | 2 | ||||
-rw-r--r-- | bootloader/main-pp.c | 2 | ||||
-rw-r--r-- | bootloader/main.c | 12 | ||||
-rw-r--r-- | bootloader/telechips.c | 2 |
7 files changed, 17 insertions, 17 deletions
diff --git a/bootloader/iaudio_x5.c b/bootloader/iaudio_x5.c index d6ee7176ca..3cfbb7aec7 100644 --- a/bootloader/iaudio_x5.c +++ b/bootloader/iaudio_x5.c | |||
@@ -93,9 +93,9 @@ void shutdown(void) | |||
93 | sleep(HZ*2); | 93 | sleep(HZ*2); |
94 | 94 | ||
95 | /* Backlight OFF */ | 95 | /* Backlight OFF */ |
96 | __backlight_off(); | 96 | _backlight_off(); |
97 | #ifdef HAVE_REMOTE_LCD | 97 | #ifdef HAVE_REMOTE_LCD |
98 | __remote_backlight_off(); | 98 | _remote_backlight_off(); |
99 | #endif | 99 | #endif |
100 | 100 | ||
101 | __reset_cookie(); | 101 | __reset_cookie(); |
diff --git a/bootloader/ipod.c b/bootloader/ipod.c index 441bda860c..816f13adde 100644 --- a/bootloader/ipod.c +++ b/bootloader/ipod.c | |||
@@ -239,7 +239,7 @@ void* main(void) | |||
239 | 239 | ||
240 | #ifndef HAVE_BACKLIGHT_INVERSION | 240 | #ifndef HAVE_BACKLIGHT_INVERSION |
241 | /* Turn on the backlight */ | 241 | /* Turn on the backlight */ |
242 | __backlight_on(); | 242 | _backlight_on(); |
243 | #endif | 243 | #endif |
244 | 244 | ||
245 | system_init(); | 245 | system_init(); |
diff --git a/bootloader/iriver_h300.c b/bootloader/iriver_h300.c index a3a15bd4b5..5b742044eb 100644 --- a/bootloader/iriver_h300.c +++ b/bootloader/iriver_h300.c | |||
@@ -100,8 +100,8 @@ void shutdown(void) | |||
100 | 100 | ||
101 | sleep(HZ*2); | 101 | sleep(HZ*2); |
102 | 102 | ||
103 | __backlight_off(); | 103 | _backlight_off(); |
104 | __remote_backlight_off(); | 104 | _remote_backlight_off(); |
105 | 105 | ||
106 | __reset_cookie(); | 106 | __reset_cookie(); |
107 | power_off(); | 107 | power_off(); |
@@ -177,10 +177,10 @@ void main(void) | |||
177 | audiohw_reset(); | 177 | audiohw_reset(); |
178 | 178 | ||
179 | /* Start with the main backlight OFF. */ | 179 | /* Start with the main backlight OFF. */ |
180 | __backlight_init(); | 180 | _backlight_init(); |
181 | __backlight_off(); | 181 | _backlight_off(); |
182 | 182 | ||
183 | __remote_backlight_on(); | 183 | _remote_backlight_on(); |
184 | 184 | ||
185 | system_init(); | 185 | system_init(); |
186 | kernel_init(); | 186 | kernel_init(); |
diff --git a/bootloader/main-e200r-installer.c b/bootloader/main-e200r-installer.c index b128a3445a..46c1f9a2ff 100644 --- a/bootloader/main-e200r-installer.c +++ b/bootloader/main-e200r-installer.c | |||
@@ -102,7 +102,7 @@ void* main(void) | |||
102 | font_init(); | 102 | font_init(); |
103 | button_init(); | 103 | button_init(); |
104 | i2c_init(); | 104 | i2c_init(); |
105 | __backlight_on(); | 105 | _backlight_on(); |
106 | 106 | ||
107 | lcd_set_foreground(LCD_WHITE); | 107 | lcd_set_foreground(LCD_WHITE); |
108 | lcd_set_background(LCD_BLACK); | 108 | lcd_set_background(LCD_BLACK); |
diff --git a/bootloader/main-pp.c b/bootloader/main-pp.c index acc916e8a4..3c498d9ee1 100644 --- a/bootloader/main-pp.c +++ b/bootloader/main-pp.c | |||
@@ -441,7 +441,7 @@ void* main(void) | |||
441 | button_init(); | 441 | button_init(); |
442 | #if defined(SANSA_E200) | 442 | #if defined(SANSA_E200) |
443 | i2c_init(); | 443 | i2c_init(); |
444 | __backlight_on(); | 444 | _backlight_on(); |
445 | #endif | 445 | #endif |
446 | 446 | ||
447 | lcd_set_foreground(LCD_WHITE); | 447 | lcd_set_foreground(LCD_WHITE); |
diff --git a/bootloader/main.c b/bootloader/main.c index e60799fa65..8d58ca71d0 100644 --- a/bootloader/main.c +++ b/bootloader/main.c | |||
@@ -156,9 +156,9 @@ void shutdown(void) | |||
156 | sleep(HZ*2); | 156 | sleep(HZ*2); |
157 | 157 | ||
158 | /* Backlight OFF */ | 158 | /* Backlight OFF */ |
159 | __backlight_off(); | 159 | _backlight_off(); |
160 | #ifdef HAVE_REMOTE_LCD | 160 | #ifdef HAVE_REMOTE_LCD |
161 | __remote_backlight_off(); | 161 | _remote_backlight_off(); |
162 | #endif | 162 | #endif |
163 | 163 | ||
164 | __reset_cookie(); | 164 | __reset_cookie(); |
@@ -395,12 +395,12 @@ void main(void) | |||
395 | } | 395 | } |
396 | 396 | ||
397 | /* Start with the main backlight OFF. */ | 397 | /* Start with the main backlight OFF. */ |
398 | __backlight_init(); | 398 | _backlight_init(); |
399 | __backlight_off(); | 399 | _backlight_off(); |
400 | 400 | ||
401 | /* Remote backlight ON */ | 401 | /* Remote backlight ON */ |
402 | #ifdef HAVE_REMOTE_LCD | 402 | #ifdef HAVE_REMOTE_LCD |
403 | __remote_backlight_on(); | 403 | _remote_backlight_on(); |
404 | #endif | 404 | #endif |
405 | 405 | ||
406 | system_init(); | 406 | system_init(); |
@@ -531,7 +531,7 @@ void main(void) | |||
531 | sleep(HZ); | 531 | sleep(HZ); |
532 | 532 | ||
533 | /* Backlight OFF */ | 533 | /* Backlight OFF */ |
534 | __backlight_off(); | 534 | _backlight_off(); |
535 | } | 535 | } |
536 | 536 | ||
537 | cpu_idle_mode(false); | 537 | cpu_idle_mode(false); |
diff --git a/bootloader/telechips.c b/bootloader/telechips.c index 83dad704da..6093701044 100644 --- a/bootloader/telechips.c +++ b/bootloader/telechips.c | |||
@@ -57,7 +57,7 @@ void* main(void) | |||
57 | lcd_init(); | 57 | lcd_init(); |
58 | font_init(); | 58 | font_init(); |
59 | 59 | ||
60 | __backlight_on(); | 60 | _backlight_on(); |
61 | 61 | ||
62 | while(!do_power_off) { | 62 | while(!do_power_off) { |
63 | line = 0; | 63 | line = 0; |