diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2006-11-10 18:47:41 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2006-11-10 18:47:41 +0000 |
commit | 58825f6e7391a237be85e63bee08f7a0bb66dc38 (patch) | |
tree | 1324b528137ce35623eb3332f32d422331f80777 /firmware/export | |
parent | f669797d077d081078407dd6dabf4e7389acf68f (diff) | |
download | rockbox-58825f6e7391a237be85e63bee08f7a0bb66dc38.tar.gz rockbox-58825f6e7391a237be85e63bee08f7a0bb66dc38.zip |
Coldfire targets: Got the rest of the coldfire code out of backlight.c. Straightened up related items in configs and split backlight_set_brightness between the normal and boot/sim builds like the other functions. Should really have done all that in the first place.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11502 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/config-h100.h | 19 | ||||
-rw-r--r-- | firmware/export/config-h120.h | 19 | ||||
-rw-r--r-- | firmware/export/config-h300.h | 13 | ||||
-rw-r--r-- | firmware/export/config-iaudiox5.h | 34 |
4 files changed, 50 insertions, 35 deletions
diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h index 8ef227676a..fd84f37061 100644 --- a/firmware/export/config-h100.h +++ b/firmware/export/config-h100.h | |||
@@ -154,13 +154,6 @@ | |||
154 | 154 | ||
155 | #endif /* !SIMULATOR */ | 155 | #endif /* !SIMULATOR */ |
156 | 156 | ||
157 | #define DEFAULT_CONTRAST_SETTING 28 | ||
158 | #define MIN_CONTRAST_SETTING 14 /* White screen a bit higher than this */ | ||
159 | #define MAX_CONTRAST_SETTING 63 /* Black screen a bit lower than this*/ | ||
160 | #define DEFAULT_REMOTE_CONTRAST_SETTING 42 | ||
161 | #define MIN_REMOTE_CONTRAST_SETTING MIN_CONTRAST_SETTING | ||
162 | #define MAX_REMOTE_CONTRAST_SETTING MAX_CONTRAST_SETTING | ||
163 | |||
164 | /* Define this for S/PDIF input available */ | 157 | /* Define this for S/PDIF input available */ |
165 | #define HAVE_SPDIF_IN | 158 | #define HAVE_SPDIF_IN |
166 | 159 | ||
@@ -173,3 +166,15 @@ | |||
173 | 166 | ||
174 | /* Define this for FM radio input available */ | 167 | /* Define this for FM radio input available */ |
175 | #define HAVE_FMRADIO_IN | 168 | #define HAVE_FMRADIO_IN |
169 | |||
170 | /** Port-specific settings **/ | ||
171 | |||
172 | /* Main LCD backlight brightness range and defaults */ | ||
173 | #define MIN_CONTRAST_SETTING 14 /* White screen a bit higher than this */ | ||
174 | #define MAX_CONTRAST_SETTING 63 /* Black screen a bit lower than this */ | ||
175 | #define DEFAULT_CONTRAST_SETTING 28 | ||
176 | |||
177 | /* Remote LCD contrast range and defaults */ | ||
178 | #define MIN_REMOTE_CONTRAST_SETTING 5 | ||
179 | #define MAX_REMOTE_CONTRAST_SETTING 63 | ||
180 | #define DEFAULT_REMOTE_CONTRAST_SETTING 42 | ||
diff --git a/firmware/export/config-h120.h b/firmware/export/config-h120.h index e4c5cfe876..4a8a3c99be 100644 --- a/firmware/export/config-h120.h +++ b/firmware/export/config-h120.h | |||
@@ -150,13 +150,6 @@ | |||
150 | 150 | ||
151 | #endif /* !SIMULATOR */ | 151 | #endif /* !SIMULATOR */ |
152 | 152 | ||
153 | #define DEFAULT_CONTRAST_SETTING 28 | ||
154 | #define MIN_CONTRAST_SETTING 14 /* White screen a bit higher than this */ | ||
155 | #define MAX_CONTRAST_SETTING 63 /* Black screen a bit lower than this*/ | ||
156 | #define DEFAULT_REMOTE_CONTRAST_SETTING 42 | ||
157 | #define MIN_REMOTE_CONTRAST_SETTING MIN_CONTRAST_SETTING | ||
158 | #define MAX_REMOTE_CONTRAST_SETTING MAX_CONTRAST_SETTING | ||
159 | |||
160 | /* Define this for S/PDIF input available */ | 153 | /* Define this for S/PDIF input available */ |
161 | #define HAVE_SPDIF_IN | 154 | #define HAVE_SPDIF_IN |
162 | 155 | ||
@@ -171,3 +164,15 @@ | |||
171 | 164 | ||
172 | /* Define this if you have a serial port */ | 165 | /* Define this if you have a serial port */ |
173 | /*#define HAVE_SERIAL*/ | 166 | /*#define HAVE_SERIAL*/ |
167 | |||
168 | /** Port-specific settings **/ | ||
169 | |||
170 | /* Main LCD backlight brightness range and defaults */ | ||
171 | #define DEFAULT_CONTRAST_SETTING 28 | ||
172 | #define MIN_CONTRAST_SETTING 14 /* White screen a bit higher than this */ | ||
173 | #define MAX_CONTRAST_SETTING 63 /* Black screen a bit lower than this */ | ||
174 | |||
175 | /* Remote LCD contrast range and defaults */ | ||
176 | #define MIN_REMOTE_CONTRAST_SETTING 5 | ||
177 | #define MAX_REMOTE_CONTRAST_SETTING 63 | ||
178 | #define DEFAULT_REMOTE_CONTRAST_SETTING 42 | ||
diff --git a/firmware/export/config-h300.h b/firmware/export/config-h300.h index 14034c61f0..b44a2c5108 100644 --- a/firmware/export/config-h300.h +++ b/firmware/export/config-h300.h | |||
@@ -151,6 +151,12 @@ | |||
151 | #define HAVE_EEPROM | 151 | #define HAVE_EEPROM |
152 | 152 | ||
153 | #endif /* SIMULATOR */ | 153 | #endif /* SIMULATOR */ |
154 | |||
155 | /* Define this for FM radio input available */ | ||
156 | #define HAVE_FMRADIO_IN | ||
157 | |||
158 | /** Port-specific settings **/ | ||
159 | |||
154 | /* Main LCD contrast range and defaults */ | 160 | /* Main LCD contrast range and defaults */ |
155 | #define MIN_CONTRAST_SETTING 5 | 161 | #define MIN_CONTRAST_SETTING 5 |
156 | #define MAX_CONTRAST_SETTING 63 | 162 | #define MAX_CONTRAST_SETTING 63 |
@@ -163,9 +169,6 @@ | |||
163 | #define DEFAULT_BRIGHTNESS_SETTING 9 /* 9/16 (56.25%) */ | 169 | #define DEFAULT_BRIGHTNESS_SETTING 9 /* 9/16 (56.25%) */ |
164 | 170 | ||
165 | /* Remote LCD contrast range and defaults */ | 171 | /* Remote LCD contrast range and defaults */ |
166 | #define MIN_REMOTE_CONTRAST_SETTING MIN_CONTRAST_SETTING | 172 | #define MIN_REMOTE_CONTRAST_SETTING 5 |
167 | #define MAX_REMOTE_CONTRAST_SETTING MAX_CONTRAST_SETTING | 173 | #define MAX_REMOTE_CONTRAST_SETTING 63 |
168 | #define DEFAULT_REMOTE_CONTRAST_SETTING 42 | 174 | #define DEFAULT_REMOTE_CONTRAST_SETTING 42 |
169 | |||
170 | /* Define this for FM radio input available */ | ||
171 | #define HAVE_FMRADIO_IN | ||
diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config-iaudiox5.h index d45f58f14c..82c36437f5 100644 --- a/firmware/export/config-iaudiox5.h +++ b/firmware/export/config-iaudiox5.h | |||
@@ -62,22 +62,6 @@ | |||
62 | 62 | ||
63 | #define CONFIG_LCD LCD_X5 | 63 | #define CONFIG_LCD LCD_X5 |
64 | 64 | ||
65 | /* Main LCD contrast range and defaults */ | ||
66 | #define MIN_CONTRAST_SETTING 1 | ||
67 | #define MAX_CONTRAST_SETTING 30 | ||
68 | #define DEFAULT_CONTRAST_SETTING 19 /* Match boot contrast */ | ||
69 | |||
70 | /* Remote LCD contrast range and defaults */ | ||
71 | #define MIN_REMOTE_CONTRAST_SETTING 10 | ||
72 | #define MAX_REMOTE_CONTRAST_SETTING 35 | ||
73 | #define DEFAULT_REMOTE_CONTRAST_SETTING 24 /* Match boot contrast */ | ||
74 | |||
75 | /* Main LCD backlight brightness range and defaults */ | ||
76 | /* PCF50506 can output 0%-100% duty cycle but D305A expects %15-100%. */ | ||
77 | #define MIN_BRIGHTNESS_SETTING 1 /* 15/16 (93.75%) */ | ||
78 | #define MAX_BRIGHTNESS_SETTING 13 /* 3/16 (18.75%) */ | ||
79 | #define DEFAULT_BRIGHTNESS_SETTING 8 /* 8/16 (50.00%) = x5 boot default */ | ||
80 | |||
81 | /* Define this for LCD backlight available */ | 65 | /* Define this for LCD backlight available */ |
82 | #define CONFIG_BACKLIGHT BL_X5 /* PCF50606 I2C */ | 66 | #define CONFIG_BACKLIGHT BL_X5 /* PCF50606 I2C */ |
83 | #define HAVE_BACKLIGHT_BRIGHTNESS | 67 | #define HAVE_BACKLIGHT_BRIGHTNESS |
@@ -170,3 +154,21 @@ | |||
170 | 154 | ||
171 | /* Define this for FM radio input available */ | 155 | /* Define this for FM radio input available */ |
172 | #define HAVE_FMRADIO_IN | 156 | #define HAVE_FMRADIO_IN |
157 | |||
158 | /** Port-specific settings **/ | ||
159 | |||
160 | /* Main LCD contrast range and defaults */ | ||
161 | #define MIN_CONTRAST_SETTING 1 | ||
162 | #define MAX_CONTRAST_SETTING 30 | ||
163 | #define DEFAULT_CONTRAST_SETTING 19 /* Match boot contrast */ | ||
164 | |||
165 | /* Main LCD backlight brightness range and defaults */ | ||
166 | /* PCF50506 can output 0%-100% duty cycle but D305A expects %15-100%. */ | ||
167 | #define MIN_BRIGHTNESS_SETTING 1 /* 15/16 (93.75%) */ | ||
168 | #define MAX_BRIGHTNESS_SETTING 13 /* 3/16 (18.75%) */ | ||
169 | #define DEFAULT_BRIGHTNESS_SETTING 8 /* 8/16 (50.00%) = x5 boot default */ | ||
170 | |||
171 | /* Remote LCD contrast range and defaults */ | ||
172 | #define MIN_REMOTE_CONTRAST_SETTING 10 | ||
173 | #define MAX_REMOTE_CONTRAST_SETTING 35 | ||
174 | #define DEFAULT_REMOTE_CONTRAST_SETTING 24 /* Match boot contrast */ | ||