summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
Diffstat (limited to 'firmware')
-rw-r--r--firmware/SOURCES6
-rwxr-xr-x[-rw-r--r--]firmware/drivers/lcd-1bit-vert.c (renamed from firmware/drivers/lcd-recorder.c)230
-rwxr-xr-xfirmware/target/arm/iriver/ifp7xx/lcd-ifp7xx.c208
-rwxr-xr-xfirmware/target/sh/archos/lcd-archos-bitmap.c203
4 files changed, 419 insertions, 228 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 8156431e48..369b260c8e 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -70,7 +70,7 @@ font.c
70hangul.c 70hangul.c
71lru.c 71lru.c
72#if LCD_DEPTH == 1 72#if LCD_DEPTH == 1
73drivers/lcd-recorder.c 73drivers/lcd-1bit-vert.c
74#elif LCD_DEPTH == 2 74#elif LCD_DEPTH == 2
75#if LCD_PIXELFORMAT == HORIZONTAL_PACKING 75#if LCD_PIXELFORMAT == HORIZONTAL_PACKING
76drivers/lcd-2bit-horz.c 76drivers/lcd-2bit-horz.c
@@ -287,18 +287,21 @@ target/sh/archos/player/lcd-as-player.S
287 287
288#ifdef ARCHOS_RECORDER 288#ifdef ARCHOS_RECORDER
289#ifndef SIMULATOR 289#ifndef SIMULATOR
290target/sh/archos/lcd-archos-bitmap.c
290target/sh/archos/lcd-as-archos-bitmap.S 291target/sh/archos/lcd-as-archos-bitmap.S
291#endif /* SIMULATOR */ 292#endif /* SIMULATOR */
292#endif /* ARCHOS_RECORDER */ 293#endif /* ARCHOS_RECORDER */
293 294
294#if defined(ARCHOS_FMRECORDER) || defined(ARCHOS_RECORDERV2) 295#if defined(ARCHOS_FMRECORDER) || defined(ARCHOS_RECORDERV2)
295#ifndef SIMULATOR 296#ifndef SIMULATOR
297target/sh/archos/lcd-archos-bitmap.c
296target/sh/archos/lcd-as-archos-bitmap.S 298target/sh/archos/lcd-as-archos-bitmap.S
297#endif /* SIMULATOR */ 299#endif /* SIMULATOR */
298#endif /* ARCHOS_FMRECORDER || ARCHOS_RECORDERV2 */ 300#endif /* ARCHOS_FMRECORDER || ARCHOS_RECORDERV2 */
299 301
300#if defined(ARCHOS_ONDIOFM) || defined(ARCHOS_ONDIOSP) 302#if defined(ARCHOS_ONDIOFM) || defined(ARCHOS_ONDIOSP)
301#ifndef SIMULATOR 303#ifndef SIMULATOR
304target/sh/archos/lcd-archos-bitmap.c
302target/sh/archos/lcd-as-archos-bitmap.S 305target/sh/archos/lcd-as-archos-bitmap.S
303#endif /* SIMULATOR */ 306#endif /* SIMULATOR */
304#endif /* ARCHOS_ONDIOFM || ARCHOS_ONDIOFM */ 307#endif /* ARCHOS_ONDIOFM || ARCHOS_ONDIOFM */
@@ -526,6 +529,7 @@ target/arm/iriver/ifp7xx/power-ifp7xx.c
526target/arm/iriver/ifp7xx/adc-ifp7xx.c 529target/arm/iriver/ifp7xx/adc-ifp7xx.c
527target/arm/iriver/ifp7xx/backlight-ifp7xx.c 530target/arm/iriver/ifp7xx/backlight-ifp7xx.c
528target/arm/iriver/ifp7xx/button-ifp7xx.c 531target/arm/iriver/ifp7xx/button-ifp7xx.c
532target/arm/iriver/ifp7xx/lcd-ifp7xx.c
529target/arm/iriver/ifp7xx/usb-ifp7xx.c 533target/arm/iriver/ifp7xx/usb-ifp7xx.c
530#endif 534#endif
531#endif 535#endif
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;
83static int xmargin = 0; 43static int xmargin = 0;
84static int ymargin = 0; 44static int ymargin = 0;
85static int curfont = FONT_SYSFIXED; 45static int curfont = FONT_SYSFIXED;
86#ifndef SIMULATOR
87static int xoffset; /* needed for flip */
88#endif
89 46
90/* scrolling */ 47/* scrolling */
91static volatile int scrolling_lines=0; /* Bitpattern of which lines are scrolling */ 48static 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
113void lcd_write_command(int cmd)
114{
115 while ((LCDSTAT & 3) != 3);
116 LCDCMD = cmd;
117}
118
119void 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
134int 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
143void lcd_set_contrast(int val)
144{
145 lcd_write_command(LCD_CNTL_CONTRAST);
146 lcd_write_command(val);
147}
148
149void 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) */
158void 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
187void lcd_init(void) 65void 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
194void 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! */
235void 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. */
253void lcd_update(void) ICODE_ATTR;
254void 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. */
270void lcd_update_rect(int, int, int, int) ICODE_ATTR;
271void 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
300void lcd_set_drawmode(int mode) 76void lcd_set_drawmode(int mode)
diff --git a/firmware/target/arm/iriver/ifp7xx/lcd-ifp7xx.c b/firmware/target/arm/iriver/ifp7xx/lcd-ifp7xx.c
new file mode 100755
index 0000000000..ca4a01b52e
--- /dev/null
+++ b/firmware/target/arm/iriver/ifp7xx/lcd-ifp7xx.c
@@ -0,0 +1,208 @@
1/***************************************************************************
2 * __________ __ ___.
3 * Open \______ \ ____ ____ | | _\_ |__ _______ ___
4 * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7 * \/ \/ \/ \/ \/
8 * $Id$
9 *
10 * Copyright (C) 2002 by Alan Korr
11 *
12 * All files in this archive are subject to the GNU General Public License.
13 * See the file COPYING in the source tree root for full license agreement.
14 *
15 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
16 * KIND, either express or implied.
17 *
18 ****************************************************************************/
19#include "config.h"
20
21#include "kernel.h"
22#include "lcd.h"
23#include "system.h"
24
25/*** definitions ***/
26
27#define LCD_SET_LOWER_COLUMN_ADDRESS ((char)0x00)
28#define LCD_SET_HIGHER_COLUMN_ADDRESS ((char)0x10)
29#define LCD_SET_INTERNAL_REGULATOR_RESISTOR_RATIO ((char)0x20)
30#define LCD_SET_POWER_CONTROL_REGISTER ((char)0x28)
31#define LCD_SET_DISPLAY_START_LINE ((char)0x40)
32#define LCD_SET_CONTRAST_CONTROL_REGISTER ((char)0x81)
33#define LCD_SET_SEGMENT_REMAP ((char)0xA0)
34#define LCD_SET_LCD_BIAS ((char)0xA2)
35#define LCD_SET_ENTIRE_DISPLAY_OFF ((char)0xA4)
36#define LCD_SET_ENTIRE_DISPLAY_ON ((char)0xA5)
37#define LCD_SET_NORMAL_DISPLAY ((char)0xA6)
38#define LCD_SET_REVERSE_DISPLAY ((char)0xA7)
39#define LCD_SET_MULTIPLEX_RATIO ((char)0xA8)
40#define LCD_SET_BIAS_TC_OSC ((char)0xA9)
41#define LCD_SET_1OVER4_BIAS_RATIO ((char)0xAA)
42#define LCD_SET_INDICATOR_OFF ((char)0xAC)
43#define LCD_SET_INDICATOR_ON ((char)0xAD)
44#define LCD_SET_DISPLAY_OFF ((char)0xAE)
45#define LCD_SET_DISPLAY_ON ((char)0xAF)
46#define LCD_SET_PAGE_ADDRESS ((char)0xB0)
47#define LCD_SET_COM_OUTPUT_SCAN_DIRECTION ((char)0xC0)
48#define LCD_SET_TOTAL_FRAME_PHASES ((char)0xD2)
49#define LCD_SET_DISPLAY_OFFSET ((char)0xD3)
50#define LCD_SET_READ_MODIFY_WRITE_MODE ((char)0xE0)
51#define LCD_SOFTWARE_RESET ((char)0xE2)
52#define LCD_NOP ((char)0xE3)
53#define LCD_SET_END_OF_READ_MODIFY_WRITE_MODE ((char)0xEE)
54
55/* LCD command codes */
56#define LCD_CNTL_RESET 0xe2 /* Software reset */
57#define LCD_CNTL_POWER 0x2f /* Power control */
58#define LCD_CNTL_CONTRAST 0x81 /* Contrast */
59#define LCD_CNTL_OUTSCAN 0xc8 /* Output scan direction */
60#define LCD_CNTL_SEGREMAP 0xa1 /* Segment remap */
61#define LCD_CNTL_DISPON 0xaf /* Display on */
62
63#define LCD_CNTL_PAGE 0xb0 /* Page address */
64#define LCD_CNTL_HIGHCOL 0x10 /* Upper column address */
65#define LCD_CNTL_LOWCOL 0x00 /* Lower column address */
66
67/*** driver routines ***/
68
69void lcd_write_command(int cmd)
70{
71 while ((LCDSTAT & 3) != 3);
72 LCDCMD = cmd;
73}
74
75void lcd_write_data( const unsigned char* data, int count )
76{
77 int i;
78 for (i=0; i < count; i++) {
79 while ((LCDSTAT & 3) != 3);
80 LCDDATA = data[i];
81 }
82}
83
84/*** hardware configuration ***/
85
86int lcd_default_contrast(void)
87{
88 return 45;
89}
90
91void lcd_set_contrast(int val)
92{
93 lcd_write_command(LCD_CNTL_CONTRAST);
94 lcd_write_command(val);
95}
96
97void lcd_set_invert_display(bool yesno)
98{
99 if (yesno)
100 lcd_write_command(LCD_SET_REVERSE_DISPLAY);
101 else
102 lcd_write_command(LCD_SET_NORMAL_DISPLAY);
103}
104
105/* turn the display upside down (call lcd_update() afterwards) */
106void lcd_set_flip(bool yesno)
107{
108 if (yesno)
109 {
110 lcd_write_command(LCD_SET_SEGMENT_REMAP);
111 lcd_write_command(LCD_SET_COM_OUTPUT_SCAN_DIRECTION);
112 }
113 else
114 {
115 lcd_write_command(LCD_SET_SEGMENT_REMAP | 0x01);
116 lcd_write_command(LCD_SET_COM_OUTPUT_SCAN_DIRECTION | 0x08);
117 }
118}
119
120void lcd_init_device(void)
121{
122 LCDREG10 = 0xf;
123 LCDREG04 = 0x4084;
124
125 /* inits like the original firmware */
126 lcd_write_command(LCD_SOFTWARE_RESET);
127 lcd_write_command(LCD_SET_INTERNAL_REGULATOR_RESISTOR_RATIO + 4);
128 lcd_write_command(LCD_SET_LCD_BIAS);
129 lcd_write_command(LCD_SET_POWER_CONTROL_REGISTER + 7);
130 /* power control register: op-amp=1, regulator=1, booster=1 */
131 lcd_write_command(LCD_SET_DISPLAY_ON);
132 lcd_write_command(LCD_SET_NORMAL_DISPLAY);
133 lcd_set_flip(false);
134 lcd_write_command(LCD_SET_DISPLAY_START_LINE + 0);
135 lcd_set_contrast(lcd_default_contrast());
136 lcd_write_command(LCD_SET_PAGE_ADDRESS);
137 lcd_write_command(LCD_SET_LOWER_COLUMN_ADDRESS + 0);
138 lcd_write_command(LCD_SET_HIGHER_COLUMN_ADDRESS + 0);
139
140 lcd_clear_display();
141 lcd_update();
142}
143
144/*** Update functions ***/
145
146/* Performance function that works with an external buffer
147 note that by and bheight are in 8-pixel units! */
148void lcd_blit(const unsigned char* data, int x, int by, int width,
149 int bheight, int stride)
150{
151 /* Copy display bitmap to hardware */
152 while (bheight--)
153 {
154 lcd_write_command (LCD_CNTL_PAGE | (by++ & 0xf));
155 lcd_write_command (LCD_CNTL_HIGHCOL | (((x+4)>>4) & 0xf));
156 lcd_write_command (LCD_CNTL_LOWCOL | ((x+4) & 0xf));
157
158 lcd_write_data(data, width);
159 data += stride;
160 }
161}
162
163
164/* Update the display.
165 This must be called after all other LCD functions that change the display. */
166void lcd_update(void) ICODE_ATTR;
167void lcd_update(void)
168{
169 int y;
170
171 /* Copy display bitmap to hardware */
172 for (y = 0; y < LCD_HEIGHT/8; y++)
173 {
174 lcd_write_command (LCD_CNTL_PAGE | (y & 0xf));
175 lcd_write_command (LCD_CNTL_HIGHCOL);
176 lcd_write_command (LCD_CNTL_LOWCOL | 4);
177
178 lcd_write_data (lcd_framebuffer[y], LCD_WIDTH);
179 }
180}
181
182/* Update a fraction of the display. */
183void lcd_update_rect(int, int, int, int) ICODE_ATTR;
184void lcd_update_rect(int x, int y, int width, int height)
185{
186 int ymax;
187
188 /* The Y coordinates have to work on even 8 pixel rows */
189 ymax = (y + height-1) >> 3;
190 y >>= 3;
191
192 if(x + width > LCD_WIDTH)
193 width = LCD_WIDTH - x;
194 if (width <= 0)
195 return; /* nothing left to do, 0 is harmful to lcd_write_data() */
196 if(ymax >= LCD_HEIGHT/8)
197 ymax = LCD_HEIGHT/8-1;
198
199 /* Copy specified rectange bitmap to hardware */
200 for (; y <= ymax; y++)
201 {
202 lcd_write_command (LCD_CNTL_PAGE | (y & 0xf));
203 lcd_write_command (LCD_CNTL_HIGHCOL | (((x+4) >> 4) & 0xf));
204 lcd_write_command (LCD_CNTL_LOWCOL | ((x+4) & 0xf));
205
206 lcd_write_data (&lcd_framebuffer[y][x], width);
207 }
208}
diff --git a/firmware/target/sh/archos/lcd-archos-bitmap.c b/firmware/target/sh/archos/lcd-archos-bitmap.c
new file mode 100755
index 0000000000..8b57099206
--- /dev/null
+++ b/firmware/target/sh/archos/lcd-archos-bitmap.c
@@ -0,0 +1,203 @@
1/***************************************************************************
2 * __________ __ ___.
3 * Open \______ \ ____ ____ | | _\_ |__ _______ ___
4 * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7 * \/ \/ \/ \/ \/
8 * $Id$
9 *
10 * Copyright (C) 2002 by Alan Korr
11 *
12 * All files in this archive are subject to the GNU General Public License.
13 * See the file COPYING in the source tree root for full license agreement.
14 *
15 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
16 * KIND, either express or implied.
17 *
18 ****************************************************************************/
19#include "config.h"
20
21#include "hwcompat.h"
22#include "kernel.h"
23#include "lcd.h"
24#include "system.h"
25
26/*** definitions ***/
27
28#define LCD_SET_LOWER_COLUMN_ADDRESS ((char)0x00)
29#define LCD_SET_HIGHER_COLUMN_ADDRESS ((char)0x10)
30#define LCD_SET_INTERNAL_REGULATOR_RESISTOR_RATIO ((char)0x20)
31#define LCD_SET_POWER_CONTROL_REGISTER ((char)0x28)
32#define LCD_SET_DISPLAY_START_LINE ((char)0x40)
33#define LCD_SET_CONTRAST_CONTROL_REGISTER ((char)0x81)
34#define LCD_SET_SEGMENT_REMAP ((char)0xA0)
35#define LCD_SET_LCD_BIAS ((char)0xA2)
36#define LCD_SET_ENTIRE_DISPLAY_OFF ((char)0xA4)
37#define LCD_SET_ENTIRE_DISPLAY_ON ((char)0xA5)
38#define LCD_SET_NORMAL_DISPLAY ((char)0xA6)
39#define LCD_SET_REVERSE_DISPLAY ((char)0xA7)
40#define LCD_SET_MULTIPLEX_RATIO ((char)0xA8)
41#define LCD_SET_BIAS_TC_OSC ((char)0xA9)
42#define LCD_SET_1OVER4_BIAS_RATIO ((char)0xAA)
43#define LCD_SET_INDICATOR_OFF ((char)0xAC)
44#define LCD_SET_INDICATOR_ON ((char)0xAD)
45#define LCD_SET_DISPLAY_OFF ((char)0xAE)
46#define LCD_SET_DISPLAY_ON ((char)0xAF)
47#define LCD_SET_PAGE_ADDRESS ((char)0xB0)
48#define LCD_SET_COM_OUTPUT_SCAN_DIRECTION ((char)0xC0)
49#define LCD_SET_TOTAL_FRAME_PHASES ((char)0xD2)
50#define LCD_SET_DISPLAY_OFFSET ((char)0xD3)
51#define LCD_SET_READ_MODIFY_WRITE_MODE ((char)0xE0)
52#define LCD_SOFTWARE_RESET ((char)0xE2)
53#define LCD_NOP ((char)0xE3)
54#define LCD_SET_END_OF_READ_MODIFY_WRITE_MODE ((char)0xEE)
55
56/* LCD command codes */
57#define LCD_CNTL_RESET 0xe2 /* Software reset */
58#define LCD_CNTL_POWER 0x2f /* Power control */
59#define LCD_CNTL_CONTRAST 0x81 /* Contrast */
60#define LCD_CNTL_OUTSCAN 0xc8 /* Output scan direction */
61#define LCD_CNTL_SEGREMAP 0xa1 /* Segment remap */
62#define LCD_CNTL_DISPON 0xaf /* Display on */
63
64#define LCD_CNTL_PAGE 0xb0 /* Page address */
65#define LCD_CNTL_HIGHCOL 0x10 /* Upper column address */
66#define LCD_CNTL_LOWCOL 0x00 /* Lower column address */
67
68/** globals **/
69
70static int xoffset; /* needed for flip */
71
72/*** hardware configuration ***/
73
74int lcd_default_contrast(void)
75{
76 return (read_hw_mask() & LCD_CONTRAST_BIAS) ? 31 : 49;
77}
78
79void lcd_set_contrast(int val)
80{
81 lcd_write_command(LCD_CNTL_CONTRAST);
82 lcd_write_command(val);
83}
84
85void lcd_set_invert_display(bool yesno)
86{
87 if (yesno)
88 lcd_write_command(LCD_SET_REVERSE_DISPLAY);
89 else
90 lcd_write_command(LCD_SET_NORMAL_DISPLAY);
91}
92
93/* turn the display upside down (call lcd_update() afterwards) */
94void lcd_set_flip(bool yesno)
95{
96#ifdef HAVE_DISPLAY_FLIPPED
97 if (!yesno)
98#else
99 if (yesno)
100#endif
101 {
102 lcd_write_command(LCD_SET_SEGMENT_REMAP);
103 lcd_write_command(LCD_SET_COM_OUTPUT_SCAN_DIRECTION);
104 xoffset = 132 - LCD_WIDTH; /* 132 colums minus the 112 we have */
105 }
106 else
107 {
108 lcd_write_command(LCD_SET_SEGMENT_REMAP | 0x01);
109 lcd_write_command(LCD_SET_COM_OUTPUT_SCAN_DIRECTION | 0x08);
110 xoffset = 0;
111 }
112}
113
114void lcd_init_device(void)
115{
116 /* Initialize PB0-3 as output pins */
117 PBCR2 &= 0xff00; /* MD = 00 */
118 PBIOR |= 0x000f; /* IOR = 1 */
119
120 /* inits like the original firmware */
121 lcd_write_command(LCD_SOFTWARE_RESET);
122 lcd_write_command(LCD_SET_INTERNAL_REGULATOR_RESISTOR_RATIO + 4);
123 lcd_write_command(LCD_SET_1OVER4_BIAS_RATIO + 0); /* force 1/4 bias: 0 */
124 lcd_write_command(LCD_SET_POWER_CONTROL_REGISTER + 7);
125 /* power control register: op-amp=1, regulator=1, booster=1 */
126 lcd_write_command(LCD_SET_DISPLAY_ON);
127 lcd_write_command(LCD_SET_NORMAL_DISPLAY);
128 lcd_set_flip(false);
129 lcd_write_command(LCD_SET_DISPLAY_START_LINE + 0);
130 lcd_set_contrast(lcd_default_contrast());
131 lcd_write_command(LCD_SET_PAGE_ADDRESS);
132 lcd_write_command(LCD_SET_LOWER_COLUMN_ADDRESS + 0);
133 lcd_write_command(LCD_SET_HIGHER_COLUMN_ADDRESS + 0);
134
135 lcd_clear_display();
136 lcd_update();
137}
138
139/*** Update functions ***/
140
141/* Performance function that works with an external buffer
142 note that by and bheight are in 8-pixel units! */
143void lcd_blit(const unsigned char* data, int x, int by, int width,
144 int bheight, int stride)
145{
146 /* Copy display bitmap to hardware */
147 while (bheight--)
148 {
149 lcd_write_command (LCD_CNTL_PAGE | (by++ & 0xf));
150 lcd_write_command (LCD_CNTL_HIGHCOL | (((x+xoffset)>>4) & 0xf));
151 lcd_write_command (LCD_CNTL_LOWCOL | ((x+xoffset) & 0xf));
152
153 lcd_write_data(data, width);
154 data += stride;
155 }
156}
157
158
159/* Update the display.
160 This must be called after all other LCD functions that change the display. */
161void lcd_update(void) ICODE_ATTR;
162void lcd_update(void)
163{
164 int y;
165
166 /* Copy display bitmap to hardware */
167 for (y = 0; y < LCD_HEIGHT/8; y++)
168 {
169 lcd_write_command (LCD_CNTL_PAGE | (y & 0xf));
170 lcd_write_command (LCD_CNTL_HIGHCOL | ((xoffset >> 4) & 0xf));
171 lcd_write_command (LCD_CNTL_LOWCOL | (xoffset & 0xf));
172
173 lcd_write_data (lcd_framebuffer[y], LCD_WIDTH);
174 }
175}
176
177/* Update a fraction of the display. */
178void lcd_update_rect(int, int, int, int) ICODE_ATTR;
179void lcd_update_rect(int x, int y, int width, int height)
180{
181 int ymax;
182
183 /* The Y coordinates have to work on even 8 pixel rows */
184 ymax = (y + height-1) >> 3;
185 y >>= 3;
186
187 if(x + width > LCD_WIDTH)
188 width = LCD_WIDTH - x;
189 if (width <= 0)
190 return; /* nothing left to do, 0 is harmful to lcd_write_data() */
191 if(ymax >= LCD_HEIGHT/8)
192 ymax = LCD_HEIGHT/8-1;
193
194 /* Copy specified rectange bitmap to hardware */
195 for (; y <= ymax; y++)
196 {
197 lcd_write_command (LCD_CNTL_PAGE | (y & 0xf));
198 lcd_write_command (LCD_CNTL_HIGHCOL | (((x+xoffset) >> 4) & 0xf));
199 lcd_write_command (LCD_CNTL_LOWCOL | ((x+xoffset) & 0xf));
200
201 lcd_write_data (&lcd_framebuffer[y][x], width);
202 }
203}