diff options
author | Marcin Bukat <marcin.bukat@gmail.com> | 2015-01-09 00:22:40 +0100 |
---|---|---|
committer | Gerrit Rockbox <gerrit@rockbox.org> | 2015-01-12 11:09:27 +0100 |
commit | 89ba7e818c0d96b779b02bc7b31c0c6a19294a46 (patch) | |
tree | 19f7326e1f27f4bd403c4437572b579add5b61bb | |
parent | 2a3e1628a50b9de7c1462ee95eb79937795f5409 (diff) | |
download | rockbox-89ba7e818c0d96b779b02bc7b31c0c6a19294a46.tar.gz rockbox-89ba7e818c0d96b779b02bc7b31c0c6a19294a46.zip |
Get rid of stupid _backlight_* function names
_remote_backlight_* and _buttonlight_* are cleaned as well
Change-Id: I73653752831bbe170c26ba95d3bc04c2e3a5cf30
148 files changed, 679 insertions, 687 deletions
diff --git a/apps/plugins/lib/grey_core.c b/apps/plugins/lib/grey_core.c index bb6823522d..fc445c5403 100644 --- a/apps/plugins/lib/grey_core.c +++ b/apps/plugins/lib/grey_core.c | |||
@@ -469,7 +469,7 @@ static unsigned long _grey_get_pixel(int x, int y) | |||
469 | static void _timer_isr(void) | 469 | static void _timer_isr(void) |
470 | { | 470 | { |
471 | #if defined(HAVE_BACKLIGHT_INVERSION) && !defined(SIMULATOR) | 471 | #if defined(HAVE_BACKLIGHT_INVERSION) && !defined(SIMULATOR) |
472 | unsigned long check = rb->is_backlight_on(true) | 472 | unsigned long check = rb->isbacklight_hw_on(true) |
473 | ? 0 : _GREY_BACKLIGHT_ON; | 473 | ? 0 : _GREY_BACKLIGHT_ON; |
474 | 474 | ||
475 | if ((_grey_info.flags & (_GREY_BACKLIGHT_ON|GREY_RAWMAPPED)) == check) | 475 | if ((_grey_info.flags & (_GREY_BACKLIGHT_ON|GREY_RAWMAPPED)) == check) |
@@ -648,7 +648,7 @@ bool grey_init(unsigned char *gbuf, long gbuf_size, | |||
648 | else | 648 | else |
649 | { | 649 | { |
650 | #if defined(HAVE_BACKLIGHT_INVERSION) && !defined(SIMULATOR) | 650 | #if defined(HAVE_BACKLIGHT_INVERSION) && !defined(SIMULATOR) |
651 | if (rb->is_backlight_on(true)) | 651 | if (rb->isbacklight_hw_on(true)) |
652 | _grey_info.flags |= _GREY_BACKLIGHT_ON; | 652 | _grey_info.flags |= _GREY_BACKLIGHT_ON; |
653 | #endif | 653 | #endif |
654 | fill_gvalues(); | 654 | fill_gvalues(); |
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 945d906d8b..66da5d52f7 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c | |||
@@ -1093,7 +1093,7 @@ static void osd_lcd_enable_hook(unsigned short id, void* param) | |||
1093 | } | 1093 | } |
1094 | #endif | 1094 | #endif |
1095 | 1095 | ||
1096 | static void osd_backlight_on_video_mode(bool video_on) | 1096 | static void osdbacklight_hw_on_video_mode(bool video_on) |
1097 | { | 1097 | { |
1098 | if (video_on) { | 1098 | if (video_on) { |
1099 | /* Turn off backlight timeout */ | 1099 | /* Turn off backlight timeout */ |
@@ -1779,7 +1779,7 @@ static int osd_play(uint32_t time) | |||
1779 | retval = stream_seek(time, SEEK_SET); | 1779 | retval = stream_seek(time, SEEK_SET); |
1780 | 1780 | ||
1781 | if (retval >= STREAM_OK) { | 1781 | if (retval >= STREAM_OK) { |
1782 | osd_backlight_on_video_mode(true); | 1782 | osdbacklight_hw_on_video_mode(true); |
1783 | osd_backlight_brightness_video_mode(true); | 1783 | osd_backlight_brightness_video_mode(true); |
1784 | stream_show_vo(true); | 1784 | stream_show_vo(true); |
1785 | 1785 | ||
@@ -1826,7 +1826,7 @@ static int osd_pause(void) | |||
1826 | 1826 | ||
1827 | osd_set_status(OSD_STATUS_PAUSED); | 1827 | osd_set_status(OSD_STATUS_PAUSED); |
1828 | 1828 | ||
1829 | osd_backlight_on_video_mode(false); | 1829 | osdbacklight_hw_on_video_mode(false); |
1830 | /* Leave brightness alone and restore it when OSD is hidden */ | 1830 | /* Leave brightness alone and restore it when OSD is hidden */ |
1831 | 1831 | ||
1832 | if (stream_can_seek() && rb->global_settings->pause_rewind) { | 1832 | if (stream_can_seek() && rb->global_settings->pause_rewind) { |
@@ -1847,7 +1847,7 @@ static void osd_resume(void) | |||
1847 | /* Cancel video and resume auto refresh - the resyc when starting | 1847 | /* Cancel video and resume auto refresh - the resyc when starting |
1848 | * playback will perform those tasks */ | 1848 | * playback will perform those tasks */ |
1849 | osd_set_hp_pause_flag(false); | 1849 | osd_set_hp_pause_flag(false); |
1850 | osd_backlight_on_video_mode(true); | 1850 | osdbacklight_hw_on_video_mode(true); |
1851 | osd_backlight_brightness_video_mode(true); | 1851 | osd_backlight_brightness_video_mode(true); |
1852 | osd_cancel_refresh(OSD_REFRESH_VIDEO | OSD_REFRESH_RESUME); | 1852 | osd_cancel_refresh(OSD_REFRESH_VIDEO | OSD_REFRESH_RESUME); |
1853 | osd_set_status(OSD_STATUS_PLAYING); | 1853 | osd_set_status(OSD_STATUS_PLAYING); |
@@ -1871,7 +1871,7 @@ static void osd_stop(void) | |||
1871 | if (resume_time != INVALID_TIMESTAMP) | 1871 | if (resume_time != INVALID_TIMESTAMP) |
1872 | settings.resume_time = resume_time; | 1872 | settings.resume_time = resume_time; |
1873 | 1873 | ||
1874 | osd_backlight_on_video_mode(false); | 1874 | osdbacklight_hw_on_video_mode(false); |
1875 | osd_backlight_brightness_video_mode(false); | 1875 | osd_backlight_brightness_video_mode(false); |
1876 | } | 1876 | } |
1877 | 1877 | ||
diff --git a/bootloader/gigabeat.c b/bootloader/gigabeat.c index 4d52407655..a79454b81d 100644 --- a/bootloader/gigabeat.c +++ b/bootloader/gigabeat.c | |||
@@ -63,7 +63,7 @@ void shutdown(void) | |||
63 | ata_sleepnow(); | 63 | ata_sleepnow(); |
64 | } | 64 | } |
65 | 65 | ||
66 | _backlight_off(); | 66 | backlight_hw_off(); |
67 | 67 | ||
68 | power_off(); | 68 | power_off(); |
69 | } | 69 | } |
diff --git a/bootloader/iaudio_coldfire.c b/bootloader/iaudio_coldfire.c index 953e649b9a..c79ab4b0c5 100644 --- a/bootloader/iaudio_coldfire.c +++ b/bootloader/iaudio_coldfire.c | |||
@@ -98,9 +98,9 @@ void shutdown(void) | |||
98 | sleep(HZ*2); | 98 | sleep(HZ*2); |
99 | 99 | ||
100 | /* Backlight OFF */ | 100 | /* Backlight OFF */ |
101 | _backlight_off(); | 101 | backlight_hw_off(); |
102 | #ifdef HAVE_REMOTE_LCD | 102 | #ifdef HAVE_REMOTE_LCD |
103 | _remote_backlight_off(); | 103 | remote_backlight_hw_off(); |
104 | #endif | 104 | #endif |
105 | 105 | ||
106 | __reset_cookie(); | 106 | __reset_cookie(); |
diff --git a/bootloader/imx233.c b/bootloader/imx233.c index 65799de7aa..efe19bf0c2 100644 --- a/bootloader/imx233.c +++ b/bootloader/imx233.c | |||
@@ -217,9 +217,9 @@ void main(uint32_t arg, uint32_t addr) | |||
217 | system_prepare_fw_start(); | 217 | system_prepare_fw_start(); |
218 | /* if target defines lcd_enable() in bootloader, take this as a hint that | 218 | /* if target defines lcd_enable() in bootloader, take this as a hint that |
219 | * we should use it to properly stop the lcd before moving one, the | 219 | * we should use it to properly stop the lcd before moving one, the |
220 | * _backlight_off() routine is supposed to disable the lcd at the same time */ | 220 | * backlight_hw_off() routine is supposed to disable the lcd at the same time */ |
221 | #ifdef HAVE_LCD_ENABLE | 221 | #ifdef HAVE_LCD_ENABLE |
222 | _backlight_off(); | 222 | backlight_hw_off(); |
223 | #endif | 223 | #endif |
224 | disable_interrupt(IRQ_FIQ_STATUS); | 224 | disable_interrupt(IRQ_FIQ_STATUS); |
225 | commit_discard_idcache(); | 225 | commit_discard_idcache(); |
diff --git a/bootloader/iriver_h1x0.c b/bootloader/iriver_h1x0.c index 742d0dd254..8fd95d048c 100644 --- a/bootloader/iriver_h1x0.c +++ b/bootloader/iriver_h1x0.c | |||
@@ -158,9 +158,9 @@ void shutdown(void) | |||
158 | sleep(HZ*2); | 158 | sleep(HZ*2); |
159 | 159 | ||
160 | /* Backlight OFF */ | 160 | /* Backlight OFF */ |
161 | _backlight_off(); | 161 | backlight_hw_off(); |
162 | #ifdef HAVE_REMOTE_LCD | 162 | #ifdef HAVE_REMOTE_LCD |
163 | _remote_backlight_off(); | 163 | remote_backlight_hw_off(); |
164 | #endif | 164 | #endif |
165 | 165 | ||
166 | __reset_cookie(); | 166 | __reset_cookie(); |
@@ -418,12 +418,12 @@ void main(void) | |||
418 | __uda1380_reset_hi(); | 418 | __uda1380_reset_hi(); |
419 | 419 | ||
420 | /* Start with the main backlight OFF. */ | 420 | /* Start with the main backlight OFF. */ |
421 | _backlight_init(); | 421 | backlight_hw_init(); |
422 | _backlight_off(); | 422 | backlight_hw_off(); |
423 | 423 | ||
424 | /* Remote backlight ON */ | 424 | /* Remote backlight ON */ |
425 | #ifdef HAVE_REMOTE_LCD | 425 | #ifdef HAVE_REMOTE_LCD |
426 | _remote_backlight_on(); | 426 | remote_backlight_hw_on(); |
427 | #endif | 427 | #endif |
428 | 428 | ||
429 | system_init(); | 429 | system_init(); |
@@ -576,7 +576,7 @@ void main(void) | |||
576 | sleep(HZ); | 576 | sleep(HZ); |
577 | 577 | ||
578 | /* Backlight OFF */ | 578 | /* Backlight OFF */ |
579 | _backlight_off(); | 579 | backlight_hw_off(); |
580 | } | 580 | } |
581 | 581 | ||
582 | cpu_idle_mode(false); | 582 | cpu_idle_mode(false); |
diff --git a/bootloader/iriver_h300.c b/bootloader/iriver_h300.c index 100e660a67..ca5c630e30 100644 --- a/bootloader/iriver_h300.c +++ b/bootloader/iriver_h300.c | |||
@@ -102,8 +102,8 @@ void shutdown(void) | |||
102 | 102 | ||
103 | sleep(HZ*2); | 103 | sleep(HZ*2); |
104 | 104 | ||
105 | _backlight_off(); | 105 | backlight_hw_off(); |
106 | _remote_backlight_off(); | 106 | remote_backlight_hw_off(); |
107 | 107 | ||
108 | __reset_cookie(); | 108 | __reset_cookie(); |
109 | power_off(); | 109 | power_off(); |
@@ -184,10 +184,10 @@ void main(void) | |||
184 | restore_irq(mask); | 184 | restore_irq(mask); |
185 | 185 | ||
186 | /* Start with the main backlight OFF. */ | 186 | /* Start with the main backlight OFF. */ |
187 | _backlight_init(); | 187 | backlight_hw_init(); |
188 | _backlight_off(); | 188 | backlight_hw_off(); |
189 | 189 | ||
190 | _remote_backlight_on(); | 190 | remote_backlight_hw_on(); |
191 | 191 | ||
192 | system_init(); | 192 | system_init(); |
193 | kernel_init(); | 193 | kernel_init(); |
diff --git a/bootloader/main-e200r-installer.c b/bootloader/main-e200r-installer.c index c5751d3095..5d1bff7b37 100644 --- a/bootloader/main-e200r-installer.c +++ b/bootloader/main-e200r-installer.c | |||
@@ -101,7 +101,7 @@ void* main(void) | |||
101 | font_init(); | 101 | font_init(); |
102 | button_init(); | 102 | button_init(); |
103 | i2c_init(); | 103 | i2c_init(); |
104 | _backlight_on(); | 104 | backlight_hw_on(); |
105 | 105 | ||
106 | lcd_set_foreground(LCD_WHITE); | 106 | lcd_set_foreground(LCD_WHITE); |
107 | lcd_set_background(LCD_BLACK); | 107 | lcd_set_background(LCD_BLACK); |
diff --git a/bootloader/main-pp.c b/bootloader/main-pp.c index 562cf17ca4..07da6409e2 100644 --- a/bootloader/main-pp.c +++ b/bootloader/main-pp.c | |||
@@ -320,7 +320,7 @@ void* main(void) | |||
320 | #endif | 320 | #endif |
321 | #if defined(SANSA_E200) || defined(PHILIPS_SA9200) | 321 | #if defined(SANSA_E200) || defined(PHILIPS_SA9200) |
322 | i2c_init(); | 322 | i2c_init(); |
323 | _backlight_on(); | 323 | backlight_hw_on(); |
324 | #endif | 324 | #endif |
325 | 325 | ||
326 | if (button_hold()) | 326 | if (button_hold()) |
diff --git a/bootloader/main-ppsansawipe.c b/bootloader/main-ppsansawipe.c index 88f722938e..d85a228167 100644 --- a/bootloader/main-ppsansawipe.c +++ b/bootloader/main-ppsansawipe.c | |||
@@ -181,7 +181,7 @@ void* main(void) | |||
181 | font_init(); | 181 | font_init(); |
182 | button_init(); | 182 | button_init(); |
183 | i2c_init(); | 183 | i2c_init(); |
184 | _backlight_on(); | 184 | backlight_hw_on(); |
185 | 185 | ||
186 | lcd_set_foreground(LCD_WHITE); | 186 | lcd_set_foreground(LCD_WHITE); |
187 | lcd_set_background(LCD_BLACK); | 187 | lcd_set_background(LCD_BLACK); |
diff --git a/bootloader/meizu_m3.c b/bootloader/meizu_m3.c index 936d3aca46..cefb186ef4 100644 --- a/bootloader/meizu_m3.c +++ b/bootloader/meizu_m3.c | |||
@@ -176,7 +176,7 @@ void main(void) | |||
176 | | QT1106_DI | QT1106_SLD_SLIDER | QT1106_RES_256); | 176 | | QT1106_DI | QT1106_SLD_SLIDER | QT1106_RES_256); |
177 | snprintf(mystring, 64, "%x %2.2x",(slider & 0x008000)>>15, slider&0xff); | 177 | snprintf(mystring, 64, "%x %2.2x",(slider & 0x008000)>>15, slider&0xff); |
178 | lcd_puts(0,1,mystring); | 178 | lcd_puts(0,1,mystring); |
179 | _backlight_set_brightness((slider & 0xFF) >> 4); | 179 | backlight_hw_brightness((slider & 0xFF) >> 4); |
180 | 180 | ||
181 | /* | 181 | /* |
182 | if(slider & 0x008000) | 182 | if(slider & 0x008000) |
diff --git a/bootloader/mpio_hd200_hd300.c b/bootloader/mpio_hd200_hd300.c index e66732f848..3d821caf6b 100644 --- a/bootloader/mpio_hd200_hd300.c +++ b/bootloader/mpio_hd200_hd300.c | |||
@@ -150,7 +150,7 @@ static void __shutdown(void) | |||
150 | } | 150 | } |
151 | 151 | ||
152 | /* Backlight OFF */ | 152 | /* Backlight OFF */ |
153 | _backlight_off(); | 153 | backlight_hw_off(); |
154 | __reset_cookie(); | 154 | __reset_cookie(); |
155 | 155 | ||
156 | power_off(); | 156 | power_off(); |
@@ -372,7 +372,7 @@ void main(void) | |||
372 | cpu_idle_mode(true); | 372 | cpu_idle_mode(true); |
373 | 373 | ||
374 | /* lowlevel init only */ | 374 | /* lowlevel init only */ |
375 | _backlight_init(); | 375 | backlight_hw_init(); |
376 | 376 | ||
377 | /* Handle wakeup event. Possibilities are: | 377 | /* Handle wakeup event. Possibilities are: |
378 | * RTC alarm (HD300) | 378 | * RTC alarm (HD300) |
diff --git a/bootloader/samsung_yps3.c b/bootloader/samsung_yps3.c index 927cd6e43a..9a09b11d2a 100644 --- a/bootloader/samsung_yps3.c +++ b/bootloader/samsung_yps3.c | |||
@@ -114,7 +114,7 @@ void main(void) | |||
114 | i2c_init(); | 114 | i2c_init(); |
115 | fmradio_i2c_init(); | 115 | fmradio_i2c_init(); |
116 | adc_init(); | 116 | adc_init(); |
117 | _backlight_init(); | 117 | backlight_hw_init(); |
118 | button_init_device(); | 118 | button_init_device(); |
119 | 119 | ||
120 | // FM power | 120 | // FM power |
@@ -259,13 +259,13 @@ void main(void) | |||
259 | if (button & BUTTON_MENU) { | 259 | if (button & BUTTON_MENU) { |
260 | if (brightness < MAX_BRIGHTNESS_SETTING) { | 260 | if (brightness < MAX_BRIGHTNESS_SETTING) { |
261 | brightness++; | 261 | brightness++; |
262 | _backlight_set_brightness(brightness); | 262 | backlight_hw_brightness(brightness); |
263 | } | 263 | } |
264 | } | 264 | } |
265 | else if (button & BUTTON_BACK) { | 265 | else if (button & BUTTON_BACK) { |
266 | if (brightness > MIN_BRIGHTNESS_SETTING) { | 266 | if (brightness > MIN_BRIGHTNESS_SETTING) { |
267 | brightness--; | 267 | brightness--; |
268 | _backlight_set_brightness(brightness); | 268 | backlight_hw_brightness(brightness); |
269 | } | 269 | } |
270 | } | 270 | } |
271 | snprintf(mystring, 64, "brightness %3d", brightness); | 271 | snprintf(mystring, 64, "brightness %3d", brightness); |
diff --git a/bootloader/sansaview.c b/bootloader/sansaview.c index 03e24b8c8e..7ea4b59250 100644 --- a/bootloader/sansaview.c +++ b/bootloader/sansaview.c | |||
@@ -54,11 +54,11 @@ void main(void) | |||
54 | 54 | ||
55 | while(1) | 55 | while(1) |
56 | { | 56 | { |
57 | _backlight_on(); | 57 | backlight_hw_on(); |
58 | _buttonlight_off(); | 58 | buttonlight_hw_off(); |
59 | sleep(HZ/4); | 59 | sleep(HZ/4); |
60 | _backlight_off(); | 60 | backlight_hw_off(); |
61 | _buttonlight_on(); | 61 | buttonlight_hw_on(); |
62 | sleep(HZ/4); | 62 | sleep(HZ/4); |
63 | } | 63 | } |
64 | } | 64 | } |
diff --git a/bootloader/telechips.c b/bootloader/telechips.c index d2cf10eb21..879e72ad65 100644 --- a/bootloader/telechips.c +++ b/bootloader/telechips.c | |||
@@ -82,10 +82,10 @@ void show_debug_screen(void) | |||
82 | } | 82 | } |
83 | #if 0 | 83 | #if 0 |
84 | if (button & BUTTON_SELECT){ | 84 | if (button & BUTTON_SELECT){ |
85 | _backlight_off(); | 85 | backlight_hw_off(); |
86 | } | 86 | } |
87 | else{ | 87 | else{ |
88 | _backlight_on(); | 88 | backlight_hw_on(); |
89 | } | 89 | } |
90 | #endif | 90 | #endif |
91 | printf("Btn: 0x%08x",button); | 91 | printf("Btn: 0x%08x",button); |
@@ -147,7 +147,7 @@ void* main(void) | |||
147 | 147 | ||
148 | show_logo(); | 148 | show_logo(); |
149 | 149 | ||
150 | _backlight_on(); | 150 | backlight_hw_on(); |
151 | 151 | ||
152 | /* Only load the firmware if TCCBOOT is defined - this ensures SDRAM_START is | 152 | /* Only load the firmware if TCCBOOT is defined - this ensures SDRAM_START is |
153 | available for loading the firmware. Otherwise display the debug screen. */ | 153 | available for loading the firmware. Otherwise display the debug screen. */ |
diff --git a/firmware/backlight-sw-fading.c b/firmware/backlight-sw-fading.c index 2aff2f9c27..c336d40458 100644 --- a/firmware/backlight-sw-fading.c +++ b/firmware/backlight-sw-fading.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include "backlight-sw-fading.h" | 28 | #include "backlight-sw-fading.h" |
29 | 29 | ||
30 | /* To adapt a target do: | 30 | /* To adapt a target do: |
31 | * - make sure _backlight_on doesn't set the brightness to something other than | 31 | * - make sure backlight_hw_on doesn't set the brightness to something other than |
32 | * the previous value (lowest brightness in most cases) | 32 | * the previous value (lowest brightness in most cases) |
33 | * add proper #defines for software fading | 33 | * add proper #defines for software fading |
34 | */ | 34 | */ |
@@ -46,7 +46,7 @@ static bool _backlight_fade_up(void) | |||
46 | { | 46 | { |
47 | if (LIKELY(current_brightness < backlight_brightness)) | 47 | if (LIKELY(current_brightness < backlight_brightness)) |
48 | { | 48 | { |
49 | _backlight_set_brightness(++current_brightness); | 49 | backlight_hw_brightness(++current_brightness); |
50 | } | 50 | } |
51 | return(current_brightness >= backlight_brightness); | 51 | return(current_brightness >= backlight_brightness); |
52 | } | 52 | } |
@@ -56,14 +56,14 @@ static bool _backlight_fade_down(void) | |||
56 | { | 56 | { |
57 | if (LIKELY(current_brightness > MIN_BRIGHTNESS_SETTING)) | 57 | if (LIKELY(current_brightness > MIN_BRIGHTNESS_SETTING)) |
58 | { | 58 | { |
59 | _backlight_set_brightness(--current_brightness); | 59 | backlight_hw_brightness(--current_brightness); |
60 | return false; | 60 | return false; |
61 | } | 61 | } |
62 | else | 62 | else |
63 | { | 63 | { |
64 | /* decrement once more, since backlight is off */ | 64 | /* decrement once more, since backlight is off */ |
65 | current_brightness--; | 65 | current_brightness--; |
66 | _backlight_off(); | 66 | backlight_hw_off(); |
67 | return true; | 67 | return true; |
68 | } | 68 | } |
69 | } | 69 | } |
diff --git a/firmware/backlight.c b/firmware/backlight.c index d24fc1342f..d6dbf3eec7 100644 --- a/firmware/backlight.c +++ b/firmware/backlight.c | |||
@@ -126,10 +126,10 @@ static void buttonlight_update_state(void) | |||
126 | if (buttonlight_timer < 0) | 126 | if (buttonlight_timer < 0) |
127 | { | 127 | { |
128 | buttonlight_timer = 0; /* Disable the timeout */ | 128 | buttonlight_timer = 0; /* Disable the timeout */ |
129 | _buttonlight_off(); | 129 | buttonlight_hw_off(); |
130 | } | 130 | } |
131 | else | 131 | else |
132 | _buttonlight_on(); | 132 | buttonlight_hw_on(); |
133 | } | 133 | } |
134 | 134 | ||
135 | /* external interface */ | 135 | /* external interface */ |
@@ -421,7 +421,7 @@ static void backlight_setup_fade_up(void) | |||
421 | if (backlight_fading_state == NOT_FADING) | 421 | if (backlight_fading_state == NOT_FADING) |
422 | { | 422 | { |
423 | /* make sure the backlight is at lowest level */ | 423 | /* make sure the backlight is at lowest level */ |
424 | _backlight_on(); | 424 | backlight_hw_on(); |
425 | } | 425 | } |
426 | backlight_fading_state = FADING_UP; | 426 | backlight_fading_state = FADING_UP; |
427 | } | 427 | } |
@@ -429,8 +429,8 @@ static void backlight_setup_fade_up(void) | |||
429 | { | 429 | { |
430 | backlight_fading_state = NOT_FADING; | 430 | backlight_fading_state = NOT_FADING; |
431 | _backlight_fade_update_state(backlight_brightness); | 431 | _backlight_fade_update_state(backlight_brightness); |
432 | _backlight_on(); | 432 | backlight_hw_on(); |
433 | _backlight_set_brightness(backlight_brightness); | 433 | backlight_hw_brightness(backlight_brightness); |
434 | } | 434 | } |
435 | } | 435 | } |
436 | 436 | ||
@@ -444,11 +444,11 @@ static void backlight_setup_fade_down(void) | |||
444 | { | 444 | { |
445 | backlight_fading_state = NOT_FADING; | 445 | backlight_fading_state = NOT_FADING; |
446 | _backlight_fade_update_state(MIN_BRIGHTNESS_SETTING-1); | 446 | _backlight_fade_update_state(MIN_BRIGHTNESS_SETTING-1); |
447 | _backlight_off(); | 447 | backlight_hw_off(); |
448 | #if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_HW_REG) | 448 | #if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_HW_REG) |
449 | /* write the lowest brightness level to the hardware so that | 449 | /* write the lowest brightness level to the hardware so that |
450 | * fading up is glitch free */ | 450 | * fading up is glitch free */ |
451 | _backlight_set_brightness(MIN_BRIGHTNESS_SETTING); | 451 | backlight_hw_brightness(MIN_BRIGHTNESS_SETTING); |
452 | #endif | 452 | #endif |
453 | #ifdef HAVE_LCD_SLEEP | 453 | #ifdef HAVE_LCD_SLEEP |
454 | backlight_lcd_sleep_countdown(true); | 454 | backlight_lcd_sleep_countdown(true); |
@@ -463,7 +463,7 @@ static inline void do_backlight_off(void) | |||
463 | #if BACKLIGHT_FADE_IN_THREAD | 463 | #if BACKLIGHT_FADE_IN_THREAD |
464 | backlight_setup_fade_down(); | 464 | backlight_setup_fade_down(); |
465 | #else | 465 | #else |
466 | _backlight_off(); | 466 | backlight_hw_off(); |
467 | /* targets that have fading need to start the countdown when done with | 467 | /* targets that have fading need to start the countdown when done with |
468 | * fading */ | 468 | * fading */ |
469 | #ifdef HAVE_LCD_SLEEP | 469 | #ifdef HAVE_LCD_SLEEP |
@@ -500,7 +500,7 @@ static void backlight_update_state(void) | |||
500 | #if BACKLIGHT_FADE_IN_THREAD | 500 | #if BACKLIGHT_FADE_IN_THREAD |
501 | backlight_setup_fade_up(); | 501 | backlight_setup_fade_up(); |
502 | #else | 502 | #else |
503 | _backlight_on(); | 503 | backlight_hw_on(); |
504 | #endif | 504 | #endif |
505 | } | 505 | } |
506 | } | 506 | } |
@@ -514,12 +514,12 @@ static void remote_backlight_update_state(void) | |||
514 | if (timeout < 0) | 514 | if (timeout < 0) |
515 | { | 515 | { |
516 | remote_backlight_timer = 0; /* Disable the timeout */ | 516 | remote_backlight_timer = 0; /* Disable the timeout */ |
517 | _remote_backlight_off(); | 517 | remote_backlight_hw_off(); |
518 | } | 518 | } |
519 | else | 519 | else |
520 | { | 520 | { |
521 | remote_backlight_timer = timeout; | 521 | remote_backlight_timer = timeout; |
522 | _remote_backlight_on(); | 522 | remote_backlight_hw_on(); |
523 | } | 523 | } |
524 | } | 524 | } |
525 | #endif /* HAVE_REMOTE_LCD */ | 525 | #endif /* HAVE_REMOTE_LCD */ |
@@ -596,7 +596,7 @@ void backlight_thread(void) | |||
596 | 596 | ||
597 | case REMOTE_BACKLIGHT_OFF: | 597 | case REMOTE_BACKLIGHT_OFF: |
598 | remote_backlight_timer = 0; /* Disable the timeout */ | 598 | remote_backlight_timer = 0; /* Disable the timeout */ |
599 | _remote_backlight_off(); | 599 | remote_backlight_hw_off(); |
600 | break; | 600 | break; |
601 | #endif /* HAVE_REMOTE_LCD */ | 601 | #endif /* HAVE_REMOTE_LCD */ |
602 | 602 | ||
@@ -611,7 +611,7 @@ void backlight_thread(void) | |||
611 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS | 611 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS |
612 | case BACKLIGHT_BRIGHTNESS_CHANGED: | 612 | case BACKLIGHT_BRIGHTNESS_CHANGED: |
613 | backlight_brightness = (int)ev.data; | 613 | backlight_brightness = (int)ev.data; |
614 | _backlight_set_brightness((int)ev.data); | 614 | backlight_hw_brightness((int)ev.data); |
615 | #if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_SETTING) \ | 615 | #if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_SETTING) \ |
616 | || (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_HW_REG) | 616 | || (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_HW_REG) |
617 | /* receive backlight brightness */ | 617 | /* receive backlight brightness */ |
@@ -632,11 +632,11 @@ void backlight_thread(void) | |||
632 | 632 | ||
633 | case BUTTON_LIGHT_OFF: | 633 | case BUTTON_LIGHT_OFF: |
634 | buttonlight_timer = 0; | 634 | buttonlight_timer = 0; |
635 | _buttonlight_off(); | 635 | buttonlight_hw_off(); |
636 | break; | 636 | break; |
637 | #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS | 637 | #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS |
638 | case BUTTON_LIGHT_BRIGHTNESS_CHANGED: | 638 | case BUTTON_LIGHT_BRIGHTNESS_CHANGED: |
639 | _buttonlight_set_brightness((int)ev.data); | 639 | buttonlight_hw_brightness((int)ev.data); |
640 | break; | 640 | break; |
641 | #endif /* HAVE_BUTTONLIGHT_BRIGHTNESS */ | 641 | #endif /* HAVE_BUTTONLIGHT_BRIGHTNESS */ |
642 | #endif /* HAVE_BUTTON_LIGHT */ | 642 | #endif /* HAVE_BUTTON_LIGHT */ |
@@ -703,7 +703,7 @@ static void backlight_timeout_handler(void) | |||
703 | remote_backlight_timer -= BACKLIGHT_THREAD_TIMEOUT; | 703 | remote_backlight_timer -= BACKLIGHT_THREAD_TIMEOUT; |
704 | if(remote_backlight_timer <= 0) | 704 | if(remote_backlight_timer <= 0) |
705 | { | 705 | { |
706 | _remote_backlight_off(); | 706 | remote_backlight_hw_off(); |
707 | } | 707 | } |
708 | } | 708 | } |
709 | #endif /* HAVE_REMOVE_LCD */ | 709 | #endif /* HAVE_REMOVE_LCD */ |
@@ -713,7 +713,7 @@ static void backlight_timeout_handler(void) | |||
713 | buttonlight_timer -= BACKLIGHT_THREAD_TIMEOUT; | 713 | buttonlight_timer -= BACKLIGHT_THREAD_TIMEOUT; |
714 | if (buttonlight_timer <= 0) | 714 | if (buttonlight_timer <= 0) |
715 | { | 715 | { |
716 | _buttonlight_off(); | 716 | buttonlight_hw_off(); |
717 | } | 717 | } |
718 | } | 718 | } |
719 | #endif /* HAVE_BUTTON_LIGHT */ | 719 | #endif /* HAVE_BUTTON_LIGHT */ |
@@ -723,7 +723,7 @@ void backlight_init(void) | |||
723 | { | 723 | { |
724 | queue_init(&backlight_queue, true); | 724 | queue_init(&backlight_queue, true); |
725 | 725 | ||
726 | if (_backlight_init()) | 726 | if (backlight_hw_init()) |
727 | { | 727 | { |
728 | #if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_PWM) | 728 | #if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_PWM) |
729 | /* If backlight is already on, don't fade in. */ | 729 | /* If backlight is already on, don't fade in. */ |
@@ -962,8 +962,8 @@ void buttonlight_set_brightness(int val) | |||
962 | #if defined(HAVE_BACKLIGHT) && !defined(BACKLIGHT_FULL_INIT) | 962 | #if defined(HAVE_BACKLIGHT) && !defined(BACKLIGHT_FULL_INIT) |
963 | void backlight_init(void) | 963 | void backlight_init(void) |
964 | { | 964 | { |
965 | (void)_backlight_init(); | 965 | (void)backlight_hw_init(); |
966 | _backlight_on(); | 966 | backlight_hw_on(); |
967 | } | 967 | } |
968 | #endif | 968 | #endif |
969 | 969 | ||
diff --git a/firmware/export/backlight.h b/firmware/export/backlight.h index ceeb979573..40efd63e17 100644 --- a/firmware/export/backlight.h +++ b/firmware/export/backlight.h | |||
@@ -65,8 +65,8 @@ void lcd_set_sleep_after_backlight_off(int index); | |||
65 | #endif /* !HAVE_BACKLIGHT */ | 65 | #endif /* !HAVE_BACKLIGHT */ |
66 | 66 | ||
67 | #ifdef HAVE_REMOTE_LCD | 67 | #ifdef HAVE_REMOTE_LCD |
68 | void _remote_backlight_on(void); | 68 | void remote_backlight_hw_on(void); |
69 | void _remote_backlight_off(void); | 69 | void remote_backlight_hw_off(void); |
70 | void remote_backlight_on(void); | 70 | void remote_backlight_on(void); |
71 | void remote_backlight_off(void); | 71 | void remote_backlight_off(void); |
72 | void remote_backlight_set_timeout(int value); | 72 | void remote_backlight_set_timeout(int value); |
diff --git a/firmware/target/arm/as3525/backlight-e200v2-fuze.c b/firmware/target/arm/as3525/backlight-e200v2-fuze.c index 91e1ef4d0c..26602fcee6 100644 --- a/firmware/target/arm/as3525/backlight-e200v2-fuze.c +++ b/firmware/target/arm/as3525/backlight-e200v2-fuze.c | |||
@@ -28,12 +28,12 @@ | |||
28 | 28 | ||
29 | int buttonlight_is_on = 0; | 29 | int buttonlight_is_on = 0; |
30 | 30 | ||
31 | void _backlight_set_brightness(int brightness) | 31 | void backlight_hw_brightness(int brightness) |
32 | { | 32 | { |
33 | ascodec_write(AS3514_DCDC15, brightness); | 33 | ascodec_write(AS3514_DCDC15, brightness); |
34 | } | 34 | } |
35 | 35 | ||
36 | void _backlight_on(void) | 36 | void backlight_hw_on(void) |
37 | { | 37 | { |
38 | #ifdef HAVE_LCD_ENABLE | 38 | #ifdef HAVE_LCD_ENABLE |
39 | lcd_enable(true); /* power on lcd + visible display */ | 39 | lcd_enable(true); /* power on lcd + visible display */ |
@@ -45,7 +45,7 @@ void _backlight_on(void) | |||
45 | #endif | 45 | #endif |
46 | } | 46 | } |
47 | 47 | ||
48 | void _backlight_off(void) | 48 | void backlight_hw_off(void) |
49 | { | 49 | { |
50 | ascodec_write(AS3514_DCDC15, 0x0); | 50 | ascodec_write(AS3514_DCDC15, 0x0); |
51 | #ifdef HAVE_LCD_ENABLE | 51 | #ifdef HAVE_LCD_ENABLE |
@@ -53,7 +53,7 @@ void _backlight_off(void) | |||
53 | #endif | 53 | #endif |
54 | } | 54 | } |
55 | 55 | ||
56 | void _buttonlight_on(void) | 56 | void buttonlight_hw_on(void) |
57 | { | 57 | { |
58 | /* Needed for buttonlight and MicroSD to work at the same time */ | 58 | /* Needed for buttonlight and MicroSD to work at the same time */ |
59 | /* Turn ROD control on, as the OF does */ | 59 | /* Turn ROD control on, as the OF does */ |
@@ -63,7 +63,7 @@ void _buttonlight_on(void) | |||
63 | buttonlight_is_on = 1; | 63 | buttonlight_is_on = 1; |
64 | } | 64 | } |
65 | 65 | ||
66 | void _buttonlight_off(void) | 66 | void buttonlight_hw_off(void) |
67 | { | 67 | { |
68 | /* Needed for buttonlight and MicroSD to work at the same time */ | 68 | /* Needed for buttonlight and MicroSD to work at the same time */ |
69 | /* Turn ROD control off, as the OF does */ | 69 | /* Turn ROD control off, as the OF does */ |
diff --git a/firmware/target/arm/as3525/sansa-c200v2/backlight-c200v2.c b/firmware/target/arm/as3525/sansa-c200v2/backlight-c200v2.c index 1da57de93a..6344eff593 100644 --- a/firmware/target/arm/as3525/sansa-c200v2/backlight-c200v2.c +++ b/firmware/target/arm/as3525/sansa-c200v2/backlight-c200v2.c | |||
@@ -98,7 +98,7 @@ void _backlight_pwm(int on) | |||
98 | } | 98 | } |
99 | } | 99 | } |
100 | 100 | ||
101 | bool _backlight_init(void) | 101 | bool backlight_hw_init(void) |
102 | { | 102 | { |
103 | GPIOA_DIR |= 1<<5; | 103 | GPIOA_DIR |= 1<<5; |
104 | if (c200v2_variant == 1) { | 104 | if (c200v2_variant == 1) { |
@@ -109,14 +109,14 @@ bool _backlight_init(void) | |||
109 | return true; | 109 | return true; |
110 | } | 110 | } |
111 | 111 | ||
112 | void _backlight_set_brightness(int brightness) | 112 | void backlight_hw_brightness(int brightness) |
113 | { | 113 | { |
114 | backlight_level = brightness_table[brightness]; | 114 | backlight_level = brightness_table[brightness]; |
115 | 115 | ||
116 | if (brightness > 0) | 116 | if (brightness > 0) |
117 | _backlight_on(); | 117 | backlight_hw_on(); |
118 | else | 118 | else |
119 | _backlight_off(); | 119 | backlight_hw_off(); |
120 | } | 120 | } |
121 | 121 | ||
122 | static void _pwm_on(void) | 122 | static void _pwm_on(void) |
@@ -130,7 +130,7 @@ static void _pwm_off(void) | |||
130 | _set_timer2_pwm_ratio(0); | 130 | _set_timer2_pwm_ratio(0); |
131 | } | 131 | } |
132 | 132 | ||
133 | void _backlight_on(void) | 133 | void backlight_hw_on(void) |
134 | { | 134 | { |
135 | if (backlight_is_on == 1) { | 135 | if (backlight_is_on == 1) { |
136 | /* Update pwm ratio in case user changed the brightness */ | 136 | /* Update pwm ratio in case user changed the brightness */ |
@@ -146,7 +146,7 @@ void _backlight_on(void) | |||
146 | backlight_is_on = 1; | 146 | backlight_is_on = 1; |
147 | } | 147 | } |
148 | 148 | ||
149 | void _backlight_off(void) | 149 | void backlight_hw_off(void) |
150 | { | 150 | { |
151 | if (backlight_is_on == 0) | 151 | if (backlight_is_on == 0) |
152 | return; | 152 | return; |
@@ -159,7 +159,7 @@ void _backlight_off(void) | |||
159 | #endif | 159 | #endif |
160 | } | 160 | } |
161 | 161 | ||
162 | void _buttonlight_on(void) | 162 | void buttonlight_hw_on(void) |
163 | { | 163 | { |
164 | if (buttonlight_is_on == 1) | 164 | if (buttonlight_is_on == 1) |
165 | return; | 165 | return; |
@@ -169,7 +169,7 @@ void _buttonlight_on(void) | |||
169 | buttonlight_is_on = 1; | 169 | buttonlight_is_on = 1; |
170 | } | 170 | } |
171 | 171 | ||
172 | void _buttonlight_off(void) | 172 | void buttonlight_hw_off(void) |
173 | { | 173 | { |
174 | if (buttonlight_is_on == 0) | 174 | if (buttonlight_is_on == 0) |
175 | return; | 175 | return; |
diff --git a/firmware/target/arm/as3525/sansa-c200v2/backlight-target.h b/firmware/target/arm/as3525/sansa-c200v2/backlight-target.h index 4a098f7f28..a6b07de6bf 100644 --- a/firmware/target/arm/as3525/sansa-c200v2/backlight-target.h +++ b/firmware/target/arm/as3525/sansa-c200v2/backlight-target.h | |||
@@ -23,22 +23,22 @@ | |||
23 | 23 | ||
24 | #include <stdbool.h> | 24 | #include <stdbool.h> |
25 | 25 | ||
26 | bool _backlight_init(void); | 26 | bool backlight_hw_init(void); |
27 | void _backlight_pwm(int on); | 27 | void _backlight_pwm(int on); |
28 | void _backlight_on(void); | 28 | void backlight_hw_on(void); |
29 | void _backlight_off(void); | 29 | void backlight_hw_off(void); |
30 | 30 | ||
31 | static inline void _backlight_panic_on(void) | 31 | static inline void _backlight_panic_on(void) |
32 | { | 32 | { |
33 | _backlight_on(); | 33 | backlight_hw_on(); |
34 | _backlight_pwm(1); | 34 | _backlight_pwm(1); |
35 | } | 35 | } |
36 | 36 | ||
37 | void _backlight_set_brightness(int brightness); | 37 | void backlight_hw_brightness(int brightness); |
38 | int __backlight_is_on(void); | 38 | int __backlight_is_on(void); |
39 | 39 | ||
40 | void _buttonlight_on(void); | 40 | void buttonlight_hw_on(void); |
41 | void _buttonlight_off(void); | 41 | void buttonlight_hw_off(void); |
42 | 42 | ||
43 | /* | 43 | /* |
44 | * FIXME: This may be better off in kernel.h, but... | 44 | * FIXME: This may be better off in kernel.h, but... |
diff --git a/firmware/target/arm/as3525/sansa-clip/backlight-target.h b/firmware/target/arm/as3525/sansa-clip/backlight-target.h index 00c6e5cc44..669f0f5939 100644 --- a/firmware/target/arm/as3525/sansa-clip/backlight-target.h +++ b/firmware/target/arm/as3525/sansa-clip/backlight-target.h | |||
@@ -25,30 +25,30 @@ | |||
25 | #include "lcd.h" | 25 | #include "lcd.h" |
26 | #include "backlight.h" | 26 | #include "backlight.h" |
27 | 27 | ||
28 | static inline void _backlight_on(void) | 28 | static inline void backlight_hw_on(void) |
29 | { | 29 | { |
30 | lcd_enable(true); | 30 | lcd_enable(true); |
31 | } | 31 | } |
32 | 32 | ||
33 | static inline void _backlight_off(void) | 33 | static inline void backlight_hw_off(void) |
34 | { | 34 | { |
35 | lcd_enable(false); | 35 | lcd_enable(false); |
36 | } | 36 | } |
37 | 37 | ||
38 | #define _backlight_panic_on() _backlight_on() | 38 | #define _backlight_panic_on() backlight_hw_on() |
39 | 39 | ||
40 | static inline bool _backlight_init(void) | 40 | static inline bool backlight_hw_init(void) |
41 | { | 41 | { |
42 | GPIOD_DIR |= (1<<7); /* for button light */ | 42 | GPIOD_DIR |= (1<<7); /* for button light */ |
43 | return true; | 43 | return true; |
44 | } | 44 | } |
45 | 45 | ||
46 | static inline void _buttonlight_on(void) | 46 | static inline void buttonlight_hw_on(void) |
47 | { | 47 | { |
48 | GPIOD_PIN(7) = (1<<7); | 48 | GPIOD_PIN(7) = (1<<7); |
49 | } | 49 | } |
50 | 50 | ||
51 | static inline void _buttonlight_off(void) | 51 | static inline void buttonlight_hw_off(void) |
52 | { | 52 | { |
53 | GPIOD_PIN(7) = 0; | 53 | GPIOD_PIN(7) = 0; |
54 | } | 54 | } |
diff --git a/firmware/target/arm/as3525/sansa-clipplus/backlight-clip.c b/firmware/target/arm/as3525/sansa-clipplus/backlight-clip.c index e3b518b3f8..76df12c948 100644 --- a/firmware/target/arm/as3525/sansa-clipplus/backlight-clip.c +++ b/firmware/target/arm/as3525/sansa-clipplus/backlight-clip.c | |||
@@ -24,13 +24,13 @@ | |||
24 | #include "as3525v2.h" | 24 | #include "as3525v2.h" |
25 | #include "ascodec.h" | 25 | #include "ascodec.h" |
26 | 26 | ||
27 | void _backlight_on(void) | 27 | void backlight_hw_on(void) |
28 | { | 28 | { |
29 | ascodec_write_pmu(AS3543_BACKLIGHT, 1, 0x90); | 29 | ascodec_write_pmu(AS3543_BACKLIGHT, 1, 0x90); |
30 | lcd_enable(true); | 30 | lcd_enable(true); |
31 | } | 31 | } |
32 | 32 | ||
33 | void _backlight_off(void) | 33 | void backlight_hw_off(void) |
34 | { | 34 | { |
35 | lcd_enable(false); | 35 | lcd_enable(false); |
36 | ascodec_write_pmu(AS3543_BACKLIGHT, 1, 0x00); | 36 | ascodec_write_pmu(AS3543_BACKLIGHT, 1, 0x00); |
diff --git a/firmware/target/arm/as3525/sansa-clipplus/backlight-target.h b/firmware/target/arm/as3525/sansa-clipplus/backlight-target.h index 3dd9240bd8..9e8ff1ce8c 100644 --- a/firmware/target/arm/as3525/sansa-clipplus/backlight-target.h +++ b/firmware/target/arm/as3525/sansa-clipplus/backlight-target.h | |||
@@ -21,10 +21,10 @@ | |||
21 | #ifndef BACKLIGHT_TARGET_H | 21 | #ifndef BACKLIGHT_TARGET_H |
22 | #define BACKLIGHT_TARGET_H | 22 | #define BACKLIGHT_TARGET_H |
23 | 23 | ||
24 | #define _backlight_init() true | 24 | #define backlight_hw_init() true |
25 | 25 | ||
26 | void _backlight_on(void); | 26 | void backlight_hw_on(void); |
27 | void _backlight_off(void); | 27 | void backlight_hw_off(void); |
28 | #define _backlight_panic_on() _backlight_on() | 28 | #define _backlight_panic_on() backlight_hw_on() |
29 | 29 | ||
30 | #endif | 30 | #endif |
diff --git a/firmware/target/arm/as3525/sansa-clipv2/backlight-clipv2.c b/firmware/target/arm/as3525/sansa-clipv2/backlight-clipv2.c index f4927ba5bf..65f69e8bcd 100644 --- a/firmware/target/arm/as3525/sansa-clipv2/backlight-clipv2.c +++ b/firmware/target/arm/as3525/sansa-clipv2/backlight-clipv2.c | |||
@@ -24,13 +24,13 @@ | |||
24 | #include "as3525v2.h" | 24 | #include "as3525v2.h" |
25 | #include "ascodec.h" | 25 | #include "ascodec.h" |
26 | 26 | ||
27 | void _backlight_on(void) | 27 | void backlight_hw_on(void) |
28 | { | 28 | { |
29 | ascodec_write_pmu(AS3543_BACKLIGHT, 1, 0x90); | 29 | ascodec_write_pmu(AS3543_BACKLIGHT, 1, 0x90); |
30 | lcd_enable(true); | 30 | lcd_enable(true); |
31 | } | 31 | } |
32 | 32 | ||
33 | void _backlight_off(void) | 33 | void backlight_hw_off(void) |
34 | { | 34 | { |
35 | lcd_enable(false); | 35 | lcd_enable(false); |
36 | ascodec_write_pmu(AS3543_BACKLIGHT, 1, 0x0); | 36 | ascodec_write_pmu(AS3543_BACKLIGHT, 1, 0x0); |
diff --git a/firmware/target/arm/as3525/sansa-clipv2/backlight-target.h b/firmware/target/arm/as3525/sansa-clipv2/backlight-target.h index b2da63dbff..800b26d7fa 100644 --- a/firmware/target/arm/as3525/sansa-clipv2/backlight-target.h +++ b/firmware/target/arm/as3525/sansa-clipv2/backlight-target.h | |||
@@ -24,22 +24,22 @@ | |||
24 | #include <stdbool.h> | 24 | #include <stdbool.h> |
25 | #include "cpu.h" | 25 | #include "cpu.h" |
26 | 26 | ||
27 | void _backlight_on(void); | 27 | void backlight_hw_on(void); |
28 | void _backlight_off(void); | 28 | void backlight_hw_off(void); |
29 | #define _backlight_panic_on() _backlight_on() | 29 | #define _backlight_panic_on() backlight_hw_on() |
30 | 30 | ||
31 | static inline bool _backlight_init(void) | 31 | static inline bool backlight_hw_init(void) |
32 | { | 32 | { |
33 | GPIOA_DIR |= 1<<5; /* for button light */ | 33 | GPIOA_DIR |= 1<<5; /* for button light */ |
34 | return true; | 34 | return true; |
35 | } | 35 | } |
36 | 36 | ||
37 | static inline void _buttonlight_on(void) | 37 | static inline void buttonlight_hw_on(void) |
38 | { | 38 | { |
39 | GPIOA_PIN(5) = 1<<5; | 39 | GPIOA_PIN(5) = 1<<5; |
40 | } | 40 | } |
41 | 41 | ||
42 | static inline void _buttonlight_off(void) | 42 | static inline void buttonlight_hw_off(void) |
43 | { | 43 | { |
44 | GPIOA_PIN(5) = 0; | 44 | GPIOA_PIN(5) = 0; |
45 | } | 45 | } |
diff --git a/firmware/target/arm/as3525/sansa-clipzip/backlight-clipzip.c b/firmware/target/arm/as3525/sansa-clipzip/backlight-clipzip.c index a47941bbd7..9fde68dd8a 100644 --- a/firmware/target/arm/as3525/sansa-clipzip/backlight-clipzip.c +++ b/firmware/target/arm/as3525/sansa-clipzip/backlight-clipzip.c | |||
@@ -27,12 +27,12 @@ | |||
27 | #include "ascodec.h" | 27 | #include "ascodec.h" |
28 | #include "lcd-target.h" | 28 | #include "lcd-target.h" |
29 | 29 | ||
30 | bool _backlight_init() | 30 | bool backlight_hw_init() |
31 | { | 31 | { |
32 | return true; | 32 | return true; |
33 | } | 33 | } |
34 | 34 | ||
35 | void _backlight_on(void) | 35 | void backlight_hw_on(void) |
36 | { | 36 | { |
37 | /* GPIO B1 controls backlight */ | 37 | /* GPIO B1 controls backlight */ |
38 | GPIOB_DIR |= (1 << 1); | 38 | GPIOB_DIR |= (1 << 1); |
@@ -43,7 +43,7 @@ void _backlight_on(void) | |||
43 | #endif | 43 | #endif |
44 | } | 44 | } |
45 | 45 | ||
46 | void _backlight_off(void) | 46 | void backlight_hw_off(void) |
47 | { | 47 | { |
48 | #ifdef HAVE_LCD_ENABLE | 48 | #ifdef HAVE_LCD_ENABLE |
49 | lcd_enable(false); | 49 | lcd_enable(false); |
@@ -52,7 +52,7 @@ void _backlight_off(void) | |||
52 | GPIOB_PIN(1) = 0; | 52 | GPIOB_PIN(1) = 0; |
53 | } | 53 | } |
54 | 54 | ||
55 | void _backlight_set_brightness(int brightness) | 55 | void backlight_hw_brightness(int brightness) |
56 | { | 56 | { |
57 | oled_brightness(brightness); | 57 | oled_brightness(brightness); |
58 | } | 58 | } |
diff --git a/firmware/target/arm/as3525/sansa-clipzip/backlight-target.h b/firmware/target/arm/as3525/sansa-clipzip/backlight-target.h index bf58973ab6..00b925c22b 100644 --- a/firmware/target/arm/as3525/sansa-clipzip/backlight-target.h +++ b/firmware/target/arm/as3525/sansa-clipzip/backlight-target.h | |||
@@ -21,11 +21,11 @@ | |||
21 | #ifndef BACKLIGHT_TARGET_H | 21 | #ifndef BACKLIGHT_TARGET_H |
22 | #define BACKLIGHT_TARGET_H | 22 | #define BACKLIGHT_TARGET_H |
23 | 23 | ||
24 | bool _backlight_init(void); | 24 | bool backlight_hw_init(void); |
25 | void _backlight_on(void); | 25 | void backlight_hw_on(void); |
26 | void _backlight_off(void); | 26 | void backlight_hw_off(void); |
27 | void _backlight_set_brightness(int brightness); | 27 | void backlight_hw_brightness(int brightness); |
28 | 28 | ||
29 | #define _backlight_panic_on() _backlight_on() | 29 | #define _backlight_panic_on() backlight_hw_on() |
30 | 30 | ||
31 | #endif | 31 | #endif |
diff --git a/firmware/target/arm/as3525/sansa-e200v2/backlight-target.h b/firmware/target/arm/as3525/sansa-e200v2/backlight-target.h index 227a154197..0baaf2441a 100644 --- a/firmware/target/arm/as3525/sansa-e200v2/backlight-target.h +++ b/firmware/target/arm/as3525/sansa-e200v2/backlight-target.h | |||
@@ -21,13 +21,13 @@ | |||
21 | #ifndef BACKLIGHT_TARGET_H | 21 | #ifndef BACKLIGHT_TARGET_H |
22 | #define BACKLIGHT_TARGET_H | 22 | #define BACKLIGHT_TARGET_H |
23 | 23 | ||
24 | #define _backlight_init() true | 24 | #define backlight_hw_init() true |
25 | void _backlight_on(void); | 25 | void backlight_hw_on(void); |
26 | void _backlight_off(void); | 26 | void backlight_hw_off(void); |
27 | #define _backlight_panic_on() _backlight_on() | 27 | #define _backlight_panic_on() backlight_hw_on() |
28 | void _backlight_set_brightness(int brightness); | 28 | void backlight_hw_brightness(int brightness); |
29 | int __backlight_is_on(void); | 29 | int __backlight_is_on(void); |
30 | 30 | ||
31 | void _buttonlight_on(void); | 31 | void buttonlight_hw_on(void); |
32 | void _buttonlight_off(void); | 32 | void buttonlight_hw_off(void); |
33 | #endif | 33 | #endif |
diff --git a/firmware/target/arm/as3525/sansa-fuze/backlight-target.h b/firmware/target/arm/as3525/sansa-fuze/backlight-target.h index df6df573b0..c4e95e9c4a 100644 --- a/firmware/target/arm/as3525/sansa-fuze/backlight-target.h +++ b/firmware/target/arm/as3525/sansa-fuze/backlight-target.h | |||
@@ -21,13 +21,13 @@ | |||
21 | #ifndef BACKLIGHT_TARGET_H | 21 | #ifndef BACKLIGHT_TARGET_H |
22 | #define BACKLIGHT_TARGET_H | 22 | #define BACKLIGHT_TARGET_H |
23 | 23 | ||
24 | #define _backlight_init() true | 24 | #define backlight_hw_init() true |
25 | void _backlight_on(void); | 25 | void backlight_hw_on(void); |
26 | void _backlight_off(void); | 26 | void backlight_hw_off(void); |
27 | #define _backlight_panic_on() _backlight_on() | 27 | #define _backlight_panic_on() backlight_hw_on() |
28 | void _backlight_set_brightness(int brightness); | 28 | void backlight_hw_brightness(int brightness); |
29 | #ifdef HAVE_BUTTON_LIGHT | 29 | #ifdef HAVE_BUTTON_LIGHT |
30 | void _buttonlight_on(void); | 30 | void buttonlight_hw_on(void); |
31 | void _buttonlight_off(void); | 31 | void buttonlight_hw_off(void); |
32 | #endif | 32 | #endif |
33 | #endif | 33 | #endif |
diff --git a/firmware/target/arm/as3525/sansa-fuzev2/backlight-fuzev2.c b/firmware/target/arm/as3525/sansa-fuzev2/backlight-fuzev2.c index a01b168b71..71f0c1a3f2 100644 --- a/firmware/target/arm/as3525/sansa-fuzev2/backlight-fuzev2.c +++ b/firmware/target/arm/as3525/sansa-fuzev2/backlight-fuzev2.c | |||
@@ -26,12 +26,12 @@ | |||
26 | #include "ascodec.h" | 26 | #include "ascodec.h" |
27 | #include "as3514.h" | 27 | #include "as3514.h" |
28 | 28 | ||
29 | void _backlight_set_brightness(int brightness) | 29 | void backlight_hw_brightness(int brightness) |
30 | { | 30 | { |
31 | ascodec_write_pmu(AS3543_BACKLIGHT, 2, brightness * 10); | 31 | ascodec_write_pmu(AS3543_BACKLIGHT, 2, brightness * 10); |
32 | } | 32 | } |
33 | 33 | ||
34 | bool _backlight_init(void) | 34 | bool backlight_hw_init(void) |
35 | { | 35 | { |
36 | ascodec_write_pmu(AS3543_BACKLIGHT, 1, 0x80); | 36 | ascodec_write_pmu(AS3543_BACKLIGHT, 1, 0x80); |
37 | ascodec_write_pmu(AS3543_BACKLIGHT, 2, backlight_brightness * 10); | 37 | ascodec_write_pmu(AS3543_BACKLIGHT, 2, backlight_brightness * 10); |
@@ -49,7 +49,7 @@ bool _backlight_init(void) | |||
49 | return true; | 49 | return true; |
50 | } | 50 | } |
51 | 51 | ||
52 | void _backlight_on(void) | 52 | void backlight_hw_on(void) |
53 | { | 53 | { |
54 | #ifdef HAVE_LCD_ENABLE | 54 | #ifdef HAVE_LCD_ENABLE |
55 | lcd_enable(true); /* power on lcd + visible display */ | 55 | lcd_enable(true); /* power on lcd + visible display */ |
@@ -57,7 +57,7 @@ void _backlight_on(void) | |||
57 | ascodec_write_pmu(AS3543_BACKLIGHT, 1, 0x80); | 57 | ascodec_write_pmu(AS3543_BACKLIGHT, 1, 0x80); |
58 | } | 58 | } |
59 | 59 | ||
60 | void _backlight_off(void) | 60 | void backlight_hw_off(void) |
61 | { | 61 | { |
62 | ascodec_write_pmu(AS3543_BACKLIGHT, 1, 0x0); | 62 | ascodec_write_pmu(AS3543_BACKLIGHT, 1, 0x0); |
63 | #ifdef HAVE_LCD_ENABLE | 63 | #ifdef HAVE_LCD_ENABLE |
@@ -65,7 +65,7 @@ void _backlight_off(void) | |||
65 | #endif | 65 | #endif |
66 | } | 66 | } |
67 | 67 | ||
68 | void _buttonlight_on(void) | 68 | void buttonlight_hw_on(void) |
69 | { | 69 | { |
70 | if (amsv2_variant == 0) | 70 | if (amsv2_variant == 0) |
71 | { | 71 | { |
@@ -77,7 +77,7 @@ void _buttonlight_on(void) | |||
77 | } | 77 | } |
78 | } | 78 | } |
79 | 79 | ||
80 | void _buttonlight_off(void) | 80 | void buttonlight_hw_off(void) |
81 | { | 81 | { |
82 | if (amsv2_variant == 0) | 82 | if (amsv2_variant == 0) |
83 | { | 83 | { |
diff --git a/firmware/target/arm/as3525/sansa-fuzev2/backlight-target.h b/firmware/target/arm/as3525/sansa-fuzev2/backlight-target.h index f9d7005f79..4138ef7868 100644 --- a/firmware/target/arm/as3525/sansa-fuzev2/backlight-target.h +++ b/firmware/target/arm/as3525/sansa-fuzev2/backlight-target.h | |||
@@ -25,13 +25,13 @@ | |||
25 | #include "config.h" | 25 | #include "config.h" |
26 | #include "ascodec.h" | 26 | #include "ascodec.h" |
27 | 27 | ||
28 | bool _backlight_init(void); | 28 | bool backlight_hw_init(void); |
29 | void _backlight_on(void); | 29 | void backlight_hw_on(void); |
30 | void _backlight_off(void); | 30 | void backlight_hw_off(void); |
31 | #define _backlight_panic_on() _backlight_on() | 31 | #define _backlight_panic_on() backlight_hw_on() |
32 | void _backlight_set_brightness(int brightness); | 32 | void backlight_hw_brightness(int brightness); |
33 | #ifdef HAVE_BUTTON_LIGHT | 33 | #ifdef HAVE_BUTTON_LIGHT |
34 | void _buttonlight_on(void); | 34 | void buttonlight_hw_on(void); |
35 | void _buttonlight_off(void); | 35 | void buttonlight_hw_off(void); |
36 | #endif | 36 | #endif |
37 | #endif | 37 | #endif |
diff --git a/firmware/target/arm/as3525/sansa-m200v4/backlight-target.h b/firmware/target/arm/as3525/sansa-m200v4/backlight-target.h index b5560bd037..f3ef1095e6 100644 --- a/firmware/target/arm/as3525/sansa-m200v4/backlight-target.h +++ b/firmware/target/arm/as3525/sansa-m200v4/backlight-target.h | |||
@@ -21,22 +21,22 @@ | |||
21 | #ifndef BACKLIGHT_TARGET_H | 21 | #ifndef BACKLIGHT_TARGET_H |
22 | #define BACKLIGHT_TARGET_H | 22 | #define BACKLIGHT_TARGET_H |
23 | 23 | ||
24 | static inline bool _backlight_init(void) | 24 | static inline bool backlight_hw_init(void) |
25 | { | 25 | { |
26 | GPIOD_DIR |= (1<<1); | 26 | GPIOD_DIR |= (1<<1); |
27 | return true; | 27 | return true; |
28 | } | 28 | } |
29 | 29 | ||
30 | static inline void _backlight_on(void) | 30 | static inline void backlight_hw_on(void) |
31 | { | 31 | { |
32 | GPIOD_PIN(1) = (1<<1); | 32 | GPIOD_PIN(1) = (1<<1); |
33 | } | 33 | } |
34 | 34 | ||
35 | static inline void _backlight_off(void) | 35 | static inline void backlight_hw_off(void) |
36 | { | 36 | { |
37 | GPIOD_PIN(1) = 0x00; | 37 | GPIOD_PIN(1) = 0x00; |
38 | } | 38 | } |
39 | 39 | ||
40 | #define _backlight_panic_on() _backlight_on() | 40 | #define _backlight_panic_on() backlight_hw_on() |
41 | 41 | ||
42 | #endif | 42 | #endif |
diff --git a/firmware/target/arm/as3525/sd-as3525.c b/firmware/target/arm/as3525/sd-as3525.c index ead40eac3c..4530d5d763 100644 --- a/firmware/target/arm/as3525/sd-as3525.c +++ b/firmware/target/arm/as3525/sd-as3525.c | |||
@@ -969,7 +969,7 @@ void sd_enable(bool on) | |||
969 | if (buttonlight_is_on) | 969 | if (buttonlight_is_on) |
970 | GPIOD_DIR &= ~(1<<7); | 970 | GPIOD_DIR &= ~(1<<7); |
971 | else | 971 | else |
972 | _buttonlight_off(); | 972 | buttonlight_hw_off(); |
973 | #endif | 973 | #endif |
974 | 974 | ||
975 | #if defined(HAVE_HOTSWAP) && defined (HAVE_ADJUSTABLE_CPU_VOLTAGE) | 975 | #if defined(HAVE_HOTSWAP) && defined (HAVE_ADJUSTABLE_CPU_VOLTAGE) |
@@ -993,7 +993,7 @@ void sd_enable(bool on) | |||
993 | #if defined(HAVE_BUTTON_LIGHT) && defined(HAVE_MULTIDRIVE) | 993 | #if defined(HAVE_BUTTON_LIGHT) && defined(HAVE_MULTIDRIVE) |
994 | bitmod32(&CCU_IO, 0<<2, 3<<2); /* XPD is general purpose IO (b3:2 = 00) */ | 994 | bitmod32(&CCU_IO, 0<<2, 3<<2); /* XPD is general purpose IO (b3:2 = 00) */ |
995 | if (buttonlight_is_on) | 995 | if (buttonlight_is_on) |
996 | _buttonlight_on(); | 996 | buttonlight_hw_on(); |
997 | #endif | 997 | #endif |
998 | } | 998 | } |
999 | } | 999 | } |
diff --git a/firmware/target/arm/as3525/system-as3525.c b/firmware/target/arm/as3525/system-as3525.c index f128ef68be..51b6755601 100644 --- a/firmware/target/arm/as3525/system-as3525.c +++ b/firmware/target/arm/as3525/system-as3525.c | |||
@@ -360,7 +360,7 @@ void system_init(void) | |||
360 | 360 | ||
361 | void system_reboot(void) | 361 | void system_reboot(void) |
362 | { | 362 | { |
363 | _backlight_off(); | 363 | backlight_hw_off(); |
364 | 364 | ||
365 | disable_irq(); | 365 | disable_irq(); |
366 | 366 | ||
diff --git a/firmware/target/arm/at91sam/lyre_proto1/backlight-lyre_proto1.c b/firmware/target/arm/at91sam/lyre_proto1/backlight-lyre_proto1.c index fabf8aa041..b60449417a 100644 --- a/firmware/target/arm/at91sam/lyre_proto1/backlight-lyre_proto1.c +++ b/firmware/target/arm/at91sam/lyre_proto1/backlight-lyre_proto1.c | |||
@@ -19,27 +19,27 @@ | |||
19 | * | 19 | * |
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | 21 | ||
22 | void _backlight_set_brightness(int brightness) | 22 | void backlight_hw_brightness(int brightness) |
23 | { | 23 | { |
24 | (void)brightness; | 24 | (void)brightness; |
25 | } | 25 | } |
26 | 26 | ||
27 | void _backlight_on(void) | 27 | void backlight_hw_on(void) |
28 | { | 28 | { |
29 | 29 | ||
30 | } | 30 | } |
31 | 31 | ||
32 | void _backlight_off(void) | 32 | void backlight_hw_off(void) |
33 | { | 33 | { |
34 | 34 | ||
35 | } | 35 | } |
36 | 36 | ||
37 | void _buttonlight_on(void) | 37 | void buttonlight_hw_on(void) |
38 | { | 38 | { |
39 | 39 | ||
40 | } | 40 | } |
41 | 41 | ||
42 | void _buttonlight_off(void) | 42 | void buttonlight_hw_off(void) |
43 | { | 43 | { |
44 | 44 | ||
45 | } | 45 | } |
diff --git a/firmware/target/arm/imx233/creative-zen/backlight-target.h b/firmware/target/arm/imx233/creative-zen/backlight-target.h index 78a0a72d85..60a2fbe746 100644 --- a/firmware/target/arm/imx233/creative-zen/backlight-target.h +++ b/firmware/target/arm/imx233/creative-zen/backlight-target.h | |||
@@ -21,9 +21,9 @@ | |||
21 | #ifndef BACKLIGHT_TARGET_H | 21 | #ifndef BACKLIGHT_TARGET_H |
22 | #define BACKLIGHT_TARGET_H | 22 | #define BACKLIGHT_TARGET_H |
23 | 23 | ||
24 | bool _backlight_init(void); | 24 | bool backlight_hw_init(void); |
25 | void _backlight_on(void); | 25 | void backlight_hw_on(void); |
26 | void _backlight_off(void); | 26 | void backlight_hw_off(void); |
27 | void _backlight_set_brightness(int brightness); | 27 | void backlight_hw_brightness(int brightness); |
28 | 28 | ||
29 | #endif /* BACKLIGHT_TARGET_H */ | 29 | #endif /* BACKLIGHT_TARGET_H */ |
diff --git a/firmware/target/arm/imx233/creative-zen/backlight-zen.c b/firmware/target/arm/imx233/creative-zen/backlight-zen.c index 6d162817c8..ef2ab615a5 100644 --- a/firmware/target/arm/imx233/creative-zen/backlight-zen.c +++ b/firmware/target/arm/imx233/creative-zen/backlight-zen.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include "pinctrl-imx233.h" | 28 | #include "pinctrl-imx233.h" |
29 | #include "pwm-imx233.h" | 29 | #include "pwm-imx233.h" |
30 | 30 | ||
31 | void _backlight_set_brightness(int level) | 31 | void backlight_hw_brightness(int level) |
32 | { | 32 | { |
33 | #if defined(CREATIVE_ZENXFISTYLE) | 33 | #if defined(CREATIVE_ZENXFISTYLE) |
34 | imx233_pwm_setup_simple(4, 24000, level); | 34 | imx233_pwm_setup_simple(4, 24000, level); |
@@ -49,7 +49,7 @@ void _backlight_set_brightness(int level) | |||
49 | #endif | 49 | #endif |
50 | } | 50 | } |
51 | 51 | ||
52 | bool _backlight_init(void) | 52 | bool backlight_hw_init(void) |
53 | { | 53 | { |
54 | #if !defined(CREATIVE_ZENV) && !defined(CREATIVE_ZENXFISTYLE) | 54 | #if !defined(CREATIVE_ZENV) && !defined(CREATIVE_ZENXFISTYLE) |
55 | imx233_pinctrl_acquire(1, 12, "backlight_enable"); | 55 | imx233_pinctrl_acquire(1, 12, "backlight_enable"); |
@@ -60,19 +60,19 @@ bool _backlight_init(void) | |||
60 | return true; | 60 | return true; |
61 | } | 61 | } |
62 | 62 | ||
63 | void _backlight_on(void) | 63 | void backlight_hw_on(void) |
64 | { | 64 | { |
65 | #ifdef HAVE_LCD_ENABLE | 65 | #ifdef HAVE_LCD_ENABLE |
66 | lcd_enable(true); /* power on lcd + visible display */ | 66 | lcd_enable(true); /* power on lcd + visible display */ |
67 | #endif | 67 | #endif |
68 | /* restore the previous backlight level */ | 68 | /* restore the previous backlight level */ |
69 | _backlight_set_brightness(backlight_brightness); | 69 | backlight_hw_brightness(backlight_brightness); |
70 | } | 70 | } |
71 | 71 | ||
72 | void _backlight_off(void) | 72 | void backlight_hw_off(void) |
73 | { | 73 | { |
74 | /* there is no real on/off but we can set to 0 brightness */ | 74 | /* there is no real on/off but we can set to 0 brightness */ |
75 | _backlight_set_brightness(0); | 75 | backlight_hw_brightness(0); |
76 | #ifdef HAVE_LCD_ENABLE | 76 | #ifdef HAVE_LCD_ENABLE |
77 | lcd_enable(false); /* power off visible display */ | 77 | lcd_enable(false); /* power off visible display */ |
78 | #endif | 78 | #endif |
diff --git a/firmware/target/arm/imx233/creative-zenxfi2/backlight-target.h b/firmware/target/arm/imx233/creative-zenxfi2/backlight-target.h index e3766965d8..483272f804 100644 --- a/firmware/target/arm/imx233/creative-zenxfi2/backlight-target.h +++ b/firmware/target/arm/imx233/creative-zenxfi2/backlight-target.h | |||
@@ -21,9 +21,9 @@ | |||
21 | #ifndef BACKLIGHT_TARGET_H | 21 | #ifndef BACKLIGHT_TARGET_H |
22 | #define BACKLIGHT_TARGET_H | 22 | #define BACKLIGHT_TARGET_H |
23 | 23 | ||
24 | bool _backlight_init(void); | 24 | bool backlight_hw_init(void); |
25 | void _backlight_on(void); | 25 | void backlight_hw_on(void); |
26 | void _backlight_off(void); | 26 | void backlight_hw_off(void); |
27 | void _backlight_set_brightness(int brightness); | 27 | void backlight_hw_brightness(int brightness); |
28 | 28 | ||
29 | #endif /* BACKLIGHT_TARGET_H */ | 29 | #endif /* BACKLIGHT_TARGET_H */ |
diff --git a/firmware/target/arm/imx233/creative-zenxfi2/backlight-zenxfi2.c b/firmware/target/arm/imx233/creative-zenxfi2/backlight-zenxfi2.c index b01dc36063..02e7a0f77e 100644 --- a/firmware/target/arm/imx233/creative-zenxfi2/backlight-zenxfi2.c +++ b/firmware/target/arm/imx233/creative-zenxfi2/backlight-zenxfi2.c | |||
@@ -26,19 +26,19 @@ | |||
26 | #include "backlight-target.h" | 26 | #include "backlight-target.h" |
27 | #include "pwm-imx233.h" | 27 | #include "pwm-imx233.h" |
28 | 28 | ||
29 | void _backlight_set_brightness(int brightness) | 29 | void backlight_hw_brightness(int brightness) |
30 | { | 30 | { |
31 | imx233_pwm_setup_simple(4, 24000, brightness); | 31 | imx233_pwm_setup_simple(4, 24000, brightness); |
32 | imx233_pwm_enable(4, true); | 32 | imx233_pwm_enable(4, true); |
33 | } | 33 | } |
34 | 34 | ||
35 | bool _backlight_init(void) | 35 | bool backlight_hw_init(void) |
36 | { | 36 | { |
37 | _backlight_set_brightness(DEFAULT_BRIGHTNESS_SETTING); | 37 | backlight_hw_brightness(DEFAULT_BRIGHTNESS_SETTING); |
38 | return true; | 38 | return true; |
39 | } | 39 | } |
40 | 40 | ||
41 | void _backlight_on(void) | 41 | void backlight_hw_on(void) |
42 | { | 42 | { |
43 | #ifdef HAVE_LCD_ENABLE | 43 | #ifdef HAVE_LCD_ENABLE |
44 | lcd_enable(true); /* power on lcd + visible display */ | 44 | lcd_enable(true); /* power on lcd + visible display */ |
@@ -46,10 +46,10 @@ void _backlight_on(void) | |||
46 | /* don't do anything special, the core will set the brightness */ | 46 | /* don't do anything special, the core will set the brightness */ |
47 | } | 47 | } |
48 | 48 | ||
49 | void _backlight_off(void) | 49 | void backlight_hw_off(void) |
50 | { | 50 | { |
51 | /* there is no real on/off but we can set to 0 brightness */ | 51 | /* there is no real on/off but we can set to 0 brightness */ |
52 | _backlight_set_brightness(0); | 52 | backlight_hw_brightness(0); |
53 | #ifdef HAVE_LCD_ENABLE | 53 | #ifdef HAVE_LCD_ENABLE |
54 | lcd_enable(false); /* power off visible display */ | 54 | lcd_enable(false); /* power off visible display */ |
55 | #endif | 55 | #endif |
diff --git a/firmware/target/arm/imx233/creative-zenxfi3/backlight-target.h b/firmware/target/arm/imx233/creative-zenxfi3/backlight-target.h index c7508c87a3..edc67ba816 100644 --- a/firmware/target/arm/imx233/creative-zenxfi3/backlight-target.h +++ b/firmware/target/arm/imx233/creative-zenxfi3/backlight-target.h | |||
@@ -21,13 +21,13 @@ | |||
21 | #ifndef BACKLIGHT_TARGET_H | 21 | #ifndef BACKLIGHT_TARGET_H |
22 | #define BACKLIGHT_TARGET_H | 22 | #define BACKLIGHT_TARGET_H |
23 | 23 | ||
24 | bool _backlight_init(void); | 24 | bool backlight_hw_init(void); |
25 | void _backlight_on(void); | 25 | void backlight_hw_on(void); |
26 | void _backlight_off(void); | 26 | void backlight_hw_off(void); |
27 | void _backlight_set_brightness(int brightness); | 27 | void backlight_hw_brightness(int brightness); |
28 | 28 | ||
29 | void _buttonlight_on(void); | 29 | void buttonlight_hw_on(void); |
30 | void _buttonlight_off(void); | 30 | void buttonlight_hw_off(void); |
31 | void _buttonlight_set_brightness(int brightness); | 31 | void buttonlight_hw_brightness(int brightness); |
32 | 32 | ||
33 | #endif /* BACKLIGHT_TARGET_H */ | 33 | #endif /* BACKLIGHT_TARGET_H */ |
diff --git a/firmware/target/arm/imx233/creative-zenxfi3/backlight-zenxfi3.c b/firmware/target/arm/imx233/creative-zenxfi3/backlight-zenxfi3.c index 7013696642..2b77a4d7ac 100644 --- a/firmware/target/arm/imx233/creative-zenxfi3/backlight-zenxfi3.c +++ b/firmware/target/arm/imx233/creative-zenxfi3/backlight-zenxfi3.c | |||
@@ -27,19 +27,19 @@ | |||
27 | #include "pwm-imx233.h" | 27 | #include "pwm-imx233.h" |
28 | #include "mpr121.h" | 28 | #include "mpr121.h" |
29 | 29 | ||
30 | void _backlight_set_brightness(int brightness) | 30 | void backlight_hw_brightness(int brightness) |
31 | { | 31 | { |
32 | imx233_pwm_setup_simple(2, 24000, brightness); | 32 | imx233_pwm_setup_simple(2, 24000, brightness); |
33 | imx233_pwm_enable(2, true); | 33 | imx233_pwm_enable(2, true); |
34 | } | 34 | } |
35 | 35 | ||
36 | bool _backlight_init(void) | 36 | bool backlight_hw_init(void) |
37 | { | 37 | { |
38 | _backlight_set_brightness(DEFAULT_BRIGHTNESS_SETTING); | 38 | backlight_hw_brightness(DEFAULT_BRIGHTNESS_SETTING); |
39 | return true; | 39 | return true; |
40 | } | 40 | } |
41 | 41 | ||
42 | void _backlight_on(void) | 42 | void backlight_hw_on(void) |
43 | { | 43 | { |
44 | #ifdef HAVE_LCD_ENABLE | 44 | #ifdef HAVE_LCD_ENABLE |
45 | lcd_enable(true); /* power on lcd + visible display */ | 45 | lcd_enable(true); /* power on lcd + visible display */ |
@@ -47,29 +47,29 @@ void _backlight_on(void) | |||
47 | /* don't do anything special, the core will set the brightness */ | 47 | /* don't do anything special, the core will set the brightness */ |
48 | } | 48 | } |
49 | 49 | ||
50 | void _backlight_off(void) | 50 | void backlight_hw_off(void) |
51 | { | 51 | { |
52 | /* there is no real on/off but we can set to 0 brightness */ | 52 | /* there is no real on/off but we can set to 0 brightness */ |
53 | _backlight_set_brightness(0); | 53 | backlight_hw_brightness(0); |
54 | #ifdef HAVE_LCD_ENABLE | 54 | #ifdef HAVE_LCD_ENABLE |
55 | lcd_enable(false); /* power off visible display */ | 55 | lcd_enable(false); /* power off visible display */ |
56 | #endif | 56 | #endif |
57 | } | 57 | } |
58 | 58 | ||
59 | /* ELE8 is the button light GPIO */ | 59 | /* ELE8 is the button light GPIO */ |
60 | void _buttonlight_on(void) | 60 | void buttonlight_hw_on(void) |
61 | { | 61 | { |
62 | /* assume mpr121 was initialized by button-zenxfi3.c */ | 62 | /* assume mpr121 was initialized by button-zenxfi3.c */ |
63 | mpr121_set_gpio_output(8, ELE_GPIO_SET); | 63 | mpr121_set_gpio_output(8, ELE_GPIO_SET); |
64 | } | 64 | } |
65 | 65 | ||
66 | void _buttonlight_off(void) | 66 | void buttonlight_hw_off(void) |
67 | { | 67 | { |
68 | /* assume mpr121 was initialized by button-zenxfi3.c */ | 68 | /* assume mpr121 was initialized by button-zenxfi3.c */ |
69 | mpr121_set_gpio_output(8, ELE_GPIO_CLR); | 69 | mpr121_set_gpio_output(8, ELE_GPIO_CLR); |
70 | } | 70 | } |
71 | 71 | ||
72 | void _buttonlight_set_brightness(int brightness) | 72 | void buttonlight_hw_brightness(int brightness) |
73 | { | 73 | { |
74 | /* assume mpr121 was initialized by button-zenxfi3.c */ | 74 | /* assume mpr121 was initialized by button-zenxfi3.c */ |
75 | /* since backlight brightness is the same for the screen and the button light, | 75 | /* since backlight brightness is the same for the screen and the button light, |
diff --git a/firmware/target/arm/imx233/samsung-ypz5/backlight-target.h b/firmware/target/arm/imx233/samsung-ypz5/backlight-target.h index 5fa2ed38f9..e26f83811d 100644 --- a/firmware/target/arm/imx233/samsung-ypz5/backlight-target.h +++ b/firmware/target/arm/imx233/samsung-ypz5/backlight-target.h | |||
@@ -20,9 +20,9 @@ | |||
20 | #ifndef BACKLIGHT_TARGET_H | 20 | #ifndef BACKLIGHT_TARGET_H |
21 | #define BACKLIGHT_TARGET_H | 21 | #define BACKLIGHT_TARGET_H |
22 | 22 | ||
23 | bool _backlight_init(void); | 23 | bool backlight_hw_init(void); |
24 | void _backlight_on(void); | 24 | void backlight_hw_on(void); |
25 | void _backlight_off(void); | 25 | void backlight_hw_off(void); |
26 | void _backlight_set_brightness(int brightness); | 26 | void backlight_hw_brightness(int brightness); |
27 | 27 | ||
28 | #endif /* BACKLIGHT_TARGET_H */ | 28 | #endif /* BACKLIGHT_TARGET_H */ |
diff --git a/firmware/target/arm/imx233/samsung-ypz5/backlight-ypz5.c b/firmware/target/arm/imx233/samsung-ypz5/backlight-ypz5.c index 27a7ecedfc..b02c3a1d16 100644 --- a/firmware/target/arm/imx233/samsung-ypz5/backlight-ypz5.c +++ b/firmware/target/arm/imx233/samsung-ypz5/backlight-ypz5.c | |||
@@ -77,7 +77,7 @@ static void aat3151_write(int addr, int data) | |||
77 | udelay(TIME_LAT); | 77 | udelay(TIME_LAT); |
78 | } | 78 | } |
79 | 79 | ||
80 | void _backlight_set_brightness(int level) | 80 | void backlight_hw_brightness(int level) |
81 | { | 81 | { |
82 | /* Don't try to reset backlight if not necessary | 82 | /* Don't try to reset backlight if not necessary |
83 | * Moreover this helps to avoid flickering when | 83 | * Moreover this helps to avoid flickering when |
@@ -120,7 +120,7 @@ void _backlight_set_brightness(int level) | |||
120 | current_level = level; | 120 | current_level = level; |
121 | } | 121 | } |
122 | 122 | ||
123 | bool _backlight_init(void) | 123 | bool backlight_hw_init(void) |
124 | { | 124 | { |
125 | imx233_pinctrl_acquire(3, 13, "backlight"); | 125 | imx233_pinctrl_acquire(3, 13, "backlight"); |
126 | imx233_pinctrl_set_function(3, 13, PINCTRL_FUNCTION_GPIO); | 126 | imx233_pinctrl_set_function(3, 13, PINCTRL_FUNCTION_GPIO); |
@@ -130,19 +130,19 @@ bool _backlight_init(void) | |||
130 | return true; | 130 | return true; |
131 | } | 131 | } |
132 | 132 | ||
133 | void _backlight_on(void) | 133 | void backlight_hw_on(void) |
134 | { | 134 | { |
135 | #ifdef HAVE_LCD_ENABLE | 135 | #ifdef HAVE_LCD_ENABLE |
136 | lcd_enable(true); /* power on lcd + visible display */ | 136 | lcd_enable(true); /* power on lcd + visible display */ |
137 | #endif | 137 | #endif |
138 | /* restore the previous backlight level */ | 138 | /* restore the previous backlight level */ |
139 | _backlight_set_brightness(backlight_brightness); | 139 | backlight_hw_brightness(backlight_brightness); |
140 | } | 140 | } |
141 | 141 | ||
142 | void _backlight_off(void) | 142 | void backlight_hw_off(void) |
143 | { | 143 | { |
144 | /* there is no real on/off but we can set to 0 brightness */ | 144 | /* there is no real on/off but we can set to 0 brightness */ |
145 | _backlight_set_brightness(0); | 145 | backlight_hw_brightness(0); |
146 | #ifdef HAVE_LCD_ENABLE | 146 | #ifdef HAVE_LCD_ENABLE |
147 | lcd_enable(false); /* power off visible display */ | 147 | lcd_enable(false); /* power off visible display */ |
148 | #endif | 148 | #endif |
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/backlight-fuzeplus.c b/firmware/target/arm/imx233/sansa-fuzeplus/backlight-fuzeplus.c index 3ee9d0914a..f87dbddfc0 100644 --- a/firmware/target/arm/imx233/sansa-fuzeplus/backlight-fuzeplus.c +++ b/firmware/target/arm/imx233/sansa-fuzeplus/backlight-fuzeplus.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #include "backlight-target.h" | 26 | #include "backlight-target.h" |
27 | #include "pinctrl-imx233.h" | 27 | #include "pinctrl-imx233.h" |
28 | 28 | ||
29 | void _backlight_set_brightness(int brightness) | 29 | void backlight_hw_brightness(int brightness) |
30 | { | 30 | { |
31 | if(brightness != 0) | 31 | if(brightness != 0) |
32 | brightness = MAX_BRIGHTNESS_SETTING + 1 - brightness; | 32 | brightness = MAX_BRIGHTNESS_SETTING + 1 - brightness; |
@@ -39,17 +39,17 @@ void _backlight_set_brightness(int brightness) | |||
39 | } | 39 | } |
40 | } | 40 | } |
41 | 41 | ||
42 | bool _backlight_init(void) | 42 | bool backlight_hw_init(void) |
43 | { | 43 | { |
44 | imx233_pinctrl_acquire(1, 28, "backlight"); | 44 | imx233_pinctrl_acquire(1, 28, "backlight"); |
45 | imx233_pinctrl_set_function(1, 28, PINCTRL_FUNCTION_GPIO); | 45 | imx233_pinctrl_set_function(1, 28, PINCTRL_FUNCTION_GPIO); |
46 | imx233_pinctrl_set_drive(1, 28, PINCTRL_DRIVE_8mA); | 46 | imx233_pinctrl_set_drive(1, 28, PINCTRL_DRIVE_8mA); |
47 | imx233_pinctrl_enable_gpio(1, 28, true); | 47 | imx233_pinctrl_enable_gpio(1, 28, true); |
48 | _backlight_set_brightness(DEFAULT_BRIGHTNESS_SETTING); | 48 | backlight_hw_brightness(DEFAULT_BRIGHTNESS_SETTING); |
49 | return true; | 49 | return true; |
50 | } | 50 | } |
51 | 51 | ||
52 | void _backlight_on(void) | 52 | void backlight_hw_on(void) |
53 | { | 53 | { |
54 | #ifdef HAVE_LCD_ENABLE | 54 | #ifdef HAVE_LCD_ENABLE |
55 | lcd_enable(true); /* power on lcd + visible display */ | 55 | lcd_enable(true); /* power on lcd + visible display */ |
@@ -57,10 +57,10 @@ void _backlight_on(void) | |||
57 | /* don't do anything special, the core will set the brightness */ | 57 | /* don't do anything special, the core will set the brightness */ |
58 | } | 58 | } |
59 | 59 | ||
60 | void _backlight_off(void) | 60 | void backlight_hw_off(void) |
61 | { | 61 | { |
62 | /* there is no real on/off but we can set to 0 brightness */ | 62 | /* there is no real on/off but we can set to 0 brightness */ |
63 | _backlight_set_brightness(0); | 63 | backlight_hw_brightness(0); |
64 | #ifdef HAVE_LCD_ENABLE | 64 | #ifdef HAVE_LCD_ENABLE |
65 | lcd_enable(false); /* power off visible display */ | 65 | lcd_enable(false); /* power off visible display */ |
66 | #endif | 66 | #endif |
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/backlight-target.h b/firmware/target/arm/imx233/sansa-fuzeplus/backlight-target.h index e3766965d8..483272f804 100644 --- a/firmware/target/arm/imx233/sansa-fuzeplus/backlight-target.h +++ b/firmware/target/arm/imx233/sansa-fuzeplus/backlight-target.h | |||
@@ -21,9 +21,9 @@ | |||
21 | #ifndef BACKLIGHT_TARGET_H | 21 | #ifndef BACKLIGHT_TARGET_H |
22 | #define BACKLIGHT_TARGET_H | 22 | #define BACKLIGHT_TARGET_H |
23 | 23 | ||
24 | bool _backlight_init(void); | 24 | bool backlight_hw_init(void); |
25 | void _backlight_on(void); | 25 | void backlight_hw_on(void); |
26 | void _backlight_off(void); | 26 | void backlight_hw_off(void); |
27 | void _backlight_set_brightness(int brightness); | 27 | void backlight_hw_brightness(int brightness); |
28 | 28 | ||
29 | #endif /* BACKLIGHT_TARGET_H */ | 29 | #endif /* BACKLIGHT_TARGET_H */ |
diff --git a/firmware/target/arm/imx233/sony-nwz/backlight-nwz.c b/firmware/target/arm/imx233/sony-nwz/backlight-nwz.c index d99d21386b..fecbeda15b 100644 --- a/firmware/target/arm/imx233/sony-nwz/backlight-nwz.c +++ b/firmware/target/arm/imx233/sony-nwz/backlight-nwz.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include "pwm-imx233.h" | 27 | #include "pwm-imx233.h" |
28 | #include "pinctrl-imx233.h" | 28 | #include "pinctrl-imx233.h" |
29 | 29 | ||
30 | void _backlight_set_brightness(int brightness) | 30 | void backlight_hw_brightness(int brightness) |
31 | { | 31 | { |
32 | bool en = brightness > 0; | 32 | bool en = brightness > 0; |
33 | imx233_pwm_setup_simple(2, 24000, 100 - brightness); | 33 | imx233_pwm_setup_simple(2, 24000, 100 - brightness); |
@@ -35,17 +35,17 @@ void _backlight_set_brightness(int brightness) | |||
35 | imx233_pinctrl_set_gpio(0, 10, en); | 35 | imx233_pinctrl_set_gpio(0, 10, en); |
36 | } | 36 | } |
37 | 37 | ||
38 | bool _backlight_init(void) | 38 | bool backlight_hw_init(void) |
39 | { | 39 | { |
40 | imx233_pinctrl_acquire(0, 10, "backlight_enable"); | 40 | imx233_pinctrl_acquire(0, 10, "backlight_enable"); |
41 | imx233_pinctrl_set_function(0, 10, PINCTRL_FUNCTION_GPIO); | 41 | imx233_pinctrl_set_function(0, 10, PINCTRL_FUNCTION_GPIO); |
42 | imx233_pinctrl_enable_gpio(0, 10, true); | 42 | imx233_pinctrl_enable_gpio(0, 10, true); |
43 | imx233_pinctrl_set_gpio(0, 10, true); | 43 | imx233_pinctrl_set_gpio(0, 10, true); |
44 | _backlight_set_brightness(DEFAULT_BRIGHTNESS_SETTING); | 44 | backlight_hw_brightness(DEFAULT_BRIGHTNESS_SETTING); |
45 | return true; | 45 | return true; |
46 | } | 46 | } |
47 | 47 | ||
48 | void _backlight_on(void) | 48 | void backlight_hw_on(void) |
49 | { | 49 | { |
50 | #ifdef HAVE_LCD_ENABLE | 50 | #ifdef HAVE_LCD_ENABLE |
51 | lcd_enable(true); /* power on lcd + visible display */ | 51 | lcd_enable(true); /* power on lcd + visible display */ |
@@ -53,10 +53,10 @@ void _backlight_on(void) | |||
53 | /* don't do anything special, the core will set the brightness */ | 53 | /* don't do anything special, the core will set the brightness */ |
54 | } | 54 | } |
55 | 55 | ||
56 | void _backlight_off(void) | 56 | void backlight_hw_off(void) |
57 | { | 57 | { |
58 | /* there is no real on/off but we can set to 0 brightness */ | 58 | /* there is no real on/off but we can set to 0 brightness */ |
59 | _backlight_set_brightness(0); | 59 | backlight_hw_brightness(0); |
60 | #ifdef HAVE_LCD_ENABLE | 60 | #ifdef HAVE_LCD_ENABLE |
61 | lcd_enable(false); /* power off visible display */ | 61 | lcd_enable(false); /* power off visible display */ |
62 | #endif | 62 | #endif |
diff --git a/firmware/target/arm/imx233/sony-nwz/backlight-target.h b/firmware/target/arm/imx233/sony-nwz/backlight-target.h index 78a0a72d85..60a2fbe746 100644 --- a/firmware/target/arm/imx233/sony-nwz/backlight-target.h +++ b/firmware/target/arm/imx233/sony-nwz/backlight-target.h | |||
@@ -21,9 +21,9 @@ | |||
21 | #ifndef BACKLIGHT_TARGET_H | 21 | #ifndef BACKLIGHT_TARGET_H |
22 | #define BACKLIGHT_TARGET_H | 22 | #define BACKLIGHT_TARGET_H |
23 | 23 | ||
24 | bool _backlight_init(void); | 24 | bool backlight_hw_init(void); |
25 | void _backlight_on(void); | 25 | void backlight_hw_on(void); |
26 | void _backlight_off(void); | 26 | void backlight_hw_off(void); |
27 | void _backlight_set_brightness(int brightness); | 27 | void backlight_hw_brightness(int brightness); |
28 | 28 | ||
29 | #endif /* BACKLIGHT_TARGET_H */ | 29 | #endif /* BACKLIGHT_TARGET_H */ |
diff --git a/firmware/target/arm/imx233/system-imx233.c b/firmware/target/arm/imx233/system-imx233.c index f34eab66e2..38865c47a3 100644 --- a/firmware/target/arm/imx233/system-imx233.c +++ b/firmware/target/arm/imx233/system-imx233.c | |||
@@ -105,7 +105,7 @@ void imx233_chip_reset(void) | |||
105 | 105 | ||
106 | void system_reboot(void) | 106 | void system_reboot(void) |
107 | { | 107 | { |
108 | _backlight_off(); | 108 | backlight_hw_off(); |
109 | 109 | ||
110 | disable_irq(); | 110 | disable_irq(); |
111 | 111 | ||
@@ -119,8 +119,8 @@ void system_exception_wait(void) | |||
119 | imx233_rtc_enable_watchdog(false); | 119 | imx233_rtc_enable_watchdog(false); |
120 | /* make sure lcd and backlight are on */ | 120 | /* make sure lcd and backlight are on */ |
121 | lcd_update(); | 121 | lcd_update(); |
122 | _backlight_on(); | 122 | backlight_hw_on(); |
123 | _backlight_set_brightness(DEFAULT_BRIGHTNESS_SETTING); | 123 | backlight_hw_brightness(DEFAULT_BRIGHTNESS_SETTING); |
124 | /* wait until button release (if a button is pressed) */ | 124 | /* wait until button release (if a button is pressed) */ |
125 | #ifdef HAVE_BUTTON_DATA | 125 | #ifdef HAVE_BUTTON_DATA |
126 | int data; | 126 | int data; |
diff --git a/firmware/target/arm/imx31/gigabeat-s/backlight-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/backlight-gigabeat-s.c index 60fcb4729d..29d8980d86 100644 --- a/firmware/target/arm/imx31/gigabeat-s/backlight-gigabeat-s.c +++ b/firmware/target/arm/imx31/gigabeat-s/backlight-gigabeat-s.c | |||
@@ -79,7 +79,7 @@ static uint32_t backlight_pwm_bits; /* Final PWM setting for fade-in */ | |||
79 | /* Backlight ramping settings */ | 79 | /* Backlight ramping settings */ |
80 | static uint32_t led_ramp_mask = MC13783_LEDMDRAMPDOWN | MC13783_LEDMDRAMPUP; | 80 | static uint32_t led_ramp_mask = MC13783_LEDMDRAMPDOWN | MC13783_LEDMDRAMPUP; |
81 | 81 | ||
82 | bool _backlight_init(void) | 82 | bool backlight_hw_init(void) |
83 | { | 83 | { |
84 | /* Set default LED register value */ | 84 | /* Set default LED register value */ |
85 | mc13783_write(MC13783_LED_CONTROL0, | 85 | mc13783_write(MC13783_LED_CONTROL0, |
@@ -88,7 +88,7 @@ bool _backlight_init(void) | |||
88 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS | 88 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS |
89 | /* Our PWM and I-Level is different than retailos (but same apparent | 89 | /* Our PWM and I-Level is different than retailos (but same apparent |
90 | * brightness), so init to our default. */ | 90 | * brightness), so init to our default. */ |
91 | _backlight_set_brightness(DEFAULT_BRIGHTNESS_SETTING); | 91 | backlight_hw_brightness(DEFAULT_BRIGHTNESS_SETTING); |
92 | #else | 92 | #else |
93 | /* Use default PWM */ | 93 | /* Use default PWM */ |
94 | backlight_pwm_bits = mc13783_read(MC13783_LED_CONTROL2) & MC13783_LEDMDDC; | 94 | backlight_pwm_bits = mc13783_read(MC13783_LED_CONTROL2) & MC13783_LEDMDDC; |
@@ -113,7 +113,7 @@ void backlight_set_fade_in(bool value) | |||
113 | led_ramp_mask &= ~MC13783_LEDMDRAMPUP; | 113 | led_ramp_mask &= ~MC13783_LEDMDRAMPUP; |
114 | } | 114 | } |
115 | 115 | ||
116 | void _backlight_on(void) | 116 | void backlight_hw_on(void) |
117 | { | 117 | { |
118 | static const char regs[2] = | 118 | static const char regs[2] = |
119 | { | 119 | { |
@@ -149,7 +149,7 @@ void _backlight_on(void) | |||
149 | } | 149 | } |
150 | } | 150 | } |
151 | 151 | ||
152 | void _backlight_off(void) | 152 | void backlight_hw_off(void) |
153 | { | 153 | { |
154 | uint32_t ctrl0 = MC13783_LED_CONTROL0_BITS | MC13783_LEDEN; | 154 | uint32_t ctrl0 = MC13783_LED_CONTROL0_BITS | MC13783_LEDEN; |
155 | 155 | ||
@@ -173,7 +173,7 @@ void _backlight_off(void) | |||
173 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS | 173 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS |
174 | /* Assumes that the backlight has been initialized - parameter should | 174 | /* Assumes that the backlight has been initialized - parameter should |
175 | * already be range-checked in public interface. */ | 175 | * already be range-checked in public interface. */ |
176 | void _backlight_set_brightness(int brightness) | 176 | void backlight_hw_brightness(int brightness) |
177 | { | 177 | { |
178 | uint32_t md = led_md_pwm_table[brightness].md; | 178 | uint32_t md = led_md_pwm_table[brightness].md; |
179 | backlight_pwm_bits = backlight_on_status ? | 179 | backlight_pwm_bits = backlight_on_status ? |
diff --git a/firmware/target/arm/imx31/gigabeat-s/backlight-target.h b/firmware/target/arm/imx31/gigabeat-s/backlight-target.h index 2ae1372815..124fa87b17 100644 --- a/firmware/target/arm/imx31/gigabeat-s/backlight-target.h +++ b/firmware/target/arm/imx31/gigabeat-s/backlight-target.h | |||
@@ -27,10 +27,10 @@ | |||
27 | #define BACKLIGHT_FULL_INIT | 27 | #define BACKLIGHT_FULL_INIT |
28 | #endif | 28 | #endif |
29 | 29 | ||
30 | bool _backlight_init(void); | 30 | bool backlight_hw_init(void); |
31 | void _backlight_on(void); | 31 | void backlight_hw_on(void); |
32 | void _backlight_off(void); | 32 | void backlight_hw_off(void); |
33 | void _backlight_set_brightness(int brightness); | 33 | void backlight_hw_brightness(int brightness); |
34 | 34 | ||
35 | void _backlight_lcd_sleep(void); | 35 | void _backlight_lcd_sleep(void); |
36 | 36 | ||
diff --git a/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c index d194a69ab1..5d89802bc9 100644 --- a/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c +++ b/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c | |||
@@ -136,7 +136,7 @@ void power_off(void) | |||
136 | dptc_stop(); | 136 | dptc_stop(); |
137 | 137 | ||
138 | /* Cut backlight */ | 138 | /* Cut backlight */ |
139 | _backlight_off(); | 139 | backlight_hw_off(); |
140 | 140 | ||
141 | /* Let it fade */ | 141 | /* Let it fade */ |
142 | sleep(5*HZ/4); | 142 | sleep(5*HZ/4); |
diff --git a/firmware/target/arm/ipod/1g2g/backlight-1g2g.c b/firmware/target/arm/ipod/1g2g/backlight-1g2g.c index b7797813ec..7f1fa7ba42 100644 --- a/firmware/target/arm/ipod/1g2g/backlight-1g2g.c +++ b/firmware/target/arm/ipod/1g2g/backlight-1g2g.c | |||
@@ -24,13 +24,13 @@ | |||
24 | #include "backlight.h" | 24 | #include "backlight.h" |
25 | #include "backlight-target.h" | 25 | #include "backlight-target.h" |
26 | 26 | ||
27 | void _backlight_on(void) | 27 | void backlight_hw_on(void) |
28 | { | 28 | { |
29 | LCD1_CONTROL |= 0x02; | 29 | LCD1_CONTROL |= 0x02; |
30 | lcd_set_backlight_inversion(true); | 30 | lcd_set_backlight_inversion(true); |
31 | } | 31 | } |
32 | 32 | ||
33 | void _backlight_off(void) | 33 | void backlight_hw_off(void) |
34 | { | 34 | { |
35 | LCD1_CONTROL &= ~0x02; | 35 | LCD1_CONTROL &= ~0x02; |
36 | lcd_set_backlight_inversion(false); | 36 | lcd_set_backlight_inversion(false); |
diff --git a/firmware/target/arm/ipod/1g2g/backlight-target.h b/firmware/target/arm/ipod/1g2g/backlight-target.h index 22826054aa..e888aa7c3f 100644 --- a/firmware/target/arm/ipod/1g2g/backlight-target.h +++ b/firmware/target/arm/ipod/1g2g/backlight-target.h | |||
@@ -21,8 +21,8 @@ | |||
21 | #ifndef BACKLIGHT_TARGET_H | 21 | #ifndef BACKLIGHT_TARGET_H |
22 | #define BACKLIGHT_TARGET_H | 22 | #define BACKLIGHT_TARGET_H |
23 | 23 | ||
24 | #define _backlight_init() false | 24 | #define backlight_hw_init() false |
25 | void _backlight_on(void); | 25 | void backlight_hw_on(void); |
26 | void _backlight_off(void); | 26 | void backlight_hw_off(void); |
27 | 27 | ||
28 | #endif | 28 | #endif |
diff --git a/firmware/target/arm/ipod/3g/backlight-3g.c b/firmware/target/arm/ipod/3g/backlight-3g.c index 77088e32ec..fcc162310f 100644 --- a/firmware/target/arm/ipod/3g/backlight-3g.c +++ b/firmware/target/arm/ipod/3g/backlight-3g.c | |||
@@ -23,12 +23,12 @@ | |||
23 | #include "backlight.h" | 23 | #include "backlight.h" |
24 | #include "backlight-target.h" | 24 | #include "backlight-target.h" |
25 | 25 | ||
26 | void _backlight_on(void) | 26 | void backlight_hw_on(void) |
27 | { | 27 | { |
28 | LCD1_CONTROL |= 0x02; | 28 | LCD1_CONTROL |= 0x02; |
29 | } | 29 | } |
30 | 30 | ||
31 | void _backlight_off(void) | 31 | void backlight_hw_off(void) |
32 | { | 32 | { |
33 | LCD1_CONTROL &= ~0x02; | 33 | LCD1_CONTROL &= ~0x02; |
34 | } | 34 | } |
diff --git a/firmware/target/arm/ipod/backlight-4g_color.c b/firmware/target/arm/ipod/backlight-4g_color.c index befb036eab..96ed387625 100644 --- a/firmware/target/arm/ipod/backlight-4g_color.c +++ b/firmware/target/arm/ipod/backlight-4g_color.c | |||
@@ -44,11 +44,11 @@ static unsigned char log_brightness[32] = { | |||
44 | static unsigned brightness = 100; /* 1 to 255 */ | 44 | static unsigned brightness = 100; /* 1 to 255 */ |
45 | static bool enabled = false; | 45 | static bool enabled = false; |
46 | 46 | ||
47 | /* Handling B03 in _backlight_on() and _backlight_off() makes backlight go off | 47 | /* Handling B03 in backlight_hw_on() and backlight_hw_off() makes backlight go off |
48 | * without delay. Not doing that does a short (fixed) fade out. Opt for the | 48 | * without delay. Not doing that does a short (fixed) fade out. Opt for the |
49 | * latter. */ | 49 | * latter. */ |
50 | 50 | ||
51 | void _backlight_on(void) | 51 | void backlight_hw_on(void) |
52 | { | 52 | { |
53 | /* brightness full */ | 53 | /* brightness full */ |
54 | outl(0x80000000 | (brightness << 16), 0x7000a010); | 54 | outl(0x80000000 | (brightness << 16), 0x7000a010); |
@@ -56,27 +56,27 @@ void _backlight_on(void) | |||
56 | enabled = true; | 56 | enabled = true; |
57 | } | 57 | } |
58 | 58 | ||
59 | void _backlight_off(void) | 59 | void backlight_hw_off(void) |
60 | { | 60 | { |
61 | outl(0x80000000, 0x7000a010); | 61 | outl(0x80000000, 0x7000a010); |
62 | GPIO_CLEAR_BITWISE(GPIOB_OUTPUT_VAL, 0x08); | 62 | GPIO_CLEAR_BITWISE(GPIOB_OUTPUT_VAL, 0x08); |
63 | enabled = false; | 63 | enabled = false; |
64 | } | 64 | } |
65 | 65 | ||
66 | void _backlight_set_brightness(int val) | 66 | void backlight_hw_brightness(int val) |
67 | { | 67 | { |
68 | brightness = log_brightness[val]; | 68 | brightness = log_brightness[val]; |
69 | if (enabled) | 69 | if (enabled) |
70 | outl(0x80000000 | (brightness << 16), 0x7000a010); | 70 | outl(0x80000000 | (brightness << 16), 0x7000a010); |
71 | } | 71 | } |
72 | 72 | ||
73 | bool _backlight_init(void) | 73 | bool backlight_hw_init(void) |
74 | { | 74 | { |
75 | GPIO_SET_BITWISE(GPIOB_ENABLE, 0x0c); /* B02 and B03 enable */ | 75 | GPIO_SET_BITWISE(GPIOB_ENABLE, 0x0c); /* B02 and B03 enable */ |
76 | GPIO_SET_BITWISE(GPIOB_OUTPUT_VAL, 0x08); /* B03 = 1 */ | 76 | GPIO_SET_BITWISE(GPIOB_OUTPUT_VAL, 0x08); /* B03 = 1 */ |
77 | GPO32_ENABLE &= ~0x2000000; /* D01 disable, so pwm takes over */ | 77 | GPO32_ENABLE &= ~0x2000000; /* D01 disable, so pwm takes over */ |
78 | DEV_EN |= DEV_PWM; /* PWM enable */ | 78 | DEV_EN |= DEV_PWM; /* PWM enable */ |
79 | 79 | ||
80 | _backlight_on(); | 80 | backlight_hw_on(); |
81 | return true; | 81 | return true; |
82 | } | 82 | } |
diff --git a/firmware/target/arm/ipod/backlight-nano_video.c b/firmware/target/arm/ipod/backlight-nano_video.c index 2f56f94225..e2e9bf0341 100644 --- a/firmware/target/arm/ipod/backlight-nano_video.c +++ b/firmware/target/arm/ipod/backlight-nano_video.c | |||
@@ -38,7 +38,7 @@ static int brightness = 1; /* 1 to 32 */ | |||
38 | static int current_dim = 16; /* default after enabling the backlight dimmer */ | 38 | static int current_dim = 16; /* default after enabling the backlight dimmer */ |
39 | static bool enabled = false; | 39 | static bool enabled = false; |
40 | 40 | ||
41 | void _backlight_set_brightness(int val) | 41 | void backlight_hw_brightness(int val) |
42 | { | 42 | { |
43 | int oldlevel; | 43 | int oldlevel; |
44 | 44 | ||
@@ -91,7 +91,7 @@ void _backlight_hw_enable(bool on) | |||
91 | GPIO_SET_BITWISE(GPIOD_OUTPUT_VAL, 0x80); | 91 | GPIO_SET_BITWISE(GPIOD_OUTPUT_VAL, 0x80); |
92 | sleep(HZ/100); | 92 | sleep(HZ/100); |
93 | current_dim = 16; | 93 | current_dim = 16; |
94 | _backlight_set_brightness(brightness); | 94 | backlight_hw_brightness(brightness); |
95 | } | 95 | } |
96 | else | 96 | else |
97 | { | 97 | { |
@@ -116,7 +116,7 @@ void _backlight_led_off(void) | |||
116 | GPIO_CLEAR_BITWISE(GPIOL_OUTPUT_VAL, 0x80); | 116 | GPIO_CLEAR_BITWISE(GPIOL_OUTPUT_VAL, 0x80); |
117 | } | 117 | } |
118 | 118 | ||
119 | bool _backlight_init(void) | 119 | bool backlight_hw_init(void) |
120 | { | 120 | { |
121 | GPIO_SET_BITWISE(GPIOB_ENABLE, 0x08); | 121 | GPIO_SET_BITWISE(GPIOB_ENABLE, 0x08); |
122 | GPIO_SET_BITWISE(GPIOB_OUTPUT_EN, 0x08); | 122 | GPIO_SET_BITWISE(GPIOB_OUTPUT_EN, 0x08); |
diff --git a/firmware/target/arm/ipod/backlight-target.h b/firmware/target/arm/ipod/backlight-target.h index 9b6a96b3cb..fef7ee8ce0 100644 --- a/firmware/target/arm/ipod/backlight-target.h +++ b/firmware/target/arm/ipod/backlight-target.h | |||
@@ -23,8 +23,8 @@ | |||
23 | 23 | ||
24 | #if defined(IPOD_VIDEO) || defined(IPOD_NANO) | 24 | #if defined(IPOD_VIDEO) || defined(IPOD_NANO) |
25 | 25 | ||
26 | bool _backlight_init(void); | 26 | bool backlight_hw_init(void); |
27 | void _backlight_set_brightness(int val); | 27 | void backlight_hw_brightness(int val); |
28 | void _backlight_led_on(void); | 28 | void _backlight_led_on(void); |
29 | void _backlight_led_off(void); | 29 | void _backlight_led_off(void); |
30 | void _backlight_hw_enable(bool on); | 30 | void _backlight_hw_enable(bool on); |
@@ -34,48 +34,48 @@ void lcd_awake(void); | |||
34 | #endif | 34 | #endif |
35 | 35 | ||
36 | #ifdef BOOTLOADER | 36 | #ifdef BOOTLOADER |
37 | #define _backlight_on() do { _backlight_hw_enable(true); \ | 37 | #define backlight_hw_on() do { _backlight_hw_enable(true); \ |
38 | _backlight_led_on(); } while(0) | 38 | _backlight_led_on(); } while(0) |
39 | #define _backlight_off() do { _backlight_led_off(); \ | 39 | #define backlight_hw_off() do { _backlight_led_off(); \ |
40 | _backlight_hw_enable(false); } while(0) | 40 | _backlight_hw_enable(false); } while(0) |
41 | #else /* !BOOTLOADER */ | 41 | #else /* !BOOTLOADER */ |
42 | #define _backlight_on_isr() _backlight_led_on() | 42 | #define backlight_hw_on_isr() _backlight_led_on() |
43 | #define _backlight_off_isr() _backlight_led_off() | 43 | #define backlight_hw_off_isr() _backlight_led_off() |
44 | #define _backlight_on_normal() do { _backlight_hw_enable(true); \ | 44 | #define backlight_hw_on_normal() do { _backlight_hw_enable(true); \ |
45 | _backlight_led_on(); } while(0) | 45 | _backlight_led_on(); } while(0) |
46 | #define _backlight_off_normal() do { _backlight_led_off(); \ | 46 | #define backlight_hw_off_normal() do { _backlight_led_off(); \ |
47 | _backlight_hw_enable(false); } while(0) | 47 | _backlight_hw_enable(false); } while(0) |
48 | #define _BACKLIGHT_FADE_ENABLE | 48 | #define _BACKLIGHT_FADE_ENABLE |
49 | #endif /* !BOOTLOADER */ | 49 | #endif /* !BOOTLOADER */ |
50 | 50 | ||
51 | #elif defined(IPOD_4G) || defined(IPOD_COLOR) | 51 | #elif defined(IPOD_4G) || defined(IPOD_COLOR) |
52 | 52 | ||
53 | bool _backlight_init(void); | 53 | bool backlight_hw_init(void); |
54 | void _backlight_on(void); | 54 | void backlight_hw_on(void); |
55 | void _backlight_off(void); | 55 | void backlight_hw_off(void); |
56 | void _backlight_set_brightness(int val); | 56 | void backlight_hw_brightness(int val); |
57 | 57 | ||
58 | #elif defined(IPOD_MINI) || defined(IPOD_MINI2G) | 58 | #elif defined(IPOD_MINI) || defined(IPOD_MINI2G) |
59 | 59 | ||
60 | #define _backlight_init() true | 60 | #define backlight_hw_init() true |
61 | void _backlight_hw_on(void); | 61 | void _backlight_hw_on(void); |
62 | void _backlight_hw_off(void); | 62 | void _backlight_hw_off(void); |
63 | 63 | ||
64 | #ifdef BOOTLOADER | 64 | #ifdef BOOTLOADER |
65 | #define _backlight_on() _backlight_hw_on() | 65 | #define backlight_hw_on() _backlight_hw_on() |
66 | #define _backlight_off() _backlight_hw_off() | 66 | #define backlight_hw_off() _backlight_hw_off() |
67 | #else | 67 | #else |
68 | #define _backlight_on_isr() _backlight_hw_on() | 68 | #define backlight_hw_on_isr() _backlight_hw_on() |
69 | #define _backlight_off_isr() _backlight_hw_off() | 69 | #define backlight_hw_off_isr() _backlight_hw_off() |
70 | #define _backlight_on_normal() _backlight_hw_on() | 70 | #define backlight_hw_on_normal() _backlight_hw_on() |
71 | #define _backlight_off_normal() _backlight_hw_off() | 71 | #define backlight_hw_off_normal() _backlight_hw_off() |
72 | #endif | 72 | #endif |
73 | 73 | ||
74 | #elif defined(IPOD_1G2G) || defined(IPOD_3G) | 74 | #elif defined(IPOD_1G2G) || defined(IPOD_3G) |
75 | 75 | ||
76 | #define _backlight_init() true | 76 | #define backlight_hw_init() true |
77 | void _backlight_on(void); | 77 | void backlight_hw_on(void); |
78 | void _backlight_off(void); | 78 | void backlight_hw_off(void); |
79 | #endif | 79 | #endif |
80 | 80 | ||
81 | #endif | 81 | #endif |
diff --git a/firmware/target/arm/ipod/button-1g-3g.c b/firmware/target/arm/ipod/button-1g-3g.c index 045a0f6d8a..67aa7eb336 100644 --- a/firmware/target/arm/ipod/button-1g-3g.c +++ b/firmware/target/arm/ipod/button-1g-3g.c | |||
@@ -66,7 +66,7 @@ static void handle_scroll_wheel(int new_scroll) | |||
66 | static int prev_scroll = -1; | 66 | static int prev_scroll = -1; |
67 | static int direction = 0; | 67 | static int direction = 0; |
68 | static int count = 0; | 68 | static int count = 0; |
69 | static long next_backlight_on = 0; | 69 | static long nextbacklight_hw_on = 0; |
70 | 70 | ||
71 | static unsigned long last_wheel_usec = 0; | 71 | static unsigned long last_wheel_usec = 0; |
72 | static unsigned long wheel_delta = 1ul << 24; | 72 | static unsigned long wheel_delta = 1ul << 24; |
@@ -96,10 +96,10 @@ static void handle_scroll_wheel(int new_scroll) | |||
96 | } | 96 | } |
97 | 97 | ||
98 | /* poke backlight every 1/4s of activity */ | 98 | /* poke backlight every 1/4s of activity */ |
99 | if (TIME_AFTER(current_tick, next_backlight_on)) { | 99 | if (TIME_AFTER(current_tick, nextbacklight_hw_on)) { |
100 | backlight_on(); | 100 | backlight_on(); |
101 | reset_poweroff_timer(); | 101 | reset_poweroff_timer(); |
102 | next_backlight_on = current_tick + HZ/4; | 102 | nextbacklight_hw_on = current_tick + HZ/4; |
103 | } | 103 | } |
104 | 104 | ||
105 | /* has wheel travelled far enough? */ | 105 | /* has wheel travelled far enough? */ |
@@ -152,7 +152,7 @@ static void handle_scroll_wheel(int new_scroll) | |||
152 | wheel_velocity = v; | 152 | wheel_velocity = v; |
153 | /* ensure backlight never gets stuck for an extended period if tick | 153 | /* ensure backlight never gets stuck for an extended period if tick |
154 | * wrapped such that next poke is very far ahead */ | 154 | * wrapped such that next poke is very far ahead */ |
155 | next_backlight_on = current_tick - 1; | 155 | nextbacklight_hw_on = current_tick - 1; |
156 | } | 156 | } |
157 | else { | 157 | else { |
158 | /* some velocity filtering to smooth things out */ | 158 | /* some velocity filtering to smooth things out */ |
diff --git a/firmware/target/arm/ipod/button-mini1g.c b/firmware/target/arm/ipod/button-mini1g.c index d4a75c90d8..a508958de1 100644 --- a/firmware/target/arm/ipod/button-mini1g.c +++ b/firmware/target/arm/ipod/button-mini1g.c | |||
@@ -60,7 +60,7 @@ static void handle_scroll_wheel(int new_scroll) | |||
60 | static int prev_scroll = -1; | 60 | static int prev_scroll = -1; |
61 | static int direction = 0; | 61 | static int direction = 0; |
62 | static int count = 0; | 62 | static int count = 0; |
63 | static long next_backlight_on = 0; | 63 | static long nextbacklight_hw_on = 0; |
64 | 64 | ||
65 | int wheel_keycode = BUTTON_NONE; | 65 | int wheel_keycode = BUTTON_NONE; |
66 | int scroll; | 66 | int scroll; |
@@ -92,10 +92,10 @@ static void handle_scroll_wheel(int new_scroll) | |||
92 | } | 92 | } |
93 | 93 | ||
94 | /* poke backlight every 1/4s of activity */ | 94 | /* poke backlight every 1/4s of activity */ |
95 | if (TIME_AFTER(current_tick, next_backlight_on)) { | 95 | if (TIME_AFTER(current_tick, nextbacklight_hw_on)) { |
96 | backlight_on(); | 96 | backlight_on(); |
97 | reset_poweroff_timer(); | 97 | reset_poweroff_timer(); |
98 | next_backlight_on = current_tick + HZ/4; | 98 | nextbacklight_hw_on = current_tick + HZ/4; |
99 | } | 99 | } |
100 | 100 | ||
101 | if (++count < WHEEL_BASE_SENSITIVITY) | 101 | if (++count < WHEEL_BASE_SENSITIVITY) |
@@ -144,7 +144,7 @@ static void handle_scroll_wheel(int new_scroll) | |||
144 | wheel_velocity = v; | 144 | wheel_velocity = v; |
145 | /* ensure backlight never gets stuck for an extended period if tick | 145 | /* ensure backlight never gets stuck for an extended period if tick |
146 | * wrapped such that next poke is very far ahead */ | 146 | * wrapped such that next poke is very far ahead */ |
147 | next_backlight_on = current_tick - 1; | 147 | nextbacklight_hw_on = current_tick - 1; |
148 | } | 148 | } |
149 | else { | 149 | else { |
150 | /* some velocity filtering to smooth things out */ | 150 | /* some velocity filtering to smooth things out */ |
diff --git a/firmware/target/arm/ipod/lcd-color_nano.c b/firmware/target/arm/ipod/lcd-color_nano.c index c7676fa721..67d26aa862 100644 --- a/firmware/target/arm/ipod/lcd-color_nano.c +++ b/firmware/target/arm/ipod/lcd-color_nano.c | |||
@@ -122,7 +122,7 @@ void lcd_shutdown(void) { | |||
122 | #if defined(IPOD_NANO) | 122 | #if defined(IPOD_NANO) |
123 | _backlight_hw_enable(false); | 123 | _backlight_hw_enable(false); |
124 | #elif defined(IPOD_COLOR) | 124 | #elif defined(IPOD_COLOR) |
125 | _backlight_off(); | 125 | backlight_hw_off(); |
126 | #endif | 126 | #endif |
127 | 127 | ||
128 | if ((lcd_type&1) == 0) { | 128 | if ((lcd_type&1) == 0) { |
diff --git a/firmware/target/arm/iriver/backlight-target.h b/firmware/target/arm/iriver/backlight-target.h index a27b489319..3882964207 100644 --- a/firmware/target/arm/iriver/backlight-target.h +++ b/firmware/target/arm/iriver/backlight-target.h | |||
@@ -21,8 +21,8 @@ | |||
21 | #ifndef BACKLIGHT_TARGET_H | 21 | #ifndef BACKLIGHT_TARGET_H |
22 | #define BACKLIGHT_TARGET_H | 22 | #define BACKLIGHT_TARGET_H |
23 | 23 | ||
24 | #define _backlight_init() true | 24 | #define backlight_hw_init() true |
25 | void _backlight_on(void); | 25 | void backlight_hw_on(void); |
26 | void _backlight_off(void); | 26 | void backlight_hw_off(void); |
27 | 27 | ||
28 | #endif | 28 | #endif |
diff --git a/firmware/target/arm/iriver/h10/backlight-h10.c b/firmware/target/arm/iriver/h10/backlight-h10.c index db10f39057..80dfdd88c1 100644 --- a/firmware/target/arm/iriver/h10/backlight-h10.c +++ b/firmware/target/arm/iriver/h10/backlight-h10.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include "backlight-target.h" | 25 | #include "backlight-target.h" |
26 | #include "lcd.h" | 26 | #include "lcd.h" |
27 | 27 | ||
28 | void _backlight_on(void) | 28 | void backlight_hw_on(void) |
29 | { | 29 | { |
30 | #ifdef HAVE_LCD_ENABLE | 30 | #ifdef HAVE_LCD_ENABLE |
31 | lcd_enable(true); /* power on lcd + visible display */ | 31 | lcd_enable(true); /* power on lcd + visible display */ |
@@ -33,7 +33,7 @@ void _backlight_on(void) | |||
33 | GPIO_SET_BITWISE(GPIOL_OUTPUT_VAL, 0x20); | 33 | GPIO_SET_BITWISE(GPIOL_OUTPUT_VAL, 0x20); |
34 | } | 34 | } |
35 | 35 | ||
36 | void _backlight_off(void) | 36 | void backlight_hw_off(void) |
37 | { | 37 | { |
38 | GPIO_CLEAR_BITWISE(GPIOL_OUTPUT_VAL, 0x20); | 38 | GPIO_CLEAR_BITWISE(GPIOL_OUTPUT_VAL, 0x20); |
39 | #ifdef HAVE_LCD_ENABLE | 39 | #ifdef HAVE_LCD_ENABLE |
diff --git a/firmware/target/arm/olympus/mrobe-100/backlight-mr100.c b/firmware/target/arm/olympus/mrobe-100/backlight-mr100.c index f3891c5000..b39010ff0e 100644 --- a/firmware/target/arm/olympus/mrobe-100/backlight-mr100.c +++ b/firmware/target/arm/olympus/mrobe-100/backlight-mr100.c | |||
@@ -28,22 +28,22 @@ | |||
28 | static const int log_brightness[12] = {0,4,8,12,20,28,40,60,88,124,176,255}; | 28 | static const int log_brightness[12] = {0,4,8,12,20,28,40,60,88,124,176,255}; |
29 | 29 | ||
30 | /* Returns the current state of the backlight (true=ON, false=OFF). */ | 30 | /* Returns the current state of the backlight (true=ON, false=OFF). */ |
31 | bool _backlight_init(void) | 31 | bool backlight_hw_init(void) |
32 | { | 32 | { |
33 | return (GPO32_ENABLE & 0x1000000) ? true : false; | 33 | return (GPO32_ENABLE & 0x1000000) ? true : false; |
34 | } | 34 | } |
35 | 35 | ||
36 | void _backlight_hw_on(void) | 36 | void backlight_hw_on(void) |
37 | { | 37 | { |
38 | GPO32_ENABLE |= 0x1000000; | 38 | GPO32_ENABLE |= 0x1000000; |
39 | } | 39 | } |
40 | 40 | ||
41 | void _backlight_hw_off(void) | 41 | void backlight_hw_off(void) |
42 | { | 42 | { |
43 | GPO32_ENABLE &= ~0x1000000; | 43 | GPO32_ENABLE &= ~0x1000000; |
44 | } | 44 | } |
45 | 45 | ||
46 | void _buttonlight_set_brightness(int brightness) | 46 | void buttonlight_hw_brightness(int brightness) |
47 | { | 47 | { |
48 | /* clamp the brightness value */ | 48 | /* clamp the brightness value */ |
49 | brightness = MAX(0, MIN(15, brightness)); | 49 | brightness = MAX(0, MIN(15, brightness)); |
@@ -51,13 +51,13 @@ void _buttonlight_set_brightness(int brightness) | |||
51 | outl(MIN_BRIGHTNESS-(log_brightness[brightness - 1] << 16), 0x7000a010); | 51 | outl(MIN_BRIGHTNESS-(log_brightness[brightness - 1] << 16), 0x7000a010); |
52 | } | 52 | } |
53 | 53 | ||
54 | void _buttonlight_on(void) | 54 | void buttonlight_hw_on(void) |
55 | { | 55 | { |
56 | /* turn on all touchpad leds */ | 56 | /* turn on all touchpad leds */ |
57 | GPIOA_OUTPUT_VAL |= BUTTONLIGHT_ALL; | 57 | GPIOA_OUTPUT_VAL |= BUTTONLIGHT_ALL; |
58 | } | 58 | } |
59 | 59 | ||
60 | void _buttonlight_off(void) | 60 | void buttonlight_hw_off(void) |
61 | { | 61 | { |
62 | /* turn off all touchpad leds */ | 62 | /* turn off all touchpad leds */ |
63 | GPIOA_OUTPUT_VAL &= ~BUTTONLIGHT_ALL; | 63 | GPIOA_OUTPUT_VAL &= ~BUTTONLIGHT_ALL; |
diff --git a/firmware/target/arm/olympus/mrobe-100/backlight-target.h b/firmware/target/arm/olympus/mrobe-100/backlight-target.h index df25106d1a..725e1ad622 100644 --- a/firmware/target/arm/olympus/mrobe-100/backlight-target.h +++ b/firmware/target/arm/olympus/mrobe-100/backlight-target.h | |||
@@ -22,23 +22,20 @@ | |||
22 | #ifndef BACKLIGHT_TARGET_H | 22 | #ifndef BACKLIGHT_TARGET_H |
23 | #define BACKLIGHT_TARGET_H | 23 | #define BACKLIGHT_TARGET_H |
24 | 24 | ||
25 | bool _backlight_init(void); /* Returns backlight current state (true=ON). */ | 25 | bool backlight_hw_init(void); /* Returns backlight current state (true=ON). */ |
26 | void _backlight_hw_on(void); | 26 | void _backlight_hw_on(void); |
27 | void _backlight_hw_off(void); | 27 | void _backlight_hw_off(void); |
28 | 28 | ||
29 | #ifdef HAVE_REMOTE_LCD | 29 | #ifdef HAVE_REMOTE_LCD |
30 | void _remote_backlight_on(void); | 30 | void remote_backlight_hw_on(void); |
31 | void _remote_backlight_off(void); | 31 | void remote_backlight_hw_off(void); |
32 | #endif | 32 | #endif |
33 | 33 | ||
34 | #ifdef BOOTLOADER | 34 | #ifndef BOOTLOADER |
35 | #define _backlight_on() _backlight_hw_on() | 35 | #define _backlight_on_isr() backlight_hw_on() |
36 | #define _backlight_off() _backlight_hw_off() | 36 | #define _backlight_off_isr() backlight_hw_off() |
37 | #else | 37 | #define _backlight_on_normal() backlight_hw_on() |
38 | #define _backlight_on_isr() _backlight_hw_on() | 38 | #define _backlight_off_normal() backlight_hw_off() |
39 | #define _backlight_off_isr() _backlight_hw_off() | ||
40 | #define _backlight_on_normal() _backlight_hw_on() | ||
41 | #define _backlight_off_normal() _backlight_hw_off() | ||
42 | #define _BACKLIGHT_FADE_BOOST | 39 | #define _BACKLIGHT_FADE_BOOST |
43 | #endif | 40 | #endif |
44 | 41 | ||
@@ -53,8 +50,8 @@ void _remote_backlight_off(void); | |||
53 | BUTTONLIGHT_DISPLAY | BUTTONLIGHT_LEFT | \ | 50 | BUTTONLIGHT_DISPLAY | BUTTONLIGHT_LEFT | \ |
54 | BUTTONLIGHT_RIGHT | BUTTONLIGHT_SCROLL) | 51 | BUTTONLIGHT_RIGHT | BUTTONLIGHT_SCROLL) |
55 | 52 | ||
56 | void _buttonlight_set_brightness(int brightness); | 53 | void buttonlight_hw_brightness(int brightness); |
57 | void _buttonlight_on(void); | 54 | void buttonlight_hw_on(void); |
58 | void _buttonlight_off(void); | 55 | void buttonlight_hw_off(void); |
59 | 56 | ||
60 | #endif | 57 | #endif |
diff --git a/firmware/target/arm/olympus/mrobe-100/lcd-remote-mr100.c b/firmware/target/arm/olympus/mrobe-100/lcd-remote-mr100.c index 34b114910a..22bc4fb0d8 100644 --- a/firmware/target/arm/olympus/mrobe-100/lcd-remote-mr100.c +++ b/firmware/target/arm/olympus/mrobe-100/lcd-remote-mr100.c | |||
@@ -552,13 +552,13 @@ void lcd_remote_update_rect(int x, int y, int width, int height) | |||
552 | rc_status |= RC_UPDATE_LCD; | 552 | rc_status |= RC_UPDATE_LCD; |
553 | } | 553 | } |
554 | 554 | ||
555 | void _remote_backlight_on(void) | 555 | void remote_backlight_hw_on(void) |
556 | { | 556 | { |
557 | rc_status |= RC_BACKLIGHT_ON; | 557 | rc_status |= RC_BACKLIGHT_ON; |
558 | rc_status |= RC_UPDATE_CONTROLLER; | 558 | rc_status |= RC_UPDATE_CONTROLLER; |
559 | } | 559 | } |
560 | 560 | ||
561 | void _remote_backlight_off(void) | 561 | void remote_backlight_hw_off(void) |
562 | { | 562 | { |
563 | rc_status &= ~RC_BACKLIGHT_ON; | 563 | rc_status &= ~RC_BACKLIGHT_ON; |
564 | rc_status |= RC_UPDATE_CONTROLLER; | 564 | rc_status |= RC_UPDATE_CONTROLLER; |
diff --git a/firmware/target/arm/pbell/vibe500/backlight-target.h b/firmware/target/arm/pbell/vibe500/backlight-target.h index 7fd6d877fb..396fea3007 100644 --- a/firmware/target/arm/pbell/vibe500/backlight-target.h +++ b/firmware/target/arm/pbell/vibe500/backlight-target.h | |||
@@ -21,18 +21,18 @@ | |||
21 | #ifndef BACKLIGHT_TARGET_H | 21 | #ifndef BACKLIGHT_TARGET_H |
22 | #define BACKLIGHT_TARGET_H | 22 | #define BACKLIGHT_TARGET_H |
23 | 23 | ||
24 | #define _backlight_init() true | 24 | #define backlight_hw_init() true |
25 | void _backlight_on(void); | 25 | void backlight_hw_on(void); |
26 | void _backlight_off(void); | 26 | void backlight_hw_off(void); |
27 | 27 | ||
28 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS | 28 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS |
29 | void _backlight_set_brightness(int brightness); | 29 | void backlight_hw_brightness(int brightness); |
30 | #endif | 30 | #endif |
31 | 31 | ||
32 | #ifdef HAVE_BUTTON_LIGHT | 32 | #ifdef HAVE_BUTTON_LIGHT |
33 | void _buttonlight_on(void); | 33 | voidbuttonlight_hw_on(void); |
34 | void _buttonlight_off(void); | 34 | voidbuttonlight_hw_off(void); |
35 | void _buttonlight_set_brightness(int brightness); | 35 | voidbuttonlight_hw_set_brightness(int brightness); |
36 | #endif | 36 | #endif |
37 | 37 | ||
38 | #endif /* BACKLIGHT_TARGET.H */ | 38 | #endif /* BACKLIGHT_TARGET.H */ |
diff --git a/firmware/target/arm/pbell/vibe500/backlight-vibe500.c b/firmware/target/arm/pbell/vibe500/backlight-vibe500.c index ab71012bdb..1d03ddddf0 100644 --- a/firmware/target/arm/pbell/vibe500/backlight-vibe500.c +++ b/firmware/target/arm/pbell/vibe500/backlight-vibe500.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include "lcd.h" | 27 | #include "lcd.h" |
28 | #include "synaptics-mep.h" | 28 | #include "synaptics-mep.h" |
29 | 29 | ||
30 | void _backlight_on(void) | 30 | void backlight_hw_on(void) |
31 | { | 31 | { |
32 | #ifdef HAVE_LCD_ENABLE | 32 | #ifdef HAVE_LCD_ENABLE |
33 | lcd_enable(true); /* power on lcd + visible display */ | 33 | lcd_enable(true); /* power on lcd + visible display */ |
@@ -35,7 +35,7 @@ void _backlight_on(void) | |||
35 | GPIO_SET_BITWISE(GPIOJ_OUTPUT_VAL, 0x01); | 35 | GPIO_SET_BITWISE(GPIOJ_OUTPUT_VAL, 0x01); |
36 | } | 36 | } |
37 | 37 | ||
38 | void _backlight_off(void) | 38 | void backlight_hw_off(void) |
39 | { | 39 | { |
40 | GPIO_CLEAR_BITWISE(GPIOJ_OUTPUT_VAL, 0x01); | 40 | GPIO_CLEAR_BITWISE(GPIOJ_OUTPUT_VAL, 0x01); |
41 | #ifdef HAVE_LCD_ENABLE | 41 | #ifdef HAVE_LCD_ENABLE |
@@ -47,7 +47,7 @@ void _backlight_off(void) | |||
47 | static const int brightness_vals[16] = | 47 | static const int brightness_vals[16] = |
48 | {255,237,219,201,183,165,147,130,112,94,76,58,40,22,5,0}; | 48 | {255,237,219,201,183,165,147,130,112,94,76,58,40,22,5,0}; |
49 | 49 | ||
50 | void _backlight_set_brightness(int brightness) | 50 | void backlight_hw_brightness(int brightness) |
51 | { | 51 | { |
52 | /* From PB Vibe Bootloader and OF */ | 52 | /* From PB Vibe Bootloader and OF */ |
53 | DEV_INIT1&=0xFFFF3F3F; | 53 | DEV_INIT1&=0xFFFF3F3F; |
@@ -60,7 +60,7 @@ void _backlight_set_brightness(int brightness) | |||
60 | #ifdef HAVE_BUTTON_LIGHT | 60 | #ifdef HAVE_BUTTON_LIGHT |
61 | static unsigned short buttonlight_status = 0; | 61 | static unsigned short buttonlight_status = 0; |
62 | 62 | ||
63 | void _buttonlight_on(void) | 63 | void buttonlight_hw_on(void) |
64 | { | 64 | { |
65 | if (!buttonlight_status) | 65 | if (!buttonlight_status) |
66 | { | 66 | { |
@@ -69,7 +69,7 @@ void _buttonlight_on(void) | |||
69 | } | 69 | } |
70 | } | 70 | } |
71 | 71 | ||
72 | void _buttonlight_off(void) | 72 | void buttonlight_hw_off(void) |
73 | { | 73 | { |
74 | if (buttonlight_status) | 74 | if (buttonlight_status) |
75 | { | 75 | { |
@@ -78,7 +78,7 @@ void _buttonlight_off(void) | |||
78 | } | 78 | } |
79 | } | 79 | } |
80 | 80 | ||
81 | void _buttonlight_set_brightness(int brightness) | 81 | void buttonlight_hw_brightness(int brightness) |
82 | { | 82 | { |
83 | /* no brightness control, but lights stays on - for compatibility */ | 83 | /* no brightness control, but lights stays on - for compatibility */ |
84 | (void)brightness; | 84 | (void)brightness; |
diff --git a/firmware/target/arm/philips/hdd1630/backlight-hdd1630.c b/firmware/target/arm/philips/hdd1630/backlight-hdd1630.c index 95a9ad8b86..efa85723a1 100644 --- a/firmware/target/arm/philips/hdd1630/backlight-hdd1630.c +++ b/firmware/target/arm/philips/hdd1630/backlight-hdd1630.c | |||
@@ -29,13 +29,13 @@ | |||
29 | static const int brightness_vals[16] = | 29 | static const int brightness_vals[16] = |
30 | {255,237,219,201,183,165,147,130,112,94,76,58,40,22,5,0}; | 30 | {255,237,219,201,183,165,147,130,112,94,76,58,40,22,5,0}; |
31 | 31 | ||
32 | void _backlight_set_brightness(int brightness) | 32 | void backlight_hw_brightness(int brightness) |
33 | { | 33 | { |
34 | outl(0x80000000 | (brightness_vals[brightness-1] << 16), 0x7000a000); | 34 | outl(0x80000000 | (brightness_vals[brightness-1] << 16), 0x7000a000); |
35 | } | 35 | } |
36 | #endif | 36 | #endif |
37 | 37 | ||
38 | void _backlight_on(void) | 38 | void backlight_hw_on(void) |
39 | { | 39 | { |
40 | #ifdef HAVE_LCD_ENABLE | 40 | #ifdef HAVE_LCD_ENABLE |
41 | lcd_enable(true); | 41 | lcd_enable(true); |
@@ -45,7 +45,7 @@ void _backlight_on(void) | |||
45 | GPO32_VAL |= 0x400; | 45 | GPO32_VAL |= 0x400; |
46 | } | 46 | } |
47 | 47 | ||
48 | void _backlight_off(void) | 48 | void backlight_hw_off(void) |
49 | { | 49 | { |
50 | GPO32_ENABLE |= 0x400; | 50 | GPO32_ENABLE |= 0x400; |
51 | GPO32_VAL &=~0x400; | 51 | GPO32_VAL &=~0x400; |
@@ -60,7 +60,7 @@ void _backlight_off(void) | |||
60 | static unsigned short buttonight_brightness = DEFAULT_BRIGHTNESS_SETTING - 1; | 60 | static unsigned short buttonight_brightness = DEFAULT_BRIGHTNESS_SETTING - 1; |
61 | static unsigned short buttonlight_status = 0; | 61 | static unsigned short buttonlight_status = 0; |
62 | 62 | ||
63 | void _buttonlight_on(void) | 63 | void buttonlight_hw_on(void) |
64 | { | 64 | { |
65 | if (!buttonlight_status) | 65 | if (!buttonlight_status) |
66 | { | 66 | { |
@@ -69,7 +69,7 @@ void _buttonlight_on(void) | |||
69 | } | 69 | } |
70 | } | 70 | } |
71 | 71 | ||
72 | void _buttonlight_off(void) | 72 | void buttonlight_hw_off(void) |
73 | { | 73 | { |
74 | if (buttonlight_status) | 74 | if (buttonlight_status) |
75 | { | 75 | { |
@@ -78,7 +78,7 @@ void _buttonlight_off(void) | |||
78 | } | 78 | } |
79 | } | 79 | } |
80 | 80 | ||
81 | void _buttonlight_set_brightness(int brightness) | 81 | void buttonlight_hw_brightness(int brightness) |
82 | { | 82 | { |
83 | buttonight_brightness = brightness - 1; | 83 | buttonight_brightness = brightness - 1; |
84 | touchpad_set_buttonlights(BUTTONLIGHT_MASK, buttonight_brightness); | 84 | touchpad_set_buttonlights(BUTTONLIGHT_MASK, buttonight_brightness); |
diff --git a/firmware/target/arm/philips/hdd1630/backlight-target.h b/firmware/target/arm/philips/hdd1630/backlight-target.h index 63f3f5a8df..d79f09a8a6 100644 --- a/firmware/target/arm/philips/hdd1630/backlight-target.h +++ b/firmware/target/arm/philips/hdd1630/backlight-target.h | |||
@@ -21,18 +21,18 @@ | |||
21 | #ifndef BACKLIGHT_TARGET_H | 21 | #ifndef BACKLIGHT_TARGET_H |
22 | #define BACKLIGHT_TARGET_H | 22 | #define BACKLIGHT_TARGET_H |
23 | 23 | ||
24 | #define _backlight_init() true | 24 | #define backlight_hw_init() true |
25 | void _backlight_on(void); | 25 | void backlight_hw_on(void); |
26 | void _backlight_off(void); | 26 | void backlight_hw_off(void); |
27 | 27 | ||
28 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS | 28 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS |
29 | void _backlight_set_brightness(int brightness); | 29 | void backlight_hw_brightness(int brightness); |
30 | #endif | 30 | #endif |
31 | 31 | ||
32 | #ifdef HAVE_BUTTON_LIGHT | 32 | #ifdef HAVE_BUTTON_LIGHT |
33 | void _buttonlight_on(void); | 33 | void buttonlight_hw_on(void); |
34 | void _buttonlight_off(void); | 34 | void buttonlight_hw_off(void); |
35 | void _buttonlight_set_brightness(int brightness); | 35 | void buttonlight_hw_brightness(int brightness); |
36 | #endif | 36 | #endif |
37 | 37 | ||
38 | #endif | 38 | #endif |
diff --git a/firmware/target/arm/philips/hdd6330/backlight-hdd6330.c b/firmware/target/arm/philips/hdd6330/backlight-hdd6330.c index 46c03e712e..b6422a5aa9 100644 --- a/firmware/target/arm/philips/hdd6330/backlight-hdd6330.c +++ b/firmware/target/arm/philips/hdd6330/backlight-hdd6330.c | |||
@@ -29,13 +29,13 @@ | |||
29 | static const int brightness_vals[16] = | 29 | static const int brightness_vals[16] = |
30 | {255,237,219,201,183,165,147,130,112,94,76,58,40,22,5,0}; | 30 | {255,237,219,201,183,165,147,130,112,94,76,58,40,22,5,0}; |
31 | 31 | ||
32 | void _backlight_set_brightness(int brightness) | 32 | void backlight_hw_brightness(int brightness) |
33 | { | 33 | { |
34 | outl(0x80000000 | (brightness_vals[brightness-1] << 16), 0x7000a000); | 34 | outl(0x80000000 | (brightness_vals[brightness-1] << 16), 0x7000a000); |
35 | } | 35 | } |
36 | #endif | 36 | #endif |
37 | 37 | ||
38 | void _backlight_on(void) | 38 | void backlight_hw_on(void) |
39 | { | 39 | { |
40 | #ifdef HAVE_LCD_ENABLE | 40 | #ifdef HAVE_LCD_ENABLE |
41 | lcd_enable(true); | 41 | lcd_enable(true); |
@@ -45,7 +45,7 @@ void _backlight_on(void) | |||
45 | GPO32_VAL |= 0x400; | 45 | GPO32_VAL |= 0x400; |
46 | } | 46 | } |
47 | 47 | ||
48 | void _backlight_off(void) | 48 | void backlight_hw_off(void) |
49 | { | 49 | { |
50 | GPO32_ENABLE |= 0x400; | 50 | GPO32_ENABLE |= 0x400; |
51 | GPO32_VAL &= ~0x400; | 51 | GPO32_VAL &= ~0x400; |
@@ -60,7 +60,7 @@ void _backlight_off(void) | |||
60 | static unsigned short buttonight_brightness = DEFAULT_BRIGHTNESS_SETTING - 1; | 60 | static unsigned short buttonight_brightness = DEFAULT_BRIGHTNESS_SETTING - 1; |
61 | static unsigned short buttonlight_status = 0; | 61 | static unsigned short buttonlight_status = 0; |
62 | 62 | ||
63 | void _buttonlight_on(void) | 63 | void buttonlight_hw_on(void) |
64 | { | 64 | { |
65 | if (!buttonlight_status) | 65 | if (!buttonlight_status) |
66 | { | 66 | { |
@@ -77,7 +77,7 @@ void _buttonlight_on(void) | |||
77 | } | 77 | } |
78 | } | 78 | } |
79 | 79 | ||
80 | void _buttonlight_off(void) | 80 | void buttonlight_hw_off(void) |
81 | { | 81 | { |
82 | if (buttonlight_status) | 82 | if (buttonlight_status) |
83 | { | 83 | { |
@@ -89,7 +89,7 @@ void _buttonlight_off(void) | |||
89 | } | 89 | } |
90 | } | 90 | } |
91 | 91 | ||
92 | void _buttonlight_set_brightness(int brightness) | 92 | void buttonlight_hw_brightness(int brightness) |
93 | { | 93 | { |
94 | touchpad_set_parameter(0x01,0x21,0x01); | 94 | touchpad_set_parameter(0x01,0x21,0x01); |
95 | touchpad_set_parameter(0x00,0x22,0x15); | 95 | touchpad_set_parameter(0x00,0x22,0x15); |
diff --git a/firmware/target/arm/philips/hdd6330/backlight-target.h b/firmware/target/arm/philips/hdd6330/backlight-target.h index 63f3f5a8df..d79f09a8a6 100644 --- a/firmware/target/arm/philips/hdd6330/backlight-target.h +++ b/firmware/target/arm/philips/hdd6330/backlight-target.h | |||
@@ -21,18 +21,18 @@ | |||
21 | #ifndef BACKLIGHT_TARGET_H | 21 | #ifndef BACKLIGHT_TARGET_H |
22 | #define BACKLIGHT_TARGET_H | 22 | #define BACKLIGHT_TARGET_H |
23 | 23 | ||
24 | #define _backlight_init() true | 24 | #define backlight_hw_init() true |
25 | void _backlight_on(void); | 25 | void backlight_hw_on(void); |
26 | void _backlight_off(void); | 26 | void backlight_hw_off(void); |
27 | 27 | ||
28 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS | 28 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS |
29 | void _backlight_set_brightness(int brightness); | 29 | void backlight_hw_brightness(int brightness); |
30 | #endif | 30 | #endif |
31 | 31 | ||
32 | #ifdef HAVE_BUTTON_LIGHT | 32 | #ifdef HAVE_BUTTON_LIGHT |
33 | void _buttonlight_on(void); | 33 | void buttonlight_hw_on(void); |
34 | void _buttonlight_off(void); | 34 | void buttonlight_hw_off(void); |
35 | void _buttonlight_set_brightness(int brightness); | 35 | void buttonlight_hw_brightness(int brightness); |
36 | #endif | 36 | #endif |
37 | 37 | ||
38 | #endif | 38 | #endif |
diff --git a/firmware/target/arm/philips/power-hdd.c b/firmware/target/arm/philips/power-hdd.c index a7f1302a7c..d38c6de2b4 100644 --- a/firmware/target/arm/philips/power-hdd.c +++ b/firmware/target/arm/philips/power-hdd.c | |||
@@ -111,7 +111,7 @@ bool ide_powered(void) | |||
111 | 111 | ||
112 | void power_off(void) | 112 | void power_off(void) |
113 | { | 113 | { |
114 | _backlight_off(); | 114 | backlight_hw_off(); |
115 | sleep(HZ/10); | 115 | sleep(HZ/10); |
116 | 116 | ||
117 | /* power off bit */ | 117 | /* power off bit */ |
diff --git a/firmware/target/arm/philips/sa9200/backlight-sa9200.c b/firmware/target/arm/philips/sa9200/backlight-sa9200.c index 0de4c05df5..7046d09910 100644 --- a/firmware/target/arm/philips/sa9200/backlight-sa9200.c +++ b/firmware/target/arm/philips/sa9200/backlight-sa9200.c | |||
@@ -27,12 +27,12 @@ | |||
27 | #include "synaptics-mep.h" | 27 | #include "synaptics-mep.h" |
28 | #include "lcd.h" | 28 | #include "lcd.h" |
29 | 29 | ||
30 | void _backlight_set_brightness(int brightness) | 30 | void backlight_hw_brightness(int brightness) |
31 | { | 31 | { |
32 | ascodec_write(AS3514_DCDC15, brightness); | 32 | ascodec_write(AS3514_DCDC15, brightness); |
33 | } | 33 | } |
34 | 34 | ||
35 | void _backlight_on(void) | 35 | void backlight_hw_on(void) |
36 | { | 36 | { |
37 | #ifdef HAVE_LCD_ENABLE | 37 | #ifdef HAVE_LCD_ENABLE |
38 | lcd_enable(true); /* power on lcd + visible display */ | 38 | lcd_enable(true); /* power on lcd + visible display */ |
@@ -40,13 +40,13 @@ void _backlight_on(void) | |||
40 | #if (CONFIG_BACKLIGHT_FADING != BACKLIGHT_FADING_SW_SETTING) /* in bootloader/sim */ | 40 | #if (CONFIG_BACKLIGHT_FADING != BACKLIGHT_FADING_SW_SETTING) /* in bootloader/sim */ |
41 | /* if we set the brightness to the settings value, then fading up | 41 | /* if we set the brightness to the settings value, then fading up |
42 | * is glitchy */ | 42 | * is glitchy */ |
43 | _backlight_set_brightness(backlight_brightness); | 43 | backlight_hw_brightness(backlight_brightness); |
44 | #endif | 44 | #endif |
45 | } | 45 | } |
46 | 46 | ||
47 | void _backlight_off(void) | 47 | void backlight_hw_off(void) |
48 | { | 48 | { |
49 | _backlight_set_brightness(0); | 49 | backlight_hw_brightness(0); |
50 | #ifdef HAVE_LCD_ENABLE | 50 | #ifdef HAVE_LCD_ENABLE |
51 | lcd_enable(false); /* power off visible display */ | 51 | lcd_enable(false); /* power off visible display */ |
52 | #endif | 52 | #endif |
@@ -58,7 +58,7 @@ void _backlight_off(void) | |||
58 | #define BUTTONLIGHT_MAX 0x0f | 58 | #define BUTTONLIGHT_MAX 0x0f |
59 | static unsigned short buttonlight_status = 0; | 59 | static unsigned short buttonlight_status = 0; |
60 | 60 | ||
61 | void _buttonlight_on(void) | 61 | void buttonlight_hw_on(void) |
62 | { | 62 | { |
63 | if (!buttonlight_status) | 63 | if (!buttonlight_status) |
64 | { | 64 | { |
@@ -68,7 +68,7 @@ void _buttonlight_on(void) | |||
68 | } | 68 | } |
69 | } | 69 | } |
70 | 70 | ||
71 | void _buttonlight_off(void) | 71 | void buttonlight_hw_off(void) |
72 | { | 72 | { |
73 | if (buttonlight_status) | 73 | if (buttonlight_status) |
74 | { | 74 | { |
diff --git a/firmware/target/arm/philips/sa9200/backlight-target.h b/firmware/target/arm/philips/sa9200/backlight-target.h index 9d695e5a22..349f2e2b57 100644 --- a/firmware/target/arm/philips/sa9200/backlight-target.h +++ b/firmware/target/arm/philips/sa9200/backlight-target.h | |||
@@ -21,15 +21,15 @@ | |||
21 | #ifndef BACKLIGHT_TARGET_H | 21 | #ifndef BACKLIGHT_TARGET_H |
22 | #define BACKLIGHT_TARGET_H | 22 | #define BACKLIGHT_TARGET_H |
23 | 23 | ||
24 | #define _backlight_init() true | 24 | #define backlight_hw_init() true |
25 | void _backlight_on(void); | 25 | void backlight_hw_on(void); |
26 | void _backlight_off(void); | 26 | void backlight_hw_off(void); |
27 | void _backlight_set_brightness(int brightness); | 27 | void backlight_hw_brightness(int brightness); |
28 | int __backlight_is_on(void); | 28 | int __backlight_is_on(void); |
29 | 29 | ||
30 | #ifdef HAVE_BUTTON_LIGHT | 30 | #ifdef HAVE_BUTTON_LIGHT |
31 | void _buttonlight_on(void); | 31 | void buttonlight_hw_on(void); |
32 | void _buttonlight_off(void); | 32 | void buttonlight_hw_off(void); |
33 | #endif | 33 | #endif |
34 | 34 | ||
35 | #endif | 35 | #endif |
diff --git a/firmware/target/arm/pnx0101/backlight-target.h b/firmware/target/arm/pnx0101/backlight-target.h index 40152f1fda..7ebe85d66f 100644 --- a/firmware/target/arm/pnx0101/backlight-target.h +++ b/firmware/target/arm/pnx0101/backlight-target.h | |||
@@ -21,8 +21,8 @@ | |||
21 | #ifndef BACKLIGHT_TARGET_H | 21 | #ifndef BACKLIGHT_TARGET_H |
22 | #define BACKLIGHT_TARGET_H | 22 | #define BACKLIGHT_TARGET_H |
23 | 23 | ||
24 | #define _backlight_init() true | 24 | #define backlight_hw_init() true |
25 | void _backlight_on(void); | 25 | void backlight_hw_on(void); |
26 | void _backlight_off(void); | 26 | void backlight_hw_off(void); |
27 | 27 | ||
28 | #endif | 28 | #endif |
diff --git a/firmware/target/arm/pnx0101/iriver-ifp7xx/backlight-ifp7xx.c b/firmware/target/arm/pnx0101/iriver-ifp7xx/backlight-ifp7xx.c index 6cf2422d60..8be7a59de2 100644 --- a/firmware/target/arm/pnx0101/iriver-ifp7xx/backlight-ifp7xx.c +++ b/firmware/target/arm/pnx0101/iriver-ifp7xx/backlight-ifp7xx.c | |||
@@ -24,12 +24,12 @@ | |||
24 | #include "backlight.h" | 24 | #include "backlight.h" |
25 | #include "lcd.h" | 25 | #include "lcd.h" |
26 | 26 | ||
27 | void _backlight_on(void) | 27 | void backlight_hw_on(void) |
28 | { | 28 | { |
29 | GPIO3_SET = 1; | 29 | GPIO3_SET = 1; |
30 | } | 30 | } |
31 | 31 | ||
32 | void _backlight_off(void) | 32 | void backlight_hw_off(void) |
33 | { | 33 | { |
34 | GPIO3_CLR = 1; | 34 | GPIO3_CLR = 1; |
35 | } | 35 | } |
diff --git a/firmware/target/arm/rk27xx/backlight-rk27xx.c b/firmware/target/arm/rk27xx/backlight-rk27xx.c index 361d18c948..1756fcdb29 100644 --- a/firmware/target/arm/rk27xx/backlight-rk27xx.c +++ b/firmware/target/arm/rk27xx/backlight-rk27xx.c | |||
@@ -77,7 +77,7 @@ static const unsigned short lin_brightness[] = { | |||
77 | }; | 77 | }; |
78 | #endif | 78 | #endif |
79 | 79 | ||
80 | bool _backlight_init(void) | 80 | bool backlight_hw_init(void) |
81 | { | 81 | { |
82 | /* configure PD4 as output */ | 82 | /* configure PD4 as output */ |
83 | GPIO_PDCON |= (1<<4); | 83 | GPIO_PDCON |= (1<<4); |
@@ -105,7 +105,7 @@ bool _backlight_init(void) | |||
105 | return true; | 105 | return true; |
106 | } | 106 | } |
107 | 107 | ||
108 | void _backlight_on(void) | 108 | void backlight_hw_on(void) |
109 | { | 109 | { |
110 | #ifdef HAVE_LCD_ENABLE | 110 | #ifdef HAVE_LCD_ENABLE |
111 | lcd_enable(true); | 111 | lcd_enable(true); |
@@ -120,7 +120,7 @@ void _backlight_on(void) | |||
120 | PWMT0_CTRL |= (1<<3) | (1<<0); | 120 | PWMT0_CTRL |= (1<<3) | (1<<0); |
121 | } | 121 | } |
122 | 122 | ||
123 | void _backlight_off(void) | 123 | void backlight_hw_off(void) |
124 | { | 124 | { |
125 | /* setup PWM0 pin as GPIO which is pulled low */ | 125 | /* setup PWM0 pin as GPIO which is pulled low */ |
126 | SCU_IOMUXB_CON &= ~(1<<11); | 126 | SCU_IOMUXB_CON &= ~(1<<11); |
@@ -135,7 +135,7 @@ void _backlight_off(void) | |||
135 | #endif | 135 | #endif |
136 | } | 136 | } |
137 | 137 | ||
138 | void _backlight_set_brightness(int val) | 138 | void backlight_hw_brightness(int val) |
139 | { | 139 | { |
140 | brightness = val & 0x1f; | 140 | brightness = val & 0x1f; |
141 | PWMT0_HRC = lin_brightness[brightness]; | 141 | PWMT0_HRC = lin_brightness[brightness]; |
diff --git a/firmware/target/arm/rk27xx/backlight-target.h b/firmware/target/arm/rk27xx/backlight-target.h index 91579b080d..a436186791 100644 --- a/firmware/target/arm/rk27xx/backlight-target.h +++ b/firmware/target/arm/rk27xx/backlight-target.h | |||
@@ -21,9 +21,9 @@ | |||
21 | #ifndef BACKLIGHT_TARGET_H | 21 | #ifndef BACKLIGHT_TARGET_H |
22 | #define BACKLIGHT_TARGET_H | 22 | #define BACKLIGHT_TARGET_H |
23 | 23 | ||
24 | bool _backlight_init(void); | 24 | bool backlight_hw_init(void); |
25 | void _backlight_on(void); | 25 | void backlight_hw_on(void); |
26 | void _backlight_off(void); | 26 | void backlight_hw_off(void); |
27 | void _backlight_set_brightness(int brightness); | 27 | void backlight_hw_brightness(int brightness); |
28 | 28 | ||
29 | #endif | 29 | #endif |
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 f3d9aac168..c30eb8d812 100644 --- a/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c +++ b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c | |||
@@ -74,7 +74,7 @@ static unsigned char buttonlight_target; | |||
74 | static unsigned short buttonlight_trigger_now; | 74 | static unsigned short buttonlight_trigger_now; |
75 | 75 | ||
76 | /* Assumes that the backlight has been initialized */ | 76 | /* Assumes that the backlight has been initialized */ |
77 | void _backlight_set_brightness(int brightness) | 77 | void backlight_hw_brightness(int brightness) |
78 | { | 78 | { |
79 | /* stop the interrupt from messing us up */ | 79 | /* stop the interrupt from messing us up */ |
80 | backlight_control = BACKLIGHT_CONTROL_IDLE; | 80 | backlight_control = BACKLIGHT_CONTROL_IDLE; |
@@ -335,7 +335,7 @@ static void __backlight_dim(bool dim_now) | |||
335 | backlight_control = BACKLIGHT_CONTROL_FADE; | 335 | backlight_control = BACKLIGHT_CONTROL_FADE; |
336 | } | 336 | } |
337 | 337 | ||
338 | void _backlight_on(void) | 338 | void backlight_hw_on(void) |
339 | { | 339 | { |
340 | #ifdef HAVE_LCD_ENABLE | 340 | #ifdef HAVE_LCD_ENABLE |
341 | lcd_enable(true); /* power on lcd + visible display */ | 341 | lcd_enable(true); /* power on lcd + visible display */ |
@@ -343,7 +343,7 @@ void _backlight_on(void) | |||
343 | __backlight_dim(false); | 343 | __backlight_dim(false); |
344 | } | 344 | } |
345 | 345 | ||
346 | void _backlight_off(void) | 346 | void backlight_hw_off(void) |
347 | { | 347 | { |
348 | __backlight_dim(true); | 348 | __backlight_dim(true); |
349 | } | 349 | } |
@@ -373,12 +373,12 @@ static void __buttonlight_dim(bool dim_now) | |||
373 | buttonlight_control = BUTTONLIGHT_CONTROL_FADE; | 373 | buttonlight_control = BUTTONLIGHT_CONTROL_FADE; |
374 | } | 374 | } |
375 | 375 | ||
376 | void _buttonlight_on(void) | 376 | void buttonlight_hw_on(void) |
377 | { | 377 | { |
378 | __buttonlight_dim(false); | 378 | __buttonlight_dim(false); |
379 | } | 379 | } |
380 | 380 | ||
381 | void _buttonlight_off(void) | 381 | void buttonlight_hw_off(void) |
382 | { | 382 | { |
383 | #ifndef BOOTLOADER | 383 | #ifndef BOOTLOADER |
384 | if(buttonlight_get_current_timeout() > 0) | 384 | if(buttonlight_get_current_timeout() > 0) |
@@ -388,7 +388,7 @@ void _buttonlight_off(void) | |||
388 | __buttonlight_off(); | 388 | __buttonlight_off(); |
389 | } | 389 | } |
390 | 390 | ||
391 | void _buttonlight_set_brightness(int brightness) | 391 | void buttonlight_hw_brightness(int brightness) |
392 | { | 392 | { |
393 | /* stop the interrupt from messing us up */ | 393 | /* stop the interrupt from messing us up */ |
394 | buttonlight_control = BUTTONLIGHT_CONTROL_IDLE; | 394 | buttonlight_control = BUTTONLIGHT_CONTROL_IDLE; |
@@ -396,7 +396,7 @@ void _buttonlight_set_brightness(int brightness) | |||
396 | buttonlight_control = BUTTONLIGHT_CONTROL_SET; | 396 | buttonlight_control = BUTTONLIGHT_CONTROL_SET; |
397 | } | 397 | } |
398 | 398 | ||
399 | bool _backlight_init(void) | 399 | bool backlight_hw_init(void) |
400 | { | 400 | { |
401 | unsigned char brightness = log_brightness[DEFAULT_BRIGHTNESS_SETTING]; | 401 | unsigned char brightness = log_brightness[DEFAULT_BRIGHTNESS_SETTING]; |
402 | buttonlight_brightness = brightness; | 402 | buttonlight_brightness = brightness; |
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/backlight-target.h b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-target.h index 8db2b11041..ef30babc2f 100644 --- a/firmware/target/arm/s3c2440/gigabeat-fx/backlight-target.h +++ b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-target.h | |||
@@ -43,12 +43,12 @@ void __buttonlight_trigger(void); | |||
43 | /* See enum buttonlight_mode for available functions */ | 43 | /* See enum buttonlight_mode for available functions */ |
44 | void __buttonlight_mode(enum buttonlight_mode mode); | 44 | void __buttonlight_mode(enum buttonlight_mode mode); |
45 | 45 | ||
46 | bool _backlight_init(void); | 46 | bool backlight_hw_init(void); |
47 | void _backlight_on(void); | 47 | void backlight_hw_on(void); |
48 | void _backlight_off(void); | 48 | void backlight_hw_off(void); |
49 | void _backlight_set_brightness(int brightness); | 49 | void backlight_hw_brightness(int brightness); |
50 | 50 | ||
51 | void _buttonlight_set_brightness(int brightness); | 51 | void buttonlight_hw_brightness(int brightness); |
52 | void _buttonlight_on(void); | 52 | void buttonlight_hw_on(void); |
53 | void _buttonlight_off(void); | 53 | void buttonlight_hw_off(void); |
54 | #endif | 54 | #endif |
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/power-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/power-meg-fx.c index ad9098dd8a..e31a633aca 100644 --- a/firmware/target/arm/s3c2440/gigabeat-fx/power-meg-fx.c +++ b/firmware/target/arm/s3c2440/gigabeat-fx/power-meg-fx.c | |||
@@ -81,8 +81,8 @@ void power_off(void) | |||
81 | int(*reboot_point)(void); | 81 | int(*reboot_point)(void); |
82 | reboot_point=(void*)(unsigned char*) 0x00000000; | 82 | reboot_point=(void*)(unsigned char*) 0x00000000; |
83 | /* turn off backlight and wait for 1 second */ | 83 | /* turn off backlight and wait for 1 second */ |
84 | _backlight_off(); | 84 | backlight_hw_off(); |
85 | _buttonlight_off(); | 85 | buttonlight_hw_off(); |
86 | sleep(HZ); | 86 | sleep(HZ); |
87 | 87 | ||
88 | /* Do this to allow the drive to properly reset when player restarts | 88 | /* Do this to allow the drive to properly reset when player restarts |
diff --git a/firmware/target/arm/s3c2440/mini2440/backlight-mini2440.c b/firmware/target/arm/s3c2440/mini2440/backlight-mini2440.c index b39bfc4949..c4b93da9bc 100644 --- a/firmware/target/arm/s3c2440/mini2440/backlight-mini2440.c +++ b/firmware/target/arm/s3c2440/mini2440/backlight-mini2440.c | |||
@@ -46,7 +46,7 @@ static unsigned char backlight_target; | |||
46 | 46 | ||
47 | 47 | ||
48 | /* Assumes that the backlight has been initialized */ | 48 | /* Assumes that the backlight has been initialized */ |
49 | void _backlight_set_brightness(int brightness) | 49 | void backlight_hw_brightness(int brightness) |
50 | { | 50 | { |
51 | if (brightness < 0) | 51 | if (brightness < 0) |
52 | brightness = 0; | 52 | brightness = 0; |
@@ -86,22 +86,22 @@ static void led_control_service(void) | |||
86 | backlight_control = BACKLIGHT_CONTROL_IDLE; | 86 | backlight_control = BACKLIGHT_CONTROL_IDLE; |
87 | break; | 87 | break; |
88 | case BACKLIGHT_CONTROL_OFF: | 88 | case BACKLIGHT_CONTROL_OFF: |
89 | _backlight_set_brightness(0); | 89 | backlight_hw_brightness(0); |
90 | backlight_control = BACKLIGHT_CONTROL_IDLE; | 90 | backlight_control = BACKLIGHT_CONTROL_IDLE; |
91 | break; | 91 | break; |
92 | case BACKLIGHT_CONTROL_ON: | 92 | case BACKLIGHT_CONTROL_ON: |
93 | _backlight_set_brightness(DEFAULT_BRIGHTNESS_SETTING); | 93 | backlight_hw_brightness(DEFAULT_BRIGHTNESS_SETTING); |
94 | backlight_control = BACKLIGHT_CONTROL_IDLE; | 94 | backlight_control = BACKLIGHT_CONTROL_IDLE; |
95 | break; | 95 | break; |
96 | case BACKLIGHT_CONTROL_SET: | 96 | case BACKLIGHT_CONTROL_SET: |
97 | /* TODO: This is probably wrong since it sets a fixed value. | 97 | /* TODO: This is probably wrong since it sets a fixed value. |
98 | It was a fixed value of 255 before, but that was even more wrong | 98 | It was a fixed value of 255 before, but that was even more wrong |
99 | since it accessed the log_brightness buffer out of bounds */ | 99 | since it accessed the log_brightness buffer out of bounds */ |
100 | _backlight_set_brightness(DEFAULT_BRIGHTNESS_SETTING); | 100 | backlight_hw_brightness(DEFAULT_BRIGHTNESS_SETTING); |
101 | backlight_control = BACKLIGHT_CONTROL_IDLE; | 101 | backlight_control = BACKLIGHT_CONTROL_IDLE; |
102 | break; | 102 | break; |
103 | case BACKLIGHT_CONTROL_FADE: | 103 | case BACKLIGHT_CONTROL_FADE: |
104 | _backlight_set_brightness(0); | 104 | backlight_hw_brightness(0); |
105 | backlight_control = BACKLIGHT_CONTROL_IDLE; | 105 | backlight_control = BACKLIGHT_CONTROL_IDLE; |
106 | break; | 106 | break; |
107 | default: | 107 | default: |
@@ -127,7 +127,7 @@ static void __backlight_dim(bool dim_now) | |||
127 | backlight_control = BACKLIGHT_CONTROL_FADE; | 127 | backlight_control = BACKLIGHT_CONTROL_FADE; |
128 | } | 128 | } |
129 | 129 | ||
130 | void _backlight_on(void) | 130 | void backlight_hw_on(void) |
131 | { | 131 | { |
132 | #ifdef HAVE_LCD_ENABLE | 132 | #ifdef HAVE_LCD_ENABLE |
133 | lcd_enable(true); /* power on lcd + visible display */ | 133 | lcd_enable(true); /* power on lcd + visible display */ |
@@ -135,13 +135,13 @@ void _backlight_on(void) | |||
135 | __backlight_dim(false); | 135 | __backlight_dim(false); |
136 | } | 136 | } |
137 | 137 | ||
138 | void _backlight_off(void) | 138 | void backlight_hw_off(void) |
139 | { | 139 | { |
140 | __backlight_dim(true); | 140 | __backlight_dim(true); |
141 | } | 141 | } |
142 | 142 | ||
143 | 143 | ||
144 | bool _backlight_init(void) | 144 | bool backlight_hw_init(void) |
145 | { | 145 | { |
146 | unsigned char brightness = log_brightness[DEFAULT_BRIGHTNESS_SETTING]; | 146 | unsigned char brightness = log_brightness[DEFAULT_BRIGHTNESS_SETTING]; |
147 | _backlight_brightness = brightness; | 147 | _backlight_brightness = brightness; |
diff --git a/firmware/target/arm/s3c2440/mini2440/backlight-target.h b/firmware/target/arm/s3c2440/mini2440/backlight-target.h index c804f16bcc..ceb6824841 100644 --- a/firmware/target/arm/s3c2440/mini2440/backlight-target.h +++ b/firmware/target/arm/s3c2440/mini2440/backlight-target.h | |||
@@ -23,9 +23,9 @@ | |||
23 | 23 | ||
24 | #define GPIO_LCD_PWR (1 << 4) /* GPIO.G4 */ | 24 | #define GPIO_LCD_PWR (1 << 4) /* GPIO.G4 */ |
25 | 25 | ||
26 | bool _backlight_init(void); | 26 | bool backlight_hw_init(void); |
27 | void _backlight_on(void); | 27 | void backlight_hw_on(void); |
28 | void _backlight_off(void); | 28 | void backlight_hw_off(void); |
29 | void _backlight_set_brightness(int brightness); | 29 | void backlight_hw_brightness(int brightness); |
30 | 30 | ||
31 | #endif | 31 | #endif |
diff --git a/firmware/target/arm/s5l8700/backlight-meizu.c b/firmware/target/arm/s5l8700/backlight-meizu.c index 4eb6967b94..d5c9a22f82 100644 --- a/firmware/target/arm/s5l8700/backlight-meizu.c +++ b/firmware/target/arm/s5l8700/backlight-meizu.c | |||
@@ -32,7 +32,7 @@ | |||
32 | level. This makes the brightness curve more linear to the human eye. | 32 | level. This makes the brightness curve more linear to the human eye. |
33 | */ | 33 | */ |
34 | 34 | ||
35 | void _backlight_set_brightness(int brightness) | 35 | void backlight_hw_brightness(int brightness) |
36 | { | 36 | { |
37 | /* pwm = round(sqrt(2)**x), where brightness level x = 1..16 */ | 37 | /* pwm = round(sqrt(2)**x), where brightness level x = 1..16 */ |
38 | static const unsigned int logtable[] = | 38 | static const unsigned int logtable[] = |
@@ -42,21 +42,21 @@ void _backlight_set_brightness(int brightness) | |||
42 | TCDATA0 = logtable[brightness]; | 42 | TCDATA0 = logtable[brightness]; |
43 | } | 43 | } |
44 | 44 | ||
45 | void _backlight_on(void) | 45 | void backlight_hw_on(void) |
46 | { | 46 | { |
47 | /* configure backlight pin P0.2 as timer PWM output */ | 47 | /* configure backlight pin P0.2 as timer PWM output */ |
48 | PCON0 = ((PCON0 & ~(3 << 4)) | (2 << 4)); | 48 | PCON0 = ((PCON0 & ~(3 << 4)) | (2 << 4)); |
49 | _backlight_set_brightness(backlight_brightness); | 49 | backlight_hw_brightness(backlight_brightness); |
50 | } | 50 | } |
51 | 51 | ||
52 | void _backlight_off(void) | 52 | void backlight_hw_off(void) |
53 | { | 53 | { |
54 | /* configure backlight pin P0.2 as GPIO and switch off */ | 54 | /* configure backlight pin P0.2 as GPIO and switch off */ |
55 | PCON0 = ((PCON0 & ~(3 << 4)) | (1 << 4)); | 55 | PCON0 = ((PCON0 & ~(3 << 4)) | (1 << 4)); |
56 | PDAT0 &= ~(1 << 2); | 56 | PDAT0 &= ~(1 << 2); |
57 | } | 57 | } |
58 | 58 | ||
59 | bool _backlight_init(void) | 59 | bool backlight_hw_init(void) |
60 | { | 60 | { |
61 | /* enable timer clock */ | 61 | /* enable timer clock */ |
62 | PWRCON &= ~(1 << 4); | 62 | PWRCON &= ~(1 << 4); |
@@ -72,7 +72,7 @@ bool _backlight_init(void) | |||
72 | TCPRE = 20; /* prescaler */ | 72 | TCPRE = 20; /* prescaler */ |
73 | TCCMD = (1 << 0); /* TC_EN */ | 73 | TCCMD = (1 << 0); /* TC_EN */ |
74 | 74 | ||
75 | _backlight_on(); | 75 | backlight_hw_on(); |
76 | 76 | ||
77 | return true; | 77 | return true; |
78 | } | 78 | } |
diff --git a/firmware/target/arm/s5l8700/backlight-target.h b/firmware/target/arm/s5l8700/backlight-target.h index 91579b080d..a436186791 100644 --- a/firmware/target/arm/s5l8700/backlight-target.h +++ b/firmware/target/arm/s5l8700/backlight-target.h | |||
@@ -21,9 +21,9 @@ | |||
21 | #ifndef BACKLIGHT_TARGET_H | 21 | #ifndef BACKLIGHT_TARGET_H |
22 | #define BACKLIGHT_TARGET_H | 22 | #define BACKLIGHT_TARGET_H |
23 | 23 | ||
24 | bool _backlight_init(void); | 24 | bool backlight_hw_init(void); |
25 | void _backlight_on(void); | 25 | void backlight_hw_on(void); |
26 | void _backlight_off(void); | 26 | void backlight_hw_off(void); |
27 | void _backlight_set_brightness(int brightness); | 27 | void backlight_hw_brightness(int brightness); |
28 | 28 | ||
29 | #endif | 29 | #endif |
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/backlight-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/backlight-nano2g.c index 3e0e7460c4..b38e0f17f5 100644 --- a/firmware/target/arm/s5l8700/ipodnano2g/backlight-nano2g.c +++ b/firmware/target/arm/s5l8700/ipodnano2g/backlight-nano2g.c | |||
@@ -32,12 +32,12 @@ void lcd_awake(void); | |||
32 | void lcd_update(void); | 32 | void lcd_update(void); |
33 | #endif | 33 | #endif |
34 | 34 | ||
35 | void _backlight_set_brightness(int brightness) | 35 | void backlight_hw_brightness(int brightness) |
36 | { | 36 | { |
37 | pmu_write(0x28, brightness); | 37 | pmu_write(0x28, brightness); |
38 | } | 38 | } |
39 | 39 | ||
40 | void _backlight_on(void) | 40 | void backlight_hw_on(void) |
41 | { | 41 | { |
42 | #ifdef HAVE_LCD_SLEEP | 42 | #ifdef HAVE_LCD_SLEEP |
43 | if (!lcd_active()) | 43 | if (!lcd_active()) |
@@ -50,18 +50,18 @@ void _backlight_on(void) | |||
50 | pmu_write(0x29, 1); | 50 | pmu_write(0x29, 1); |
51 | } | 51 | } |
52 | 52 | ||
53 | void _backlight_off(void) | 53 | void backlight_hw_off(void) |
54 | { | 54 | { |
55 | pmu_write(0x29, 0); | 55 | pmu_write(0x29, 0); |
56 | } | 56 | } |
57 | 57 | ||
58 | bool _backlight_init(void) | 58 | bool backlight_hw_init(void) |
59 | { | 59 | { |
60 | pmu_write(0x2a, 6); | 60 | pmu_write(0x2a, 6); |
61 | pmu_write(0x28, 0x2e); | 61 | pmu_write(0x28, 0x2e); |
62 | pmu_write(0x2b, 20); | 62 | pmu_write(0x2b, 20); |
63 | 63 | ||
64 | _backlight_on(); | 64 | backlight_hw_on(); |
65 | 65 | ||
66 | return true; | 66 | return true; |
67 | } | 67 | } |
diff --git a/firmware/target/arm/s5l8700/yps3/backlight-target.h b/firmware/target/arm/s5l8700/yps3/backlight-target.h index 0507be4f76..74ea0aa035 100644 --- a/firmware/target/arm/s5l8700/yps3/backlight-target.h +++ b/firmware/target/arm/s5l8700/yps3/backlight-target.h | |||
@@ -21,13 +21,13 @@ | |||
21 | #ifndef BACKLIGHT_TARGET_H | 21 | #ifndef BACKLIGHT_TARGET_H |
22 | #define BACKLIGHT_TARGET_H | 22 | #define BACKLIGHT_TARGET_H |
23 | 23 | ||
24 | bool _backlight_init(void); | 24 | bool backlight_hw_init(void); |
25 | void _backlight_on(void); | 25 | void backlight_hw_on(void); |
26 | void _backlight_off(void); | 26 | void backlight_hw_off(void); |
27 | void _backlight_set_brightness(int brightness); | 27 | void backlight_hw_brightness(int brightness); |
28 | 28 | ||
29 | void _buttonlight_on(void); | 29 | void buttonlight_hw_on(void); |
30 | void _buttonlight_off(void); | 30 | void buttonlight_hw_off(void); |
31 | 31 | ||
32 | #endif /* BACKLIGHT_TARGET_H */ | 32 | #endif /* BACKLIGHT_TARGET_H */ |
33 | 33 | ||
diff --git a/firmware/target/arm/s5l8700/yps3/backlight-yps3.c b/firmware/target/arm/s5l8700/yps3/backlight-yps3.c index 7cf3a44805..ae3cc3b0a1 100644 --- a/firmware/target/arm/s5l8700/yps3/backlight-yps3.c +++ b/firmware/target/arm/s5l8700/yps3/backlight-yps3.c | |||
@@ -35,7 +35,7 @@ | |||
35 | are three individually controllable groups: menu/back, cursor, middle). | 35 | are three individually controllable groups: menu/back, cursor, middle). |
36 | */ | 36 | */ |
37 | 37 | ||
38 | void _backlight_set_brightness(int brightness) | 38 | void backlight_hw_brightness(int brightness) |
39 | { | 39 | { |
40 | /* pwm = round(16 * 16**(x/16)), where brightness level x = 1..16 */ | 40 | /* pwm = round(16 * 16**(x/16)), where brightness level x = 1..16 */ |
41 | static const unsigned int logtable[] = | 41 | static const unsigned int logtable[] = |
@@ -45,39 +45,39 @@ void _backlight_set_brightness(int brightness) | |||
45 | TADATA0 = logtable[brightness]; | 45 | TADATA0 = logtable[brightness]; |
46 | } | 46 | } |
47 | 47 | ||
48 | void _backlight_on(void) | 48 | void backlight_hw_on(void) |
49 | { | 49 | { |
50 | /* configure backlight pin P0.0 as timer PWM output */ | 50 | /* configure backlight pin P0.0 as timer PWM output */ |
51 | PCON0 = ((PCON0 & ~(3 << 0)) | (2 << 0)); | 51 | PCON0 = ((PCON0 & ~(3 << 0)) | (2 << 0)); |
52 | 52 | ||
53 | _backlight_set_brightness(backlight_brightness); | 53 | backlight_hw_brightness(backlight_brightness); |
54 | } | 54 | } |
55 | 55 | ||
56 | void _backlight_off(void) | 56 | void backlight_hw_off(void) |
57 | { | 57 | { |
58 | /* configure backlight pin P0.0 as GPIO and switch off */ | 58 | /* configure backlight pin P0.0 as GPIO and switch off */ |
59 | PCON0 = ((PCON0 & ~(3 << 0)) | (1 << 0)); | 59 | PCON0 = ((PCON0 & ~(3 << 0)) | (1 << 0)); |
60 | PDAT0 &= ~(1 << 0); | 60 | PDAT0 &= ~(1 << 0); |
61 | } | 61 | } |
62 | 62 | ||
63 | void _buttonlight_on(void) | 63 | void buttonlight_hw_on(void) |
64 | { | 64 | { |
65 | PDAT3 |= (3 << 2); | 65 | PDAT3 |= (3 << 2); |
66 | PDAT4 |= (1 << 2); | 66 | PDAT4 |= (1 << 2); |
67 | } | 67 | } |
68 | 68 | ||
69 | void _buttonlight_off(void) | 69 | void buttonlight_hw_off(void) |
70 | { | 70 | { |
71 | PDAT3 &= ~(3 << 2); | 71 | PDAT3 &= ~(3 << 2); |
72 | PDAT4 &= ~(1 << 2); | 72 | PDAT4 &= ~(1 << 2); |
73 | } | 73 | } |
74 | 74 | ||
75 | bool _backlight_init(void) | 75 | bool backlight_hw_init(void) |
76 | { | 76 | { |
77 | /* Enable button LEDs: P3.2 (menu/back), P3.3 (cursor), P4.2 (middle) */ | 77 | /* Enable button LEDs: P3.2 (menu/back), P3.3 (cursor), P4.2 (middle) */ |
78 | PCON3 = (PCON3 & ~0x0000FF00) | 0x00001100; | 78 | PCON3 = (PCON3 & ~0x0000FF00) | 0x00001100; |
79 | PCON4 = (PCON4 & ~0x00000F00) | 0x00000100; | 79 | PCON4 = (PCON4 & ~0x00000F00) | 0x00000100; |
80 | _buttonlight_off(); | 80 | buttonlight_hw_off(); |
81 | 81 | ||
82 | /* enable timer clock */ | 82 | /* enable timer clock */ |
83 | PWRCON &= ~(1 << 4); | 83 | PWRCON &= ~(1 << 4); |
@@ -93,7 +93,7 @@ bool _backlight_init(void) | |||
93 | TAPRE = 20; /* prescaler */ | 93 | TAPRE = 20; /* prescaler */ |
94 | TACMD = (1 << 0); /* TA_EN */ | 94 | TACMD = (1 << 0); /* TA_EN */ |
95 | 95 | ||
96 | _backlight_on(); | 96 | backlight_hw_on(); |
97 | 97 | ||
98 | return true; | 98 | return true; |
99 | } | 99 | } |
diff --git a/firmware/target/arm/s5l8702/ipod6g/backlight-ipod6g.c b/firmware/target/arm/s5l8702/ipod6g/backlight-ipod6g.c index 481a2643bb..7d1c8bde13 100644 --- a/firmware/target/arm/s5l8702/ipod6g/backlight-ipod6g.c +++ b/firmware/target/arm/s5l8702/ipod6g/backlight-ipod6g.c | |||
@@ -32,12 +32,12 @@ void lcd_awake(void); | |||
32 | void lcd_update(void); | 32 | void lcd_update(void); |
33 | #endif | 33 | #endif |
34 | 34 | ||
35 | void _backlight_set_brightness(int brightness) | 35 | void backlight_hw_brightness(int brightness) |
36 | { | 36 | { |
37 | pmu_write(0x28, brightness); | 37 | pmu_write(0x28, brightness); |
38 | } | 38 | } |
39 | 39 | ||
40 | void _backlight_on(void) | 40 | void backlight_hw_on(void) |
41 | { | 41 | { |
42 | #ifdef HAVE_LCD_SLEEP | 42 | #ifdef HAVE_LCD_SLEEP |
43 | if (!lcd_active()) | 43 | if (!lcd_active()) |
@@ -50,20 +50,20 @@ void _backlight_on(void) | |||
50 | pmu_write(0x29, 1); | 50 | pmu_write(0x29, 1); |
51 | } | 51 | } |
52 | 52 | ||
53 | void _backlight_off(void) | 53 | void backlight_hw_off(void) |
54 | { | 54 | { |
55 | pmu_write(0x29, 0); | 55 | pmu_write(0x29, 0); |
56 | } | 56 | } |
57 | 57 | ||
58 | bool _backlight_init(void) | 58 | bool backlight_hw_init(void) |
59 | { | 59 | { |
60 | /* LEDCTL: overvoltage protection enabled, OCP limit is 500mA */ | 60 | /* LEDCTL: overvoltage protection enabled, OCP limit is 500mA */ |
61 | pmu_write(0x2a, 0x05); | 61 | pmu_write(0x2a, 0x05); |
62 | 62 | ||
63 | pmu_write(0x2b, 0x14); /* T_dimstep = 16 * value / 32768 */ | 63 | pmu_write(0x2b, 0x14); /* T_dimstep = 16 * value / 32768 */ |
64 | _backlight_set_brightness(DEFAULT_BRIGHTNESS_SETTING); | 64 | backlight_hw_brightness(DEFAULT_BRIGHTNESS_SETTING); |
65 | 65 | ||
66 | _backlight_on(); | 66 | backlight_hw_on(); |
67 | 67 | ||
68 | return true; | 68 | return true; |
69 | } | 69 | } |
diff --git a/firmware/target/arm/s5l8702/ipod6g/backlight-target.h b/firmware/target/arm/s5l8702/ipod6g/backlight-target.h index 05a8addfea..21ff6c30e1 100644 --- a/firmware/target/arm/s5l8702/ipod6g/backlight-target.h +++ b/firmware/target/arm/s5l8702/ipod6g/backlight-target.h | |||
@@ -21,9 +21,9 @@ | |||
21 | #ifndef BACKLIGHT_TARGET_H | 21 | #ifndef BACKLIGHT_TARGET_H |
22 | #define BACKLIGHT_TARGET_H | 22 | #define BACKLIGHT_TARGET_H |
23 | 23 | ||
24 | bool _backlight_init(void); | 24 | bool backlight_hw_init(void); |
25 | void _backlight_on(void); | 25 | void backlight_hw_on(void); |
26 | void _backlight_off(void); | 26 | void backlight_hw_off(void); |
27 | void _backlight_set_brightness(int brightness); | 27 | void backlight_hw_brightness(int brightness); |
28 | 28 | ||
29 | #endif | 29 | #endif |
diff --git a/firmware/target/arm/samsung/backlight-target.h b/firmware/target/arm/samsung/backlight-target.h index a27b489319..3882964207 100644 --- a/firmware/target/arm/samsung/backlight-target.h +++ b/firmware/target/arm/samsung/backlight-target.h | |||
@@ -21,8 +21,8 @@ | |||
21 | #ifndef BACKLIGHT_TARGET_H | 21 | #ifndef BACKLIGHT_TARGET_H |
22 | #define BACKLIGHT_TARGET_H | 22 | #define BACKLIGHT_TARGET_H |
23 | 23 | ||
24 | #define _backlight_init() true | 24 | #define backlight_hw_init() true |
25 | void _backlight_on(void); | 25 | void backlight_hw_on(void); |
26 | void _backlight_off(void); | 26 | void backlight_hw_off(void); |
27 | 27 | ||
28 | #endif | 28 | #endif |
diff --git a/firmware/target/arm/samsung/yh820/backlight-yh820.c b/firmware/target/arm/samsung/yh820/backlight-yh820.c index 0bbdb4f7d4..b24f8128c4 100644 --- a/firmware/target/arm/samsung/yh820/backlight-yh820.c +++ b/firmware/target/arm/samsung/yh820/backlight-yh820.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include "backlight-target.h" | 25 | #include "backlight-target.h" |
26 | #include "lcd.h" | 26 | #include "lcd.h" |
27 | 27 | ||
28 | void _backlight_on(void) | 28 | void backlight_hw_on(void) |
29 | { | 29 | { |
30 | #ifdef HAVE_LCD_SLEEP | 30 | #ifdef HAVE_LCD_SLEEP |
31 | backlight_lcd_sleep_countdown(false); /* stop counter */ | 31 | backlight_lcd_sleep_countdown(false); /* stop counter */ |
@@ -36,7 +36,7 @@ void _backlight_on(void) | |||
36 | GPIO_SET_BITWISE(GPIOB_OUTPUT_VAL, 0x2); | 36 | GPIO_SET_BITWISE(GPIOB_OUTPUT_VAL, 0x2); |
37 | } | 37 | } |
38 | 38 | ||
39 | void _backlight_off(void) | 39 | void backlight_hw_off(void) |
40 | { | 40 | { |
41 | GPIO_CLEAR_BITWISE(GPIOB_OUTPUT_VAL, 0x2); | 41 | GPIO_CLEAR_BITWISE(GPIOB_OUTPUT_VAL, 0x2); |
42 | #ifdef HAVE_LCD_ENABLE | 42 | #ifdef HAVE_LCD_ENABLE |
diff --git a/firmware/target/arm/samsung/yh920/backlight-yh920.c b/firmware/target/arm/samsung/yh920/backlight-yh920.c index 0bbdb4f7d4..b24f8128c4 100644 --- a/firmware/target/arm/samsung/yh920/backlight-yh920.c +++ b/firmware/target/arm/samsung/yh920/backlight-yh920.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include "backlight-target.h" | 25 | #include "backlight-target.h" |
26 | #include "lcd.h" | 26 | #include "lcd.h" |
27 | 27 | ||
28 | void _backlight_on(void) | 28 | void backlight_hw_on(void) |
29 | { | 29 | { |
30 | #ifdef HAVE_LCD_SLEEP | 30 | #ifdef HAVE_LCD_SLEEP |
31 | backlight_lcd_sleep_countdown(false); /* stop counter */ | 31 | backlight_lcd_sleep_countdown(false); /* stop counter */ |
@@ -36,7 +36,7 @@ void _backlight_on(void) | |||
36 | GPIO_SET_BITWISE(GPIOB_OUTPUT_VAL, 0x2); | 36 | GPIO_SET_BITWISE(GPIOB_OUTPUT_VAL, 0x2); |
37 | } | 37 | } |
38 | 38 | ||
39 | void _backlight_off(void) | 39 | void backlight_hw_off(void) |
40 | { | 40 | { |
41 | GPIO_CLEAR_BITWISE(GPIOB_OUTPUT_VAL, 0x2); | 41 | GPIO_CLEAR_BITWISE(GPIOB_OUTPUT_VAL, 0x2); |
42 | #ifdef HAVE_LCD_ENABLE | 42 | #ifdef HAVE_LCD_ENABLE |
diff --git a/firmware/target/arm/samsung/yh925/backlight-yh925.c b/firmware/target/arm/samsung/yh925/backlight-yh925.c index 5f29f9f770..8eb287b61b 100644 --- a/firmware/target/arm/samsung/yh925/backlight-yh925.c +++ b/firmware/target/arm/samsung/yh925/backlight-yh925.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include "backlight-target.h" | 25 | #include "backlight-target.h" |
26 | #include "lcd.h" | 26 | #include "lcd.h" |
27 | 27 | ||
28 | void _backlight_on(void) | 28 | void backlight_hw_on(void) |
29 | { | 29 | { |
30 | #ifdef HAVE_LCD_SLEEP | 30 | #ifdef HAVE_LCD_SLEEP |
31 | backlight_lcd_sleep_countdown(false); /* stop counter */ | 31 | backlight_lcd_sleep_countdown(false); /* stop counter */ |
@@ -36,7 +36,7 @@ void _backlight_on(void) | |||
36 | GPIO_SET_BITWISE(GPIOF_OUTPUT_VAL, 0x1); | 36 | GPIO_SET_BITWISE(GPIOF_OUTPUT_VAL, 0x1); |
37 | } | 37 | } |
38 | 38 | ||
39 | void _backlight_off(void) | 39 | void backlight_hw_off(void) |
40 | { | 40 | { |
41 | GPIO_CLEAR_BITWISE(GPIOF_OUTPUT_VAL, 0x1); | 41 | GPIO_CLEAR_BITWISE(GPIOF_OUTPUT_VAL, 0x1); |
42 | #ifdef HAVE_LCD_ENABLE | 42 | #ifdef HAVE_LCD_ENABLE |
diff --git a/firmware/target/arm/sandisk/backlight-c200_e200.c b/firmware/target/arm/sandisk/backlight-c200_e200.c index 0280604526..ad1a6d9e46 100644 --- a/firmware/target/arm/sandisk/backlight-c200_e200.c +++ b/firmware/target/arm/sandisk/backlight-c200_e200.c | |||
@@ -26,12 +26,12 @@ | |||
26 | #include "ascodec.h" | 26 | #include "ascodec.h" |
27 | #include "as3514.h" | 27 | #include "as3514.h" |
28 | 28 | ||
29 | void _backlight_set_brightness(int brightness) | 29 | void backlight_hw_brightness(int brightness) |
30 | { | 30 | { |
31 | ascodec_write(AS3514_DCDC15, brightness); | 31 | ascodec_write(AS3514_DCDC15, brightness); |
32 | } | 32 | } |
33 | 33 | ||
34 | void _backlight_on(void) | 34 | void backlight_hw_on(void) |
35 | { | 35 | { |
36 | #ifdef HAVE_LCD_ENABLE | 36 | #ifdef HAVE_LCD_ENABLE |
37 | lcd_enable(true); /* power on lcd + visible display */ | 37 | lcd_enable(true); /* power on lcd + visible display */ |
@@ -39,19 +39,19 @@ void _backlight_on(void) | |||
39 | #if (CONFIG_BACKLIGHT_FADING != BACKLIGHT_FADING_SW_SETTING) /* in bootloader/sim */ | 39 | #if (CONFIG_BACKLIGHT_FADING != BACKLIGHT_FADING_SW_SETTING) /* in bootloader/sim */ |
40 | /* if we set the brightness to the settings value, then fading up | 40 | /* if we set the brightness to the settings value, then fading up |
41 | * is glitchy */ | 41 | * is glitchy */ |
42 | _backlight_set_brightness(backlight_brightness); | 42 | backlight_hw_brightness(backlight_brightness); |
43 | #endif | 43 | #endif |
44 | } | 44 | } |
45 | 45 | ||
46 | void _backlight_off(void) | 46 | void backlight_hw_off(void) |
47 | { | 47 | { |
48 | _backlight_set_brightness(0); | 48 | backlight_hw_brightness(0); |
49 | #ifdef HAVE_LCD_ENABLE | 49 | #ifdef HAVE_LCD_ENABLE |
50 | lcd_enable(false); /* power off visible display */ | 50 | lcd_enable(false); /* power off visible display */ |
51 | #endif | 51 | #endif |
52 | } | 52 | } |
53 | 53 | ||
54 | void _buttonlight_on(void) | 54 | void buttonlight_hw_on(void) |
55 | { | 55 | { |
56 | GPIO_SET_BITWISE(GPIOG_OUTPUT_VAL, 0x80); | 56 | GPIO_SET_BITWISE(GPIOG_OUTPUT_VAL, 0x80); |
57 | #ifdef SANSA_C200 | 57 | #ifdef SANSA_C200 |
@@ -59,7 +59,7 @@ void _buttonlight_on(void) | |||
59 | #endif | 59 | #endif |
60 | } | 60 | } |
61 | 61 | ||
62 | void _buttonlight_off(void) | 62 | void buttonlight_hw_off(void) |
63 | { | 63 | { |
64 | GPIO_CLEAR_BITWISE(GPIOG_OUTPUT_VAL, 0x80); | 64 | GPIO_CLEAR_BITWISE(GPIOG_OUTPUT_VAL, 0x80); |
65 | #ifdef SANSA_C200 | 65 | #ifdef SANSA_C200 |
diff --git a/firmware/target/arm/sandisk/backlight-target.h b/firmware/target/arm/sandisk/backlight-target.h index 1f5e475a42..cbe26f54da 100644 --- a/firmware/target/arm/sandisk/backlight-target.h +++ b/firmware/target/arm/sandisk/backlight-target.h | |||
@@ -21,11 +21,11 @@ | |||
21 | #ifndef BACKLIGHT_TARGET_H | 21 | #ifndef BACKLIGHT_TARGET_H |
22 | #define BACKLIGHT_TARGET_H | 22 | #define BACKLIGHT_TARGET_H |
23 | 23 | ||
24 | #define _backlight_init() true | 24 | #define backlight_hw_init() true |
25 | void _backlight_on(void); | 25 | void backlight_hw_on(void); |
26 | void _backlight_off(void); | 26 | void backlight_hw_off(void); |
27 | void _backlight_set_brightness(int brightness); | 27 | void backlight_hw_brightness(int brightness); |
28 | 28 | ||
29 | void _buttonlight_on(void); | 29 | void buttonlight_hw_on(void); |
30 | void _buttonlight_off(void); | 30 | void buttonlight_hw_off(void); |
31 | #endif | 31 | #endif |
diff --git a/firmware/target/arm/sandisk/sansa-e200/button-e200.c b/firmware/target/arm/sandisk/sansa-e200/button-e200.c index 73279b44cf..0df71f4815 100644 --- a/firmware/target/arm/sandisk/sansa-e200/button-e200.c +++ b/firmware/target/arm/sandisk/sansa-e200/button-e200.c | |||
@@ -135,7 +135,7 @@ void clickwheel_int(void) | |||
135 | static int prev_keypost = BUTTON_NONE; | 135 | static int prev_keypost = BUTTON_NONE; |
136 | static int count = 0; | 136 | static int count = 0; |
137 | static int fast_mode = 0; | 137 | static int fast_mode = 0; |
138 | static long next_backlight_on = 0; | 138 | static long nextbacklight_hw_on = 0; |
139 | 139 | ||
140 | static unsigned long prev_usec[WHEEL_BASE_SENSITIVITY] = { 0 }; | 140 | static unsigned long prev_usec[WHEEL_BASE_SENSITIVITY] = { 0 }; |
141 | static unsigned long delta = 1ul << 24; | 141 | static unsigned long delta = 1ul << 24; |
@@ -166,11 +166,11 @@ void clickwheel_int(void) | |||
166 | velocity = 0; | 166 | velocity = 0; |
167 | } | 167 | } |
168 | 168 | ||
169 | if (TIME_AFTER(current_tick, next_backlight_on)) | 169 | if (TIME_AFTER(current_tick, nextbacklight_hw_on)) |
170 | { | 170 | { |
171 | /* Poke backlight to turn it on or maintain it no more often | 171 | /* Poke backlight to turn it on or maintain it no more often |
172 | * than every 1/4 second */ | 172 | * than every 1/4 second */ |
173 | next_backlight_on = current_tick + HZ/4; | 173 | nextbacklight_hw_on = current_tick + HZ/4; |
174 | backlight_on(); | 174 | backlight_on(); |
175 | #ifdef HAVE_BUTTON_LIGHT | 175 | #ifdef HAVE_BUTTON_LIGHT |
176 | buttonlight_on(); | 176 | buttonlight_on(); |
@@ -209,7 +209,7 @@ void clickwheel_int(void) | |||
209 | velocity = v; | 209 | velocity = v; |
210 | /* Ensure backlight never gets stuck for an extended period if tick | 210 | /* Ensure backlight never gets stuck for an extended period if tick |
211 | * wrapped such that next poke is very far ahead */ | 211 | * wrapped such that next poke is very far ahead */ |
212 | next_backlight_on = current_tick - 1; | 212 | nextbacklight_hw_on = current_tick - 1; |
213 | } | 213 | } |
214 | else | 214 | else |
215 | { | 215 | { |
diff --git a/firmware/target/arm/sandisk/sansa-view/backlight-target.h b/firmware/target/arm/sandisk/sansa-view/backlight-target.h index 545ee93677..c51875754d 100644 --- a/firmware/target/arm/sandisk/sansa-view/backlight-target.h +++ b/firmware/target/arm/sandisk/sansa-view/backlight-target.h | |||
@@ -24,10 +24,10 @@ | |||
24 | 24 | ||
25 | #include <stdbool.h> | 25 | #include <stdbool.h> |
26 | 26 | ||
27 | void _backlight_on(void); | 27 | void backlight_hw_on(void); |
28 | void _backlight_off(void); | 28 | void backlight_hw_off(void); |
29 | 29 | ||
30 | void _buttonlight_on(void); | 30 | void buttonlight_hw_on(void); |
31 | void _buttonlight_off(void); | 31 | void buttonlight_hw_off(void); |
32 | 32 | ||
33 | #endif | 33 | #endif |
diff --git a/firmware/target/arm/sandisk/sansa-view/backlight-view.c b/firmware/target/arm/sandisk/sansa-view/backlight-view.c index c065ec3f2a..637e5b4269 100644 --- a/firmware/target/arm/sandisk/sansa-view/backlight-view.c +++ b/firmware/target/arm/sandisk/sansa-view/backlight-view.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include "lcd.h" | 25 | #include "lcd.h" |
26 | #include "backlight.h" | 26 | #include "backlight.h" |
27 | 27 | ||
28 | bool _backlight_init(void) | 28 | bool backlight_hw_init(void) |
29 | { | 29 | { |
30 | GPIO_SET_BITWISE(GPIOD_ENABLE, 0x01); | 30 | GPIO_SET_BITWISE(GPIOD_ENABLE, 0x01); |
31 | GPIO_SET_BITWISE(GPIOD_OUTPUT_EN, 0x01); | 31 | GPIO_SET_BITWISE(GPIOD_OUTPUT_EN, 0x01); |
@@ -44,22 +44,22 @@ bool _backlight_init(void) | |||
44 | return true; | 44 | return true; |
45 | } | 45 | } |
46 | 46 | ||
47 | void _backlight_set_brightness(int brightness) | 47 | void backlight_hw_brightness(int brightness) |
48 | { | 48 | { |
49 | (void)brightness; | 49 | (void)brightness; |
50 | } | 50 | } |
51 | 51 | ||
52 | void _backlight_off(void) | 52 | void backlight_hw_off(void) |
53 | { | 53 | { |
54 | GPIO_CLEAR_BITWISE(GPIOD_OUTPUT_VAL, 0x01); | 54 | GPIO_CLEAR_BITWISE(GPIOD_OUTPUT_VAL, 0x01); |
55 | } | 55 | } |
56 | 56 | ||
57 | void _backlight_on(void) | 57 | void backlight_hw_on(void) |
58 | { | 58 | { |
59 | GPIO_SET_BITWISE(GPIOD_OUTPUT_VAL, 0x01); | 59 | GPIO_SET_BITWISE(GPIOD_OUTPUT_VAL, 0x01); |
60 | } | 60 | } |
61 | 61 | ||
62 | void _buttonlight_off(void) | 62 | void buttonlight_hw_off(void) |
63 | { | 63 | { |
64 | GPIO_CLEAR_BITWISE(GPIOA_OUTPUT_VAL, 0x02); /* vertical buttonlight */ | 64 | GPIO_CLEAR_BITWISE(GPIOA_OUTPUT_VAL, 0x02); /* vertical buttonlight */ |
65 | GPIO_CLEAR_BITWISE(GPIOA_OUTPUT_VAL, 0x01); /* horizontal buttonlight */ | 65 | GPIO_CLEAR_BITWISE(GPIOA_OUTPUT_VAL, 0x01); /* horizontal buttonlight */ |
@@ -70,7 +70,7 @@ void _buttonlight_off(void) | |||
70 | GPIO_CLEAR_BITWISE(GPIOR_OUTPUT_VAL, 0x10); /* scrollwheel left led */ | 70 | GPIO_CLEAR_BITWISE(GPIOR_OUTPUT_VAL, 0x10); /* scrollwheel left led */ |
71 | } | 71 | } |
72 | 72 | ||
73 | void _buttonlight_on(void) | 73 | void buttonlight_hw_on(void) |
74 | { | 74 | { |
75 | GPIO_SET_BITWISE(GPIOA_OUTPUT_VAL, 0x02); /* vertical buttonlight */ | 75 | GPIO_SET_BITWISE(GPIOA_OUTPUT_VAL, 0x02); /* vertical buttonlight */ |
76 | GPIO_SET_BITWISE(GPIOA_OUTPUT_VAL, 0x01); /* horizontal buttonlight */ | 76 | GPIO_SET_BITWISE(GPIOA_OUTPUT_VAL, 0x01); /* horizontal buttonlight */ |
diff --git a/firmware/target/arm/tatung/tpj1022/backlight-target.h b/firmware/target/arm/tatung/tpj1022/backlight-target.h index f82dc567ef..4a5e677599 100644 --- a/firmware/target/arm/tatung/tpj1022/backlight-target.h +++ b/firmware/target/arm/tatung/tpj1022/backlight-target.h | |||
@@ -24,8 +24,8 @@ | |||
24 | #ifndef BACKLIGHT_TARGET_H | 24 | #ifndef BACKLIGHT_TARGET_H |
25 | #define BACKLIGHT_TARGET_H | 25 | #define BACKLIGHT_TARGET_H |
26 | 26 | ||
27 | #define _backlight_init() true | 27 | #define backlight_hw_init() true |
28 | void _backlight_on(void); | 28 | void backlight_hw_on(void); |
29 | void _backlight_off(void); | 29 | void backlight_hw_off(void); |
30 | 30 | ||
31 | #endif | 31 | #endif |
diff --git a/firmware/target/arm/tatung/tpj1022/backlight-tpj1022.c b/firmware/target/arm/tatung/tpj1022/backlight-tpj1022.c index 87ec19fa80..d63387728b 100644 --- a/firmware/target/arm/tatung/tpj1022/backlight-tpj1022.c +++ b/firmware/target/arm/tatung/tpj1022/backlight-tpj1022.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include "system.h" | 27 | #include "system.h" |
28 | #include "backlight.h" | 28 | #include "backlight.h" |
29 | 29 | ||
30 | void _backlight_on(void) | 30 | void backlight_hw_on(void) |
31 | { | 31 | { |
32 | #if 0 | 32 | #if 0 |
33 | int level = disable_irq_save(); | 33 | int level = disable_irq_save(); |
@@ -36,7 +36,7 @@ void _backlight_on(void) | |||
36 | #endif | 36 | #endif |
37 | } | 37 | } |
38 | 38 | ||
39 | void _backlight_off(void) | 39 | void backlight_hw_off(void) |
40 | { | 40 | { |
41 | #if 0 | 41 | #if 0 |
42 | int level = disable_irq_save(); | 42 | int level = disable_irq_save(); |
diff --git a/firmware/target/arm/tcc77x/c100/backlight-target.h b/firmware/target/arm/tcc77x/c100/backlight-target.h index 738a2f80ab..7ae71022f0 100644 --- a/firmware/target/arm/tcc77x/c100/backlight-target.h +++ b/firmware/target/arm/tcc77x/c100/backlight-target.h | |||
@@ -23,15 +23,15 @@ | |||
23 | 23 | ||
24 | #include "tcc77x.h" | 24 | #include "tcc77x.h" |
25 | 25 | ||
26 | #define _backlight_init() true | 26 | #define backlight_hw_init() true |
27 | 27 | ||
28 | static inline void _backlight_on(void) | 28 | static inline void backlight_hw_on(void) |
29 | { | 29 | { |
30 | /* Enable backlight */ | 30 | /* Enable backlight */ |
31 | GPIOE |= 0x2; | 31 | GPIOE |= 0x2; |
32 | } | 32 | } |
33 | 33 | ||
34 | static inline void _backlight_off(void) | 34 | static inline void backlight_hw_off(void) |
35 | { | 35 | { |
36 | /* Disable backlight */ | 36 | /* Disable backlight */ |
37 | GPIOE &= ~0x2; | 37 | GPIOE &= ~0x2; |
diff --git a/firmware/target/arm/tcc77x/iaudio7/backlight-target.h b/firmware/target/arm/tcc77x/iaudio7/backlight-target.h index 9a6182ff02..0b227cd11c 100644 --- a/firmware/target/arm/tcc77x/iaudio7/backlight-target.h +++ b/firmware/target/arm/tcc77x/iaudio7/backlight-target.h | |||
@@ -26,7 +26,7 @@ | |||
26 | 26 | ||
27 | void power_touch_panel(bool on); | 27 | void power_touch_panel(bool on); |
28 | 28 | ||
29 | static inline bool _backlight_init(void) | 29 | static inline bool backlight_hw_init(void) |
30 | { | 30 | { |
31 | GPIOD_DIR |= 0x2; | 31 | GPIOD_DIR |= 0x2; |
32 | /* set backlight on by default, since the screen is unreadable without it */ | 32 | /* set backlight on by default, since the screen is unreadable without it */ |
@@ -34,13 +34,13 @@ static inline bool _backlight_init(void) | |||
34 | return true; | 34 | return true; |
35 | } | 35 | } |
36 | 36 | ||
37 | static inline void _backlight_on(void) | 37 | static inline void backlight_hw_on(void) |
38 | { | 38 | { |
39 | GPIOD |= 0x2; | 39 | GPIOD |= 0x2; |
40 | power_touch_panel(true); | 40 | power_touch_panel(true); |
41 | } | 41 | } |
42 | 42 | ||
43 | static inline void _backlight_off(void) | 43 | static inline void backlight_hw_off(void) |
44 | { | 44 | { |
45 | GPIOD &= ~0x2; | 45 | GPIOD &= ~0x2; |
46 | power_touch_panel(false); | 46 | power_touch_panel(false); |
diff --git a/firmware/target/arm/tcc77x/logikdax/backlight-target.h b/firmware/target/arm/tcc77x/logikdax/backlight-target.h index 7630a8332e..202e118606 100644 --- a/firmware/target/arm/tcc77x/logikdax/backlight-target.h +++ b/firmware/target/arm/tcc77x/logikdax/backlight-target.h | |||
@@ -23,15 +23,15 @@ | |||
23 | 23 | ||
24 | #include "tcc77x.h" | 24 | #include "tcc77x.h" |
25 | 25 | ||
26 | #define _backlight_init() true | 26 | #define backlight_hw_init() true |
27 | 27 | ||
28 | static inline void _backlight_on(void) | 28 | static inline void backlight_hw_on(void) |
29 | { | 29 | { |
30 | /* Enable backlight */ | 30 | /* Enable backlight */ |
31 | GPIOD |= 0x10; | 31 | GPIOD |= 0x10; |
32 | } | 32 | } |
33 | 33 | ||
34 | static inline void _backlight_off(void) | 34 | static inline void backlight_hw_off(void) |
35 | { | 35 | { |
36 | /* Disable backlight */ | 36 | /* Disable backlight */ |
37 | GPIOD &= ~0x10; | 37 | GPIOD &= ~0x10; |
diff --git a/firmware/target/arm/tcc77x/m200/backlight-target.h b/firmware/target/arm/tcc77x/m200/backlight-target.h index bbc9037075..d73ac78852 100644 --- a/firmware/target/arm/tcc77x/m200/backlight-target.h +++ b/firmware/target/arm/tcc77x/m200/backlight-target.h | |||
@@ -23,19 +23,19 @@ | |||
23 | 23 | ||
24 | #include "tcc77x.h" | 24 | #include "tcc77x.h" |
25 | 25 | ||
26 | static inline bool _backlight_init(void) | 26 | static inline bool backlight_hw_init(void) |
27 | { | 27 | { |
28 | GPIOA_DIR |= 0x40; | 28 | GPIOA_DIR |= 0x40; |
29 | return true; | 29 | return true; |
30 | } | 30 | } |
31 | 31 | ||
32 | static inline void _backlight_on(void) | 32 | static inline void backlight_hw_on(void) |
33 | { | 33 | { |
34 | /* Enable backlight */ | 34 | /* Enable backlight */ |
35 | GPIOA |= 0x40; | 35 | GPIOA |= 0x40; |
36 | } | 36 | } |
37 | 37 | ||
38 | static inline void _backlight_off(void) | 38 | static inline void backlight_hw_off(void) |
39 | { | 39 | { |
40 | /* Disable backlight */ | 40 | /* Disable backlight */ |
41 | GPIOA &= ~0x40; | 41 | GPIOA &= ~0x40; |
diff --git a/firmware/target/arm/tcc780x/cowond2/backlight-cowond2.c b/firmware/target/arm/tcc780x/cowond2/backlight-cowond2.c index 5668023f28..37ee0e57a1 100644 --- a/firmware/target/arm/tcc780x/cowond2/backlight-cowond2.c +++ b/firmware/target/arm/tcc780x/cowond2/backlight-cowond2.c | |||
@@ -26,15 +26,15 @@ | |||
26 | #include "tcc780x.h" | 26 | #include "tcc780x.h" |
27 | #include "pmu-target.h" | 27 | #include "pmu-target.h" |
28 | 28 | ||
29 | int _backlight_init(void) | 29 | int backlight_hw_init(void) |
30 | { | 30 | { |
31 | _backlight_set_brightness(DEFAULT_BRIGHTNESS_SETTING); | 31 | backlight_hw_brightness(DEFAULT_BRIGHTNESS_SETTING); |
32 | /* set backlight on by default, since the screen is unreadable without it */ | 32 | /* set backlight on by default, since the screen is unreadable without it */ |
33 | _backlight_on(); | 33 | backlight_hw_on(); |
34 | return true; | 34 | return true; |
35 | } | 35 | } |
36 | 36 | ||
37 | void _backlight_set_brightness(int brightness) | 37 | void backlight_hw_brightness(int brightness) |
38 | { | 38 | { |
39 | int level = disable_irq_save(); | 39 | int level = disable_irq_save(); |
40 | 40 | ||
@@ -56,7 +56,7 @@ void _backlight_set_brightness(int brightness) | |||
56 | restore_irq(level); | 56 | restore_irq(level); |
57 | } | 57 | } |
58 | 58 | ||
59 | void _backlight_on(void) | 59 | void backlight_hw_on(void) |
60 | { | 60 | { |
61 | if (get_pmu_type() == PCF50606) | 61 | if (get_pmu_type() == PCF50606) |
62 | { | 62 | { |
@@ -70,7 +70,7 @@ void _backlight_on(void) | |||
70 | } | 70 | } |
71 | } | 71 | } |
72 | 72 | ||
73 | void _backlight_off(void) | 73 | void backlight_hw_off(void) |
74 | { | 74 | { |
75 | if (get_pmu_type() == PCF50606) | 75 | if (get_pmu_type() == PCF50606) |
76 | { | 76 | { |
diff --git a/firmware/target/arm/tcc780x/cowond2/backlight-target.h b/firmware/target/arm/tcc780x/cowond2/backlight-target.h index dbb0baae43..6577f74474 100644 --- a/firmware/target/arm/tcc780x/cowond2/backlight-target.h +++ b/firmware/target/arm/tcc780x/cowond2/backlight-target.h | |||
@@ -21,9 +21,9 @@ | |||
21 | #ifndef BACKLIGHT_TARGET_H | 21 | #ifndef BACKLIGHT_TARGET_H |
22 | #define BACKLIGHT_TARGET_H | 22 | #define BACKLIGHT_TARGET_H |
23 | 23 | ||
24 | int _backlight_init(void); | 24 | int backlight_hw_init(void); |
25 | void _backlight_on(void); | 25 | void backlight_hw_on(void); |
26 | void _backlight_off(void); | 26 | void backlight_hw_off(void); |
27 | void _backlight_set_brightness(int brightness); | 27 | void backlight_hw_brightness(int brightness); |
28 | 28 | ||
29 | #endif | 29 | #endif |
diff --git a/firmware/target/arm/tcc780x/cowond2/button-cowond2.c b/firmware/target/arm/tcc780x/cowond2/button-cowond2.c index df2ea1f307..6c8541ef62 100644 --- a/firmware/target/arm/tcc780x/cowond2/button-cowond2.c +++ b/firmware/target/arm/tcc780x/cowond2/button-cowond2.c | |||
@@ -92,7 +92,7 @@ int button_read_device(int *data) | |||
92 | if (!(GPIOA & 0x4)) | 92 | if (!(GPIOA & 0x4)) |
93 | btn |= BUTTON_POWER; | 93 | btn |= BUTTON_POWER; |
94 | 94 | ||
95 | if (btn & BUTTON_TOUCHSCREEN && !is_backlight_on(true)) | 95 | if (btn & BUTTON_TOUCHSCREEN && !isbacklight_hw_on(true)) |
96 | old_data = *data = 0; | 96 | old_data = *data = 0; |
97 | 97 | ||
98 | return btn; | 98 | return btn; |
diff --git a/firmware/target/arm/tcc780x/cowond2/power-cowond2.c b/firmware/target/arm/tcc780x/cowond2/power-cowond2.c index 09787289ac..6576afb09c 100644 --- a/firmware/target/arm/tcc780x/cowond2/power-cowond2.c +++ b/firmware/target/arm/tcc780x/cowond2/power-cowond2.c | |||
@@ -78,7 +78,7 @@ void power_init(void) | |||
78 | void power_off(void) | 78 | void power_off(void) |
79 | { | 79 | { |
80 | /* Turn the backlight off first to avoid a bright stripe on power-off */ | 80 | /* Turn the backlight off first to avoid a bright stripe on power-off */ |
81 | _backlight_off(); | 81 | backlight_hw_off(); |
82 | sleep(HZ/10); | 82 | sleep(HZ/10); |
83 | 83 | ||
84 | /* Power off the player using the same mechanism as the OF */ | 84 | /* Power off the player using the same mechanism as the OF */ |
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/backlight-target.h b/firmware/target/arm/tms320dm320/creative-zvm/backlight-target.h index c50ce6a128..4ebe3144cf 100644 --- a/firmware/target/arm/tms320dm320/creative-zvm/backlight-target.h +++ b/firmware/target/arm/tms320dm320/creative-zvm/backlight-target.h | |||
@@ -22,10 +22,10 @@ | |||
22 | #ifndef BACKLIGHT_TARGET_H | 22 | #ifndef BACKLIGHT_TARGET_H |
23 | #define BACKLIGHT_TARGET_H | 23 | #define BACKLIGHT_TARGET_H |
24 | 24 | ||
25 | bool _backlight_init(void); | 25 | bool backlight_hw_init(void); |
26 | void _backlight_on(void); | 26 | void backlight_hw_on(void); |
27 | void _backlight_off(void); | 27 | void backlight_hw_off(void); |
28 | void _backlight_set_brightness(int brightness); | 28 | void backlight_hw_brightness(int brightness); |
29 | 29 | ||
30 | /* true: backlight fades off - false: backlight fades on */ | 30 | /* true: backlight fades off - false: backlight fades on */ |
31 | void __backlight_dim(bool dim); | 31 | void __backlight_dim(bool dim); |
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/backlight-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/backlight-mr500.c index 0cebc1bd5c..0b338c1640 100644 --- a/firmware/target/arm/tms320dm320/mrobe-500/backlight-mr500.c +++ b/firmware/target/arm/tms320dm320/mrobe-500/backlight-mr500.c | |||
@@ -55,7 +55,7 @@ static void _backlight_write_brightness(int brightness) | |||
55 | spi_block_transfer(SPI_target_BACKLIGHT, bl_command, 4, 0, 0); | 55 | spi_block_transfer(SPI_target_BACKLIGHT, bl_command, 4, 0, 0); |
56 | } | 56 | } |
57 | 57 | ||
58 | void _backlight_on(void) | 58 | void backlight_hw_on(void) |
59 | { | 59 | { |
60 | lcd_awake(); /* power on lcd + visible display */ | 60 | lcd_awake(); /* power on lcd + visible display */ |
61 | 61 | ||
@@ -64,25 +64,25 @@ void _backlight_on(void) | |||
64 | #endif | 64 | #endif |
65 | } | 65 | } |
66 | 66 | ||
67 | void _backlight_off(void) | 67 | void backlight_hw_off(void) |
68 | { | 68 | { |
69 | _backlight_write_brightness(0); | 69 | _backlight_write_brightness(0); |
70 | } | 70 | } |
71 | 71 | ||
72 | /* Assumes that the backlight has been initialized */ | 72 | /* Assumes that the backlight has been initialized */ |
73 | void _backlight_set_brightness(int brightness) | 73 | void backlight_hw_brightness(int brightness) |
74 | { | 74 | { |
75 | _backlight_write_brightness(brightness); | 75 | _backlight_write_brightness(brightness); |
76 | } | 76 | } |
77 | 77 | ||
78 | void __backlight_dim(bool dim_now) | 78 | void __backlight_dim(bool dim_now) |
79 | { | 79 | { |
80 | _backlight_set_brightness(dim_now ? | 80 | backlight_hw_brightness(dim_now ? |
81 | DEFAULT_BRIGHTNESS_SETTING : | 81 | DEFAULT_BRIGHTNESS_SETTING : |
82 | DEFAULT_DIMNESS_SETTING); | 82 | DEFAULT_DIMNESS_SETTING); |
83 | } | 83 | } |
84 | 84 | ||
85 | bool _backlight_init(void) | 85 | bool backlight_hw_init(void) |
86 | { | 86 | { |
87 | short read_value; | 87 | short read_value; |
88 | 88 | ||
@@ -102,7 +102,7 @@ bool _backlight_init(void) | |||
102 | 102 | ||
103 | spi_block_transfer(SPI_target_BACKLIGHT, commands[2], 2, 0, 0); | 103 | spi_block_transfer(SPI_target_BACKLIGHT, commands[2], 2, 0, 0); |
104 | 104 | ||
105 | _backlight_set_brightness(backlight_brightness); | 105 | backlight_hw_brightness(backlight_brightness); |
106 | return true; | 106 | return true; |
107 | } | 107 | } |
108 | 108 | ||
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/backlight-target.h b/firmware/target/arm/tms320dm320/mrobe-500/backlight-target.h index ab8ceacbb1..5e91cd691a 100644 --- a/firmware/target/arm/tms320dm320/mrobe-500/backlight-target.h +++ b/firmware/target/arm/tms320dm320/mrobe-500/backlight-target.h | |||
@@ -22,10 +22,10 @@ | |||
22 | #ifndef BACKLIGHT_TARGET_H | 22 | #ifndef BACKLIGHT_TARGET_H |
23 | #define BACKLIGHT_TARGET_H | 23 | #define BACKLIGHT_TARGET_H |
24 | 24 | ||
25 | bool _backlight_init(void); | 25 | bool backlight_hw_init(void); |
26 | void _backlight_on(void); | 26 | void backlight_hw_on(void); |
27 | void _backlight_off(void); | 27 | void backlight_hw_off(void); |
28 | void _backlight_set_brightness(int brightness); | 28 | void backlight_hw_brightness(int brightness); |
29 | 29 | ||
30 | /* true: backlight fades off - false: backlight fades on */ | 30 | /* true: backlight fades off - false: backlight fades on */ |
31 | void __backlight_dim(bool dim); | 31 | void __backlight_dim(bool dim); |
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/lcd-remote-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/lcd-remote-mr500.c index b001032322..e21e1fa193 100644 --- a/firmware/target/arm/tms320dm320/mrobe-500/lcd-remote-mr500.c +++ b/firmware/target/arm/tms320dm320/mrobe-500/lcd-remote-mr500.c | |||
@@ -292,13 +292,13 @@ void lcd_remote_update_rect(int x, int y, int width, int height) | |||
292 | remote_state_control=REMOTE_CONTROL_DRAW; | 292 | remote_state_control=REMOTE_CONTROL_DRAW; |
293 | } | 293 | } |
294 | 294 | ||
295 | void _remote_backlight_on(void) | 295 | void remote_backlight_hw_on(void) |
296 | { | 296 | { |
297 | remote_power|=0x40; | 297 | remote_power|=0x40; |
298 | remote_state_control_next=REMOTE_CONTROL_POWER; | 298 | remote_state_control_next=REMOTE_CONTROL_POWER; |
299 | } | 299 | } |
300 | 300 | ||
301 | void _remote_backlight_off(void) | 301 | void remote_backlight_hw_off(void) |
302 | { | 302 | { |
303 | remote_power&=~(0x40); | 303 | remote_power&=~(0x40); |
304 | remote_state_control_next=REMOTE_CONTROL_POWER; | 304 | remote_state_control_next=REMOTE_CONTROL_POWER; |
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/power-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/power-mr500.c index d9e0d52191..77348317a6 100644 --- a/firmware/target/arm/tms320dm320/mrobe-500/power-mr500.c +++ b/firmware/target/arm/tms320dm320/mrobe-500/power-mr500.c | |||
@@ -75,7 +75,7 @@ bool ide_powered(void) | |||
75 | void power_off(void) | 75 | void power_off(void) |
76 | { | 76 | { |
77 | /* turn off backlight and wait for 1 second */ | 77 | /* turn off backlight and wait for 1 second */ |
78 | _backlight_off(); | 78 | backlight_hw_off(); |
79 | #if defined(HAVE_REMOTE_LCD) | 79 | #if defined(HAVE_REMOTE_LCD) |
80 | lcd_remote_sleep(); | 80 | lcd_remote_sleep(); |
81 | #endif | 81 | #endif |
diff --git a/firmware/target/arm/tms320dm320/sansa-connect/avr-sansaconnect.c b/firmware/target/arm/tms320dm320/sansa-connect/avr-sansaconnect.c index c8b2c9623c..611bdbfde5 100644 --- a/firmware/target/arm/tms320dm320/sansa-connect/avr-sansaconnect.c +++ b/firmware/target/arm/tms320dm320/sansa-connect/avr-sansaconnect.c | |||
@@ -92,15 +92,15 @@ static void handle_wheel(unsigned char wheel) | |||
92 | static unsigned char velocity = 0; | 92 | static unsigned char velocity = 0; |
93 | static unsigned long wheel_delta = 1ul << 24; | 93 | static unsigned long wheel_delta = 1ul << 24; |
94 | static unsigned char wheel_prev = 0; | 94 | static unsigned char wheel_prev = 0; |
95 | static long next_backlight_on = 0; | 95 | static long nextbacklight_hw_on = 0; |
96 | static int prev_key = -1; | 96 | static int prev_key = -1; |
97 | static int prev_key_post = 0; | 97 | static int prev_key_post = 0; |
98 | 98 | ||
99 | if (TIME_AFTER(current_tick, next_backlight_on)) | 99 | if (TIME_AFTER(current_tick, nextbacklight_hw_on)) |
100 | { | 100 | { |
101 | backlight_on(); | 101 | backlight_on(); |
102 | reset_poweroff_timer(); | 102 | reset_poweroff_timer(); |
103 | next_backlight_on = current_tick + HZ/4; | 103 | nextbacklight_hw_on = current_tick + HZ/4; |
104 | } | 104 | } |
105 | 105 | ||
106 | if (wheel_prev < wheel) | 106 | if (wheel_prev < wheel) |
diff --git a/firmware/target/arm/tms320dm320/sansa-connect/backlight-sansaconnect.c b/firmware/target/arm/tms320dm320/sansa-connect/backlight-sansaconnect.c index 4104c21e52..c65d806635 100644 --- a/firmware/target/arm/tms320dm320/sansa-connect/backlight-sansaconnect.c +++ b/firmware/target/arm/tms320dm320/sansa-connect/backlight-sansaconnect.c | |||
@@ -50,7 +50,7 @@ static void _backlight_write_brightness(int brightness) | |||
50 | IO_CLK_PWM1H = brightness*70; | 50 | IO_CLK_PWM1H = brightness*70; |
51 | } | 51 | } |
52 | 52 | ||
53 | void _backlight_on(void) | 53 | void backlight_hw_on(void) |
54 | { | 54 | { |
55 | #ifdef HAVE_LCD_SLEEP | 55 | #ifdef HAVE_LCD_SLEEP |
56 | if (!lcd_active()) | 56 | if (!lcd_active()) |
@@ -67,7 +67,7 @@ void _backlight_on(void) | |||
67 | #endif | 67 | #endif |
68 | } | 68 | } |
69 | 69 | ||
70 | void _backlight_off(void) | 70 | void backlight_hw_off(void) |
71 | { | 71 | { |
72 | _backlight_write_brightness(0); | 72 | _backlight_write_brightness(0); |
73 | 73 | ||
@@ -77,23 +77,23 @@ void _backlight_off(void) | |||
77 | } | 77 | } |
78 | 78 | ||
79 | /* Assumes that the backlight has been initialized */ | 79 | /* Assumes that the backlight has been initialized */ |
80 | void _backlight_set_brightness(int brightness) | 80 | void backlight_hw_brightness(int brightness) |
81 | { | 81 | { |
82 | _backlight_write_brightness(brightness); | 82 | _backlight_write_brightness(brightness); |
83 | } | 83 | } |
84 | 84 | ||
85 | void __backlight_dim(bool dim_now) | 85 | void __backlight_dim(bool dim_now) |
86 | { | 86 | { |
87 | _backlight_set_brightness(dim_now ? | 87 | backlight_hw_brightness(dim_now ? |
88 | DEFAULT_BRIGHTNESS_SETTING : | 88 | DEFAULT_BRIGHTNESS_SETTING : |
89 | DEFAULT_DIMNESS_SETTING); | 89 | DEFAULT_DIMNESS_SETTING); |
90 | } | 90 | } |
91 | 91 | ||
92 | bool _backlight_init(void) | 92 | bool backlight_hw_init(void) |
93 | { | 93 | { |
94 | IO_CLK_PWM1C = 0x58D; /* as found in OF */ | 94 | IO_CLK_PWM1C = 0x58D; /* as found in OF */ |
95 | 95 | ||
96 | _backlight_set_brightness(backlight_brightness); | 96 | backlight_hw_brightness(backlight_brightness); |
97 | return true; | 97 | return true; |
98 | } | 98 | } |
99 | 99 | ||
diff --git a/firmware/target/arm/tms320dm320/sansa-connect/backlight-target.h b/firmware/target/arm/tms320dm320/sansa-connect/backlight-target.h index 89bd837cee..3a6fc8cf11 100644 --- a/firmware/target/arm/tms320dm320/sansa-connect/backlight-target.h +++ b/firmware/target/arm/tms320dm320/sansa-connect/backlight-target.h | |||
@@ -22,10 +22,10 @@ | |||
22 | #ifndef BACKLIGHT_TARGET_H | 22 | #ifndef BACKLIGHT_TARGET_H |
23 | #define BACKLIGHT_TARGET_H | 23 | #define BACKLIGHT_TARGET_H |
24 | 24 | ||
25 | bool _backlight_init(void); | 25 | bool backlight_hw_init(void); |
26 | void _backlight_on(void); | 26 | void backlight_hw_on(void); |
27 | void _backlight_off(void); | 27 | void backlight_hw_off(void); |
28 | void _backlight_set_brightness(int brightness); | 28 | void backlight_hw_brightness(int brightness); |
29 | 29 | ||
30 | /* true: backlight fades off - false: backlight fades on */ | 30 | /* true: backlight fades off - false: backlight fades on */ |
31 | void __backlight_dim(bool dim); | 31 | void __backlight_dim(bool dim); |
diff --git a/firmware/target/coldfire/iaudio/m3/backlight-m3.c b/firmware/target/coldfire/iaudio/m3/backlight-m3.c index 0b4ee51275..1163d6acb7 100644 --- a/firmware/target/coldfire/iaudio/m3/backlight-m3.c +++ b/firmware/target/coldfire/iaudio/m3/backlight-m3.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include "backlight.h" | 25 | #include "backlight.h" |
26 | #include "backlight-target.h" | 26 | #include "backlight-target.h" |
27 | 27 | ||
28 | bool _backlight_init(void) | 28 | bool backlight_hw_init(void) |
29 | { | 29 | { |
30 | and_l(~0x00000008, &GPIO1_OUT); | 30 | and_l(~0x00000008, &GPIO1_OUT); |
31 | or_l(0x00000008, &GPIO1_ENABLE); | 31 | or_l(0x00000008, &GPIO1_ENABLE); |
@@ -33,12 +33,12 @@ bool _backlight_init(void) | |||
33 | return true; /* Backlight always ON after boot. */ | 33 | return true; /* Backlight always ON after boot. */ |
34 | } | 34 | } |
35 | 35 | ||
36 | void _backlight_on(void) | 36 | void backlight_hw_on(void) |
37 | { | 37 | { |
38 | and_l(~0x00000008, &GPIO1_OUT); | 38 | and_l(~0x00000008, &GPIO1_OUT); |
39 | } | 39 | } |
40 | 40 | ||
41 | void _backlight_off(void) | 41 | void backlight_hw_off(void) |
42 | { | 42 | { |
43 | or_l(0x00000008, &GPIO1_OUT); | 43 | or_l(0x00000008, &GPIO1_OUT); |
44 | } | 44 | } |
diff --git a/firmware/target/coldfire/iaudio/m3/backlight-target.h b/firmware/target/coldfire/iaudio/m3/backlight-target.h index 7c3ba979a3..fdc8438ea7 100644 --- a/firmware/target/coldfire/iaudio/m3/backlight-target.h +++ b/firmware/target/coldfire/iaudio/m3/backlight-target.h | |||
@@ -22,8 +22,8 @@ | |||
22 | #ifndef BACKLIGHT_TARGET_H | 22 | #ifndef BACKLIGHT_TARGET_H |
23 | #define BACKLIGHT_TARGET_H | 23 | #define BACKLIGHT_TARGET_H |
24 | 24 | ||
25 | bool _backlight_init(void); | 25 | bool backlight_hw_init(void); |
26 | void _backlight_on(void); | 26 | void backlight_hw_on(void); |
27 | void _backlight_off(void); | 27 | void backlight_hw_off(void); |
28 | 28 | ||
29 | #endif | 29 | #endif |
diff --git a/firmware/target/coldfire/iaudio/m5/backlight-m5.c b/firmware/target/coldfire/iaudio/m5/backlight-m5.c index daa613810e..2738a327c9 100644 --- a/firmware/target/coldfire/iaudio/m5/backlight-m5.c +++ b/firmware/target/coldfire/iaudio/m5/backlight-m5.c | |||
@@ -26,14 +26,14 @@ | |||
26 | #include "pcf50606.h" | 26 | #include "pcf50606.h" |
27 | #include "lcd.h" | 27 | #include "lcd.h" |
28 | 28 | ||
29 | bool _backlight_init(void) | 29 | bool backlight_hw_init(void) |
30 | { | 30 | { |
31 | _backlight_on(); | 31 | backlight_hw_on(); |
32 | 32 | ||
33 | return true; /* Backlight always ON after boot. */ | 33 | return true; /* Backlight always ON after boot. */ |
34 | } | 34 | } |
35 | 35 | ||
36 | void _backlight_on(void) | 36 | void backlight_hw_on(void) |
37 | { | 37 | { |
38 | int level = disable_irq_save(); | 38 | int level = disable_irq_save(); |
39 | 39 | ||
@@ -41,7 +41,7 @@ void _backlight_on(void) | |||
41 | restore_irq(level); | 41 | restore_irq(level); |
42 | } | 42 | } |
43 | 43 | ||
44 | void _backlight_off(void) | 44 | void backlight_hw_off(void) |
45 | { | 45 | { |
46 | int level = disable_irq_save(); | 46 | int level = disable_irq_save(); |
47 | 47 | ||
@@ -49,12 +49,12 @@ void _backlight_off(void) | |||
49 | restore_irq(level); | 49 | restore_irq(level); |
50 | } | 50 | } |
51 | 51 | ||
52 | void _remote_backlight_on(void) | 52 | void remote_backlight_hw_on(void) |
53 | { | 53 | { |
54 | and_l(~0x00200000, &GPIO_OUT); | 54 | and_l(~0x00200000, &GPIO_OUT); |
55 | } | 55 | } |
56 | 56 | ||
57 | void _remote_backlight_off(void) | 57 | void remote_backlight_hw_off(void) |
58 | { | 58 | { |
59 | or_l(0x00200000, &GPIO_OUT); | 59 | or_l(0x00200000, &GPIO_OUT); |
60 | } | 60 | } |
diff --git a/firmware/target/coldfire/iaudio/m5/backlight-target.h b/firmware/target/coldfire/iaudio/m5/backlight-target.h index 43e8a2cbe2..38acdd0e5f 100644 --- a/firmware/target/coldfire/iaudio/m5/backlight-target.h +++ b/firmware/target/coldfire/iaudio/m5/backlight-target.h | |||
@@ -21,10 +21,10 @@ | |||
21 | #ifndef BACKLIGHT_TARGET_H | 21 | #ifndef BACKLIGHT_TARGET_H |
22 | #define BACKLIGHT_TARGET_H | 22 | #define BACKLIGHT_TARGET_H |
23 | 23 | ||
24 | bool _backlight_init(void); | 24 | bool backlight_hw_init(void); |
25 | void _backlight_on(void); | 25 | void backlight_hw_on(void); |
26 | void _backlight_off(void); | 26 | void backlight_hw_off(void); |
27 | void _remote_backlight_on(void); | 27 | void remote_backlight_hw_on(void); |
28 | void _remote_backlight_off(void); | 28 | void remote_backlight_hw_off(void); |
29 | 29 | ||
30 | #endif | 30 | #endif |
diff --git a/firmware/target/coldfire/iaudio/x5/backlight-target.h b/firmware/target/coldfire/iaudio/x5/backlight-target.h index 2b5281c23e..1d9bee0545 100644 --- a/firmware/target/coldfire/iaudio/x5/backlight-target.h +++ b/firmware/target/coldfire/iaudio/x5/backlight-target.h | |||
@@ -21,11 +21,11 @@ | |||
21 | #ifndef BACKLIGHT_TARGET_H | 21 | #ifndef BACKLIGHT_TARGET_H |
22 | #define BACKLIGHT_TARGET_H | 22 | #define BACKLIGHT_TARGET_H |
23 | 23 | ||
24 | bool _backlight_init(void); | 24 | bool backlight_hw_init(void); |
25 | void _backlight_on(void); | 25 | void backlight_hw_on(void); |
26 | void _backlight_off(void); | 26 | void backlight_hw_off(void); |
27 | void _backlight_set_brightness(int val); | 27 | void backlight_hw_brightness(int val); |
28 | void _remote_backlight_on(void); | 28 | void remote_backlight_hw_on(void); |
29 | void _remote_backlight_off(void); | 29 | void remote_backlight_hw_off(void); |
30 | 30 | ||
31 | #endif | 31 | #endif |
diff --git a/firmware/target/coldfire/iaudio/x5/backlight-x5.c b/firmware/target/coldfire/iaudio/x5/backlight-x5.c index 8a06c7d653..de8b3d8e14 100644 --- a/firmware/target/coldfire/iaudio/x5/backlight-x5.c +++ b/firmware/target/coldfire/iaudio/x5/backlight-x5.c | |||
@@ -26,15 +26,15 @@ | |||
26 | #include "pcf50606.h" | 26 | #include "pcf50606.h" |
27 | #include "lcd.h" | 27 | #include "lcd.h" |
28 | 28 | ||
29 | bool _backlight_init(void) | 29 | bool backlight_hw_init(void) |
30 | { | 30 | { |
31 | _backlight_set_brightness(DEFAULT_BRIGHTNESS_SETTING); | 31 | backlight_hw_brightness(DEFAULT_BRIGHTNESS_SETTING); |
32 | _backlight_on(); | 32 | backlight_hw_on(); |
33 | 33 | ||
34 | return true; /* Backlight always ON after boot. */ | 34 | return true; /* Backlight always ON after boot. */ |
35 | } | 35 | } |
36 | 36 | ||
37 | void _backlight_on(void) | 37 | void backlight_hw_on(void) |
38 | { | 38 | { |
39 | int level; | 39 | int level; |
40 | #ifdef HAVE_LCD_ENABLE | 40 | #ifdef HAVE_LCD_ENABLE |
@@ -45,7 +45,7 @@ void _backlight_on(void) | |||
45 | restore_irq(level); | 45 | restore_irq(level); |
46 | } | 46 | } |
47 | 47 | ||
48 | void _backlight_off(void) | 48 | void backlight_hw_off(void) |
49 | { | 49 | { |
50 | int level = disable_irq_save(); | 50 | int level = disable_irq_save(); |
51 | pcf50606_write(0x38, 0x80); /* Backlight OFF, GPO1INV=1, GPO1ACT=000 */ | 51 | pcf50606_write(0x38, 0x80); /* Backlight OFF, GPO1INV=1, GPO1ACT=000 */ |
@@ -56,7 +56,7 @@ void _backlight_off(void) | |||
56 | } | 56 | } |
57 | 57 | ||
58 | /* set brightness by changing the PWM */ | 58 | /* set brightness by changing the PWM */ |
59 | void _backlight_set_brightness(int val) | 59 | void backlight_hw_brightness(int val) |
60 | { | 60 | { |
61 | /* disable IRQs while bitbanging */ | 61 | /* disable IRQs while bitbanging */ |
62 | int old_irq_level = disable_irq_save(); | 62 | int old_irq_level = disable_irq_save(); |
@@ -65,12 +65,12 @@ void _backlight_set_brightness(int val) | |||
65 | restore_irq(old_irq_level); | 65 | restore_irq(old_irq_level); |
66 | } | 66 | } |
67 | 67 | ||
68 | void _remote_backlight_on(void) | 68 | void remote_backlight_hw_on(void) |
69 | { | 69 | { |
70 | and_l(~0x00200000, &GPIO_OUT); | 70 | and_l(~0x00200000, &GPIO_OUT); |
71 | } | 71 | } |
72 | 72 | ||
73 | void _remote_backlight_off(void) | 73 | void remote_backlight_hw_off(void) |
74 | { | 74 | { |
75 | or_l(0x00200000, &GPIO_OUT); | 75 | or_l(0x00200000, &GPIO_OUT); |
76 | } | 76 | } |
diff --git a/firmware/target/coldfire/iriver/h100/backlight-h100.c b/firmware/target/coldfire/iriver/h100/backlight-h100.c index 47c02cb351..1f582ec8df 100644 --- a/firmware/target/coldfire/iriver/h100/backlight-h100.c +++ b/firmware/target/coldfire/iriver/h100/backlight-h100.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include "lcd.h" | 27 | #include "lcd.h" |
28 | 28 | ||
29 | /* Returns the current state of the backlight (true=ON, false=OFF). */ | 29 | /* Returns the current state of the backlight (true=ON, false=OFF). */ |
30 | bool _backlight_init(void) | 30 | bool backlight_hw_init(void) |
31 | { | 31 | { |
32 | or_l(0x00020000, &GPIO1_ENABLE); | 32 | or_l(0x00020000, &GPIO1_ENABLE); |
33 | or_l(0x00020000, &GPIO1_FUNCTION); | 33 | or_l(0x00020000, &GPIO1_FUNCTION); |
@@ -45,12 +45,12 @@ void _backlight_hw_off(void) | |||
45 | or_l(0x00020000, &GPIO1_OUT); | 45 | or_l(0x00020000, &GPIO1_OUT); |
46 | } | 46 | } |
47 | 47 | ||
48 | void _remote_backlight_on(void) | 48 | void remote_backlight_hw_on(void) |
49 | { | 49 | { |
50 | and_l(~0x00000800, &GPIO_OUT); | 50 | and_l(~0x00000800, &GPIO_OUT); |
51 | } | 51 | } |
52 | 52 | ||
53 | void _remote_backlight_off(void) | 53 | void remote_backlight_hw_off(void) |
54 | { | 54 | { |
55 | or_l(0x00000800, &GPIO_OUT); | 55 | or_l(0x00000800, &GPIO_OUT); |
56 | } | 56 | } |
diff --git a/firmware/target/coldfire/iriver/h100/backlight-target.h b/firmware/target/coldfire/iriver/h100/backlight-target.h index 5cd6fa7133..64d0353ab0 100644 --- a/firmware/target/coldfire/iriver/h100/backlight-target.h +++ b/firmware/target/coldfire/iriver/h100/backlight-target.h | |||
@@ -21,22 +21,19 @@ | |||
21 | #ifndef BACKLIGHT_TARGET_H | 21 | #ifndef BACKLIGHT_TARGET_H |
22 | #define BACKLIGHT_TARGET_H | 22 | #define BACKLIGHT_TARGET_H |
23 | 23 | ||
24 | bool _backlight_init(void); /* Returns backlight current state (true=ON). */ | 24 | bool backlight_hw_init(void); /* Returns backlight current state (true=ON). */ |
25 | void _backlight_hw_on(void); | 25 | void backlight_hw_on(void); |
26 | void _backlight_hw_off(void); | 26 | void backlight_hw_off(void); |
27 | 27 | ||
28 | #ifdef BOOTLOADER | 28 | #ifndef BOOTLOADER |
29 | #define _backlight_on() _backlight_hw_on() | 29 | #define backlight_hw_on_isr() backlight_hw_on() |
30 | #define _backlight_off() _backlight_hw_off() | 30 | #define backlight_hw_off_isr() backlight_hw_off() |
31 | #else | 31 | #define backlight_hw_on_normal() backlight_hw_on() |
32 | #define _backlight_on_isr() _backlight_hw_on() | 32 | #define backlight_hw_off_normal() backlight_hw_off() |
33 | #define _backlight_off_isr() _backlight_hw_off() | ||
34 | #define _backlight_on_normal() _backlight_hw_on() | ||
35 | #define _backlight_off_normal() _backlight_hw_off() | ||
36 | #define _BACKLIGHT_FADE_BOOST | 33 | #define _BACKLIGHT_FADE_BOOST |
37 | #endif | 34 | #endif |
38 | 35 | ||
39 | void _remote_backlight_on(void); | 36 | void remote_backlight_hw_on(void); |
40 | void _remote_backlight_off(void); | 37 | void remote_backlight_hw_off(void); |
41 | 38 | ||
42 | #endif | 39 | #endif |
diff --git a/firmware/target/coldfire/iriver/h300/backlight-h300.c b/firmware/target/coldfire/iriver/h300/backlight-h300.c index 64e09b9b40..9e44dfa80e 100644 --- a/firmware/target/coldfire/iriver/h300/backlight-h300.c +++ b/firmware/target/coldfire/iriver/h300/backlight-h300.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include "pcf50606.h" | 28 | #include "pcf50606.h" |
29 | #include "lcd.h" | 29 | #include "lcd.h" |
30 | 30 | ||
31 | bool _backlight_init(void) | 31 | bool backlight_hw_init(void) |
32 | { | 32 | { |
33 | or_l(0x00020000, &GPIO1_ENABLE); | 33 | or_l(0x00020000, &GPIO1_ENABLE); |
34 | or_l(0x00020000, &GPIO1_FUNCTION); | 34 | or_l(0x00020000, &GPIO1_FUNCTION); |
@@ -37,21 +37,21 @@ bool _backlight_init(void) | |||
37 | return true; /* Backlight always ON after boot. */ | 37 | return true; /* Backlight always ON after boot. */ |
38 | } | 38 | } |
39 | 39 | ||
40 | void _backlight_on(void) | 40 | void backlight_hw_on(void) |
41 | { | 41 | { |
42 | lcd_enable(true); | 42 | lcd_enable(true); |
43 | sleep(HZ/100); /* lcd needs time - avoid flashing for dark screens */ | 43 | sleep(HZ/100); /* lcd needs time - avoid flashing for dark screens */ |
44 | or_l(0x00020000, &GPIO1_OUT); | 44 | or_l(0x00020000, &GPIO1_OUT); |
45 | } | 45 | } |
46 | 46 | ||
47 | void _backlight_off(void) | 47 | void backlight_hw_off(void) |
48 | { | 48 | { |
49 | and_l(~0x00020000, &GPIO1_OUT); | 49 | and_l(~0x00020000, &GPIO1_OUT); |
50 | lcd_enable(false); | 50 | lcd_enable(false); |
51 | } | 51 | } |
52 | 52 | ||
53 | /* set brightness by changing the PWM */ | 53 | /* set brightness by changing the PWM */ |
54 | void _backlight_set_brightness(int val) | 54 | void backlight_hw_brightness(int val) |
55 | { | 55 | { |
56 | /* disable IRQs while bitbanging */ | 56 | /* disable IRQs while bitbanging */ |
57 | int old_irq_level = disable_irq_save(); | 57 | int old_irq_level = disable_irq_save(); |
@@ -60,12 +60,12 @@ void _backlight_set_brightness(int val) | |||
60 | restore_irq(old_irq_level); | 60 | restore_irq(old_irq_level); |
61 | } | 61 | } |
62 | 62 | ||
63 | void _remote_backlight_on(void) | 63 | void remote_backlight_hw_on(void) |
64 | { | 64 | { |
65 | and_l(~0x00000002, &GPIO1_OUT); | 65 | and_l(~0x00000002, &GPIO1_OUT); |
66 | } | 66 | } |
67 | 67 | ||
68 | void _remote_backlight_off(void) | 68 | void remote_backlight_hw_off(void) |
69 | { | 69 | { |
70 | or_l(0x00000002, &GPIO1_OUT); | 70 | or_l(0x00000002, &GPIO1_OUT); |
71 | } | 71 | } |
diff --git a/firmware/target/coldfire/iriver/h300/backlight-target.h b/firmware/target/coldfire/iriver/h300/backlight-target.h index 046a8fba8b..1ea9087a7b 100644 --- a/firmware/target/coldfire/iriver/h300/backlight-target.h +++ b/firmware/target/coldfire/iriver/h300/backlight-target.h | |||
@@ -21,11 +21,11 @@ | |||
21 | #ifndef BACKLIGHT_TARGET_H | 21 | #ifndef BACKLIGHT_TARGET_H |
22 | #define BACKLIGHT_TARGET_H | 22 | #define BACKLIGHT_TARGET_H |
23 | 23 | ||
24 | bool _backlight_init(void); /* Returns backlight current state (true=ON). */ | 24 | bool backlight_hw_init(void); /* Returns backlight current state (true=ON). */ |
25 | void _backlight_on(void); | 25 | void backlight_hw_on(void); |
26 | void _backlight_off(void); | 26 | void backlight_hw_off(void); |
27 | void _backlight_set_brightness(int val); | 27 | void backlight_hw_brightness(int val); |
28 | void _remote_backlight_on(void); | 28 | void remote_backlight_hw_on(void); |
29 | void _remote_backlight_off(void); | 29 | void remote_backlight_hw_off(void); |
30 | 30 | ||
31 | #endif | 31 | #endif |
diff --git a/firmware/target/coldfire/mpio/backlight-mpio.c b/firmware/target/coldfire/mpio/backlight-mpio.c index 1e40e9bb88..e04fa6d7dc 100644 --- a/firmware/target/coldfire/mpio/backlight-mpio.c +++ b/firmware/target/coldfire/mpio/backlight-mpio.c | |||
@@ -27,11 +27,11 @@ | |||
27 | #include "backlight-target.h" | 27 | #include "backlight-target.h" |
28 | #include "lcd.h" | 28 | #include "lcd.h" |
29 | 29 | ||
30 | static bool _backlight_on = true; | 30 | static bool backlight_hw_on = true; |
31 | static int _brightness = DEFAULT_BRIGHTNESS_SETTING; | 31 | static int _brightness = DEFAULT_BRIGHTNESS_SETTING; |
32 | 32 | ||
33 | /* Returns the current state of the backlight (true=ON, false=OFF). */ | 33 | /* Returns the current state of the backlight (true=ON, false=OFF). */ |
34 | bool _backlight_init(void) | 34 | bool backlight_hw_init(void) |
35 | { | 35 | { |
36 | #ifdef BOOTLOADER | 36 | #ifdef BOOTLOADER |
37 | and_l(~(1<<28),&GPIO_OUT); | 37 | and_l(~(1<<28),&GPIO_OUT); |
@@ -44,12 +44,12 @@ bool _backlight_init(void) | |||
44 | void _backlight_hw_on(void) | 44 | void _backlight_hw_on(void) |
45 | { | 45 | { |
46 | #ifndef BOOTLOADER | 46 | #ifndef BOOTLOADER |
47 | if (_backlight_on) | 47 | if (backlight_hw_on) |
48 | return; | 48 | return; |
49 | #endif | 49 | #endif |
50 | 50 | ||
51 | _backlight_set_brightness(_brightness); | 51 | backlight_hw_brightness(_brightness); |
52 | _backlight_on = true; | 52 | backlight_hw_on = true; |
53 | 53 | ||
54 | } | 54 | } |
55 | 55 | ||
@@ -57,15 +57,15 @@ void _backlight_hw_off(void) | |||
57 | { | 57 | { |
58 | /* GPIO28 low */ | 58 | /* GPIO28 low */ |
59 | and_l(~(1<<28),&GPIO_OUT); | 59 | and_l(~(1<<28),&GPIO_OUT); |
60 | _backlight_on = false; | 60 | backlight_hw_on = false; |
61 | } | 61 | } |
62 | 62 | ||
63 | void _backlight_set_brightness(int val) | 63 | void backlight_hw_brightness(int val) |
64 | { | 64 | { |
65 | unsigned char i; | 65 | unsigned char i; |
66 | 66 | ||
67 | #ifndef BOOTLOADER | 67 | #ifndef BOOTLOADER |
68 | if( _brightness == val && _backlight_on == true ) | 68 | if( _brightness == val && backlight_hw_on == true ) |
69 | return; | 69 | return; |
70 | #endif | 70 | #endif |
71 | 71 | ||
@@ -83,12 +83,12 @@ void _backlight_set_brightness(int val) | |||
83 | _brightness = val; | 83 | _brightness = val; |
84 | } | 84 | } |
85 | 85 | ||
86 | void _remote_backlight_on(void) | 86 | void remote_backlight_hw_on(void) |
87 | { | 87 | { |
88 | /* I don't have remote to play with */ | 88 | /* I don't have remote to play with */ |
89 | } | 89 | } |
90 | 90 | ||
91 | void _remote_backlight_off(void) | 91 | void remote_backlight_hw_off(void) |
92 | { | 92 | { |
93 | /* I don't have remote to play with */ | 93 | /* I don't have remote to play with */ |
94 | } | 94 | } |
diff --git a/firmware/target/coldfire/mpio/backlight-target.h b/firmware/target/coldfire/mpio/backlight-target.h index 93b1f309fb..b73bf27c89 100644 --- a/firmware/target/coldfire/mpio/backlight-target.h +++ b/firmware/target/coldfire/mpio/backlight-target.h | |||
@@ -21,15 +21,13 @@ | |||
21 | #ifndef BACKLIGHT_TARGET_H | 21 | #ifndef BACKLIGHT_TARGET_H |
22 | #define BACKLIGHT_TARGET_H | 22 | #define BACKLIGHT_TARGET_H |
23 | 23 | ||
24 | bool _backlight_init(void); /* Returns backlight current state (true=ON). */ | 24 | bool backlight_hw_init(void); /* Returns backlight current state (true=ON). */ |
25 | void _backlight_hw_on(void); | 25 | void backlight_hw_on(void); |
26 | void _backlight_hw_off(void); | 26 | void backlight_hw_off(void); |
27 | void _backlight_set_brightness(int val); | 27 | void backlight_hw_brightness(int val); |
28 | 28 | ||
29 | #define _backlight_on() _backlight_hw_on() | 29 | #define backlight_hw_on_isr() backlight_hw_on() |
30 | #define _backlight_off() _backlight_hw_off() | 30 | #define backlight_hw_off_isr() backlight_hw_off() |
31 | #define _backlight_on_isr() _backlight_hw_on() | 31 | #define backlight_hw_on_normal() backlight_hw_on() |
32 | #define _backlight_off_isr() _backlight_hw_off() | 32 | #define backlight_hw_off_normal() backlight_hw_off() |
33 | #define _backlight_on_normal() _backlight_hw_on() | ||
34 | #define _backlight_off_normal() _backlight_hw_off() | ||
35 | #endif | 33 | #endif |
diff --git a/firmware/target/coldfire/mpio/hd300/button-hd300.c b/firmware/target/coldfire/mpio/hd300/button-hd300.c index fda26dd0df..e84b8d442b 100644 --- a/firmware/target/coldfire/mpio/hd300/button-hd300.c +++ b/firmware/target/coldfire/mpio/hd300/button-hd300.c | |||
@@ -80,7 +80,7 @@ void scrollstrip_isr(void) | |||
80 | static signed char prev_scroll_lines = -1; | 80 | static signed char prev_scroll_lines = -1; |
81 | static signed char direction = 0; | 81 | static signed char direction = 0; |
82 | static unsigned char count = 0; | 82 | static unsigned char count = 0; |
83 | static long next_backlight_on = 0; | 83 | static long nextbacklight_hw_on = 0; |
84 | 84 | ||
85 | signed int new_scroll_lines; | 85 | signed int new_scroll_lines; |
86 | signed int scroll_dir; | 86 | signed int scroll_dir; |
@@ -120,11 +120,11 @@ void scrollstrip_isr(void) | |||
120 | } | 120 | } |
121 | 121 | ||
122 | /* poke backlight */ | 122 | /* poke backlight */ |
123 | if (TIME_AFTER(current_tick, next_backlight_on)) | 123 | if (TIME_AFTER(current_tick, nextbacklight_hw_on)) |
124 | { | 124 | { |
125 | backlight_on(); | 125 | backlight_on(); |
126 | reset_poweroff_timer(); | 126 | reset_poweroff_timer(); |
127 | next_backlight_on = current_tick + HZ/4; | 127 | nextbacklight_hw_on = current_tick + HZ/4; |
128 | } | 128 | } |
129 | 129 | ||
130 | /* apply sensitivity filter */ | 130 | /* apply sensitivity filter */ |
diff --git a/firmware/target/hosted/android/dx50/backlight-dx50.c b/firmware/target/hosted/android/dx50/backlight-dx50.c index 98dbcb8abe..8eb4c58191 100644 --- a/firmware/target/hosted/android/dx50/backlight-dx50.c +++ b/firmware/target/hosted/android/dx50/backlight-dx50.c | |||
@@ -27,13 +27,13 @@ | |||
27 | #include <stdio.h> | 27 | #include <stdio.h> |
28 | #include "unistd.h" | 28 | #include "unistd.h" |
29 | 29 | ||
30 | bool _backlight_init(void) | 30 | bool backlight_hw_init(void) |
31 | { | 31 | { |
32 | /* We have nothing to do */ | 32 | /* We have nothing to do */ |
33 | return true; | 33 | return true; |
34 | } | 34 | } |
35 | 35 | ||
36 | void _backlight_on(void) | 36 | void backlight_hw_on(void) |
37 | { | 37 | { |
38 | FILE *f = fopen("/sys/power/state", "w"); | 38 | FILE *f = fopen("/sys/power/state", "w"); |
39 | fputs("on", f); | 39 | fputs("on", f); |
@@ -41,7 +41,7 @@ void _backlight_on(void) | |||
41 | lcd_enable(true); | 41 | lcd_enable(true); |
42 | } | 42 | } |
43 | 43 | ||
44 | void _backlight_off(void) | 44 | void backlight_hw_off(void) |
45 | { | 45 | { |
46 | FILE * f; | 46 | FILE * f; |
47 | 47 | ||
@@ -62,7 +62,7 @@ void _backlight_off(void) | |||
62 | 62 | ||
63 | } | 63 | } |
64 | 64 | ||
65 | void _backlight_set_brightness(int brightness) | 65 | void backlight_hw_brightness(int brightness) |
66 | { | 66 | { |
67 | /* Just another check... */ | 67 | /* Just another check... */ |
68 | if (brightness > MAX_BRIGHTNESS_SETTING) | 68 | if (brightness > MAX_BRIGHTNESS_SETTING) |
diff --git a/firmware/target/hosted/android/dx50/backlight-target.h b/firmware/target/hosted/android/dx50/backlight-target.h index 67836aa790..0dc7ce387a 100644 --- a/firmware/target/hosted/android/dx50/backlight-target.h +++ b/firmware/target/hosted/android/dx50/backlight-target.h | |||
@@ -23,9 +23,9 @@ | |||
23 | 23 | ||
24 | #include <stdbool.h> | 24 | #include <stdbool.h> |
25 | 25 | ||
26 | bool _backlight_init(void); | 26 | bool backlight_hw_init(void); |
27 | void _backlight_on(void); | 27 | void backlight_hw_on(void); |
28 | void _backlight_off(void); | 28 | void backlight_hw_off(void); |
29 | void _backlight_set_brightness(int brightness); | 29 | void backlight_hw_brightness(int brightness); |
30 | 30 | ||
31 | #endif /* BACKLIGHT_TARGET_H */ | 31 | #endif /* BACKLIGHT_TARGET_H */ |
diff --git a/firmware/target/hosted/samsungypr/backlight-target.h b/firmware/target/hosted/samsungypr/backlight-target.h index 21db75c8c9..138c2ccd3c 100644 --- a/firmware/target/hosted/samsungypr/backlight-target.h +++ b/firmware/target/hosted/samsungypr/backlight-target.h | |||
@@ -21,9 +21,9 @@ | |||
21 | #ifndef BACKLIGHT_TARGET_H | 21 | #ifndef BACKLIGHT_TARGET_H |
22 | #define BACKLIGHT_TARGET_H | 22 | #define BACKLIGHT_TARGET_H |
23 | 23 | ||
24 | bool _backlight_init(void); | 24 | bool backlight_hw_init(void); |
25 | void _backlight_on(void); | 25 | void backlight_hw_on(void); |
26 | void _backlight_off(void); | 26 | void backlight_hw_off(void); |
27 | void _backlight_set_brightness(int brightness); | 27 | void backlight_hw_brightness(int brightness); |
28 | 28 | ||
29 | #endif /* BACKLIGHT_TARGET_H */ | 29 | #endif /* BACKLIGHT_TARGET_H */ |
diff --git a/firmware/target/hosted/samsungypr/ypr0/backlight-ypr0.c b/firmware/target/hosted/samsungypr/ypr0/backlight-ypr0.c index 5555b30473..353ab15c48 100644 --- a/firmware/target/hosted/samsungypr/ypr0/backlight-ypr0.c +++ b/firmware/target/hosted/samsungypr/ypr0/backlight-ypr0.c | |||
@@ -29,13 +29,13 @@ | |||
29 | 29 | ||
30 | static bool backlight_on_status = true; /* Is on or off? */ | 30 | static bool backlight_on_status = true; /* Is on or off? */ |
31 | 31 | ||
32 | bool _backlight_init(void) | 32 | bool backlight_hw_init(void) |
33 | { | 33 | { |
34 | /* We have nothing to do */ | 34 | /* We have nothing to do */ |
35 | return true; | 35 | return true; |
36 | } | 36 | } |
37 | 37 | ||
38 | void _backlight_on(void) | 38 | void backlight_hw_on(void) |
39 | { | 39 | { |
40 | if (!backlight_on_status) | 40 | if (!backlight_on_status) |
41 | { | 41 | { |
@@ -51,7 +51,7 @@ void _backlight_on(void) | |||
51 | 51 | ||
52 | } | 52 | } |
53 | 53 | ||
54 | void _backlight_off(void) | 54 | void backlight_hw_off(void) |
55 | { | 55 | { |
56 | if (backlight_on_status) | 56 | if (backlight_on_status) |
57 | { | 57 | { |
@@ -66,7 +66,7 @@ void _backlight_off(void) | |||
66 | backlight_on_status = false; | 66 | backlight_on_status = false; |
67 | } | 67 | } |
68 | 68 | ||
69 | void _backlight_set_brightness(int brightness) | 69 | void backlight_hw_brightness(int brightness) |
70 | { | 70 | { |
71 | /* Just another check... */ | 71 | /* Just another check... */ |
72 | if (brightness > MAX_BRIGHTNESS_SETTING) | 72 | if (brightness > MAX_BRIGHTNESS_SETTING) |
diff --git a/firmware/target/hosted/samsungypr/ypr1/backlight-ypr1.c b/firmware/target/hosted/samsungypr/ypr1/backlight-ypr1.c index e4f0457cf9..7f9cc1e729 100644 --- a/firmware/target/hosted/samsungypr/ypr1/backlight-ypr1.c +++ b/firmware/target/hosted/samsungypr/ypr1/backlight-ypr1.c | |||
@@ -27,32 +27,32 @@ | |||
27 | 27 | ||
28 | static bool backlight_on_status = true; /* Is on or off? */ | 28 | static bool backlight_on_status = true; /* Is on or off? */ |
29 | 29 | ||
30 | bool _backlight_init(void) | 30 | bool backlight_hw_init(void) |
31 | { | 31 | { |
32 | /* We have nothing to do */ | 32 | /* We have nothing to do */ |
33 | return true; | 33 | return true; |
34 | } | 34 | } |
35 | 35 | ||
36 | void _backlight_on(void) | 36 | void backlight_hw_on(void) |
37 | { | 37 | { |
38 | if (!backlight_on_status) { | 38 | if (!backlight_on_status) { |
39 | _backlight_set_brightness(backlight_brightness); | 39 | backlight_hw_brightness(backlight_brightness); |
40 | } | 40 | } |
41 | 41 | ||
42 | backlight_on_status = true; | 42 | backlight_on_status = true; |
43 | 43 | ||
44 | } | 44 | } |
45 | 45 | ||
46 | void _backlight_off(void) | 46 | void backlight_hw_off(void) |
47 | { | 47 | { |
48 | if (backlight_on_status) { | 48 | if (backlight_on_status) { |
49 | _backlight_set_brightness(0); | 49 | backlight_hw_brightness(0); |
50 | } | 50 | } |
51 | 51 | ||
52 | backlight_on_status = false; | 52 | backlight_on_status = false; |
53 | } | 53 | } |
54 | 54 | ||
55 | void _backlight_set_brightness(int brightness) | 55 | void backlight_hw_brightness(int brightness) |
56 | { | 56 | { |
57 | /* Just another check... */ | 57 | /* Just another check... */ |
58 | if (brightness > MAX_BRIGHTNESS_SETTING) { | 58 | if (brightness > MAX_BRIGHTNESS_SETTING) { |
diff --git a/firmware/target/mips/ingenic_jz47xx/backlight-target.h b/firmware/target/mips/ingenic_jz47xx/backlight-target.h index 67836aa790..0dc7ce387a 100644 --- a/firmware/target/mips/ingenic_jz47xx/backlight-target.h +++ b/firmware/target/mips/ingenic_jz47xx/backlight-target.h | |||
@@ -23,9 +23,9 @@ | |||
23 | 23 | ||
24 | #include <stdbool.h> | 24 | #include <stdbool.h> |
25 | 25 | ||
26 | bool _backlight_init(void); | 26 | bool backlight_hw_init(void); |
27 | void _backlight_on(void); | 27 | void backlight_hw_on(void); |
28 | void _backlight_off(void); | 28 | void backlight_hw_off(void); |
29 | void _backlight_set_brightness(int brightness); | 29 | void backlight_hw_brightness(int brightness); |
30 | 30 | ||
31 | #endif /* BACKLIGHT_TARGET_H */ | 31 | #endif /* BACKLIGHT_TARGET_H */ |
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx747/backlight-onda_vx7X7.c b/firmware/target/mips/ingenic_jz47xx/onda_vx747/backlight-onda_vx7X7.c index 7f834129b3..aacfe36f82 100644 --- a/firmware/target/mips/ingenic_jz47xx/onda_vx747/backlight-onda_vx7X7.c +++ b/firmware/target/mips/ingenic_jz47xx/onda_vx747/backlight-onda_vx7X7.c | |||
@@ -53,19 +53,19 @@ static void set_backlight(int val) | |||
53 | old_val = val; | 53 | old_val = val; |
54 | } | 54 | } |
55 | 55 | ||
56 | static void set_backlight_on(void) | 56 | static void setbacklight_hw_on(void) |
57 | { | 57 | { |
58 | __tcu_start_counter(BACKLIGHT_PWM); | 58 | __tcu_start_counter(BACKLIGHT_PWM); |
59 | __tcu_enable_pwm_output(BACKLIGHT_PWM); | 59 | __tcu_enable_pwm_output(BACKLIGHT_PWM); |
60 | } | 60 | } |
61 | 61 | ||
62 | static void set_backlight_off(void) | 62 | static void setbacklight_hw_off(void) |
63 | { | 63 | { |
64 | __tcu_disable_pwm_output(BACKLIGHT_PWM); | 64 | __tcu_disable_pwm_output(BACKLIGHT_PWM); |
65 | __tcu_stop_counter(BACKLIGHT_PWM); | 65 | __tcu_stop_counter(BACKLIGHT_PWM); |
66 | } | 66 | } |
67 | 67 | ||
68 | bool _backlight_init(void) | 68 | bool backlight_hw_init(void) |
69 | { | 69 | { |
70 | __gpio_as_pwm(BACKLIGHT_PWM); | 70 | __gpio_as_pwm(BACKLIGHT_PWM); |
71 | __tcu_start_timer_clock(BACKLIGHT_PWM); | 71 | __tcu_start_timer_clock(BACKLIGHT_PWM); |
@@ -88,24 +88,24 @@ bool _backlight_init(void) | |||
88 | return true; | 88 | return true; |
89 | } | 89 | } |
90 | 90 | ||
91 | void _backlight_on(void) | 91 | void backlight_hw_on(void) |
92 | { | 92 | { |
93 | #ifdef HAVE_LCD_ENABLE | 93 | #ifdef HAVE_LCD_ENABLE |
94 | lcd_enable(true); /* power on lcd */ | 94 | lcd_enable(true); /* power on lcd */ |
95 | #endif | 95 | #endif |
96 | set_backlight_on(); | 96 | setbacklight_hw_on(); |
97 | } | 97 | } |
98 | 98 | ||
99 | void _backlight_off(void) | 99 | void backlight_hw_off(void) |
100 | { | 100 | { |
101 | set_backlight_off(); | 101 | setbacklight_hw_off(); |
102 | #ifdef HAVE_LCD_ENABLE | 102 | #ifdef HAVE_LCD_ENABLE |
103 | lcd_enable(false); /* power off lcd */ | 103 | lcd_enable(false); /* power off lcd */ |
104 | #endif | 104 | #endif |
105 | } | 105 | } |
106 | 106 | ||
107 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS | 107 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS |
108 | void _backlight_set_brightness(int brightness) | 108 | void backlight_hw_brightness(int brightness) |
109 | { | 109 | { |
110 | set_backlight(brightness); | 110 | set_backlight(brightness); |
111 | } | 111 | } |
@@ -115,6 +115,6 @@ void _backlight_set_brightness(int brightness) | |||
115 | /* Turn off LED supply */ | 115 | /* Turn off LED supply */ |
116 | void _backlight_lcd_sleep(void) | 116 | void _backlight_lcd_sleep(void) |
117 | { | 117 | { |
118 | _backlight_off(); | 118 | backlight_hw_off(); |
119 | } | 119 | } |
120 | #endif | 120 | #endif |
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c b/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c index d06cb28f40..a810fde704 100644 --- a/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c +++ b/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c | |||
@@ -184,7 +184,7 @@ int button_read_device(int *data) | |||
184 | #if CONFIG_ORIENTATION == SCREEN_LANDSCAPE | 184 | #if CONFIG_ORIENTATION == SCREEN_LANDSCAPE |
185 | *data = (*data & 0xFFFF) | ((LCD_HEIGHT - (*data >> 16)) << 16); | 185 | *data = (*data & 0xFFFF) | ((LCD_HEIGHT - (*data >> 16)) << 16); |
186 | #endif | 186 | #endif |
187 | if( UNLIKELY(!is_backlight_on(true)) ) | 187 | if( UNLIKELY(!isbacklight_hw_on(true)) ) |
188 | *data = 0; | 188 | *data = 0; |
189 | 189 | ||
190 | old_data = *data; | 190 | old_data = *data; |
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx767/backlight-target.h b/firmware/target/mips/ingenic_jz47xx/onda_vx767/backlight-target.h index 67836aa790..0dc7ce387a 100644 --- a/firmware/target/mips/ingenic_jz47xx/onda_vx767/backlight-target.h +++ b/firmware/target/mips/ingenic_jz47xx/onda_vx767/backlight-target.h | |||
@@ -23,9 +23,9 @@ | |||
23 | 23 | ||
24 | #include <stdbool.h> | 24 | #include <stdbool.h> |
25 | 25 | ||
26 | bool _backlight_init(void); | 26 | bool backlight_hw_init(void); |
27 | void _backlight_on(void); | 27 | void backlight_hw_on(void); |
28 | void _backlight_off(void); | 28 | void backlight_hw_off(void); |
29 | void _backlight_set_brightness(int brightness); | 29 | void backlight_hw_brightness(int brightness); |
30 | 30 | ||
31 | #endif /* BACKLIGHT_TARGET_H */ | 31 | #endif /* BACKLIGHT_TARGET_H */ |
diff --git a/firmware/target/mips/ingenic_jz47xx/system-jz4740.c b/firmware/target/mips/ingenic_jz47xx/system-jz4740.c index ab232baf65..5ef500a69b 100644 --- a/firmware/target/mips/ingenic_jz47xx/system-jz4740.c +++ b/firmware/target/mips/ingenic_jz47xx/system-jz4740.c | |||
@@ -272,7 +272,7 @@ void exception_handler(void* stack_ptr, unsigned int cause, unsigned int epc) | |||
272 | lcd_set_viewport(NULL); | 272 | lcd_set_viewport(NULL); |
273 | #endif | 273 | #endif |
274 | lcd_clear_display(); | 274 | lcd_clear_display(); |
275 | _backlight_on(); | 275 | backlight_hw_on(); |
276 | 276 | ||
277 | lcd_puts(0, 0, parse_exception(cause)); | 277 | lcd_puts(0, 0, parse_exception(cause)); |
278 | lcd_putsf(0, 1, "0x%08x at 0x%08x", read_c0_badvaddr(), epc); | 278 | lcd_putsf(0, 1, "0x%08x at 0x%08x", read_c0_badvaddr(), epc); |
diff --git a/firmware/target/sh/archos/fm_v2/backlight-target.h b/firmware/target/sh/archos/fm_v2/backlight-target.h index 9eff09016a..c3dd395eca 100644 --- a/firmware/target/sh/archos/fm_v2/backlight-target.h +++ b/firmware/target/sh/archos/fm_v2/backlight-target.h | |||
@@ -24,15 +24,15 @@ | |||
24 | #include "config.h" | 24 | #include "config.h" |
25 | #include "rtc.h" | 25 | #include "rtc.h" |
26 | 26 | ||
27 | #define _backlight_init() true | 27 | #define backlight_hw_init() true |
28 | 28 | ||
29 | static inline void _backlight_on(void) | 29 | static inline void backlight_hw_on(void) |
30 | { | 30 | { |
31 | rtc_write(0x13, 0x10); /* 32 kHz square wave */ | 31 | rtc_write(0x13, 0x10); /* 32 kHz square wave */ |
32 | rtc_write(0x0a, rtc_read(0x0a) | 0x40); /* Enable square wave */ | 32 | rtc_write(0x0a, rtc_read(0x0a) | 0x40); /* Enable square wave */ |
33 | } | 33 | } |
34 | 34 | ||
35 | static inline void _backlight_off(void) | 35 | static inline void backlight_hw_off(void) |
36 | { | 36 | { |
37 | /* While on, backlight is flashing at 32 kHz. If the square wave output | 37 | /* While on, backlight is flashing at 32 kHz. If the square wave output |
38 | is disabled while the backlight is lit, it will become constantly lit, | 38 | is disabled while the backlight is lit, it will become constantly lit, |
diff --git a/firmware/target/sh/archos/ondio/backlight-target.h b/firmware/target/sh/archos/ondio/backlight-target.h index 9dd3eb1cf9..438c8c926a 100644 --- a/firmware/target/sh/archos/ondio/backlight-target.h +++ b/firmware/target/sh/archos/ondio/backlight-target.h | |||
@@ -27,7 +27,7 @@ | |||
27 | #ifdef HAVE_BACKLIGHT | 27 | #ifdef HAVE_BACKLIGHT |
28 | /* A stock Ondio has no backlight, it needs a hardware mod. */ | 28 | /* A stock Ondio has no backlight, it needs a hardware mod. */ |
29 | 29 | ||
30 | static inline bool _backlight_init(void) | 30 | static inline bool backlight_hw_init(void) |
31 | { | 31 | { |
32 | PACR1 &= ~0x3000; /* Set PA14 (backlight control) to GPIO */ | 32 | PACR1 &= ~0x3000; /* Set PA14 (backlight control) to GPIO */ |
33 | or_b(0x40, &PADRH); /* drive it high */ | 33 | or_b(0x40, &PADRH); /* drive it high */ |
@@ -35,12 +35,12 @@ static inline bool _backlight_init(void) | |||
35 | return true; | 35 | return true; |
36 | } | 36 | } |
37 | 37 | ||
38 | static inline void _backlight_on(void) | 38 | static inline void backlight_hw_on(void) |
39 | { | 39 | { |
40 | or_b(0x40, &PADRH); /* drive it high */ | 40 | or_b(0x40, &PADRH); /* drive it high */ |
41 | } | 41 | } |
42 | 42 | ||
43 | static inline void _backlight_off(void) | 43 | static inline void backlight_hw_off(void) |
44 | { | 44 | { |
45 | and_b(~0x40, &PADRH); /* drive it low */ | 45 | and_b(~0x40, &PADRH); /* drive it low */ |
46 | } | 46 | } |
diff --git a/firmware/target/sh/archos/ondio/power-ondio.c b/firmware/target/sh/archos/ondio/power-ondio.c index 86026777fa..d7bbc08f4f 100644 --- a/firmware/target/sh/archos/ondio/power-ondio.c +++ b/firmware/target/sh/archos/ondio/power-ondio.c | |||
@@ -70,7 +70,7 @@ void power_off(void) | |||
70 | disable_irq(); | 70 | disable_irq(); |
71 | #ifdef HAVE_BACKLIGHT | 71 | #ifdef HAVE_BACKLIGHT |
72 | /* Switch off the light on backlight-modded Ondios */ | 72 | /* Switch off the light on backlight-modded Ondios */ |
73 | _backlight_off(); | 73 | backlight_hw_off(); |
74 | #endif | 74 | #endif |
75 | and_b(~0x20, &PBDRL); | 75 | and_b(~0x20, &PBDRL); |
76 | or_b(0x20, &PBIORL); | 76 | or_b(0x20, &PBIORL); |
diff --git a/firmware/target/sh/archos/player/backlight-target.h b/firmware/target/sh/archos/player/backlight-target.h index 71d6a935bc..b97d21a40f 100644 --- a/firmware/target/sh/archos/player/backlight-target.h +++ b/firmware/target/sh/archos/player/backlight-target.h | |||
@@ -24,7 +24,7 @@ | |||
24 | #include "config.h" | 24 | #include "config.h" |
25 | #include "cpu.h" | 25 | #include "cpu.h" |
26 | 26 | ||
27 | static inline bool _backlight_init(void) | 27 | static inline bool backlight_hw_init(void) |
28 | { | 28 | { |
29 | PACR1 &= ~0x3000; /* Set PA14 (backlight control) to GPIO */ | 29 | PACR1 &= ~0x3000; /* Set PA14 (backlight control) to GPIO */ |
30 | and_b(~0x40, &PADRH); /* drive and set low */ | 30 | and_b(~0x40, &PADRH); /* drive and set low */ |
@@ -32,13 +32,13 @@ static inline bool _backlight_init(void) | |||
32 | return true; | 32 | return true; |
33 | } | 33 | } |
34 | 34 | ||
35 | static inline void _backlight_on(void) | 35 | static inline void backlight_hw_on(void) |
36 | { | 36 | { |
37 | and_b(~0x40, &PADRH); /* drive and set low */ | 37 | and_b(~0x40, &PADRH); /* drive and set low */ |
38 | or_b(0x40, &PAIORH); | 38 | or_b(0x40, &PAIORH); |
39 | } | 39 | } |
40 | 40 | ||
41 | static inline void _backlight_off(void) | 41 | static inline void backlight_hw_off(void) |
42 | { | 42 | { |
43 | and_b(~0x40, &PAIORH); /* let it float (up) */ | 43 | and_b(~0x40, &PAIORH); /* let it float (up) */ |
44 | } | 44 | } |
diff --git a/firmware/target/sh/archos/recorder/backlight-target.h b/firmware/target/sh/archos/recorder/backlight-target.h index 9eff09016a..c3dd395eca 100644 --- a/firmware/target/sh/archos/recorder/backlight-target.h +++ b/firmware/target/sh/archos/recorder/backlight-target.h | |||
@@ -24,15 +24,15 @@ | |||
24 | #include "config.h" | 24 | #include "config.h" |
25 | #include "rtc.h" | 25 | #include "rtc.h" |
26 | 26 | ||
27 | #define _backlight_init() true | 27 | #define backlight_hw_init() true |
28 | 28 | ||
29 | static inline void _backlight_on(void) | 29 | static inline void backlight_hw_on(void) |
30 | { | 30 | { |
31 | rtc_write(0x13, 0x10); /* 32 kHz square wave */ | 31 | rtc_write(0x13, 0x10); /* 32 kHz square wave */ |
32 | rtc_write(0x0a, rtc_read(0x0a) | 0x40); /* Enable square wave */ | 32 | rtc_write(0x0a, rtc_read(0x0a) | 0x40); /* Enable square wave */ |
33 | } | 33 | } |
34 | 34 | ||
35 | static inline void _backlight_off(void) | 35 | static inline void backlight_hw_off(void) |
36 | { | 36 | { |
37 | /* While on, backlight is flashing at 32 kHz. If the square wave output | 37 | /* While on, backlight is flashing at 32 kHz. If the square wave output |
38 | is disabled while the backlight is lit, it will become constantly lit, | 38 | is disabled while the backlight is lit, it will become constantly lit, |
diff --git a/uisimulator/common/backlight-sim.c b/uisimulator/common/backlight-sim.c index f60a218c41..0d6440b7f3 100644 --- a/uisimulator/common/backlight-sim.c +++ b/uisimulator/common/backlight-sim.c | |||
@@ -30,7 +30,7 @@ extern void lcd_awake(void); | |||
30 | /* in uisimulator/sdl/lcd-bitmap.c and lcd-charcell.c */ | 30 | /* in uisimulator/sdl/lcd-bitmap.c and lcd-charcell.c */ |
31 | extern void sim_backlight(int value); | 31 | extern void sim_backlight(int value); |
32 | 32 | ||
33 | bool _backlight_init(void) | 33 | bool backlight_hw_init(void) |
34 | { | 34 | { |
35 | return true; | 35 | return true; |
36 | } | 36 | } |
@@ -45,7 +45,7 @@ static inline int normalize_backlight(int val) | |||
45 | (MAX_BRIGHTNESS_SETTING - MIN_BRIGHTNESS_SETTING + 1); | 45 | (MAX_BRIGHTNESS_SETTING - MIN_BRIGHTNESS_SETTING + 1); |
46 | } | 46 | } |
47 | 47 | ||
48 | void _backlight_set_brightness(int val) | 48 | void backlight_hw_brightness(int val) |
49 | { | 49 | { |
50 | sim_backlight(normalize_backlight(val)); | 50 | sim_backlight(normalize_backlight(val)); |
51 | } | 51 | } |
@@ -53,7 +53,7 @@ void _backlight_set_brightness(int val) | |||
53 | #endif /* HAVE_BACKLIGHT_BRIGHTNESS */ | 53 | #endif /* HAVE_BACKLIGHT_BRIGHTNESS */ |
54 | 54 | ||
55 | 55 | ||
56 | void _backlight_on(void) | 56 | void backlight_hw_on(void) |
57 | { | 57 | { |
58 | #if defined(HAVE_LCD_ENABLE) | 58 | #if defined(HAVE_LCD_ENABLE) |
59 | lcd_enable(true); | 59 | lcd_enable(true); |
@@ -72,7 +72,7 @@ void _backlight_on(void) | |||
72 | #endif | 72 | #endif |
73 | } | 73 | } |
74 | 74 | ||
75 | void _backlight_off(void) | 75 | void backlight_hw_off(void) |
76 | { | 76 | { |
77 | sim_backlight(0); | 77 | sim_backlight(0); |
78 | #ifdef HAVE_LCD_ENABLE | 78 | #ifdef HAVE_LCD_ENABLE |
@@ -82,16 +82,16 @@ void _backlight_off(void) | |||
82 | 82 | ||
83 | 83 | ||
84 | #ifdef HAVE_BUTTON_LIGHT | 84 | #ifdef HAVE_BUTTON_LIGHT |
85 | void _buttonlight_on(void) | 85 | void buttonlight_hw_on(void) |
86 | { | 86 | { |
87 | } | 87 | } |
88 | 88 | ||
89 | void _buttonlight_off(void) | 89 | void buttonlight_hw_off(void) |
90 | { | 90 | { |
91 | } | 91 | } |
92 | 92 | ||
93 | #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS | 93 | #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS |
94 | void _buttonlight_set_brightness(int val) | 94 | void buttonlight_hw_brightness(int val) |
95 | { | 95 | { |
96 | (void)val; | 96 | (void)val; |
97 | } | 97 | } |
@@ -99,12 +99,12 @@ void _buttonlight_set_brightness(int val) | |||
99 | #endif /* HAVE_BUTTON_LIGHT */ | 99 | #endif /* HAVE_BUTTON_LIGHT */ |
100 | 100 | ||
101 | #ifdef HAVE_REMOTE_LCD | 101 | #ifdef HAVE_REMOTE_LCD |
102 | void _remote_backlight_on(void) | 102 | void remote_backlight_hw_on(void) |
103 | { | 103 | { |
104 | sim_remote_backlight(100); | 104 | sim_remote_backlight(100); |
105 | } | 105 | } |
106 | 106 | ||
107 | void _remote_backlight_off(void) | 107 | void remote_backlight_hw_off(void) |
108 | { | 108 | { |
109 | sim_remote_backlight(0); | 109 | sim_remote_backlight(0); |
110 | } | 110 | } |
diff --git a/uisimulator/common/backlight-sim.h b/uisimulator/common/backlight-sim.h index 4a97752f75..f7e35dcc75 100644 --- a/uisimulator/common/backlight-sim.h +++ b/uisimulator/common/backlight-sim.h | |||
@@ -24,18 +24,18 @@ | |||
24 | 24 | ||
25 | #include "config.h" | 25 | #include "config.h" |
26 | 26 | ||
27 | bool _backlight_init(void); | 27 | bool backlight_hw_init(void); |
28 | void _backlight_on(void); | 28 | void backlight_hw_on(void); |
29 | void _backlight_off(void); | 29 | void backlight_hw_off(void); |
30 | 30 | ||
31 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS | 31 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS |
32 | void _backlight_set_brightness(int val); | 32 | void backlight_hw_brightness(int val); |
33 | #endif /* HAVE_BACKLIGHT_BRIGHTNESS */ | 33 | #endif /* HAVE_BACKLIGHT_BRIGHTNESS */ |
34 | #ifdef HAVE_BUTTON_LIGHT | 34 | #ifdef HAVE_BUTTON_LIGHT |
35 | void _buttonlight_on(void); | 35 | voidbuttonlight_hw_on(void); |
36 | void _buttonlight_off(void); | 36 | voidbuttonlight_hw_off(void); |
37 | #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS | 37 | #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS |
38 | void _buttonlight_set_brightness(int val); | 38 | voidbuttonlight_hw_set_brightness(int val); |
39 | #endif /* HAVE_BUTTONLIGHT_BRIGHTNESS */ | 39 | #endif /* HAVE_BUTTONLIGHT_BRIGHTNESS */ |
40 | #endif /* HAVE_BUTTON_LIGHT */ | 40 | #endif /* HAVE_BUTTON_LIGHT */ |
41 | 41 | ||