Conditional compile for scart RGBs NTSC/PAL vs VGA

Author: tschrapel

src/CMakeLists.txt

@@ -25,9 +25,19 @@ execute_process(
     OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
+if (${PICO9918_SCART_RGBS})
+  if (${PICO9918_SCART_PAL})
+    set(PICO9918_OUTPUT_STR "rgbs-pal576i")
+  else()
+    set(PICO9918_OUTPUT_STR "rgbs-ntsc480i")
+  endif()
+else()
+  set(PICO9918_OUTPUT_STR "vga")
+endif()
+
 string(REPLACE "." "-" PICO9918_VERSION_STR "${PICO9918_VERSION}")
 
-set(PICO9918_BINARY_SUFFIX -pcb-v${PICO9918_PCB_MAJOR_VER}-${PICO9918_PCB_MINOR_VER}-${PICO9918_GIT_BRANCH}-build-${PICO9918_VERSION_STR})
+set(PICO9918_BINARY_SUFFIX -pcb-v${PICO9918_PCB_MAJOR_VER}-${PICO9918_PCB_MINOR_VER}-${PICO9918_OUTPUT_STR}-build-${PICO9918_VERSION_STR})
 
 if (${PICO9918_SCANLINES})
   set(PICO9918_BINARY_SUFFIX ${PICO9918_BINARY_SUFFIX}-sl)
@@ -59,12 +69,14 @@ pico_add_extra_outputs(${PROGRAM})
 pico_enable_stdio_usb(${PROGRAM} 0)
 pico_enable_stdio_uart(${PROGRAM} 0)
 
-pico_set_binary_type(${PROGRAM} copy_to_ram)   # TOO SLOW TO BOOT
+pico_set_binary_type(${PROGRAM} copy_to_ram)
 
 add_definitions(-DPICO9918_VERSION="${PICO9918_VERSION}")
 add_definitions(-DPICO9918_PCB_MAJOR_VER=${PICO9918_PCB_MAJOR_VER})
 add_definitions(-DPICO9918_PCB_MINOR_VER=${PICO9918_PCB_MINOR_VER})
 add_definitions(-DPICO9918_SCANLINES=${PICO9918_SCANLINES})
+add_definitions(-DPICO9918_SCART_RGBS=${PICO9918_SCART_RGBS})
+add_definitions(-DPICO9918_SCART_PAL=${PICO9918_SCART_PAL})
 
 add_definitions(-DPICO_DISABLE_SHARED_IRQ_HANDLERS=1)
 #add_definitions(-DPICO_TIME_DEFAULT_ALARM_POOL_DISABLED=1)

src/main.c

@@ -63,8 +63,8 @@
   *       https://www.aliexpress.com/item/1005007066733934.html
   */
 
-#define PCB_MAJOR_VERSION 0
-#define PCB_MINOR_VERSION 3
+#define PCB_MAJOR_VERSION PICO9918_PCB_MAJOR_VER
+#define PCB_MINOR_VERSION PICO9918_PCB_MINOR_VER
 
 #define GPIO_CD7 14
 #define GPIO_CSR tmsRead_CSR_PIN  // defined in tms9918.pio
@@ -97,13 +97,15 @@
 
 #define TMS_CRYSTAL_FREQ_HZ 10738635.0f
 
-//#define PICO_CLOCK_PLL 1260000000
-//#define PICO_CLOCK_PLL_DIV1 5
-//#define PICO_CLOCK_PLL_DIV2 1
-
-#define PICO_CLOCK_PLL 1536000000
-#define PICO_CLOCK_PLL_DIV1 3
-#define PICO_CLOCK_PLL_DIV2 2
+#if PICO9918_SCART_RGBS // for 15kHz
+  #define PICO_CLOCK_PLL 1536000000
+  #define PICO_CLOCK_PLL_DIV1 3
+  #define PICO_CLOCK_PLL_DIV2 2
+#else // for 31.46875 kHz
+  #define PICO_CLOCK_PLL 1260000000
+  #define PICO_CLOCK_PLL_DIV1 5
+  #define PICO_CLOCK_PLL_DIV2 1
+#endif
 
 #define PICO_CLOCK_HZ (PICO_CLOCK_PLL / PICO_CLOCK_PLL_DIV1 / PICO_CLOCK_PLL_DIV2)
 
@@ -451,11 +453,19 @@ int main(void)
 
   /* then set up VGA output */
   VgaInitParams params = { 0 };
-  params.params = vgaGetParams(RGBS_NTSC_720_480i_60HZ);
-  //params.params = vgaGetParams(VGA_640_480_60HZ);
 
-  /* virtual size will be 640 x 320 to accomodate 80-column mode */
-  //setVgaParamsScaleY(&params.params, 2);
+#if PICO9918_SCART_RGBS
+  #if PICO9918_SCART_PAL
+    params.params = vgaGetParams(RGBS_PAL_720_576i_50HZ);
+  #else
+    params.params = vgaGetParams(RGBS_NTSC_720_480i_60HZ);
+  #endif
+#else // VGA
+  params.params = vgaGetParams(VGA_640_480_60HZ);
+
+  /* virtual size will be 640 x 240 to accomodate 80-column mode */
+  setVgaParamsScaleY(&params.params, 2);
+#endif
 
   /* set vga scanline callback to generate tms9918 scanlines */
   params.scanlineFn = tmsScanline;

src/vga/vga.c

@@ -22,11 +22,10 @@
 
  // compile options
 #define VGA_CRT_EFFECT PICO9918_SCANLINES
-#define VGA_SCANLINE_TIME_DEBUG 0
-#define VGA_HARDCODED_640 0
-#define VGA_NO_MALLOC 1
-#define VGA_COMBINE_SYNC 1
+#define VGA_HARDCODED_640 !PICO9918_SCART_RGBS
+#define VGA_COMBINE_SYNC PICO9918_SCART_RGBS
 
+#define VGA_NO_MALLOC 1
 
  // a number of compiile-time optimisations can occur 
  // if it knows some of the VGA parameters 
@@ -61,10 +60,16 @@ int roundflt(float x)
 #define RGB_SM          1        // vga rgb state machine index
 
 #define END_OF_SCANLINE_MSG 0x40000000
-#define END_OF_FRAME_MSG 0x80000000
+#define END_OF_FRAME_MSG    0x80000000
 
+#if VGA_COMBINE_SYNC
+bi_decl(bi_1pin_with_name(SYNC_PINS_START, "C Sync"));
+bi_decl(bi_1pin_with_name(SYNC_PINS_START + 1, "C Sync"));
+#else
 bi_decl(bi_1pin_with_name(SYNC_PINS_START, "H Sync"));
 bi_decl(bi_1pin_with_name(SYNC_PINS_START + 1, "V Sync"));
+#endif
+
 bi_decl(bi_pin_mask_with_names(0xf << RGB_PINS_START, "Red (LSB - MSB)"));
 bi_decl(bi_pin_mask_with_names(0xf << RGB_PINS_START + 4, "Green (LSB - MSB)"));
 bi_decl(bi_pin_mask_with_names(0xf << RGB_PINS_START + 8, "Blue (LSB - MSB)"));
@@ -77,10 +82,10 @@ uint32_t __aligned(4) syncDataPorch[4];   // vertical porch
 uint32_t __aligned(4) syncDataSync[4];    // vertical sync
 
 #if VGA_NO_MALLOC
-uint16_t __aligned(4) rgbDataBuffer[2 + VGA_SCANLINE_TIME_DEBUG][640 * sizeof(uint16_t)] = { 0 };   // two scanline buffers (odd and even)
+uint16_t __aligned(4) rgbDataBuffer[2][640 * sizeof(uint16_t)] = { 0 };   // two scanline buffers (odd and even)
 #else
 #include <stdlib.h>
-uint16_t* __aligned(4) rgbDataBuffer[2 + VGA_SCANLINE_TIME_DEBUG] = { 0 };                          // two scanline buffers (odd and even)
+uint16_t* __aligned(4) rgbDataBuffer[2] = { 0 };                          // two scanline buffers (odd and even)
 #endif
 
 
@@ -93,11 +98,6 @@ static uint syncDmaChanMask = 0;
 static uint rgbDmaChanMask = 0;
 static VgaInitParams vgaParams = { 0 };
 
-#if VGA_SCANLINE_TIME_DEBUG
-bool hasRenderedNext = false;
-#endif
-
-
 uint32_t vgaMinimumPioClockKHz(VgaParams* params)
 {
   if (params)
@@ -130,15 +130,6 @@ static bool buildSyncData()
   rgbDataBuffer[1] = malloc(VIRTUAL_PIXELS_X * sizeof(uint16_t));
 #endif
 
-#if VGA_SCANLINE_TIME_DEBUG
-#if !VGA_NO_MALLOC
-  rgbDataBuffer[2] = malloc(VIRTUAL_PIXELS_X * sizeof(uint16_t));
-#endif
-
-  for (int i = 0; i < VIRTUAL_PIXELS_X; ++i)
-    rgbDataBuffer[2][i] = 0x0f00;
-#endif
-
   vgaParams.params.pioDivider = roundflt(sysClockKHz / (float)minClockKHz);
   vgaParams.params.pioFreqKHz = sysClockKHz / vgaParams.params.pioDivider;
 
@@ -361,15 +352,6 @@ static void __isr __time_critical_func(dmaIrqHandler)(void)
     }
 #endif
 
-#if VGA_SCANLINE_TIME_DEBUG
-    // apply a few darkened values before passing to dma
-    if (pxLineRpt != 0 && hasRenderedNext)
-    {
-      currentBuffer = (uint32_t*)rgbDataBuffer[2];
-    }
-#endif
-
-
     dma_channel_set_read_addr(rgbDmaChan, currentBuffer, true);
 
     // need a new line every X display lines
@@ -380,9 +362,6 @@ static void __isr __time_critical_func(dmaIrqHandler)(void)
 
       multicore_fifo_push_timeout_us(requestLine, 0);
 
-#if VGA_SCANLINE_TIME_DEBUG
-      hasRenderedNext = false;
-#endif
       if (requestLine == VIRTUAL_PIXELS_Y - 1)
       {
         multicore_fifo_push_timeout_us(END_OF_FRAME_MSG, 0);
@@ -449,10 +428,6 @@ void __time_critical_func(vgaLoop)()
     {
       // get the next scanline pixels
       vgaParams.scanlineFn(message & 0xfff, &vgaParams.params, rgbDataBuffer[message & 0x01]);
-#if VGA_SCANLINE_TIME_DEBUG
-      dma_channel_set_read_addr(rgbDmaChan, rgbDataBuffer[2], true);
-      hasRenderedNext = true;
-#endif
     }
   }
 }