len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[4/4] Remove HAVE_LCD_BITMAP, as it's now the only choice.

Browse source 
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
This commit is contained in:
Solomon Peachy 2020-07-17 10:31:31 -04:00
parent 8cb555460f
commit 658026e626
240 changed files with 288 additions and 1759 deletions
Download patch file Download diff file Expand all files Collapse all files

25
firmware/common/unicode.c
View file

@ -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++;