diff options
author | Jens Arnold <amiconn@rockbox.org> | 2006-07-25 11:15:50 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2006-07-25 11:15:50 +0000 |
commit | 9051afa8a061152941ed4cf99e0ceb9bc4a3caf1 (patch) | |
tree | 40883fe94c814baadeb6a08d0060dd3c8dea7015 | |
parent | 7136fd9bb6f589ae873057aa9731c45f17a7b339 (diff) | |
download | rockbox-9051afa8a061152941ed4cf99e0ceb9bc4a3caf1.tar.gz rockbox-9051afa8a061152941ed4cf99e0ceb9bc4a3caf1.zip |
Contrast setting cleanup: * Only include contrast setting for targets where it's used. * Make lcd_default_contrast() a stub for simulators.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10317 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/settings.c | 8 | ||||
-rw-r--r-- | apps/settings.h | 13 | ||||
-rw-r--r-- | firmware/drivers/lcd-16bit.c | 8 | ||||
-rw-r--r-- | firmware/drivers/lcd-2bit-horz.c | 9 | ||||
-rw-r--r-- | firmware/drivers/lcd-h100.c | 4 | ||||
-rw-r--r-- | firmware/drivers/lcd-ipod.c | 9 | ||||
-rw-r--r-- | firmware/drivers/lcd-player.c | 10 | ||||
-rw-r--r-- | firmware/drivers/lcd-recorder.c | 8 | ||||
-rw-r--r-- | uisimulator/common/lcd-common.c | 9 |
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[] = | |||
240 | {32 | SIGNED, S_O(resume_seed), -1, NULL, NULL }, | 240 | {32 | SIGNED, S_O(resume_seed), -1, NULL, NULL }, |
241 | {3, S_O(repeat_mode), REPEAT_ALL, "repeat", "off,all,one,shuffle,ab" }, | 241 | {3, S_O(repeat_mode), REPEAT_ALL, "repeat", "off,all,one,shuffle,ab" }, |
242 | /* LCD */ | 242 | /* LCD */ |
243 | #if !defined(HAVE_LCD_COLOR) || defined(IAUDIO_X5) | ||
243 | {6, S_O(contrast), 40, "contrast", NULL }, | 244 | {6, S_O(contrast), 40, "contrast", NULL }, |
245 | #endif | ||
244 | #ifdef CONFIG_BACKLIGHT | 246 | #ifdef CONFIG_BACKLIGHT |
245 | {5, S_O(backlight_timeout), 5, "backlight timeout", backlight_times_conf }, | 247 | {5, S_O(backlight_timeout), 5, "backlight timeout", backlight_times_conf }, |
246 | #ifdef CONFIG_CHARGING | 248 | #ifdef CONFIG_CHARGING |
@@ -1015,7 +1017,9 @@ void settings_apply(void) | |||
1015 | 1017 | ||
1016 | audio_set_buffer_margin(global_settings.buffer_margin); | 1018 | audio_set_buffer_margin(global_settings.buffer_margin); |
1017 | 1019 | ||
1020 | #if !defined(HAVE_LCD_COLOR) || defined(IAUDIO_X5) | ||
1018 | lcd_set_contrast(global_settings.contrast); | 1021 | lcd_set_contrast(global_settings.contrast); |
1022 | #endif | ||
1019 | lcd_scroll_speed(global_settings.scroll_speed); | 1023 | lcd_scroll_speed(global_settings.scroll_speed); |
1020 | #ifdef HAVE_REMOTE_LCD | 1024 | #ifdef HAVE_REMOTE_LCD |
1021 | lcd_remote_set_contrast(global_settings.remote_contrast); | 1025 | lcd_remote_set_contrast(global_settings.remote_contrast); |
@@ -1259,8 +1263,10 @@ void settings_load(int which) | |||
1259 | RTC_BLOCK_SIZE*8); | 1263 | RTC_BLOCK_SIZE*8); |
1260 | } | 1264 | } |
1261 | 1265 | ||
1266 | #if !defined(HAVE_LCD_COLOR) || defined(IAUDIO_X5) | ||
1262 | if ( global_settings.contrast < MIN_CONTRAST_SETTING ) | 1267 | if ( global_settings.contrast < MIN_CONTRAST_SETTING ) |
1263 | global_settings.contrast = lcd_default_contrast(); | 1268 | global_settings.contrast = lcd_default_contrast(); |
1269 | #endif | ||
1264 | 1270 | ||
1265 | i = 0xb8; | 1271 | i = 0xb8; |
1266 | strncpy((char *)global_settings.wps_file, (char *)&config_block[i], | 1272 | strncpy((char *)global_settings.wps_file, (char *)&config_block[i], |
@@ -1722,7 +1728,9 @@ void settings_reset(void) { | |||
1722 | global_settings.mdb_enable = sound_default(SOUND_MDB_ENABLE); | 1728 | global_settings.mdb_enable = sound_default(SOUND_MDB_ENABLE); |
1723 | global_settings.superbass = sound_default(SOUND_SUPERBASS); | 1729 | global_settings.superbass = sound_default(SOUND_SUPERBASS); |
1724 | #endif | 1730 | #endif |
1731 | #if !defined(HAVE_LCD_COLOR) || defined(IAUDIO_X5) | ||
1725 | global_settings.contrast = lcd_default_contrast(); | 1732 | global_settings.contrast = lcd_default_contrast(); |
1733 | #endif | ||
1726 | #ifdef HAVE_LCD_REMOTE | 1734 | #ifdef HAVE_LCD_REMOTE |
1727 | global_settings.remote_contrast = lcd_remote_default_contrast(); | 1735 | global_settings.remote_contrast = lcd_remote_default_contrast(); |
1728 | #endif | 1736 | #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 | |||
274 | 274 | ||
275 | /* device settings */ | 275 | /* device settings */ |
276 | 276 | ||
277 | int contrast; /* lcd contrast: 0-63 0=low 63=high */ | 277 | #if !defined(HAVE_LCD_COLOR) || defined(IAUDIO_X5) |
278 | int contrast; /* lcd contrast */ | ||
279 | #endif | ||
278 | bool invert; /* invert display */ | 280 | bool invert; /* invert display */ |
279 | bool invert_cursor; /* invert the current file in dir browser and menu | 281 | bool invert_cursor; /* invert the current file in dir browser and menu |
280 | instead of using the default cursor */ | 282 | instead of using the default cursor */ |
@@ -573,16 +575,13 @@ extern const char rec_base_directory[]; | |||
573 | #ifdef IAUDIO_X5 | 575 | #ifdef IAUDIO_X5 |
574 | #define MIN_CONTRAST_SETTING 0 | 576 | #define MIN_CONTRAST_SETTING 0 |
575 | #define MAX_CONTRAST_SETTING 29 | 577 | #define MAX_CONTRAST_SETTING 29 |
576 | #else | 578 | #elif defined HAVE_LCD_CHARCELLS |
577 | #ifdef HAVE_LCD_CHARCELLS | 579 | #define MIN_CONTRAST_SETTING 5 |
578 | #define MAX_CONTRAST_SETTING 31 | 580 | #define MAX_CONTRAST_SETTING 31 |
579 | #define DEFAULT_CONTRAST_SETTING 30 | ||
580 | #else | 581 | #else |
582 | #define MIN_CONTRAST_SETTING 5 | ||
581 | #define MAX_CONTRAST_SETTING 63 | 583 | #define MAX_CONTRAST_SETTING 63 |
582 | #define DEFAULT_CONTRAST_SETTING 38 | ||
583 | #endif | 584 | #endif |
584 | #define MIN_CONTRAST_SETTING 5 | ||
585 | #endif // X5 | ||
586 | 585 | ||
587 | /* argument bits for settings_load() */ | 586 | /* argument bits for settings_load() */ |
588 | #define SETTINGS_RTC 1 /* only the settings from the RTC nonvolatile RAM */ | 587 | #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] = { | |||
72 | 100, 80, 64, 50, 40, 32, 25, 20, 16, 12, 10, 8, 6, 5, 4, 3 | 72 | 100, 80, 64, 50, 40, 32, 25, 20, 16, 12, 10, 8, 6, 5, 4, 3 |
73 | }; | 73 | }; |
74 | 74 | ||
75 | #ifndef TARGET_TREE | ||
76 | /* probably just a dummy */ | ||
77 | int lcd_default_contrast(void) | ||
78 | { | ||
79 | return 28; | ||
80 | } | ||
81 | #endif | ||
82 | |||
83 | /* LCD init */ | 75 | /* LCD init */ |
84 | void lcd_init(void) | 76 | void lcd_init(void) |
85 | { | 77 | { |
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) | |||
79 | sizeof(scroll_stack), scroll_name); | 79 | sizeof(scroll_stack), scroll_name); |
80 | } | 80 | } |
81 | 81 | ||
82 | int lcd_default_contrast(void) | ||
83 | { | ||
84 | #if defined(IPOD_MINI) || defined(IPOD_MINI2G) | ||
85 | return 42; | ||
86 | #else | ||
87 | return 35; | ||
88 | #endif | ||
89 | } | ||
90 | |||
91 | /*** parameter handling ***/ | 82 | /*** parameter handling ***/ |
92 | 83 | ||
93 | void lcd_set_drawmode(int mode) | 84 | 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] = { | |||
102 | 102 | ||
103 | /*** hardware configuration ***/ | 103 | /*** hardware configuration ***/ |
104 | 104 | ||
105 | #ifndef SIMULATOR | ||
106 | |||
105 | int lcd_default_contrast(void) | 107 | int lcd_default_contrast(void) |
106 | { | 108 | { |
107 | return 28; | 109 | return 28; |
108 | } | 110 | } |
109 | 111 | ||
110 | #ifndef SIMULATOR | ||
111 | |||
112 | void lcd_set_contrast(int val) | 112 | void lcd_set_contrast(int val) |
113 | { | 113 | { |
114 | lcd_write_command_ex(LCD_CNTL_ELECTRONIC_VOLUME, val, -1); | 114 | 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) | |||
146 | 146 | ||
147 | /*** hardware configuration ***/ | 147 | /*** hardware configuration ***/ |
148 | 148 | ||
149 | int lcd_default_contrast(void) | ||
150 | { | ||
151 | #if defined(IPOD_MINI) || defined(IPOD_MINI2G) | ||
152 | return 42; | ||
153 | #else | ||
154 | return 35; | ||
155 | #endif | ||
156 | } | ||
157 | |||
149 | /* Rockbox stores the contrast as 0..63 - we add 64 to it */ | 158 | /* Rockbox stores the contrast as 0..63 - we add 64 to it */ |
150 | void lcd_set_contrast(int val) | 159 | void lcd_set_contrast(int val) |
151 | { | 160 | { |
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) | |||
274 | return false; | 274 | return false; |
275 | } | 275 | } |
276 | 276 | ||
277 | int lcd_default_contrast(void) | ||
278 | { | ||
279 | return 30; | ||
280 | } | ||
281 | |||
282 | void lcd_clear_display(void) | 277 | void lcd_clear_display(void) |
283 | { | 278 | { |
284 | int i; | 279 | int i; |
@@ -483,6 +478,11 @@ void lcd_icon(int icon, bool enable) | |||
483 | lcd_write_data(&icon_mirror[pos], 1); | 478 | lcd_write_data(&icon_mirror[pos], 1); |
484 | } | 479 | } |
485 | 480 | ||
481 | int lcd_default_contrast(void) | ||
482 | { | ||
483 | return 30; | ||
484 | } | ||
485 | |||
486 | void lcd_set_contrast(int val) | 486 | void lcd_set_contrast(int val) |
487 | { | 487 | { |
488 | lcd_data_byte = (unsigned char) (31 - val); | 488 | 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 ) | |||
157 | 157 | ||
158 | /*** hardware configuration ***/ | 158 | /*** hardware configuration ***/ |
159 | 159 | ||
160 | #ifndef SIMULATOR | ||
161 | |||
160 | int lcd_default_contrast(void) | 162 | int lcd_default_contrast(void) |
161 | { | 163 | { |
162 | #ifdef SIMULATOR | 164 | #if CONFIG_LCD == LCD_GMINI100 |
163 | return 30; | ||
164 | #elif CONFIG_LCD == LCD_GMINI100 | ||
165 | return 31; | 165 | return 31; |
166 | #elif CONFIG_LCD == LCD_IFP7XX | 166 | #elif CONFIG_LCD == LCD_IFP7XX |
167 | return 45; | 167 | return 45; |
@@ -170,8 +170,6 @@ int lcd_default_contrast(void) | |||
170 | #endif | 170 | #endif |
171 | } | 171 | } |
172 | 172 | ||
173 | #ifndef SIMULATOR | ||
174 | |||
175 | void lcd_set_contrast(int val) | 173 | void lcd_set_contrast(int val) |
176 | { | 174 | { |
177 | lcd_write_command(LCD_CNTL_CONTRAST); | 175 | 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) | |||
53 | (void)invert; | 53 | (void)invert; |
54 | } | 54 | } |
55 | 55 | ||
56 | void lcd_remote_set_invert_display(bool invert) | 56 | int lcd_default_contrast(void) |
57 | { | 57 | { |
58 | (void)invert; | 58 | return 28; |
59 | } | 59 | } |
60 | 60 | ||
61 | #ifdef HAVE_REMOTE_LCD | 61 | #ifdef HAVE_REMOTE_LCD |
@@ -76,4 +76,9 @@ void lcd_remote_set_flip(bool yesno) | |||
76 | { | 76 | { |
77 | (void)yesno; | 77 | (void)yesno; |
78 | } | 78 | } |
79 | |||
80 | void lcd_remote_set_invert_display(bool invert) | ||
81 | { | ||
82 | (void)invert; | ||
83 | } | ||
79 | #endif | 84 | #endif |