diff options
author | Jens Arnold <amiconn@rockbox.org> | 2006-11-12 13:22:59 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2006-11-12 13:22:59 +0000 |
commit | 6bdf3ee6f28097e25770ae43e28dd4b59054e88f (patch) | |
tree | fb95473e5753cb801c643e31b1b30033a33bafe6 /firmware/drivers | |
parent | 3875b5766769a5f75d460614c0279aaad72e0922 (diff) | |
download | rockbox-6bdf3ee6f28097e25770ae43e28dd4b59054e88f.tar.gz rockbox-6bdf3ee6f28097e25770ae43e28dd4b59054e88f.zip |
Split 1 bit LCD code and move appropriate parts to target tree. Only archos code is tested.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11517 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers')
-rwxr-xr-x[-rw-r--r--] | firmware/drivers/lcd-1bit-vert.c (renamed from firmware/drivers/lcd-recorder.c) | 230 |
1 files changed, 3 insertions, 227 deletions
diff --git a/firmware/drivers/lcd-recorder.c b/firmware/drivers/lcd-1bit-vert.c index 5c4a0352a7..6ae92af72b 100644..100755 --- a/firmware/drivers/lcd-recorder.c +++ b/firmware/drivers/lcd-1bit-vert.c | |||
@@ -33,47 +33,7 @@ | |||
33 | 33 | ||
34 | /*** definitions ***/ | 34 | /*** definitions ***/ |
35 | 35 | ||
36 | #define LCD_SET_LOWER_COLUMN_ADDRESS ((char)0x00) | 36 | #define SCROLLABLE_LINES ((LCD_HEIGHT+4)/5 < 32 ? (LCD_HEIGHT+4)/5 : 32) |
37 | #define LCD_SET_HIGHER_COLUMN_ADDRESS ((char)0x10) | ||
38 | #define LCD_SET_INTERNAL_REGULATOR_RESISTOR_RATIO ((char)0x20) | ||
39 | #define LCD_SET_POWER_CONTROL_REGISTER ((char)0x28) | ||
40 | #define LCD_SET_DISPLAY_START_LINE ((char)0x40) | ||
41 | #define LCD_SET_CONTRAST_CONTROL_REGISTER ((char)0x81) | ||
42 | #define LCD_SET_SEGMENT_REMAP ((char)0xA0) | ||
43 | #define LCD_SET_LCD_BIAS ((char)0xA2) | ||
44 | #define LCD_SET_ENTIRE_DISPLAY_OFF ((char)0xA4) | ||
45 | #define LCD_SET_ENTIRE_DISPLAY_ON ((char)0xA5) | ||
46 | #define LCD_SET_NORMAL_DISPLAY ((char)0xA6) | ||
47 | #define LCD_SET_REVERSE_DISPLAY ((char)0xA7) | ||
48 | #define LCD_SET_MULTIPLEX_RATIO ((char)0xA8) | ||
49 | #define LCD_SET_BIAS_TC_OSC ((char)0xA9) | ||
50 | #define LCD_SET_1OVER4_BIAS_RATIO ((char)0xAA) | ||
51 | #define LCD_SET_INDICATOR_OFF ((char)0xAC) | ||
52 | #define LCD_SET_INDICATOR_ON ((char)0xAD) | ||
53 | #define LCD_SET_DISPLAY_OFF ((char)0xAE) | ||
54 | #define LCD_SET_DISPLAY_ON ((char)0xAF) | ||
55 | #define LCD_SET_PAGE_ADDRESS ((char)0xB0) | ||
56 | #define LCD_SET_COM_OUTPUT_SCAN_DIRECTION ((char)0xC0) | ||
57 | #define LCD_SET_TOTAL_FRAME_PHASES ((char)0xD2) | ||
58 | #define LCD_SET_DISPLAY_OFFSET ((char)0xD3) | ||
59 | #define LCD_SET_READ_MODIFY_WRITE_MODE ((char)0xE0) | ||
60 | #define LCD_SOFTWARE_RESET ((char)0xE2) | ||
61 | #define LCD_NOP ((char)0xE3) | ||
62 | #define LCD_SET_END_OF_READ_MODIFY_WRITE_MODE ((char)0xEE) | ||
63 | |||
64 | /* LCD command codes */ | ||
65 | #define LCD_CNTL_RESET 0xe2 /* Software reset */ | ||
66 | #define LCD_CNTL_POWER 0x2f /* Power control */ | ||
67 | #define LCD_CNTL_CONTRAST 0x81 /* Contrast */ | ||
68 | #define LCD_CNTL_OUTSCAN 0xc8 /* Output scan direction */ | ||
69 | #define LCD_CNTL_SEGREMAP 0xa1 /* Segment remap */ | ||
70 | #define LCD_CNTL_DISPON 0xaf /* Display on */ | ||
71 | |||
72 | #define LCD_CNTL_PAGE 0xb0 /* Page address */ | ||
73 | #define LCD_CNTL_HIGHCOL 0x10 /* Upper column address */ | ||
74 | #define LCD_CNTL_LOWCOL 0x00 /* Lower column address */ | ||
75 | |||
76 | #define SCROLLABLE_LINES 13 | ||
77 | 37 | ||
78 | /*** globals ***/ | 38 | /*** globals ***/ |
79 | 39 | ||
@@ -83,9 +43,6 @@ static int drawmode = DRMODE_SOLID; | |||
83 | static int xmargin = 0; | 43 | static int xmargin = 0; |
84 | static int ymargin = 0; | 44 | static int ymargin = 0; |
85 | static int curfont = FONT_SYSFIXED; | 45 | static int curfont = FONT_SYSFIXED; |
86 | #ifndef SIMULATOR | ||
87 | static int xoffset; /* needed for flip */ | ||
88 | #endif | ||
89 | 46 | ||
90 | /* scrolling */ | 47 | /* scrolling */ |
91 | static volatile int scrolling_lines=0; /* Bitpattern of which lines are scrolling */ | 48 | static volatile int scrolling_lines=0; /* Bitpattern of which lines are scrolling */ |
@@ -104,197 +61,16 @@ static const char scroll_tick_table[16] = { | |||
104 | 100, 80, 64, 50, 40, 32, 25, 20, 16, 12, 10, 8, 6, 5, 4, 3 | 61 | 100, 80, 64, 50, 40, 32, 25, 20, 16, 12, 10, 8, 6, 5, 4, 3 |
105 | }; | 62 | }; |
106 | 63 | ||
107 | /*** driver routines ***/ | ||
108 | |||
109 | /* optimised archos recorder code is in lcd.S */ | ||
110 | |||
111 | #if CONFIG_CPU == PNX0101 | ||
112 | |||
113 | void lcd_write_command(int cmd) | ||
114 | { | ||
115 | while ((LCDSTAT & 3) != 3); | ||
116 | LCDCMD = cmd; | ||
117 | } | ||
118 | |||
119 | void lcd_write_data( const unsigned char* data, int count ) | ||
120 | { | ||
121 | int i; | ||
122 | for (i=0; i < count; i++) { | ||
123 | while ((LCDSTAT & 3) != 3); | ||
124 | LCDDATA = data[i]; | ||
125 | } | ||
126 | } | ||
127 | |||
128 | #endif | ||
129 | |||
130 | /*** hardware configuration ***/ | ||
131 | |||
132 | #ifndef SIMULATOR | ||
133 | |||
134 | int lcd_default_contrast(void) | ||
135 | { | ||
136 | #if CONFIG_LCD == LCD_IFP7XX | ||
137 | return 45; | ||
138 | #else | ||
139 | return (read_hw_mask() & LCD_CONTRAST_BIAS) ? 31 : 49; | ||
140 | #endif | ||
141 | } | ||
142 | |||
143 | void lcd_set_contrast(int val) | ||
144 | { | ||
145 | lcd_write_command(LCD_CNTL_CONTRAST); | ||
146 | lcd_write_command(val); | ||
147 | } | ||
148 | |||
149 | void lcd_set_invert_display(bool yesno) | ||
150 | { | ||
151 | if (yesno) | ||
152 | lcd_write_command(LCD_SET_REVERSE_DISPLAY); | ||
153 | else | ||
154 | lcd_write_command(LCD_SET_NORMAL_DISPLAY); | ||
155 | } | ||
156 | |||
157 | /* turn the display upside down (call lcd_update() afterwards) */ | ||
158 | void lcd_set_flip(bool yesno) | ||
159 | { | ||
160 | #ifdef HAVE_DISPLAY_FLIPPED | ||
161 | if (!yesno) | ||
162 | #else | ||
163 | if (yesno) | ||
164 | #endif | ||
165 | { | ||
166 | lcd_write_command(LCD_SET_SEGMENT_REMAP); | ||
167 | lcd_write_command(LCD_SET_COM_OUTPUT_SCAN_DIRECTION); | ||
168 | xoffset = 132 - LCD_WIDTH; /* 132 colums minus the 112 we have */ | ||
169 | } | ||
170 | else | ||
171 | { | ||
172 | lcd_write_command(LCD_SET_SEGMENT_REMAP | 0x01); | ||
173 | lcd_write_command(LCD_SET_COM_OUTPUT_SCAN_DIRECTION | 0x08); | ||
174 | #if CONFIG_LCD == LCD_IFP7XX | ||
175 | xoffset = 4; | ||
176 | #else | ||
177 | xoffset = 0; | ||
178 | #endif | ||
179 | } | ||
180 | } | ||
181 | |||
182 | #endif /* !SIMULATOR */ | ||
183 | |||
184 | /* LCD init */ | 64 | /* LCD init */ |
185 | #ifdef SIMULATOR | ||
186 | |||
187 | void lcd_init(void) | 65 | void lcd_init(void) |
188 | { | 66 | { |
189 | create_thread(scroll_thread, scroll_stack, | ||
190 | sizeof(scroll_stack), scroll_name IF_PRIO(, PRIORITY_USER_INTERFACE)); | ||
191 | } | ||
192 | #else | ||
193 | |||
194 | void lcd_init(void) | ||
195 | { | ||
196 | #if CONFIG_CPU == PNX0101 | ||
197 | LCDREG10 = 0xf; | ||
198 | LCDREG04 = 0x4084; | ||
199 | #else | ||
200 | /* Initialize PB0-3 as output pins */ | ||
201 | PBCR2 &= 0xff00; /* MD = 00 */ | ||
202 | PBIOR |= 0x000f; /* IOR = 1 */ | ||
203 | #endif | ||
204 | |||
205 | /* inits like the original firmware */ | ||
206 | lcd_write_command(LCD_SOFTWARE_RESET); | ||
207 | lcd_write_command(LCD_SET_INTERNAL_REGULATOR_RESISTOR_RATIO + 4); | ||
208 | #if CONFIG_LCD == LCD_IFP7XX | ||
209 | lcd_write_command(LCD_SET_LCD_BIAS); | ||
210 | #else | ||
211 | lcd_write_command(LCD_SET_1OVER4_BIAS_RATIO + 0); /* force 1/4 bias: 0 */ | ||
212 | #endif | ||
213 | lcd_write_command(LCD_SET_POWER_CONTROL_REGISTER + 7); | ||
214 | /* power control register: op-amp=1, regulator=1, booster=1 */ | ||
215 | lcd_write_command(LCD_SET_DISPLAY_ON); | ||
216 | lcd_write_command(LCD_SET_NORMAL_DISPLAY); | ||
217 | lcd_set_flip(false); | ||
218 | lcd_write_command(LCD_SET_DISPLAY_START_LINE + 0); | ||
219 | lcd_set_contrast(lcd_default_contrast()); | ||
220 | lcd_write_command(LCD_SET_PAGE_ADDRESS); | ||
221 | lcd_write_command(LCD_SET_LOWER_COLUMN_ADDRESS + 0); | ||
222 | lcd_write_command(LCD_SET_HIGHER_COLUMN_ADDRESS + 0); | ||
223 | |||
224 | lcd_clear_display(); | 67 | lcd_clear_display(); |
225 | lcd_update(); | 68 | /* Call device specific init */ |
226 | 69 | lcd_init_device(); | |
227 | create_thread(scroll_thread, scroll_stack, | 70 | create_thread(scroll_thread, scroll_stack, |
228 | sizeof(scroll_stack), scroll_name IF_PRIO(, PRIORITY_USER_INTERFACE)); | 71 | sizeof(scroll_stack), scroll_name IF_PRIO(, PRIORITY_USER_INTERFACE)); |
229 | } | 72 | } |
230 | 73 | ||
231 | /*** Update functions ***/ | ||
232 | |||
233 | /* Performance function that works with an external buffer | ||
234 | note that by and bheight are in 8-pixel units! */ | ||
235 | void lcd_blit(const unsigned char* data, int x, int by, int width, | ||
236 | int bheight, int stride) | ||
237 | { | ||
238 | /* Copy display bitmap to hardware */ | ||
239 | while (bheight--) | ||
240 | { | ||
241 | lcd_write_command (LCD_CNTL_PAGE | (by++ & 0xf)); | ||
242 | lcd_write_command (LCD_CNTL_HIGHCOL | (((x+xoffset)>>4) & 0xf)); | ||
243 | lcd_write_command (LCD_CNTL_LOWCOL | ((x+xoffset) & 0xf)); | ||
244 | |||
245 | lcd_write_data(data, width); | ||
246 | data += stride; | ||
247 | } | ||
248 | } | ||
249 | |||
250 | |||
251 | /* Update the display. | ||
252 | This must be called after all other LCD functions that change the display. */ | ||
253 | void lcd_update(void) ICODE_ATTR; | ||
254 | void lcd_update(void) | ||
255 | { | ||
256 | int y; | ||
257 | |||
258 | /* Copy display bitmap to hardware */ | ||
259 | for (y = 0; y < LCD_HEIGHT/8; y++) | ||
260 | { | ||
261 | lcd_write_command (LCD_CNTL_PAGE | (y & 0xf)); | ||
262 | lcd_write_command (LCD_CNTL_HIGHCOL | ((xoffset >> 4) & 0xf)); | ||
263 | lcd_write_command (LCD_CNTL_LOWCOL | (xoffset & 0xf)); | ||
264 | |||
265 | lcd_write_data (lcd_framebuffer[y], LCD_WIDTH); | ||
266 | } | ||
267 | } | ||
268 | |||
269 | /* Update a fraction of the display. */ | ||
270 | void lcd_update_rect(int, int, int, int) ICODE_ATTR; | ||
271 | void lcd_update_rect(int x, int y, int width, int height) | ||
272 | { | ||
273 | int ymax; | ||
274 | |||
275 | /* The Y coordinates have to work on even 8 pixel rows */ | ||
276 | ymax = (y + height-1) >> 3; | ||
277 | y >>= 3; | ||
278 | |||
279 | if(x + width > LCD_WIDTH) | ||
280 | width = LCD_WIDTH - x; | ||
281 | if (width <= 0) | ||
282 | return; /* nothing left to do, 0 is harmful to lcd_write_data() */ | ||
283 | if(ymax >= LCD_HEIGHT/8) | ||
284 | ymax = LCD_HEIGHT/8-1; | ||
285 | |||
286 | /* Copy specified rectange bitmap to hardware */ | ||
287 | for (; y <= ymax; y++) | ||
288 | { | ||
289 | lcd_write_command (LCD_CNTL_PAGE | (y & 0xf)); | ||
290 | lcd_write_command (LCD_CNTL_HIGHCOL | (((x+xoffset) >> 4) & 0xf)); | ||
291 | lcd_write_command (LCD_CNTL_LOWCOL | ((x+xoffset) & 0xf)); | ||
292 | |||
293 | lcd_write_data (&lcd_framebuffer[y][x], width); | ||
294 | } | ||
295 | } | ||
296 | #endif /* !SIMULATOR */ | ||
297 | |||
298 | /*** parameter handling ***/ | 74 | /*** parameter handling ***/ |
299 | 75 | ||
300 | void lcd_set_drawmode(int mode) | 76 | void lcd_set_drawmode(int mode) |