diff options
author | Marcoen Hirschberg <marcoen@gmail.com> | 2005-12-06 15:04:48 +0000 |
---|---|---|
committer | Marcoen Hirschberg <marcoen@gmail.com> | 2005-12-06 15:04:48 +0000 |
commit | f9752c408d427754a63519a60a13eaf1cbdf245d (patch) | |
tree | 143a46cb0d24e877ce5ad0734d3bd3fb85ce9a8e /tools | |
parent | d622e6416596b2be58f9a0c98fa56c76d44242ae (diff) | |
download | rockbox-f9752c408d427754a63519a60a13eaf1cbdf245d.tar.gz rockbox-f9752c408d427754a63519a60a13eaf1cbdf245d.zip |
move some code from .h files to .c files and polish unicode.c a bit
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8174 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools')
-rw-r--r-- | tools/Makefile | 2 | ||||
-rw-r--r-- | tools/codepage_tables.c (renamed from tools/codepages.h) | 44 | ||||
-rw-r--r-- | tools/codepages.c | 34 |
3 files changed, 40 insertions, 40 deletions
diff --git a/tools/Makefile b/tools/Makefile index a8e8ddcc6c..89c3681cc9 100644 --- a/tools/Makefile +++ b/tools/Makefile | |||
@@ -41,7 +41,7 @@ ipod_fw: ipod_fw.c | |||
41 | convbdf: convbdf.c | 41 | convbdf: convbdf.c |
42 | $(CC) -g $+ -o $@ | 42 | $(CC) -g $+ -o $@ |
43 | 43 | ||
44 | codepages: codepages.c | 44 | codepages: codepages.c codepage_tables.c |
45 | $(CC) -g $+ -o $@ | 45 | $(CC) -g $+ -o $@ |
46 | 46 | ||
47 | generate_rocklatin: generate_rocklatin.c ../firmware/drivers/lcd-player-charset.c | 47 | generate_rocklatin: generate_rocklatin.c ../firmware/drivers/lcd-player-charset.c |
diff --git a/tools/codepages.h b/tools/codepage_tables.c index cfe9a4cca8..45e3d529ab 100644 --- a/tools/codepages.h +++ b/tools/codepage_tables.c | |||
@@ -17,7 +17,41 @@ | |||
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | 19 | ||
20 | static const unsigned short cp932_table[] = { | 20 | #include "codepage_tables.h" |
21 | |||
22 | const unsigned short iso8859_7_to_uni[] = { | ||
23 | 0x2018, 0x2019, 0x00A3, 0x20AC, 0x20AF, 0x00A6, 0x00A7, /* A1-A7 */ | ||
24 | 0x00A8, 0x00A9, 0x037A, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x2015, /* A8-AF */ | ||
25 | 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x0384, 0x0385, 0x0386, 0x00B7 /* B0-B7 */ | ||
26 | }; | ||
27 | |||
28 | const unsigned short cp1251_to_uni[] = { | ||
29 | 0x0402, 0x0403, 0x201A, 0x0453, 0x201E, 0x2026, 0x2020, 0x2021, /* 80-87 */ | ||
30 | 0x20AC, 0x2030, 0x0409, 0x2039, 0x040A, 0x040C, 0x040B, 0x040F, /* 88-8F */ | ||
31 | 0x0452, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, /* 90-97 */ | ||
32 | 0x0098, 0x2122, 0x0459, 0x203A, 0x045A, 0x045C, 0x045B, 0x045F, /* 98-9F */ | ||
33 | 0x00A0, 0x040E, 0x045E, 0x0408, 0x00A4, 0x0490, 0x00A6, 0x00A7, /* A0-A7 */ | ||
34 | 0x0401, 0x00A9, 0x0404, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x0407, /* A8-AF */ | ||
35 | 0x00B0, 0x00B1, 0x0406, 0x0456, 0x0491, 0x00B5, 0x00B6, 0x00B7, /* B0-B7 */ | ||
36 | 0x0451, 0x2116, 0x0454, 0x00BB, 0x0458, 0x0405, 0x0455, 0x0457 /* B8-BF */ | ||
37 | }; | ||
38 | |||
39 | const unsigned short iso8859_2_to_uni[] = { | ||
40 | 0x0104, 0x02D8, 0x0141, 0x00A4, 0x013D, 0x015A, 0x00A7, /* A1-A7 */ | ||
41 | 0x00A8, 0x0160, 0x015E, 0x0164, 0x0179, 0x00AD, 0x017D, 0x017B, /* A8-AF */ | ||
42 | 0x00B0, 0x0105, 0x02DB, 0x0142, 0x00B4, 0x013E, 0x015B, 0x02C7, /* B0-B7 */ | ||
43 | 0x00B8, 0x0161, 0x015F, 0x0165, 0x017A, 0x02DD, 0x017E, 0x017C, /* B8-BF */ | ||
44 | 0x0154, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0139, 0x0106, 0x00C7, /* C0-C7 */ | ||
45 | 0x010C, 0x00C9, 0x0118, 0x00CB, 0x011A, 0x00CD, 0x00CE, 0x010E, /* C8-CF */ | ||
46 | 0x0110, 0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x00D7, /* D0-D7 */ | ||
47 | 0x0158, 0x016E, 0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162, 0x00DF, /* D8-DF */ | ||
48 | 0x0155, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7, /* E0-E7 */ | ||
49 | 0x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F, /* E8-EF */ | ||
50 | 0x0111, 0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7, /* F0-F7 */ | ||
51 | 0x0159, 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9 /* F8-FF */ | ||
52 | }; | ||
53 | |||
54 | const unsigned short cp932_table[] = { | ||
21 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, | 55 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, |
22 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, | 56 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, |
23 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, | 57 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, |
@@ -4116,8 +4150,7 @@ static const unsigned short cp932_table[] = { | |||
4116 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, | 4150 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, |
4117 | }; | 4151 | }; |
4118 | 4152 | ||
4119 | 4153 | const unsigned short cp936_table[] = { | |
4120 | static const unsigned short cp936_table[] = { | ||
4121 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, | 4154 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, |
4122 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, | 4155 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, |
4123 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, | 4156 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, |
@@ -8217,7 +8250,7 @@ static const unsigned short cp936_table[] = { | |||
8217 | }; | 8250 | }; |
8218 | 8251 | ||
8219 | 8252 | ||
8220 | static const unsigned short cp949_table[] = { | 8253 | const unsigned short cp949_table[] = { |
8221 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, | 8254 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, |
8222 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, | 8255 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, |
8223 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, | 8256 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, |
@@ -12317,7 +12350,7 @@ static const unsigned short cp949_table[] = { | |||
12317 | }; | 12350 | }; |
12318 | 12351 | ||
12319 | 12352 | ||
12320 | static const unsigned short cp950_table[] = { | 12353 | const unsigned short cp950_table[] = { |
12321 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, | 12354 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, |
12322 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, | 12355 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, |
12323 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, | 12356 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, |
@@ -16416,4 +16449,3 @@ static const unsigned short cp950_table[] = { | |||
16416 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, | 16449 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, |
16417 | }; | 16450 | }; |
16418 | 16451 | ||
16419 | |||
diff --git a/tools/codepages.c b/tools/codepages.c index 94768860f4..af181a7b7d 100644 --- a/tools/codepages.c +++ b/tools/codepages.c | |||
@@ -19,44 +19,12 @@ | |||
19 | #include <stdio.h> | 19 | #include <stdio.h> |
20 | #include <stdlib.h> | 20 | #include <stdlib.h> |
21 | #include <string.h> | 21 | #include <string.h> |
22 | #include "codepages.h" | 22 | #include "codepage_tables.h" |
23 | 23 | ||
24 | #define MAX_TABLE_SIZE 32768 | 24 | #define MAX_TABLE_SIZE 32768 |
25 | 25 | ||
26 | static unsigned short iso_table[MAX_TABLE_SIZE]; | 26 | static unsigned short iso_table[MAX_TABLE_SIZE]; |
27 | 27 | ||
28 | static const unsigned short iso8859_7_to_uni[] = { | ||
29 | 0x2018, 0x2019, 0x00A3, 0x20AC, 0x20AF, 0x00A6, 0x00A7, /* A1-A7 */ | ||
30 | 0x00A8, 0x00A9, 0x037A, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x2015, /* A8-AF */ | ||
31 | 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x0384, 0x0385, 0x0386, 0x00B7 /* B0-B7 */ | ||
32 | }; | ||
33 | |||
34 | static const unsigned short cp1251_to_uni[] = { | ||
35 | 0x0402, 0x0403, 0x201A, 0x0453, 0x201E, 0x2026, 0x2020, 0x2021, /* 80-87 */ | ||
36 | 0x20AC, 0x2030, 0x0409, 0x2039, 0x040A, 0x040C, 0x040B, 0x040F, /* 88-8F */ | ||
37 | 0x0452, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, /* 90-97 */ | ||
38 | 0x0098, 0x2122, 0x0459, 0x203A, 0x045A, 0x045C, 0x045B, 0x045F, /* 98-9F */ | ||
39 | 0x00A0, 0x040E, 0x045E, 0x0408, 0x00A4, 0x0490, 0x00A6, 0x00A7, /* A0-A7 */ | ||
40 | 0x0401, 0x00A9, 0x0404, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x0407, /* A8-AF */ | ||
41 | 0x00B0, 0x00B1, 0x0406, 0x0456, 0x0491, 0x00B5, 0x00B6, 0x00B7, /* B0-B7 */ | ||
42 | 0x0451, 0x2116, 0x0454, 0x00BB, 0x0458, 0x0405, 0x0455, 0x0457 /* B8-BF */ | ||
43 | }; | ||
44 | |||
45 | static const unsigned short iso8859_2_to_uni[] = { | ||
46 | 0x0104, 0x02D8, 0x0141, 0x00A4, 0x013D, 0x015A, 0x00A7, /* A1-A7 */ | ||
47 | 0x00A8, 0x0160, 0x015E, 0x0164, 0x0179, 0x00AD, 0x017D, 0x017B, /* A8-AF */ | ||
48 | 0x00B0, 0x0105, 0x02DB, 0x0142, 0x00B4, 0x013E, 0x015B, 0x02C7, /* B0-B7 */ | ||
49 | 0x00B8, 0x0161, 0x015F, 0x0165, 0x017A, 0x02DD, 0x017E, 0x017C, /* B8-BF */ | ||
50 | 0x0154, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0139, 0x0106, 0x00C7, /* C0-C7 */ | ||
51 | 0x010C, 0x00C9, 0x0118, 0x00CB, 0x011A, 0x00CD, 0x00CE, 0x010E, /* C8-CF */ | ||
52 | 0x0110, 0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x00D7, /* D0-D7 */ | ||
53 | 0x0158, 0x016E, 0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162, 0x00DF, /* D8-DF */ | ||
54 | 0x0155, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7, /* E0-E7 */ | ||
55 | 0x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F, /* E8-EF */ | ||
56 | 0x0111, 0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7, /* F0-F7 */ | ||
57 | 0x0159, 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9 /* F8-FF */ | ||
58 | }; | ||
59 | |||
60 | unsigned short iso_decode(unsigned char *latin1, int cp, int count) | 28 | unsigned short iso_decode(unsigned char *latin1, int cp, int count) |
61 | { | 29 | { |
62 | unsigned short ucs = 0; | 30 | unsigned short ucs = 0; |