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

Accepted Brian King's backlight-on-when-charging patch, slightly modified

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2515 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2002-10-06 10:13:48 +00:00
parent 83611fe8c3
commit c5b24010cb
1 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
apps/settings.c
View file

@ -275,15 +275,9 @@ int settings_save( void )
config_block[0xa] = (unsigned char)global_settings.contrast; config_block[0xa] = (unsigned char)global_settings.contrast;
#ifdef HAVE_CHARGE_CTRL config_block[0xb] = (unsigned char)
if( global_settings.backlight_on_when_charging ) { ((global_settings.backlight_on_when_charging?0x40:0) |
config_block[0xb] = (unsigned char) (global_settings.backlight_timeout + 128); (global_settings.backlight_timeout & 0x3f));
} else {
config_block[0xb] = (unsigned char)global_settings.backlight_timeout;
}
#else
config_block[0xb] = (unsigned char)global_settings.backlight_timeout;
#endif
config_block[0xc] = (unsigned char)global_settings.poweroff; config_block[0xc] = (unsigned char)global_settings.poweroff;
config_block[0xd] = (unsigned char)global_settings.resume; config_block[0xd] = (unsigned char)global_settings.resume;
@ -408,15 +402,14 @@ void settings_load(void)
if ( global_settings.contrast < MIN_CONTRAST_SETTING ) if ( global_settings.contrast < MIN_CONTRAST_SETTING )
global_settings.contrast = DEFAULT_CONTRAST_SETTING; global_settings.contrast = DEFAULT_CONTRAST_SETTING;
} }
#ifdef HAVE_CHARGE_CTRL
if (config_block[0xb] != 0xFF) { if (config_block[0xb] != 0xFF) {
global_settings.backlight_timeout = config_block[0xb] & 127; /* Bit 7 is unused to be able to detect uninitialized entry */
global_settings.backlight_on_when_charging = config_block[0xb] & 128 ? 1 : 0; global_settings.backlight_timeout = config_block[0xb] & 0x3f;
global_settings.backlight_on_when_charging =
config_block[0xb] & 0x40 ? true : false;
} }
#else
if (config_block[0xb] != 0xFF)
global_settings.backlight_timeout = config_block[0xb];
#endif
if (config_block[0xc] != 0xFF) if (config_block[0xc] != 0xFF)
global_settings.poweroff = config_block[0xc]; global_settings.poweroff = config_block[0xc];
if (config_block[0xd] != 0xFF) if (config_block[0xd] != 0xFF)