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/coldfire/iriver | |
| parent | 2a3e1628a50b9de7c1462ee95eb79937795f5409 (diff) | |
| download | rockbox-89ba7e818c0d96b779b02bc7b31c0c6a19294a46.zip rockbox-89ba7e818c0d96b779b02bc7b31c0c6a19294a46.tar.gz rockbox-89ba7e818c0d96b779b02bc7b31c0c6a19294a46.tar.bz2 rockbox-89ba7e818c0d96b779b02bc7b31c0c6a19294a46.tar.xz | |
Get rid of stupid _backlight_* function names
_remote_backlight_* and _buttonlight_* are cleaned as well
Change-Id: I73653752831bbe170c26ba95d3bc04c2e3a5cf30
Diffstat (limited to 'firmware/target/coldfire/iriver')
4 files changed, 25 insertions, 28 deletions
diff --git a/firmware/target/coldfire/iriver/h100/backlight-h100.c b/firmware/target/coldfire/iriver/h100/backlight-h100.c index 47c02cb..1f582ec 100644 --- a/firmware/target/coldfire/iriver/h100/backlight-h100.c +++ b/firmware/target/coldfire/iriver/h100/backlight-h100.c @@ -27,7 +27,7 @@ #include "lcd.h" /* Returns the current state of the backlight (true=ON, false=OFF). */ -bool _backlight_init(void) +bool backlight_hw_init(void) { or_l(0x00020000, &GPIO1_ENABLE); or_l(0x00020000, &GPIO1_FUNCTION); @@ -45,12 +45,12 @@ void _backlight_hw_off(void) or_l(0x00020000, &GPIO1_OUT); } -void _remote_backlight_on(void) +void remote_backlight_hw_on(void) { and_l(~0x00000800, &GPIO_OUT); } -void _remote_backlight_off(void) +void remote_backlight_hw_off(void) { or_l(0x00000800, &GPIO_OUT); } diff --git a/firmware/target/coldfire/iriver/h100/backlight-target.h b/firmware/target/coldfire/iriver/h100/backlight-target.h index 5cd6fa7..64d0353 100644 --- a/firmware/target/coldfire/iriver/h100/backlight-target.h +++ b/firmware/target/coldfire/iriver/h100/backlight-target.h @@ -21,22 +21,19 @@ #ifndef BACKLIGHT_TARGET_H #define BACKLIGHT_TARGET_H -bool _backlight_init(void); /* Returns backlight current state (true=ON). */ -void _backlight_hw_on(void); -void _backlight_hw_off(void); +bool backlight_hw_init(void); /* Returns backlight current state (true=ON). */ +void backlight_hw_on(void); +void backlight_hw_off(void); -#ifdef BOOTLOADER -#define _backlight_on() _backlight_hw_on() -#define _backlight_off() _backlight_hw_off() -#else -#define _backlight_on_isr() _backlight_hw_on() -#define _backlight_off_isr() _backlight_hw_off() -#define _backlight_on_normal() _backlight_hw_on() -#define _backlight_off_normal() _backlight_hw_off() +#ifndef BOOTLOADER +#define backlight_hw_on_isr() backlight_hw_on() +#define backlight_hw_off_isr() backlight_hw_off() +#define backlight_hw_on_normal() backlight_hw_on() +#define backlight_hw_off_normal() backlight_hw_off() #define _BACKLIGHT_FADE_BOOST #endif -void _remote_backlight_on(void); -void _remote_backlight_off(void); +void remote_backlight_hw_on(void); +void remote_backlight_hw_off(void); #endif diff --git a/firmware/target/coldfire/iriver/h300/backlight-h300.c b/firmware/target/coldfire/iriver/h300/backlight-h300.c index 64e09b9..9e44dfa 100644 --- a/firmware/target/coldfire/iriver/h300/backlight-h300.c +++ b/firmware/target/coldfire/iriver/h300/backlight-h300.c @@ -28,7 +28,7 @@ #include "pcf50606.h" #include "lcd.h" -bool _backlight_init(void) +bool backlight_hw_init(void) { or_l(0x00020000, &GPIO1_ENABLE); or_l(0x00020000, &GPIO1_FUNCTION); @@ -37,21 +37,21 @@ bool _backlight_init(void) return true; /* Backlight always ON after boot. */ } -void _backlight_on(void) +void backlight_hw_on(void) { lcd_enable(true); sleep(HZ/100); /* lcd needs time - avoid flashing for dark screens */ or_l(0x00020000, &GPIO1_OUT); } -void _backlight_off(void) +void backlight_hw_off(void) { and_l(~0x00020000, &GPIO1_OUT); lcd_enable(false); } /* set brightness by changing the PWM */ -void _backlight_set_brightness(int val) +void backlight_hw_brightness(int val) { /* disable IRQs while bitbanging */ int old_irq_level = disable_irq_save(); @@ -60,12 +60,12 @@ void _backlight_set_brightness(int val) restore_irq(old_irq_level); } -void _remote_backlight_on(void) +void remote_backlight_hw_on(void) { and_l(~0x00000002, &GPIO1_OUT); } -void _remote_backlight_off(void) +void remote_backlight_hw_off(void) { or_l(0x00000002, &GPIO1_OUT); } diff --git a/firmware/target/coldfire/iriver/h300/backlight-target.h b/firmware/target/coldfire/iriver/h300/backlight-target.h index 046a8fb..1ea9087 100644 --- a/firmware/target/coldfire/iriver/h300/backlight-target.h +++ b/firmware/target/coldfire/iriver/h300/backlight-target.h @@ -21,11 +21,11 @@ #ifndef BACKLIGHT_TARGET_H #define BACKLIGHT_TARGET_H -bool _backlight_init(void); /* Returns backlight current state (true=ON). */ -void _backlight_on(void); -void _backlight_off(void); -void _backlight_set_brightness(int val); -void _remote_backlight_on(void); -void _remote_backlight_off(void); +bool backlight_hw_init(void); /* Returns backlight current state (true=ON). */ +void backlight_hw_on(void); +void backlight_hw_off(void); +void backlight_hw_brightness(int val); +void remote_backlight_hw_on(void); +void remote_backlight_hw_off(void); #endif |