From fe6aa21e9eb88f49005863efd2003d0982920048 Mon Sep 17 00:00:00 2001 From: Aidan MacDonald Date: Mon, 3 Oct 2022 10:17:41 +0100 Subject: Remove YUV blitting functions and LCD modes None of this is needed now that mpegplayer is gone. Change-Id: I360366db8513e4d988021e8d7b7d8eb09930efb8 --- .../target/arm/philips/hdd1630/lcd-as-hdd1630.S | 570 -------------------- firmware/target/arm/philips/hdd1630/lcd-hdd1630.c | 81 --- .../target/arm/philips/hdd6330/lcd-as-hdd6330.S | 140 ----- firmware/target/arm/philips/hdd6330/lcd-hdd6330.c | 98 ---- firmware/target/arm/philips/sa9200/lcd-as-sa9200.S | 590 --------------------- firmware/target/arm/philips/sa9200/lcd-sa9200.c | 82 --- 6 files changed, 1561 deletions(-) delete mode 100644 firmware/target/arm/philips/hdd1630/lcd-as-hdd1630.S delete mode 100644 firmware/target/arm/philips/hdd6330/lcd-as-hdd6330.S delete mode 100644 firmware/target/arm/philips/sa9200/lcd-as-sa9200.S (limited to 'firmware/target/arm/philips') diff --git a/firmware/target/arm/philips/hdd1630/lcd-as-hdd1630.S b/firmware/target/arm/philips/hdd1630/lcd-as-hdd1630.S deleted file mode 100644 index 3bb3530917..0000000000 --- a/firmware/target/arm/philips/hdd1630/lcd-as-hdd1630.S +++ /dev/null @@ -1,570 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2007-2008 by Michael Sevakis - * - * H10 20GB 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. - * - ****************************************************************************/ - -#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-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 - @ - mov r0, #0x7000000c @ r0 = &LCD2_PORT = 0x70008a0c - add r0, r0, #0x8a00 @ - mov r14, #LCD2_DATA_MASK @ - @ - 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 r11, r9, r9, asl #2 @ r9 = Cr*101 - add r11, r11, r9, asl #5 @ - add r9, r11, 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 r11, r9, r7, asr #8 @ r11 = r = (Y >> 9) + rv - add r7, r10, r7, asr #7 @ r7 = g = (Y >> 8) + guv - @ - orr r12, r3, r11 @ 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 r11, #31 @ clamp r - mvnhi r11, r11, asr #31 @ - andhi r11, r11, #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 r3, r3, r11, lsl #11 @ r3 = b | (r << 11) - orr r3, r3, r7, lsl #5 @ r3 |= (g << 5) - @ - orr r7, r14, r3, lsr #8 @ store pixel - orr r11, r14, r3 @ -20: @ - ldr r3, [r0] @ - tst r3, #LCD2_BUSY_MASK @ - bne 20b @ - str r7, [r0] @ -20: @ - ldr r3, [r0] @ - tst r3, #LCD2_BUSY_MASK @ - bne 20b @ - str r11, [r0] @ - @ - 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 r11, r9, r7, asr #8 @ r11 = r = (Y >> 9) + rv - add r7, r10, r7, asr #7 @ r7 = g = (Y >> 8) + guv - @ - orr r12, r3, r11 @ 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 r11, #31 @ clamp r - mvnhi r11, r11, asr #31 @ - andhi r11, r11, #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 r3, r3, r11, lsl #11 @ r3 = b | (r << 11) - orr r3, r3, r7, lsl #5 @ r3 |= (g << 5) - @ - orr r7, r14, r3, lsr #8 @ store pixel - orr r11, r14, r3 @ -20: @ - ldr r3, [r0] @ - tst r3, #LCD2_BUSY_MASK @ - bne 20b @ - str r7, [r0] @ -20: @ - ldr r3, [r0] @ - tst r3, #LCD2_BUSY_MASK @ - bne 20b @ - str r11, [r0] @ - @ - 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 r11, r9, r7, asr #8 @ r11 = r = (Y >> 9) + rv - add r7, r10, r7, asr #7 @ r7 = g = (Y >> 8) + guv - @ - orr r12, r3, r11 @ 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 r11, #31 @ clamp r - mvnhi r11, r11, asr #31 @ - andhi r11, r11, #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 r3, r3, r7, lsl #5 @ r3 = b | (g << 5) - orr r3, r3, r11, lsl #11 @ r3 |= (r << 11) - @ - orr r7, r14, r3, lsr #8 @ store pixel - orr r11, r14, r3 @ -20: @ - ldr r3, [r0] @ - tst r3, #LCD2_BUSY_MASK @ - bne 20b @ - str r7, [r0] @ -20: @ - ldr r3, [r0] @ - tst r3, #LCD2_BUSY_MASK @ - bne 20b @ - str r11, [r0] @ - @ - 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 r11, r9, r7, asr #8 @ r11 = r = (Y >> 9) + rv - add r7, r10, r7, asr #7 @ r7 = g = (Y >> 8) + guv - @ - orr r12, r3, r11 @ 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 r11, #31 @ clamp r - mvnhi r11, r11, asr #31 @ - andhi r11, r11, #31 @ - cmp r7, #63 @ clamp g - mvnhi r7, r7, asr #31 @ - andhi r7, r7, #63 @ -15: @ no clamp @ - @ - orr r3, r3, r11, lsl #11 @ r3 = b | (r << 11) - orr r3, r3, r7, lsl #5 @ r3 |= (g << 5) - @ - orr r7, r14, r3, lsr #8 @ store pixel - orr r11, r14, r3 @ -20: @ - ldr r3, [r0] @ - tst r3, #LCD2_BUSY_MASK @ - bne 20b @ - str r7, [r0] @ -20: @ - ldr r3, [r0] @ - tst r3, #LCD2_BUSY_MASK @ - bne 20b @ - str r11, [r0] @ - @ - 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, .-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 + > down - * 2 4 \/ left - * - * Kernel pattern (raw|use order): - * 5 3 4 2 row0 row2 > down - * 1 7 0 6 | 5 1 3 7 4 0 2 6 col0 left - * 4 2 5 3 | 4 0 2 6 5 1 3 7 col2 \/ - * 0 6 1 7 - */ - .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 = stride - @ 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, #0x7000000c @ r0 = &LCD2_PORT = 0x70008a0c - add r0, r0, #0x8a00 @ - @ - 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 @ - @ - 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 - @ - 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 @ pack pixel - and r7, r7, #0x7e00 @ r3 = pixel = (r & 0xf800) | - orr r11, r11, r7, lsr #4 @ ((g & 0x7e00) >> 4) | - orr r3, r11, r3, lsr #10 @ (b >> 10) - @ - mov r11, #LCD2_DATA_MASK @ store pixel - orr r7, r11, r3, lsr #8 @ - orr r11, r11, r3 @ -20: @ - ldr r3, [r0] @ - tst r3, #LCD2_BUSY_MASK @ - bne 20b @ - str r7, [r0] @ -20: @ - ldr r3, [r0] @ - tst r3, #LCD2_BUSY_MASK @ - bne 20b @ - str r11, [r0] @ - @ - 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 @ - @ - @ 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 - @ - 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 @ pack pixel - and r7, r7, #0x7e00 @ r3 = pixel = (r & 0xf800) | - orr r11, r11, r7, lsr #4 @ ((g & 0x7e00) >> 4) | - orr r3, r11, r3, lsr #10 @ (b >> 10) - @ - mov r11, #LCD2_DATA_MASK @ store pixel - orr r7, r11, r3, lsr #8 @ - orr r11, r11, r3 @ -20: @ - ldr r3, [r0] @ - tst r3, #LCD2_BUSY_MASK @ - bne 20b @ - str r7, [r0] @ -20: @ - ldr r3, [r0] @ - tst r3, #LCD2_BUSY_MASK @ - bne 20b @ - str r11, [r0] @ - @ - 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 @ - @ - add r12, r14, #0x100 @ - @ - 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 @ pack pixel - and r7, r7, #0x7e00 @ r3 = pixel = (r & 0xf800) | - orr r11, r11, r7, lsr #4 @ ((g & 0x7e00) >> 4) | - orr r3, r11, r3, lsr #10 @ (b >> 10) - @ - mov r11, #LCD2_DATA_MASK @ store pixel - orr r7, r11, r3, lsr #8 @ - orr r11, r11, r3 @ -20: @ - ldr r3, [r0] @ - tst r3, #LCD2_BUSY_MASK @ - bne 20b @ - str r7, [r0] @ -20: @ - ldr r3, [r0] @ - tst r3, #LCD2_BUSY_MASK @ - bne 20b @ - str r11, [r0] @ - @ - 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 @ - @ - 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 - @ - 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 @ pack pixel - and r7, r7, #0x7e00 @ r3 = pixel = (r & 0xf800) | - orr r11, r11, r7, lsr #4 @ ((g & 0x7e00) >> 4) | - orr r3, r11, r3, lsr #10 @ (b >> 10) - @ - mov r11, #LCD2_DATA_MASK @ store pixel - orr r7, r11, r3, lsr #8 @ - orr r11, r11, r3 @ -20: @ - ldr r3, [r0] @ - tst r3, #LCD2_BUSY_MASK @ - bne 20b @ - str r7, [r0] @ -20: @ - ldr r3, [r0] @ - tst r3, #LCD2_BUSY_MASK @ - bne 20b @ - str r11, [r0] @ - @ - 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/hdd1630/lcd-hdd1630.c b/firmware/target/arm/philips/hdd1630/lcd-hdd1630.c index c26c0bc963..d9570600bc 100644 --- a/firmware/target/arm/philips/hdd1630/lcd-hdd1630.c +++ b/firmware/target/arm/philips/hdd1630/lcd-hdd1630.c @@ -81,7 +81,6 @@ static bool lcd_enabled; /* Display status */ -static unsigned lcd_yuv_options SHAREDBSS_ATTR = 0; static unsigned mad_ctrl = 0; /* wait for LCD */ @@ -313,86 +312,6 @@ void lcd_set_flip(bool yesno) lcd_send_data(mad_ctrl); } -void lcd_yuv_set_options(unsigned options) -{ - lcd_yuv_options = options; -} - -/* Line write helper function for lcd_yuv_blit. Write two lines of yuv420. */ -extern void lcd_write_yuv420_lines(unsigned char const * const src[3], - int width, int stride); - -extern void lcd_write_yuv420_lines_odither(unsigned char const * const src[3], - int width, int stride, - int x_screen, int y_screen); - -/* Performance function to blit a YUV bitmap directly to the LCD */ -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) -{ - unsigned char const * yuv_src[3]; - off_t z; - - /* Sorry, but width and height must be >= 2 or else */ - width &= ~1; - height >>= 1; - - z = stride*src_y; - yuv_src[0] = src[0] + z + src_x; - yuv_src[1] = src[1] + (z >> 2) + (src_x >> 1); - yuv_src[2] = src[2] + (yuv_src[1] - src[1]); - - /* Set vertical address mode */ - lcd_send_cmd(MADCTR); - lcd_send_data(mad_ctrl | (1<<5)); - - lcd_send_cmd(RASET); - lcd_send_data(x); - lcd_send_data(x + width - 1); - - if (lcd_yuv_options & LCD_YUV_DITHER) - { - do - { - lcd_send_cmd(CASET); - lcd_send_data(y); - lcd_send_data(y + 1); - - lcd_send_cmd(RAMWR); - - lcd_write_yuv420_lines_odither(yuv_src, width, stride, x, y); - yuv_src[0] += stride << 1; /* Skip down two luma lines */ - yuv_src[1] += stride >> 1; /* Skip down one chroma line */ - yuv_src[2] += stride >> 1; - y += 2; - } - while (--height > 0); - } - else - { - do - { - lcd_send_cmd(CASET); - lcd_send_data(y); - lcd_send_data(y + 1); - - lcd_send_cmd(RAMWR); - - lcd_write_yuv420_lines(yuv_src, width, stride); - yuv_src[0] += stride << 1; /* Skip down two luma lines */ - yuv_src[1] += stride >> 1; /* Skip down one chroma line */ - yuv_src[2] += stride >> 1; - y += 2; - } - while (--height > 0); - } - - /* Restore the address mode */ - lcd_send_cmd(MADCTR); - lcd_send_data(mad_ctrl); -} - /* Update the display. This must be called after all other LCD functions that change the display. */ void lcd_update(void) diff --git a/firmware/target/arm/philips/hdd6330/lcd-as-hdd6330.S b/firmware/target/arm/philips/hdd6330/lcd-as-hdd6330.S deleted file mode 100644 index c3a7992a2e..0000000000 --- a/firmware/target/arm/philips/hdd6330/lcd-as-hdd6330.S +++ /dev/null @@ -1,140 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id:$ - * - * Copyright (C) 2010 by Szymon Dziok - * - * Philips Gogear HDD6330 LCD assembly routine - * - * 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. - * - ****************************************************************************/ - -#include "config.h" -#include "cpu.h" - -/**************************************************************************** - void lcd_yuv_write_inner_loop(unsigned char const * const ysrc, - unsigned char const * const usrc, - unsigned char const * const vsrc, - int width); -*/ - .section .icode, "ax", %progbits - .align 2 - .global lcd_yuv_write_inner_loop - .type lcd_yuv_write_inner_loop, %function -lcd_yuv_write_inner_loop: - @ r0 = ysrc - @ r1 = usrc - @ r2 = vsrc - @ r3 = width - stmfd sp!, { r4-r11, lr } @ save regs - mov r4, #0x70000000 @ r4 = LCD2_BLOCK_CTRL - 0x20 - add r4, r4, #0x8a00 @ - add r5, r4, #0x100 @ r5 = LCD2_BLOCK_DATA -10: @ loop - - ldrb r7, [r1], #1 @ *usrc++ - ldrb r8, [r2], #1 @ *vsrc++ - - sub r7, r7, #128 @ Cb -= 128 - sub r8, r8, #128 @ Cr -= 128 - - add r10, r8, r8, asl #2 @ Cr*101 - add r10, r10, r8, asl #5 - add r10, r10, r8, asl #6 - - add r11, r8, r8, asl #1 @ Cr*51 + Cb*24 - add r11, r11, r11, asl #4 - add r11, r11, r7, asl #3 - add r11, r11, r7, asl #4 - - add r12, r7, #2 @ r12 = bu = (Cb*128 + 256) >> 9 - mov r12, r12, asr #2 - add r10, r10, #256 @ r10 = rv = (Cr*101 + 256) >> 9 - mov r10, r10, asr #9 - rsb r11, r11, #128 @ r11 = guv = (-r11 + 128) >> 8 - mov r11, r11, asr #8 - -@ pixel_1 - ldrb r7, [r0], #1 @ *ysrc++ - sub r7, r7, #16 @ Y = (Y' - 16) * 37 - add r8, r7, r7, asl #2 - add r7, r8, r7, asl #5 - - add r9, r10, r7, asr #8 @ R = (Y >> 8) + rv - add r8, r11, r7, asr #7 @ G = (Y >> 7) + guv - add r7, r12, r7, asr #8 @ B = (Y >> 8) + bu - - cmp r9, #31 @ clamp R - mvnhi r9, r9, asr #31 - andhi r9, r9, #31 - - cmp r8, #63 @ clamp G - mvnhi r8, r8, asr #31 - andhi r8, r8, #63 - - cmp r7, #31 @ clamp B - mvnhi r7, r7, asr #31 - andhi r7, r7, #31 - - orr r6, r7, r8, lsl #5 @ pack pixel - orr r6, r6, r9, lsl #11 - - mov r7, r6, lsl #8 @ swap bytes - and r7, r7, #0xff00 - add r6, r7, r6, lsr #8 - -@ pixel_2 - ldrb r7, [r0], #1 @ *ysrc++ - sub r7, r7, #16 @ Y = (Y' - 16) * 37 - add r8, r7, r7, asl #2 - add r7, r8, r7, asl #5 - - add r9, r10, r7, asr #8 @ R = (Y >> 8) + rv - add r8, r11, r7, asr #7 @ G = (Y >> 7) + guv - add r7, r12, r7, asr #8 @ B = (Y >> 8) + bu - - cmp r9, #31 @ clamp R - mvnhi r9, r9, asr #31 - andhi r9, r9, #31 - - cmp r8, #63 @ clamp G - mvnhi r8, r8, asr #31 - andhi r8, r8, #63 - - cmp r7, #31 @ clamp B - mvnhi r7, r7, asr #31 - andhi r7, r7, #31 - - orr r7, r7, r8, lsl #5 @ pack pixel - orr r7, r7, r9, lsl #11 - - orr r6, r6, r7, lsl #24 @ swap bytes and add pixels simultaneously - mov r7, r7, lsr #8 - orr r6, r6, r7, lsl #16 - -11: @ while (!(LCD2_BLOCK_CTRL & LCD2_BLOCK_TXOK)); - ldr r11, [r4, #0x20] @ - tst r11, #0x1000000 @ - beq 11b @ - - str r6, [r5] @ send two pixels - - subs r3, r3, #2 @ decrease width - bgt 10b @ loop - - ldmpc regs=r4-r11 @ restore regs - .ltorg @ dump constant pool - .size lcd_yuv_write_inner_loop, .-lcd_yuv_write_inner_loop diff --git a/firmware/target/arm/philips/hdd6330/lcd-hdd6330.c b/firmware/target/arm/philips/hdd6330/lcd-hdd6330.c index cdd3064bba..9d2fdc8519 100644 --- a/firmware/target/arm/philips/hdd6330/lcd-hdd6330.c +++ b/firmware/target/arm/philips/hdd6330/lcd-hdd6330.c @@ -37,9 +37,6 @@ /* whether the lcd is currently enabled or not */ static bool lcd_enabled; -/* Display status */ -static unsigned lcd_yuv_options SHAREDBSS_ATTR = 0; - /* Value used for flipping. Must be remembered when display is turned off. */ static unsigned short flip; @@ -147,101 +144,6 @@ void lcd_set_flip(bool yesno) lcd_send_data(0x08 | flip); } -void lcd_yuv_set_options(unsigned options) -{ - lcd_yuv_options = options; -} - -#define CSUB_X 2 -#define CSUB_Y 2 - -/* YUV- > RGB565 conversion - * |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 -*/ - -extern void lcd_yuv_write_inner_loop(unsigned char const * const ysrc, - unsigned char const * const usrc, - unsigned char const * const vsrc, - int width); - -/* Performance function to blit a YUV bitmap directly to the LCD */ -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) -{ - int h; - - width = (width + 1) & ~1; - - lcd_send_reg(LCD_REG_HORIZ_ADDR_START); - lcd_send_data(y); - - lcd_send_reg(LCD_REG_HORIZ_ADDR_END); - lcd_send_data(y + height - 1); - - lcd_send_reg(LCD_REG_VERT_ADDR_START); - lcd_send_data(x + x_offset); - - lcd_send_reg(LCD_REG_VERT_ADDR_END); - lcd_send_data(x + width - 1 + x_offset); - - lcd_send_reg(LCD_REG_WRITE_DATA_2_GRAM); - - const int stride_div_csub_x = stride/CSUB_X; - - h=0; - while (1) - { - /* upsampling, YUV->RGB conversion and reduction to RGB565 in one go */ - const unsigned char *ysrc = src[0] + stride * src_y + src_x; - - const int uvoffset = stride_div_csub_x * (src_y/CSUB_Y) + - (src_x/CSUB_X); - - const unsigned char *usrc = src[1] + uvoffset; - const unsigned char *vsrc = src[2] + uvoffset; - - int pixels_to_write; - - if (h==0) - { - while (!(LCD2_BLOCK_CTRL & LCD2_BLOCK_READY)); - LCD2_BLOCK_CONFIG = 0; - - if (height == 0) break; - - pixels_to_write = (width * height) * 2; - h = height; - - /* calculate how much we can do in one go */ - if (pixels_to_write > 0x10000) - { - h = (0x10000/2) / width; - pixels_to_write = (width * h) * 2; - } - - height -= h; - LCD2_BLOCK_CTRL = 0x10000080; - LCD2_BLOCK_CONFIG = 0xc0010000 | (pixels_to_write - 1); - LCD2_BLOCK_CTRL = 0x34000000; - } - - lcd_yuv_write_inner_loop(ysrc,usrc,vsrc,width); - - src_y++; - h--; - } - - while (!(LCD2_BLOCK_CTRL & LCD2_BLOCK_READY)); - LCD2_BLOCK_CONFIG = 0; -} - /* Update the display. This must be called after all other LCD functions that change the display. */ void lcd_update(void) diff --git a/firmware/target/arm/philips/sa9200/lcd-as-sa9200.S b/firmware/target/arm/philips/sa9200/lcd-as-sa9200.S deleted file mode 100644 index d99222b9df..0000000000 --- a/firmware/target/arm/philips/sa9200/lcd-as-sa9200.S +++ /dev/null @@ -1,590 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * 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 e30a298045..c6c297e6ca 100644 --- a/firmware/target/arm/philips/sa9200/lcd-sa9200.c +++ b/firmware/target/arm/philips/sa9200/lcd-sa9200.c @@ -75,9 +75,6 @@ static void lcd_display_off(void); #define R_GATE_OUT_PERIOD_CTRL 0x71 #define R_SOFTWARE_RESET 0x72 -/* Display status */ -static unsigned lcd_yuv_options SHAREDBSS_ATTR = 0; - /* wait for LCD */ static inline void lcd_wait_write(void) { @@ -407,85 +404,6 @@ void lcd_set_flip(bool yesno) lcd_write_reg(R_DRV_OUTPUT_CONTROL, flip ? 0x090c : 0x0a0c); } -void lcd_yuv_set_options(unsigned options) -{ - lcd_yuv_options = 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) -{ - 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) -- cgit v1.2.3