From 89ba7e818c0d96b779b02bc7b31c0c6a19294a46 Mon Sep 17 00:00:00 2001 From: Marcin Bukat Date: Fri, 9 Jan 2015 00:22:40 +0100 Subject: Get rid of stupid _backlight_* function names _remote_backlight_* and _buttonlight_* are cleaned as well Change-Id: I73653752831bbe170c26ba95d3bc04c2e3a5cf30 --- bootloader/gigabeat.c | 2 +- bootloader/iaudio_coldfire.c | 4 ++-- bootloader/imx233.c | 4 ++-- bootloader/iriver_h1x0.c | 12 ++++++------ bootloader/iriver_h300.c | 10 +++++----- bootloader/main-e200r-installer.c | 2 +- bootloader/main-pp.c | 2 +- bootloader/main-ppsansawipe.c | 2 +- bootloader/meizu_m3.c | 2 +- bootloader/mpio_hd200_hd300.c | 4 ++-- bootloader/samsung_yps3.c | 6 +++--- bootloader/sansaview.c | 8 ++++---- bootloader/telechips.c | 6 +++--- 13 files changed, 32 insertions(+), 32 deletions(-) (limited to 'bootloader') 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) ata_sleepnow(); } - _backlight_off(); + backlight_hw_off(); power_off(); } 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) sleep(HZ*2); /* Backlight OFF */ - _backlight_off(); + backlight_hw_off(); #ifdef HAVE_REMOTE_LCD - _remote_backlight_off(); + remote_backlight_hw_off(); #endif __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) system_prepare_fw_start(); /* if target defines lcd_enable() in bootloader, take this as a hint that * we should use it to properly stop the lcd before moving one, the - * _backlight_off() routine is supposed to disable the lcd at the same time */ + * backlight_hw_off() routine is supposed to disable the lcd at the same time */ #ifdef HAVE_LCD_ENABLE - _backlight_off(); + backlight_hw_off(); #endif disable_interrupt(IRQ_FIQ_STATUS); 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) sleep(HZ*2); /* Backlight OFF */ - _backlight_off(); + backlight_hw_off(); #ifdef HAVE_REMOTE_LCD - _remote_backlight_off(); + remote_backlight_hw_off(); #endif __reset_cookie(); @@ -418,12 +418,12 @@ void main(void) __uda1380_reset_hi(); /* Start with the main backlight OFF. */ - _backlight_init(); - _backlight_off(); + backlight_hw_init(); + backlight_hw_off(); /* Remote backlight ON */ #ifdef HAVE_REMOTE_LCD - _remote_backlight_on(); + remote_backlight_hw_on(); #endif system_init(); @@ -576,7 +576,7 @@ void main(void) sleep(HZ); /* Backlight OFF */ - _backlight_off(); + backlight_hw_off(); } 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) sleep(HZ*2); - _backlight_off(); - _remote_backlight_off(); + backlight_hw_off(); + remote_backlight_hw_off(); __reset_cookie(); power_off(); @@ -184,10 +184,10 @@ void main(void) restore_irq(mask); /* Start with the main backlight OFF. */ - _backlight_init(); - _backlight_off(); + backlight_hw_init(); + backlight_hw_off(); - _remote_backlight_on(); + remote_backlight_hw_on(); system_init(); 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) font_init(); button_init(); i2c_init(); - _backlight_on(); + backlight_hw_on(); lcd_set_foreground(LCD_WHITE); 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) #endif #if defined(SANSA_E200) || defined(PHILIPS_SA9200) i2c_init(); - _backlight_on(); + backlight_hw_on(); #endif 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) font_init(); button_init(); i2c_init(); - _backlight_on(); + backlight_hw_on(); lcd_set_foreground(LCD_WHITE); 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) | QT1106_DI | QT1106_SLD_SLIDER | QT1106_RES_256); snprintf(mystring, 64, "%x %2.2x",(slider & 0x008000)>>15, slider&0xff); lcd_puts(0,1,mystring); - _backlight_set_brightness((slider & 0xFF) >> 4); + backlight_hw_brightness((slider & 0xFF) >> 4); /* 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) } /* Backlight OFF */ - _backlight_off(); + backlight_hw_off(); __reset_cookie(); power_off(); @@ -372,7 +372,7 @@ void main(void) cpu_idle_mode(true); /* lowlevel init only */ - _backlight_init(); + backlight_hw_init(); /* Handle wakeup event. Possibilities are: * 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) i2c_init(); fmradio_i2c_init(); adc_init(); - _backlight_init(); + backlight_hw_init(); button_init_device(); // FM power @@ -259,13 +259,13 @@ void main(void) if (button & BUTTON_MENU) { if (brightness < MAX_BRIGHTNESS_SETTING) { brightness++; - _backlight_set_brightness(brightness); + backlight_hw_brightness(brightness); } } else if (button & BUTTON_BACK) { if (brightness > MIN_BRIGHTNESS_SETTING) { brightness--; - _backlight_set_brightness(brightness); + backlight_hw_brightness(brightness); } } 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) while(1) { - _backlight_on(); - _buttonlight_off(); + backlight_hw_on(); + buttonlight_hw_off(); sleep(HZ/4); - _backlight_off(); - _buttonlight_on(); + backlight_hw_off(); + buttonlight_hw_on(); sleep(HZ/4); } } 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) } #if 0 if (button & BUTTON_SELECT){ - _backlight_off(); + backlight_hw_off(); } else{ - _backlight_on(); + backlight_hw_on(); } #endif printf("Btn: 0x%08x",button); @@ -147,7 +147,7 @@ void* main(void) show_logo(); - _backlight_on(); + backlight_hw_on(); /* Only load the firmware if TCCBOOT is defined - this ensures SDRAM_START is available for loading the firmware. Otherwise display the debug screen. */ -- cgit v1.2.3