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 /bootloader | |
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
Diffstat (limited to 'bootloader')
-rw-r--r-- | bootloader/gigabeat.c | 2 | ||||
-rw-r--r-- | bootloader/iaudio_coldfire.c | 4 | ||||
-rw-r--r-- | bootloader/imx233.c | 4 | ||||
-rw-r--r-- | bootloader/iriver_h1x0.c | 12 | ||||
-rw-r--r-- | bootloader/iriver_h300.c | 10 | ||||
-rw-r--r-- | bootloader/main-e200r-installer.c | 2 | ||||
-rw-r--r-- | bootloader/main-pp.c | 2 | ||||
-rw-r--r-- | bootloader/main-ppsansawipe.c | 2 | ||||
-rw-r--r-- | bootloader/meizu_m3.c | 2 | ||||
-rw-r--r-- | bootloader/mpio_hd200_hd300.c | 4 | ||||
-rw-r--r-- | bootloader/samsung_yps3.c | 6 | ||||
-rw-r--r-- | bootloader/sansaview.c | 8 | ||||
-rw-r--r-- | bootloader/telechips.c | 6 |
13 files changed, 32 insertions, 32 deletions
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. */ |