re-enabled custom board file. higher clock rate, minor fixes

Author: tschrapel

CMakeLists.txt

@@ -9,21 +9,23 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 # Initialise pico_sdk from installed location
 # (note this can come from environment, CMake cache etc)
 
-# == DO NEVER EDIT THE NEXT LINES for Raspberry Pi Pico VS Code Extension to work ==
-if(WIN32)
-    set(USERHOME $ENV{USERPROFILE})
-else()
-    set(USERHOME $ENV{HOME})
-endif()
-set(sdkVersion 2.0.0)
-set(toolchainVersion 13_3_Rel1)
-set(picotoolVersion 2.0.0)
-set(picoVscode ${USERHOME}/.pico-sdk/cmake/pico-vscode.cmake)
-if (EXISTS ${picoVscode})
-    include(${picoVscode})
-endif()
+# == DO NEVER EDIT THE NEXT LINES for Raspberry Pi Pico VS Code Extension to work ==
+if(WIN32)
+    set(USERHOME $ENV{USERPROFILE})
+else()
+    set(USERHOME $ENV{HOME})
+endif()
+set(sdkVersion 2.0.0)
+set(toolchainVersion 13_3_Rel1)
+set(picotoolVersion 2.0.0)
+set(picoVscode ${USERHOME}/.pico-sdk/cmake/pico-vscode.cmake)
+if (EXISTS ${picoVscode})
+    include(${picoVscode})
+endif()
 # ====================================================================================
-set(PICO_BOARD pico CACHE STRING "Board type")
+
+set(PICO_BOARD_HEADER_DIRS ${CMAKE_CURRENT_LIST_DIR}/src/boards )
+set(PICO_BOARD "pico9918_v04" CACHE STRING "Board type")
 
 # Pull in Raspberry Pi Pico SDK (must be before project)
 include(pico_sdk_import.cmake)

src/boards/pico9918_v04.h

@@ -11,8 +11,7 @@
 
 // This header may be included by other board headers as "boards/pico.h"
 
-#ifndef _BOARDS_PICO_H
-#define _BOARDS_PICO_H
+#pragma once
 
 // For board detection
 #define PICO9918
@@ -95,5 +94,3 @@
 #ifndef PICO_VSYS_PIN
 #define PICO_VSYS_PIN 29
 #endif
-
-#endif

src/gpu.c

@@ -97,8 +97,8 @@ static void triggerGpuDma()
   uint32_t params = tms9918->vram[0x8007];
   *(uint16_t*)(tms9918->vram + 0x8008) = 0;
 
-  int32_t srcInc = params & 0x01 ? 0 : (params & 0x02 ? -1 : 1);
   int32_t dstInc = params & 0x02 ? -1 : 1;
+  int32_t srcInc = params & 0x01 ? 0 : dstInc;
 
   uint8_t *srcPtr = tms9918->vram + srcVramAddr;
   uint8_t *dstPtr = tms9918->vram + dstVramAddr;

src/main.c

@@ -107,8 +107,8 @@
 
 #define TMS_CRYSTAL_FREQ_HZ 10738635.0f
 
-#define PICO_CLOCK_PLL 604000000
-#define PICO_CLOCK_PLL_DIV1 2
+#define PICO_CLOCK_PLL 1512000000
+#define PICO_CLOCK_PLL_DIV1 4
 #define PICO_CLOCK_PLL_DIV2 1
 #define PICO_CLOCK_HZ (PICO_CLOCK_PLL / PICO_CLOCK_PLL_DIV1 / PICO_CLOCK_PLL_DIV2)
 
@@ -758,6 +758,7 @@ void proc1Entry()
  */
 int main(void)
 {
+  vreg_set_voltage(VREG_VOLTAGE_1_30);
   /* currently, VGA hard-coded to 640x480@60Hz. We want a high clock frequency
    * that comes close to being divisible by 25.175MHz. 302.0 is close... enough :)
    * I do have code which sets the best clock baased on the chosen VGA mode,

src/vga/vga.c

@@ -141,7 +141,7 @@ static bool buildSyncData()
     rgbDataBuffer[2][i] = 0x0f00;
 #endif
 
-  vgaParams.params.pioDivider = roundflt(sysClockKHz / (float)minClockKHz);
+  vgaParams.params.pioDivider = (sysClockKHz / (float)minClockKHz);
   vgaParams.params.pioFreqKHz = sysClockKHz / vgaParams.params.pioDivider;
 
   vgaParams.params.pioClocksPerPixel = vgaParams.params.pioFreqKHz / (float)vgaParams.params.pixelClockKHz;