Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix FS#9599 - LCD Brightness setting broken by software fading. Patch by Thomas Martitz (kugel). The internal code requires log_brightness values.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19297 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2008-12-02 02:56:46 +00:00
parent c1cd0469ca
commit 9eabf8fb8b
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c
View file

@ -63,6 +63,7 @@ enum buttonlight_states
BUTTONLIGHT_CONTROL_FADE, BUTTONLIGHT_CONTROL_FADE,
} buttonlight_control; } buttonlight_control;
static unsigned char _backlight_brightness;
static unsigned char buttonlight_brightness; static unsigned char buttonlight_brightness;
static unsigned char backlight_target; static unsigned char backlight_target;
static unsigned char buttonlight_target; static unsigned char buttonlight_target;
@ -72,7 +73,9 @@ static unsigned short buttonlight_trigger_now;
/* Assumes that the backlight has been initialized */ /* Assumes that the backlight has been initialized */
void _backlight_set_brightness(int brightness) void _backlight_set_brightness(int brightness)
{ {
(void) brightness; /* Actually handled in led_control_service() */ /* stop the interrupt from messing us up */
backlight_control = BACKLIGHT_CONTROL_IDLE;
_backlight_brightness = log_brightness[brightness - 1];
backlight_control = BACKLIGHT_CONTROL_SET; backlight_control = BACKLIGHT_CONTROL_SET;
} }
@ -147,14 +150,14 @@ static void led_control_service(void)
sc606_changed=true; sc606_changed=true;
sc606_CONF_changed=true; sc606_CONF_changed=true;
sc606regCONFval |= 0x03; sc606regCONFval |= 0x03;
sc606regAval=backlight_brightness; sc606regAval=_backlight_brightness;
backlight_control = BACKLIGHT_CONTROL_IDLE; backlight_control = BACKLIGHT_CONTROL_IDLE;
break; break;
case BACKLIGHT_CONTROL_SET: case BACKLIGHT_CONTROL_SET:
if(!(sc606regCONFval&0x03)) if(!(sc606regCONFval&0x03))
break; break;
sc606_changed=true; sc606_changed=true;
sc606regAval=log_brightness[backlight_brightness - 1]; sc606regAval = _backlight_brightness;
backlight_control = BACKLIGHT_CONTROL_IDLE; backlight_control = BACKLIGHT_CONTROL_IDLE;
break; break;
case BACKLIGHT_CONTROL_FADE: case BACKLIGHT_CONTROL_FADE:
@ -317,8 +320,8 @@ static void __backlight_dim(bool dim_now)
{ {
/* dont let the interrupt tick happen */ /* dont let the interrupt tick happen */
backlight_control = BACKLIGHT_CONTROL_IDLE; backlight_control = BACKLIGHT_CONTROL_IDLE;
backlight_target = (dim_now == true) ? 0 : backlight_brightness; backlight_target = (dim_now == true) ? 0 : _backlight_brightness;
if(backlight_target==0 && backlight_brightness==0) if(backlight_target==0 && _backlight_brightness==0)
{ {
if(dim_now == false) if(dim_now == false)
backlight_control = BACKLIGHT_CONTROL_ON; backlight_control = BACKLIGHT_CONTROL_ON;
@ -402,7 +405,7 @@ void _buttonlight_set_brightness(int brightness)
bool _backlight_init(void) bool _backlight_init(void)
{ {
buttonlight_brightness = DEFAULT_BRIGHTNESS_SETTING; buttonlight_brightness = DEFAULT_BRIGHTNESS_SETTING;
backlight_brightness = DEFAULT_BRIGHTNESS_SETTING; _backlight_brightness = DEFAULT_BRIGHTNESS_SETTING;
buttonlight_control = BUTTONLIGHT_CONTROL_IDLE; buttonlight_control = BUTTONLIGHT_CONTROL_IDLE;
backlight_control = BACKLIGHT_CONTROL_ON; backlight_control = BACKLIGHT_CONTROL_ON;