diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-19 19:38:45 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-24 21:20:13 +0000 |
commit | 0c4f89370d05056faa789aa9cabcccc4e509fb9f (patch) | |
tree | 6ddf7fff0a47564db41d39927ea1acbdb03e74ee /uisimulator/common | |
parent | 092c340a2062fa98b7387fc5fd63578ddae7d0b6 (diff) | |
download | rockbox-0c4f89370d05056faa789aa9cabcccc4e509fb9f.tar.gz rockbox-0c4f89370d05056faa789aa9cabcccc4e509fb9f.zip |
[2/4] get rid of HAVE_LCD_CHARCELLS
HAVE_LCD_BITMAP is now redundant.
lcd_bitmap is always-on in features.txt so manual and lang strings
don't have to change
Change-Id: I08eeb20de48099ffc2dc23782711af368c2ec794
Diffstat (limited to 'uisimulator/common')
-rw-r--r-- | uisimulator/common/SOURCES | 5 | ||||
-rw-r--r-- | uisimulator/common/backlight-sim.c | 2 | ||||
-rw-r--r-- | uisimulator/common/font-player.c | 548 | ||||
-rw-r--r-- | uisimulator/common/font-player.h | 27 | ||||
-rw-r--r-- | uisimulator/common/lcd-common.c | 2 | ||||
-rw-r--r-- | uisimulator/common/lcd-playersim.c | 119 | ||||
-rw-r--r-- | uisimulator/common/lcd-playersim.h | 38 | ||||
-rw-r--r-- | uisimulator/common/sim_icons.c | 312 | ||||
-rw-r--r-- | uisimulator/common/stubs.c | 20 |
9 files changed, 2 insertions, 1071 deletions
diff --git a/uisimulator/common/SOURCES b/uisimulator/common/SOURCES index 9833753236..6d15a04c41 100644 --- a/uisimulator/common/SOURCES +++ b/uisimulator/common/SOURCES | |||
@@ -1,11 +1,6 @@ | |||
1 | #ifdef SIMULATOR | 1 | #ifdef SIMULATOR |
2 | 2 | ||
3 | lcd-common.c | 3 | lcd-common.c |
4 | #ifdef HAVE_LCD_CHARCELLS | ||
5 | font-player.c | ||
6 | lcd-playersim.c | ||
7 | sim_icons.c | ||
8 | #endif | ||
9 | sim_tasks.c | 4 | sim_tasks.c |
10 | fmradio.c | 5 | fmradio.c |
11 | backlight-sim.c | 6 | backlight-sim.c |
diff --git a/uisimulator/common/backlight-sim.c b/uisimulator/common/backlight-sim.c index 0d6440b7f3..7acdee84ae 100644 --- a/uisimulator/common/backlight-sim.c +++ b/uisimulator/common/backlight-sim.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #ifdef HAVE_LCD_SLEEP | 27 | #ifdef HAVE_LCD_SLEEP |
28 | extern void lcd_awake(void); | 28 | extern void lcd_awake(void); |
29 | #endif | 29 | #endif |
30 | /* in uisimulator/sdl/lcd-bitmap.c and lcd-charcell.c */ | 30 | /* in uisimulator/sdl/lcd-bitmap.c */ |
31 | extern void sim_backlight(int value); | 31 | extern void sim_backlight(int value); |
32 | 32 | ||
33 | bool backlight_hw_init(void) | 33 | bool backlight_hw_init(void) |
diff --git a/uisimulator/common/font-player.c b/uisimulator/common/font-player.c deleted file mode 100644 index f08a98348f..0000000000 --- a/uisimulator/common/font-player.c +++ /dev/null | |||
@@ -1,548 +0,0 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * This program is free software; you can redistribute it and/or | ||
11 | * modify it under the terms of the GNU General Public License | ||
12 | * as published by the Free Software Foundation; either version 2 | ||
13 | * of the License, or (at your option) any later version. | ||
14 | * | ||
15 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
16 | * KIND, either express or implied. | ||
17 | * | ||
18 | ****************************************************************************/ | ||
19 | |||
20 | #include "font-player.h" | ||
21 | #include "hwcompat.h" | ||
22 | |||
23 | static unsigned char font_player_newlcd[256][7] = { | ||
24 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* 00 */ | ||
25 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* 01 */ | ||
26 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* 02 */ | ||
27 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* 03 */ | ||
28 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* 04 */ | ||
29 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* 05 */ | ||
30 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* 06 */ | ||
31 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* 07 */ | ||
32 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* 08 */ | ||
33 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* 09 */ | ||
34 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* 0a */ | ||
35 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* 0b */ | ||
36 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* 0c */ | ||
37 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* 0d */ | ||
38 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* 0e */ | ||
39 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* 0f */ | ||
40 | { 0x00, 0x10, 0x1c, 0x1f, 0x1c, 0x10, 0x00 }, /* 10 */ | ||
41 | { 0x00, 0x01, 0x07, 0x1f, 0x07, 0x01, 0x00 }, /* 11 */ | ||
42 | { 0x00, 0x10, 0x08, 0x04, 0x02, 0x01, 0x00 }, /* 12 */ | ||
43 | { 0x0a, 0x0a, 0x0a, 0x0a, 0x00, 0x00, 0x0a }, /* 13 */ | ||
44 | { 0x0f, 0x1d, 0x1d, 0x0d, 0x05, 0x05, 0x05 }, /* 14 */ | ||
45 | { 0x07, 0x08, 0x0e, 0x11, 0x0e, 0x02, 0x1c }, /* 15 */ | ||
46 | { 0x00, 0x00, 0x1f, 0x1f, 0x00, 0x00, 0x00 }, /* 16 */ | ||
47 | { 0x01, 0x01, 0x05, 0x09, 0x1f, 0x08, 0x04 }, /* 17 */ | ||
48 | { 0x04, 0x0e, 0x15, 0x04, 0x04, 0x04, 0x04 }, /* 18 */ | ||
49 | { 0x04, 0x04, 0x04, 0x04, 0x15, 0x0e, 0x04 }, /* 19 */ | ||
50 | { 0x11, 0x19, 0x1d, 0x1f, 0x1d, 0x19, 0x11 }, /* 1a */ | ||
51 | { 0x11, 0x13, 0x17, 0x1f, 0x17, 0x13, 0x11 }, /* 1b */ | ||
52 | { 0x10, 0x14, 0x12, 0x1f, 0x12, 0x14, 0x10 }, /* 1c */ | ||
53 | { 0x01, 0x05, 0x09, 0x1f, 0x09, 0x05, 0x01 }, /* 1d */ | ||
54 | { 0x00, 0x1f, 0x0e, 0x0e, 0x04, 0x04, 0x00 }, /* 1e */ | ||
55 | { 0x00, 0x04, 0x04, 0x0e, 0x0e, 0x1f, 0x00 }, /* 1f */ | ||
56 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* 20 */ | ||
57 | { 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x04 }, /* 21 */ | ||
58 | { 0x0a, 0x0a, 0x0a, 0x00, 0x00, 0x00, 0x00 }, /* 22 */ | ||
59 | { 0x0a, 0x0a, 0x1f, 0x0a, 0x1f, 0x0a, 0x0a }, /* 23 */ | ||
60 | { 0x04, 0x0f, 0x14, 0x0e, 0x05, 0x1e, 0x04 }, /* 24 */ | ||
61 | { 0x18, 0x19, 0x02, 0x04, 0x08, 0x13, 0x03 }, /* 25 */ | ||
62 | { 0x0c, 0x12, 0x14, 0x08, 0x15, 0x12, 0x0d }, /* 26 */ | ||
63 | { 0x0c, 0x04, 0x08, 0x00, 0x00, 0x00, 0x00 }, /* 27 */ | ||
64 | { 0x02, 0x04, 0x08, 0x08, 0x08, 0x04, 0x02 }, /* 28 */ | ||
65 | { 0x08, 0x04, 0x02, 0x02, 0x02, 0x04, 0x08 }, /* 29 */ | ||
66 | { 0x00, 0x04, 0x15, 0x0e, 0x15, 0x04, 0x00 }, /* 2a */ | ||
67 | { 0x00, 0x04, 0x04, 0x1f, 0x04, 0x04, 0x00 }, /* 2b */ | ||
68 | { 0x00, 0x00, 0x00, 0x00, 0x0c, 0x04, 0x08 }, /* 2c */ | ||
69 | { 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00 }, /* 2d */ | ||
70 | { 0x00, 0x00, 0x00, 0x00, 0x0c, 0x0c, 0x00 }, /* 2e */ | ||
71 | { 0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x00 }, /* 2f */ | ||
72 | { 0x0e, 0x11, 0x13, 0x15, 0x19, 0x11, 0x0e }, /* 30 */ | ||
73 | { 0x04, 0x0c, 0x04, 0x04, 0x04, 0x04, 0x0e }, /* 31 */ | ||
74 | { 0x0e, 0x11, 0x01, 0x02, 0x04, 0x08, 0x1f }, /* 32 */ | ||
75 | { 0x1f, 0x02, 0x04, 0x02, 0x01, 0x11, 0x0e }, /* 33 */ | ||
76 | { 0x02, 0x06, 0x0a, 0x12, 0x1f, 0x02, 0x02 }, /* 34 */ | ||
77 | { 0x1f, 0x10, 0x1e, 0x01, 0x01, 0x11, 0x0e }, /* 35 */ | ||
78 | { 0x06, 0x08, 0x10, 0x1e, 0x11, 0x11, 0x0e }, /* 36 */ | ||
79 | { 0x1f, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04 }, /* 37 */ | ||
80 | { 0x0e, 0x11, 0x11, 0x0e, 0x11, 0x11, 0x0e }, /* 38 */ | ||
81 | { 0x0e, 0x11, 0x11, 0x0f, 0x01, 0x02, 0x0c }, /* 39 */ | ||
82 | { 0x00, 0x0c, 0x0c, 0x00, 0x0c, 0x0c, 0x00 }, /* 3a */ | ||
83 | { 0x0c, 0x0c, 0x00, 0x0c, 0x0c, 0x04, 0x08 }, /* 3b */ | ||
84 | { 0x02, 0x04, 0x08, 0x10, 0x08, 0x04, 0x02 }, /* 3c */ | ||
85 | { 0x00, 0x00, 0x1f, 0x00, 0x1f, 0x00, 0x00 }, /* 3d */ | ||
86 | { 0x08, 0x04, 0x02, 0x01, 0x02, 0x04, 0x08 }, /* 3e */ | ||
87 | { 0x0e, 0x11, 0x01, 0x02, 0x04, 0x00, 0x04 }, /* 3f */ | ||
88 | { 0x0e, 0x11, 0x01, 0x0d, 0x15, 0x15, 0x0e }, /* 40 */ | ||
89 | { 0x0e, 0x11, 0x11, 0x11, 0x1f, 0x11, 0x11 }, /* 41 */ | ||
90 | { 0x1e, 0x11, 0x11, 0x1e, 0x11, 0x11, 0x1e }, /* 42 */ | ||
91 | { 0x0e, 0x11, 0x10, 0x10, 0x10, 0x11, 0x0e }, /* 43 */ | ||
92 | { 0x1c, 0x12, 0x11, 0x11, 0x11, 0x12, 0x1c }, /* 44 */ | ||
93 | { 0x1f, 0x10, 0x10, 0x1e, 0x10, 0x10, 0x1f }, /* 45 */ | ||
94 | { 0x1f, 0x10, 0x10, 0x1e, 0x10, 0x10, 0x10 }, /* 46 */ | ||
95 | { 0x0e, 0x11, 0x10, 0x17, 0x11, 0x11, 0x0f }, /* 47 */ | ||
96 | { 0x11, 0x11, 0x11, 0x1f, 0x11, 0x11, 0x11 }, /* 48 */ | ||
97 | { 0x0e, 0x04, 0x04, 0x04, 0x04, 0x04, 0x0e }, /* 49 */ | ||
98 | { 0x0f, 0x02, 0x02, 0x02, 0x02, 0x12, 0x0c }, /* 4a */ | ||
99 | { 0x11, 0x12, 0x14, 0x18, 0x14, 0x12, 0x11 }, /* 4b */ | ||
100 | { 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x1f }, /* 4c */ | ||
101 | { 0x11, 0x1b, 0x15, 0x15, 0x11, 0x11, 0x11 }, /* 4d */ | ||
102 | { 0x11, 0x11, 0x19, 0x15, 0x13, 0x11, 0x11 }, /* 4e */ | ||
103 | { 0x0e, 0x11, 0x11, 0x11, 0x11, 0x11, 0x0e }, /* 4f */ | ||
104 | { 0x1e, 0x11, 0x11, 0x1e, 0x10, 0x10, 0x10 }, /* 50 */ | ||
105 | { 0x0e, 0x11, 0x11, 0x11, 0x11, 0x12, 0x0d }, /* 51 */ | ||
106 | { 0x1e, 0x11, 0x11, 0x1e, 0x14, 0x12, 0x11 }, /* 52 */ | ||
107 | { 0x0e, 0x11, 0x10, 0x0e, 0x01, 0x11, 0x0e }, /* 53 */ | ||
108 | { 0x1f, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04 }, /* 54 */ | ||
109 | { 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x0e }, /* 55 */ | ||
110 | { 0x11, 0x11, 0x11, 0x11, 0x11, 0x0a, 0x04 }, /* 56 */ | ||
111 | { 0x11, 0x11, 0x11, 0x15, 0x15, 0x15, 0x0a }, /* 57 */ | ||
112 | { 0x11, 0x11, 0x0a, 0x04, 0x0a, 0x11, 0x11 }, /* 58 */ | ||
113 | { 0x11, 0x11, 0x0a, 0x04, 0x04, 0x04, 0x04 }, /* 59 */ | ||
114 | { 0x1f, 0x01, 0x02, 0x04, 0x08, 0x10, 0x1f }, /* 5a */ | ||
115 | { 0x0e, 0x08, 0x08, 0x08, 0x08, 0x08, 0x0e }, /* 5b */ | ||
116 | { 0x11, 0x0a, 0x1f, 0x04, 0x1f, 0x04, 0x04 }, /* 5c */ | ||
117 | { 0x0e, 0x02, 0x02, 0x02, 0x02, 0x02, 0x0e }, /* 5d */ | ||
118 | { 0x04, 0x0a, 0x11, 0x00, 0x00, 0x00, 0x00 }, /* 5e */ | ||
119 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f }, /* 5f */ | ||
120 | { 0x08, 0x04, 0x02, 0x00, 0x00, 0x00, 0x00 }, /* 60 */ | ||
121 | { 0x00, 0x00, 0x0e, 0x01, 0x0f, 0x11, 0x0f }, /* 61 */ | ||
122 | { 0x10, 0x10, 0x16, 0x19, 0x11, 0x11, 0x1e }, /* 62 */ | ||
123 | { 0x00, 0x00, 0x0e, 0x10, 0x10, 0x11, 0x0e }, /* 63 */ | ||
124 | { 0x01, 0x01, 0x0d, 0x13, 0x11, 0x11, 0x0f }, /* 64 */ | ||
125 | { 0x00, 0x00, 0x0e, 0x11, 0x1f, 0x10, 0x0e }, /* 65 */ | ||
126 | { 0x06, 0x09, 0x08, 0x1c, 0x08, 0x08, 0x08 }, /* 66 */ | ||
127 | { 0x00, 0x0f, 0x11, 0x11, 0x0f, 0x01, 0x0e }, /* 67 */ | ||
128 | { 0x10, 0x10, 0x16, 0x19, 0x11, 0x11, 0x11 }, /* 68 */ | ||
129 | { 0x04, 0x00, 0x0c, 0x04, 0x04, 0x04, 0x0e }, /* 69 */ | ||
130 | { 0x02, 0x00, 0x06, 0x02, 0x02, 0x12, 0x0c }, /* 6a */ | ||
131 | { 0x10, 0x10, 0x12, 0x14, 0x18, 0x14, 0x12 }, /* 6b */ | ||
132 | { 0x0c, 0x04, 0x04, 0x04, 0x04, 0x04, 0x0e }, /* 6c */ | ||
133 | { 0x00, 0x00, 0x1a, 0x15, 0x15, 0x11, 0x11 }, /* 6d */ | ||
134 | { 0x00, 0x00, 0x16, 0x19, 0x11, 0x11, 0x11 }, /* 6e */ | ||
135 | { 0x00, 0x00, 0x0e, 0x11, 0x11, 0x11, 0x0e }, /* 6f */ | ||
136 | { 0x00, 0x00, 0x1e, 0x11, 0x1e, 0x10, 0x10 }, /* 70 */ | ||
137 | { 0x00, 0x00, 0x0d, 0x13, 0x0f, 0x01, 0x01 }, /* 71 */ | ||
138 | { 0x00, 0x00, 0x16, 0x19, 0x10, 0x10, 0x10 }, /* 72 */ | ||
139 | { 0x00, 0x00, 0x0e, 0x10, 0x0e, 0x01, 0x1e }, /* 73 */ | ||
140 | { 0x08, 0x08, 0x1c, 0x08, 0x08, 0x09, 0x06 }, /* 74 */ | ||
141 | { 0x00, 0x00, 0x11, 0x11, 0x11, 0x13, 0x0d }, /* 75 */ | ||
142 | { 0x00, 0x00, 0x11, 0x11, 0x11, 0x0a, 0x04 }, /* 76 */ | ||
143 | { 0x00, 0x00, 0x11, 0x11, 0x15, 0x15, 0x0a }, /* 77 */ | ||
144 | { 0x00, 0x00, 0x11, 0x0a, 0x04, 0x0a, 0x11 }, /* 78 */ | ||
145 | { 0x00, 0x00, 0x11, 0x11, 0x0f, 0x01, 0x1e }, /* 79 */ | ||
146 | { 0x00, 0x00, 0x1f, 0x02, 0x04, 0x08, 0x1f }, /* 7a */ | ||
147 | { 0x02, 0x04, 0x04, 0x08, 0x04, 0x04, 0x02 }, /* 7b */ | ||
148 | { 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04 }, /* 7c */ | ||
149 | { 0x08, 0x04, 0x04, 0x02, 0x04, 0x04, 0x08 }, /* 7d */ | ||
150 | { 0x00, 0x04, 0x02, 0x1f, 0x02, 0x04, 0x00 }, /* 7e */ | ||
151 | { 0x00, 0x04, 0x08, 0x1f, 0x08, 0x04, 0x00 }, /* 7f */ | ||
152 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f }, /* 80 */ | ||
153 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f }, /* 81 */ | ||
154 | { 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x1f }, /* 82 */ | ||
155 | { 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x1f, 0x1f }, /* 83 */ | ||
156 | { 0x00, 0x00, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f }, /* 84 */ | ||
157 | { 0x00, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f }, /* 85 */ | ||
158 | { 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f }, /* 86 */ | ||
159 | { 0x00, 0x0a, 0x04, 0x1f, 0x04, 0x0a, 0x00 }, /* 87 */ | ||
160 | { 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11 }, /* 88 */ | ||
161 | { 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19 }, /* 89 */ | ||
162 | { 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d }, /* 8a */ | ||
163 | { 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08 }, /* 8b */ | ||
164 | { 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c }, /* 8c */ | ||
165 | { 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e }, /* 8d */ | ||
166 | { 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f }, /* 8e */ | ||
167 | { 0x00, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x00 }, /* 8f */ | ||
168 | { 0x00, 0x0e, 0x1f, 0x1f, 0x1f, 0x0e, 0x00 }, /* 90 */ | ||
169 | { 0x1f, 0x11, 0x11, 0x11, 0x11, 0x11, 0x1f }, /* 91 */ | ||
170 | { 0x1f, 0x1b, 0x13, 0x1b, 0x1b, 0x11, 0x1f }, /* 92 */ | ||
171 | { 0x1f, 0x11, 0x1d, 0x1b, 0x17, 0x11, 0x1f }, /* 93 */ | ||
172 | { 0x00, 0x00, 0x07, 0x04, 0x04, 0x14, 0x08 }, /* 94 */ | ||
173 | { 0x04, 0x04, 0x1f, 0x04, 0x04, 0x00, 0x1f }, /* 95 */ | ||
174 | { 0x00, 0x11, 0x0a, 0x04, 0x0a, 0x11, 0x00 }, /* 96 */ | ||
175 | { 0x00, 0x04, 0x00, 0x1f, 0x00, 0x04, 0x00 }, /* 97 */ | ||
176 | { 0x1f, 0x00, 0x11, 0x0a, 0x04, 0x0a, 0x11 }, /* 98 */ | ||
177 | { 0x1c, 0x04, 0x1c, 0x10, 0x1c, 0x00, 0x00 }, /* 99 */ | ||
178 | { 0x1c, 0x04, 0x1c, 0x04, 0x1c, 0x00, 0x00 }, /* 9a */ | ||
179 | { 0x11, 0x12, 0x17, 0x09, 0x17, 0x04, 0x07 }, /* 9b */ | ||
180 | { 0x11, 0x12, 0x14, 0x09, 0x13, 0x07, 0x01 }, /* 9c */ | ||
181 | { 0x18, 0x09, 0x1a, 0x0d, 0x1b, 0x17, 0x01 }, /* 9d */ | ||
182 | { 0x00, 0x05, 0x0a, 0x14, 0x0a, 0x05, 0x00 }, /* 9e */ | ||
183 | { 0x00, 0x14, 0x0a, 0x05, 0x0a, 0x14, 0x00 }, /* 9f */ | ||
184 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* a0 */ | ||
185 | { 0x00, 0x00, 0x00, 0x00, 0x1c, 0x14, 0x1c }, /* a1 */ | ||
186 | { 0x07, 0x04, 0x04, 0x04, 0x00, 0x00, 0x00 }, /* a2 */ | ||
187 | { 0x00, 0x00, 0x00, 0x04, 0x04, 0x04, 0x1c }, /* a3 */ | ||
188 | { 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x04 }, /* a4 */ | ||
189 | { 0x00, 0x00, 0x00, 0x0c, 0x0c, 0x00, 0x00 }, /* a5 */ | ||
190 | { 0x00, 0x1f, 0x01, 0x1f, 0x01, 0x02, 0x04 }, /* a6 */ | ||
191 | { 0x00, 0x00, 0x1f, 0x01, 0x06, 0x04, 0x08 }, /* a7 */ | ||
192 | { 0x00, 0x00, 0x02, 0x04, 0x0c, 0x14, 0x04 }, /* a8 */ | ||
193 | { 0x00, 0x00, 0x04, 0x1f, 0x11, 0x01, 0x06 }, /* a9 */ | ||
194 | { 0x00, 0x00, 0x00, 0x1f, 0x04, 0x04, 0x1f }, /* aa */ | ||
195 | { 0x00, 0x00, 0x02, 0x1f, 0x06, 0x0a, 0x12 }, /* ab */ | ||
196 | { 0x00, 0x00, 0x08, 0x1f, 0x09, 0x0a, 0x08 }, /* ac */ | ||
197 | { 0x00, 0x00, 0x00, 0x0e, 0x02, 0x02, 0x1f }, /* ad */ | ||
198 | { 0x00, 0x00, 0x1e, 0x02, 0x1e, 0x02, 0x1e }, /* ae */ | ||
199 | { 0x00, 0x00, 0x00, 0x15, 0x15, 0x01, 0x06 }, /* af */ | ||
200 | { 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00 }, /* b0 */ | ||
201 | { 0x1f, 0x01, 0x05, 0x06, 0x04, 0x04, 0x08 }, /* b1 */ | ||
202 | { 0x01, 0x02, 0x04, 0x0c, 0x14, 0x04, 0x04 }, /* b2 */ | ||
203 | { 0x04, 0x1f, 0x11, 0x11, 0x01, 0x02, 0x04 }, /* b3 */ | ||
204 | { 0x00, 0x1f, 0x04, 0x04, 0x04, 0x04, 0x1f }, /* b4 */ | ||
205 | { 0x02, 0x1f, 0x02, 0x06, 0x0a, 0x12, 0x02 }, /* b5 */ | ||
206 | { 0x08, 0x1f, 0x09, 0x09, 0x09, 0x09, 0x12 }, /* b6 */ | ||
207 | { 0x04, 0x1f, 0x04, 0x1f, 0x04, 0x04, 0x04 }, /* b7 */ | ||
208 | { 0x00, 0x0f, 0x09, 0x11, 0x01, 0x02, 0x0c }, /* b8 */ | ||
209 | { 0x08, 0x0f, 0x12, 0x02, 0x02, 0x02, 0x04 }, /* b9 */ | ||
210 | { 0x00, 0x1f, 0x01, 0x01, 0x01, 0x01, 0x1f }, /* ba */ | ||
211 | { 0x0a, 0x1f, 0x0a, 0x02, 0x02, 0x02, 0x04 }, /* bb */ | ||
212 | { 0x00, 0x18, 0x00, 0x18, 0x01, 0x02, 0x1c }, /* bc */ | ||
213 | { 0x00, 0x1f, 0x01, 0x02, 0x04, 0x0a, 0x11 }, /* bd */ | ||
214 | { 0x08, 0x1f, 0x09, 0x0a, 0x08, 0x08, 0x07 }, /* be */ | ||
215 | { 0x00, 0x11, 0x11, 0x09, 0x01, 0x02, 0x0c }, /* bf */ | ||
216 | { 0x00, 0x0f, 0x09, 0x15, 0x03, 0x02, 0x0c }, /* c0 */ | ||
217 | { 0x02, 0x1c, 0x04, 0x1f, 0x04, 0x04, 0x08 }, /* c1 */ | ||
218 | { 0x00, 0x15, 0x15, 0x15, 0x01, 0x02, 0x04 }, /* c2 */ | ||
219 | { 0x0e, 0x00, 0x1f, 0x04, 0x04, 0x04, 0x08 }, /* c3 */ | ||
220 | { 0x08, 0x08, 0x08, 0x0c, 0x0a, 0x08, 0x08 }, /* c4 */ | ||
221 | { 0x04, 0x04, 0x1f, 0x04, 0x04, 0x08, 0x10 }, /* c5 */ | ||
222 | { 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x1f }, /* c6 */ | ||
223 | { 0x00, 0x1f, 0x01, 0x0a, 0x04, 0x0a, 0x10 }, /* c7 */ | ||
224 | { 0x04, 0x1f, 0x02, 0x04, 0x0e, 0x15, 0x04 }, /* c8 */ | ||
225 | { 0x02, 0x02, 0x02, 0x02, 0x02, 0x04, 0x08 }, /* c9 */ | ||
226 | { 0x00, 0x04, 0x02, 0x11, 0x11, 0x11, 0x11 }, /* ca */ | ||
227 | { 0x10, 0x10, 0x1f, 0x10, 0x10, 0x10, 0x0f }, /* cb */ | ||
228 | { 0x00, 0x1f, 0x01, 0x01, 0x01, 0x02, 0x0c }, /* cc */ | ||
229 | { 0x00, 0x08, 0x14, 0x02, 0x01, 0x01, 0x00 }, /* cd */ | ||
230 | { 0x04, 0x1f, 0x04, 0x04, 0x15, 0x15, 0x04 }, /* ce */ | ||
231 | { 0x00, 0x1f, 0x01, 0x01, 0x0a, 0x04, 0x02 }, /* cf */ | ||
232 | { 0x00, 0x0e, 0x00, 0x0e, 0x00, 0x0e, 0x01 }, /* d0 */ | ||
233 | { 0x00, 0x04, 0x08, 0x10, 0x11, 0x1f, 0x01 }, /* d1 */ | ||
234 | { 0x00, 0x01, 0x01, 0x0a, 0x04, 0x0a, 0x10 }, /* d2 */ | ||
235 | { 0x00, 0x1f, 0x08, 0x1f, 0x08, 0x08, 0x07 }, /* d3 */ | ||
236 | { 0x08, 0x08, 0x1f, 0x09, 0x0a, 0x08, 0x08 }, /* d4 */ | ||
237 | { 0x00, 0x0e, 0x02, 0x02, 0x02, 0x02, 0x1f }, /* d5 */ | ||
238 | { 0x00, 0x1f, 0x01, 0x1f, 0x01, 0x01, 0x1f }, /* d6 */ | ||
239 | { 0x0e, 0x00, 0x1f, 0x01, 0x01, 0x02, 0x04 }, /* d7 */ | ||
240 | { 0x12, 0x12, 0x12, 0x12, 0x12, 0x04, 0x08 }, /* d8 */ | ||
241 | { 0x00, 0x04, 0x14, 0x14, 0x15, 0x15, 0x16 }, /* d9 */ | ||
242 | { 0x00, 0x10, 0x10, 0x11, 0x12, 0x14, 0x18 }, /* da */ | ||
243 | { 0x1f, 0x11, 0x11, 0x11, 0x11, 0x11, 0x1f }, /* db */ | ||
244 | { 0x00, 0x1f, 0x11, 0x11, 0x01, 0x02, 0x04 }, /* dc */ | ||
245 | { 0x00, 0x18, 0x00, 0x01, 0x01, 0x02, 0x1c }, /* dd */ | ||
246 | { 0x04, 0x12, 0x08, 0x00, 0x00, 0x00, 0x00 }, /* de */ | ||
247 | { 0x1c, 0x14, 0x1c, 0x00, 0x00, 0x00, 0x00 }, /* df */ | ||
248 | { 0x00, 0x00, 0x09, 0x15, 0x12, 0x12, 0x0d }, /* e0 */ | ||
249 | { 0x00, 0x0e, 0x11, 0x1e, 0x11, 0x1e, 0x10 }, /* e1 */ | ||
250 | { 0x00, 0x11, 0x0a, 0x0a, 0x04, 0x04, 0x08 }, /* e2 */ | ||
251 | { 0x00, 0x00, 0x1f, 0x0a, 0x0a, 0x0a, 0x13 }, /* e3 */ | ||
252 | { 0x1f, 0x10, 0x08, 0x04, 0x08, 0x10, 0x1f }, /* e4 */ | ||
253 | { 0x00, 0x00, 0x0f, 0x14, 0x12, 0x11, 0x0e }, /* e5 */ | ||
254 | { 0x00, 0x09, 0x09, 0x09, 0x0f, 0x08, 0x10 }, /* e6 */ | ||
255 | { 0x00, 0x00, 0x1f, 0x04, 0x04, 0x04, 0x03 }, /* e7 */ | ||
256 | { 0x1f, 0x04, 0x0e, 0x15, 0x0e, 0x04, 0x1f }, /* e8 */ | ||
257 | { 0x00, 0x0e, 0x11, 0x1f, 0x11, 0x11, 0x0e }, /* e9 */ | ||
258 | { 0x00, 0x00, 0x0e, 0x11, 0x11, 0x0a, 0x1b }, /* ea */ | ||
259 | { 0x0f, 0x10, 0x0e, 0x11, 0x11, 0x11, 0x0e }, /* eb */ | ||
260 | { 0x00, 0x00, 0x00, 0x00, 0x0b, 0x15, 0x1a }, /* ec */ | ||
261 | { 0x02, 0x04, 0x0e, 0x15, 0x0e, 0x04, 0x08 }, /* ed */ | ||
262 | { 0x00, 0x0e, 0x10, 0x0e, 0x10, 0x0e, 0x00 }, /* ee */ | ||
263 | { 0x06, 0x09, 0x11, 0x1e, 0x10, 0x10, 0x10 }, /* ef */ | ||
264 | { 0x00, 0x00, 0x08, 0x15, 0x02, 0x00, 0x00 }, /* f0 */ | ||
265 | { 0x00, 0x08, 0x15, 0x0a, 0x15, 0x02, 0x00 }, /* f1 */ | ||
266 | { 0x08, 0x0f, 0x12, 0x0f, 0x0a, 0x1f, 0x02 }, /* f2 */ | ||
267 | { 0x0f, 0x09, 0x0f, 0x09, 0x0f, 0x09, 0x11 }, /* f3 */ | ||
268 | { 0x04, 0x15, 0x15, 0x04, 0x04, 0x0a, 0x11 }, /* f4 */ | ||
269 | { 0x04, 0x04, 0x1d, 0x06, 0x0e, 0x15, 0x04 }, /* f5 */ | ||
270 | { 0x04, 0x04, 0x1f, 0x04, 0x0e, 0x15, 0x04 }, /* f6 */ | ||
271 | { 0x04, 0x0a, 0x11, 0x0e, 0x04, 0x0e, 0x1f }, /* f7 */ | ||
272 | { 0x04, 0x04, 0x0e, 0x04, 0x04, 0x04, 0x1f }, /* f8 */ | ||
273 | { 0x1f, 0x11, 0x11, 0x1f, 0x11, 0x11, 0x1f }, /* f9 */ | ||
274 | { 0x00, 0x01, 0x1e, 0x04, 0x1f, 0x04, 0x04 }, /* fa */ | ||
275 | { 0x00, 0x00, 0x1f, 0x08, 0x0f, 0x09, 0x11 }, /* fb */ | ||
276 | { 0x00, 0x00, 0x1f, 0x15, 0x1f, 0x11, 0x11 }, /* fc */ | ||
277 | { 0x0a, 0x15, 0x0a, 0x15, 0x0a, 0x15, 0x0a }, /* fd */ | ||
278 | { 0x15, 0x0a, 0x15, 0x0a, 0x15, 0x0a, 0x15 }, /* fe */ | ||
279 | { 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f }, /* ff */ | ||
280 | }; | ||
281 | static unsigned char font_player_oldlcd[256][7] = { | ||
282 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* 00 */ | ||
283 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* 01 */ | ||
284 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* 02 */ | ||
285 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* 03 */ | ||
286 | { 0x0e, 0x11, 0x17, 0x15, 0x17, 0x10, 0x0e }, /* 04 */ | ||
287 | { 0x06, 0x09, 0x08, 0x1e, 0x08, 0x08, 0x1f }, /* 05 */ | ||
288 | { 0x04, 0x0f, 0x14, 0x0e, 0x05, 0x1e, 0x04 }, /* 06 */ | ||
289 | { 0x11, 0x0a, 0x1f, 0x04, 0x1f, 0x04, 0x04 }, /* 07 */ | ||
290 | { 0x08, 0x04, 0x0e, 0x11, 0x1f, 0x10, 0x0e }, /* 08 */ | ||
291 | { 0x02, 0x04, 0x0e, 0x11, 0x1f, 0x10, 0x0e }, /* 09 */ | ||
292 | { 0x08, 0x04, 0x00, 0x11, 0x11, 0x13, 0x0d }, /* 0a */ | ||
293 | { 0x08, 0x04, 0x00, 0x0c, 0x04, 0x04, 0x0e }, /* 0b */ | ||
294 | { 0x08, 0x04, 0x00, 0x0e, 0x11, 0x11, 0x0e }, /* 0c */ | ||
295 | { 0x0f, 0x10, 0x10, 0x10, 0x0f, 0x02, 0x0e }, /* 0d */ | ||
296 | { 0x10, 0x10, 0x17, 0x14, 0x1e, 0x04, 0x04 }, /* 0e */ | ||
297 | { 0x01, 0x0e, 0x13, 0x15, 0x19, 0x0e, 0x10 }, /* 0f */ | ||
298 | { 0x00, 0x02, 0x0e, 0x15, 0x15, 0x0e, 0x08 }, /* 10 */ | ||
299 | { 0x1c, 0x10, 0x17, 0x1d, 0x07, 0x06, 0x05 }, /* 11 */ | ||
300 | { 0x04, 0x0a, 0x04, 0x0e, 0x11, 0x1f, 0x11 }, /* 12 */ | ||
301 | { 0x04, 0x0a, 0x04, 0x01, 0x0f, 0x11, 0x0f }, /* 13 */ | ||
302 | { 0x00, 0x04, 0x04, 0x0a, 0x0a, 0x11, 0x1f }, /* 14 */ | ||
303 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f }, /* 15 */ | ||
304 | { 0x0e, 0x04, 0x1f, 0x15, 0x1f, 0x04, 0x0e }, /* 16 */ | ||
305 | { 0x1f, 0x11, 0x11, 0x10, 0x10, 0x10, 0x10 }, /* 17 */ | ||
306 | { 0x04, 0x04, 0x0a, 0x0a, 0x11, 0x11, 0x11 }, /* 18 */ | ||
307 | { 0x0e, 0x11, 0x11, 0x11, 0x0a, 0x0a, 0x1b }, /* 19 */ | ||
308 | { 0x1f, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a }, /* 1a */ | ||
309 | { 0x15, 0x15, 0x15, 0x15, 0x0e, 0x04, 0x04 }, /* 1b */ | ||
310 | { 0x1f, 0x08, 0x04, 0x02, 0x04, 0x08, 0x1f }, /* 1c */ | ||
311 | { 0x0e, 0x11, 0x11, 0x1f, 0x11, 0x11, 0x0e }, /* 1d */ | ||
312 | { 0x1f, 0x11, 0x00, 0x0e, 0x00, 0x11, 0x1f }, /* 1e */ | ||
313 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* 1f */ | ||
314 | { 0x0f, 0x14, 0x14, 0x1f, 0x14, 0x14, 0x17 }, /* 20 */ | ||
315 | { 0x00, 0x00, 0x1a, 0x05, 0x0f, 0x14, 0x0f }, /* 21 */ | ||
316 | { 0x0c, 0x12, 0x16, 0x11, 0x11, 0x16, 0x10 }, /* 22 */ | ||
317 | { 0x02, 0x04, 0x1f, 0x10, 0x1c, 0x10, 0x1f }, /* 23 */ | ||
318 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* 24 */ | ||
319 | { 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x04 }, /* 25 */ | ||
320 | { 0x1b, 0x09, 0x12, 0x00, 0x00, 0x00, 0x00 }, /* 26 */ | ||
321 | { 0x0a, 0x0a, 0x1f, 0x0a, 0x1f, 0x0a, 0x0a }, /* 27 */ | ||
322 | { 0x00, 0x11, 0x0e, 0x0a, 0x0e, 0x11, 0x00 }, /* 28 */ | ||
323 | { 0x18, 0x19, 0x02, 0x04, 0x08, 0x13, 0x03 }, /* 29 */ | ||
324 | { 0x08, 0x14, 0x14, 0x09, 0x15, 0x12, 0x0d }, /* 2a */ | ||
325 | { 0x0c, 0x04, 0x08, 0x00, 0x00, 0x00, 0x00 }, /* 2b */ | ||
326 | { 0x02, 0x04, 0x08, 0x08, 0x08, 0x04, 0x02 }, /* 2c */ | ||
327 | { 0x08, 0x04, 0x02, 0x02, 0x02, 0x04, 0x08 }, /* 2d */ | ||
328 | { 0x04, 0x15, 0x0e, 0x04, 0x0e, 0x15, 0x04 }, /* 2e */ | ||
329 | { 0x00, 0x04, 0x04, 0x1f, 0x04, 0x04, 0x00 }, /* 2f */ | ||
330 | { 0x00, 0x00, 0x00, 0x00, 0x0c, 0x04, 0x08 }, /* 30 */ | ||
331 | { 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00 }, /* 31 */ | ||
332 | { 0x00, 0x00, 0x00, 0x00, 0x0c, 0x0c, 0x00 }, /* 32 */ | ||
333 | { 0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x00 }, /* 33 */ | ||
334 | { 0x0e, 0x11, 0x11, 0x11, 0x11, 0x11, 0x0e }, /* 34 */ | ||
335 | { 0x04, 0x0c, 0x04, 0x04, 0x04, 0x04, 0x0e }, /* 35 */ | ||
336 | { 0x0e, 0x11, 0x01, 0x02, 0x04, 0x08, 0x1f }, /* 36 */ | ||
337 | { 0x1f, 0x02, 0x04, 0x02, 0x01, 0x11, 0x0e }, /* 37 */ | ||
338 | { 0x02, 0x06, 0x0a, 0x12, 0x1f, 0x02, 0x02 }, /* 38 */ | ||
339 | { 0x1f, 0x10, 0x1e, 0x01, 0x01, 0x11, 0x0e }, /* 39 */ | ||
340 | { 0x06, 0x08, 0x10, 0x1e, 0x11, 0x11, 0x0e }, /* 3a */ | ||
341 | { 0x1f, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04 }, /* 3b */ | ||
342 | { 0x0e, 0x11, 0x11, 0x0e, 0x11, 0x11, 0x0e }, /* 3c */ | ||
343 | { 0x0e, 0x11, 0x11, 0x0f, 0x01, 0x02, 0x0c }, /* 3d */ | ||
344 | { 0x00, 0x0c, 0x0c, 0x00, 0x0c, 0x0c, 0x00 }, /* 3e */ | ||
345 | { 0x00, 0x0c, 0x0c, 0x00, 0x0c, 0x04, 0x08 }, /* 3f */ | ||
346 | { 0x03, 0x06, 0x0c, 0x18, 0x0c, 0x06, 0x03 }, /* 40 */ | ||
347 | { 0x00, 0x00, 0x1f, 0x00, 0x1f, 0x00, 0x00 }, /* 41 */ | ||
348 | { 0x18, 0x0c, 0x06, 0x03, 0x06, 0x0c, 0x18 }, /* 42 */ | ||
349 | { 0x0e, 0x11, 0x01, 0x02, 0x04, 0x00, 0x04 }, /* 43 */ | ||
350 | { 0x04, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04 }, /* 44 */ | ||
351 | { 0x04, 0x0a, 0x11, 0x11, 0x1f, 0x11, 0x11 }, /* 45 */ | ||
352 | { 0x1e, 0x11, 0x11, 0x1e, 0x11, 0x11, 0x1e }, /* 46 */ | ||
353 | { 0x0e, 0x11, 0x10, 0x10, 0x10, 0x11, 0x0e }, /* 47 */ | ||
354 | { 0x1c, 0x12, 0x11, 0x11, 0x11, 0x12, 0x1c }, /* 48 */ | ||
355 | { 0x1f, 0x10, 0x10, 0x1e, 0x10, 0x10, 0x1f }, /* 49 */ | ||
356 | { 0x1f, 0x10, 0x10, 0x1e, 0x10, 0x10, 0x10 }, /* 4a */ | ||
357 | { 0x0e, 0x10, 0x10, 0x17, 0x11, 0x11, 0x0e }, /* 4b */ | ||
358 | { 0x11, 0x11, 0x11, 0x1f, 0x11, 0x11, 0x11 }, /* 4c */ | ||
359 | { 0x0e, 0x04, 0x04, 0x04, 0x04, 0x04, 0x0e }, /* 4d */ | ||
360 | { 0x0f, 0x02, 0x02, 0x02, 0x02, 0x12, 0x0c }, /* 4e */ | ||
361 | { 0x11, 0x12, 0x14, 0x18, 0x14, 0x12, 0x11 }, /* 4f */ | ||
362 | { 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x1f }, /* 50 */ | ||
363 | { 0x11, 0x1b, 0x15, 0x11, 0x11, 0x11, 0x11 }, /* 51 */ | ||
364 | { 0x11, 0x11, 0x19, 0x15, 0x13, 0x11, 0x11 }, /* 52 */ | ||
365 | { 0x0e, 0x11, 0x11, 0x11, 0x11, 0x11, 0x0e }, /* 53 */ | ||
366 | { 0x1e, 0x11, 0x11, 0x1e, 0x10, 0x10, 0x10 }, /* 54 */ | ||
367 | { 0x0e, 0x11, 0x11, 0x11, 0x11, 0x12, 0x0d }, /* 55 */ | ||
368 | { 0x1e, 0x11, 0x11, 0x1e, 0x14, 0x12, 0x11 }, /* 56 */ | ||
369 | { 0x0e, 0x11, 0x10, 0x0e, 0x01, 0x11, 0x0e }, /* 57 */ | ||
370 | { 0x1f, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04 }, /* 58 */ | ||
371 | { 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x0e }, /* 59 */ | ||
372 | { 0x11, 0x11, 0x11, 0x11, 0x11, 0x0a, 0x04 }, /* 5a */ | ||
373 | { 0x11, 0x11, 0x11, 0x11, 0x11, 0x15, 0x0a }, /* 5b */ | ||
374 | { 0x11, 0x11, 0x0a, 0x04, 0x0a, 0x11, 0x11 }, /* 5c */ | ||
375 | { 0x11, 0x11, 0x0a, 0x04, 0x04, 0x04, 0x04 }, /* 5d */ | ||
376 | { 0x1f, 0x01, 0x02, 0x04, 0x08, 0x10, 0x1f }, /* 5e */ | ||
377 | { 0x0a, 0x00, 0x04, 0x0a, 0x11, 0x1f, 0x11 }, /* 5f */ | ||
378 | { 0x0a, 0x00, 0x0e, 0x11, 0x11, 0x11, 0x0e }, /* 60 */ | ||
379 | { 0x0d, 0x12, 0x00, 0x19, 0x15, 0x13, 0x11 }, /* 61 */ | ||
380 | { 0x0a, 0x00, 0x11, 0x11, 0x11, 0x11, 0x0e }, /* 62 */ | ||
381 | { 0x0e, 0x10, 0x0e, 0x11, 0x0e, 0x01, 0x0e }, /* 63 */ | ||
382 | { 0x04, 0x00, 0x04, 0x08, 0x10, 0x11, 0x0e }, /* 64 */ | ||
383 | { 0x00, 0x00, 0x0e, 0x01, 0x0f, 0x11, 0x0f }, /* 65 */ | ||
384 | { 0x10, 0x10, 0x1e, 0x11, 0x11, 0x11, 0x1e }, /* 66 */ | ||
385 | { 0x00, 0x00, 0x0f, 0x10, 0x10, 0x10, 0x0f }, /* 67 */ | ||
386 | { 0x01, 0x01, 0x0f, 0x11, 0x11, 0x11, 0x0f }, /* 68 */ | ||
387 | { 0x00, 0x00, 0x0e, 0x11, 0x1f, 0x10, 0x0f }, /* 69 */ | ||
388 | { 0x03, 0x04, 0x0f, 0x04, 0x04, 0x04, 0x04 }, /* 6a */ | ||
389 | { 0x00, 0x00, 0x0f, 0x11, 0x0f, 0x01, 0x0e }, /* 6b */ | ||
390 | { 0x10, 0x10, 0x16, 0x19, 0x11, 0x11, 0x11 }, /* 6c */ | ||
391 | { 0x04, 0x00, 0x0c, 0x04, 0x04, 0x04, 0x0e }, /* 6d */ | ||
392 | { 0x02, 0x00, 0x06, 0x02, 0x02, 0x12, 0x0c }, /* 6e */ | ||
393 | { 0x08, 0x08, 0x09, 0x0a, 0x0c, 0x0a, 0x09 }, /* 6f */ | ||
394 | { 0x0c, 0x04, 0x04, 0x04, 0x04, 0x04, 0x0e }, /* 70 */ | ||
395 | { 0x00, 0x00, 0x1a, 0x15, 0x15, 0x15, 0x15 }, /* 71 */ | ||
396 | { 0x00, 0x00, 0x16, 0x19, 0x11, 0x11, 0x11 }, /* 72 */ | ||
397 | { 0x00, 0x00, 0x0e, 0x11, 0x11, 0x11, 0x0e }, /* 73 */ | ||
398 | { 0x00, 0x00, 0x1e, 0x11, 0x1e, 0x10, 0x10 }, /* 74 */ | ||
399 | { 0x00, 0x00, 0x0f, 0x11, 0x0f, 0x01, 0x01 }, /* 75 */ | ||
400 | { 0x00, 0x00, 0x0b, 0x0c, 0x08, 0x08, 0x08 }, /* 76 */ | ||
401 | { 0x00, 0x00, 0x0e, 0x10, 0x0e, 0x01, 0x1e }, /* 77 */ | ||
402 | { 0x04, 0x04, 0x0f, 0x04, 0x04, 0x04, 0x03 }, /* 78 */ | ||
403 | { 0x00, 0x00, 0x11, 0x11, 0x11, 0x13, 0x0d }, /* 79 */ | ||
404 | { 0x00, 0x00, 0x11, 0x11, 0x11, 0x0a, 0x04 }, /* 7a */ | ||
405 | { 0x00, 0x00, 0x11, 0x11, 0x11, 0x15, 0x0a }, /* 7b */ | ||
406 | { 0x00, 0x00, 0x11, 0x0a, 0x04, 0x0a, 0x11 }, /* 7c */ | ||
407 | { 0x00, 0x00, 0x11, 0x11, 0x0f, 0x01, 0x1e }, /* 7d */ | ||
408 | { 0x00, 0x00, 0x1f, 0x02, 0x04, 0x08, 0x1f }, /* 7e */ | ||
409 | { 0x0a, 0x00, 0x0e, 0x01, 0x0f, 0x11, 0x0f }, /* 7f */ | ||
410 | { 0x00, 0x0a, 0x00, 0x0e, 0x11, 0x11, 0x0e }, /* 80 */ | ||
411 | { 0x0d, 0x12, 0x00, 0x16, 0x19, 0x11, 0x11 }, /* 81 */ | ||
412 | { 0x00, 0x0a, 0x00, 0x11, 0x11, 0x13, 0x0d }, /* 82 */ | ||
413 | { 0x08, 0x04, 0x0e, 0x01, 0x0f, 0x11, 0x0f }, /* 83 */ | ||
414 | { 0x00, 0x0f, 0x10, 0x10, 0x0f, 0x02, 0x04 }, /* 84 */ | ||
415 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x00 }, /* 85 */ | ||
416 | { 0x00, 0x00, 0x04, 0x0e, 0x1f, 0x00, 0x00 }, /* 86 */ | ||
417 | { 0x00, 0x00, 0x1f, 0x0e, 0x04, 0x00, 0x00 }, /* 87 */ | ||
418 | { 0x02, 0x06, 0x0e, 0x1e, 0x0e, 0x06, 0x02 }, /* 88 */ | ||
419 | { 0x08, 0x0c, 0x0e, 0x0f, 0x0e, 0x0c, 0x08 }, /* 89 */ | ||
420 | { 0x1c, 0x1f, 0x13, 0x10, 0x10, 0x10, 0x10 }, /* 8a */ | ||
421 | { 0x15, 0x0a, 0x15, 0x0a, 0x15, 0x0a, 0x15 }, /* 8b */ | ||
422 | { 0x08, 0x04, 0x0e, 0x11, 0x1f, 0x11, 0x11 }, /* 8c */ | ||
423 | { 0x02, 0x04, 0x0e, 0x11, 0x1f, 0x11, 0x11 }, /* 8d */ | ||
424 | { 0x04, 0x0a, 0x0e, 0x11, 0x1f, 0x11, 0x11 }, /* 8e */ | ||
425 | { 0x0d, 0x12, 0x0e, 0x11, 0x1f, 0x11, 0x11 }, /* 8f */ | ||
426 | { 0x08, 0x04, 0x1f, 0x10, 0x1e, 0x10, 0x1f }, /* 90 */ | ||
427 | { 0x04, 0x0a, 0x1f, 0x10, 0x1c, 0x10, 0x1f }, /* 91 */ | ||
428 | { 0x0a, 0x00, 0x1f, 0x10, 0x1c, 0x10, 0x1f }, /* 92 */ | ||
429 | { 0x08, 0x04, 0x0e, 0x04, 0x04, 0x04, 0x0e }, /* 93 */ | ||
430 | { 0x02, 0x04, 0x0e, 0x04, 0x04, 0x04, 0x0e }, /* 94 */ | ||
431 | { 0x0c, 0x0a, 0x09, 0x1d, 0x09, 0x0a, 0x0c }, /* 95 */ | ||
432 | { 0x08, 0x04, 0x0e, 0x11, 0x11, 0x11, 0x0e }, /* 96 */ | ||
433 | { 0x02, 0x04, 0x0e, 0x11, 0x11, 0x11, 0x0e }, /* 97 */ | ||
434 | { 0x04, 0x0a, 0x0e, 0x11, 0x11, 0x11, 0x0e }, /* 98 */ | ||
435 | { 0x0d, 0x12, 0x0e, 0x11, 0x11, 0x11, 0x0e }, /* 99 */ | ||
436 | { 0x08, 0x04, 0x11, 0x11, 0x11, 0x11, 0x0e }, /* 9a */ | ||
437 | { 0x02, 0x04, 0x11, 0x11, 0x11, 0x11, 0x0e }, /* 9b */ | ||
438 | { 0x02, 0x04, 0x0e, 0x01, 0x0f, 0x11, 0x0f }, /* 9c */ | ||
439 | { 0x04, 0x0a, 0x0e, 0x01, 0x0f, 0x11, 0x0f }, /* 9d */ | ||
440 | { 0x0d, 0x12, 0x0e, 0x01, 0x0f, 0x11, 0x0f }, /* 9e */ | ||
441 | { 0x04, 0x0a, 0x0e, 0x11, 0x1f, 0x10, 0x0e }, /* 9f */ | ||
442 | { 0x0a, 0x00, 0x0e, 0x11, 0x1f, 0x10, 0x0e }, /* a0 */ | ||
443 | { 0x02, 0x04, 0x00, 0x0c, 0x04, 0x04, 0x0e }, /* a1 */ | ||
444 | { 0x04, 0x0a, 0x00, 0x0c, 0x04, 0x04, 0x0e }, /* a2 */ | ||
445 | { 0x0a, 0x00, 0x00, 0x0c, 0x04, 0x04, 0x0e }, /* a3 */ | ||
446 | { 0x02, 0x04, 0x00, 0x0e, 0x11, 0x11, 0x0e }, /* a4 */ | ||
447 | { 0x04, 0x0a, 0x00, 0x0e, 0x11, 0x11, 0x0e }, /* a5 */ | ||
448 | { 0x0d, 0x12, 0x00, 0x0e, 0x11, 0x11, 0x0e }, /* a6 */ | ||
449 | { 0x02, 0x04, 0x00, 0x11, 0x11, 0x13, 0x0d }, /* a7 */ | ||
450 | { 0x04, 0x04, 0x0f, 0x10, 0x10, 0x0f, 0x04 }, /* a8 */ | ||
451 | { 0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03 }, /* a9 */ | ||
452 | { 0x0a, 0x04, 0x0b, 0x0c, 0x08, 0x08, 0x08 }, /* aa */ | ||
453 | { 0x0a, 0x04, 0x0f, 0x10, 0x10, 0x10, 0x0f }, /* ab */ | ||
454 | { 0x0a, 0x04, 0x0e, 0x10, 0x0e, 0x01, 0x1e }, /* ac */ | ||
455 | { 0x0a, 0x04, 0x0e, 0x11, 0x1f, 0x10, 0x0e }, /* ad */ | ||
456 | { 0x04, 0x0a, 0x04, 0x11, 0x11, 0x13, 0x0d }, /* ae */ | ||
457 | { 0x02, 0x04, 0x11, 0x11, 0x0f, 0x01, 0x0e }, /* af */ | ||
458 | { 0x02, 0x0f, 0x02, 0x0e, 0x12, 0x12, 0x0e }, /* b0 */ | ||
459 | { 0x02, 0x04, 0x0f, 0x10, 0x10, 0x10, 0x0f }, /* b1 */ | ||
460 | { 0x0e, 0x11, 0x1f, 0x10, 0x0e, 0x04, 0x06 }, /* b2 */ | ||
461 | { 0x0e, 0x01, 0x0f, 0x11, 0x0f, 0x02, 0x03 }, /* b3 */ | ||
462 | { 0x04, 0x00, 0x1f, 0x02, 0x04, 0x08, 0x1f }, /* b4 */ | ||
463 | { 0x02, 0x04, 0x1f, 0x02, 0x04, 0x08, 0x1f }, /* b5 */ | ||
464 | { 0x02, 0x04, 0x0e, 0x10, 0x0e, 0x01, 0x1e }, /* b6 */ | ||
465 | { 0x02, 0x04, 0x16, 0x19, 0x11, 0x11, 0x11 }, /* b7 */ | ||
466 | { 0x0c, 0x04, 0x06, 0x0c, 0x04, 0x04, 0x0e }, /* b8 */ | ||
467 | { 0x04, 0x0e, 0x1f, 0x1f, 0x1b, 0x04, 0x0e }, /* b9 */ | ||
468 | { 0x0a, 0x04, 0x16, 0x19, 0x11, 0x11, 0x11 }, /* ba */ | ||
469 | { 0x09, 0x09, 0x08, 0x1e, 0x08, 0x08, 0x06 }, /* bb */ | ||
470 | { 0x05, 0x05, 0x0c, 0x14, 0x14, 0x14, 0x0c }, /* bc */ | ||
471 | { 0x0a, 0x04, 0x1f, 0x02, 0x04, 0x08, 0x1f }, /* bd */ | ||
472 | { 0x0f, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* be */ | ||
473 | { 0x0f, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01 }, /* bf */ | ||
474 | { 0x1e, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1f }, /* c0 */ | ||
475 | { 0x1f, 0x00, 0x0e, 0x10, 0x17, 0x11, 0x0e }, /* c1 */ | ||
476 | { 0x1f, 0x00, 0x0f, 0x11, 0x0f, 0x01, 0x0e }, /* c2 */ | ||
477 | { 0x0e, 0x10, 0x0e, 0x01, 0x0e, 0x04, 0x0c }, /* c3 */ | ||
478 | { 0x00, 0x0e, 0x10, 0x0e, 0x01, 0x0e, 0x04 }, /* c4 */ | ||
479 | { 0x04, 0x00, 0x0e, 0x04, 0x04, 0x04, 0x0e }, /* c5 */ | ||
480 | { 0x00, 0x00, 0x0c, 0x04, 0x04, 0x04, 0x0e }, /* c6 */ | ||
481 | { 0x05, 0x0a, 0x11, 0x11, 0x11, 0x11, 0x0e }, /* c7 */ | ||
482 | { 0x09, 0x12, 0x0e, 0x11, 0x11, 0x11, 0x0e }, /* c8 */ | ||
483 | { 0x09, 0x12, 0x00, 0x11, 0x11, 0x13, 0x0d }, /* c9 */ | ||
484 | { 0x09, 0x12, 0x00, 0x0e, 0x11, 0x11, 0x0e }, /* ca */ | ||
485 | { 0x01, 0x01, 0x01, 0x01, 0x01, 0x10, 0x0f }, /* cb */ | ||
486 | { 0x10, 0x10, 0x10, 0x10, 0x10, 0x01, 0x1e }, /* cc */ | ||
487 | { 0x00, 0x1b, 0x1f, 0x1f, 0x0e, 0x04, 0x00 }, /* cd */ | ||
488 | { 0x18, 0x08, 0x08, 0x08, 0x08, 0x08, 0x18 }, /* ce */ | ||
489 | { 0x0e, 0x11, 0x04, 0x0a, 0x1b, 0x1f, 0x00 }, /* cf */ | ||
490 | { 0x0a, 0x15, 0x04, 0x07, 0x00, 0x11, 0x0a }, /* d0 */ | ||
491 | { 0x0f, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1f }, /* d1 */ | ||
492 | { 0x01, 0x03, 0x1d, 0x11, 0x1d, 0x03, 0x01 }, /* d2 */ | ||
493 | { 0x0e, 0x11, 0x11, 0x1f, 0x1b, 0x1b, 0x1f }, /* d3 */ | ||
494 | { 0x00, 0x01, 0x02, 0x0a, 0x04, 0x04, 0x00 }, /* d4 */ | ||
495 | { 0x04, 0x0e, 0x1f, 0x00, 0x1f, 0x0e, 0x04 }, /* d5 */ | ||
496 | { 0x02, 0x02, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e }, /* d6 */ | ||
497 | { 0x1b, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1b }, /* d7 */ | ||
498 | { 0x1b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b }, /* d8 */ | ||
499 | { 0x04, 0x0f, 0x04, 0x04, 0x04, 0x03, 0x06 }, /* d9 */ | ||
500 | { 0x1b, 0x1b, 0x1b, 0x1b, 0x1b, 0x1b, 0x1b }, /* da */ | ||
501 | { 0x00, 0x04, 0x0e, 0x1f, 0x0e, 0x04, 0x00 }, /* db */ | ||
502 | { 0x00, 0x00, 0x1f, 0x1b, 0x15, 0x11, 0x1f }, /* dc */ | ||
503 | { 0x0e, 0x0e, 0x04, 0x1f, 0x0e, 0x0e, 0x0a }, /* dd */ | ||
504 | { 0x00, 0x00, 0x00, 0x00, 0x0a, 0x04, 0x0a }, /* de */ | ||
505 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f }, /* df */ | ||
506 | { 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x1f }, /* e0 */ | ||
507 | { 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x1f, 0x1f }, /* e1 */ | ||
508 | { 0x00, 0x00, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f }, /* e2 */ | ||
509 | { 0x00, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f }, /* e3 */ | ||
510 | { 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x04 }, /* e4 */ | ||
511 | { 0x04, 0x09, 0x0a, 0x0a, 0x0a, 0x09, 0x04 }, /* e5 */ | ||
512 | { 0x00, 0x1f, 0x11, 0x11, 0x1f, 0x04, 0x1f }, /* e6 */ | ||
513 | { 0x00, 0x07, 0x03, 0x05, 0x08, 0x10, 0x00 }, /* e7 */ | ||
514 | { 0x00, 0x10, 0x08, 0x05, 0x03, 0x07, 0x00 }, /* e8 */ | ||
515 | { 0x09, 0x06, 0x0e, 0x01, 0x0f, 0x11, 0x0f }, /* e9 */ | ||
516 | { 0x1e, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* ea */ | ||
517 | { 0x00, 0x00, 0x10, 0x08, 0x04, 0x04, 0x04 }, /* eb */ | ||
518 | { 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f }, /* ec */ | ||
519 | { 0x1f, 0x18, 0x14, 0x12, 0x15, 0x18, 0x1f }, /* ed */ | ||
520 | { 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* ee */ | ||
521 | { 0x1f, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10 }, /* ef */ | ||
522 | { 0x00, 0x03, 0x07, 0x0c, 0x18, 0x1c, 0x1c }, /* f0 */ | ||
523 | { 0x1c, 0x10, 0x1c, 0x07, 0x1c, 0x04, 0x07 }, /* f1 */ | ||
524 | { 0x00, 0x1e, 0x03, 0x09, 0x19, 0x09, 0x1d }, /* f2 */ | ||
525 | { 0x1e, 0x01, 0x19, 0x05, 0x09, 0x1d, 0x01 }, /* f3 */ | ||
526 | { 0x04, 0x04, 0x04, 0x02, 0x01, 0x00, 0x00 }, /* f4 */ | ||
527 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x0f }, /* f5 */ | ||
528 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1e }, /* f6 */ | ||
529 | { 0x04, 0x04, 0x04, 0x08, 0x10, 0x00, 0x00 }, /* f7 */ | ||
530 | { 0x07, 0x03, 0x05, 0x08, 0x10, 0x10, 0x0f }, /* f8 */ | ||
531 | { 0x04, 0x0e, 0x1f, 0x11, 0x11, 0x15, 0x1f }, /* f9 */ | ||
532 | { 0x1f, 0x03, 0x1a, 0x02, 0x1a, 0x02, 0x1e }, /* fa */ | ||
533 | { 0x00, 0x0e, 0x1f, 0x11, 0x1f, 0x0e, 0x00 }, /* fb */ | ||
534 | { 0x03, 0x05, 0x09, 0x09, 0x0b, 0x1b, 0x18 }, /* fc */ | ||
535 | { 0x1f, 0x03, 0x05, 0x09, 0x15, 0x03, 0x1f }, /* fd */ | ||
536 | { 0x10, 0x10, 0x10, 0x10, 0x10, 0x1c, 0x1c }, /* fe */ | ||
537 | { 0x1c, 0x1c, 0x10, 0x10, 0x10, 0x10, 0x10 }, /* ff */ | ||
538 | }; | ||
539 | |||
540 | unsigned char (*font_player)[256][7] = &font_player_newlcd; | ||
541 | |||
542 | void font_init(void) | ||
543 | { | ||
544 | if (is_new_player()) | ||
545 | font_player = &font_player_newlcd; | ||
546 | else | ||
547 | font_player = &font_player_oldlcd; | ||
548 | } | ||
diff --git a/uisimulator/common/font-player.h b/uisimulator/common/font-player.h deleted file mode 100644 index bfa88d7321..0000000000 --- a/uisimulator/common/font-player.h +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * This program is free software; you can redistribute it and/or | ||
11 | * modify it under the terms of the GNU General Public License | ||
12 | * as published by the Free Software Foundation; either version 2 | ||
13 | * of the License, or (at your option) any later version. | ||
14 | * | ||
15 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
16 | * KIND, either express or implied. | ||
17 | * | ||
18 | ****************************************************************************/ | ||
19 | |||
20 | #ifndef __FONT_PLAYER_H__ | ||
21 | #define __FONT_PLAYER_H__ | ||
22 | |||
23 | extern unsigned char (*font_player)[256][7]; | ||
24 | |||
25 | void font_init(void); | ||
26 | |||
27 | #endif /* __FONT_PLAYER_H__ */ | ||
diff --git a/uisimulator/common/lcd-common.c b/uisimulator/common/lcd-common.c index 0c8e0dcad5..97cc17638e 100644 --- a/uisimulator/common/lcd-common.c +++ b/uisimulator/common/lcd-common.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include "system.h" | 27 | #include "system.h" |
28 | #include "lcd.h" | 28 | #include "lcd.h" |
29 | #if defined(HAVE_TRANSFLECTIVE_LCD) && defined(HAVE_LCD_SLEEP) | 29 | #if defined(HAVE_TRANSFLECTIVE_LCD) && defined(HAVE_LCD_SLEEP) |
30 | /* in uisimulator/sdl/lcd-bitmap.c and lcd-charcell.c */ | 30 | /* in uisimulator/sdl/lcd-bitmap.c */ |
31 | extern void sim_backlight(int value); | 31 | extern void sim_backlight(int value); |
32 | #endif | 32 | #endif |
33 | 33 | ||
diff --git a/uisimulator/common/lcd-playersim.c b/uisimulator/common/lcd-playersim.c deleted file mode 100644 index 14efded5d4..0000000000 --- a/uisimulator/common/lcd-playersim.c +++ /dev/null | |||
@@ -1,119 +0,0 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2002 by Alan Korr | ||
11 | * | ||
12 | * This program is free software; you can redistribute it and/or | ||
13 | * modify it under the terms of the GNU General Public License | ||
14 | * as published by the Free Software Foundation; either version 2 | ||
15 | * of the License, or (at your option) any later version. | ||
16 | * | ||
17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
18 | * KIND, either express or implied. | ||
19 | * | ||
20 | ****************************************************************************/ | ||
21 | #include "config.h" | ||
22 | #include "hwcompat.h" | ||
23 | |||
24 | #include "lcd.h" | ||
25 | #include "lcd-charcell.h" | ||
26 | #include "kernel.h" | ||
27 | #include "thread.h" | ||
28 | #include <string.h> | ||
29 | #include <stdlib.h> | ||
30 | #include "debug.h" | ||
31 | #include "system.h" | ||
32 | |||
33 | #include "font-player.h" | ||
34 | #include "lcd-playersim.h" | ||
35 | |||
36 | /*** definitions ***/ | ||
37 | |||
38 | bool sim_lcd_framebuffer[SIM_LCD_HEIGHT][SIM_LCD_WIDTH]; | ||
39 | |||
40 | static int double_height = 1; | ||
41 | |||
42 | void lcd_print_icon(int x, int icon_line, bool enable, char **icon) | ||
43 | { | ||
44 | int row = 0, col = 0; /* shut up gcc */ | ||
45 | int y = (ICON_HEIGHT+(CHAR_HEIGHT*2+2)*CHAR_PIXEL) * icon_line; | ||
46 | |||
47 | y += BORDER_MARGIN; | ||
48 | x += BORDER_MARGIN; | ||
49 | |||
50 | for (; icon[row]; row++) | ||
51 | { | ||
52 | for (col = 0; icon[row][col]; col++) | ||
53 | { | ||
54 | switch (icon[row][col]) | ||
55 | { | ||
56 | case '*': | ||
57 | sim_lcd_framebuffer[y+row][x+col] = enable; | ||
58 | break; | ||
59 | |||
60 | case ' ': | ||
61 | sim_lcd_framebuffer[y+row][x+col] = false; | ||
62 | break; | ||
63 | } | ||
64 | } | ||
65 | } | ||
66 | sim_lcd_update_rect(x, y, col, row); | ||
67 | /* icon drawing updates immediately */ | ||
68 | } | ||
69 | |||
70 | void lcd_print_char(int x, int y, unsigned char ch) | ||
71 | { | ||
72 | int xpos = x * CHAR_WIDTH*CHAR_PIXEL; | ||
73 | int ypos = y * CHAR_HEIGHT*CHAR_PIXEL + ICON_HEIGHT; | ||
74 | int row, col, r, c; | ||
75 | |||
76 | if (double_height > 1 && y == 1) | ||
77 | return; /* only one row available if text is double height */ | ||
78 | |||
79 | for (row = 0; row < 7; row ++) | ||
80 | { | ||
81 | unsigned fontbitmap = (*font_player)[ch][row]; | ||
82 | int height = (row == 3) ? 1 : double_height; | ||
83 | |||
84 | y = ypos + row * CHAR_PIXEL * double_height; | ||
85 | for (col = 0; col < 5; col++) | ||
86 | { | ||
87 | bool fontbit = fontbitmap & (0x10 >> col); | ||
88 | |||
89 | x = xpos + col * CHAR_PIXEL; | ||
90 | for (r = 0; r < height * CHAR_PIXEL; r++) | ||
91 | for (c = 0; c < CHAR_PIXEL; c++) | ||
92 | sim_lcd_framebuffer[y+r][x+c] = fontbit; | ||
93 | } | ||
94 | } | ||
95 | if (double_height > 1) | ||
96 | { | ||
97 | y = ypos + 15*CHAR_PIXEL; | ||
98 | for (r = 0; r < CHAR_PIXEL; r++) | ||
99 | for (c = 0; c < 5*CHAR_PIXEL; c++) | ||
100 | sim_lcd_framebuffer[y+r][xpos+c] = false; | ||
101 | } | ||
102 | } | ||
103 | |||
104 | void lcd_double_height(bool on) | ||
105 | { | ||
106 | int newval = (is_new_player() && on) ? 2 : 1; | ||
107 | |||
108 | if (newval != double_height) | ||
109 | { | ||
110 | double_height = newval; | ||
111 | lcd_update(); | ||
112 | } | ||
113 | } | ||
114 | |||
115 | void sim_lcd_define_pattern(int pat, const char *pattern) | ||
116 | { | ||
117 | if (pat < lcd_pattern_count) | ||
118 | memcpy((*font_player)[pat], pattern, 7); | ||
119 | } | ||
diff --git a/uisimulator/common/lcd-playersim.h b/uisimulator/common/lcd-playersim.h deleted file mode 100644 index 63e8b80eba..0000000000 --- a/uisimulator/common/lcd-playersim.h +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2002 by Kjell Ericson | ||
11 | * | ||
12 | * This program is free software; you can redistribute it and/or | ||
13 | * modify it under the terms of the GNU General Public License | ||
14 | * as published by the Free Software Foundation; either version 2 | ||
15 | * of the License, or (at your option) any later version. | ||
16 | * | ||
17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
18 | * KIND, either express or implied. | ||
19 | * | ||
20 | ****************************************************************************/ | ||
21 | |||
22 | #define ICON_HEIGHT 12 | ||
23 | #define CHAR_HEIGHT 8 | ||
24 | |||
25 | #ifdef CHAR_WIDTH | ||
26 | #undef CHAR_WIDTH | ||
27 | #endif | ||
28 | |||
29 | #define CHAR_WIDTH 6 | ||
30 | #define CHAR_PIXEL 2 | ||
31 | #define BORDER_MARGIN 1 | ||
32 | |||
33 | extern bool sim_lcd_framebuffer[SIM_LCD_HEIGHT][SIM_LCD_WIDTH]; | ||
34 | |||
35 | void lcd_print_icon(int x, int icon_line, bool enable, char **icon); | ||
36 | void lcd_print_char(int x, int y, unsigned char ch); | ||
37 | void sim_lcd_update_rect(int x, int y, int width, int height); | ||
38 | void sim_lcd_define_pattern(int pat, const char *pattern); | ||
diff --git a/uisimulator/common/sim_icons.c b/uisimulator/common/sim_icons.c deleted file mode 100644 index b72f6003e8..0000000000 --- a/uisimulator/common/sim_icons.c +++ /dev/null | |||
@@ -1,312 +0,0 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2002 Mats Lidell <matsl@contactor.se> | ||
11 | * | ||
12 | * This program is free software; you can redistribute it and/or | ||
13 | * modify it under the terms of the GNU General Public License | ||
14 | * as published by the Free Software Foundation; either version 2 | ||
15 | * of the License, or (at your option) any later version. | ||
16 | * | ||
17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
18 | * KIND, either express or implied. | ||
19 | * | ||
20 | ****************************************************************************/ | ||
21 | #include <stdio.h> | ||
22 | #include "config.h" | ||
23 | |||
24 | #include <lcd.h> | ||
25 | #include <kernel.h> | ||
26 | #include <string.h> | ||
27 | #include <debug.h> | ||
28 | |||
29 | extern void lcd_print_icon(int x, int icon_line, bool enable, char **icon); | ||
30 | |||
31 | static char* icon_battery_bit[]= | ||
32 | { | ||
33 | "-----", | ||
34 | " ", | ||
35 | "*****", | ||
36 | "*****", | ||
37 | "*****", | ||
38 | "*****", | ||
39 | "*****", | ||
40 | "*****", | ||
41 | " ", | ||
42 | "-----", | ||
43 | NULL | ||
44 | }; | ||
45 | |||
46 | static char* icon_battery[]= | ||
47 | { | ||
48 | "********************* ", | ||
49 | "* * ", | ||
50 | "* ----- ----- ----- * ", | ||
51 | "* ----- ----- ----- ***", | ||
52 | "* ----- ----- ----- * *", | ||
53 | "* ----- ----- ----- * *", | ||
54 | "* ----- ----- ----- ***", | ||
55 | "* ----- ----- ----- * ", | ||
56 | "* * ", | ||
57 | "********************* ", | ||
58 | NULL | ||
59 | }; | ||
60 | |||
61 | static char* icon_volume[]= | ||
62 | { | ||
63 | " ", | ||
64 | " ", | ||
65 | " ", | ||
66 | " ", | ||
67 | "* * * ", | ||
68 | "* * * ", | ||
69 | " * * *** * ", | ||
70 | " * * * * * ", | ||
71 | " * * * * ", | ||
72 | " * *** * ", | ||
73 | NULL | ||
74 | }; | ||
75 | |||
76 | static char* icon_volume_1[]= | ||
77 | { | ||
78 | " ", | ||
79 | " ", | ||
80 | " ", | ||
81 | " ", | ||
82 | "**", | ||
83 | "**", | ||
84 | "**", | ||
85 | "**", | ||
86 | "**", | ||
87 | "**", | ||
88 | NULL | ||
89 | }; | ||
90 | |||
91 | static char* icon_volume_2[]= | ||
92 | { | ||
93 | " ", | ||
94 | " ", | ||
95 | " ", | ||
96 | "**", | ||
97 | "**", | ||
98 | "**", | ||
99 | "**", | ||
100 | "**", | ||
101 | "**", | ||
102 | "**", | ||
103 | NULL | ||
104 | }; | ||
105 | |||
106 | static char* icon_volume_3[]= | ||
107 | { | ||
108 | " ", | ||
109 | " ", | ||
110 | "**", | ||
111 | "**", | ||
112 | "**", | ||
113 | "**", | ||
114 | "**", | ||
115 | "**", | ||
116 | "**", | ||
117 | "**", | ||
118 | NULL | ||
119 | }; | ||
120 | |||
121 | static char* icon_volume_4[]= | ||
122 | { | ||
123 | " ", | ||
124 | "**", | ||
125 | "**", | ||
126 | "**", | ||
127 | "**", | ||
128 | "**", | ||
129 | "**", | ||
130 | "**", | ||
131 | "**", | ||
132 | "**", | ||
133 | NULL | ||
134 | }; | ||
135 | |||
136 | static char* icon_volume_5[]= | ||
137 | { | ||
138 | "**", | ||
139 | "**", | ||
140 | "**", | ||
141 | "**", | ||
142 | "**", | ||
143 | "**", | ||
144 | "**", | ||
145 | "**", | ||
146 | "**", | ||
147 | "**", | ||
148 | NULL | ||
149 | }; | ||
150 | |||
151 | static char* icon_pause[]= | ||
152 | { | ||
153 | " **** **** ", | ||
154 | " **** **** ", | ||
155 | " **** **** ", | ||
156 | " **** **** ", | ||
157 | " **** **** ", | ||
158 | " **** **** ", | ||
159 | " **** **** ", | ||
160 | " **** **** ", | ||
161 | " **** **** ", | ||
162 | " **** **** ", | ||
163 | NULL | ||
164 | }; | ||
165 | |||
166 | static char* icon_play[]= | ||
167 | { | ||
168 | "** ", | ||
169 | "***** ", | ||
170 | "******* ", | ||
171 | "********* ", | ||
172 | "*********** ", | ||
173 | "********* ", | ||
174 | "******* ", | ||
175 | "***** ", | ||
176 | "** ", | ||
177 | " ", | ||
178 | NULL | ||
179 | }; | ||
180 | |||
181 | static char* icon_record[]= | ||
182 | { | ||
183 | " *** ", | ||
184 | " ***** ", | ||
185 | " ******* ", | ||
186 | " ********* ", | ||
187 | " ********* ", | ||
188 | " ********* ", | ||
189 | " ******* ", | ||
190 | " ***** ", | ||
191 | " *** ", | ||
192 | " ", | ||
193 | NULL | ||
194 | }; | ||
195 | |||
196 | static char* icon_usb[]= | ||
197 | { | ||
198 | " ********* ", | ||
199 | " ** ** ", | ||
200 | " * ", | ||
201 | " ** * ** ", | ||
202 | "***********************", | ||
203 | " ** * ** ", | ||
204 | " * ", | ||
205 | " ** ** ", | ||
206 | " ******** ", | ||
207 | " ** ", | ||
208 | NULL | ||
209 | }; | ||
210 | |||
211 | static char* icon_audio[]= | ||
212 | { | ||
213 | " *************************** ", | ||
214 | " ** ** ", | ||
215 | "* ** * * **** * *** *", | ||
216 | "* * * * * * * * * * *", | ||
217 | "* * * * * * * * * * *", | ||
218 | "* ****** * * * * * * * *", | ||
219 | "* * * * * * * * * * *", | ||
220 | "* * * *** **** * *** *", | ||
221 | " ** ** ", | ||
222 | " *************************** ", | ||
223 | NULL | ||
224 | }; | ||
225 | |||
226 | static char* icon_param[]= | ||
227 | { | ||
228 | " ********************************* ", | ||
229 | " ** ** ", | ||
230 | "* **** ** **** ** ** ** *", | ||
231 | "* * * * * * * * * ** ** *", | ||
232 | "* * * * * * * * * * * * * *", | ||
233 | "* **** ****** **** ****** * * * * *", | ||
234 | "* * * * * * * * * * * *", | ||
235 | "* * * * * * * * * * * *", | ||
236 | " ** ** ", | ||
237 | " ********************************* ", | ||
238 | NULL | ||
239 | }; | ||
240 | |||
241 | static char* icon_repeat[]= | ||
242 | { | ||
243 | " ", | ||
244 | " *************", | ||
245 | " * ", | ||
246 | " * ", | ||
247 | "* ", | ||
248 | "* ", | ||
249 | "* ** ", | ||
250 | " * **** ", | ||
251 | " * ****** ", | ||
252 | " *************", | ||
253 | NULL | ||
254 | }; | ||
255 | |||
256 | static char* icon_repeat2[]= | ||
257 | { | ||
258 | " ", | ||
259 | " *", | ||
260 | " **", | ||
261 | "***", | ||
262 | " *", | ||
263 | " *", | ||
264 | " *", | ||
265 | " *", | ||
266 | " *", | ||
267 | " *", | ||
268 | NULL | ||
269 | }; | ||
270 | |||
271 | |||
272 | struct icon_info | ||
273 | { | ||
274 | char** bitmap; | ||
275 | int xpos; | ||
276 | int row; | ||
277 | }; | ||
278 | |||
279 | #define ICON_VOLUME_POS 102 | ||
280 | #define ICON_VOLUME_SIZE 14 | ||
281 | #define ICON_VOLUME_X_SIZE 2 | ||
282 | |||
283 | static struct icon_info icons [] = | ||
284 | { | ||
285 | |||
286 | {icon_battery, 0, 0}, | ||
287 | {icon_battery_bit, 2, 0}, | ||
288 | {icon_battery_bit, 8, 0}, | ||
289 | {icon_battery_bit, 14, 0}, | ||
290 | {icon_usb, 0, 1}, | ||
291 | {icon_play, 36, 0}, | ||
292 | {icon_record, 48, 0}, | ||
293 | {icon_pause, 60, 0}, | ||
294 | {icon_audio, 37, 1}, | ||
295 | {icon_repeat, 74, 0}, | ||
296 | {icon_repeat2, 94, 0}, | ||
297 | {icon_volume, ICON_VOLUME_POS, 0}, | ||
298 | {icon_volume_1, ICON_VOLUME_POS+ICON_VOLUME_SIZE, 0}, | ||
299 | {icon_volume_2, ICON_VOLUME_POS+ICON_VOLUME_SIZE+(1*ICON_VOLUME_X_SIZE)+1, 0}, | ||
300 | {icon_volume_3, ICON_VOLUME_POS+ICON_VOLUME_SIZE+(2*ICON_VOLUME_X_SIZE)+2, 0}, | ||
301 | {icon_volume_4, ICON_VOLUME_POS+ICON_VOLUME_SIZE+(3*ICON_VOLUME_X_SIZE)+3, 0}, | ||
302 | {icon_volume_5, ICON_VOLUME_POS+ICON_VOLUME_SIZE+(4*ICON_VOLUME_X_SIZE)+4, 0}, | ||
303 | {icon_param, 90, 1} | ||
304 | }; | ||
305 | |||
306 | void | ||
307 | lcd_icon(int icon, bool enable) | ||
308 | { | ||
309 | lcd_print_icon(icons[icon].xpos, icons[icon].row, enable, | ||
310 | icons[icon].bitmap); | ||
311 | } | ||
312 | |||
diff --git a/uisimulator/common/stubs.c b/uisimulator/common/stubs.c index 0ad78fdb7c..9374a97d66 100644 --- a/uisimulator/common/stubs.c +++ b/uisimulator/common/stubs.c | |||
@@ -304,26 +304,6 @@ void mpeg_set_pitch(int pitch) | |||
304 | (void)pitch; | 304 | (void)pitch; |
305 | } | 305 | } |
306 | 306 | ||
307 | #ifdef HAVE_LCD_CHARCELLS | ||
308 | void lcd_clearrect (int x, int y, int nx, int ny) | ||
309 | { | ||
310 | /* Reprint char if you want to change anything */ | ||
311 | (void)x; | ||
312 | (void)y; | ||
313 | (void)nx; | ||
314 | (void)ny; | ||
315 | } | ||
316 | |||
317 | void lcd_fillrect (int x, int y, int nx, int ny) | ||
318 | { | ||
319 | /* Reprint char if you want to change display anything */ | ||
320 | (void)x; | ||
321 | (void)y; | ||
322 | (void)nx; | ||
323 | (void)ny; | ||
324 | } | ||
325 | #endif | ||
326 | |||
327 | void cpu_sleep(bool enabled) | 307 | void cpu_sleep(bool enabled) |
328 | { | 308 | { |
329 | (void)enabled; | 309 | (void)enabled; |