From 52aaa75e83fc34524625dfa51dc0b7c1baacbac5 Mon Sep 17 00:00:00 2001 From: Linus Nielsen Feltzing Date: Tue, 25 Jul 2006 07:19:35 +0000 Subject: Restore the default backlight settings broken by Rani git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10314 a1c6a512-1295-4272-9138-f99709370657 --- apps/settings.c | 6 +++--- apps/settings.h | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'apps') diff --git a/apps/settings.c b/apps/settings.c index 4dbd2bf3ac..00fea9f84b 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -94,7 +94,7 @@ const char rec_base_directory[] = REC_BASE_DIR; #include "dsp.h" #endif -#define CONFIG_BLOCK_VERSION 48 +#define CONFIG_BLOCK_VERSION 49 #define CONFIG_BLOCK_SIZE 512 #define RTC_BLOCK_SIZE 44 @@ -1260,7 +1260,7 @@ void settings_load(int which) } if ( global_settings.contrast < MIN_CONTRAST_SETTING ) - global_settings.contrast = DEFAULT_CONTRAST_SETTING; + global_settings.contrast = lcd_default_contrast(); i = 0xb8; strncpy((char *)global_settings.wps_file, (char *)&config_block[i], @@ -1722,7 +1722,7 @@ void settings_reset(void) { global_settings.mdb_enable = sound_default(SOUND_MDB_ENABLE); global_settings.superbass = sound_default(SOUND_SUPERBASS); #endif - global_settings.contrast = DEFAULT_CONTRAST_SETTING; + global_settings.contrast = lcd_default_contrast(); #ifdef HAVE_LCD_REMOTE global_settings.remote_contrast = lcd_remote_default_contrast(); #endif diff --git a/apps/settings.h b/apps/settings.h index 51eaca3a51..58e8f3f14e 100644 --- a/apps/settings.h +++ b/apps/settings.h @@ -573,7 +573,6 @@ extern const char rec_base_directory[]; #ifdef IAUDIO_X5 #define MIN_CONTRAST_SETTING 0 #define MAX_CONTRAST_SETTING 29 -#define DEFAULT_CONTRAST_SETTING 15 #else #ifdef HAVE_LCD_CHARCELLS #define MAX_CONTRAST_SETTING 31 -- cgit v1.2.3