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 /firmware/target/arm/imx233 | |
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 'firmware/target/arm/imx233')
13 files changed, 69 insertions, 69 deletions
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 @@ #ifndef BACKLIGHT_TARGET_H #define BACKLIGHT_TARGET_H -bool _backlight_init(void); -void _backlight_on(void); -void _backlight_off(void); -void _backlight_set_brightness(int brightness); +bool backlight_hw_init(void); +void backlight_hw_on(void); +void backlight_hw_off(void); +void backlight_hw_brightness(int brightness); #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 @@ #include "pinctrl-imx233.h" #include "pwm-imx233.h" -void _backlight_set_brightness(int level) +void backlight_hw_brightness(int level) { #if defined(CREATIVE_ZENXFISTYLE) imx233_pwm_setup_simple(4, 24000, level); @@ -49,7 +49,7 @@ void _backlight_set_brightness(int level) #endif } -bool _backlight_init(void) +bool backlight_hw_init(void) { #if !defined(CREATIVE_ZENV) && !defined(CREATIVE_ZENXFISTYLE) imx233_pinctrl_acquire(1, 12, "backlight_enable"); @@ -60,19 +60,19 @@ bool _backlight_init(void) return true; } -void _backlight_on(void) +void backlight_hw_on(void) { #ifdef HAVE_LCD_ENABLE lcd_enable(true); /* power on lcd + visible display */ #endif /* restore the previous backlight level */ - _backlight_set_brightness(backlight_brightness); + backlight_hw_brightness(backlight_brightness); } -void _backlight_off(void) +void backlight_hw_off(void) { /* there is no real on/off but we can set to 0 brightness */ - _backlight_set_brightness(0); + backlight_hw_brightness(0); #ifdef HAVE_LCD_ENABLE lcd_enable(false); /* power off visible display */ #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 @@ #ifndef BACKLIGHT_TARGET_H #define BACKLIGHT_TARGET_H -bool _backlight_init(void); -void _backlight_on(void); -void _backlight_off(void); -void _backlight_set_brightness(int brightness); +bool backlight_hw_init(void); +void backlight_hw_on(void); +void backlight_hw_off(void); +void backlight_hw_brightness(int brightness); #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 @@ #include "backlight-target.h" #include "pwm-imx233.h" -void _backlight_set_brightness(int brightness) +void backlight_hw_brightness(int brightness) { imx233_pwm_setup_simple(4, 24000, brightness); imx233_pwm_enable(4, true); } -bool _backlight_init(void) +bool backlight_hw_init(void) { - _backlight_set_brightness(DEFAULT_BRIGHTNESS_SETTING); + backlight_hw_brightness(DEFAULT_BRIGHTNESS_SETTING); return true; } -void _backlight_on(void) +void backlight_hw_on(void) { #ifdef HAVE_LCD_ENABLE lcd_enable(true); /* power on lcd + visible display */ @@ -46,10 +46,10 @@ void _backlight_on(void) /* don't do anything special, the core will set the brightness */ } -void _backlight_off(void) +void backlight_hw_off(void) { /* there is no real on/off but we can set to 0 brightness */ - _backlight_set_brightness(0); + backlight_hw_brightness(0); #ifdef HAVE_LCD_ENABLE lcd_enable(false); /* power off visible display */ #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 @@ #ifndef BACKLIGHT_TARGET_H #define BACKLIGHT_TARGET_H -bool _backlight_init(void); -void _backlight_on(void); -void _backlight_off(void); -void _backlight_set_brightness(int brightness); +bool backlight_hw_init(void); +void backlight_hw_on(void); +void backlight_hw_off(void); +void backlight_hw_brightness(int brightness); -void _buttonlight_on(void); -void _buttonlight_off(void); -void _buttonlight_set_brightness(int brightness); +void buttonlight_hw_on(void); +void buttonlight_hw_off(void); +void buttonlight_hw_brightness(int brightness); #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 @@ #include "pwm-imx233.h" #include "mpr121.h" -void _backlight_set_brightness(int brightness) +void backlight_hw_brightness(int brightness) { imx233_pwm_setup_simple(2, 24000, brightness); imx233_pwm_enable(2, true); } -bool _backlight_init(void) +bool backlight_hw_init(void) { - _backlight_set_brightness(DEFAULT_BRIGHTNESS_SETTING); + backlight_hw_brightness(DEFAULT_BRIGHTNESS_SETTING); return true; } -void _backlight_on(void) +void backlight_hw_on(void) { #ifdef HAVE_LCD_ENABLE lcd_enable(true); /* power on lcd + visible display */ @@ -47,29 +47,29 @@ void _backlight_on(void) /* don't do anything special, the core will set the brightness */ } -void _backlight_off(void) +void backlight_hw_off(void) { /* there is no real on/off but we can set to 0 brightness */ - _backlight_set_brightness(0); + backlight_hw_brightness(0); #ifdef HAVE_LCD_ENABLE lcd_enable(false); /* power off visible display */ #endif } /* ELE8 is the button light GPIO */ -void _buttonlight_on(void) +void buttonlight_hw_on(void) { /* assume mpr121 was initialized by button-zenxfi3.c */ mpr121_set_gpio_output(8, ELE_GPIO_SET); } -void _buttonlight_off(void) +void buttonlight_hw_off(void) { /* assume mpr121 was initialized by button-zenxfi3.c */ mpr121_set_gpio_output(8, ELE_GPIO_CLR); } -void _buttonlight_set_brightness(int brightness) +void buttonlight_hw_brightness(int brightness) { /* assume mpr121 was initialized by button-zenxfi3.c */ /* 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 @@ #ifndef BACKLIGHT_TARGET_H #define BACKLIGHT_TARGET_H -bool _backlight_init(void); -void _backlight_on(void); -void _backlight_off(void); -void _backlight_set_brightness(int brightness); +bool backlight_hw_init(void); +void backlight_hw_on(void); +void backlight_hw_off(void); +void backlight_hw_brightness(int brightness); #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) udelay(TIME_LAT); } -void _backlight_set_brightness(int level) +void backlight_hw_brightness(int level) { /* Don't try to reset backlight if not necessary * Moreover this helps to avoid flickering when @@ -120,7 +120,7 @@ void _backlight_set_brightness(int level) current_level = level; } -bool _backlight_init(void) +bool backlight_hw_init(void) { imx233_pinctrl_acquire(3, 13, "backlight"); imx233_pinctrl_set_function(3, 13, PINCTRL_FUNCTION_GPIO); @@ -130,19 +130,19 @@ bool _backlight_init(void) return true; } -void _backlight_on(void) +void backlight_hw_on(void) { #ifdef HAVE_LCD_ENABLE lcd_enable(true); /* power on lcd + visible display */ #endif /* restore the previous backlight level */ - _backlight_set_brightness(backlight_brightness); + backlight_hw_brightness(backlight_brightness); } -void _backlight_off(void) +void backlight_hw_off(void) { /* there is no real on/off but we can set to 0 brightness */ - _backlight_set_brightness(0); + backlight_hw_brightness(0); #ifdef HAVE_LCD_ENABLE lcd_enable(false); /* power off visible display */ #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 @@ #include "backlight-target.h" #include "pinctrl-imx233.h" -void _backlight_set_brightness(int brightness) +void backlight_hw_brightness(int brightness) { if(brightness != 0) brightness = MAX_BRIGHTNESS_SETTING + 1 - brightness; @@ -39,17 +39,17 @@ void _backlight_set_brightness(int brightness) } } -bool _backlight_init(void) +bool backlight_hw_init(void) { imx233_pinctrl_acquire(1, 28, "backlight"); imx233_pinctrl_set_function(1, 28, PINCTRL_FUNCTION_GPIO); imx233_pinctrl_set_drive(1, 28, PINCTRL_DRIVE_8mA); imx233_pinctrl_enable_gpio(1, 28, true); - _backlight_set_brightness(DEFAULT_BRIGHTNESS_SETTING); + backlight_hw_brightness(DEFAULT_BRIGHTNESS_SETTING); return true; } -void _backlight_on(void) +void backlight_hw_on(void) { #ifdef HAVE_LCD_ENABLE lcd_enable(true); /* power on lcd + visible display */ @@ -57,10 +57,10 @@ void _backlight_on(void) /* don't do anything special, the core will set the brightness */ } -void _backlight_off(void) +void backlight_hw_off(void) { /* there is no real on/off but we can set to 0 brightness */ - _backlight_set_brightness(0); + backlight_hw_brightness(0); #ifdef HAVE_LCD_ENABLE lcd_enable(false); /* power off visible display */ #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 @@ #ifndef BACKLIGHT_TARGET_H #define BACKLIGHT_TARGET_H -bool _backlight_init(void); -void _backlight_on(void); -void _backlight_off(void); -void _backlight_set_brightness(int brightness); +bool backlight_hw_init(void); +void backlight_hw_on(void); +void backlight_hw_off(void); +void backlight_hw_brightness(int brightness); #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 @@ #include "pwm-imx233.h" #include "pinctrl-imx233.h" -void _backlight_set_brightness(int brightness) +void backlight_hw_brightness(int brightness) { bool en = brightness > 0; imx233_pwm_setup_simple(2, 24000, 100 - brightness); @@ -35,17 +35,17 @@ void _backlight_set_brightness(int brightness) imx233_pinctrl_set_gpio(0, 10, en); } -bool _backlight_init(void) +bool backlight_hw_init(void) { imx233_pinctrl_acquire(0, 10, "backlight_enable"); imx233_pinctrl_set_function(0, 10, PINCTRL_FUNCTION_GPIO); imx233_pinctrl_enable_gpio(0, 10, true); imx233_pinctrl_set_gpio(0, 10, true); - _backlight_set_brightness(DEFAULT_BRIGHTNESS_SETTING); + backlight_hw_brightness(DEFAULT_BRIGHTNESS_SETTING); return true; } -void _backlight_on(void) +void backlight_hw_on(void) { #ifdef HAVE_LCD_ENABLE lcd_enable(true); /* power on lcd + visible display */ @@ -53,10 +53,10 @@ void _backlight_on(void) /* don't do anything special, the core will set the brightness */ } -void _backlight_off(void) +void backlight_hw_off(void) { /* there is no real on/off but we can set to 0 brightness */ - _backlight_set_brightness(0); + backlight_hw_brightness(0); #ifdef HAVE_LCD_ENABLE lcd_enable(false); /* power off visible display */ #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 @@ #ifndef BACKLIGHT_TARGET_H #define BACKLIGHT_TARGET_H -bool _backlight_init(void); -void _backlight_on(void); -void _backlight_off(void); -void _backlight_set_brightness(int brightness); +bool backlight_hw_init(void); +void backlight_hw_on(void); +void backlight_hw_off(void); +void backlight_hw_brightness(int brightness); #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) void system_reboot(void) { - _backlight_off(); + backlight_hw_off(); disable_irq(); @@ -119,8 +119,8 @@ void system_exception_wait(void) imx233_rtc_enable_watchdog(false); /* make sure lcd and backlight are on */ lcd_update(); - _backlight_on(); - _backlight_set_brightness(DEFAULT_BRIGHTNESS_SETTING); + backlight_hw_on(); + backlight_hw_brightness(DEFAULT_BRIGHTNESS_SETTING); /* wait until button release (if a button is pressed) */ #ifdef HAVE_BUTTON_DATA int data; |