summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm/olympus/mrobe-100
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target/arm/olympus/mrobe-100')
-rw-r--r--firmware/target/arm/olympus/mrobe-100/lcd-as-mr100.S115
-rw-r--r--firmware/target/arm/olympus/mrobe-100/lcd-mr100.c40
2 files changed, 135 insertions, 20 deletions
diff --git a/firmware/target/arm/olympus/mrobe-100/lcd-as-mr100.S b/firmware/target/arm/olympus/mrobe-100/lcd-as-mr100.S
new file mode 100644
index 0000000000..43ae3c5c6b
--- /dev/null
+++ b/firmware/target/arm/olympus/mrobe-100/lcd-as-mr100.S
@@ -0,0 +1,115 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Copyright (C) 2008 by Jens Arnold
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+#include "config.h"
+#include "cpu.h"
+
+ .text
+ .align 2
+
+
+ .global lcd_write_data
+ .type lcd_write_data,%function
+
+lcd_write_data:
+ str lr, [sp, #-4]!
+ ldr lr, =LCD1_BASE
+
+.loop:
+ ldrb r2, [r0], #1
+1:
+ ldr r3, [lr]
+ tst r3, #LCD1_BUSY_MASK
+ bne 1b
+ str r2, [lr, #0x10]
+
+ subs r1, r1, #1
+ bne .loop
+
+ ldr pc, [sp], #4
+ .size lcd_write_data,.-lcd_write_data
+
+
+ .global lcd_grey_data
+ .type lcd_grey_data,%function
+
+/* A high performance function to write grey phase data to the display,
+ * one or multiple pixels.
+ *
+ * Arguments:
+ * r0 - pixel value data address
+ * r1 - pixel phase data address
+ * r2 - pixel block count
+ *
+ * Register usage:
+ * r3/r4 - current block of phases
+ * r5/r6 - current block of values
+ * r7 - lcd data accumulator
+ * r8 - phase signs mask
+ * lr - lcd bridge address
+ */
+
+lcd_grey_data:
+ stmfd sp!, {r4-r8, lr}
+ mov r8, #0x80
+ orr r8, r8, r8, lsl #8
+ orr r8, r8, r8, lsl #16
+ ldr lr, =LCD1_BASE
+
+.greyloop:
+ ldmia r1, {r3-r4} /* Fetch 8 pixel phases */
+ ldmia r0!, {r5-r6} /* Fetch 8 pixel values */
+
+ mov r7, #0xff
+ tst r3, #0x80
+ biceq r7, r7, #0x80
+ tst r3, #0x8000
+ biceq r7, r7, #0x40
+ tst r3, #0x800000
+ biceq r7, r7, #0x20
+ tst r3, #0x80000000
+ biceq r7, r7, #0x10
+ bic r3, r3, r8
+ add r3, r3, r5
+
+ tst r4, #0x80
+ biceq r7, r7, #0x08
+ tst r4, #0x8000
+ biceq r7, r7, #0x04
+ tst r4, #0x800000
+ biceq r7, r7, #0x02
+ tst r4, #0x80000000
+ biceq r7, r7, #0x01
+ bic r4, r4, r8
+ add r4, r4, r6
+
+ stmia r1!, {r3-r4}
+
+1:
+ ldr r5, [lr]
+ tst r5, #LCD1_BUSY_MASK
+ bne 1b
+ str r7, [lr, #0x10]
+
+ subs r2, r2, #1
+ bne .greyloop
+
+ ldmfd sp!, {r4-r8, pc}
+ .size lcd_grey_data,.-lcd_grey_data
+
diff --git a/firmware/target/arm/olympus/mrobe-100/lcd-mr100.c b/firmware/target/arm/olympus/mrobe-100/lcd-mr100.c
index d3c913f4d7..9299b131f2 100644
--- a/firmware/target/arm/olympus/mrobe-100/lcd-mr100.c
+++ b/firmware/target/arm/olympus/mrobe-100/lcd-mr100.c
@@ -76,17 +76,6 @@ void lcd_write_command(int byte)
LCD1_CMD = byte;
}
-/* send LCD data */
-
-void lcd_write_data(const fb_data* p_bytes, int count)
-{
- while (count--)
- {
- while (LCD1_CONTROL & LCD1_BUSY_MASK); /* wait for LCD */
- LCD1_DATA = *(p_bytes++);
- }
-}
-
static int xoffset; /* needed for flip */
/*** hardware configuration ***/
@@ -146,8 +135,7 @@ void lcd_init_device(void)
LCD1_CONTROL |= 0x4;
udelay(10);
- LCD1_CONTROL = 0x690;
- LCD1_CONTROL = 0x694;
+ LCD1_CONTROL = 0x0094;
/* OF just reads these */
LCD1_CONTROL;
@@ -206,18 +194,30 @@ void lcd_blit_mono(const unsigned char* data, int x, int by, int width,
}
}
+/* Helper function for lcd_grey_phase_blit(). */
+void lcd_grey_data(unsigned char *values, unsigned char *phases, int count);
+
/* Performance function that works with an external buffer
note that by and bheight are in 8-pixel units! */
void lcd_blit_grey_phase(unsigned char *values, unsigned char *phases,
int x, int by, int width, int bheight, int stride)
{
- (void)values;
- (void)phases;
- (void)x;
- (void)by;
- (void)width;
- (void)bheight;
- (void)stride;
+ int cmd1, cmd2;
+
+ stride <<= 3; /* 8 pixels per block */
+ cmd1 = LCD_CNTL_HIGHCOL | (((x + xoffset) >> 4) & 0xf);
+ cmd2 = LCD_CNTL_LOWCOL | ((x + xoffset) & 0xf);
+
+ while (bheight--)
+ {
+ lcd_write_command(LCD_CNTL_PAGE | (by++ & 0xff));
+ lcd_write_command(cmd1);
+ lcd_write_command(cmd2);
+
+ lcd_grey_data(values, phases, width);
+ values += stride;
+ phases += stride;
+ }
}
/* Update the display.