summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2011-01-11 01:21:31 +0000
committerMichael Sevakis <jethead71@rockbox.org>2011-01-11 01:21:31 +0000
commit0dd74ca7224d8cb141fd924727bd65be1bda9ec6 (patch)
tree2988b0745f88ede6d6c06a46e732f5d5f72a9021 /firmware
parent2e686eca633a329d99daf5a6a45b41ccb9dc5563 (diff)
downloadrockbox-0dd74ca7224d8cb141fd924727bd65be1bda9ec6.tar.gz
rockbox-0dd74ca7224d8cb141fd924727bd65be1bda9ec6.zip
SA9200: Add YUV blitting, do full-screen updates more efficiently and properly clip partial updates. Plugin struct becomes incompatible for this target but leave version alone since it's still dev-only.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29028 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/SOURCES1
-rw-r--r--firmware/target/arm/philips/sa9200/lcd-as-sa9200.S590
-rw-r--r--firmware/target/arm/philips/sa9200/lcd-sa9200.c111
3 files changed, 687 insertions, 15 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 2750b975ae..06dbf9d6e8 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -700,6 +700,7 @@ target/arm/usb-fw-pp502x.c
target/arm/philips/sa9200/backlight-sa9200.c
target/arm/philips/sa9200/button-sa9200.c
target/arm/philips/sa9200/lcd-sa9200.c
+target/arm/philips/sa9200/lcd-as-sa9200.S
target/arm/philips/sa9200/power-sa9200.c
target/arm/philips/sa9200/powermgmt-sa9200.c
#endif /* SIMULATOR */
diff --git a/firmware/target/arm/philips/sa9200/lcd-as-sa9200.S b/firmware/target/arm/philips/sa9200/lcd-as-sa9200.S
new file mode 100644
index 0000000000..d99222b9df
--- /dev/null
+++ b/firmware/target/arm/philips/sa9200/lcd-as-sa9200.S
@@ -0,0 +1,590 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Copyright (C) 2007-2011 by Michael Sevakis
+ *
+ * Philips GoGear SA9200 LCD assembly routines
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+ /* This code should work in general for a Renesas type LCD interface
+ * connected to the "mono" bridge. TODO: Share it where possible.
+ *
+ * Dither is already prepared to be built for upright and rotated
+ * orientations. */
+
+#include "config.h"
+#include "cpu.h"
+
+/****************************************************************************
+ * void lcd_write_yuv420_lines(unsigned char const * const src[3],
+ * int width,
+ * int stride);
+ *
+ * |R| |1.000000 -0.000001 1.402000| |Y'|
+ * |G| = |1.000000 -0.334136 -0.714136| |Pb|
+ * |B| |1.000000 1.772000 0.000000| |Pr|
+ * Scaled, normalized, rounded and tweaked to yield RGB 565:
+ * |R| |74 0 101| |Y' - 16| >> 9
+ * |G| = |74 -24 -51| |Cb - 128| >> 8
+ * |B| |74 128 0| |Cr - 128| >> 9
+ *
+ * Write four RGB565 pixels in the following order on each loop:
+ * 1 3 + > down
+ * 2 4 \/ left
+ */
+ .section .icode, "ax", %progbits
+ .align 2
+ .global lcd_write_yuv420_lines
+ .type lcd_write_yuv420_lines, %function
+lcd_write_yuv420_lines:
+ @ r0 = yuv_src
+ @ r1 = width
+ @ r2 = stride
+ stmfd sp!, { r4-r10, lr } @ save non-scratch
+ ldmia r0, { r4, r5, r6 } @ r4 = yuv_src[0] = Y'_p
+ @ r5 = yuv_src[1] = Cb_p
+ @ r6 = yuv_src[2] = Cr_p
+ @
+ mov r0, #0x70000000 @ r0 = LCD1_BASE_ADDR = 0x70003000
+ orr r0, r0, #0x3000 @
+ @
+ sub r2, r2, #1 @ Adjust stride because of increment
+10: @ loop line @
+ ldrb r7, [r4], #1 @ r7 = *Y'_p++;
+ ldrb r8, [r5], #1 @ r8 = *Cb_p++;
+ ldrb r9, [r6], #1 @ r9 = *Cr_p++;
+ @
+ sub r7, r7, #16 @ r7 = Y = (Y' - 16)*74
+ add r12, r7, r7, asl #2 @ actually (Y' - 16)*37 and shift right
+ add r7, r12, r7, asl #5 @ by one less when adding - same for all
+ @
+ sub r8, r8, #128 @ Cb -= 128
+ sub r9, r9, #128 @ Cr -= 128
+ @
+ add r10, r9, r9, asl #1 @ r10 = Cr*51 + Cb*24
+ add r10, r10, r10, asl #4 @
+ add r10, r10, r8, asl #3 @
+ add r10, r10, r8, asl #4 @
+ @
+ add r14, r9, r9, asl #2 @ r9 = Cr*101
+ add r14, r14, r9, asl #5 @
+ add r9, r14, r9, asl #6 @
+ @
+ add r8, r8, #2 @ r8 = bu = (Cb*128 + 128) >> 8
+ mov r8, r8, asr #2 @
+ add r9, r9, #256 @ r9 = rv = (r8 + 256) >> 9
+ mov r9, r9, asr #9 @
+ rsb r10, r10, #128 @ r10 = guv = (-r9 + 128) >> 8
+ mov r10, r10, asr #8 @
+ @ compute R, G, and B
+ add r3, r8, r7, asr #8 @ r3 = b = (Y >> 9) + bu
+ add r14, r9, r7, asr #8 @ r14 = r = (Y >> 9) + rv
+ add r7, r10, r7, asr #7 @ r7 = g = (Y >> 8) + guv
+ @
+ orr r12, r3, r14 @ check if clamping is needed...
+ orr r12, r12, r7, asr #1 @ ...at all
+ cmp r12, #31 @
+ bls 15f @ no clamp @
+ cmp r3, #31 @ clamp b
+ mvnhi r3, r3, asr #31 @
+ andhi r3, r3, #31 @
+ cmp r14, #31 @ clamp r
+ mvnhi r14, r14, asr #31 @
+ andhi r14, r14, #31 @
+ cmp r7, #63 @ clamp g
+ mvnhi r7, r7, asr #31 @
+ andhi r7, r7, #63 @
+15: @ no clamp @
+ @
+ ldrb r12, [r4, r2] @ r12 = Y' = *(Y'_p + stride)
+ @
+ orr r7, r3, r7, lsl #5 @ r7 = |00000000|00000000|00000ggg|gggbbbbb|
+ orr r7, r7, r14, lsl #11 @ r7 = |00000000|00000000|rrrrrggg|gggbbbbb|
+ mov r14, r7, lsr #8 @ r14 = |00000000|00000000|00000000|rrrrrggg|
+ @
+20: @
+ ldr r3, [r0] @
+ tst r3, #LCD1_BUSY_MASK @
+ bne 20b @
+ strb r14, [r0, #0x10] @
+20: @
+ ldr r3, [r0] @
+ tst r3, #LCD1_BUSY_MASK @
+ bne 20b @
+ strb r7, [r0, #0x10] @
+ @
+ sub r7, r12, #16 @ r7 = Y = (Y' - 16)*74
+ add r12, r7, r7, asl #2 @
+ add r7, r12, r7, asl #5 @
+ @ compute R, G, and B
+ add r3, r8, r7, asr #8 @ r3 = b = (Y >> 9) + bu
+ add r14, r9, r7, asr #8 @ r14 = r = (Y >> 9) + rv
+ add r7, r10, r7, asr #7 @ r7 = g = (Y >> 8) + guv
+ @
+ orr r12, r3, r14 @ check if clamping is needed...
+ orr r12, r12, r7, asr #1 @ ...at all
+ cmp r12, #31 @
+ bls 15f @ no clamp @
+ cmp r3, #31 @ clamp b
+ mvnhi r3, r3, asr #31 @
+ andhi r3, r3, #31 @
+ cmp r14, #31 @ clamp r
+ mvnhi r14, r14, asr #31 @
+ andhi r14, r14, #31 @
+ cmp r7, #63 @ clamp g
+ mvnhi r7, r7, asr #31 @
+ andhi r7, r7, #63 @
+15: @ no clamp @
+ @
+ ldrb r12, [r4], #1 @ r12 = Y' = *(Y'_p++)
+ @
+ orr r7, r3, r7, lsl #5 @ r7 = |00000000|00000000|00000ggg|gggbbbbb|
+ orr r7, r7, r14, lsl #11 @ r7 = |00000000|00000000|rrrrrggg|gggbbbbb|
+ mov r14, r7, lsr #8 @ r14 = |00000000|00000000|00000000|rrrrrggg|
+20: @
+ ldr r3, [r0] @
+ tst r3, #LCD1_BUSY_MASK @
+ bne 20b @
+ strb r14, [r0, #0x10] @
+20: @
+ ldr r3, [r0] @
+ tst r3, #LCD1_BUSY_MASK @
+ bne 20b @
+ strb r7, [r0, #0x10] @
+ @
+ sub r7, r12, #16 @ r7 = Y = (Y' - 16)*74
+ add r12, r7, r7, asl #2 @
+ add r7, r12, r7, asl #5 @
+ @ compute R, G, and B
+ add r3, r8, r7, asr #8 @ r3 = b = (Y >> 9) + bu
+ add r14, r9, r7, asr #8 @ r14 = r = (Y >> 9) + rv
+ add r7, r10, r7, asr #7 @ r7 = g = (Y >> 8) + guv
+ @
+ orr r12, r3, r14 @ check if clamping is needed...
+ orr r12, r12, r7, asr #1 @ ...at all
+ cmp r12, #31 @
+ bls 15f @ no clamp @
+ cmp r3, #31 @ clamp b
+ mvnhi r3, r3, asr #31 @
+ andhi r3, r3, #31 @
+ cmp r14, #31 @ clamp r
+ mvnhi r14, r14, asr #31 @
+ andhi r14, r14, #31 @
+ cmp r7, #63 @ clamp g
+ mvnhi r7, r7, asr #31 @
+ andhi r7, r7, #63 @
+15: @ no clamp @
+ @
+ ldrb r12, [r4, r2] @ r12 = Y' = *(Y'_p + stride)
+ @
+ orr r7, r3, r7, lsl #5 @ r7 = |00000000|00000000|00000ggg|gggbbbbb|
+ orr r7, r7, r14, lsl #11 @ r7 = |00000000|00000000|rrrrrggg|gggbbbbb|
+ mov r14, r7, lsr #8 @ r14 = |00000000|00000000|00000000|rrrrrggg|
+20: @
+ ldr r3, [r0] @
+ tst r3, #LCD1_BUSY_MASK @
+ bne 20b @
+ strb r14, [r0, #0x10] @
+20: @
+ ldr r3, [r0] @
+ tst r3, #LCD1_BUSY_MASK @
+ bne 20b @
+ strb r7, [r0, #0x10] @
+ @
+ sub r7, r12, #16 @ r7 = Y = (Y' - 16)*74
+ add r12, r7, r7, asl #2 @
+ add r7, r12, r7, asl #5 @
+ @ compute R, G, and B
+ add r3, r8, r7, asr #8 @ r3 = b = (Y >> 9) + bu
+ add r14, r9, r7, asr #8 @ r14 = r = (Y >> 9) + rv
+ add r7, r10, r7, asr #7 @ r7 = g = (Y >> 8) + guv
+ @
+ orr r12, r3, r14 @ check if clamping is needed...
+ orr r12, r12, r7, asr #1 @ ...at all
+ cmp r12, #31 @
+ bls 15f @ no clamp @
+ cmp r3, #31 @ clamp b
+ mvnhi r3, r3, asr #31 @
+ andhi r3, r3, #31 @
+ cmp r14, #31 @ clamp r
+ mvnhi r14, r14, asr #31 @
+ andhi r14, r14, #31 @
+ cmp r7, #63 @ clamp g
+ mvnhi r7, r7, asr #31 @
+ andhi r7, r7, #63 @
+15: @ no clamp @
+ @
+ orr r7, r3, r7, lsl #5 @ r7 = |00000000|00000000|00000ggg|gggbbbbb|
+ orr r7, r7, r14, lsl #11 @ r7 = |00000000|00000000|rrrrrggg|gggbbbbb|
+ mov r14, r7, lsr #8 @ r14 = |00000000|00000000|00000000|rrrrrggg|
+20: @
+ ldr r3, [r0] @
+ tst r3, #LCD1_BUSY_MASK @
+ bne 20b @
+ strb r14, [r0, #0x10] @
+20: @
+ ldr r3, [r0] @
+ tst r3, #LCD1_BUSY_MASK @
+ bne 20b @
+ strb r7, [r0, #0x10] @
+ @
+ subs r1, r1, #2 @ subtract block from width
+ bgt 10b @ loop line @
+ @
+ ldmpc regs=r4-r10 @ restore registers and return
+ .ltorg @ dump constant pool
+ .size lcd_write_yuv420_lines, .-lcd_write_yuv420_lines
+
+
+/****************************************************************************
+ * void lcd_write_yuv420_lines_odither(unsigned char const * const src[3],
+ * int width,
+ * int stride,
+ * int x_screen,
+ * int y_screen);
+ *
+ * |R| |1.000000 -0.000001 1.402000| |Y'|
+ * |G| = |1.000000 -0.334136 -0.714136| |Pb|
+ * |B| |1.000000 1.772000 0.000000| |Pr|
+ * Red scaled at twice g & b but at same precision to place it in correct
+ * bit position after multiply and leave instruction count lower.
+ * |R| |258 0 408| |Y' - 16|
+ * |G| = |149 -49 -104| |Cb - 128|
+ * |B| |149 258 0| |Cr - 128|
+ *
+ * Write four RGB565 pixels in the following order on each loop:
+ * 1 3 + > right/down
+ * 2 4 \/ down/left
+ *
+ * Kernel pattern for upright display:
+ * 5 3 4 2 +-> right
+ * 1 7 0 6 | down
+ * 4 2 5 3 \/
+ * 0 6 1 7
+ *
+ * Kernel pattern for clockwise rotated display:
+ * 2 6 3 7 +-> down
+ * 4 0 5 1 | left
+ * 3 7 2 6 \/
+ * 5 1 4 0
+ */
+ .section .icode, "ax", %progbits
+ .align 2
+ .global lcd_write_yuv420_lines_odither
+ .type lcd_write_yuv420_lines_odither, %function
+lcd_write_yuv420_lines_odither:
+ @ r0 = yuv_src
+ @ r1 = width
+ @ r2 = strideS
+ @ r3 = x_screen
+ @ [sp] = y_screen
+ stmfd sp!, { r4-r11, lr } @ save non-scratch
+ ldmia r0, { r4, r5, r6 } @ r4 = yuv_src[0] = Y'_p
+ @ r5 = yuv_src[1] = Cb_p
+ @ r6 = yuv_src[2] = Cr_p
+ @
+ ldr r0, [sp, #36] @ Line up pattern and kernel quadrant
+ eor r14, r3, r0 @
+ and r14, r14, #0x2 @
+ mov r14, r14, lsl #6 @ 0x00 or 0x80
+ @
+ mov r0, #0x70000000 @ r0 = LCD1_BASE_ADDR = 0x70003000
+ orr r0, r0, #0x3000 @
+ @
+ sub r2, r2, #1 @ Adjust stride because of increment
+10: @ loop line @
+ @
+ ldrb r7, [r4], #1 @ r7 = *Y'_p++;
+ ldrb r8, [r5], #1 @ r8 = *Cb_p++;
+ ldrb r9, [r6], #1 @ r9 = *Cr_p++;
+ @
+ eor r14, r14, #0x80 @ flip pattern quadrant
+ @
+ sub r7, r7, #16 @ r7 = Y = (Y' - 16)*149
+ add r12, r7, r7, asl #2 @
+ add r12, r12, r12, asl #4 @
+ add r7, r12, r7, asl #6 @
+ @
+ sub r8, r8, #128 @ Cb -= 128
+ sub r9, r9, #128 @ Cr -= 128
+ @
+ add r10, r8, r8, asl #4 @ r10 = guv = Cr*104 + Cb*49
+ add r10, r10, r8, asl #5 @
+ add r10, r10, r9, asl #3 @
+ add r10, r10, r9, asl #5 @
+ add r10, r10, r9, asl #6 @
+ @
+ mov r8, r8, asl #1 @ r8 = bu = Cb*258
+ add r8, r8, r8, asl #7 @
+ @
+ add r9, r9, r9, asl #1 @ r9 = rv = Cr*408
+ add r9, r9, r9, asl #4 @
+ mov r9, r9, asl #3 @
+ @
+ @ compute R, G, and B
+ add r3, r8, r7 @ r3 = b' = Y + bu
+ add r11, r9, r7, asl #1 @ r11 = r' = Y*2 + rv
+ rsb r7, r10, r7 @ r7 = g' = Y + guv
+ @
+ @ r8 = bu, r9 = rv, r10 = guv
+ @
+ sub r12, r3, r3, lsr #5 @ r3 = 31/32*b + b/256
+ add r3, r12, r3, lsr #8 @
+ @
+ sub r12, r11, r11, lsr #5 @ r11 = 31/32*r + r/256
+ add r11, r12, r11, lsr #8 @
+ @
+ sub r12, r7, r7, lsr #6 @ r7 = 63/64*g + g/256
+ add r7, r12, r7, lsr #8 @
+ @
+#if LCD_WIDTH >= LCD_HEIGHT
+ add r12, r14, #0x200 @
+#else
+ add r12, r14, #0x100 @
+#endif
+ @
+ add r3, r3, r12 @ b = r3 + delta
+ add r11, r11, r12, lsl #1 @ r = r11 + delta*2
+ add r7, r7, r12, lsr #1 @ g = r7 + delta/2
+ @
+ orr r12, r3, r11, asr #1 @ check if clamping is needed...
+ orr r12, r12, r7 @ ...at all
+ movs r12, r12, asr #15 @
+ beq 15f @ no clamp @
+ movs r12, r3, asr #15 @ clamp b
+ mvnne r3, r12, lsr #15 @
+ andne r3, r3, #0x7c00 @ mask b only if clamped
+ movs r12, r11, asr #16 @ clamp r
+ mvnne r11, r12, lsr #16 @
+ movs r12, r7, asr #15 @ clamp g
+ mvnne r7, r12, lsr #15 @
+15: @ no clamp @
+ @
+ ldrb r12, [r4, r2] @ r12 = Y' = *(Y'_p + stride)
+ @
+ and r11, r11, #0xf800 @ r11 = |00000000|00000000|rrrrrggg|gggbbbbb|
+ and r7, r7, #0x7e00 @
+ orr r11, r11, r7, lsr #4 @
+ orr r11, r11, r3, lsr #10 @
+ mov r7, r11, lsr #8 @ r7 = |00000000|00000000|00000000|rrrrrggg|
+ @
+20: @
+ ldr r3, [r0] @
+ tst r3, #LCD1_BUSY_MASK @
+ bne 20b @
+ strb r7, [r0, #0x10] @
+20: @
+ ldr r3, [r0] @
+ tst r3, #LCD1_BUSY_MASK @
+ bne 20b @
+ strb r11, [r0, #0x10] @
+ @
+ sub r7, r12, #16 @ r7 = Y = (Y' - 16)*149
+ add r12, r7, r7, asl #2 @
+ add r12, r12, r12, asl #4 @
+ add r7, r12, r7, asl #6 @
+ @ compute R, G, and B
+ add r3, r8, r7 @ r3 = b' = Y + bu
+ add r11, r9, r7, asl #1 @ r11 = r' = Y*2 + rv
+ rsb r7, r10, r7 @ r7 = g' = Y + guv
+ @
+ sub r12, r3, r3, lsr #5 @ r3 = 31/32*b' + b'/256
+ add r3, r12, r3, lsr #8 @
+ @
+ sub r12, r11, r11, lsr #5 @ r11 = 31/32*r' + r'/256
+ add r11, r12, r11, lsr #8 @
+ @
+ sub r12, r7, r7, lsr #6 @ r7 = 63/64*g' + g'/256
+ add r7, r12, r7, lsr #8 @
+ @
+#if LCD_WIDTH >= LCD_HEIGHT
+ @ This element is zero - use r14 @
+ @
+ add r3, r3, r14 @ b = r3 + delta
+ add r11, r11, r14, lsl #1 @ r = r11 + delta*2
+ add r7, r7, r14, lsr #1 @ g = r7 + delta/2
+#else
+ add r12, r14, #0x200 @
+ @
+ add r3, r3, r12 @ b = r3 + delta
+ add r11, r11, r12, lsl #1 @ r = r11 + delta*2
+ add r7, r7, r12, lsr #1 @ g = r7 + delta/2
+#endif
+ @
+ orr r12, r3, r11, asr #1 @ check if clamping is needed...
+ orr r12, r12, r7 @ ...at all
+ movs r12, r12, asr #15 @
+ beq 15f @ no clamp @
+ movs r12, r3, asr #15 @ clamp b
+ mvnne r3, r12, lsr #15 @
+ andne r3, r3, #0x7c00 @ mask b only if clamped
+ movs r12, r11, asr #16 @ clamp r
+ mvnne r11, r12, lsr #16 @
+ movs r12, r7, asr #15 @ clamp g
+ mvnne r7, r12, lsr #15 @
+15: @ no clamp @
+ @
+ ldrb r12, [r4], #1 @ r12 = Y' = *(Y'_p++)
+ @
+ and r11, r11, #0xf800 @ r11 = |00000000|00000000|rrrrrggg|gggbbbbb|
+ and r7, r7, #0x7e00 @
+ orr r11, r11, r7, lsr #4 @
+ orr r11, r11, r3, lsr #10 @
+ mov r7, r11, lsr #8 @ r7 = |00000000|00000000|00000000|rrrrrggg|
+ @
+20: @
+ ldr r3, [r0] @
+ tst r3, #LCD1_BUSY_MASK @
+ bne 20b @
+ strb r7, [r0, #0x10] @
+20: @
+ ldr r3, [r0] @
+ tst r3, #LCD1_BUSY_MASK @
+ bne 20b @
+ strb r11, [r0, #0x10] @
+ @
+ sub r7, r12, #16 @ r7 = Y = (Y' - 16)*149
+ add r12, r7, r7, asl #2 @
+ add r12, r12, r12, asl #4 @
+ add r7, r12, r7, asl #6 @
+ @ compute R, G, and B
+ add r3, r8, r7 @ r3 = b' = Y + bu
+ add r11, r9, r7, asl #1 @ r11 = r' = Y*2 + rv
+ rsb r7, r10, r7 @ r7 = g' = Y + guv
+ @
+ @ r8 = bu, r9 = rv, r10 = guv
+ @
+ sub r12, r3, r3, lsr #5 @ r3 = 31/32*b' + b'/256
+ add r3, r12, r3, lsr #8 @
+ @
+ sub r12, r11, r11, lsr #5 @ r11 = 31/32*r' + r'/256
+ add r11, r12, r11, lsr #8 @
+ @
+ sub r12, r7, r7, lsr #6 @ r7 = 63/64*g' + g'/256
+ add r7, r12, r7, lsr #8 @
+ @
+#if LCD_WIDTH >= LCD_HEIGHT
+ add r12, r14, #0x100 @
+#else
+ add r12, r14, #0x300 @
+#endif
+ @
+ add r3, r3, r12 @ b = r3 + delta
+ add r11, r11, r12, lsl #1 @ r = r11 + delta*2
+ add r7, r7, r12, lsr #1 @ g = r7 + delta/2
+ @
+ orr r12, r3, r11, asr #1 @ check if clamping is needed...
+ orr r12, r12, r7 @ ...at all
+ movs r12, r12, asr #15 @
+ beq 15f @ no clamp @
+ movs r12, r3, asr #15 @ clamp b
+ mvnne r3, r12, lsr #15 @
+ andne r3, r3, #0x7c00 @ mask b only if clamped
+ movs r12, r11, asr #16 @ clamp r
+ mvnne r11, r12, lsr #16 @
+ movs r12, r7, asr #15 @ clamp g
+ mvnne r7, r12, lsr #15 @
+15: @ no clamp @
+ @
+ ldrb r12, [r4, r2] @ r12 = Y' = *(Y'_p + stride)
+ @
+ and r11, r11, #0xf800 @ r11 = |00000000|00000000|rrrrrggg|gggbbbbb|
+ and r7, r7, #0x7e00 @
+ orr r11, r11, r7, lsr #4 @
+ orr r11, r11, r3, lsr #10 @
+ mov r7, r11, lsr #8 @ r7 = |00000000|00000000|00000000|rrrrrggg|
+ @
+20: @
+ ldr r3, [r0] @
+ tst r3, #LCD1_BUSY_MASK @
+ bne 20b @
+ strb r7, [r0, #0x10] @
+20: @
+ ldr r3, [r0] @
+ tst r3, #LCD1_BUSY_MASK @
+ bne 20b @
+ strb r11, [r0, #0x10] @
+ @
+ sub r7, r12, #16 @ r7 = Y = (Y' - 16)*149
+ add r12, r7, r7, asl #2 @
+ add r12, r12, r12, asl #4 @
+ add r7, r12, r7, asl #6 @
+ @ compute R, G, and B
+ add r3, r8, r7 @ r3 = b' = Y + bu
+ add r11, r9, r7, asl #1 @ r11 = r' = Y*2 + rv
+ rsb r7, r10, r7 @ r7 = g' = Y + guv
+ @
+ sub r12, r3, r3, lsr #5 @ r3 = 31/32*b + b/256
+ add r3, r12, r3, lsr #8 @
+ @
+ sub r12, r11, r11, lsr #5 @ r11 = 31/32*r + r/256
+ add r11, r12, r11, lsr #8 @
+ @
+ sub r12, r7, r7, lsr #6 @ r7 = 63/64*g + g/256
+ add r7, r12, r7, lsr #8 @
+ @
+#if LCD_WIDTH >= LCD_HEIGHT
+ add r12, r14, #0x300 @
+ @
+ add r3, r3, r12 @ b = r3 + delta
+ add r11, r11, r12, lsl #1 @ r = r11 + delta*2
+ add r7, r7, r12, lsr #1 @ g = r7 + delta/2
+#else
+ @ This element is zero - use r14 @
+ @
+ add r3, r3, r14 @ b = r3 + delta
+ add r11, r11, r14, lsl #1 @ r = r11 + delta*2
+ add r7, r7, r14, lsr #1 @ g = r7 + delta/2
+#endif
+ @
+ orr r12, r3, r11, asr #1 @ check if clamping is needed...
+ orr r12, r12, r7 @ ...at all
+ movs r12, r12, asr #15 @
+ beq 15f @ no clamp @
+ movs r12, r3, asr #15 @ clamp b
+ mvnne r3, r12, lsr #15 @
+ andne r3, r3, #0x7c00 @ mask b only if clamped
+ movs r12, r11, asr #16 @ clamp r
+ mvnne r11, r12, lsr #16 @
+ movs r12, r7, asr #15 @ clamp g
+ mvnne r7, r12, lsr #15 @
+15: @ no clamp @
+ @
+ and r11, r11, #0xf800 @ r11 = |00000000|00000000|rrrrrggg|gggbbbbb|
+ and r7, r7, #0x7e00 @
+ orr r11, r11, r7, lsr #4 @
+ orr r11, r11, r3, lsr #10 @
+ mov r7, r11, lsr #8 @ r7 = |00000000|00000000|00000000|rrrrrggg|
+ @
+20: @
+ ldr r3, [r0] @
+ tst r3, #LCD1_BUSY_MASK @
+ bne 20b @
+ strb r7, [r0, #0x10] @
+20: @
+ ldr r3, [r0] @
+ tst r3, #LCD1_BUSY_MASK @
+ bne 20b @
+ strb r11, [r0, #0x10] @
+ @
+ subs r1, r1, #2 @ subtract block from width
+ bgt 10b @ loop line @
+ @
+ ldmpc regs=r4-r11 @ restore registers and return
+ .ltorg @ dump constant pool
+ .size lcd_write_yuv420_lines_odither, .-lcd_write_yuv420_lines_odither
diff --git a/firmware/target/arm/philips/sa9200/lcd-sa9200.c b/firmware/target/arm/philips/sa9200/lcd-sa9200.c
index 51a3cf0f71..47fbfa3843 100644
--- a/firmware/target/arm/philips/sa9200/lcd-sa9200.c
+++ b/firmware/target/arm/philips/sa9200/lcd-sa9200.c
@@ -97,9 +97,9 @@ static void lcd_send_data(unsigned data)
static void lcd_send_command(unsigned cmd)
{
lcd_wait_write();
- LCD1_CMD = cmd >> 8;
+ LCD1_CMD = 0;
lcd_wait_write();
- LCD1_CMD = cmd & 0xff;
+ LCD1_CMD = cmd;
}
static void lcd_write_reg(unsigned reg, unsigned data)
@@ -401,25 +401,101 @@ void lcd_yuv_set_options(unsigned options)
}
/* Performance function to blit a YUV bitmap directly to the LCD */
+void lcd_write_yuv420_lines(unsigned char const * const src[3],
+ int width,
+ int stride);
+void lcd_write_yuv420_lines_odither(unsigned char const * const src[3],
+ int width,
+ int stride,
+ int x_screen,
+ int y_screen);
void lcd_blit_yuv(unsigned char * const src[3],
int src_x, int src_y, int stride,
int x, int y, int width, int height)
{
- (void)src;
- (void)src_x;
- (void)src_y;
- (void)stride;
- (void)x;
- (void)y;
- (void)width;
- (void)height;
+ const unsigned char *yuv_src[3];
+ const unsigned char *ysrc_max;
+ int options;
+
+ if (!display_on)
+ return;
+
+ width &= ~1;
+ height &= ~1;
+
+ /* calculate the drawing region */
+ lcd_write_reg(R_VERT_RAM_ADDR_POS, ((x + width - 1) << 8) | x);
+
+ /* convert YUV coordinates to screen coordinates */
+ y = LCD_WIDTH - 1 - y;
+
+ /* 2px strip: cursor moves left, then down in gram */
+ /* BGR=1, MDT1-0=00, I/D1-0=10, AM=0 */
+ lcd_write_reg(R_ENTRY_MODE, 0x1020);
+
+ yuv_src[0] = src[0] + src_y * stride + src_x;
+ yuv_src[1] = src[1] + (src_y * stride >> 2) + (src_x >> 1);
+ yuv_src[2] = src[2] + (yuv_src[1] - src[1]);
+ ysrc_max = yuv_src[0] + height * stride;
+
+ /* cache options setting */
+ options = lcd_yuv_options;
+
+ do
+ {
+ /* max horiz << 8 | start horiz */
+ lcd_write_reg(R_HORIZ_RAM_ADDR_POS, (y << 8) | (y - 1));
+
+ /* position cursor (set AD0-AD15) */
+ lcd_write_reg(R_RAM_ADDR_SET, (x << 8) | y);
+
+ /* start drawing */
+ lcd_send_command(R_WRITE_DATA_2_GRAM);
+
+ if (options & LCD_YUV_DITHER)
+ {
+ lcd_write_yuv420_lines_odither(yuv_src, width, stride,
+ y, x);
+ }
+ else
+ {
+ lcd_write_yuv420_lines(yuv_src, width, stride);
+ }
+
+ y -= 2; /* move strip by "down" 2 px */
+ yuv_src[0] += stride << 1;
+ yuv_src[1] += stride >> 1;
+ yuv_src[2] += stride >> 1;
+ }
+ while (yuv_src[0] < ysrc_max);
+
+ /* back to normal right, then down cursor in gram */
+ /* BGR=1, MDT1-0=00, I/D1-0=11, AM=0 */
+ lcd_write_reg(R_ENTRY_MODE, 0x1030);
}
/* Update the display.
This must be called after all other LCD functions that change the display. */
void lcd_update(void)
{
- lcd_update_rect(0, 0, LCD_WIDTH, LCD_HEIGHT);
+ const fb_data *addr, *end;
+
+ if (!display_on)
+ return;
+
+ addr = &lcd_framebuffer[0][0];
+ end = &lcd_framebuffer[LCD_HEIGHT - 1][LCD_WIDTH];
+
+ lcd_write_reg(R_HORIZ_RAM_ADDR_POS, (LCD_WIDTH - 1) << 8);
+ lcd_write_reg(R_VERT_RAM_ADDR_POS, (LCD_HEIGHT - 1) << 8);
+ lcd_write_reg(R_RAM_ADDR_SET, 0);
+ lcd_send_command(R_WRITE_DATA_2_GRAM);
+
+ do
+ {
+ lcd_send_data(*addr++);
+ }
+ while (addr < end);
}
/* Update a fraction of the display. */
@@ -432,18 +508,23 @@ void lcd_update_rect(int x, int y, int width, int height)
if (x + width > LCD_WIDTH)
width = LCD_WIDTH - x;
+ if (x < 0)
+ width += x, x = 0;
+ if (width <= 0)
+ return; /* Nothing left to do. */
if (y + height > LCD_HEIGHT)
height = LCD_HEIGHT - y;
-
- if ((width <= 0) || (height <= 0))
+ if (y < 0)
+ height += y, y = 0;
+ if (height <= 0)
return; /* Nothing left to do. */
addr = &lcd_framebuffer[y][x];
lcd_write_reg(R_HORIZ_RAM_ADDR_POS, ((x + width - 1) << 8) | x);
- lcd_write_reg(R_VERT_RAM_ADDR_POS, ((y + height -1) << 8) | y);
- lcd_write_reg(R_RAM_ADDR_SET, ((y & 0xff) << 8) | (x & 0xff));
+ lcd_write_reg(R_VERT_RAM_ADDR_POS, ((y + height - 1) << 8) | y);
+ lcd_write_reg(R_RAM_ADDR_SET, (y << 8) | x);
lcd_send_command(R_WRITE_DATA_2_GRAM);
do {