Move a few #defines to target specific config files

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15658 a1c6a512-1295-4272-9138-f99709370657
2007-11-18 13:33:27 +00:00 · 2007-11-18 13:33:27 +00:00 · 5386cc205f
commit 5386cc205f
parent 572ecef486
7 changed files with 37 additions and 21 deletions
--- a/apps/settings.h
+++ b/apps/settings.h
@ -119,27 +119,6 @@ extern const struct opt_items trig_durations[TRIG_DURATION_COUNT];
 #define FOLDER_ADVANCE_NEXT 1
 #define FOLDER_ADVANCE_RANDOM 2

-/* system defines */
-#ifndef TARGET_TREE
-
-#ifndef HAVE_LCD_COLOR
-#define DEFAULT_CONTRAST_SETTING    40
-#endif
-
-#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 */
-
-#if !defined(HAVE_LCD_COLOR)
-#define HAVE_LCD_CONTRAST
-#endif
-
 /* repeat mode options */
 enum
 {
--- a/firmware/export/config-fmrecorder.h
+++ b/firmware/export/config-fmrecorder.h
@ -109,3 +109,9 @@
 #define BOOTDIR "/"

 #endif /* SIMULATOR */
+
+#define HAVE_LCD_CONTRAST
+
+#define MIN_CONTRAST_SETTING        5
+#define MAX_CONTRAST_SETTING        63
+
--- a/firmware/export/config-ondiofm.h
+++ b/firmware/export/config-ondiofm.h
@ -122,3 +122,9 @@
 #define BOOTDIR "/"

 #endif /* SIMULATOR */
+
+#define HAVE_LCD_CONTRAST
+
+#define MIN_CONTRAST_SETTING        5
+#define MAX_CONTRAST_SETTING        63
+
--- a/firmware/export/config-ondiosp.h
+++ b/firmware/export/config-ondiosp.h
@ -105,3 +105,9 @@
 #define BOOTDIR "/"

 #endif /* SIMULATOR */
+
+#define HAVE_LCD_CONTRAST
+
+#define MIN_CONTRAST_SETTING        5
+#define MAX_CONTRAST_SETTING        63
+
--- a/firmware/export/config-player.h
+++ b/firmware/export/config-player.h
@ -84,3 +84,10 @@
 #define BOOTDIR "/"

 #endif /* SIMULATOR */
+
+#define HAVE_LCD_CONTRAST
+
+#define MIN_CONTRAST_SETTING        5
+#define MAX_CONTRAST_SETTING        31
+#define DEFAULT_CONTRAST_SETTING    30
+
--- a/firmware/export/config-recorder.h
+++ b/firmware/export/config-recorder.h
@ -100,3 +100,9 @@
 #define BOOTDIR "/"

 #endif /* SIMULATOR */
+
+#define HAVE_LCD_CONTRAST
+
+#define MIN_CONTRAST_SETTING        5
+#define MAX_CONTRAST_SETTING        63
+
--- a/firmware/export/config-recorderv2.h
+++ b/firmware/export/config-recorderv2.h
@ -109,3 +109,9 @@
 #define BOOTDIR "/"

 #endif /* SIMULATOR */
+
+#define HAVE_LCD_CONTRAST
+
+#define MIN_CONTRAST_SETTING        5
+#define MAX_CONTRAST_SETTING        63
+