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/s5l8700/ipodnano2g/lcd-asm-nano2g.S | 228 --------------------- .../target/arm/s5l8700/ipodnano2g/lcd-nano2g.c | 33 --- 2 files changed, 261 deletions(-) (limited to 'firmware/target/arm/s5l8700/ipodnano2g') diff --git a/firmware/target/arm/s5l8700/ipodnano2g/lcd-asm-nano2g.S b/firmware/target/arm/s5l8700/ipodnano2g/lcd-asm-nano2g.S index af338eef16..50104a73e8 100644 --- a/firmware/target/arm/s5l8700/ipodnano2g/lcd-asm-nano2g.S +++ b/firmware/target/arm/s5l8700/ipodnano2g/lcd-asm-nano2g.S @@ -65,231 +65,3 @@ lcd_write_line: /* r2 = LCD_BASE */ bgt .loop ldmpc regs=r4-r6 - -/**************************************************************************** - * extern void lcd_write_yuv420_lines(unsigned char const * const src[3], - * const unsigned LCD_BASE, - * int width, - * int stride); - * - * Conversion from Motion JPEG and MPEG Y'PbPr to RGB is: - * |R| |1.164 0.000 1.596| |Y' - 16| - * |G| = |1.164 -0.391 -0.813| |Pb - 128| - * |B| |1.164 2.018 0.000| |Pr - 128| - * - * 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 - * - * Converts two lines from YUV to RGB565 and writes to LCD at once. First loop - * loads Cb/Cr, calculates the chroma offset and saves them to buffer. Within - * the second loop these chroma offset are reloaded from buffer. Within each - * loop two pixels are calculated and written to LCD. - */ - .align 2 - .global lcd_write_yuv420_lines - .type lcd_write_yuv420_lines, %function -lcd_write_yuv420_lines: - /* r0 = src = yuv_src */ - /* r1 = dst = LCD_BASE */ - /* r2 = width */ - /* r3 = stride */ - stmfd sp!, { r4-r10, lr } /* save non-scratch */ - ldmia r0, { r9, r10, r12 } /* r9 = yuv_src[0] = Y'_p */ - /* r10 = yuv_src[1] = Cb_p */ - /* r12 = yuv_src[2] = Cr_p */ - add r3, r9, r3 /* r3 = &ysrc[stride] */ - add r4, r2, r2, asr #1 /* chroma buffer lenght = width/2 *3 */ - mov r4, r4, asl #2 /* use words for str/ldm possibility */ - add r4, r4, #19 /* plus room for 4 additional words, */ - bic r4, r4, #3 /* rounded up to multiples of 4 byte */ - sub sp, sp, r4 /* and allocate on stack */ - stmia sp, {r1-r4} /* LCD_BASE, width, &ysrc[stride], stack_alloc */ - - mov r7, r2 /* r7 = loop count */ - add r8, sp, #16 /* chroma buffer */ - add lr, r1, #0x40 /* LCD data port = LCD_BASE + 0x40 */ - - /* 1st loop start */ -10: /* loop start */ - - ldrb r0, [r10], #1 /* r0 = *usrc++ = *Cb_p++ */ - ldrb r1, [r12], #1 /* r1 = *vsrc++ = *Cr_p++ */ - - sub r0, r0, #128 /* r0 = Cb-128 */ - sub r1, r1, #128 /* r1 = Cr-128 */ - - add r2, r1, r1, asl #1 /* r2 = Cr*51 + Cb*24 */ - add r2, r2, r2, asl #4 - add r2, r2, r0, asl #3 - add r2, r2, r0, asl #4 - - add r4, r1, r1, asl #2 /* r1 = Cr*101 */ - add r4, r4, r1, asl #5 - add r1, r4, r1, asl #6 - - add r1, r1, #256 /* r1 = rv = (r1 + 256) >> 9 */ - mov r1, r1, asr #9 - rsb r2, r2, #128 /* r2 = guv = (-r2 + 128) >> 8 */ - mov r2, r2, asr #8 - add r0, r0, #2 /* r0 = bu = (Cb*128 + 256) >> 9 */ - mov r0, r0, asr #2 - stmia r8!, {r0-r2} /* store r0, r1 and r2 to chroma buffer */ - - /* 1st loop, first pixel */ - ldrb r5, [r9], #1 /* r5 = *ysrc++ = *Y'_p++ */ - sub r5, r5, #16 /* r5 = (Y'-16) * 74 */ - add r3, r5, r5, asl #2 - add r5, r3, r5, asl #5 - - add r6, r1, r5, asr #8 /* r6 = r = (Y >> 9) + rv */ - add r3, r2, r5, asr #7 /* r3 = g = (Y >> 8) + guv */ - add r4, r0, r5, asr #8 /* r4 = b = (Y >> 9) + bu */ - - orr r5, r6, r4 /* check if clamping is needed... */ - orr r5, r5, r3, asr #1 /* ...at all */ - cmp r5, #31 - bls 15f /* -> no clamp */ - cmp r6, #31 /* clamp r */ - mvnhi r6, r6, asr #31 - andhi r6, r6, #31 - cmp r3, #63 /* clamp g */ - mvnhi r3, r3, asr #31 - andhi r3, r3, #63 - cmp r4, #31 /* clamp b */ - mvnhi r4, r4, asr #31 - andhi r4, r4, #31 -15: /* no clamp */ - - /* calculate pixel_1 and save to r4 for later pixel packing */ - orr r4, r4, r3, lsl #5 /* pixel_1 = r<<11 | g<<5 | b */ - orr r4, r4, r6, lsl #11 /* r4 = pixel_1 */ - - /* 1st loop, second pixel */ - ldrb r5, [r9], #1 /* r5 = *ysrc++ = *Y'_p++ */ - sub r5, r5, #16 /* r5 = (Y'-16) * 74 */ - add r3, r5, r5, asl #2 - add r5, r3, r5, asl #5 - - add r6, r1, r5, asr #8 /* r6 = r = (Y >> 9) + rv */ - add r3, r2, r5, asr #7 /* r3 = g = (Y >> 8) + guv */ - add r5, r0, r5, asr #8 /* r5 = b = (Y >> 9) + bu */ - - orr r0, r6, r5 /* check if clamping is needed... */ - orr r0, r0, r3, asr #1 /* ...at all */ - cmp r0, #31 - bls 15f /* -> no clamp */ - cmp r6, #31 /* clamp r */ - mvnhi r6, r6, asr #31 - andhi r6, r6, #31 - cmp r3, #63 /* clamp g */ - mvnhi r3, r3, asr #31 - andhi r3, r3, #63 - cmp r5, #31 /* clamp b */ - mvnhi r5, r5, asr #31 - andhi r5, r5, #31 -15: /* no clamp */ - - /* calculate pixel_2 and pack with pixel_1 before writing */ - orr r5, r5, r3, lsl #5 /* pixel_2 = r<<11 | g<<5 | b */ - orr r5, r5, r6, lsl #11 /* r5 = pixel_2 */ -#ifdef FORCE_FIFO_WAIT - /* wait for FIFO half full */ -.fifo_wait1: - ldr r3, [lr, #-0x24] /* while (LCD_STATUS & 0x08); */ - tst r3, #0x8 - bgt .fifo_wait1 -#endif - stmia lr, {r4,r5} /* write pixel_1 and pixel_2 */ - - subs r7, r7, #2 /* check for loop end */ - bgt 10b /* back to beginning */ - /* 1st loop end */ - - /* Reload several registers for pointer rewinding for next loop */ - add r8, sp, #16 /* chroma buffer */ - ldmia sp, { r1, r7, r9} /* r1 = LCD_BASE */ - /* r7 = loop count */ - /* r9 = &ysrc[stride] */ - - /* 2nd loop start */ -20: /* loop start */ - /* restore r0 (bu), r1 (rv) and r2 (guv) from chroma buffer */ - ldmia r8!, {r0-r2} - - /* 2nd loop, first pixel */ - ldrb r5, [r9], #1 /* r5 = *ysrc++ = *Y'_p++ */ - sub r5, r5, #16 /* r5 = (Y'-16) * 74 */ - add r3, r5, r5, asl #2 - add r5, r3, r5, asl #5 - - add r6, r1, r5, asr #8 /* r6 = r = (Y >> 9) + rv */ - add r3, r2, r5, asr #7 /* r3 = g = (Y >> 8) + guv */ - add r4, r0, r5, asr #8 /* r4 = b = (Y >> 9) + bu */ - - orr r5, r6, r4 /* check if clamping is needed... */ - orr r5, r5, r3, asr #1 /* ...at all */ - cmp r5, #31 - bls 15f /* -> no clamp */ - cmp r6, #31 /* clamp r */ - mvnhi r6, r6, asr #31 - andhi r6, r6, #31 - cmp r3, #63 /* clamp g */ - mvnhi r3, r3, asr #31 - andhi r3, r3, #63 - cmp r4, #31 /* clamp b */ - mvnhi r4, r4, asr #31 - andhi r4, r4, #31 -15: /* no clamp */ - /* calculate pixel_1 and save to r4 for later pixel packing */ - orr r4, r4, r3, lsl #5 /* pixel_1 = r<<11 | g<<5 | b */ - orr r4, r4, r6, lsl #11 /* r4 = pixel_1 */ - - /* 2nd loop, second pixel */ - ldrb r5, [r9], #1 /* r5 = *ysrc++ = *Y'_p++ */ - sub r5, r5, #16 /* r5 = (Y'-16) * 74 */ - add r3, r5, r5, asl #2 - add r5, r3, r5, asl #5 - - add r6, r1, r5, asr #8 /* r6 = r = (Y >> 9) + rv */ - add r3, r2, r5, asr #7 /* r3 = g = (Y >> 8) + guv */ - add r5, r0, r5, asr #8 /* r5 = b = (Y >> 9) + bu */ - - orr r0, r6, r5 /* check if clamping is needed... */ - orr r0, r0, r3, asr #1 /* ...at all */ - cmp r0, #31 - bls 15f /* -> no clamp */ - cmp r6, #31 /* clamp r */ - mvnhi r6, r6, asr #31 - andhi r6, r6, #31 - cmp r3, #63 /* clamp g */ - mvnhi r3, r3, asr #31 - andhi r3, r3, #63 - cmp r5, #31 /* clamp b */ - mvnhi r5, r5, asr #31 - andhi r5, r5, #31 -15: /* no clamp */ - - /* calculate pixel_2 and pack with pixel_1 before writing */ - orr r5, r5, r3, lsl #5 /* pixel_2 = r<<11 | g<<5 | b */ - orr r5, r5, r6, lsl #11 /* r5 = pixel_2 */ -#ifdef FORCE_FIFO_WAIT - /* wait for FIFO half full */ -.fifo_wait2: - ldr r3, [lr, #-0x24] /* while (LCD_STATUS & 0x08); */ - tst r3, #0x8 - bgt .fifo_wait2 -#endif - stmia lr, {r4,r5} /* write pixel_1 and pixel_2 */ - - subs r7, r7, #2 /* check for loop end */ - bgt 20b /* back to beginning */ - /* 2nd loop end */ - - ldr r3, [sp, #12] - add sp, sp, r3 /* deallocate buffer */ - ldmpc regs=r4-r10 /* restore registers */ - - .ltorg - .size lcd_write_yuv420_lines, .-lcd_write_yuv420_lines diff --git a/firmware/target/arm/s5l8700/ipodnano2g/lcd-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/lcd-nano2g.c index 13e5c5c1d4..2d630886c9 100644 --- a/firmware/target/arm/s5l8700/ipodnano2g/lcd-nano2g.c +++ b/firmware/target/arm/s5l8700/ipodnano2g/lcd-nano2g.c @@ -406,36 +406,3 @@ void lcd_update_rect(int x, int y, int width, int height) } while (--height > 0 ); } } - -/* Line write helper function for lcd_yuv_blit. Writes two lines of yuv420. */ -extern void lcd_write_yuv420_lines(unsigned char const * const src[3], - const unsigned int lcd_baseadress, - int width, - int stride); - -/* 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 int z; - unsigned char const * yuv_src[3]; - - width = (width + 1) & ~1; /* ensure width is even */ - - lcd_setup_drawing_region(x, y, width, height); - - 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]); - - height >>= 1; - - do { - lcd_write_yuv420_lines(yuv_src, LCD_BASE, width, stride); - yuv_src[0] += stride << 1; - yuv_src[1] += stride >> 1; /* Skip down one chroma line */ - yuv_src[2] += stride >> 1; - } while (--height > 0); -} -- cgit v1.2.3