mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-12-08 12:45:26 -05:00
Fix red/yellow
Change-Id: Ie01251af2cd843979b5fdefcfa541ba377d13bd7
This commit is contained in:
parent
bbd7d1dba3
commit
9ffd9327e3
12 changed files with 38 additions and 46 deletions
|
|
@ -34,12 +34,12 @@
|
|||
#include "backlight.h"
|
||||
#include "backlight-target.h"
|
||||
|
||||
void _backlight_hw_on(void)
|
||||
void backlight_hw_on(void)
|
||||
{
|
||||
GPIO_SET_BITWISE(GPIOB_OUTPUT_VAL, 0x08);
|
||||
}
|
||||
|
||||
void _backlight_hw_off(void)
|
||||
void backlight_hw_off(void)
|
||||
{
|
||||
GPIO_CLEAR_BITWISE(GPIOB_OUTPUT_VAL, 0x08);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,11 +39,11 @@ void lcd_awake(void);
|
|||
#define backlight_hw_off() do { _backlight_led_off(); \
|
||||
_backlight_hw_enable(false); } while(0)
|
||||
#else /* !BOOTLOADER */
|
||||
#define backlight_hw_on_isr() _backlight_led_on()
|
||||
#define backlight_hw_off_isr() _backlight_led_off()
|
||||
#define backlight_hw_on_normal() do { _backlight_hw_enable(true); \
|
||||
#define _backlight_on_isr() _backlight_led_on()
|
||||
#define _backlight_off_isr() _backlight_led_off()
|
||||
#define _backlight_on_normal() do { _backlight_hw_enable(true); \
|
||||
_backlight_led_on(); } while(0)
|
||||
#define backlight_hw_off_normal() do { _backlight_led_off(); \
|
||||
#define _backlight_off_normal() do { _backlight_led_off(); \
|
||||
_backlight_hw_enable(false); } while(0)
|
||||
#define _BACKLIGHT_FADE_ENABLE
|
||||
#endif /* !BOOTLOADER */
|
||||
|
|
@ -58,17 +58,14 @@ void backlight_hw_brightness(int val);
|
|||
#elif defined(IPOD_MINI) || defined(IPOD_MINI2G)
|
||||
|
||||
#define backlight_hw_init() true
|
||||
void _backlight_hw_on(void);
|
||||
void _backlight_hw_off(void);
|
||||
void backlight_hw_on(void);
|
||||
void backlight_hw_off(void);
|
||||
|
||||
#ifdef BOOTLOADER
|
||||
#define backlight_hw_on() _backlight_hw_on()
|
||||
#define backlight_hw_off() _backlight_hw_off()
|
||||
#else
|
||||
#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()
|
||||
#ifndef BOOTLOADER
|
||||
#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()
|
||||
#endif
|
||||
|
||||
#elif defined(IPOD_1G2G) || defined(IPOD_3G)
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@
|
|||
#define BACKLIGHT_TARGET_H
|
||||
|
||||
bool backlight_hw_init(void); /* Returns backlight current state (true=ON). */
|
||||
void _backlight_hw_on(void);
|
||||
void _backlight_hw_off(void);
|
||||
void backlight_hw_on(void);
|
||||
void backlight_hw_off(void);
|
||||
|
||||
#ifdef HAVE_REMOTE_LCD
|
||||
void remote_backlight_hw_on(void);
|
||||
|
|
|
|||
|
|
@ -30,9 +30,9 @@ void backlight_hw_brightness(int brightness);
|
|||
#endif
|
||||
|
||||
#ifdef HAVE_BUTTON_LIGHT
|
||||
voidbuttonlight_hw_on(void);
|
||||
voidbuttonlight_hw_off(void);
|
||||
voidbuttonlight_hw_set_brightness(int brightness);
|
||||
void buttonlight_hw_on(void);
|
||||
void buttonlight_hw_off(void);
|
||||
void buttonlight_hw_set_brightness(int brightness);
|
||||
#endif
|
||||
|
||||
#endif /* BACKLIGHT_TARGET.H */
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ int button_read_device(int *data)
|
|||
if (!(GPIOA & 0x4))
|
||||
btn |= BUTTON_POWER;
|
||||
|
||||
if (btn & BUTTON_TOUCHSCREEN && !isbacklight_hw_on(true))
|
||||
if (btn & BUTTON_TOUCHSCREEN && !is_backlight_on(true))
|
||||
old_data = *data = 0;
|
||||
|
||||
return btn;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue