summaryrefslogtreecommitdiffstats
path: root/firmware/common
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-07-17 10:31:31 -0400
committerSolomon Peachy <pizza@shaftnet.org>2020-07-24 21:20:13 +0000
commit658026e6267277b27d297c481728f74d160a8481 (patch)
tree915a9d2bb48469bdd5b9127dc19a61f230721a6c /firmware/common
parent8cb555460ff79e636a7907fb2589e16db98c8600 (diff)
downloadrockbox-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/common')
-rw-r--r--firmware/common/unicode.c25
1 files changed, 0 insertions, 25 deletions
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++;