9 files changed, 40 insertions, 38 deletions

diff --git a/apps/settings.c b/apps/settings.c
index 00fea9f84b..db3b45d155 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -240,7 +240,9 @@ static const struct bit_entry rtc_bits[] =
     {32 | SIGNED, S_O(resume_seed), -1, NULL, NULL },
     {3, S_O(repeat_mode), REPEAT_ALL, "repeat", "off,all,one,shuffle,ab" },
     /* LCD */
+#if !defined(HAVE_LCD_COLOR) || defined(IAUDIO_X5)
     {6, S_O(contrast), 40, "contrast", NULL },
+#endif
 #ifdef CONFIG_BACKLIGHT
     {5, S_O(backlight_timeout), 5, "backlight timeout", backlight_times_conf },
 #ifdef CONFIG_CHARGING
@@ -1015,7 +1017,9 @@ void settings_apply(void)
 
     audio_set_buffer_margin(global_settings.buffer_margin);
 
+#if !defined(HAVE_LCD_COLOR) || defined(IAUDIO_X5)
     lcd_set_contrast(global_settings.contrast);
+#endif
     lcd_scroll_speed(global_settings.scroll_speed);
 #ifdef HAVE_REMOTE_LCD
     lcd_remote_set_contrast(global_settings.remote_contrast);
@@ -1259,8 +1263,10 @@ void settings_load(int which)
                 RTC_BLOCK_SIZE*8);
         }
 
+#if !defined(HAVE_LCD_COLOR) || defined(IAUDIO_X5)
         if ( global_settings.contrast < MIN_CONTRAST_SETTING )
             global_settings.contrast = lcd_default_contrast();
+#endif
 
         i = 0xb8;
         strncpy((char *)global_settings.wps_file, (char *)&config_block[i],
@@ -1722,7 +1728,9 @@ void settings_reset(void) {
     global_settings.mdb_enable = sound_default(SOUND_MDB_ENABLE);
     global_settings.superbass = sound_default(SOUND_SUPERBASS);
 #endif
+#if !defined(HAVE_LCD_COLOR) || defined(IAUDIO_X5)
     global_settings.contrast = lcd_default_contrast();
+#endif
 #ifdef HAVE_LCD_REMOTE
     global_settings.remote_contrast = lcd_remote_default_contrast();
 #endif
diff --git a/apps/settings.h b/apps/settings.h
index 58e8f3f14e..d32b58ac85 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -274,7 +274,9 @@ struct user_settings
 
     /* device settings */
 
-    int contrast;   /* lcd contrast:          0-63 0=low 63=high            */
+#if !defined(HAVE_LCD_COLOR) || defined(IAUDIO_X5)
+    int contrast;   /* lcd contrast */
+#endif
     bool invert;    /* invert display */
     bool invert_cursor; /* invert the current file in dir browser and menu
                            instead of using the default cursor */
@@ -573,16 +575,13 @@ extern const char rec_base_directory[];
 #ifdef IAUDIO_X5
 #define MIN_CONTRAST_SETTING        0
 #define MAX_CONTRAST_SETTING        29
-#else
-#ifdef HAVE_LCD_CHARCELLS
+#elif defined HAVE_LCD_CHARCELLS
+#define MIN_CONTRAST_SETTING        5
 #define MAX_CONTRAST_SETTING        31
-#define DEFAULT_CONTRAST_SETTING    30
 #else
+#define MIN_CONTRAST_SETTING        5
 #define MAX_CONTRAST_SETTING        63
-#define DEFAULT_CONTRAST_SETTING    38
 #endif
-#define MIN_CONTRAST_SETTING        5
-#endif // X5
 
 /* argument bits for settings_load() */
 #define SETTINGS_RTC 1 /* only the settings from the RTC nonvolatile RAM */
diff --git a/firmware/drivers/lcd-16bit.c b/firmware/drivers/lcd-16bit.c
index 4297937abd..d237dac858 100644
--- a/firmware/drivers/lcd-16bit.c
+++ b/firmware/drivers/lcd-16bit.c
@@ -72,14 +72,6 @@ static const char scroll_tick_table[16] = {
     100, 80, 64, 50, 40, 32, 25, 20, 16, 12, 10, 8, 6, 5, 4, 3
 };
 
-#ifndef TARGET_TREE
-/* probably just a dummy */
-int lcd_default_contrast(void)
-{
-    return 28;
-}
-#endif
-
 /* LCD init */
 void lcd_init(void)
 {
diff --git a/firmware/drivers/lcd-2bit-horz.c b/firmware/drivers/lcd-2bit-horz.c
index e70df3fb84..4ee2e2ea28 100644
--- a/firmware/drivers/lcd-2bit-horz.c
+++ b/firmware/drivers/lcd-2bit-horz.c
@@ -79,15 +79,6 @@ void lcd_init(void)
                   sizeof(scroll_stack), scroll_name);
 }
 
-int lcd_default_contrast(void)
-{
-#if defined(IPOD_MINI) || defined(IPOD_MINI2G)
-    return 42;
-#else
-    return 35;
-#endif
-}
-
 /*** parameter handling ***/
 
 void lcd_set_drawmode(int mode)
diff --git a/firmware/drivers/lcd-h100.c b/firmware/drivers/lcd-h100.c
index f460165534..369833944f 100644
--- a/firmware/drivers/lcd-h100.c
+++ b/firmware/drivers/lcd-h100.c
@@ -102,13 +102,13 @@ static const char scroll_tick_table[16] = {
 
 /*** hardware configuration ***/
 
+#ifndef SIMULATOR
+
 int lcd_default_contrast(void)
 {
     return 28;
 }
 
-#ifndef SIMULATOR
-
 void lcd_set_contrast(int val)
 {
     lcd_write_command_ex(LCD_CNTL_ELECTRONIC_VOLUME, val, -1);
diff --git a/firmware/drivers/lcd-ipod.c b/firmware/drivers/lcd-ipod.c
index 67f9e7c23f..6500335e04 100644
--- a/firmware/drivers/lcd-ipod.c
+++ b/firmware/drivers/lcd-ipod.c
@@ -146,6 +146,15 @@ void lcd_init_device(void)
 
 /*** hardware configuration ***/
 
+int lcd_default_contrast(void)
+{
+#if defined(IPOD_MINI) || defined(IPOD_MINI2G)
+    return 42;
+#else
+    return 35;
+#endif
+}
+
 /* Rockbox stores the contrast as 0..63 - we add 64 to it */
 void lcd_set_contrast(int val)
 {
diff --git a/firmware/drivers/lcd-player.c b/firmware/drivers/lcd-player.c
index d01ec3447f..7da345279d 100644
--- a/firmware/drivers/lcd-player.c
+++ b/firmware/drivers/lcd-player.c
@@ -274,11 +274,6 @@ bool lcdx_putc(int x, int y, unsigned short ch)
     return false;
 }
 
-int lcd_default_contrast(void)
-{
-    return 30;
-}
-
 void lcd_clear_display(void)
 {
     int i;
@@ -483,6 +478,11 @@ void lcd_icon(int icon, bool enable)
     lcd_write_data(&icon_mirror[pos], 1);
 }
 
+int lcd_default_contrast(void)
+{
+    return 30;
+}
+
 void lcd_set_contrast(int val)
 {
     lcd_data_byte = (unsigned char) (31 - val);
diff --git a/firmware/drivers/lcd-recorder.c b/firmware/drivers/lcd-recorder.c
index 22bfebe289..75faa18b28 100644
--- a/firmware/drivers/lcd-recorder.c
+++ b/firmware/drivers/lcd-recorder.c
@@ -157,11 +157,11 @@ void lcd_write_data( const unsigned char* data, int count )
 
 /*** hardware configuration ***/
 
+#ifndef SIMULATOR
+
 int lcd_default_contrast(void)
 {
-#ifdef SIMULATOR
-    return 30;
-#elif CONFIG_LCD == LCD_GMINI100
+#if CONFIG_LCD == LCD_GMINI100
     return 31;
 #elif CONFIG_LCD == LCD_IFP7XX
     return 45;
@@ -170,8 +170,6 @@ int lcd_default_contrast(void)
 #endif
 }
 
-#ifndef SIMULATOR
-
 void lcd_set_contrast(int val)
 {
     lcd_write_command(LCD_CNTL_CONTRAST);
diff --git a/uisimulator/common/lcd-common.c b/uisimulator/common/lcd-common.c
index a28e619706..a50745a334 100644
--- a/uisimulator/common/lcd-common.c
+++ b/uisimulator/common/lcd-common.c
@@ -53,9 +53,9 @@ void lcd_set_invert_display(bool invert)
     (void)invert;
 }
 
-void lcd_remote_set_invert_display(bool invert)
+int lcd_default_contrast(void)
 {
-    (void)invert;
+    return 28;
 }
 
 #ifdef HAVE_REMOTE_LCD
@@ -76,4 +76,9 @@ void lcd_remote_set_flip(bool yesno)
 {
     (void)yesno;
 }
+
+void lcd_remote_set_invert_display(bool invert)
+{
+    (void)invert;
+}
 #endif