summaryrefslogtreecommitdiff
path: root/firmware/target
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target')
-rw-r--r--firmware/target/arm/iriver/h10/lcd-h10_5gb.c114
-rw-r--r--firmware/target/coldfire/iaudio/lcd-remote-iaudio.c125
-rw-r--r--firmware/target/coldfire/iaudio/m3/button-m3.c2
-rw-r--r--firmware/target/coldfire/iaudio/m3/lcd-m3.c303
4 files changed, 399 insertions, 145 deletions
diff --git a/firmware/target/arm/iriver/h10/lcd-h10_5gb.c b/firmware/target/arm/iriver/h10/lcd-h10_5gb.c
index 669654f5c3..5b022e09c5 100644
--- a/firmware/target/arm/iriver/h10/lcd-h10_5gb.c
+++ b/firmware/target/arm/iriver/h10/lcd-h10_5gb.c
@@ -108,7 +108,6 @@ void lcd_init_device(void)
108{ 108{
109 CLCD_CLOCK_SRC |= 0xc0000000; /* Set LCD interface clock to PLL */ 109 CLCD_CLOCK_SRC |= 0xc0000000; /* Set LCD interface clock to PLL */
110 /* H10 LCD is initialised by the bootloader */ 110 /* H10 LCD is initialised by the bootloader */
111 lcd_write_reg(R_ENTRY_MODE, 0x1030); /* BGR =1, ID1 = 1, ID0 = 1 */
112} 111}
113 112
114/*** update functions ***/ 113/*** update functions ***/
@@ -276,51 +275,88 @@ void lcd_blit_yuv(unsigned char * const src[3],
276 275
277 276
278/* Update a fraction of the display. */ 277/* Update a fraction of the display. */
279void lcd_update_rect(int x, int y, int width, int height) 278void lcd_update_rect(int x0, int y0, int width, int height)
280{ 279{
281 const fb_data *addr; 280 int x1, y1;
282 int bytes_to_write; 281 int newx,newwidth;
283 282 unsigned long *addr;
284 if (x + width >= LCD_WIDTH)
285 width = LCD_WIDTH - x;
286 if (y + height >= LCD_HEIGHT)
287 height = LCD_HEIGHT - y;
288
289 if ((width <= 0) || (height <= 0))
290 return; /* Nothing left to do. 0 would hang the transfer. */
291
292 /* Ensure x and width are both even, so we can read
293 * 32-bit aligned data from the framebuffer */
294 width = (width + (x & 1) + 1) & ~1;
295 x &= ~1;
296
297 lcd_write_reg(R_VERT_RAM_ADDR_POS, (LCD_HEIGHT-1) << 8);
298 lcd_write_reg(R_HORIZ_RAM_ADDR_POS, ((x + width - 1) << 8) | x);
299 lcd_write_reg(R_RAM_ADDR_SET, (y << 8) | x);
300 283
284 /* Ensure x and width are both even - so we can read 32-bit aligned
285 data from lcd_framebuffer */
286 newx=x0&~1;
287 newwidth=width&~1;
288 if (newx+newwidth < x0+width) { newwidth+=2; }
289 x0=newx; width=newwidth;
290
291 /* calculate the drawing region */
292 y1 = (y0 + height) - 1; /* max vert */
293 x1 = (x0 + width) - 1; /* max horiz */
294
295
296 /* swap max horiz < start horiz */
297 if (y1 < y0) {
298 int t;
299 t = y0;
300 y0 = y1;
301 y1 = t;
302 }
303
304 /* swap max vert < start vert */
305 if (x1 < x0) {
306 int t;
307 t = x0;
308 x0 = x1;
309 x1 = t;
310 }
311
312 /* max horiz << 8 | start horiz */
313 lcd_write_reg(R_HORIZ_RAM_ADDR_POS, (x1 << 8) | x0);
314
315 /* max vert << 8 | start vert */
316 lcd_write_reg(R_VERT_RAM_ADDR_POS, (y1 << 8) | y0);
317
318 /* start vert << 8 | start horiz */
319 lcd_write_reg(R_RAM_ADDR_SET, (y0 << 8) | x0);
320
321 /* start drawing */
301 lcd_send_cmd(R_WRITE_DATA_2_GRAM); 322 lcd_send_cmd(R_WRITE_DATA_2_GRAM);
302 323
303 addr = &lcd_framebuffer[y][x]; 324 addr = (unsigned long*)&lcd_framebuffer[y0][x0];
304 bytes_to_write = width * height * sizeof(fb_data);
305 /* must be <= 0x10000, but that's guaranteed on H10. */
306 325
307 LCD2_BLOCK_CTRL = 0x10000080; 326 while (height > 0) {
308 LCD2_BLOCK_CONFIG = 0xc0010000 | (bytes_to_write - 1); 327 int c, r;
309 LCD2_BLOCK_CTRL = 0x34000000; 328 int h, pixels_to_write;
310 329
311 do 330 pixels_to_write = (width * height) * 2;
312 { 331 h = height;
313 int w = width >> 1; 332
314 do 333 /* calculate how much we can do in one go */
315 { 334 if (pixels_to_write > 0x10000) {
316 while (!(LCD2_BLOCK_CTRL & LCD2_BLOCK_TXOK)); 335 h = (0x10000/2) / width;
317 LCD2_BLOCK_DATA = *(unsigned long*)addr; /* output 2 pixels */ 336 pixels_to_write = (width * h) * 2;
318 addr += 2;
319 } 337 }
320 while (--w > 0); 338
321 addr += LCD_WIDTH - width; 339 LCD2_BLOCK_CTRL = 0x10000080;
340 LCD2_BLOCK_CONFIG = 0xc0010000 | (pixels_to_write - 1);
341 LCD2_BLOCK_CTRL = 0x34000000;
342
343 /* for each row */
344 for (r = 0; r < h; r++) {
345 /* for each column */
346 for (c = 0; c < width; c += 2) {
347 while (!(LCD2_BLOCK_CTRL & LCD2_BLOCK_TXOK));
348
349 /* output 2 pixels */
350 LCD2_BLOCK_DATA = *addr++;
351 }
352 addr += (LCD_WIDTH - width)/2;
353 }
354
355 while (!(LCD2_BLOCK_CTRL & LCD2_BLOCK_READY));
356 LCD2_BLOCK_CONFIG = 0;
357
358 height -= h;
322 } 359 }
323 while (--height > 0);
324} 360}
325 361
326/* Update the display. 362/* Update the display.
diff --git a/firmware/target/coldfire/iaudio/lcd-remote-iaudio.c b/firmware/target/coldfire/iaudio/lcd-remote-iaudio.c
index 6565d3088d..5a03dc6180 100644
--- a/firmware/target/coldfire/iaudio/lcd-remote-iaudio.c
+++ b/firmware/target/coldfire/iaudio/lcd-remote-iaudio.c
@@ -64,106 +64,83 @@ bool remote_initialized = false;
64static inline void _write_byte(unsigned data) 64static inline void _write_byte(unsigned data)
65{ 65{
66 asm volatile ( 66 asm volatile (
67 "move.w %%sr,%%d2 \n" /* Get current interrupt level */ 67 "move.l (%[gpo0]), %%d0 \n" /* Get current state of data line */
68 "move.w #0x2700,%%sr \n" /* Disable interrupts */ 68 "and.l %[dbit], %%d0 \n"
69
70 "move.l (%[gpo0]), %%d0 \n" /* Get current state of data port */
71 "move.l %%d0, %%d1 \n"
72 "and.l %[dbit], %%d1 \n" /* Check current state of data line */
73 "beq.s 1f \n" /* and set it as previous-state bit */ 69 "beq.s 1f \n" /* and set it as previous-state bit */
74 "bset #8, %[data] \n" 70 "bset #8, %[data] \n"
75 "1: \n" 71 "1: \n"
76 "move.l %[data], %%d1 \n" /* Compute the 'bit derivative', i.e. a value */ 72 "move.l %[data], %%d0 \n" /* Compute the 'bit derivative', i.e. a value */
77 "lsr.l #1, %%d1 \n" /* with 1's where the data changes from the */ 73 "lsr.l #1, %%d0 \n" /* with 1's where the data changes from the */
78 "eor.l %%d1, %[data] \n" /* previous state, and 0's where it doesn't */ 74 "eor.l %%d0, %[data] \n" /* previous state, and 0's where it doesn't */
79 "swap %[data] \n" /* Shift data to upper byte */ 75 "swap %[data] \n" /* Shift data to upper byte */
80 "lsl.l #8, %[data] \n" 76 "lsl.l #8, %[data] \n"
81 77
82 "eor.l %[cbit], %%d0 \n" /* precalculate opposite state of clock line */ 78 "move.l %[cbit], %%d1 \n" /* Prepare mask for flipping CLK */
83 79 "or.l %[dbit], %%d1 \n" /* and DATA at once */
80
84 "lsl.l #1,%[data] \n" /* Shift out MSB */ 81 "lsl.l #1,%[data] \n" /* Shift out MSB */
85 "bcc.s 1f \n" 82 "bcc.s 1f \n"
86 "eor.l %[dbit], %%d0 \n" /* 1: Flip data bit */ 83 "eor.l %%d1, (%[gpo0]) \n" /* 1: Flip both CLK and DATA */
84 ".word 0x51fa \n" /* (trapf.w - shadow next insn) */
87 "1: \n" 85 "1: \n"
88 "move.l %%d0, %%d1 \n" 86 "eor.l %[cbit], (%[gpo0]) \n" /* else flip CLK only */
89 "move.l %%d0, (%[gpo0]) \n" /* Output new state and set CLK = 0*/ 87 "eor.l %[cbit], (%[gpo0]) \n" /* Flip CLK again */
90 "eor.l %[cbit], %%d1 \n"
91 "nop \n"
92 88
93 "lsl.l #1,%[data] \n" /* ..unrolled.. */ 89 "lsl.l #1,%[data] \n" /* ..unrolled.. */
94 "bcc.s 1f \n" 90 "bcc.s 1f \n"
95 "eor.l %[dbit], %%d0 \n" 91 "eor.l %%d1, (%[gpo0]) \n"
92 ".word 0x51fa \n"
96 "1: \n" 93 "1: \n"
97 "move.l %%d1, (%[gpo0]) \n" /* set CLK = 1 (delayed) */ 94 "eor.l %[cbit], (%[gpo0]) \n"
98 "move.l %%d0, %%d1 \n" 95 "eor.l %[cbit], (%[gpo0]) \n"
99 "move.l %%d0, (%[gpo0]) \n"
100 "eor.l %[cbit], %%d1 \n"
101 "nop \n"
102 96
103 "lsl.l #1,%[data] \n" /* ..unrolled.. */ 97 "lsl.l #1,%[data] \n"
104 "bcc.s 1f \n" 98 "bcc.s 1f \n"
105 "eor.l %[dbit], %%d0 \n" 99 "eor.l %%d1, (%[gpo0]) \n"
100 ".word 0x51fa \n"
106 "1: \n" 101 "1: \n"
107 "move.l %%d1, (%[gpo0]) \n" 102 "eor.l %[cbit], (%[gpo0]) \n"
108 "move.l %%d0, %%d1 \n" 103 "eor.l %[cbit], (%[gpo0]) \n"
109 "move.l %%d0, (%[gpo0]) \n"
110 "eor.l %[cbit], %%d1 \n"
111 "nop \n"
112 104
113 "lsl.l #1,%[data] \n" /* ..unrolled.. */ 105 "lsl.l #1,%[data] \n"
114 "bcc.s 1f \n" 106 "bcc.s 1f \n"
115 "eor.l %[dbit], %%d0 \n" 107 "eor.l %%d1, (%[gpo0]) \n"
108 ".word 0x51fa \n"
116 "1: \n" 109 "1: \n"
117 "move.l %%d1, (%[gpo0]) \n" 110 "eor.l %[cbit], (%[gpo0]) \n"
118 "move.l %%d0, %%d1 \n" 111 "eor.l %[cbit], (%[gpo0]) \n"
119 "move.l %%d0, (%[gpo0]) \n"
120 "eor.l %[cbit], %%d1 \n"
121 "nop \n"
122 112
123 "lsl.l #1,%[data] \n" /* ..unrolled.. */ 113 "lsl.l #1,%[data] \n"
124 "bcc.s 1f \n" 114 "bcc.s 1f \n"
125 "eor.l %[dbit], %%d0 \n" 115 "eor.l %%d1, (%[gpo0]) \n"
116 ".word 0x51fa \n"
126 "1: \n" 117 "1: \n"
127 "move.l %%d1, (%[gpo0]) \n" 118 "eor.l %[cbit], (%[gpo0]) \n"
128 "move.l %%d0, %%d1 \n" 119 "eor.l %[cbit], (%[gpo0]) \n"
129 "move.l %%d0, (%[gpo0]) \n"
130 "eor.l %[cbit], %%d1 \n"
131 "nop \n"
132 120
133 "lsl.l #1,%[data] \n" /* ..unrolled.. */ 121 "lsl.l #1,%[data] \n"
134 "bcc.s 1f \n" 122 "bcc.s 1f \n"
135 "eor.l %[dbit], %%d0 \n" 123 "eor.l %%d1, (%[gpo0]) \n"
124 ".word 0x51fa \n"
136 "1: \n" 125 "1: \n"
137 "move.l %%d1, (%[gpo0]) \n" 126 "eor.l %[cbit], (%[gpo0]) \n"
138 "move.l %%d0, %%d1 \n" 127 "eor.l %[cbit], (%[gpo0]) \n"
139 "move.l %%d0, (%[gpo0]) \n"
140 "eor.l %[cbit], %%d1 \n"
141 "nop \n"
142 128
143 "lsl.l #1,%[data] \n" /* ..unrolled.. */ 129 "lsl.l #1,%[data] \n"
144 "bcc.s 1f \n" 130 "bcc.s 1f \n"
145 "eor.l %[dbit], %%d0 \n" 131 "eor.l %%d1, (%[gpo0]) \n"
132 ".word 0x51fa \n"
146 "1: \n" 133 "1: \n"
147 "move.l %%d1, (%[gpo0]) \n" 134 "eor.l %[cbit], (%[gpo0]) \n"
148 "move.l %%d0, %%d1 \n" 135 "eor.l %[cbit], (%[gpo0]) \n"
149 "move.l %%d0, (%[gpo0]) \n"
150 "eor.l %[cbit], %%d1 \n"
151 "nop \n"
152 136
153 "lsl.l #1,%[data] \n" /* ..unrolled.. */ 137 "lsl.l #1,%[data] \n"
154 "bcc.s 1f \n" 138 "bcc.s 1f \n"
155 "eor.l %[dbit], %%d0 \n" 139 "eor.l %%d1, (%[gpo0]) \n"
140 ".word 0x51fa \n"
156 "1: \n" 141 "1: \n"
157 "move.l %%d1, (%[gpo0]) \n" 142 "eor.l %[cbit], (%[gpo0]) \n"
158 "move.l %%d0, %%d1 \n" 143 "eor.l %[cbit], (%[gpo0]) \n"
159 "move.l %%d0, (%[gpo0]) \n"
160 "eor.l %[cbit], %%d1 \n"
161 "nop \n"
162
163 "nop \n"
164 "move.l %%d1, (%[gpo0]) \n" /* set CLK = 1 (delayed) */
165
166 "move.w %%d2, %%sr \n" /* Restore interrupt level */
167 : /* outputs */ 144 : /* outputs */
168 [data]"+d"(data) 145 [data]"+d"(data)
169 : /* inputs */ 146 : /* inputs */
@@ -171,7 +148,7 @@ static inline void _write_byte(unsigned data)
171 [cbit]"d"(0x00004000), 148 [cbit]"d"(0x00004000),
172 [dbit]"d"(0x00002000) 149 [dbit]"d"(0x00002000)
173 : /* clobbers */ 150 : /* clobbers */
174 "d0", "d1", "d2" 151 "d0", "d1"
175 ); 152 );
176} 153}
177 154
@@ -180,7 +157,7 @@ static inline void _write_byte(unsigned data)
180static inline void _write_fast(unsigned data) 157static inline void _write_fast(unsigned data)
181{ 158{
182 asm volatile ( 159 asm volatile (
183 "move.w %%sr,%%d2 \n" /* Get current interrupt level */ 160 "move.w %%sr,%%d3 \n" /* Get current interrupt level */
184 "move.w #0x2700,%%sr \n" /* Disable interrupts */ 161 "move.w #0x2700,%%sr \n" /* Disable interrupts */
185 162
186 "move.l (%[gpo0]), %%d0 \n" /* Get current state of data port */ 163 "move.l (%[gpo0]), %%d0 \n" /* Get current state of data port */
@@ -262,7 +239,7 @@ static inline void _write_fast(unsigned data)
262 "move.l %%d1, (%[gpo0]) \n" 239 "move.l %%d1, (%[gpo0]) \n"
263 "move.l %%d0, (%[gpo0]) \n" 240 "move.l %%d0, (%[gpo0]) \n"
264 241
265 "move.w %%d2, %%sr \n" /* Restore interrupt level */ 242 "move.w %%d3, %%sr \n" /* Restore interrupt level */
266 : /* outputs */ 243 : /* outputs */
267 [data]"+d"(data) 244 [data]"+d"(data)
268 : /* inputs */ 245 : /* inputs */
@@ -270,7 +247,7 @@ static inline void _write_fast(unsigned data)
270 [cbit]"d"(0x00004000), 247 [cbit]"d"(0x00004000),
271 [dbit]"d"(0x00002000) 248 [dbit]"d"(0x00002000)
272 : /* clobbers */ 249 : /* clobbers */
273 "d0", "d1", "d2" 250 "d0", "d1", "d2", "d3"
274 ); 251 );
275} 252}
276 253
diff --git a/firmware/target/coldfire/iaudio/m3/button-m3.c b/firmware/target/coldfire/iaudio/m3/button-m3.c
index f5d4b59363..ecea221a4c 100644
--- a/firmware/target/coldfire/iaudio/m3/button-m3.c
+++ b/firmware/target/coldfire/iaudio/m3/button-m3.c
@@ -116,7 +116,7 @@ int button_read_device(void)
116 else 116 else
117 btn |= BUTTON_RC_VOL_DOWN; 117 btn |= BUTTON_RC_VOL_DOWN;
118 } 118 }
119 if ((GPIO_READ & 0x80000000) == 0) 119 if ((GPIO_READ & 0x80000000) == 0)
120 btn |= BUTTON_RC_PLAY; 120 btn |= BUTTON_RC_PLAY;
121 } 121 }
122 122
diff --git a/firmware/target/coldfire/iaudio/m3/lcd-m3.c b/firmware/target/coldfire/iaudio/m3/lcd-m3.c
index 4bc22380f5..ae72832a82 100644
--- a/firmware/target/coldfire/iaudio/m3/lcd-m3.c
+++ b/firmware/target/coldfire/iaudio/m3/lcd-m3.c
@@ -61,6 +61,263 @@ static int cached_contrast = DEFAULT_CONTRAST_SETTING;
61bool initialized = false; 61bool initialized = false;
62 62
63 63
64/* Standard low-level byte writer. Requires CLK high on entry */
65static inline void _write_byte(unsigned data)
66{
67 asm volatile (
68 "move.l (%[gpo0]), %%d0 \n" /* Get current state of data line */
69 "and.l %[dbit], %%d0 \n"
70 "beq.s 1f \n" /* and set it as previous-state bit */
71 "bset #8, %[data] \n"
72 "1: \n"
73 "move.l %[data], %%d0 \n" /* Compute the 'bit derivative', i.e. a value */
74 "lsr.l #1, %%d0 \n" /* with 1's where the data changes from the */
75 "eor.l %%d0, %[data] \n" /* previous state, and 0's where it doesn't */
76 "swap %[data] \n" /* Shift data to upper byte */
77 "lsl.l #8, %[data] \n"
78
79 "move.l %[cbit], %%d1 \n" /* Prepare mask for flipping CLK */
80 "or.l %[dbit], %%d1 \n" /* and DATA at once */
81
82 "lsl.l #1,%[data] \n" /* Shift out MSB */
83 "bcc.s 1f \n"
84 "eor.l %%d1, (%[gpo0]) \n" /* 1: Flip both CLK and DATA */
85 ".word 0x51fa \n" /* (trapf.w - shadow next insn) */
86 "1: \n"
87 "eor.l %[cbit], (%[gpo0]) \n" /* else flip CLK only */
88 "eor.l %[cbit], (%[gpo0]) \n" /* Flip CLK again */
89
90 "lsl.l #1,%[data] \n" /* ..unrolled.. */
91 "bcc.s 1f \n"
92 "eor.l %%d1, (%[gpo0]) \n"
93 ".word 0x51fa \n"
94 "1: \n"
95 "eor.l %[cbit], (%[gpo0]) \n"
96 "eor.l %[cbit], (%[gpo0]) \n"
97
98 "lsl.l #1,%[data] \n"
99 "bcc.s 1f \n"
100 "eor.l %%d1, (%[gpo0]) \n"
101 ".word 0x51fa \n"
102 "1: \n"
103 "eor.l %[cbit], (%[gpo0]) \n"
104 "eor.l %[cbit], (%[gpo0]) \n"
105
106 "lsl.l #1,%[data] \n"
107 "bcc.s 1f \n"
108 "eor.l %%d1, (%[gpo0]) \n"
109 ".word 0x51fa \n"
110 "1: \n"
111 "eor.l %[cbit], (%[gpo0]) \n"
112 "eor.l %[cbit], (%[gpo0]) \n"
113
114 "lsl.l #1,%[data] \n"
115 "bcc.s 1f \n"
116 "eor.l %%d1, (%[gpo0]) \n"
117 ".word 0x51fa \n"
118 "1: \n"
119 "eor.l %[cbit], (%[gpo0]) \n"
120 "eor.l %[cbit], (%[gpo0]) \n"
121
122 "lsl.l #1,%[data] \n"
123 "bcc.s 1f \n"
124 "eor.l %%d1, (%[gpo0]) \n"
125 ".word 0x51fa \n"
126 "1: \n"
127 "eor.l %[cbit], (%[gpo0]) \n"
128 "eor.l %[cbit], (%[gpo0]) \n"
129
130 "lsl.l #1,%[data] \n"
131 "bcc.s 1f \n"
132 "eor.l %%d1, (%[gpo0]) \n"
133 ".word 0x51fa \n"
134 "1: \n"
135 "eor.l %[cbit], (%[gpo0]) \n"
136 "eor.l %[cbit], (%[gpo0]) \n"
137
138 "lsl.l #1,%[data] \n"
139 "bcc.s 1f \n"
140 "eor.l %%d1, (%[gpo0]) \n"
141 ".word 0x51fa \n"
142 "1: \n"
143 "eor.l %[cbit], (%[gpo0]) \n"
144 "eor.l %[cbit], (%[gpo0]) \n"
145 : /* outputs */
146 [data]"+d"(data)
147 : /* inputs */
148 [gpo0]"a"(&GPIO_OUT),
149 [cbit]"d"(0x20000000),
150 [dbit]"d"(0x04000000)
151 : /* clobbers */
152 "d0", "d1"
153 );
154}
155
156/* Fast low-level byte writer. Don't use with high CPU clock.
157 * Requires CLK high on entry */
158static inline void _write_fast(unsigned data)
159{
160 asm volatile (
161 "move.w %%sr,%%d3 \n" /* Get current interrupt level */
162 "move.w #0x2700,%%sr \n" /* Disable interrupts */
163
164 "move.l (%[gpo0]), %%d0 \n" /* Get current state of data port */
165 "move.l %%d0, %%d1 \n"
166 "and.l %[dbit], %%d1 \n" /* Check current state of data line */
167 "beq.s 1f \n" /* and set it as previous-state bit */
168 "bset #8, %[data] \n"
169 "1: \n"
170 "move.l %[data], %%d1 \n" /* Compute the 'bit derivative', i.e. a value */
171 "lsr.l #1, %%d1 \n" /* with 1's where the data changes from the */
172 "eor.l %%d1, %[data] \n" /* previous state, and 0's where it doesn't */
173 "swap %[data] \n" /* Shift data to upper byte */
174 "lsl.l #8, %[data] \n"
175
176 "move.l %%d0, %%d1 \n" /* precalculate opposite state of clock line */
177 "eor.l %[cbit], %%d1 \n"
178
179 "lsl.l #1,%[data] \n" /* Shift out MSB */
180 "bcc.s 1f \n"
181 "eor.l %[dbit], %%d0 \n" /* 1: Flip data bit */
182 "eor.l %[dbit], %%d1 \n" /* for both clock states */
183 "1: \n"
184 "move.l %%d1, (%[gpo0]) \n" /* Output new state and set CLK */
185 "move.l %%d0, (%[gpo0]) \n" /* reset CLK */
186
187 "lsl.l #1,%[data] \n" /* ..unrolled.. */
188 "bcc.s 1f \n"
189 "eor.l %[dbit], %%d0 \n"
190 "eor.l %[dbit], %%d1 \n"
191 "1: \n"
192 "move.l %%d1, (%[gpo0]) \n"
193 "move.l %%d0, (%[gpo0]) \n"
194
195 "lsl.l #1,%[data] \n"
196 "bcc.s 1f \n"
197 "eor.l %[dbit], %%d0 \n"
198 "eor.l %[dbit], %%d1 \n"
199 "1: \n"
200 "move.l %%d1, (%[gpo0]) \n"
201 "move.l %%d0, (%[gpo0]) \n"
202
203 "lsl.l #1,%[data] \n"
204 "bcc.s 1f \n"
205 "eor.l %[dbit], %%d0 \n"
206 "eor.l %[dbit], %%d1 \n"
207 "1: \n"
208 "move.l %%d1, (%[gpo0]) \n"
209 "move.l %%d0, (%[gpo0]) \n"
210
211 "lsl.l #1,%[data] \n"
212 "bcc.s 1f \n"
213 "eor.l %[dbit], %%d0 \n"
214 "eor.l %[dbit], %%d1 \n"
215 "1: \n"
216 "move.l %%d1, (%[gpo0]) \n"
217 "move.l %%d0, (%[gpo0]) \n"
218
219 "lsl.l #1,%[data] \n"
220 "bcc.s 1f \n"
221 "eor.l %[dbit], %%d0 \n"
222 "eor.l %[dbit], %%d1 \n"
223 "1: \n"
224 "move.l %%d1, (%[gpo0]) \n"
225 "move.l %%d0, (%[gpo0]) \n"
226
227 "lsl.l #1,%[data] \n"
228 "bcc.s 1f \n"
229 "eor.l %[dbit], %%d0 \n"
230 "eor.l %[dbit], %%d1 \n"
231 "1: \n"
232 "move.l %%d1, (%[gpo0]) \n"
233 "move.l %%d0, (%[gpo0]) \n"
234
235 "lsl.l #1,%[data] \n"
236 "bcc.s 1f \n"
237 "eor.l %[dbit], %%d0 \n"
238 "eor.l %[dbit], %%d1 \n"
239 "1: \n"
240 "move.l %%d1, (%[gpo0]) \n"
241 "move.l %%d0, (%[gpo0]) \n"
242
243 "move.w %%d3, %%sr \n" /* Restore interrupt level */
244 : /* outputs */
245 [data]"+d"(data)
246 : /* inputs */
247 [gpo0]"a"(&GPIO_OUT),
248 [cbit]"d"(0x20000000),
249 [dbit]"d"(0x04000000)
250 : /* clobbers */
251 "d0", "d1", "d2", "d3"
252 );
253}
254
255void lcd_write_command(int cmd)
256{
257 RS_LO;
258 CS_LO;
259 _write_byte(cmd);
260 CS_HI;
261}
262
263void lcd_write_command_e(int cmd, int data)
264{
265 RS_LO;
266 CS_LO;
267 _write_byte(cmd);
268 _write_byte(data);
269 CS_HI;
270}
271
272void lcd_write_data(const fb_data *p_words, int count)
273{
274 const unsigned char *p_bytes = (const unsigned char *)p_words;
275 const unsigned char *p_end = (const unsigned char *)(p_words + count);
276
277 RS_HI;
278 CS_LO;
279 if (cpu_frequency < 50000000)
280 {
281 while (p_bytes < p_end)
282 _write_fast(*p_bytes++);
283 }
284 else
285 {
286 while (p_bytes < p_end)
287 _write_byte(*p_bytes++);
288 }
289 CS_HI;
290}
291
292static void lcd_mono_data(const unsigned char *p_words, int count)
293{
294 unsigned data;
295 const unsigned char *p_bytes = p_words;
296 const unsigned char *p_end = p_words + count;
297
298 RS_HI;
299 CS_LO;
300 if (cpu_frequency < 50000000)
301 {
302 while (p_bytes < p_end)
303 {
304 data = *p_bytes++;
305 _write_fast(data);
306 _write_fast(data);
307 }
308 }
309 else
310 {
311 while (p_bytes < p_end)
312 {
313 data = *p_bytes++;
314 _write_byte(data);
315 _write_byte(data);
316 }
317 }
318 CS_HI;
319}
320
64int lcd_default_contrast(void) 321int lcd_default_contrast(void)
65{ 322{
66 return DEFAULT_CONTRAST_SETTING; 323 return DEFAULT_CONTRAST_SETTING;
@@ -200,9 +457,6 @@ void lcd_init_device(void)
200#endif 457#endif
201} 458}
202 459
203/* Helper function. */
204void lcd_mono_data(const unsigned char *data, int count);
205
206/* Performance function that works with an external buffer 460/* Performance function that works with an external buffer
207 note that by and bheight are in 8-pixel units! */ 461 note that by and bheight are in 8-pixel units! */
208void lcd_blit_mono(const unsigned char *data, int x, int by, int width, 462void lcd_blit_mono(const unsigned char *data, int x, int by, int width,
@@ -223,28 +477,20 @@ void lcd_blit_mono(const unsigned char *data, int x, int by, int width,
223 } 477 }
224} 478}
225 479
226/* Helper function for lcd_grey_phase_blit(). */ 480/* TODO: implement grey blit function */
227void lcd_grey_data(unsigned char *values, unsigned char *phases, int count);
228 481
229/* Performance function that works with an external buffer 482/* Performance function that works with an external buffer
230 note that by and bheight are in 8-pixel units! */ 483 note that by and bheight are in 8-pixel units! */
231void lcd_blit_grey_phase(unsigned char *values, unsigned char *phases, 484void lcd_blit_grey_phase(unsigned char *values, unsigned char *phases,
232 int x, int by, int width, int bheight, int stride) 485 int x, int by, int width, int bheight, int stride)
233{ 486{
234 if (initialized) 487 (void)values;
235 { 488 (void)phases;
236 stride <<= 3; /* 8 pixels per block */ 489 (void)x;
237 while (bheight--) 490 (void)by;
238 { 491 (void)width;
239 lcd_write_command(LCD_SET_PAGE | ((by > 5 ? by + 2 : by) & 0xf)); 492 (void)bheight;
240 lcd_write_command_e(LCD_SET_COLUMN | ((x >> 4) & 0xf), x & 0xf); 493 (void)stride;
241
242 lcd_grey_data(values, phases, width);
243 values += stride;
244 phases += stride;
245 by++;
246 }
247 }
248} 494}
249 495
250/* Update the display. 496/* Update the display.
@@ -255,13 +501,12 @@ void lcd_update(void)
255 int y; 501 int y;
256 if (initialized) 502 if (initialized)
257 { 503 {
258 for(y = 0;y < LCD_FBHEIGHT;y++) 504 for(y = 0;y < LCD_FBHEIGHT;y++) {
259 {
260 /* Copy display bitmap to hardware. 505 /* Copy display bitmap to hardware.
261 The COM48-COM63 lines are not connected so we have to skip 506 The COM48-COM63 lines are not connected so we have to skip
262 them. Further, the column address doesn't wrap, so we 507 them. Further, the column address doesn't wrap, so we
263 have to update one page at a time. */ 508 have to update one page at a time. */
264 lcd_write_command(LCD_SET_PAGE | (y > 5 ? y + 2 : y)); 509 lcd_write_command(LCD_SET_PAGE | (y>5?y+2:y));
265 lcd_write_command_e(LCD_SET_COLUMN | 0, 0); 510 lcd_write_command_e(LCD_SET_COLUMN | 0, 0);
266 lcd_write_data(lcd_framebuffer[y], LCD_WIDTH); 511 lcd_write_data(lcd_framebuffer[y], LCD_WIDTH);
267 } 512 }
@@ -291,7 +536,7 @@ void lcd_update_rect(int x, int y, int width, int height)
291 COM48-COM63 are not connected, so we need to skip those */ 536 COM48-COM63 are not connected, so we need to skip those */
292 for (; y <= ymax; y++) 537 for (; y <= ymax; y++)
293 { 538 {
294 lcd_write_command(LCD_SET_PAGE | ((y > 5 ? y + 2 : y) & 0xf)); 539 lcd_write_command(LCD_SET_PAGE | ((y > 5?y + 2:y) & 0xf));
295 lcd_write_command_e(LCD_SET_COLUMN | ((x >> 4) & 0xf), x & 0xf); 540 lcd_write_command_e(LCD_SET_COLUMN | ((x >> 4) & 0xf), x & 0xf);
296 541
297 lcd_write_data(&lcd_framebuffer[y][x], width); 542 lcd_write_data(&lcd_framebuffer[y][x], width);
@@ -302,23 +547,19 @@ void lcd_update_rect(int x, int y, int width, int height)
302void lcd_set_invert_display(bool yesno) 547void lcd_set_invert_display(bool yesno)
303{ 548{
304 cached_invert = yesno; 549 cached_invert = yesno;
305 if (initialized) 550 if(initialized)
306 lcd_write_command(LCD_REVERSE | yesno); 551 lcd_write_command(LCD_REVERSE | yesno);
307} 552}
308 553
309void lcd_set_flip(bool yesno) 554void lcd_set_flip(bool yesno)
310{ 555{
311 cached_flip = yesno; 556 cached_flip = yesno;
312 if (initialized) 557 if(initialized) {
313 { 558 if(yesno) {
314 if(yesno)
315 {
316 lcd_write_command(LCD_SELECT_ADC | 0); 559 lcd_write_command(LCD_SELECT_ADC | 0);
317 lcd_write_command(LCD_SELECT_SHL | 0); 560 lcd_write_command(LCD_SELECT_SHL | 0);
318 lcd_write_command_e(LCD_SET_COM0, 16); 561 lcd_write_command_e(LCD_SET_COM0, 16);
319 } 562 } else {
320 else
321 {
322 lcd_write_command(LCD_SELECT_ADC | 1); 563 lcd_write_command(LCD_SELECT_ADC | 1);
323 lcd_write_command(LCD_SELECT_SHL | 8); 564 lcd_write_command(LCD_SELECT_SHL | 8);
324 lcd_write_command_e(LCD_SET_COM0, 0); 565 lcd_write_command_e(LCD_SET_COM0, 0);
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-17 22:26:20 +0000