H10 fixes: Split LCD driver up into two drivers, one for each LCD type. Improvements to 20GB LCD driver - support for enable/disable, contrast adjustment, make the update code clearer and ~4% faster, support for flipping, support for invert. Fix CPU frequency for both models. Fix default battery capacity for 5/6GB.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10910 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 3 insertions, 5 deletions

diff --git a/apps/settings.h b/apps/settings.h
index 05f5dee382..b66e96b765 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -532,17 +532,15 @@ extern long lasttime;
 extern const char rec_base_directory[];
 
 /* system defines */
-#ifdef IAUDIO_X5
-#define MIN_CONTRAST_SETTING        1
-#define MAX_CONTRAST_SETTING        30
-#define DEFAULT_CONTRAST_SETTING    19
-#elif defined HAVE_LCD_CHARCELLS
+#ifndef TARGET_TREE
+#if defined HAVE_LCD_CHARCELLS
 #define MIN_CONTRAST_SETTING        5
 #define MAX_CONTRAST_SETTING        31
 #else
 #define MIN_CONTRAST_SETTING        5
 #define MAX_CONTRAST_SETTING        63
 #endif
+#endif /* !TARGET_TREE */
 
 /* argument bits for settings_load() */
 #define SETTINGS_RTC 1 /* only the settings from the RTC nonvolatile RAM */