diff options
| author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-17 10:31:31 -0400 |
|---|---|---|
| committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-24 21:20:13 +0000 |
| commit | 658026e6267277b27d297c481728f74d160a8481 (patch) | |
| tree | 915a9d2bb48469bdd5b9127dc19a61f230721a6c /firmware | |
| parent | 8cb555460ff79e636a7907fb2589e16db98c8600 (diff) | |
| download | rockbox-658026e6267277b27d297c481728f74d160a8481.tar.gz rockbox-658026e6267277b27d297c481728f74d160a8481.tar.bz2 rockbox-658026e6267277b27d297c481728f74d160a8481.zip | |
[4/4] Remove HAVE_LCD_BITMAP, as it's now the only choice.
Note: I left behind lcd_bitmap in features.txt, because removing it
would require considerable work in the manual and the translations.
Change-Id: Ia8ca7761f610d9332a0d22a7d189775fb15ec88a
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 #ifdef HAVE_SDL target/hosted/sdl/button-sdl.c target/hosted/sdl/kernel-sdl.c -#ifdef HAVE_LCD_BITMAP target/hosted/sdl/lcd-bitmap.c -#endif #ifdef HAVE_REMOTE_LCD target/hosted/sdl/lcd-remote-bitmap.c #endif @@ -253,7 +251,6 @@ common/vuprintf.c /* Display */ scroll_engine.c -#ifdef HAVE_LCD_BITMAP arabjoin.c bidi.c font_cache.c @@ -283,7 +280,6 @@ drivers/lcd-16bit.c drivers/lcd-24bit.c #endif /* LCD_DEPTH */ common/diacritic.c -#endif /* HAVE_LCD_BITMAP */ #ifdef HAVE_REMOTE_LCD #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 const char *name; }; -#ifdef HAVE_LCD_BITMAP - #define MAX_CP_TABLE_SIZE 32768 #define CPF_ISO "iso.cp" @@ -118,27 +116,6 @@ static const struct cp_info cp_info[NUM_CODEPAGES+1] = [UTF_8] = { CP_TID_NONE, NULL , "UTF-8" }, }; -#else /* !HAVE_LCD_BITMAP, reduced support */ - -#define MAX_CP_TABLE_SIZE 768 - -#define CPF_ISOMINI "isomini.cp" - -static const struct cp_info cp_info[NUM_CODEPAGES+1] = -{ - [0 ... NUM_CODEPAGES] = { CP_TID_NONE, NULL , "unknown" }, - [ISO_8859_1] = { CP_TID_NONE, NULL , "ISO-8859-1" }, - [ISO_8859_7] = { CP_TID_ISO , CPF_ISOMINI, "ISO-8859-7" }, - [WIN_1251] = { CP_TID_ISO , CPF_ISOMINI, "CP1251" }, - [ISO_8859_9] = { CP_TID_ISO , CPF_ISOMINI, "ISO-8859-9" }, - [ISO_8859_2] = { CP_TID_ISO , CPF_ISOMINI, "ISO-8859-2" }, - [WIN_1250] = { CP_TID_ISO , CPF_ISOMINI, "CP1250" }, - [WIN_1252] = { CP_TID_ISO , CPF_ISOMINI, "CP1252" }, - [UTF_8] = { CP_TID_ISO , NULL , "UTF-8" }, -}; - -#endif /* HAVE_LCD_BITMAP */ - static int default_cp = INIT_CODEPAGE; static int default_cp_tid = CP_TID_NONE; static int default_cp_handle = 0; @@ -368,7 +345,6 @@ unsigned char* iso_decode(const unsigned char *iso, unsigned char *utf8, ucs = table[tmp]; break; -#ifdef HAVE_LCD_BITMAP case CP_TID_932: /* Japanese */ if (*iso > 0xA0 && *iso < 0xE0) { tmp = *iso++ | (0xA100 - 0x8000); @@ -392,7 +368,6 @@ unsigned char* iso_decode(const unsigned char *iso, unsigned char *utf8, ucs = table[tmp]; count--; break; -#endif /* HAVE_LCD_BITMAP */ default: 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; static long lastbtn; /* Last valid button status */ static long last_read; /* Last button status, for debouncing/filtering */ static intptr_t button_data; /* data value from last message dequeued */ -#ifdef HAVE_LCD_BITMAP static bool flipped; /* buttons can be flipped to match the LCD flip */ -#endif #ifdef HAVE_BACKLIGHT static bool filter_first_keypress; #ifdef HAVE_REMOTE_LCD @@ -535,9 +533,7 @@ void button_init(void) reset_poweroff_timer(); -#ifdef HAVE_LCD_BITMAP flipped = false; -#endif #ifdef HAVE_BACKLIGHT filter_first_keypress = false; #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) = .ticks = 12, .delay = HZ/2, .bidir_limit = 50, -#ifdef HAVE_LCD_BITMAP .step = 6, -#endif }; @@ -100,12 +98,10 @@ void LCDFN(scroll_speed)(int speed) LCDFN(scroll_info).ticks = scroll_tick_table[speed]; } -#if defined(HAVE_LCD_BITMAP) void LCDFN(scroll_step)(int step) { LCDFN(scroll_info).step = step; } -#endif void LCDFN(scroll_delay)(int ms) { @@ -162,7 +158,6 @@ bool LCDFN(scroll_now)(struct scrollinfo *s) /* Stash and restore these three, so that the scroll_func * can do whatever it likes without destroying the state */ -#ifdef HAVE_LCD_BITMAP unsigned drawmode; #if LCD_DEPTH > 1 unsigned fg_pattern, bg_pattern; @@ -170,18 +165,15 @@ bool LCDFN(scroll_now)(struct scrollinfo *s) bg_pattern = s->vp->bg_pattern; #endif drawmode = s->vp->drawmode; -#endif s->scroll_func(s); LCDFN(update_viewport_rect)(s->x, s->y, s->width, s->height); -#ifdef HAVE_LCD_BITMAP #if LCD_DEPTH > 1 s->vp->fg_pattern = fg_pattern; s->vp->bg_pattern = bg_pattern; #endif s->vp->drawmode = drawmode; -#endif return ended; } @@ -216,12 +208,7 @@ static void LCDFN(scroll_worker)(void) LCDFN(set_viewport)(s->vp); makedelay = false; -#ifdef HAVE_LCD_BITMAP step = si->step; -#else - step = 1; -#endif - if (s->backward) 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); int button_status_wdata(int *pdata); #endif void button_clear_queue(void); -#ifdef HAVE_LCD_BITMAP void button_set_flip(bool flip); /* turn 180 degrees */ -#endif #ifdef HAVE_BACKLIGHT void set_backlight_filter_keypress(bool value); #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 */ #endif #endif -#if defined(HAVE_TAGCACHE) && defined(HAVE_LCD_BITMAP) +#if defined(HAVE_TAGCACHE) #define HAVE_PICTUREFLOW_INTEGRATION #endif 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 @@ #define CONFIG_PLATFORM (PLATFORM_HOSTED) #endif -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ #define USB_NONE -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ explicitly if different */ #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_FMRADIO) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ explicitly if different */ #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #define HAVE_LCD_COLOR 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 @@ explicitly if different */ #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #define HAVE_LCD_COLOR 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 @@ explicitly if different */ #define INPUT_SRC_CAPS SRC_CAP_MIC -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #define HAVE_LCD_COLOR 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 @@ explicitly if different */ #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #define HAVE_LCD_COLOR 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 @@ explicitly if different */ #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #define HAVE_LCD_COLOR 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 @@ explicitly if different */ #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #define HAVE_LCD_COLOR 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 @@ explicitly if different */ #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #define HAVE_LCD_COLOR 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 @@ /*define this if the ATA controller and method of USB access support LBA48 */ #define HAVE_LBA48 -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ /*define this if the ATA controller and method of USB access support LBA48 */ #define HAVE_LBA48 -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ /*define this if the ATA controller and method of USB access support LBA48 */ #define HAVE_LBA48 -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ #define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ #define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ #define HW_SAMPR_CAPS (SAMPR_CAP_44) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ #define HAVE_PCM1792_CODEC #define CODEC_SLAVE -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you can flip your LCD */ /* #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 @@ #define HAVE_PCM1792_CODEC #define CODEC_SLAVE -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you can flip your LCD */ /* #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 @@ #define HAVE_DF1704_CODEC #define CODEC_SLAVE -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you can flip your LCD */ /* #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 @@ #define HAVE_DF1704_CODEC #define CODEC_SLAVE -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you can flip your LCD */ /* #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 @@ #define HAVE_DUMMY_CODEC #define CODEC_SLAVE -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you can flip your LCD */ /* #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 @@ #define HAVE_DUMMY_CODEC #define CODEC_SLAVE -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you can flip your LCD */ /* #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 @@ /* define the bitmask of recording sample rates */ #define REC_SAMPR_CAPS (SAMPR_CAP_44/* | SAMPR_CAP_22 | SAMPR_CAP_11*/) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ /* define the bitmask of recording sample rates */ #define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you want album art for this target */ #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 @@ /* define the bitmask of recording sample rates */ #define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you want album art for this target */ #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 @@ /* define the bitmask of recording sample rates */ #define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you can flip your LCD */ #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 @@ #define USB_NONE -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ #define USB_NONE -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ #define HAVE_DUMMY_CODEC #define CODEC_SLAVE -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you can flip your LCD */ /* #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 @@ #define HAVE_WM8740 #define CODEC_SLAVE -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you can flip your LCD */ /* #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 @@ #define HAVE_WM8740 #define CODEC_SLAVE -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you can flip your LCD */ /* #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 @@ #define HAVE_ES9018 #define CODEC_SLAVE -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you can flip your LCD */ /* #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 @@ #define HAVE_DUMMY_CODEC #define CODEC_SLAVE -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you can flip your LCD */ /* #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 @@ #define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) */ -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you want album art for this target */ #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 @@ #define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) */ -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you want album art for this target */ #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 @@ /* define the bitmask of recording sample rates */ #define REC_SAMPR_CAPS (SAMPR_CAP_44) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you want album art for this target */ #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 @@ | SAMPR_CAP_48 | SAMPR_CAP_24 | SAMPR_CAP_12 \ | SAMPR_CAP_32 | SAMPR_CAP_16 | SAMPR_CAP_8) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you can flip your LCD */ //#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 @@ /* define the bitmask of recording sample rates */ #define REC_SAMPR_CAPS (SAMPR_CAP_44) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ #define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) */ -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you want album art for this target */ #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 @@ #define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) */ -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you want album art for this target */ #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 @@ /* define the bitmask of recording sample rates */ #define REC_SAMPR_CAPS (SAMPR_CAP_44) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ | SAMPR_CAP_96 | SAMPR_CAP_48 | SAMPR_CAP_24 | SAMPR_CAP_12 \ | SAMPR_CAP_64 | SAMPR_CAP_32 | SAMPR_CAP_16 | SAMPR_CAP_8) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you can flip your LCD */ //#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 @@ /* define the bitmask of recording sample rates */ #define REC_SAMPR_CAPS HW_SAMPR_CAPS -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ #define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ /*define this if the ATA controller and method of USB access support LBA48 */ #define HAVE_LBA48 -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you want album art for this target */ #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 @@ #define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ /*define this if the ATA controller and method of USB access support LBA48 */ #define HAVE_LBA48 -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you want album art for this target */ #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 @@ /*define this if the ATA controller and method of USB access support LBA48 */ #define HAVE_LBA48 -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ /* define this if you have recording possibility */ /*#define HAVE_RECORDING*/ -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you would like tagcache to build on this target */ /* #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 @@ #endif -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you can flip your LCD */ #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 @@ #define CONFIG_STORAGE STORAGE_SD #define HAVE_FLASH_STORAGE -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ /* define the bitmask of recording sample rates */ #define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you can flip your LCD */ //#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 @@ /* define the bitmask of recording sample rates */ #define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you can flip your LCD */ //#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 @@ /* define the bitmask of recording sample rates */ #define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you can flip your LCD */ //#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 @@ /* #define HAVE_DISK_STORAGE */ /* Display */ -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #define HAVE_LCD_COLOR /* 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 @@ /* define the bitmask of recording sample rates */ #define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you want album art for this target */ #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 @@ /* define the bitmask of recording sample rates */ #define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you want album art for this target */ #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 @@ /*define this if the ATA controller and method of USB access support LBA48 */ #define HAVE_LBA48 -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have access to the quickscreen */ #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 @@ /* Define this to add support for ATA DMA */ //#define HAVE_ATA_DMA -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ #define USB_NONE -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ #define USB_NONE -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ /* ChinaChip NAND FTL */ #define CONFIG_NAND NAND_CC -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ #define HAVE_MULTIDRIVE #define NUM_DRIVES 2 -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ /* ChinaChip NAND FTL */ #define CONFIG_NAND NAND_CC -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ #define USB_NONE -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ | SAMPR_CAP_48 | SAMPR_CAP_24 | SAMPR_CAP_12 \ | SAMPR_CAP_32 | SAMPR_CAP_16 | SAMPR_CAP_8) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you can flip your LCD */ /* #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 @@ /* put the lcd frame buffer in IRAM */ /* #define IRAM_LCDFRAMEBUFFER IDATA_ATTR */ -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ /* put the lcd frame buffer in IRAM */ /* #define IRAM_LCDFRAMEBUFFER IDATA_ATTR */ -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you want album art for this target */ #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 @@ /* put the lcd frame buffer in IRAM */ /* #define IRAM_LCDFRAMEBUFFER IDATA_ATTR */ -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ #define MODEL_NAME "Samsung YP-R0" -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ #define MODEL_NAME "Samsung YP-R1" -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ /* define the bitmask of recording sample rates */ #define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you can flip your LCD */ //#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 @@ #define HAVE_FMRADIO_IN #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #define HAVE_LCD_COLOR 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 @@ /* define hardware samples rate caps mask */ #define HW_SAMPR_CAPS (/*SAMPR_CAP_88 | */SAMPR_CAP_44/* | SAMPR_CAP_22 | SAMPR_CAP_11*/) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ explicitly if different */ #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ explicitly if different */ #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ explicitly if different */ #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a light associated with the buttons */ #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 @@ explicitly if different */ #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have access to the quickscreen */ #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 @@ explicitly if different */ #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a light associated with the buttons */ #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 @@ explicitly if different */ #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #define HAVE_LCD_COLOR 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 @@ #define HAVE_HOTSWAP #define HAVE_HOTSWAP_STORAGE_AS_MAIN -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ explicitly if different */ #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ explicitly if different */ #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ explicitly if different */ #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #define HAVE_LCD_COLOR 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 @@ explicitly if different */ #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #define HAVE_LCD_COLOR #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 @@ explicitly if different */ #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #define HAVE_LCD_COLOR 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 @@ explicitly if different */ //#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_SPDIF) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you can flip your LCD */ #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 @@ explicitly if different */ #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you can flip your LCD */ #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 @@ explicitly if different */ #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ #define USB_NONE -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ explicitly if different */ #define INPUT_SRC_CAPS SRC_CAP_FMRADIO -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #define HAVE_LCD_COLOR 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 @@ explicitly if different */ #define INPUT_SRC_CAPS SRC_CAP_FMRADIO -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #define HAVE_LCD_COLOR 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 @@ #define CONFIG_PLATFORM (PLATFORM_HOSTED) #endif -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ #define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) */ -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ /* define the bitmask of recording sample rates */ #define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you can flip your LCD */ #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 @@ #define CONFIG_PLATFORM (PLATFORM_HOSTED) #endif -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ /* ChinaChip NAND FTL */ #define CONFIG_NAND NAND_CC -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have access to the quickscreen */ #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 @@ #define CONFIG_PLATFORM (PLATFORM_HOSTED) #endif -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ /*define this if the ATA controller and method of USB access support LBA48 */ #define HAVE_LBA48 -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ /*define this if the ATA controller and method of USB access support LBA48 */ #define HAVE_LBA48 -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP + + /* define this if you have a colour LCD */ #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 @@ */ #include "config.h" -#if defined(HAVE_LCD_BITMAP) || (CONFIG_PLATFORM & PLATFORM_HOSTED) #ifndef __PCTOOL__ #include "font_cache.h" #include "sysfont.h" #endif - /* * Fonts are specified by number, and used for display * 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) int font_get_width(struct font* ft, unsigned short ch); const unsigned char * font_get_bits(struct font* ft, unsigned short ch); -#else /* HAVE_LCD_BITMAP */ - -#define font_init() -#define font_load(x) - -#endif - #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 { int y; int width; int height; -#ifdef HAVE_LCD_BITMAP int flags; int font; int drawmode; /* needed for even for mono displays to support greylib */ unsigned fg_pattern; unsigned bg_pattern; -#endif }; /* Frame buffer stride @@ -114,7 +112,6 @@ struct scrollinfo; #define STRIDE(screen, w, h) (screen==SCREEN_MAIN?STRIDE_MAIN((w), \ (h)):STRIDE_REMOTE((w),(h))) -#ifdef HAVE_LCD_BITMAP #if LCD_DEPTH <=8 #if (LCD_PIXELFORMAT == VERTICAL_INTERLEAVED) \ || (LCD_PIXELFORMAT == HORIZONTAL_INTERLEAVED) @@ -144,7 +141,6 @@ typedef unsigned long fb_data; #endif #define FB_DATA_SZ 4 #endif /* LCD_DEPTH */ -#endif #if defined(HAVE_LCD_MODES) void lcd_set_mode(int mode); @@ -193,8 +189,6 @@ extern bool lcd_putsxy_scroll_func(int x, int y, const unsigned char *string, void (*scroll_func)(struct scrollinfo *), void *data, int x_offset); -#ifdef HAVE_LCD_BITMAP - /* performance function */ #if defined(HAVE_LCD_COLOR) #if MEMORYSIZE > 2 @@ -221,7 +215,6 @@ extern void lcd_remote_update(void); /* update a fraction of the screen */ extern void lcd_remote_update_rect(int x, int y, int width, int height); #endif /* HAVE_REMOTE_LCD */ -#endif /* HAVE_LCD_BITMAP */ /* Bitmap formats */ enum @@ -249,8 +242,6 @@ typedef void lcd_blockfunc_type(fb_data *address, unsigned mask, unsigned bits); typedef void lcd_fastpixelfunc_type(fb_data *address); #endif -#ifdef HAVE_LCD_BITMAP - #if defined(HAVE_LCD_COLOR) && defined(LCD_REMOTE_DEPTH) && \ LCD_REMOTE_DEPTH > 1 /* Just return color for screens use */ @@ -593,6 +584,4 @@ static inline int lcd_get_dpi(void) { return LCD_DPI; } extern int lcd_get_dpi(void); #endif /* LCD_DPI */ -#endif /* HAVE_LCD_BITMAP */ - #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 @@ #include "config.h" -/* Make BMP colour map entries from R, G, B triples, without and with blending. - * Not within HAVE_LCD_BITMAP because it is also used for the Player sim */ +/* Make BMP colour map entries from R, G, B triples, without and with blending. */ #define RED_CMP(c) (((c) >> 16) & 0xff) #define GREEN_CMP(c) (((c) >> 8) & 0xff) #define BLUE_CMP(c) ((c) & 0xff) @@ -63,9 +62,7 @@ /* Save a .BMP file containing the current screen contents. */ void screen_dump(void); -#ifdef HAVE_LCD_BITMAP void screen_dump_set_hook(void (*hook)(int fd)); -#endif #ifdef HAVE_REMOTE_LCD /* 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); * larger than the normal linebuffer since it holds the line a second * time (+3 spaces) for non-bidir scrolling */ #define SCROLL_SPACING 3 -#ifdef HAVE_LCD_BITMAP #define SCROLL_LINE_SIZE (MAX_PATH + SCROLL_SPACING + 3*LCD_WIDTH/2 + 2) -#else -#define SCROLL_LINE_SIZE (MAX_PATH + SCROLL_SPACING + 3*LCD_WIDTH + 2) -#endif struct scrollinfo { @@ -95,20 +91,14 @@ struct scroll_screen_info long ticks; /* # of ticks between updates*/ long delay; /* ticks delay before start */ int bidir_limit; /* percent */ -#if defined(HAVE_LCD_BITMAP) || defined(HAVE_REMOTE_LCD) int step; /* pixels per scroll step */ -#endif #if defined(HAVE_REMOTE_LCD) long last_scroll; #endif }; /** main lcd **/ -#ifdef HAVE_LCD_BITMAP #define LCD_SCROLLABLE_LINES ((LCD_HEIGHT+4)/5 < 32 ? (LCD_HEIGHT+4)/5 : 32) -#else -#define LCD_SCROLLABLE_LINES LCD_HEIGHT * 2 -#endif extern struct scroll_screen_info lcd_scroll_info; 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 @@ /* Messages from usb_tick and thread states */ enum { -#ifdef HAVE_LCD_BITMAP USB_SCREENDUMP = -1, /* State */ -#endif USB_EXTRACTED = 0, /* Event+State */ USB_INSERTED, /* Event+State */ 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 @@ #define MASK 0xC0 /* 11000000 */ #define COMP 0x80 /* 10x */ -#ifdef HAVE_LCD_BITMAP - enum codepages { ISO_8859_1 = 0, /* Latin1 */ ISO_8859_7, /* Greek */ @@ -55,23 +53,6 @@ enum codepages { INIT_CODEPAGE = ISO_8859_1, }; -#else /* !HAVE_LCD_BITMAP, reduced support */ - -enum codepages { - ISO_8859_1 = 0, /* Latin1 */ - ISO_8859_7, /* Greek */ - WIN_1251, /* Cyrillic */ - ISO_8859_9, /* Turkish */ - ISO_8859_2, /* Latin Extended */ - WIN_1250, /* Central European */ - WIN_1252, /* Western European */ - UTF_8, /* Unicode */ - NUM_CODEPAGES, - INIT_CODEPAGE = ISO_8859_1, -}; - -#endif - /* Encode a UCS value as UTF-8 and return a pointer after this UTF-8 char. */ unsigned char* utf8encode(unsigned long ucs, unsigned char *utf8); 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, ...) lcd_set_viewport(NULL); -#if defined(HAVE_LCD_BITMAP) int y = 1; #if LCD_DEPTH > 1 @@ -116,9 +115,6 @@ void panicf( const char *fmt, ...) #ifdef ROCKBOX_HAS_LOGF logf_panic_dump(&y); #endif -#else - /* no LCD */ -#endif lcd_update(); 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 @@ #include "fmradio.h" #endif #include "sound.h" -#ifdef HAVE_LCD_BITMAP #include "font.h" -#endif #include "logf.h" #ifdef HAVE_REMOTE_LCD #include "lcd-remote.h" @@ -754,9 +752,7 @@ void shutdown_hw(void) audio_stop(); if (battery_level_safe()) { /* do not save on critical battery */ -#ifdef HAVE_LCD_BITMAP font_unload_all(); -#endif /* Commit pending writes if needed. Even though we don't do write caching, 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 @@ #include "system-sdl.h" #include "sim-ui-defines.h" #include "lcd-sdl.h" -#ifdef HAVE_LCD_BITMAP #include "lcd-bitmap.h" -#endif #ifdef HAVE_REMOTE_LCD #include "lcd-remote-bitmap.h" #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) "$1", "LO", "HI", "STATUS", "EPC" }; int i; -#ifdef HAVE_LCD_BITMAP #if LCD_DEPTH > 1 lcd_set_backdrop(NULL); lcd_set_drawmode(DRMODE_SOLID); @@ -270,7 +269,7 @@ void exception_handler(void* stack_ptr, unsigned int cause, unsigned int epc) #endif lcd_setfont(FONT_SYSFIXED); lcd_set_viewport(NULL); -#endif + lcd_clear_display(); backlight_hw_on(); 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 @@ #define USB_FULL_INIT #endif -#ifdef HAVE_LCD_BITMAP bool do_screendump_instead_of_usb = false; -#endif #if !defined(SIMULATOR) && !defined(USB_NONE) @@ -116,7 +114,6 @@ static void try_reboot(void) #endif /* USB_FIRWIRE_HANDLING */ /* Screen dump */ -#ifdef HAVE_LCD_BITMAP static inline bool usb_do_screendump(void) { if(do_screendump_instead_of_usb) @@ -129,7 +126,6 @@ static inline bool usb_do_screendump(void) } return false; } -#endif /* HAVE_LCD_BITMAP */ /* Power (charging-only) button */ static inline void usb_detect_charging_only(bool detect) @@ -458,13 +454,11 @@ static void NORETURN_ATTR usb_thread(void) if(usb_state != USB_EXTRACTED) break; -#ifdef HAVE_LCD_BITMAP if(usb_do_screendump()) { usb_state = USB_SCREENDUMP; break; } -#endif usb_state = USB_POWERED; usb_stack_enable(true); |