From 711685f4f125e76a19932cee4ed3726095bed51f Mon Sep 17 00:00:00 2001 From: Michal Szafranski Date: Thu, 15 Jun 2023 19:40:40 +0100 Subject: [PATCH 1/2] Revert "get CC on lines 21 and 284" This reverts commit 8d7bd58c9c911dc9b0d72d5bed4bdb62033c0825. --- cea608.c | 2 +- tvctl.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cea608.c b/cea608.c index 2b0dcdb..0cc15fb 100644 --- a/cea608.c +++ b/cea608.c @@ -52,7 +52,7 @@ void draw(uint8_t *image, int next_resource) { // fill image if(next_resource == 0) { - get_packet(ROW(image, 1)+FIXED, ROW(image, 0)+FIXED); + get_packet(ROW(image, 0)+FIXED, ROW(image, 1)+FIXED); } } diff --git a/tvctl.c b/tvctl.c index 87bec6d..b41f115 100644 --- a/tvctl.c +++ b/tvctl.c @@ -65,7 +65,7 @@ int try_set_regs(volatile unsigned int *regs, int argc, char *argv[]) state = PAL_ON; else if (regs[5] == 0x00100003 && regs[6] == 0x000300f0 && regs[7] == 0x00100003 && regs[8] == 0x000400f0) state = NTSC_OFF; - else if (regs[5] == 0x000e0003 && regs[6] == 0x000500f0 && regs[7] == 0x000f0003 && regs[8] == 0x000500f0) + else if (regs[5] == 0x000e0003 && regs[6] == 0x000500f0 && regs[7] == 0x000e0003 && regs[8] == 0x000600f0) state = NTSC_ON; else state = UNKNOWN; @@ -88,8 +88,8 @@ int try_set_regs(volatile unsigned int *regs, int argc, char *argv[]) case NTSC_OFF: regs[5] = 0x000e0003; regs[6] = 0x000500f0; - regs[7] = 0x000f0003; - regs[8] = 0x000500f0; + regs[7] = 0x000e0003; + regs[8] = 0x000600f0; /* fallthrough */ case NTSC_ON: fprintf(stderr, "CEA608 output is now on.\n"); From 0c4d746bd485651bf2d1295a634e787329e53fa9 Mon Sep 17 00:00:00 2001 From: Michal Szafranski Date: Thu, 15 Jun 2023 19:42:46 +0100 Subject: [PATCH 2/2] initial --- cea608.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cea608.c b/cea608.c index 0cc15fb..80afda0 100644 --- a/cea608.c +++ b/cea608.c @@ -33,7 +33,8 @@ #include "cea608buffer.h" #define WIDTH (53) -#define HEIGHT (2) +#define VOFFSET (1) +#define HEIGHT (VOFFSET+2) #define OFFSET (1) #define FIXED (19) #define ROW(i, n) (i+(PITCH(WIDTH)*(n))+OFFSET) @@ -52,7 +53,7 @@ void draw(uint8_t *image, int next_resource) { // fill image if(next_resource == 0) { - get_packet(ROW(image, 0)+FIXED, ROW(image, 1)+FIXED); + get_packet(ROW(image, VOFFSET)+FIXED, ROW(image, VOFFSET + 1)+FIXED); } } @@ -62,7 +63,7 @@ void init(uint8_t *image) // initialize image buffer with clock run in int n, m, clock = 0x61555; for (m=0; m> 1;