diff options
Diffstat (limited to 'firmware')
117 files changed, 203 insertions, 322 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES index cc1dca3557..a68d10ec76 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -50,9 +50,7 @@ panic.c | |||
50 | #ifdef HAVE_SDL | 50 | #ifdef HAVE_SDL |
51 | target/hosted/sdl/button-sdl.c | 51 | target/hosted/sdl/button-sdl.c |
52 | target/hosted/sdl/kernel-sdl.c | 52 | target/hosted/sdl/kernel-sdl.c |
53 | #ifdef HAVE_LCD_BITMAP | ||
54 | target/hosted/sdl/lcd-bitmap.c | 53 | target/hosted/sdl/lcd-bitmap.c |
55 | #endif | ||
56 | #ifdef HAVE_REMOTE_LCD | 54 | #ifdef HAVE_REMOTE_LCD |
57 | target/hosted/sdl/lcd-remote-bitmap.c | 55 | target/hosted/sdl/lcd-remote-bitmap.c |
58 | #endif | 56 | #endif |
@@ -253,7 +251,6 @@ common/vuprintf.c | |||
253 | /* Display */ | 251 | /* Display */ |
254 | scroll_engine.c | 252 | scroll_engine.c |
255 | 253 | ||
256 | #ifdef HAVE_LCD_BITMAP | ||
257 | arabjoin.c | 254 | arabjoin.c |
258 | bidi.c | 255 | bidi.c |
259 | font_cache.c | 256 | font_cache.c |
@@ -283,7 +280,6 @@ drivers/lcd-16bit.c | |||
283 | drivers/lcd-24bit.c | 280 | drivers/lcd-24bit.c |
284 | #endif /* LCD_DEPTH */ | 281 | #endif /* LCD_DEPTH */ |
285 | common/diacritic.c | 282 | common/diacritic.c |
286 | #endif /* HAVE_LCD_BITMAP */ | ||
287 | 283 | ||
288 | #ifdef HAVE_REMOTE_LCD | 284 | #ifdef HAVE_REMOTE_LCD |
289 | #if LCD_REMOTE_DEPTH == 1 | 285 | #if LCD_REMOTE_DEPTH == 1 |
diff --git a/firmware/common/unicode.c b/firmware/common/unicode.c index eb0af7092c..f0f663f712 100644 --- a/firmware/common/unicode.c +++ b/firmware/common/unicode.c | |||
@@ -88,8 +88,6 @@ struct cp_info | |||
88 | const char *name; | 88 | const char *name; |
89 | }; | 89 | }; |
90 | 90 | ||
91 | #ifdef HAVE_LCD_BITMAP | ||
92 | |||
93 | #define MAX_CP_TABLE_SIZE 32768 | 91 | #define MAX_CP_TABLE_SIZE 32768 |
94 | 92 | ||
95 | #define CPF_ISO "iso.cp" | 93 | #define CPF_ISO "iso.cp" |
@@ -118,27 +116,6 @@ static const struct cp_info cp_info[NUM_CODEPAGES+1] = | |||
118 | [UTF_8] = { CP_TID_NONE, NULL , "UTF-8" }, | 116 | [UTF_8] = { CP_TID_NONE, NULL , "UTF-8" }, |
119 | }; | 117 | }; |
120 | 118 | ||
121 | #else /* !HAVE_LCD_BITMAP, reduced support */ | ||
122 | |||
123 | #define MAX_CP_TABLE_SIZE 768 | ||
124 | |||
125 | #define CPF_ISOMINI "isomini.cp" | ||
126 | |||
127 | static const struct cp_info cp_info[NUM_CODEPAGES+1] = | ||
128 | { | ||
129 | [0 ... NUM_CODEPAGES] = { CP_TID_NONE, NULL , "unknown" }, | ||
130 | [ISO_8859_1] = { CP_TID_NONE, NULL , "ISO-8859-1" }, | ||
131 | [ISO_8859_7] = { CP_TID_ISO , CPF_ISOMINI, "ISO-8859-7" }, | ||
132 | [WIN_1251] = { CP_TID_ISO , CPF_ISOMINI, "CP1251" }, | ||
133 | [ISO_8859_9] = { CP_TID_ISO , CPF_ISOMINI, "ISO-8859-9" }, | ||
134 | [ISO_8859_2] = { CP_TID_ISO , CPF_ISOMINI, "ISO-8859-2" }, | ||
135 | [WIN_1250] = { CP_TID_ISO , CPF_ISOMINI, "CP1250" }, | ||
136 | [WIN_1252] = { CP_TID_ISO , CPF_ISOMINI, "CP1252" }, | ||
137 | [UTF_8] = { CP_TID_ISO , NULL , "UTF-8" }, | ||
138 | }; | ||
139 | |||
140 | #endif /* HAVE_LCD_BITMAP */ | ||
141 | |||
142 | static int default_cp = INIT_CODEPAGE; | 119 | static int default_cp = INIT_CODEPAGE; |
143 | static int default_cp_tid = CP_TID_NONE; | 120 | static int default_cp_tid = CP_TID_NONE; |
144 | static int default_cp_handle = 0; | 121 | static int default_cp_handle = 0; |
@@ -368,7 +345,6 @@ unsigned char* iso_decode(const unsigned char *iso, unsigned char *utf8, | |||
368 | ucs = table[tmp]; | 345 | ucs = table[tmp]; |
369 | break; | 346 | break; |
370 | 347 | ||
371 | #ifdef HAVE_LCD_BITMAP | ||
372 | case CP_TID_932: /* Japanese */ | 348 | case CP_TID_932: /* Japanese */ |
373 | if (*iso > 0xA0 && *iso < 0xE0) { | 349 | if (*iso > 0xA0 && *iso < 0xE0) { |
374 | tmp = *iso++ | (0xA100 - 0x8000); | 350 | tmp = *iso++ | (0xA100 - 0x8000); |
@@ -392,7 +368,6 @@ unsigned char* iso_decode(const unsigned char *iso, unsigned char *utf8, | |||
392 | ucs = table[tmp]; | 368 | ucs = table[tmp]; |
393 | count--; | 369 | count--; |
394 | break; | 370 | break; |
395 | #endif /* HAVE_LCD_BITMAP */ | ||
396 | 371 | ||
397 | default: | 372 | default: |
398 | ucs = *iso++; | 373 | ucs = *iso++; |
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c index c81b629f6d..f2408d891e 100644 --- a/firmware/drivers/button.c +++ b/firmware/drivers/button.c | |||
@@ -50,9 +50,7 @@ struct event_queue button_queue SHAREDBSS_ATTR; | |||
50 | static long lastbtn; /* Last valid button status */ | 50 | static long lastbtn; /* Last valid button status */ |
51 | static long last_read; /* Last button status, for debouncing/filtering */ | 51 | static long last_read; /* Last button status, for debouncing/filtering */ |
52 | static intptr_t button_data; /* data value from last message dequeued */ | 52 | static intptr_t button_data; /* data value from last message dequeued */ |
53 | #ifdef HAVE_LCD_BITMAP | ||
54 | static bool flipped; /* buttons can be flipped to match the LCD flip */ | 53 | static bool flipped; /* buttons can be flipped to match the LCD flip */ |
55 | #endif | ||
56 | #ifdef HAVE_BACKLIGHT | 54 | #ifdef HAVE_BACKLIGHT |
57 | static bool filter_first_keypress; | 55 | static bool filter_first_keypress; |
58 | #ifdef HAVE_REMOTE_LCD | 56 | #ifdef HAVE_REMOTE_LCD |
@@ -535,9 +533,7 @@ void button_init(void) | |||
535 | 533 | ||
536 | reset_poweroff_timer(); | 534 | reset_poweroff_timer(); |
537 | 535 | ||
538 | #ifdef HAVE_LCD_BITMAP | ||
539 | flipped = false; | 536 | flipped = false; |
540 | #endif | ||
541 | #ifdef HAVE_BACKLIGHT | 537 | #ifdef HAVE_BACKLIGHT |
542 | filter_first_keypress = false; | 538 | filter_first_keypress = false; |
543 | #ifdef HAVE_REMOTE_LCD | 539 | #ifdef HAVE_REMOTE_LCD |
diff --git a/firmware/drivers/lcd-scroll.c b/firmware/drivers/lcd-scroll.c index 7916556dfb..5d66788093 100644 --- a/firmware/drivers/lcd-scroll.c +++ b/firmware/drivers/lcd-scroll.c | |||
@@ -39,9 +39,7 @@ struct scroll_screen_info LCDFN(scroll_info) = | |||
39 | .ticks = 12, | 39 | .ticks = 12, |
40 | .delay = HZ/2, | 40 | .delay = HZ/2, |
41 | .bidir_limit = 50, | 41 | .bidir_limit = 50, |
42 | #ifdef HAVE_LCD_BITMAP | ||
43 | .step = 6, | 42 | .step = 6, |
44 | #endif | ||
45 | }; | 43 | }; |
46 | 44 | ||
47 | 45 | ||
@@ -100,12 +98,10 @@ void LCDFN(scroll_speed)(int speed) | |||
100 | LCDFN(scroll_info).ticks = scroll_tick_table[speed]; | 98 | LCDFN(scroll_info).ticks = scroll_tick_table[speed]; |
101 | } | 99 | } |
102 | 100 | ||
103 | #if defined(HAVE_LCD_BITMAP) | ||
104 | void LCDFN(scroll_step)(int step) | 101 | void LCDFN(scroll_step)(int step) |
105 | { | 102 | { |
106 | LCDFN(scroll_info).step = step; | 103 | LCDFN(scroll_info).step = step; |
107 | } | 104 | } |
108 | #endif | ||
109 | 105 | ||
110 | void LCDFN(scroll_delay)(int ms) | 106 | void LCDFN(scroll_delay)(int ms) |
111 | { | 107 | { |
@@ -162,7 +158,6 @@ bool LCDFN(scroll_now)(struct scrollinfo *s) | |||
162 | 158 | ||
163 | /* Stash and restore these three, so that the scroll_func | 159 | /* Stash and restore these three, so that the scroll_func |
164 | * can do whatever it likes without destroying the state */ | 160 | * can do whatever it likes without destroying the state */ |
165 | #ifdef HAVE_LCD_BITMAP | ||
166 | unsigned drawmode; | 161 | unsigned drawmode; |
167 | #if LCD_DEPTH > 1 | 162 | #if LCD_DEPTH > 1 |
168 | unsigned fg_pattern, bg_pattern; | 163 | unsigned fg_pattern, bg_pattern; |
@@ -170,18 +165,15 @@ bool LCDFN(scroll_now)(struct scrollinfo *s) | |||
170 | bg_pattern = s->vp->bg_pattern; | 165 | bg_pattern = s->vp->bg_pattern; |
171 | #endif | 166 | #endif |
172 | drawmode = s->vp->drawmode; | 167 | drawmode = s->vp->drawmode; |
173 | #endif | ||
174 | s->scroll_func(s); | 168 | s->scroll_func(s); |
175 | 169 | ||
176 | LCDFN(update_viewport_rect)(s->x, s->y, s->width, s->height); | 170 | LCDFN(update_viewport_rect)(s->x, s->y, s->width, s->height); |
177 | 171 | ||
178 | #ifdef HAVE_LCD_BITMAP | ||
179 | #if LCD_DEPTH > 1 | 172 | #if LCD_DEPTH > 1 |
180 | s->vp->fg_pattern = fg_pattern; | 173 | s->vp->fg_pattern = fg_pattern; |
181 | s->vp->bg_pattern = bg_pattern; | 174 | s->vp->bg_pattern = bg_pattern; |
182 | #endif | 175 | #endif |
183 | s->vp->drawmode = drawmode; | 176 | s->vp->drawmode = drawmode; |
184 | #endif | ||
185 | 177 | ||
186 | return ended; | 178 | return ended; |
187 | } | 179 | } |
@@ -216,12 +208,7 @@ static void LCDFN(scroll_worker)(void) | |||
216 | LCDFN(set_viewport)(s->vp); | 208 | LCDFN(set_viewport)(s->vp); |
217 | 209 | ||
218 | makedelay = false; | 210 | makedelay = false; |
219 | #ifdef HAVE_LCD_BITMAP | ||
220 | step = si->step; | 211 | step = si->step; |
221 | #else | ||
222 | step = 1; | ||
223 | #endif | ||
224 | |||
225 | 212 | ||
226 | if (s->backward) | 213 | if (s->backward) |
227 | s->offset -= step; | 214 | s->offset -= step; |
diff --git a/firmware/export/button.h b/firmware/export/button.h index 36b615f216..1745947230 100644 --- a/firmware/export/button.h +++ b/firmware/export/button.h | |||
@@ -59,9 +59,7 @@ int button_status(void); | |||
59 | int button_status_wdata(int *pdata); | 59 | int button_status_wdata(int *pdata); |
60 | #endif | 60 | #endif |
61 | void button_clear_queue(void); | 61 | void button_clear_queue(void); |
62 | #ifdef HAVE_LCD_BITMAP | ||
63 | void button_set_flip(bool flip); /* turn 180 degrees */ | 62 | void button_set_flip(bool flip); /* turn 180 degrees */ |
64 | #endif | ||
65 | #ifdef HAVE_BACKLIGHT | 63 | #ifdef HAVE_BACKLIGHT |
66 | void set_backlight_filter_keypress(bool value); | 64 | void set_backlight_filter_keypress(bool value); |
67 | #ifdef HAVE_REMOTE_LCD | 65 | #ifdef HAVE_REMOTE_LCD |
diff --git a/firmware/export/config.h b/firmware/export/config.h index e4397517db..65fdc6a03c 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -896,7 +896,7 @@ Lyre prototype 1 */ | |||
896 | #endif | 896 | #endif |
897 | #endif | 897 | #endif |
898 | 898 | ||
899 | #if defined(HAVE_TAGCACHE) && defined(HAVE_LCD_BITMAP) | 899 | #if defined(HAVE_TAGCACHE) |
900 | #define HAVE_PICTUREFLOW_INTEGRATION | 900 | #define HAVE_PICTUREFLOW_INTEGRATION |
901 | #endif | 901 | #endif |
902 | 902 | ||
diff --git a/firmware/export/config/agptekrocker.h b/firmware/export/config/agptekrocker.h index 3d5565f1d9..b0ed88d113 100644 --- a/firmware/export/config/agptekrocker.h +++ b/firmware/export/config/agptekrocker.h | |||
@@ -17,8 +17,8 @@ | |||
17 | #define CONFIG_PLATFORM (PLATFORM_HOSTED) | 17 | #define CONFIG_PLATFORM (PLATFORM_HOSTED) |
18 | #endif | 18 | #endif |
19 | 19 | ||
20 | /* define this if you have a bitmap LCD display */ | 20 | |
21 | #define HAVE_LCD_BITMAP | 21 | |
22 | 22 | ||
23 | /* define this if you have a colour LCD */ | 23 | /* define this if you have a colour LCD */ |
24 | #define HAVE_LCD_COLOR | 24 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/android.h b/firmware/export/config/android.h index fa95ade999..8f91d21845 100644 --- a/firmware/export/config/android.h +++ b/firmware/export/config/android.h | |||
@@ -12,8 +12,8 @@ | |||
12 | 12 | ||
13 | #define USB_NONE | 13 | #define USB_NONE |
14 | 14 | ||
15 | /* define this if you have a bitmap LCD display */ | 15 | |
16 | #define HAVE_LCD_BITMAP | 16 | |
17 | 17 | ||
18 | /* define this if you have a colour LCD */ | 18 | /* define this if you have a colour LCD */ |
19 | #define HAVE_LCD_COLOR | 19 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/cowond2.h b/firmware/export/config/cowond2.h index f0e117dd7a..81a2a85018 100644 --- a/firmware/export/config/cowond2.h +++ b/firmware/export/config/cowond2.h | |||
@@ -24,8 +24,8 @@ | |||
24 | explicitly if different */ | 24 | explicitly if different */ |
25 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_FMRADIO) | 25 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_FMRADIO) |
26 | 26 | ||
27 | /* define this if you have a bitmap LCD display */ | 27 | |
28 | #define HAVE_LCD_BITMAP | 28 | |
29 | 29 | ||
30 | /* define this if you have a colour LCD */ | 30 | /* define this if you have a colour LCD */ |
31 | #define HAVE_LCD_COLOR | 31 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/creativezen.h b/firmware/export/config/creativezen.h index 234556dd23..2592325160 100644 --- a/firmware/export/config/creativezen.h +++ b/firmware/export/config/creativezen.h | |||
@@ -27,8 +27,8 @@ | |||
27 | explicitly if different */ | 27 | explicitly if different */ |
28 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) | 28 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) |
29 | 29 | ||
30 | /* define this if you have a bitmap LCD display */ | 30 | |
31 | #define HAVE_LCD_BITMAP | 31 | |
32 | /* define this if you have a colour LCD */ | 32 | /* define this if you have a colour LCD */ |
33 | #define HAVE_LCD_COLOR | 33 | #define HAVE_LCD_COLOR |
34 | 34 | ||
diff --git a/firmware/export/config/creativezenmozaic.h b/firmware/export/config/creativezenmozaic.h index c8397f26bb..0ffe8ed45b 100644 --- a/firmware/export/config/creativezenmozaic.h +++ b/firmware/export/config/creativezenmozaic.h | |||
@@ -25,8 +25,8 @@ | |||
25 | explicitly if different */ | 25 | explicitly if different */ |
26 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) | 26 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) |
27 | 27 | ||
28 | /* define this if you have a bitmap LCD display */ | 28 | |
29 | #define HAVE_LCD_BITMAP | 29 | |
30 | /* define this if you have a colour LCD */ | 30 | /* define this if you have a colour LCD */ |
31 | #define HAVE_LCD_COLOR | 31 | #define HAVE_LCD_COLOR |
32 | 32 | ||
diff --git a/firmware/export/config/creativezenv.h b/firmware/export/config/creativezenv.h index fcdc39242f..288c2aecbd 100644 --- a/firmware/export/config/creativezenv.h +++ b/firmware/export/config/creativezenv.h | |||
@@ -25,8 +25,8 @@ | |||
25 | explicitly if different */ | 25 | explicitly if different */ |
26 | #define INPUT_SRC_CAPS SRC_CAP_MIC | 26 | #define INPUT_SRC_CAPS SRC_CAP_MIC |
27 | 27 | ||
28 | /* define this if you have a bitmap LCD display */ | 28 | |
29 | #define HAVE_LCD_BITMAP | 29 | |
30 | /* define this if you have a colour LCD */ | 30 | /* define this if you have a colour LCD */ |
31 | #define HAVE_LCD_COLOR | 31 | #define HAVE_LCD_COLOR |
32 | 32 | ||
diff --git a/firmware/export/config/creativezenxfi.h b/firmware/export/config/creativezenxfi.h index 2eb747687a..977e11feff 100644 --- a/firmware/export/config/creativezenxfi.h +++ b/firmware/export/config/creativezenxfi.h | |||
@@ -25,8 +25,8 @@ | |||
25 | explicitly if different */ | 25 | explicitly if different */ |
26 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) | 26 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) |
27 | 27 | ||
28 | /* define this if you have a bitmap LCD display */ | 28 | |
29 | #define HAVE_LCD_BITMAP | 29 | |
30 | /* define this if you have a colour LCD */ | 30 | /* define this if you have a colour LCD */ |
31 | #define HAVE_LCD_COLOR | 31 | #define HAVE_LCD_COLOR |
32 | 32 | ||
diff --git a/firmware/export/config/creativezenxfi2.h b/firmware/export/config/creativezenxfi2.h index 9e5c748cd9..3a14017bf2 100644 --- a/firmware/export/config/creativezenxfi2.h +++ b/firmware/export/config/creativezenxfi2.h | |||
@@ -27,8 +27,8 @@ | |||
27 | explicitly if different */ | 27 | explicitly if different */ |
28 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) | 28 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) |
29 | 29 | ||
30 | /* define this if you have a bitmap LCD display */ | 30 | |
31 | #define HAVE_LCD_BITMAP | 31 | |
32 | /* define this if you have a colour LCD */ | 32 | /* define this if you have a colour LCD */ |
33 | #define HAVE_LCD_COLOR | 33 | #define HAVE_LCD_COLOR |
34 | 34 | ||
diff --git a/firmware/export/config/creativezenxfi3.h b/firmware/export/config/creativezenxfi3.h index a3626800bd..5139de0588 100644 --- a/firmware/export/config/creativezenxfi3.h +++ b/firmware/export/config/creativezenxfi3.h | |||
@@ -27,8 +27,8 @@ | |||
27 | explicitly if different */ | 27 | explicitly if different */ |
28 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) | 28 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) |
29 | 29 | ||
30 | /* define this if you have a bitmap LCD display */ | 30 | |
31 | #define HAVE_LCD_BITMAP | 31 | |
32 | /* define this if you have a colour LCD */ | 32 | /* define this if you have a colour LCD */ |
33 | #define HAVE_LCD_COLOR | 33 | #define HAVE_LCD_COLOR |
34 | 34 | ||
diff --git a/firmware/export/config/creativezenxfistyle.h b/firmware/export/config/creativezenxfistyle.h index afb2b18db4..41f5ce97b8 100644 --- a/firmware/export/config/creativezenxfistyle.h +++ b/firmware/export/config/creativezenxfistyle.h | |||
@@ -25,8 +25,8 @@ | |||
25 | explicitly if different */ | 25 | explicitly if different */ |
26 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) | 26 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) |
27 | 27 | ||
28 | /* define this if you have a bitmap LCD display */ | 28 | |
29 | #define HAVE_LCD_BITMAP | 29 | |
30 | /* define this if you have a colour LCD */ | 30 | /* define this if you have a colour LCD */ |
31 | #define HAVE_LCD_COLOR | 31 | #define HAVE_LCD_COLOR |
32 | 32 | ||
diff --git a/firmware/export/config/creativezv.h b/firmware/export/config/creativezv.h index a38c72afaa..54312e9071 100644 --- a/firmware/export/config/creativezv.h +++ b/firmware/export/config/creativezv.h | |||
@@ -41,8 +41,8 @@ | |||
41 | /*define this if the ATA controller and method of USB access support LBA48 */ | 41 | /*define this if the ATA controller and method of USB access support LBA48 */ |
42 | #define HAVE_LBA48 | 42 | #define HAVE_LBA48 |
43 | 43 | ||
44 | /* define this if you have a bitmap LCD display */ | 44 | |
45 | #define HAVE_LCD_BITMAP | 45 | |
46 | 46 | ||
47 | /* define this if you have a colour LCD */ | 47 | /* define this if you have a colour LCD */ |
48 | #define HAVE_LCD_COLOR | 48 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/gigabeatfx.h b/firmware/export/config/gigabeatfx.h index 2382cb9d43..738d7a8eec 100644 --- a/firmware/export/config/gigabeatfx.h +++ b/firmware/export/config/gigabeatfx.h | |||
@@ -15,8 +15,8 @@ | |||
15 | /*define this if the ATA controller and method of USB access support LBA48 */ | 15 | /*define this if the ATA controller and method of USB access support LBA48 */ |
16 | #define HAVE_LBA48 | 16 | #define HAVE_LBA48 |
17 | 17 | ||
18 | /* define this if you have a bitmap LCD display */ | 18 | |
19 | #define HAVE_LCD_BITMAP | 19 | |
20 | 20 | ||
21 | /* define this if you have a colour LCD */ | 21 | /* define this if you have a colour LCD */ |
22 | #define HAVE_LCD_COLOR | 22 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/gigabeats.h b/firmware/export/config/gigabeats.h index 1a60fff38f..ba71c5a400 100644 --- a/firmware/export/config/gigabeats.h +++ b/firmware/export/config/gigabeats.h | |||
@@ -22,8 +22,8 @@ | |||
22 | /*define this if the ATA controller and method of USB access support LBA48 */ | 22 | /*define this if the ATA controller and method of USB access support LBA48 */ |
23 | #define HAVE_LBA48 | 23 | #define HAVE_LBA48 |
24 | 24 | ||
25 | /* define this if you have a bitmap LCD display */ | 25 | |
26 | #define HAVE_LCD_BITMAP | 26 | |
27 | 27 | ||
28 | /* define this if you have a colour LCD */ | 28 | /* define this if you have a colour LCD */ |
29 | #define HAVE_LCD_COLOR | 29 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/gogearhdd1630.h b/firmware/export/config/gogearhdd1630.h index 4a4f7b10d4..e1e40cee0b 100644 --- a/firmware/export/config/gogearhdd1630.h +++ b/firmware/export/config/gogearhdd1630.h | |||
@@ -27,8 +27,8 @@ | |||
27 | #define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ | 27 | #define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ |
28 | SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) | 28 | SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) |
29 | 29 | ||
30 | /* define this if you have a bitmap LCD display */ | 30 | |
31 | #define HAVE_LCD_BITMAP | 31 | |
32 | 32 | ||
33 | /* define this if you have a colour LCD */ | 33 | /* define this if you have a colour LCD */ |
34 | #define HAVE_LCD_COLOR | 34 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/gogearhdd6330.h b/firmware/export/config/gogearhdd6330.h index 921ca637f2..964e725184 100644 --- a/firmware/export/config/gogearhdd6330.h +++ b/firmware/export/config/gogearhdd6330.h | |||
@@ -27,8 +27,8 @@ | |||
27 | #define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ | 27 | #define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ |
28 | SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) | 28 | SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) |
29 | 29 | ||
30 | /* define this if you have a bitmap LCD display */ | 30 | |
31 | #define HAVE_LCD_BITMAP | 31 | |
32 | 32 | ||
33 | /* define this if you have a colour LCD */ | 33 | /* define this if you have a colour LCD */ |
34 | #define HAVE_LCD_COLOR | 34 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/gogearsa9200.h b/firmware/export/config/gogearsa9200.h index c1aeb527cd..0a4dbad006 100644 --- a/firmware/export/config/gogearsa9200.h +++ b/firmware/export/config/gogearsa9200.h | |||
@@ -8,8 +8,8 @@ | |||
8 | 8 | ||
9 | #define HW_SAMPR_CAPS (SAMPR_CAP_44) | 9 | #define HW_SAMPR_CAPS (SAMPR_CAP_44) |
10 | 10 | ||
11 | /* define this if you have a bitmap LCD display */ | 11 | |
12 | #define HAVE_LCD_BITMAP | 12 | |
13 | 13 | ||
14 | /* define this if you have a colour LCD */ | 14 | /* define this if you have a colour LCD */ |
15 | #define HAVE_LCD_COLOR | 15 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/hifietma8.h b/firmware/export/config/hifietma8.h index 48c4145c80..a9b94227d8 100644 --- a/firmware/export/config/hifietma8.h +++ b/firmware/export/config/hifietma8.h | |||
@@ -15,8 +15,8 @@ | |||
15 | #define HAVE_PCM1792_CODEC | 15 | #define HAVE_PCM1792_CODEC |
16 | 16 | ||
17 | #define CODEC_SLAVE | 17 | #define CODEC_SLAVE |
18 | /* define this if you have a bitmap LCD display */ | 18 | |
19 | #define HAVE_LCD_BITMAP | 19 | |
20 | 20 | ||
21 | /* define this if you can flip your LCD */ | 21 | /* define this if you can flip your LCD */ |
22 | /* #define HAVE_LCD_FLIP */ | 22 | /* #define HAVE_LCD_FLIP */ |
diff --git a/firmware/export/config/hifietma8c.h b/firmware/export/config/hifietma8c.h index 72b5ea7ee4..009c4ee353 100644 --- a/firmware/export/config/hifietma8c.h +++ b/firmware/export/config/hifietma8c.h | |||
@@ -15,8 +15,8 @@ | |||
15 | #define HAVE_PCM1792_CODEC | 15 | #define HAVE_PCM1792_CODEC |
16 | 16 | ||
17 | #define CODEC_SLAVE | 17 | #define CODEC_SLAVE |
18 | /* define this if you have a bitmap LCD display */ | 18 | |
19 | #define HAVE_LCD_BITMAP | 19 | |
20 | 20 | ||
21 | /* define this if you can flip your LCD */ | 21 | /* define this if you can flip your LCD */ |
22 | /* #define HAVE_LCD_FLIP */ | 22 | /* #define HAVE_LCD_FLIP */ |
diff --git a/firmware/export/config/hifietma9.h b/firmware/export/config/hifietma9.h index 6b96afde08..454b3b17ff 100644 --- a/firmware/export/config/hifietma9.h +++ b/firmware/export/config/hifietma9.h | |||
@@ -15,8 +15,8 @@ | |||
15 | #define HAVE_DF1704_CODEC | 15 | #define HAVE_DF1704_CODEC |
16 | 16 | ||
17 | #define CODEC_SLAVE | 17 | #define CODEC_SLAVE |
18 | /* define this if you have a bitmap LCD display */ | 18 | |
19 | #define HAVE_LCD_BITMAP | 19 | |
20 | 20 | ||
21 | /* define this if you can flip your LCD */ | 21 | /* define this if you can flip your LCD */ |
22 | /* #define HAVE_LCD_FLIP */ | 22 | /* #define HAVE_LCD_FLIP */ |
diff --git a/firmware/export/config/hifietma9c.h b/firmware/export/config/hifietma9c.h index 5bdb28cd6e..e9817e40d6 100644 --- a/firmware/export/config/hifietma9c.h +++ b/firmware/export/config/hifietma9c.h | |||
@@ -15,8 +15,8 @@ | |||
15 | #define HAVE_DF1704_CODEC | 15 | #define HAVE_DF1704_CODEC |
16 | 16 | ||
17 | #define CODEC_SLAVE | 17 | #define CODEC_SLAVE |
18 | /* define this if you have a bitmap LCD display */ | 18 | |
19 | #define HAVE_LCD_BITMAP | 19 | |
20 | 20 | ||
21 | /* define this if you can flip your LCD */ | 21 | /* define this if you can flip your LCD */ |
22 | /* #define HAVE_LCD_FLIP */ | 22 | /* #define HAVE_LCD_FLIP */ |
diff --git a/firmware/export/config/hifimanhm60x.h b/firmware/export/config/hifimanhm60x.h index fc718ba935..84f65f1c81 100644 --- a/firmware/export/config/hifimanhm60x.h +++ b/firmware/export/config/hifimanhm60x.h | |||
@@ -18,8 +18,8 @@ | |||
18 | 18 | ||
19 | #define HAVE_DUMMY_CODEC | 19 | #define HAVE_DUMMY_CODEC |
20 | #define CODEC_SLAVE | 20 | #define CODEC_SLAVE |
21 | /* define this if you have a bitmap LCD display */ | 21 | |
22 | #define HAVE_LCD_BITMAP | 22 | |
23 | 23 | ||
24 | /* define this if you can flip your LCD */ | 24 | /* define this if you can flip your LCD */ |
25 | /* #define HAVE_LCD_FLIP */ | 25 | /* #define HAVE_LCD_FLIP */ |
diff --git a/firmware/export/config/hifimanhm801.h b/firmware/export/config/hifimanhm801.h index 049c4a40b5..0879cd2980 100644 --- a/firmware/export/config/hifimanhm801.h +++ b/firmware/export/config/hifimanhm801.h | |||
@@ -15,8 +15,8 @@ | |||
15 | 15 | ||
16 | #define HAVE_DUMMY_CODEC | 16 | #define HAVE_DUMMY_CODEC |
17 | #define CODEC_SLAVE | 17 | #define CODEC_SLAVE |
18 | /* define this if you have a bitmap LCD display */ | 18 | |
19 | #define HAVE_LCD_BITMAP | 19 | |
20 | 20 | ||
21 | /* define this if you can flip your LCD */ | 21 | /* define this if you can flip your LCD */ |
22 | /* #define HAVE_LCD_FLIP */ | 22 | /* #define HAVE_LCD_FLIP */ |
diff --git a/firmware/export/config/iaudio7.h b/firmware/export/config/iaudio7.h index 0cc8b19787..698ff13724 100644 --- a/firmware/export/config/iaudio7.h +++ b/firmware/export/config/iaudio7.h | |||
@@ -26,8 +26,8 @@ | |||
26 | /* define the bitmask of recording sample rates */ | 26 | /* define the bitmask of recording sample rates */ |
27 | #define REC_SAMPR_CAPS (SAMPR_CAP_44/* | SAMPR_CAP_22 | SAMPR_CAP_11*/) | 27 | #define REC_SAMPR_CAPS (SAMPR_CAP_44/* | SAMPR_CAP_22 | SAMPR_CAP_11*/) |
28 | 28 | ||
29 | /* define this if you have a bitmap LCD display */ | 29 | |
30 | #define HAVE_LCD_BITMAP | 30 | |
31 | 31 | ||
32 | /* define this if you have a colour LCD */ | 32 | /* define this if you have a colour LCD */ |
33 | #define HAVE_LCD_COLOR | 33 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/iaudiom3.h b/firmware/export/config/iaudiom3.h index 06ada6b8d5..1ed31b4d46 100644 --- a/firmware/export/config/iaudiom3.h +++ b/firmware/export/config/iaudiom3.h | |||
@@ -26,8 +26,8 @@ | |||
26 | /* define the bitmask of recording sample rates */ | 26 | /* define the bitmask of recording sample rates */ |
27 | #define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) | 27 | #define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) |
28 | 28 | ||
29 | /* define this if you have a bitmap LCD display */ | 29 | |
30 | #define HAVE_LCD_BITMAP | 30 | |
31 | 31 | ||
32 | /* define this if you want album art for this target */ | 32 | /* define this if you want album art for this target */ |
33 | #define HAVE_ALBUMART | 33 | #define HAVE_ALBUMART |
diff --git a/firmware/export/config/iaudiom5.h b/firmware/export/config/iaudiom5.h index 9619fd36bb..a597590508 100644 --- a/firmware/export/config/iaudiom5.h +++ b/firmware/export/config/iaudiom5.h | |||
@@ -30,8 +30,8 @@ | |||
30 | /* define the bitmask of recording sample rates */ | 30 | /* define the bitmask of recording sample rates */ |
31 | #define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) | 31 | #define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) |
32 | 32 | ||
33 | /* define this if you have a bitmap LCD display */ | 33 | |
34 | #define HAVE_LCD_BITMAP | 34 | |
35 | 35 | ||
36 | /* define this if you want album art for this target */ | 36 | /* define this if you want album art for this target */ |
37 | #define HAVE_ALBUMART | 37 | #define HAVE_ALBUMART |
diff --git a/firmware/export/config/iaudiox5.h b/firmware/export/config/iaudiox5.h index 0b520bf12c..fc97f71813 100644 --- a/firmware/export/config/iaudiox5.h +++ b/firmware/export/config/iaudiox5.h | |||
@@ -26,8 +26,8 @@ | |||
26 | /* define the bitmask of recording sample rates */ | 26 | /* define the bitmask of recording sample rates */ |
27 | #define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) | 27 | #define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) |
28 | 28 | ||
29 | /* define this if you have a bitmap LCD display */ | 29 | |
30 | #define HAVE_LCD_BITMAP | 30 | |
31 | 31 | ||
32 | /* define this if you can flip your LCD */ | 32 | /* define this if you can flip your LCD */ |
33 | #define HAVE_LCD_FLIP | 33 | #define HAVE_LCD_FLIP |
diff --git a/firmware/export/config/ibassodx50.h b/firmware/export/config/ibassodx50.h index 9ebad8b120..9f5e343978 100644 --- a/firmware/export/config/ibassodx50.h +++ b/firmware/export/config/ibassodx50.h | |||
@@ -33,8 +33,8 @@ | |||
33 | 33 | ||
34 | #define USB_NONE | 34 | #define USB_NONE |
35 | 35 | ||
36 | /* define this if you have a bitmap LCD display */ | 36 | |
37 | #define HAVE_LCD_BITMAP | 37 | |
38 | 38 | ||
39 | /* define this if you have a colour LCD */ | 39 | /* define this if you have a colour LCD */ |
40 | #define HAVE_LCD_COLOR | 40 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/ibassodx90.h b/firmware/export/config/ibassodx90.h index 7f8b3725c8..8155cec5aa 100644 --- a/firmware/export/config/ibassodx90.h +++ b/firmware/export/config/ibassodx90.h | |||
@@ -33,8 +33,8 @@ | |||
33 | 33 | ||
34 | #define USB_NONE | 34 | #define USB_NONE |
35 | 35 | ||
36 | /* define this if you have a bitmap LCD display */ | 36 | |
37 | #define HAVE_LCD_BITMAP | 37 | |
38 | 38 | ||
39 | /* define this if you have a colour LCD */ | 39 | /* define this if you have a colour LCD */ |
40 | #define HAVE_LCD_COLOR | 40 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/ihifi760.h b/firmware/export/config/ihifi760.h index 06ed3640a3..d58d6b9dfb 100644 --- a/firmware/export/config/ihifi760.h +++ b/firmware/export/config/ihifi760.h | |||
@@ -18,8 +18,8 @@ | |||
18 | 18 | ||
19 | #define HAVE_DUMMY_CODEC | 19 | #define HAVE_DUMMY_CODEC |
20 | #define CODEC_SLAVE | 20 | #define CODEC_SLAVE |
21 | /* define this if you have a bitmap LCD display */ | 21 | |
22 | #define HAVE_LCD_BITMAP | 22 | |
23 | 23 | ||
24 | /* define this if you can flip your LCD */ | 24 | /* define this if you can flip your LCD */ |
25 | /* #define HAVE_LCD_FLIP */ | 25 | /* #define HAVE_LCD_FLIP */ |
diff --git a/firmware/export/config/ihifi770.h b/firmware/export/config/ihifi770.h index f2c28bee2d..60bf4c844d 100644 --- a/firmware/export/config/ihifi770.h +++ b/firmware/export/config/ihifi770.h | |||
@@ -19,8 +19,8 @@ | |||
19 | #define HAVE_WM8740 | 19 | #define HAVE_WM8740 |
20 | #define CODEC_SLAVE | 20 | #define CODEC_SLAVE |
21 | 21 | ||
22 | /* define this if you have a bitmap LCD display */ | 22 | |
23 | #define HAVE_LCD_BITMAP | 23 | |
24 | 24 | ||
25 | /* define this if you can flip your LCD */ | 25 | /* define this if you can flip your LCD */ |
26 | /* #define HAVE_LCD_FLIP */ | 26 | /* #define HAVE_LCD_FLIP */ |
diff --git a/firmware/export/config/ihifi770c.h b/firmware/export/config/ihifi770c.h index 589ef44046..087557e24b 100644 --- a/firmware/export/config/ihifi770c.h +++ b/firmware/export/config/ihifi770c.h | |||
@@ -19,8 +19,8 @@ | |||
19 | #define HAVE_WM8740 | 19 | #define HAVE_WM8740 |
20 | #define CODEC_SLAVE | 20 | #define CODEC_SLAVE |
21 | 21 | ||
22 | /* define this if you have a bitmap LCD display */ | 22 | |
23 | #define HAVE_LCD_BITMAP | 23 | |
24 | 24 | ||
25 | /* define this if you can flip your LCD */ | 25 | /* define this if you can flip your LCD */ |
26 | /* #define HAVE_LCD_FLIP */ | 26 | /* #define HAVE_LCD_FLIP */ |
diff --git a/firmware/export/config/ihifi800.h b/firmware/export/config/ihifi800.h index 9ee488111c..be68b49abf 100644 --- a/firmware/export/config/ihifi800.h +++ b/firmware/export/config/ihifi800.h | |||
@@ -19,8 +19,8 @@ | |||
19 | #define HAVE_ES9018 | 19 | #define HAVE_ES9018 |
20 | #define CODEC_SLAVE | 20 | #define CODEC_SLAVE |
21 | 21 | ||
22 | /* define this if you have a bitmap LCD display */ | 22 | |
23 | #define HAVE_LCD_BITMAP | 23 | |
24 | 24 | ||
25 | /* define this if you can flip your LCD */ | 25 | /* define this if you can flip your LCD */ |
26 | /* #define HAVE_LCD_FLIP */ | 26 | /* #define HAVE_LCD_FLIP */ |
diff --git a/firmware/export/config/ihifi960.h b/firmware/export/config/ihifi960.h index 9b0c1fe7e2..9f8b3ef443 100644 --- a/firmware/export/config/ihifi960.h +++ b/firmware/export/config/ihifi960.h | |||
@@ -18,8 +18,8 @@ | |||
18 | 18 | ||
19 | #define HAVE_DUMMY_CODEC | 19 | #define HAVE_DUMMY_CODEC |
20 | #define CODEC_SLAVE | 20 | #define CODEC_SLAVE |
21 | /* define this if you have a bitmap LCD display */ | 21 | |
22 | #define HAVE_LCD_BITMAP | 22 | |
23 | 23 | ||
24 | /* define this if you can flip your LCD */ | 24 | /* define this if you can flip your LCD */ |
25 | /* #define HAVE_LCD_FLIP */ | 25 | /* #define HAVE_LCD_FLIP */ |
diff --git a/firmware/export/config/ipod1g2g.h b/firmware/export/config/ipod1g2g.h index 5dfac2e0c3..057b0fab48 100644 --- a/firmware/export/config/ipod1g2g.h +++ b/firmware/export/config/ipod1g2g.h | |||
@@ -26,8 +26,8 @@ | |||
26 | #define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ | 26 | #define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ |
27 | SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) */ | 27 | SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) */ |
28 | 28 | ||
29 | /* define this if you have a bitmap LCD display */ | 29 | |
30 | #define HAVE_LCD_BITMAP | 30 | |
31 | 31 | ||
32 | /* define this if you want album art for this target */ | 32 | /* define this if you want album art for this target */ |
33 | #define HAVE_ALBUMART | 33 | #define HAVE_ALBUMART |
diff --git a/firmware/export/config/ipod3g.h b/firmware/export/config/ipod3g.h index 3914d9f654..ae94ea7d63 100644 --- a/firmware/export/config/ipod3g.h +++ b/firmware/export/config/ipod3g.h | |||
@@ -26,8 +26,8 @@ | |||
26 | #define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ | 26 | #define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ |
27 | SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) */ | 27 | SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) */ |
28 | 28 | ||
29 | /* define this if you have a bitmap LCD display */ | 29 | |
30 | #define HAVE_LCD_BITMAP | 30 | |
31 | 31 | ||
32 | /* define this if you want album art for this target */ | 32 | /* define this if you want album art for this target */ |
33 | #define HAVE_ALBUMART | 33 | #define HAVE_ALBUMART |
diff --git a/firmware/export/config/ipod4g.h b/firmware/export/config/ipod4g.h index e838174701..49996c4eee 100644 --- a/firmware/export/config/ipod4g.h +++ b/firmware/export/config/ipod4g.h | |||
@@ -28,8 +28,8 @@ | |||
28 | /* define the bitmask of recording sample rates */ | 28 | /* define the bitmask of recording sample rates */ |
29 | #define REC_SAMPR_CAPS (SAMPR_CAP_44) | 29 | #define REC_SAMPR_CAPS (SAMPR_CAP_44) |
30 | 30 | ||
31 | /* define this if you have a bitmap LCD display */ | 31 | |
32 | #define HAVE_LCD_BITMAP | 32 | |
33 | 33 | ||
34 | /* define this if you want album art for this target */ | 34 | /* define this if you want album art for this target */ |
35 | #define HAVE_ALBUMART | 35 | #define HAVE_ALBUMART |
diff --git a/firmware/export/config/ipod6g.h b/firmware/export/config/ipod6g.h index d3c4805389..cb3ab31139 100644 --- a/firmware/export/config/ipod6g.h +++ b/firmware/export/config/ipod6g.h | |||
@@ -38,8 +38,8 @@ | |||
38 | | SAMPR_CAP_48 | SAMPR_CAP_24 | SAMPR_CAP_12 \ | 38 | | SAMPR_CAP_48 | SAMPR_CAP_24 | SAMPR_CAP_12 \ |
39 | | SAMPR_CAP_32 | SAMPR_CAP_16 | SAMPR_CAP_8) | 39 | | SAMPR_CAP_32 | SAMPR_CAP_16 | SAMPR_CAP_8) |
40 | 40 | ||
41 | /* define this if you have a bitmap LCD display */ | 41 | |
42 | #define HAVE_LCD_BITMAP | 42 | |
43 | 43 | ||
44 | /* define this if you can flip your LCD */ | 44 | /* define this if you can flip your LCD */ |
45 | //#define HAVE_LCD_FLIP | 45 | //#define HAVE_LCD_FLIP |
diff --git a/firmware/export/config/ipodcolor.h b/firmware/export/config/ipodcolor.h index 6292b97d58..93bea58daa 100644 --- a/firmware/export/config/ipodcolor.h +++ b/firmware/export/config/ipodcolor.h | |||
@@ -28,8 +28,8 @@ | |||
28 | /* define the bitmask of recording sample rates */ | 28 | /* define the bitmask of recording sample rates */ |
29 | #define REC_SAMPR_CAPS (SAMPR_CAP_44) | 29 | #define REC_SAMPR_CAPS (SAMPR_CAP_44) |
30 | 30 | ||
31 | /* define this if you have a bitmap LCD display */ | 31 | |
32 | #define HAVE_LCD_BITMAP | 32 | |
33 | 33 | ||
34 | /* define this if you have a colour LCD */ | 34 | /* define this if you have a colour LCD */ |
35 | #define HAVE_LCD_COLOR | 35 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/ipodmini1g.h b/firmware/export/config/ipodmini1g.h index 84481550f1..abcf237aa9 100644 --- a/firmware/export/config/ipodmini1g.h +++ b/firmware/export/config/ipodmini1g.h | |||
@@ -28,8 +28,8 @@ | |||
28 | #define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ | 28 | #define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ |
29 | SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) */ | 29 | SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) */ |
30 | 30 | ||
31 | /* define this if you have a bitmap LCD display */ | 31 | |
32 | #define HAVE_LCD_BITMAP | 32 | |
33 | 33 | ||
34 | /* define this if you want album art for this target */ | 34 | /* define this if you want album art for this target */ |
35 | #define HAVE_ALBUMART | 35 | #define HAVE_ALBUMART |
diff --git a/firmware/export/config/ipodmini2g.h b/firmware/export/config/ipodmini2g.h index ffc566920d..f11681978c 100644 --- a/firmware/export/config/ipodmini2g.h +++ b/firmware/export/config/ipodmini2g.h | |||
@@ -28,8 +28,8 @@ | |||
28 | #define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ | 28 | #define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ |
29 | SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) */ | 29 | SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) */ |
30 | 30 | ||
31 | /* define this if you have a bitmap LCD display */ | 31 | |
32 | #define HAVE_LCD_BITMAP | 32 | |
33 | 33 | ||
34 | /* define this if you want album art for this target */ | 34 | /* define this if you want album art for this target */ |
35 | #define HAVE_ALBUMART | 35 | #define HAVE_ALBUMART |
diff --git a/firmware/export/config/ipodnano1g.h b/firmware/export/config/ipodnano1g.h index 8ca7544dbe..d919435cbd 100644 --- a/firmware/export/config/ipodnano1g.h +++ b/firmware/export/config/ipodnano1g.h | |||
@@ -28,8 +28,8 @@ | |||
28 | /* define the bitmask of recording sample rates */ | 28 | /* define the bitmask of recording sample rates */ |
29 | #define REC_SAMPR_CAPS (SAMPR_CAP_44) | 29 | #define REC_SAMPR_CAPS (SAMPR_CAP_44) |
30 | 30 | ||
31 | /* define this if you have a bitmap LCD display */ | 31 | |
32 | #define HAVE_LCD_BITMAP | 32 | |
33 | 33 | ||
34 | /* define this if you have a colour LCD */ | 34 | /* define this if you have a colour LCD */ |
35 | #define HAVE_LCD_COLOR | 35 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/ipodnano2g.h b/firmware/export/config/ipodnano2g.h index 362258a822..9445b2809a 100644 --- a/firmware/export/config/ipodnano2g.h +++ b/firmware/export/config/ipodnano2g.h | |||
@@ -26,8 +26,8 @@ | |||
26 | | SAMPR_CAP_96 | SAMPR_CAP_48 | SAMPR_CAP_24 | SAMPR_CAP_12 \ | 26 | | SAMPR_CAP_96 | SAMPR_CAP_48 | SAMPR_CAP_24 | SAMPR_CAP_12 \ |
27 | | SAMPR_CAP_64 | SAMPR_CAP_32 | SAMPR_CAP_16 | SAMPR_CAP_8) | 27 | | SAMPR_CAP_64 | SAMPR_CAP_32 | SAMPR_CAP_16 | SAMPR_CAP_8) |
28 | 28 | ||
29 | /* define this if you have a bitmap LCD display */ | 29 | |
30 | #define HAVE_LCD_BITMAP | 30 | |
31 | 31 | ||
32 | /* define this if you can flip your LCD */ | 32 | /* define this if you can flip your LCD */ |
33 | //#define HAVE_LCD_FLIP | 33 | //#define HAVE_LCD_FLIP |
diff --git a/firmware/export/config/ipodvideo.h b/firmware/export/config/ipodvideo.h index d48f7e3387..4385d74fda 100644 --- a/firmware/export/config/ipodvideo.h +++ b/firmware/export/config/ipodvideo.h | |||
@@ -30,8 +30,8 @@ | |||
30 | /* define the bitmask of recording sample rates */ | 30 | /* define the bitmask of recording sample rates */ |
31 | #define REC_SAMPR_CAPS HW_SAMPR_CAPS | 31 | #define REC_SAMPR_CAPS HW_SAMPR_CAPS |
32 | 32 | ||
33 | /* define this if you have a bitmap LCD display */ | 33 | |
34 | #define HAVE_LCD_BITMAP | 34 | |
35 | 35 | ||
36 | /* define this if you have a colour LCD */ | 36 | /* define this if you have a colour LCD */ |
37 | #define HAVE_LCD_COLOR | 37 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/iriverh10.h b/firmware/export/config/iriverh10.h index ed3157020a..91ed963b0b 100644 --- a/firmware/export/config/iriverh10.h +++ b/firmware/export/config/iriverh10.h | |||
@@ -26,8 +26,8 @@ | |||
26 | #define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ | 26 | #define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ |
27 | SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) | 27 | SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) |
28 | 28 | ||
29 | /* define this if you have a bitmap LCD display */ | 29 | |
30 | #define HAVE_LCD_BITMAP | 30 | |
31 | 31 | ||
32 | /* define this if you have a colour LCD */ | 32 | /* define this if you have a colour LCD */ |
33 | #define HAVE_LCD_COLOR | 33 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/iriverh100.h b/firmware/export/config/iriverh100.h index 798ee27f44..3cff24de4f 100644 --- a/firmware/export/config/iriverh100.h +++ b/firmware/export/config/iriverh100.h | |||
@@ -14,8 +14,8 @@ | |||
14 | /*define this if the ATA controller and method of USB access support LBA48 */ | 14 | /*define this if the ATA controller and method of USB access support LBA48 */ |
15 | #define HAVE_LBA48 | 15 | #define HAVE_LBA48 |
16 | 16 | ||
17 | /* define this if you have a bitmap LCD display */ | 17 | |
18 | #define HAVE_LCD_BITMAP | 18 | |
19 | 19 | ||
20 | /* define this if you want album art for this target */ | 20 | /* define this if you want album art for this target */ |
21 | #define HAVE_ALBUMART | 21 | #define HAVE_ALBUMART |
diff --git a/firmware/export/config/iriverh10_5gb.h b/firmware/export/config/iriverh10_5gb.h index b75e834a1f..d1ec64090e 100644 --- a/firmware/export/config/iriverh10_5gb.h +++ b/firmware/export/config/iriverh10_5gb.h | |||
@@ -26,8 +26,8 @@ | |||
26 | #define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ | 26 | #define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ |
27 | SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) | 27 | SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) |
28 | 28 | ||
29 | /* define this if you have a bitmap LCD display */ | 29 | |
30 | #define HAVE_LCD_BITMAP | 30 | |
31 | 31 | ||
32 | /* define this if you have a colour LCD */ | 32 | /* define this if you have a colour LCD */ |
33 | #define HAVE_LCD_COLOR | 33 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/iriverh120.h b/firmware/export/config/iriverh120.h index e1cfda768b..70670a0418 100644 --- a/firmware/export/config/iriverh120.h +++ b/firmware/export/config/iriverh120.h | |||
@@ -14,8 +14,8 @@ | |||
14 | /*define this if the ATA controller and method of USB access support LBA48 */ | 14 | /*define this if the ATA controller and method of USB access support LBA48 */ |
15 | #define HAVE_LBA48 | 15 | #define HAVE_LBA48 |
16 | 16 | ||
17 | /* define this if you have a bitmap LCD display */ | 17 | |
18 | #define HAVE_LCD_BITMAP | 18 | |
19 | 19 | ||
20 | /* define this if you want album art for this target */ | 20 | /* define this if you want album art for this target */ |
21 | #define HAVE_ALBUMART | 21 | #define HAVE_ALBUMART |
diff --git a/firmware/export/config/iriverh300.h b/firmware/export/config/iriverh300.h index 15c5448aed..e2f16d2b4e 100644 --- a/firmware/export/config/iriverh300.h +++ b/firmware/export/config/iriverh300.h | |||
@@ -14,8 +14,8 @@ | |||
14 | /*define this if the ATA controller and method of USB access support LBA48 */ | 14 | /*define this if the ATA controller and method of USB access support LBA48 */ |
15 | #define HAVE_LBA48 | 15 | #define HAVE_LBA48 |
16 | 16 | ||
17 | /* define this if you have a bitmap LCD display */ | 17 | |
18 | #define HAVE_LCD_BITMAP | 18 | |
19 | 19 | ||
20 | /* define this if you have a colour LCD */ | 20 | /* define this if you have a colour LCD */ |
21 | #define HAVE_LCD_COLOR | 21 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/iriverifp7xx.h b/firmware/export/config/iriverifp7xx.h index cb48d9713d..0db9a7810d 100644 --- a/firmware/export/config/iriverifp7xx.h +++ b/firmware/export/config/iriverifp7xx.h | |||
@@ -12,8 +12,8 @@ | |||
12 | /* define this if you have recording possibility */ | 12 | /* define this if you have recording possibility */ |
13 | /*#define HAVE_RECORDING*/ | 13 | /*#define HAVE_RECORDING*/ |
14 | 14 | ||
15 | /* define this if you have a bitmap LCD display */ | 15 | |
16 | #define HAVE_LCD_BITMAP | 16 | |
17 | 17 | ||
18 | /* define this if you would like tagcache to build on this target */ | 18 | /* define this if you would like tagcache to build on this target */ |
19 | /* #define HAVE_TAGCACHE */ | 19 | /* #define HAVE_TAGCACHE */ |
diff --git a/firmware/export/config/logikdax.h b/firmware/export/config/logikdax.h index 5f35c6e725..47229f7a1d 100644 --- a/firmware/export/config/logikdax.h +++ b/firmware/export/config/logikdax.h | |||
@@ -21,8 +21,8 @@ | |||
21 | #endif | 21 | #endif |
22 | 22 | ||
23 | 23 | ||
24 | /* define this if you have a bitmap LCD display */ | 24 | |
25 | #define HAVE_LCD_BITMAP | 25 | |
26 | 26 | ||
27 | /* define this if you can flip your LCD */ | 27 | /* define this if you can flip your LCD */ |
28 | #define HAVE_LCD_FLIP | 28 | #define HAVE_LCD_FLIP |
diff --git a/firmware/export/config/lyreproto1.h b/firmware/export/config/lyreproto1.h index 5281a4a864..4cde26879c 100644 --- a/firmware/export/config/lyreproto1.h +++ b/firmware/export/config/lyreproto1.h | |||
@@ -33,8 +33,8 @@ | |||
33 | #define CONFIG_STORAGE STORAGE_SD | 33 | #define CONFIG_STORAGE STORAGE_SD |
34 | #define HAVE_FLASH_STORAGE | 34 | #define HAVE_FLASH_STORAGE |
35 | 35 | ||
36 | /* define this if you have a bitmap LCD display */ | 36 | |
37 | #define HAVE_LCD_BITMAP | 37 | |
38 | 38 | ||
39 | /* define this if you have a colour LCD */ | 39 | /* define this if you have a colour LCD */ |
40 | #define HAVE_LCD_COLOR | 40 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/meizum3.h b/firmware/export/config/meizum3.h index 161330d38f..c770790d47 100644 --- a/firmware/export/config/meizum3.h +++ b/firmware/export/config/meizum3.h | |||
@@ -20,8 +20,8 @@ | |||
20 | /* define the bitmask of recording sample rates */ | 20 | /* define the bitmask of recording sample rates */ |
21 | #define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) | 21 | #define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) |
22 | 22 | ||
23 | /* define this if you have a bitmap LCD display */ | 23 | |
24 | #define HAVE_LCD_BITMAP | 24 | |
25 | 25 | ||
26 | /* define this if you can flip your LCD */ | 26 | /* define this if you can flip your LCD */ |
27 | //#define HAVE_LCD_FLIP | 27 | //#define HAVE_LCD_FLIP |
diff --git a/firmware/export/config/meizum6sl.h b/firmware/export/config/meizum6sl.h index 267950b9e2..95841c8465 100644 --- a/firmware/export/config/meizum6sl.h +++ b/firmware/export/config/meizum6sl.h | |||
@@ -20,8 +20,8 @@ | |||
20 | /* define the bitmask of recording sample rates */ | 20 | /* define the bitmask of recording sample rates */ |
21 | #define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) | 21 | #define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) |
22 | 22 | ||
23 | /* define this if you have a bitmap LCD display */ | 23 | |
24 | #define HAVE_LCD_BITMAP | 24 | |
25 | 25 | ||
26 | /* define this if you can flip your LCD */ | 26 | /* define this if you can flip your LCD */ |
27 | //#define HAVE_LCD_FLIP | 27 | //#define HAVE_LCD_FLIP |
diff --git a/firmware/export/config/meizum6sp.h b/firmware/export/config/meizum6sp.h index dc9e2f657e..13b4d2e6b5 100644 --- a/firmware/export/config/meizum6sp.h +++ b/firmware/export/config/meizum6sp.h | |||
@@ -26,8 +26,8 @@ | |||
26 | /* define the bitmask of recording sample rates */ | 26 | /* define the bitmask of recording sample rates */ |
27 | #define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) | 27 | #define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) |
28 | 28 | ||
29 | /* define this if you have a bitmap LCD display */ | 29 | |
30 | #define HAVE_LCD_BITMAP | 30 | |
31 | 31 | ||
32 | /* define this if you can flip your LCD */ | 32 | /* define this if you can flip your LCD */ |
33 | //#define HAVE_LCD_FLIP | 33 | //#define HAVE_LCD_FLIP |
diff --git a/firmware/export/config/mini2440.h b/firmware/export/config/mini2440.h index f78c101c80..5f57606378 100644 --- a/firmware/export/config/mini2440.h +++ b/firmware/export/config/mini2440.h | |||
@@ -50,8 +50,8 @@ | |||
50 | /* #define HAVE_DISK_STORAGE */ | 50 | /* #define HAVE_DISK_STORAGE */ |
51 | 51 | ||
52 | /* Display */ | 52 | /* Display */ |
53 | /* define this if you have a bitmap LCD display */ | 53 | |
54 | #define HAVE_LCD_BITMAP | 54 | |
55 | /* define this if you have a colour LCD */ | 55 | /* define this if you have a colour LCD */ |
56 | #define HAVE_LCD_COLOR | 56 | #define HAVE_LCD_COLOR |
57 | /* The LCD is assumed to be 3.5" TFT touch screen, others are possible */ | 57 | /* The LCD is assumed to be 3.5" TFT touch screen, others are possible */ |
diff --git a/firmware/export/config/mpiohd200.h b/firmware/export/config/mpiohd200.h index da2420b814..1d367e4b20 100644 --- a/firmware/export/config/mpiohd200.h +++ b/firmware/export/config/mpiohd200.h | |||
@@ -26,8 +26,8 @@ | |||
26 | /* define the bitmask of recording sample rates */ | 26 | /* define the bitmask of recording sample rates */ |
27 | #define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) | 27 | #define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) |
28 | 28 | ||
29 | /* define this if you have a bitmap LCD display */ | 29 | |
30 | #define HAVE_LCD_BITMAP | 30 | |
31 | 31 | ||
32 | /* define this if you want album art for this target */ | 32 | /* define this if you want album art for this target */ |
33 | #define HAVE_ALBUMART | 33 | #define HAVE_ALBUMART |
diff --git a/firmware/export/config/mpiohd300.h b/firmware/export/config/mpiohd300.h index bf0821e1a9..fe17ec16b5 100644 --- a/firmware/export/config/mpiohd300.h +++ b/firmware/export/config/mpiohd300.h | |||
@@ -26,8 +26,8 @@ | |||
26 | /* define the bitmask of recording sample rates */ | 26 | /* define the bitmask of recording sample rates */ |
27 | #define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) | 27 | #define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) |
28 | 28 | ||
29 | /* define this if you have a bitmap LCD display */ | 29 | |
30 | #define HAVE_LCD_BITMAP | 30 | |
31 | 31 | ||
32 | /* define this if you want album art for this target */ | 32 | /* define this if you want album art for this target */ |
33 | #define HAVE_ALBUMART | 33 | #define HAVE_ALBUMART |
diff --git a/firmware/export/config/mrobe100.h b/firmware/export/config/mrobe100.h index f2ecb5a6f0..bb636f7625 100644 --- a/firmware/export/config/mrobe100.h +++ b/firmware/export/config/mrobe100.h | |||
@@ -12,8 +12,8 @@ | |||
12 | /*define this if the ATA controller and method of USB access support LBA48 */ | 12 | /*define this if the ATA controller and method of USB access support LBA48 */ |
13 | #define HAVE_LBA48 | 13 | #define HAVE_LBA48 |
14 | 14 | ||
15 | /* define this if you have a bitmap LCD display */ | 15 | |
16 | #define HAVE_LCD_BITMAP | 16 | |
17 | 17 | ||
18 | /* define this if you have access to the quickscreen */ | 18 | /* define this if you have access to the quickscreen */ |
19 | #define HAVE_QUICKSCREEN | 19 | #define HAVE_QUICKSCREEN |
diff --git a/firmware/export/config/mrobe500.h b/firmware/export/config/mrobe500.h index 82a4ef28d1..57d13cf1ab 100644 --- a/firmware/export/config/mrobe500.h +++ b/firmware/export/config/mrobe500.h | |||
@@ -41,8 +41,8 @@ | |||
41 | /* Define this to add support for ATA DMA */ | 41 | /* Define this to add support for ATA DMA */ |
42 | //#define HAVE_ATA_DMA | 42 | //#define HAVE_ATA_DMA |
43 | 43 | ||
44 | /* define this if you have a bitmap LCD display */ | 44 | |
45 | #define HAVE_LCD_BITMAP | 45 | |
46 | 46 | ||
47 | /* define this if you have a colour LCD */ | 47 | /* define this if you have a colour LCD */ |
48 | #define HAVE_LCD_COLOR | 48 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/nokian8xx.h b/firmware/export/config/nokian8xx.h index 4204fddf1d..c1585251e8 100644 --- a/firmware/export/config/nokian8xx.h +++ b/firmware/export/config/nokian8xx.h | |||
@@ -12,8 +12,8 @@ | |||
12 | 12 | ||
13 | #define USB_NONE | 13 | #define USB_NONE |
14 | 14 | ||
15 | /* define this if you have a bitmap LCD display */ | 15 | |
16 | #define HAVE_LCD_BITMAP | 16 | |
17 | 17 | ||
18 | /* define this if you have a colour LCD */ | 18 | /* define this if you have a colour LCD */ |
19 | #define HAVE_LCD_COLOR | 19 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/nokian900.h b/firmware/export/config/nokian900.h index bf692af312..1050763623 100644 --- a/firmware/export/config/nokian900.h +++ b/firmware/export/config/nokian900.h | |||
@@ -12,8 +12,8 @@ | |||
12 | 12 | ||
13 | #define USB_NONE | 13 | #define USB_NONE |
14 | 14 | ||
15 | /* define this if you have a bitmap LCD display */ | 15 | |
16 | #define HAVE_LCD_BITMAP | 16 | |
17 | 17 | ||
18 | /* define this if you have a colour LCD */ | 18 | /* define this if you have a colour LCD */ |
19 | #define HAVE_LCD_COLOR | 19 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/ondavx747.h b/firmware/export/config/ondavx747.h index e14edb3e37..fe5a772167 100644 --- a/firmware/export/config/ondavx747.h +++ b/firmware/export/config/ondavx747.h | |||
@@ -40,8 +40,8 @@ | |||
40 | /* ChinaChip NAND FTL */ | 40 | /* ChinaChip NAND FTL */ |
41 | #define CONFIG_NAND NAND_CC | 41 | #define CONFIG_NAND NAND_CC |
42 | 42 | ||
43 | /* define this if you have a bitmap LCD display */ | 43 | |
44 | #define HAVE_LCD_BITMAP | 44 | |
45 | 45 | ||
46 | /* define this if you have a colour LCD */ | 46 | /* define this if you have a colour LCD */ |
47 | #define HAVE_LCD_COLOR | 47 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/ondavx767.h b/firmware/export/config/ondavx767.h index dbad0b6a95..ee65702fe0 100644 --- a/firmware/export/config/ondavx767.h +++ b/firmware/export/config/ondavx767.h | |||
@@ -43,8 +43,8 @@ | |||
43 | #define HAVE_MULTIDRIVE | 43 | #define HAVE_MULTIDRIVE |
44 | #define NUM_DRIVES 2 | 44 | #define NUM_DRIVES 2 |
45 | 45 | ||
46 | /* define this if you have a bitmap LCD display */ | 46 | |
47 | #define HAVE_LCD_BITMAP | 47 | |
48 | 48 | ||
49 | /* define this if you have a colour LCD */ | 49 | /* define this if you have a colour LCD */ |
50 | #define HAVE_LCD_COLOR | 50 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/ondavx777.h b/firmware/export/config/ondavx777.h index 7225096237..e03a0cdd04 100644 --- a/firmware/export/config/ondavx777.h +++ b/firmware/export/config/ondavx777.h | |||
@@ -34,8 +34,8 @@ | |||
34 | /* ChinaChip NAND FTL */ | 34 | /* ChinaChip NAND FTL */ |
35 | #define CONFIG_NAND NAND_CC | 35 | #define CONFIG_NAND NAND_CC |
36 | 36 | ||
37 | /* define this if you have a bitmap LCD display */ | 37 | |
38 | #define HAVE_LCD_BITMAP | 38 | |
39 | 39 | ||
40 | /* define this if you have a colour LCD */ | 40 | /* define this if you have a colour LCD */ |
41 | #define HAVE_LCD_COLOR | 41 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/pandora.h b/firmware/export/config/pandora.h index 27745073ec..3b26ad9b7b 100644 --- a/firmware/export/config/pandora.h +++ b/firmware/export/config/pandora.h | |||
@@ -12,8 +12,8 @@ | |||
12 | 12 | ||
13 | #define USB_NONE | 13 | #define USB_NONE |
14 | 14 | ||
15 | /* define this if you have a bitmap LCD display */ | 15 | |
16 | #define HAVE_LCD_BITMAP | 16 | |
17 | 17 | ||
18 | /* define this if you have a colour LCD */ | 18 | /* define this if you have a colour LCD */ |
19 | #define HAVE_LCD_COLOR | 19 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/rk27generic.h b/firmware/export/config/rk27generic.h index c116f17603..369974abb7 100644 --- a/firmware/export/config/rk27generic.h +++ b/firmware/export/config/rk27generic.h | |||
@@ -25,8 +25,8 @@ | |||
25 | | SAMPR_CAP_48 | SAMPR_CAP_24 | SAMPR_CAP_12 \ | 25 | | SAMPR_CAP_48 | SAMPR_CAP_24 | SAMPR_CAP_12 \ |
26 | | SAMPR_CAP_32 | SAMPR_CAP_16 | SAMPR_CAP_8) | 26 | | SAMPR_CAP_32 | SAMPR_CAP_16 | SAMPR_CAP_8) |
27 | 27 | ||
28 | /* define this if you have a bitmap LCD display */ | 28 | |
29 | #define HAVE_LCD_BITMAP | 29 | |
30 | 30 | ||
31 | /* define this if you can flip your LCD */ | 31 | /* define this if you can flip your LCD */ |
32 | /* #define HAVE_LCD_FLIP */ | 32 | /* #define HAVE_LCD_FLIP */ |
diff --git a/firmware/export/config/samsungyh820.h b/firmware/export/config/samsungyh820.h index 4980084a07..b04ae1c0ea 100644 --- a/firmware/export/config/samsungyh820.h +++ b/firmware/export/config/samsungyh820.h | |||
@@ -76,8 +76,8 @@ | |||
76 | /* put the lcd frame buffer in IRAM */ | 76 | /* put the lcd frame buffer in IRAM */ |
77 | /* #define IRAM_LCDFRAMEBUFFER IDATA_ATTR */ | 77 | /* #define IRAM_LCDFRAMEBUFFER IDATA_ATTR */ |
78 | 78 | ||
79 | /* define this if you have a bitmap LCD display */ | 79 | |
80 | #define HAVE_LCD_BITMAP | 80 | |
81 | 81 | ||
82 | /* define this if you have a colour LCD */ | 82 | /* define this if you have a colour LCD */ |
83 | #define HAVE_LCD_COLOR | 83 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/samsungyh920.h b/firmware/export/config/samsungyh920.h index aaf93609b0..8367f06731 100644 --- a/firmware/export/config/samsungyh920.h +++ b/firmware/export/config/samsungyh920.h | |||
@@ -72,8 +72,8 @@ | |||
72 | /* put the lcd frame buffer in IRAM */ | 72 | /* put the lcd frame buffer in IRAM */ |
73 | /* #define IRAM_LCDFRAMEBUFFER IDATA_ATTR */ | 73 | /* #define IRAM_LCDFRAMEBUFFER IDATA_ATTR */ |
74 | 74 | ||
75 | /* define this if you have a bitmap LCD display */ | 75 | |
76 | #define HAVE_LCD_BITMAP | 76 | |
77 | 77 | ||
78 | /* define this if you want album art for this target */ | 78 | /* define this if you want album art for this target */ |
79 | #define HAVE_ALBUMART | 79 | #define HAVE_ALBUMART |
diff --git a/firmware/export/config/samsungyh925.h b/firmware/export/config/samsungyh925.h index 10e9743f3a..8e467550d8 100644 --- a/firmware/export/config/samsungyh925.h +++ b/firmware/export/config/samsungyh925.h | |||
@@ -66,8 +66,8 @@ | |||
66 | /* put the lcd frame buffer in IRAM */ | 66 | /* put the lcd frame buffer in IRAM */ |
67 | /* #define IRAM_LCDFRAMEBUFFER IDATA_ATTR */ | 67 | /* #define IRAM_LCDFRAMEBUFFER IDATA_ATTR */ |
68 | 68 | ||
69 | /* define this if you have a bitmap LCD display */ | 69 | |
70 | #define HAVE_LCD_BITMAP | 70 | |
71 | 71 | ||
72 | /* define this if you have a colour LCD */ | 72 | /* define this if you have a colour LCD */ |
73 | #define HAVE_LCD_COLOR | 73 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/samsungypr0.h b/firmware/export/config/samsungypr0.h index e9596fb9cc..414ba39517 100644 --- a/firmware/export/config/samsungypr0.h +++ b/firmware/export/config/samsungypr0.h | |||
@@ -14,8 +14,8 @@ | |||
14 | 14 | ||
15 | #define MODEL_NAME "Samsung YP-R0" | 15 | #define MODEL_NAME "Samsung YP-R0" |
16 | 16 | ||
17 | /* define this if you have a bitmap LCD display */ | 17 | |
18 | #define HAVE_LCD_BITMAP | 18 | |
19 | 19 | ||
20 | /* define this if you have a colour LCD */ | 20 | /* define this if you have a colour LCD */ |
21 | #define HAVE_LCD_COLOR | 21 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/samsungypr1.h b/firmware/export/config/samsungypr1.h index 0021f81a52..4d5c4a88f9 100644 --- a/firmware/export/config/samsungypr1.h +++ b/firmware/export/config/samsungypr1.h | |||
@@ -14,8 +14,8 @@ | |||
14 | 14 | ||
15 | #define MODEL_NAME "Samsung YP-R1" | 15 | #define MODEL_NAME "Samsung YP-R1" |
16 | 16 | ||
17 | /* define this if you have a bitmap LCD display */ | 17 | |
18 | #define HAVE_LCD_BITMAP | 18 | |
19 | 19 | ||
20 | /* define this if you have a colour LCD */ | 20 | /* define this if you have a colour LCD */ |
21 | #define HAVE_LCD_COLOR | 21 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/samsungyps3.h b/firmware/export/config/samsungyps3.h index 3707507f72..6306d23102 100644 --- a/firmware/export/config/samsungyps3.h +++ b/firmware/export/config/samsungyps3.h | |||
@@ -20,8 +20,8 @@ | |||
20 | /* define the bitmask of recording sample rates */ | 20 | /* define the bitmask of recording sample rates */ |
21 | #define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) | 21 | #define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) |
22 | 22 | ||
23 | /* define this if you have a bitmap LCD display */ | 23 | |
24 | #define HAVE_LCD_BITMAP | 24 | |
25 | 25 | ||
26 | /* define this if you can flip your LCD */ | 26 | /* define this if you can flip your LCD */ |
27 | //#define HAVE_LCD_FLIP | 27 | //#define HAVE_LCD_FLIP |
diff --git a/firmware/export/config/samsungypz5.h b/firmware/export/config/samsungypz5.h index 8c013e7c29..c890d629f1 100644 --- a/firmware/export/config/samsungypz5.h +++ b/firmware/export/config/samsungypz5.h | |||
@@ -28,8 +28,8 @@ | |||
28 | #define HAVE_FMRADIO_IN | 28 | #define HAVE_FMRADIO_IN |
29 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) | 29 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) |
30 | 30 | ||
31 | /* define this if you have a bitmap LCD display */ | 31 | |
32 | #define HAVE_LCD_BITMAP | 32 | |
33 | /* define this if you have a colour LCD */ | 33 | /* define this if you have a colour LCD */ |
34 | #define HAVE_LCD_COLOR | 34 | #define HAVE_LCD_COLOR |
35 | 35 | ||
diff --git a/firmware/export/config/sansac100.h b/firmware/export/config/sansac100.h index 7e984762d6..c2956eed12 100644 --- a/firmware/export/config/sansac100.h +++ b/firmware/export/config/sansac100.h | |||
@@ -10,8 +10,8 @@ | |||
10 | /* define hardware samples rate caps mask */ | 10 | /* define hardware samples rate caps mask */ |
11 | #define HW_SAMPR_CAPS (/*SAMPR_CAP_88 | */SAMPR_CAP_44/* | SAMPR_CAP_22 | SAMPR_CAP_11*/) | 11 | #define HW_SAMPR_CAPS (/*SAMPR_CAP_88 | */SAMPR_CAP_44/* | SAMPR_CAP_22 | SAMPR_CAP_11*/) |
12 | 12 | ||
13 | /* define this if you have a bitmap LCD display */ | 13 | |
14 | #define HAVE_LCD_BITMAP | 14 | |
15 | 15 | ||
16 | /* define this if you have a colour LCD */ | 16 | /* define this if you have a colour LCD */ |
17 | #define HAVE_LCD_COLOR | 17 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/sansac200.h b/firmware/export/config/sansac200.h index 1eed043b8c..4d5bf17256 100644 --- a/firmware/export/config/sansac200.h +++ b/firmware/export/config/sansac200.h | |||
@@ -24,8 +24,8 @@ | |||
24 | explicitly if different */ | 24 | explicitly if different */ |
25 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) | 25 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) |
26 | 26 | ||
27 | /* define this if you have a bitmap LCD display */ | 27 | |
28 | #define HAVE_LCD_BITMAP | 28 | |
29 | 29 | ||
30 | /* define this if you have a colour LCD */ | 30 | /* define this if you have a colour LCD */ |
31 | #define HAVE_LCD_COLOR | 31 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/sansac200v2.h b/firmware/export/config/sansac200v2.h index e98b44d0e8..66e02f9738 100644 --- a/firmware/export/config/sansac200v2.h +++ b/firmware/export/config/sansac200v2.h | |||
@@ -26,8 +26,8 @@ | |||
26 | explicitly if different */ | 26 | explicitly if different */ |
27 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) | 27 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) |
28 | 28 | ||
29 | /* define this if you have a bitmap LCD display */ | 29 | |
30 | #define HAVE_LCD_BITMAP | 30 | |
31 | 31 | ||
32 | /* define this if you have a colour LCD */ | 32 | /* define this if you have a colour LCD */ |
33 | #define HAVE_LCD_COLOR | 33 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/sansaclip.h b/firmware/export/config/sansaclip.h index 70f66779a4..84970e820d 100644 --- a/firmware/export/config/sansaclip.h +++ b/firmware/export/config/sansaclip.h | |||
@@ -26,8 +26,8 @@ | |||
26 | explicitly if different */ | 26 | explicitly if different */ |
27 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) | 27 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) |
28 | 28 | ||
29 | /* define this if you have a bitmap LCD display */ | 29 | |
30 | #define HAVE_LCD_BITMAP | 30 | |
31 | 31 | ||
32 | /* define this if you have a light associated with the buttons */ | 32 | /* define this if you have a light associated with the buttons */ |
33 | #define HAVE_BUTTON_LIGHT | 33 | #define HAVE_BUTTON_LIGHT |
diff --git a/firmware/export/config/sansaclipplus.h b/firmware/export/config/sansaclipplus.h index 54ffdb1071..d4638a1acd 100644 --- a/firmware/export/config/sansaclipplus.h +++ b/firmware/export/config/sansaclipplus.h | |||
@@ -37,8 +37,8 @@ | |||
37 | explicitly if different */ | 37 | explicitly if different */ |
38 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) | 38 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) |
39 | 39 | ||
40 | /* define this if you have a bitmap LCD display */ | 40 | |
41 | #define HAVE_LCD_BITMAP | 41 | |
42 | 42 | ||
43 | /* define this if you have access to the quickscreen */ | 43 | /* define this if you have access to the quickscreen */ |
44 | #define HAVE_QUICKSCREEN | 44 | #define HAVE_QUICKSCREEN |
diff --git a/firmware/export/config/sansaclipv2.h b/firmware/export/config/sansaclipv2.h index 04c2efacfa..df5e15d369 100644 --- a/firmware/export/config/sansaclipv2.h +++ b/firmware/export/config/sansaclipv2.h | |||
@@ -28,8 +28,8 @@ | |||
28 | explicitly if different */ | 28 | explicitly if different */ |
29 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) | 29 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) |
30 | 30 | ||
31 | /* define this if you have a bitmap LCD display */ | 31 | |
32 | #define HAVE_LCD_BITMAP | 32 | |
33 | 33 | ||
34 | /* define this if you have a light associated with the buttons */ | 34 | /* define this if you have a light associated with the buttons */ |
35 | #define HAVE_BUTTON_LIGHT | 35 | #define HAVE_BUTTON_LIGHT |
diff --git a/firmware/export/config/sansaclipzip.h b/firmware/export/config/sansaclipzip.h index 9513b0074c..01ba0e1346 100644 --- a/firmware/export/config/sansaclipzip.h +++ b/firmware/export/config/sansaclipzip.h | |||
@@ -38,8 +38,8 @@ | |||
38 | explicitly if different */ | 38 | explicitly if different */ |
39 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) | 39 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) |
40 | 40 | ||
41 | /* define this if you have a bitmap LCD display */ | 41 | |
42 | #define HAVE_LCD_BITMAP | 42 | |
43 | /* define this if you have a colour LCD */ | 43 | /* define this if you have a colour LCD */ |
44 | #define HAVE_LCD_COLOR | 44 | #define HAVE_LCD_COLOR |
45 | 45 | ||
diff --git a/firmware/export/config/sansaconnect.h b/firmware/export/config/sansaconnect.h index 8ad4cab396..465a576664 100644 --- a/firmware/export/config/sansaconnect.h +++ b/firmware/export/config/sansaconnect.h | |||
@@ -42,8 +42,8 @@ | |||
42 | #define HAVE_HOTSWAP | 42 | #define HAVE_HOTSWAP |
43 | #define HAVE_HOTSWAP_STORAGE_AS_MAIN | 43 | #define HAVE_HOTSWAP_STORAGE_AS_MAIN |
44 | 44 | ||
45 | /* define this if you have a bitmap LCD display */ | 45 | |
46 | #define HAVE_LCD_BITMAP | 46 | |
47 | 47 | ||
48 | /* define this if you have a colour LCD */ | 48 | /* define this if you have a colour LCD */ |
49 | #define HAVE_LCD_COLOR | 49 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/sansae200.h b/firmware/export/config/sansae200.h index af9baa3202..e03784a204 100644 --- a/firmware/export/config/sansae200.h +++ b/firmware/export/config/sansae200.h | |||
@@ -24,8 +24,8 @@ | |||
24 | explicitly if different */ | 24 | explicitly if different */ |
25 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) | 25 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) |
26 | 26 | ||
27 | /* define this if you have a bitmap LCD display */ | 27 | |
28 | #define HAVE_LCD_BITMAP | 28 | |
29 | 29 | ||
30 | /* define this if you have a colour LCD */ | 30 | /* define this if you have a colour LCD */ |
31 | #define HAVE_LCD_COLOR | 31 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/sansae200v2.h b/firmware/export/config/sansae200v2.h index 604f51db23..211fee701b 100644 --- a/firmware/export/config/sansae200v2.h +++ b/firmware/export/config/sansae200v2.h | |||
@@ -24,8 +24,8 @@ | |||
24 | explicitly if different */ | 24 | explicitly if different */ |
25 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) | 25 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) |
26 | 26 | ||
27 | /* define this if you have a bitmap LCD display */ | 27 | |
28 | #define HAVE_LCD_BITMAP | 28 | |
29 | 29 | ||
30 | /* define this if you have a colour LCD */ | 30 | /* define this if you have a colour LCD */ |
31 | #define HAVE_LCD_COLOR | 31 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/sansafuze.h b/firmware/export/config/sansafuze.h index e918cd888f..fb17923e90 100644 --- a/firmware/export/config/sansafuze.h +++ b/firmware/export/config/sansafuze.h | |||
@@ -34,8 +34,8 @@ | |||
34 | explicitly if different */ | 34 | explicitly if different */ |
35 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) | 35 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) |
36 | 36 | ||
37 | /* define this if you have a bitmap LCD display */ | 37 | |
38 | #define HAVE_LCD_BITMAP | 38 | |
39 | /* define this if you have a colour LCD */ | 39 | /* define this if you have a colour LCD */ |
40 | #define HAVE_LCD_COLOR | 40 | #define HAVE_LCD_COLOR |
41 | 41 | ||
diff --git a/firmware/export/config/sansafuzeplus.h b/firmware/export/config/sansafuzeplus.h index bd587be11a..0306b4d14a 100644 --- a/firmware/export/config/sansafuzeplus.h +++ b/firmware/export/config/sansafuzeplus.h | |||
@@ -29,8 +29,8 @@ | |||
29 | explicitly if different */ | 29 | explicitly if different */ |
30 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) | 30 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) |
31 | 31 | ||
32 | /* define this if you have a bitmap LCD display */ | 32 | |
33 | #define HAVE_LCD_BITMAP | 33 | |
34 | /* define this if you have a colour LCD */ | 34 | /* define this if you have a colour LCD */ |
35 | #define HAVE_LCD_COLOR | 35 | #define HAVE_LCD_COLOR |
36 | #define HAVE_LCD_FLIP | 36 | #define HAVE_LCD_FLIP |
diff --git a/firmware/export/config/sansafuzev2.h b/firmware/export/config/sansafuzev2.h index 1fa03cf6be..6c42e58f7a 100644 --- a/firmware/export/config/sansafuzev2.h +++ b/firmware/export/config/sansafuzev2.h | |||
@@ -34,8 +34,8 @@ | |||
34 | explicitly if different */ | 34 | explicitly if different */ |
35 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) | 35 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) |
36 | 36 | ||
37 | /* define this if you have a bitmap LCD display */ | 37 | |
38 | #define HAVE_LCD_BITMAP | 38 | |
39 | /* define this if you have a colour LCD */ | 39 | /* define this if you have a colour LCD */ |
40 | #define HAVE_LCD_COLOR | 40 | #define HAVE_LCD_COLOR |
41 | 41 | ||
diff --git a/firmware/export/config/sansam200.h b/firmware/export/config/sansam200.h index 044802550e..95647013e7 100644 --- a/firmware/export/config/sansam200.h +++ b/firmware/export/config/sansam200.h | |||
@@ -17,8 +17,8 @@ | |||
17 | explicitly if different */ | 17 | explicitly if different */ |
18 | //#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_SPDIF) | 18 | //#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_SPDIF) |
19 | 19 | ||
20 | /* define this if you have a bitmap LCD display */ | 20 | |
21 | #define HAVE_LCD_BITMAP | 21 | |
22 | 22 | ||
23 | /* define this if you can flip your LCD */ | 23 | /* define this if you can flip your LCD */ |
24 | #define HAVE_LCD_FLIP | 24 | #define HAVE_LCD_FLIP |
diff --git a/firmware/export/config/sansam200v4.h b/firmware/export/config/sansam200v4.h index 7415ba7dae..b6ebaf4266 100644 --- a/firmware/export/config/sansam200v4.h +++ b/firmware/export/config/sansam200v4.h | |||
@@ -28,8 +28,8 @@ | |||
28 | explicitly if different */ | 28 | explicitly if different */ |
29 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) | 29 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) |
30 | 30 | ||
31 | /* define this if you have a bitmap LCD display */ | 31 | |
32 | #define HAVE_LCD_BITMAP | 32 | |
33 | 33 | ||
34 | /* define this if you can flip your LCD */ | 34 | /* define this if you can flip your LCD */ |
35 | #define HAVE_LCD_FLIP | 35 | #define HAVE_LCD_FLIP |
diff --git a/firmware/export/config/sansaview.h b/firmware/export/config/sansaview.h index 1057c5e817..78458fe3fc 100644 --- a/firmware/export/config/sansaview.h +++ b/firmware/export/config/sansaview.h | |||
@@ -19,8 +19,8 @@ | |||
19 | explicitly if different */ | 19 | explicitly if different */ |
20 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) | 20 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) |
21 | 21 | ||
22 | /* define this if you have a bitmap LCD display */ | 22 | |
23 | #define HAVE_LCD_BITMAP | 23 | |
24 | 24 | ||
25 | /* define this if you have a colour LCD */ | 25 | /* define this if you have a colour LCD */ |
26 | #define HAVE_LCD_COLOR | 26 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/sdlapp.h b/firmware/export/config/sdlapp.h index dde0b2783c..038e1d8c8e 100644 --- a/firmware/export/config/sdlapp.h +++ b/firmware/export/config/sdlapp.h | |||
@@ -12,8 +12,8 @@ | |||
12 | 12 | ||
13 | #define USB_NONE | 13 | #define USB_NONE |
14 | 14 | ||
15 | /* define this if you have a bitmap LCD display */ | 15 | |
16 | #define HAVE_LCD_BITMAP | 16 | |
17 | 17 | ||
18 | /* define this if you have a colour LCD */ | 18 | /* define this if you have a colour LCD */ |
19 | #define HAVE_LCD_COLOR | 19 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/sonynwze360.h b/firmware/export/config/sonynwze360.h index 0049f13123..7240070ba4 100644 --- a/firmware/export/config/sonynwze360.h +++ b/firmware/export/config/sonynwze360.h | |||
@@ -17,8 +17,8 @@ | |||
17 | explicitly if different */ | 17 | explicitly if different */ |
18 | #define INPUT_SRC_CAPS SRC_CAP_FMRADIO | 18 | #define INPUT_SRC_CAPS SRC_CAP_FMRADIO |
19 | 19 | ||
20 | /* define this if you have a bitmap LCD display */ | 20 | |
21 | #define HAVE_LCD_BITMAP | 21 | |
22 | /* define this if you have a colour LCD */ | 22 | /* define this if you have a colour LCD */ |
23 | #define HAVE_LCD_COLOR | 23 | #define HAVE_LCD_COLOR |
24 | 24 | ||
diff --git a/firmware/export/config/sonynwze370.h b/firmware/export/config/sonynwze370.h index f0e6d08e0d..08c5c4a99f 100644 --- a/firmware/export/config/sonynwze370.h +++ b/firmware/export/config/sonynwze370.h | |||
@@ -17,8 +17,8 @@ | |||
17 | explicitly if different */ | 17 | explicitly if different */ |
18 | #define INPUT_SRC_CAPS SRC_CAP_FMRADIO | 18 | #define INPUT_SRC_CAPS SRC_CAP_FMRADIO |
19 | 19 | ||
20 | /* define this if you have a bitmap LCD display */ | 20 | |
21 | #define HAVE_LCD_BITMAP | 21 | |
22 | /* define this if you have a colour LCD */ | 22 | /* define this if you have a colour LCD */ |
23 | #define HAVE_LCD_COLOR | 23 | #define HAVE_LCD_COLOR |
24 | 24 | ||
diff --git a/firmware/export/config/sonynwzlinux.h b/firmware/export/config/sonynwzlinux.h index 771cef57bb..66f18724db 100644 --- a/firmware/export/config/sonynwzlinux.h +++ b/firmware/export/config/sonynwzlinux.h | |||
@@ -6,8 +6,8 @@ | |||
6 | #define CONFIG_PLATFORM (PLATFORM_HOSTED) | 6 | #define CONFIG_PLATFORM (PLATFORM_HOSTED) |
7 | #endif | 7 | #endif |
8 | 8 | ||
9 | /* define this if you have a bitmap LCD display */ | 9 | |
10 | #define HAVE_LCD_BITMAP | 10 | |
11 | 11 | ||
12 | /* define this if you have a colour LCD */ | 12 | /* define this if you have a colour LCD */ |
13 | #define HAVE_LCD_COLOR | 13 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/tatungtpj1022.h b/firmware/export/config/tatungtpj1022.h index 7f3b579c49..3865e8f87f 100644 --- a/firmware/export/config/tatungtpj1022.h +++ b/firmware/export/config/tatungtpj1022.h | |||
@@ -24,8 +24,8 @@ | |||
24 | #define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ | 24 | #define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ |
25 | SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) */ | 25 | SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) */ |
26 | 26 | ||
27 | /* define this if you have a bitmap LCD display */ | 27 | |
28 | #define HAVE_LCD_BITMAP | 28 | |
29 | 29 | ||
30 | /* define this if you have a colour LCD */ | 30 | /* define this if you have a colour LCD */ |
31 | #define HAVE_LCD_COLOR | 31 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/vibe500.h b/firmware/export/config/vibe500.h index 0626fe1078..0444a2e065 100644 --- a/firmware/export/config/vibe500.h +++ b/firmware/export/config/vibe500.h | |||
@@ -25,8 +25,8 @@ | |||
25 | /* define the bitmask of recording sample rates */ | 25 | /* define the bitmask of recording sample rates */ |
26 | #define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) | 26 | #define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) |
27 | 27 | ||
28 | /* define this if you have a bitmap LCD display */ | 28 | |
29 | #define HAVE_LCD_BITMAP | 29 | |
30 | 30 | ||
31 | /* define this if you can flip your LCD */ | 31 | /* define this if you can flip your LCD */ |
32 | #define HAVE_LCD_FLIP | 32 | #define HAVE_LCD_FLIP |
diff --git a/firmware/export/config/xduoox20.h b/firmware/export/config/xduoox20.h index b453e42a9c..7d298112c6 100644 --- a/firmware/export/config/xduoox20.h +++ b/firmware/export/config/xduoox20.h | |||
@@ -17,8 +17,8 @@ | |||
17 | #define CONFIG_PLATFORM (PLATFORM_HOSTED) | 17 | #define CONFIG_PLATFORM (PLATFORM_HOSTED) |
18 | #endif | 18 | #endif |
19 | 19 | ||
20 | /* define this if you have a bitmap LCD display */ | 20 | |
21 | #define HAVE_LCD_BITMAP | 21 | |
22 | 22 | ||
23 | /* define this if you have a colour LCD */ | 23 | /* define this if you have a colour LCD */ |
24 | #define HAVE_LCD_COLOR | 24 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/xduoox3.h b/firmware/export/config/xduoox3.h index 3d35555ebf..7efeaf3b2f 100644 --- a/firmware/export/config/xduoox3.h +++ b/firmware/export/config/xduoox3.h | |||
@@ -17,8 +17,8 @@ | |||
17 | /* ChinaChip NAND FTL */ | 17 | /* ChinaChip NAND FTL */ |
18 | #define CONFIG_NAND NAND_CC | 18 | #define CONFIG_NAND NAND_CC |
19 | 19 | ||
20 | /* define this if you have a bitmap LCD display */ | 20 | |
21 | #define HAVE_LCD_BITMAP | 21 | |
22 | 22 | ||
23 | /* define this if you have access to the quickscreen */ | 23 | /* define this if you have access to the quickscreen */ |
24 | #define HAVE_QUICKSCREEN | 24 | #define HAVE_QUICKSCREEN |
diff --git a/firmware/export/config/xduoox3ii.h b/firmware/export/config/xduoox3ii.h index fb72532993..e9bf8ba51c 100644 --- a/firmware/export/config/xduoox3ii.h +++ b/firmware/export/config/xduoox3ii.h | |||
@@ -17,8 +17,8 @@ | |||
17 | #define CONFIG_PLATFORM (PLATFORM_HOSTED) | 17 | #define CONFIG_PLATFORM (PLATFORM_HOSTED) |
18 | #endif | 18 | #endif |
19 | 19 | ||
20 | /* define this if you have a bitmap LCD display */ | 20 | |
21 | #define HAVE_LCD_BITMAP | 21 | |
22 | 22 | ||
23 | /* define this if you have a colour LCD */ | 23 | /* define this if you have a colour LCD */ |
24 | #define HAVE_LCD_COLOR | 24 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/zenvisionm30gb.h b/firmware/export/config/zenvisionm30gb.h index 5fa5496b20..ff68345349 100644 --- a/firmware/export/config/zenvisionm30gb.h +++ b/firmware/export/config/zenvisionm30gb.h | |||
@@ -41,8 +41,8 @@ | |||
41 | /*define this if the ATA controller and method of USB access support LBA48 */ | 41 | /*define this if the ATA controller and method of USB access support LBA48 */ |
42 | #define HAVE_LBA48 | 42 | #define HAVE_LBA48 |
43 | 43 | ||
44 | /* define this if you have a bitmap LCD display */ | 44 | |
45 | #define HAVE_LCD_BITMAP | 45 | |
46 | 46 | ||
47 | /* define this if you have a colour LCD */ | 47 | /* define this if you have a colour LCD */ |
48 | #define HAVE_LCD_COLOR | 48 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/config/zenvisionm60gb.h b/firmware/export/config/zenvisionm60gb.h index 23e92ddb0a..7136595d94 100644 --- a/firmware/export/config/zenvisionm60gb.h +++ b/firmware/export/config/zenvisionm60gb.h | |||
@@ -41,8 +41,8 @@ | |||
41 | /*define this if the ATA controller and method of USB access support LBA48 */ | 41 | /*define this if the ATA controller and method of USB access support LBA48 */ |
42 | #define HAVE_LBA48 | 42 | #define HAVE_LBA48 |
43 | 43 | ||
44 | /* define this if you have a bitmap LCD display */ | 44 | |
45 | #define HAVE_LCD_BITMAP | 45 | |
46 | 46 | ||
47 | /* define this if you have a colour LCD */ | 47 | /* define this if you have a colour LCD */ |
48 | #define HAVE_LCD_COLOR | 48 | #define HAVE_LCD_COLOR |
diff --git a/firmware/export/font.h b/firmware/export/font.h index ad72cb52c7..067c67e43d 100644 --- a/firmware/export/font.h +++ b/firmware/export/font.h | |||
@@ -30,13 +30,11 @@ | |||
30 | */ | 30 | */ |
31 | #include "config.h" | 31 | #include "config.h" |
32 | 32 | ||
33 | #if defined(HAVE_LCD_BITMAP) || (CONFIG_PLATFORM & PLATFORM_HOSTED) | ||
34 | #ifndef __PCTOOL__ | 33 | #ifndef __PCTOOL__ |
35 | #include "font_cache.h" | 34 | #include "font_cache.h" |
36 | #include "sysfont.h" | 35 | #include "sysfont.h" |
37 | #endif | 36 | #endif |
38 | 37 | ||
39 | |||
40 | /* | 38 | /* |
41 | * Fonts are specified by number, and used for display | 39 | * Fonts are specified by number, and used for display |
42 | * of menu information as well as mp3 filename data. | 40 | * of menu information as well as mp3 filename data. |
@@ -139,11 +137,4 @@ int font_getstringsize(const unsigned char *str, int *w, int *h, int fontnumber) | |||
139 | int font_get_width(struct font* ft, unsigned short ch); | 137 | int font_get_width(struct font* ft, unsigned short ch); |
140 | const unsigned char * font_get_bits(struct font* ft, unsigned short ch); | 138 | const unsigned char * font_get_bits(struct font* ft, unsigned short ch); |
141 | 139 | ||
142 | #else /* HAVE_LCD_BITMAP */ | ||
143 | |||
144 | #define font_init() | ||
145 | #define font_load(x) | ||
146 | |||
147 | #endif | ||
148 | |||
149 | #endif | 140 | #endif |
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index 0975df4c79..9346a6815b 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h | |||
@@ -40,14 +40,12 @@ struct viewport { | |||
40 | int y; | 40 | int y; |
41 | int width; | 41 | int width; |
42 | int height; | 42 | int height; |
43 | #ifdef HAVE_LCD_BITMAP | ||
44 | int flags; | 43 | int flags; |
45 | int font; | 44 | int font; |
46 | int drawmode; | 45 | int drawmode; |
47 | /* needed for even for mono displays to support greylib */ | 46 | /* needed for even for mono displays to support greylib */ |
48 | unsigned fg_pattern; | 47 | unsigned fg_pattern; |
49 | unsigned bg_pattern; | 48 | unsigned bg_pattern; |
50 | #endif | ||
51 | }; | 49 | }; |
52 | 50 | ||
53 | /* Frame buffer stride | 51 | /* Frame buffer stride |
@@ -114,7 +112,6 @@ struct scrollinfo; | |||
114 | #define STRIDE(screen, w, h) (screen==SCREEN_MAIN?STRIDE_MAIN((w), \ | 112 | #define STRIDE(screen, w, h) (screen==SCREEN_MAIN?STRIDE_MAIN((w), \ |
115 | (h)):STRIDE_REMOTE((w),(h))) | 113 | (h)):STRIDE_REMOTE((w),(h))) |
116 | 114 | ||
117 | #ifdef HAVE_LCD_BITMAP | ||
118 | #if LCD_DEPTH <=8 | 115 | #if LCD_DEPTH <=8 |
119 | #if (LCD_PIXELFORMAT == VERTICAL_INTERLEAVED) \ | 116 | #if (LCD_PIXELFORMAT == VERTICAL_INTERLEAVED) \ |
120 | || (LCD_PIXELFORMAT == HORIZONTAL_INTERLEAVED) | 117 | || (LCD_PIXELFORMAT == HORIZONTAL_INTERLEAVED) |
@@ -144,7 +141,6 @@ typedef unsigned long fb_data; | |||
144 | #endif | 141 | #endif |
145 | #define FB_DATA_SZ 4 | 142 | #define FB_DATA_SZ 4 |
146 | #endif /* LCD_DEPTH */ | 143 | #endif /* LCD_DEPTH */ |
147 | #endif | ||
148 | 144 | ||
149 | #if defined(HAVE_LCD_MODES) | 145 | #if defined(HAVE_LCD_MODES) |
150 | void lcd_set_mode(int mode); | 146 | void lcd_set_mode(int mode); |
@@ -193,8 +189,6 @@ extern bool lcd_putsxy_scroll_func(int x, int y, const unsigned char *string, | |||
193 | void (*scroll_func)(struct scrollinfo *), | 189 | void (*scroll_func)(struct scrollinfo *), |
194 | void *data, int x_offset); | 190 | void *data, int x_offset); |
195 | 191 | ||
196 | #ifdef HAVE_LCD_BITMAP | ||
197 | |||
198 | /* performance function */ | 192 | /* performance function */ |
199 | #if defined(HAVE_LCD_COLOR) | 193 | #if defined(HAVE_LCD_COLOR) |
200 | #if MEMORYSIZE > 2 | 194 | #if MEMORYSIZE > 2 |
@@ -221,7 +215,6 @@ extern void lcd_remote_update(void); | |||
221 | /* update a fraction of the screen */ | 215 | /* update a fraction of the screen */ |
222 | extern void lcd_remote_update_rect(int x, int y, int width, int height); | 216 | extern void lcd_remote_update_rect(int x, int y, int width, int height); |
223 | #endif /* HAVE_REMOTE_LCD */ | 217 | #endif /* HAVE_REMOTE_LCD */ |
224 | #endif /* HAVE_LCD_BITMAP */ | ||
225 | 218 | ||
226 | /* Bitmap formats */ | 219 | /* Bitmap formats */ |
227 | enum | 220 | enum |
@@ -249,8 +242,6 @@ typedef void lcd_blockfunc_type(fb_data *address, unsigned mask, unsigned bits); | |||
249 | typedef void lcd_fastpixelfunc_type(fb_data *address); | 242 | typedef void lcd_fastpixelfunc_type(fb_data *address); |
250 | #endif | 243 | #endif |
251 | 244 | ||
252 | #ifdef HAVE_LCD_BITMAP | ||
253 | |||
254 | #if defined(HAVE_LCD_COLOR) && defined(LCD_REMOTE_DEPTH) && \ | 245 | #if defined(HAVE_LCD_COLOR) && defined(LCD_REMOTE_DEPTH) && \ |
255 | LCD_REMOTE_DEPTH > 1 | 246 | LCD_REMOTE_DEPTH > 1 |
256 | /* Just return color for screens use */ | 247 | /* Just return color for screens use */ |
@@ -593,6 +584,4 @@ static inline int lcd_get_dpi(void) { return LCD_DPI; } | |||
593 | extern int lcd_get_dpi(void); | 584 | extern int lcd_get_dpi(void); |
594 | #endif /* LCD_DPI */ | 585 | #endif /* LCD_DPI */ |
595 | 586 | ||
596 | #endif /* HAVE_LCD_BITMAP */ | ||
597 | |||
598 | #endif /* __LCD_H__ */ | 587 | #endif /* __LCD_H__ */ |
diff --git a/firmware/export/screendump.h b/firmware/export/screendump.h index 484bc4dc7a..cd7793b9d3 100644 --- a/firmware/export/screendump.h +++ b/firmware/export/screendump.h | |||
@@ -24,8 +24,7 @@ | |||
24 | 24 | ||
25 | #include "config.h" | 25 | #include "config.h" |
26 | 26 | ||
27 | /* Make BMP colour map entries from R, G, B triples, without and with blending. | 27 | /* Make BMP colour map entries from R, G, B triples, without and with blending. */ |
28 | * Not within HAVE_LCD_BITMAP because it is also used for the Player sim */ | ||
29 | #define RED_CMP(c) (((c) >> 16) & 0xff) | 28 | #define RED_CMP(c) (((c) >> 16) & 0xff) |
30 | #define GREEN_CMP(c) (((c) >> 8) & 0xff) | 29 | #define GREEN_CMP(c) (((c) >> 8) & 0xff) |
31 | #define BLUE_CMP(c) ((c) & 0xff) | 30 | #define BLUE_CMP(c) ((c) & 0xff) |
@@ -63,9 +62,7 @@ | |||
63 | /* Save a .BMP file containing the current screen contents. */ | 62 | /* Save a .BMP file containing the current screen contents. */ |
64 | void screen_dump(void); | 63 | void screen_dump(void); |
65 | 64 | ||
66 | #ifdef HAVE_LCD_BITMAP | ||
67 | void screen_dump_set_hook(void (*hook)(int fd)); | 65 | void screen_dump_set_hook(void (*hook)(int fd)); |
68 | #endif | ||
69 | 66 | ||
70 | #ifdef HAVE_REMOTE_LCD | 67 | #ifdef HAVE_REMOTE_LCD |
71 | /* Save a .BMP file containing the current remote screen contents. */ | 68 | /* Save a .BMP file containing the current remote screen contents. */ |
diff --git a/firmware/export/scroll_engine.h b/firmware/export/scroll_engine.h index 051e367506..f13e2efca7 100644 --- a/firmware/export/scroll_engine.h +++ b/firmware/export/scroll_engine.h | |||
@@ -58,11 +58,7 @@ extern bool lcd_remote_scroll_now(struct scrollinfo *scroll); | |||
58 | * larger than the normal linebuffer since it holds the line a second | 58 | * larger than the normal linebuffer since it holds the line a second |
59 | * time (+3 spaces) for non-bidir scrolling */ | 59 | * time (+3 spaces) for non-bidir scrolling */ |
60 | #define SCROLL_SPACING 3 | 60 | #define SCROLL_SPACING 3 |
61 | #ifdef HAVE_LCD_BITMAP | ||
62 | #define SCROLL_LINE_SIZE (MAX_PATH + SCROLL_SPACING + 3*LCD_WIDTH/2 + 2) | 61 | #define SCROLL_LINE_SIZE (MAX_PATH + SCROLL_SPACING + 3*LCD_WIDTH/2 + 2) |
63 | #else | ||
64 | #define SCROLL_LINE_SIZE (MAX_PATH + SCROLL_SPACING + 3*LCD_WIDTH + 2) | ||
65 | #endif | ||
66 | 62 | ||
67 | struct scrollinfo | 63 | struct scrollinfo |
68 | { | 64 | { |
@@ -95,20 +91,14 @@ struct scroll_screen_info | |||
95 | long ticks; /* # of ticks between updates*/ | 91 | long ticks; /* # of ticks between updates*/ |
96 | long delay; /* ticks delay before start */ | 92 | long delay; /* ticks delay before start */ |
97 | int bidir_limit; /* percent */ | 93 | int bidir_limit; /* percent */ |
98 | #if defined(HAVE_LCD_BITMAP) || defined(HAVE_REMOTE_LCD) | ||
99 | int step; /* pixels per scroll step */ | 94 | int step; /* pixels per scroll step */ |
100 | #endif | ||
101 | #if defined(HAVE_REMOTE_LCD) | 95 | #if defined(HAVE_REMOTE_LCD) |
102 | long last_scroll; | 96 | long last_scroll; |
103 | #endif | 97 | #endif |
104 | }; | 98 | }; |
105 | 99 | ||
106 | /** main lcd **/ | 100 | /** main lcd **/ |
107 | #ifdef HAVE_LCD_BITMAP | ||
108 | #define LCD_SCROLLABLE_LINES ((LCD_HEIGHT+4)/5 < 32 ? (LCD_HEIGHT+4)/5 : 32) | 101 | #define LCD_SCROLLABLE_LINES ((LCD_HEIGHT+4)/5 < 32 ? (LCD_HEIGHT+4)/5 : 32) |
109 | #else | ||
110 | #define LCD_SCROLLABLE_LINES LCD_HEIGHT * 2 | ||
111 | #endif | ||
112 | 102 | ||
113 | extern struct scroll_screen_info lcd_scroll_info; | 103 | extern struct scroll_screen_info lcd_scroll_info; |
114 | 104 | ||
diff --git a/firmware/export/usb.h b/firmware/export/usb.h index d723f85b1a..b7b846d5b3 100644 --- a/firmware/export/usb.h +++ b/firmware/export/usb.h | |||
@@ -107,9 +107,7 @@ | |||
107 | /* Messages from usb_tick and thread states */ | 107 | /* Messages from usb_tick and thread states */ |
108 | enum | 108 | enum |
109 | { | 109 | { |
110 | #ifdef HAVE_LCD_BITMAP | ||
111 | USB_SCREENDUMP = -1, /* State */ | 110 | USB_SCREENDUMP = -1, /* State */ |
112 | #endif | ||
113 | USB_EXTRACTED = 0, /* Event+State */ | 111 | USB_EXTRACTED = 0, /* Event+State */ |
114 | USB_INSERTED, /* Event+State */ | 112 | USB_INSERTED, /* Event+State */ |
115 | USB_POWERED, /* State - transitional indicator if no host */ | 113 | USB_POWERED, /* State - transitional indicator if no host */ |
diff --git a/firmware/include/rbunicode.h b/firmware/include/rbunicode.h index 077029304d..1af560abfe 100644 --- a/firmware/include/rbunicode.h +++ b/firmware/include/rbunicode.h | |||
@@ -33,8 +33,6 @@ | |||
33 | #define MASK 0xC0 /* 11000000 */ | 33 | #define MASK 0xC0 /* 11000000 */ |
34 | #define COMP 0x80 /* 10x */ | 34 | #define COMP 0x80 /* 10x */ |
35 | 35 | ||
36 | #ifdef HAVE_LCD_BITMAP | ||
37 | |||
38 | enum codepages { | 36 | enum codepages { |
39 | ISO_8859_1 = 0, /* Latin1 */ | 37 | ISO_8859_1 = 0, /* Latin1 */ |
40 | ISO_8859_7, /* Greek */ | 38 | ISO_8859_7, /* Greek */ |
@@ -55,23 +53,6 @@ enum codepages { | |||
55 | INIT_CODEPAGE = ISO_8859_1, | 53 | INIT_CODEPAGE = ISO_8859_1, |
56 | }; | 54 | }; |
57 | 55 | ||
58 | #else /* !HAVE_LCD_BITMAP, reduced support */ | ||
59 | |||
60 | enum codepages { | ||
61 | ISO_8859_1 = 0, /* Latin1 */ | ||
62 | ISO_8859_7, /* Greek */ | ||
63 | WIN_1251, /* Cyrillic */ | ||
64 | ISO_8859_9, /* Turkish */ | ||
65 | ISO_8859_2, /* Latin Extended */ | ||
66 | WIN_1250, /* Central European */ | ||
67 | WIN_1252, /* Western European */ | ||
68 | UTF_8, /* Unicode */ | ||
69 | NUM_CODEPAGES, | ||
70 | INIT_CODEPAGE = ISO_8859_1, | ||
71 | }; | ||
72 | |||
73 | #endif | ||
74 | |||
75 | /* Encode a UCS value as UTF-8 and return a pointer after this UTF-8 char. */ | 56 | /* Encode a UCS value as UTF-8 and return a pointer after this UTF-8 char. */ |
76 | unsigned char* utf8encode(unsigned long ucs, unsigned char *utf8); | 57 | unsigned char* utf8encode(unsigned long ucs, unsigned char *utf8); |
77 | unsigned char* iso_decode(const unsigned char *latin1, unsigned char *utf8, int cp, int count); | 58 | unsigned char* iso_decode(const unsigned char *latin1, unsigned char *utf8, int cp, int count); |
diff --git a/firmware/panic.c b/firmware/panic.c index 358be42924..fcfa8b2bb8 100644 --- a/firmware/panic.c +++ b/firmware/panic.c | |||
@@ -86,7 +86,6 @@ void panicf( const char *fmt, ...) | |||
86 | 86 | ||
87 | lcd_set_viewport(NULL); | 87 | lcd_set_viewport(NULL); |
88 | 88 | ||
89 | #if defined(HAVE_LCD_BITMAP) | ||
90 | int y = 1; | 89 | int y = 1; |
91 | 90 | ||
92 | #if LCD_DEPTH > 1 | 91 | #if LCD_DEPTH > 1 |
@@ -116,9 +115,6 @@ void panicf( const char *fmt, ...) | |||
116 | #ifdef ROCKBOX_HAS_LOGF | 115 | #ifdef ROCKBOX_HAS_LOGF |
117 | logf_panic_dump(&y); | 116 | logf_panic_dump(&y); |
118 | #endif | 117 | #endif |
119 | #else | ||
120 | /* no LCD */ | ||
121 | #endif | ||
122 | 118 | ||
123 | lcd_update(); | 119 | lcd_update(); |
124 | DEBUGF("%s", panic_buf); | 120 | DEBUGF("%s", panic_buf); |
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c index ed979f83ce..b55690be96 100644 --- a/firmware/powermgmt.c +++ b/firmware/powermgmt.c | |||
@@ -40,9 +40,7 @@ | |||
40 | #include "fmradio.h" | 40 | #include "fmradio.h" |
41 | #endif | 41 | #endif |
42 | #include "sound.h" | 42 | #include "sound.h" |
43 | #ifdef HAVE_LCD_BITMAP | ||
44 | #include "font.h" | 43 | #include "font.h" |
45 | #endif | ||
46 | #include "logf.h" | 44 | #include "logf.h" |
47 | #ifdef HAVE_REMOTE_LCD | 45 | #ifdef HAVE_REMOTE_LCD |
48 | #include "lcd-remote.h" | 46 | #include "lcd-remote.h" |
@@ -754,9 +752,7 @@ void shutdown_hw(void) | |||
754 | audio_stop(); | 752 | audio_stop(); |
755 | 753 | ||
756 | if (battery_level_safe()) { /* do not save on critical battery */ | 754 | if (battery_level_safe()) { /* do not save on critical battery */ |
757 | #ifdef HAVE_LCD_BITMAP | ||
758 | font_unload_all(); | 755 | font_unload_all(); |
759 | #endif | ||
760 | 756 | ||
761 | /* Commit pending writes if needed. Even though we don't do write caching, | 757 | /* Commit pending writes if needed. Even though we don't do write caching, |
762 | things like flash translation layers may need this to commit scattered | 758 | things like flash translation layers may need this to commit scattered |
diff --git a/firmware/target/hosted/sdl/system-sdl.c b/firmware/target/hosted/sdl/system-sdl.c index 6aaab6e8a5..e53643f449 100644 --- a/firmware/target/hosted/sdl/system-sdl.c +++ b/firmware/target/hosted/sdl/system-sdl.c | |||
@@ -33,9 +33,7 @@ | |||
33 | #include "system-sdl.h" | 33 | #include "system-sdl.h" |
34 | #include "sim-ui-defines.h" | 34 | #include "sim-ui-defines.h" |
35 | #include "lcd-sdl.h" | 35 | #include "lcd-sdl.h" |
36 | #ifdef HAVE_LCD_BITMAP | ||
37 | #include "lcd-bitmap.h" | 36 | #include "lcd-bitmap.h" |
38 | #endif | ||
39 | #ifdef HAVE_REMOTE_LCD | 37 | #ifdef HAVE_REMOTE_LCD |
40 | #include "lcd-remote-bitmap.h" | 38 | #include "lcd-remote-bitmap.h" |
41 | #endif | 39 | #endif |
diff --git a/firmware/target/mips/ingenic_jz47xx/system-jz4740.c b/firmware/target/mips/ingenic_jz47xx/system-jz4740.c index 5ef500a69b..87094dd7ae 100644 --- a/firmware/target/mips/ingenic_jz47xx/system-jz4740.c +++ b/firmware/target/mips/ingenic_jz47xx/system-jz4740.c | |||
@@ -261,7 +261,6 @@ void exception_handler(void* stack_ptr, unsigned int cause, unsigned int epc) | |||
261 | "$1", "LO", "HI", "STATUS", "EPC" }; | 261 | "$1", "LO", "HI", "STATUS", "EPC" }; |
262 | int i; | 262 | int i; |
263 | 263 | ||
264 | #ifdef HAVE_LCD_BITMAP | ||
265 | #if LCD_DEPTH > 1 | 264 | #if LCD_DEPTH > 1 |
266 | lcd_set_backdrop(NULL); | 265 | lcd_set_backdrop(NULL); |
267 | lcd_set_drawmode(DRMODE_SOLID); | 266 | lcd_set_drawmode(DRMODE_SOLID); |
@@ -270,7 +269,7 @@ void exception_handler(void* stack_ptr, unsigned int cause, unsigned int epc) | |||
270 | #endif | 269 | #endif |
271 | lcd_setfont(FONT_SYSFIXED); | 270 | lcd_setfont(FONT_SYSFIXED); |
272 | lcd_set_viewport(NULL); | 271 | lcd_set_viewport(NULL); |
273 | #endif | 272 | |
274 | lcd_clear_display(); | 273 | lcd_clear_display(); |
275 | backlight_hw_on(); | 274 | backlight_hw_on(); |
276 | 275 | ||
diff --git a/firmware/usb.c b/firmware/usb.c index e20388c073..f97cc75ffe 100644 --- a/firmware/usb.c +++ b/firmware/usb.c | |||
@@ -56,9 +56,7 @@ | |||
56 | #define USB_FULL_INIT | 56 | #define USB_FULL_INIT |
57 | #endif | 57 | #endif |
58 | 58 | ||
59 | #ifdef HAVE_LCD_BITMAP | ||
60 | bool do_screendump_instead_of_usb = false; | 59 | bool do_screendump_instead_of_usb = false; |
61 | #endif | ||
62 | 60 | ||
63 | #if !defined(SIMULATOR) && !defined(USB_NONE) | 61 | #if !defined(SIMULATOR) && !defined(USB_NONE) |
64 | 62 | ||
@@ -116,7 +114,6 @@ static void try_reboot(void) | |||
116 | #endif /* USB_FIRWIRE_HANDLING */ | 114 | #endif /* USB_FIRWIRE_HANDLING */ |
117 | 115 | ||
118 | /* Screen dump */ | 116 | /* Screen dump */ |
119 | #ifdef HAVE_LCD_BITMAP | ||
120 | static inline bool usb_do_screendump(void) | 117 | static inline bool usb_do_screendump(void) |
121 | { | 118 | { |
122 | if(do_screendump_instead_of_usb) | 119 | if(do_screendump_instead_of_usb) |
@@ -129,7 +126,6 @@ static inline bool usb_do_screendump(void) | |||
129 | } | 126 | } |
130 | return false; | 127 | return false; |
131 | } | 128 | } |
132 | #endif /* HAVE_LCD_BITMAP */ | ||
133 | 129 | ||
134 | /* Power (charging-only) button */ | 130 | /* Power (charging-only) button */ |
135 | static inline void usb_detect_charging_only(bool detect) | 131 | static inline void usb_detect_charging_only(bool detect) |
@@ -458,13 +454,11 @@ static void NORETURN_ATTR usb_thread(void) | |||
458 | if(usb_state != USB_EXTRACTED) | 454 | if(usb_state != USB_EXTRACTED) |
459 | break; | 455 | break; |
460 | 456 | ||
461 | #ifdef HAVE_LCD_BITMAP | ||
462 | if(usb_do_screendump()) | 457 | if(usb_do_screendump()) |
463 | { | 458 | { |
464 | usb_state = USB_SCREENDUMP; | 459 | usb_state = USB_SCREENDUMP; |
465 | break; | 460 | break; |
466 | } | 461 | } |
467 | #endif | ||
468 | 462 | ||
469 | usb_state = USB_POWERED; | 463 | usb_state = USB_POWERED; |
470 | usb_stack_enable(true); | 464 | usb_stack_enable(true); |