Fix red/yellow
Change-Id: Ie01251af2cd843979b5fdefcfa541ba377d13bd7
This commit is contained in:
parent
bbd7d1dba3
commit
9ffd9327e3
|
@ -469,7 +469,7 @@ static unsigned long _grey_get_pixel(int x, int y)
|
|||
static void _timer_isr(void)
|
||||
{
|
||||
#if defined(HAVE_BACKLIGHT_INVERSION) && !defined(SIMULATOR)
|
||||
unsigned long check = rb->isbacklight_hw_on(true)
|
||||
unsigned long check = rb->is_backlight_on(true)
|
||||
? 0 : _GREY_BACKLIGHT_ON;
|
||||
|
||||
if ((_grey_info.flags & (_GREY_BACKLIGHT_ON|GREY_RAWMAPPED)) == check)
|
||||
|
@ -648,7 +648,7 @@ bool grey_init(unsigned char *gbuf, long gbuf_size,
|
|||
else
|
||||
{
|
||||
#if defined(HAVE_BACKLIGHT_INVERSION) && !defined(SIMULATOR)
|
||||
if (rb->isbacklight_hw_on(true))
|
||||
if (rb->is_backlight_on(true))
|
||||
_grey_info.flags |= _GREY_BACKLIGHT_ON;
|
||||
#endif
|
||||
fill_gvalues();
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -35,12 +35,12 @@ bool backlight_hw_init(void)
|
|||
return (GPIO1_OUT & 0x00020000) ? false : true;
|
||||
}
|
||||
|
||||
void _backlight_hw_on(void)
|
||||
void backlight_hw_on(void)
|
||||
{
|
||||
and_l(~0x00020000, &GPIO1_OUT);
|
||||
}
|
||||
|
||||
void _backlight_hw_off(void)
|
||||
void backlight_hw_off(void)
|
||||
{
|
||||
or_l(0x00020000, &GPIO1_OUT);
|
||||
}
|
||||
|
|
|
@ -26,10 +26,10 @@ void backlight_hw_on(void);
|
|||
void backlight_hw_off(void);
|
||||
|
||||
#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_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()
|
||||
#define _BACKLIGHT_FADE_BOOST
|
||||
#endif
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
#include "backlight-target.h"
|
||||
#include "lcd.h"
|
||||
|
||||
static bool backlight_hw_on = true;
|
||||
static bool _backlight_on = true;
|
||||
static int _brightness = DEFAULT_BRIGHTNESS_SETTING;
|
||||
|
||||
/* Returns the current state of the backlight (true=ON, false=OFF). */
|
||||
|
@ -41,23 +41,23 @@ bool backlight_hw_init(void)
|
|||
return true;
|
||||
}
|
||||
|
||||
void _backlight_hw_on(void)
|
||||
void backlight_hw_on(void)
|
||||
{
|
||||
#ifndef BOOTLOADER
|
||||
if (backlight_hw_on)
|
||||
if (_backlight_on)
|
||||
return;
|
||||
#endif
|
||||
|
||||
backlight_hw_brightness(_brightness);
|
||||
backlight_hw_on = true;
|
||||
_backlight_on = true;
|
||||
|
||||
}
|
||||
|
||||
void _backlight_hw_off(void)
|
||||
void backlight_hw_off(void)
|
||||
{
|
||||
/* GPIO28 low */
|
||||
and_l(~(1<<28),&GPIO_OUT);
|
||||
backlight_hw_on = false;
|
||||
_backlight_on = false;
|
||||
}
|
||||
|
||||
void backlight_hw_brightness(int val)
|
||||
|
@ -65,7 +65,7 @@ void backlight_hw_brightness(int val)
|
|||
unsigned char i;
|
||||
|
||||
#ifndef BOOTLOADER
|
||||
if( _brightness == val && backlight_hw_on == true )
|
||||
if( _brightness == val && _backlight_on == true )
|
||||
return;
|
||||
#endif
|
||||
|
||||
|
|
|
@ -25,9 +25,4 @@ 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);
|
||||
|
||||
#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()
|
||||
#endif
|
||||
|
|
|
@ -184,7 +184,7 @@ int button_read_device(int *data)
|
|||
#if CONFIG_ORIENTATION == SCREEN_LANDSCAPE
|
||||
*data = (*data & 0xFFFF) | ((LCD_HEIGHT - (*data >> 16)) << 16);
|
||||
#endif
|
||||
if( UNLIKELY(!isbacklight_hw_on(true)) )
|
||||
if( UNLIKELY(!is_backlight_on(true)) )
|
||||
*data = 0;
|
||||
|
||||
old_data = *data;
|
||||
|
|
|
@ -32,10 +32,10 @@ void backlight_hw_off(void);
|
|||
void backlight_hw_brightness(int val);
|
||||
#endif /* HAVE_BACKLIGHT_BRIGHTNESS */
|
||||
#ifdef HAVE_BUTTON_LIGHT
|
||||
voidbuttonlight_hw_on(void);
|
||||
voidbuttonlight_hw_off(void);
|
||||
void buttonlight_hw_on(void);
|
||||
void buttonlight_hw_off(void);
|
||||
#ifdef HAVE_BUTTONLIGHT_BRIGHTNESS
|
||||
voidbuttonlight_hw_set_brightness(int val);
|
||||
void buttonlight_hw_set_brightness(int val);
|
||||
#endif /* HAVE_BUTTONLIGHT_BRIGHTNESS */
|
||||
#endif /* HAVE_BUTTON_LIGHT */
|
||||
|
||||
|
|
Loading…
Reference in New Issue