len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-08 12:45:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Get rid of stupid _backlight_* function names

Browse source 
_remote_backlight_* and _buttonlight_* are cleaned as well

Change-Id: I73653752831bbe170c26ba95d3bc04c2e3a5cf30
This commit is contained in:
Marcin Bukat 2015-01-09 00:22:40 +01:00 • committed by Gerrit Rockbox
parent 2a3e1628a5
commit 89ba7e818c
148 changed files with 679 additions and 687 deletions
Download patch file Download diff file Expand all files Collapse all files

10
firmware/target/arm/as3525/backlight-e200v2-fuze.c
View file

@ -28,12 +28,12 @@
int buttonlight_is_on = 0;
void _backlight_set_brightness(int brightness)
void backlight_hw_brightness(int brightness)
{
ascodec_write(AS3514_DCDC15, brightness);
}
void _backlight_on(void)
void backlight_hw_on(void)
{
#ifdef HAVE_LCD_ENABLE
lcd_enable(true); /* power on lcd + visible display */
@ -45,7 +45,7 @@ void _backlight_on(void)
#endif
}
void _backlight_off(void)
void backlight_hw_off(void)
{
ascodec_write(AS3514_DCDC15, 0x0);
#ifdef HAVE_LCD_ENABLE
@ -53,7 +53,7 @@ void _backlight_off(void)
#endif
}
void _buttonlight_on(void)
void buttonlight_hw_on(void)
{
/* Needed for buttonlight and MicroSD to work at the same time */
/* Turn ROD control on, as the OF does */
@ -63,7 +63,7 @@ void _buttonlight_on(void)
buttonlight_is_on = 1;
}
void _buttonlight_off(void)
void buttonlight_hw_off(void)
{
/* Needed for buttonlight and MicroSD to work at the same time */
/* Turn ROD control off, as the OF does */

16
firmware/target/arm/as3525/sansa-c200v2/backlight-c200v2.c
View file

@ -98,7 +98,7 @@ void _backlight_pwm(int on)
}
}
bool _backlight_init(void)
bool backlight_hw_init(void)
{
GPIOA_DIR |= 1<<5;
if (c200v2_variant == 1) {
@ -109,14 +109,14 @@ bool _backlight_init(void)
return true;
}
void _backlight_set_brightness(int brightness)
void backlight_hw_brightness(int brightness)
{
backlight_level = brightness_table[brightness];
if (brightness > 0)
_backlight_on();
backlight_hw_on();
else
_backlight_off();
backlight_hw_off();
}
static void _pwm_on(void)
@ -130,7 +130,7 @@ static void _pwm_off(void)
_set_timer2_pwm_ratio(0);
}
void _backlight_on(void)
void backlight_hw_on(void)
{
if (backlight_is_on == 1) {
/* Update pwm ratio in case user changed the brightness */
@ -146,7 +146,7 @@ void _backlight_on(void)
backlight_is_on = 1;
}
void _backlight_off(void)
void backlight_hw_off(void)
{
if (backlight_is_on == 0)
return;
@ -159,7 +159,7 @@ void _backlight_off(void)
#endif
}
void _buttonlight_on(void)
void buttonlight_hw_on(void)
{
if (buttonlight_is_on == 1)
return;
@ -169,7 +169,7 @@ void _buttonlight_on(void)
buttonlight_is_on = 1;
}
void _buttonlight_off(void)
void buttonlight_hw_off(void)
{
if (buttonlight_is_on == 0)
return;

14
firmware/target/arm/as3525/sansa-c200v2/backlight-target.h
View file

@ -23,22 +23,22 @@
#include <stdbool.h>
bool _backlight_init(void);
bool backlight_hw_init(void);
void _backlight_pwm(int on);
void _backlight_on(void);
void _backlight_off(void);
void backlight_hw_on(void);
void backlight_hw_off(void);
static inline void _backlight_panic_on(void)
{
_backlight_on();
backlight_hw_on();
_backlight_pwm(1);
}
void _backlight_set_brightness(int brightness);
void backlight_hw_brightness(int brightness);
int __backlight_is_on(void);
void _buttonlight_on(void);
void _buttonlight_off(void);
void buttonlight_hw_on(void);
void buttonlight_hw_off(void);
/*
* FIXME: This may be better off in kernel.h, but...

12
firmware/target/arm/as3525/sansa-clip/backlight-target.h
View file

@ -25,30 +25,30 @@
#include "lcd.h"
#include "backlight.h"
static inline void _backlight_on(void)
static inline void backlight_hw_on(void)
{
lcd_enable(true);
}
static inline void _backlight_off(void)
static inline void backlight_hw_off(void)
{
lcd_enable(false);
}
#define _backlight_panic_on() _backlight_on()
#define _backlight_panic_on() backlight_hw_on()
static inline bool _backlight_init(void)
static inline bool backlight_hw_init(void)
{
GPIOD_DIR |= (1<<7); /* for button light */
return true;
}
static inline void _buttonlight_on(void)
static inline void buttonlight_hw_on(void)
{
GPIOD_PIN(7) = (1<<7);
}
static inline void _buttonlight_off(void)
static inline void buttonlight_hw_off(void)
{
GPIOD_PIN(7) = 0;
}

4
firmware/target/arm/as3525/sansa-clipplus/backlight-clip.c
View file

@ -24,13 +24,13 @@
#include "as3525v2.h"
#include "ascodec.h"
void _backlight_on(void)
void backlight_hw_on(void)
{
ascodec_write_pmu(AS3543_BACKLIGHT, 1, 0x90);
lcd_enable(true);
}
void _backlight_off(void)
void backlight_hw_off(void)
{
lcd_enable(false);
ascodec_write_pmu(AS3543_BACKLIGHT, 1, 0x00);

8
firmware/target/arm/as3525/sansa-clipplus/backlight-target.h
View file

@ -21,10 +21,10 @@
#ifndef BACKLIGHT_TARGET_H
#define BACKLIGHT_TARGET_H
#define _backlight_init() true
#define backlight_hw_init() true
void _backlight_on(void);
void _backlight_off(void);
#define _backlight_panic_on() _backlight_on()
void backlight_hw_on(void);
void backlight_hw_off(void);
#define _backlight_panic_on() backlight_hw_on()
#endif

4
firmware/target/arm/as3525/sansa-clipv2/backlight-clipv2.c
View file

@ -24,13 +24,13 @@
#include "as3525v2.h"
#include "ascodec.h"
void _backlight_on(void)
void backlight_hw_on(void)
{
ascodec_write_pmu(AS3543_BACKLIGHT, 1, 0x90);
lcd_enable(true);
}
void _backlight_off(void)
void backlight_hw_off(void)
{
lcd_enable(false);
ascodec_write_pmu(AS3543_BACKLIGHT, 1, 0x0);

12
firmware/target/arm/as3525/sansa-clipv2/backlight-target.h
View file

@ -24,22 +24,22 @@
#include <stdbool.h>
#include "cpu.h"
void _backlight_on(void);
void _backlight_off(void);
#define _backlight_panic_on() _backlight_on()
void backlight_hw_on(void);
void backlight_hw_off(void);
#define _backlight_panic_on() backlight_hw_on()
static inline bool _backlight_init(void)
static inline bool backlight_hw_init(void)
{
GPIOA_DIR |= 1<<5; /* for button light */
return true;
}
static inline void _buttonlight_on(void)
static inline void buttonlight_hw_on(void)
{
GPIOA_PIN(5) = 1<<5;
}
static inline void _buttonlight_off(void)
static inline void buttonlight_hw_off(void)
{
GPIOA_PIN(5) = 0;
}

8
firmware/target/arm/as3525/sansa-clipzip/backlight-clipzip.c
View file

@ -27,12 +27,12 @@
#include "ascodec.h"
#include "lcd-target.h"
bool _backlight_init()
bool backlight_hw_init()
{
return true;
}
void _backlight_on(void)
void backlight_hw_on(void)
{
/* GPIO B1 controls backlight */
GPIOB_DIR |= (1 << 1);
@ -43,7 +43,7 @@ void _backlight_on(void)
#endif
}
void _backlight_off(void)
void backlight_hw_off(void)
{
#ifdef HAVE_LCD_ENABLE
lcd_enable(false);
@ -52,7 +52,7 @@ void _backlight_off(void)
GPIOB_PIN(1) = 0;
}
void _backlight_set_brightness(int brightness)
void backlight_hw_brightness(int brightness)
{
oled_brightness(brightness);
}

10
firmware/target/arm/as3525/sansa-clipzip/backlight-target.h
View file

@ -21,11 +21,11 @@
#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);
#define _backlight_panic_on() _backlight_on()
#define _backlight_panic_on() backlight_hw_on()
#endif

14
firmware/target/arm/as3525/sansa-e200v2/backlight-target.h
View file

@ -21,13 +21,13 @@
#ifndef BACKLIGHT_TARGET_H
#define BACKLIGHT_TARGET_H
#define _backlight_init() true
void _backlight_on(void);
void _backlight_off(void);
#define _backlight_panic_on() _backlight_on()
void _backlight_set_brightness(int brightness);
#define backlight_hw_init() true
void backlight_hw_on(void);
void backlight_hw_off(void);
#define _backlight_panic_on() backlight_hw_on()
void backlight_hw_brightness(int brightness);
int __backlight_is_on(void);
void _buttonlight_on(void);
void _buttonlight_off(void);
void buttonlight_hw_on(void);
void buttonlight_hw_off(void);
#endif

14
firmware/target/arm/as3525/sansa-fuze/backlight-target.h
View file

@ -21,13 +21,13 @@
#ifndef BACKLIGHT_TARGET_H
#define BACKLIGHT_TARGET_H
#define _backlight_init() true
void _backlight_on(void);
void _backlight_off(void);
#define _backlight_panic_on() _backlight_on()
void _backlight_set_brightness(int brightness);
#define backlight_hw_init() true
void backlight_hw_on(void);
void backlight_hw_off(void);
#define _backlight_panic_on() backlight_hw_on()
void backlight_hw_brightness(int brightness);
#ifdef HAVE_BUTTON_LIGHT
void _buttonlight_on(void);
void _buttonlight_off(void);
void buttonlight_hw_on(void);
void buttonlight_hw_off(void);
#endif
#endif

12
firmware/target/arm/as3525/sansa-fuzev2/backlight-fuzev2.c
View file

@ -26,12 +26,12 @@
#include "ascodec.h"
#include "as3514.h"
void _backlight_set_brightness(int brightness)
void backlight_hw_brightness(int brightness)
{
ascodec_write_pmu(AS3543_BACKLIGHT, 2, brightness * 10);
}
bool _backlight_init(void)
bool backlight_hw_init(void)
{
ascodec_write_pmu(AS3543_BACKLIGHT, 1, 0x80);
ascodec_write_pmu(AS3543_BACKLIGHT, 2, backlight_brightness * 10);
@ -49,7 +49,7 @@ 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 */
@ -57,7 +57,7 @@ void _backlight_on(void)
ascodec_write_pmu(AS3543_BACKLIGHT, 1, 0x80);
}
void _backlight_off(void)
void backlight_hw_off(void)
{
ascodec_write_pmu(AS3543_BACKLIGHT, 1, 0x0);
#ifdef HAVE_LCD_ENABLE
@ -65,7 +65,7 @@ void _backlight_off(void)
#endif
}
void _buttonlight_on(void)
void buttonlight_hw_on(void)
{
if (amsv2_variant == 0)
{
@ -77,7 +77,7 @@ void _buttonlight_on(void)
}
}
void _buttonlight_off(void)
void buttonlight_hw_off(void)
{
if (amsv2_variant == 0)
{

14
firmware/target/arm/as3525/sansa-fuzev2/backlight-target.h
View file

@ -25,13 +25,13 @@
#include "config.h"
#include "ascodec.h"
bool _backlight_init(void);
void _backlight_on(void);
void _backlight_off(void);
#define _backlight_panic_on() _backlight_on()
void _backlight_set_brightness(int brightness);
bool backlight_hw_init(void);
void backlight_hw_on(void);
void backlight_hw_off(void);
#define _backlight_panic_on() backlight_hw_on()
void backlight_hw_brightness(int brightness);
#ifdef HAVE_BUTTON_LIGHT
void _buttonlight_on(void);
void _buttonlight_off(void);
void buttonlight_hw_on(void);
void buttonlight_hw_off(void);
#endif
#endif

8
firmware/target/arm/as3525/sansa-m200v4/backlight-target.h
View file

@ -21,22 +21,22 @@
#ifndef BACKLIGHT_TARGET_H
#define BACKLIGHT_TARGET_H
static inline bool _backlight_init(void)
static inline bool backlight_hw_init(void)
{
GPIOD_DIR |= (1<<1);
return true;
}
static inline void _backlight_on(void)
static inline void backlight_hw_on(void)
{
GPIOD_PIN(1) = (1<<1);
}
static inline void _backlight_off(void)
static inline void backlight_hw_off(void)
{
GPIOD_PIN(1) = 0x00;
}
#define _backlight_panic_on() _backlight_on()
#define _backlight_panic_on() backlight_hw_on()
#endif

4
firmware/target/arm/as3525/sd-as3525.c
View file

@ -969,7 +969,7 @@ void sd_enable(bool on)
if (buttonlight_is_on)
GPIOD_DIR &= ~(1<<7);
else
_buttonlight_off();
buttonlight_hw_off();
#endif
#if defined(HAVE_HOTSWAP) && defined (HAVE_ADJUSTABLE_CPU_VOLTAGE)
@ -993,7 +993,7 @@ void sd_enable(bool on)
#if defined(HAVE_BUTTON_LIGHT) && defined(HAVE_MULTIDRIVE)
bitmod32(&CCU_IO, 0<<2, 3<<2); /* XPD is general purpose IO (b3:2 = 00) */
if (buttonlight_is_on)
_buttonlight_on();
buttonlight_hw_on();
#endif
}
}

2
firmware/target/arm/as3525/system-as3525.c
View file

@ -360,7 +360,7 @@ void system_init(void)
void system_reboot(void)
{
_backlight_off();
backlight_hw_off();
disable_irq();