From c149b77db285ffd79618eb04bb22652ad89f03ff Mon Sep 17 00:00:00 2001 From: Wayne Venables Date: Fri, 5 Sep 2025 20:26:42 -0700 Subject: [PATCH] Restructure the files for different CPUs --- picovga.cmake | 20 +++++++++---------- src/render/{ => rp2040}/vga_tilepersp.S | 2 +- src/render/{ => rp2040}/vga_tilepersp15.S | 2 +- src/render/{ => rp2040}/vga_tilepersp2.S | 2 +- src/render/{ => rp2040}/vga_tilepersp3.S | 2 +- src/render/{ => rp2040}/vga_tilepersp4.S | 2 +- .../vga_tilepersp.S} | 2 +- .../vga_tilepersp15.S} | 2 +- .../vga_tilepersp2.S} | 2 +- .../vga_tilepersp3.S} | 2 +- .../vga_tilepersp4.S} | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) rename src/render/{ => rp2040}/vga_tilepersp.S (96%) rename src/render/{ => rp2040}/vga_tilepersp15.S (96%) rename src/render/{ => rp2040}/vga_tilepersp2.S (96%) rename src/render/{ => rp2040}/vga_tilepersp3.S (96%) rename src/render/{ => rp2040}/vga_tilepersp4.S (96%) rename src/render/{vga_tilepersp.rp2350.S => rp2350/vga_tilepersp.S} (96%) rename src/render/{vga_tilepersp15.rp2350.S => rp2350/vga_tilepersp15.S} (96%) rename src/render/{vga_tilepersp2.rp2350.S => rp2350/vga_tilepersp2.S} (96%) rename src/render/{vga_tilepersp3.rp2350.S => rp2350/vga_tilepersp3.S} (96%) rename src/render/{vga_tilepersp4.rp2350.S => rp2350/vga_tilepersp4.S} (96%) diff --git a/picovga.cmake b/picovga.cmake index 30ec045..9c390ed 100644 --- a/picovga.cmake +++ b/picovga.cmake @@ -44,19 +44,19 @@ macro(add_picovga project) if(PICO_PLATFORM STREQUAL "rp2040") target_sources(${project} PRIVATE - ${PICOVGA_PATH}/src/render/vga_tilepersp.S - ${PICOVGA_PATH}/src/render/vga_tilepersp15.S - ${PICOVGA_PATH}/src/render/vga_tilepersp2.S - ${PICOVGA_PATH}/src/render/vga_tilepersp3.S - ${PICOVGA_PATH}/src/render/vga_tilepersp4.S + ${PICOVGA_PATH}/src/render/rp2040/vga_tilepersp.S + ${PICOVGA_PATH}/src/render/rp2040/vga_tilepersp15.S + ${PICOVGA_PATH}/src/render/rp2040/vga_tilepersp2.S + ${PICOVGA_PATH}/src/render/rp2040/vga_tilepersp3.S + ${PICOVGA_PATH}/src/render/rp2040/vga_tilepersp4.S ) elseif(PICO_PLATFORM STREQUAL "rp2350-arm-s") target_sources(${project} PRIVATE - ${PICOVGA_PATH}/src/render/vga_tilepersp.rp2350.S - ${PICOVGA_PATH}/src/render/vga_tilepersp15.rp2350.S - ${PICOVGA_PATH}/src/render/vga_tilepersp2.rp2350.S - ${PICOVGA_PATH}/src/render/vga_tilepersp3.rp2350.S - ${PICOVGA_PATH}/src/render/vga_tilepersp4.rp2350.S + ${PICOVGA_PATH}/src/render/rp2350/vga_tilepersp.S + ${PICOVGA_PATH}/src/render/rp2350/vga_tilepersp15.S + ${PICOVGA_PATH}/src/render/rp2350/vga_tilepersp2.S + ${PICOVGA_PATH}/src/render/rp2350/vga_tilepersp3.S + ${PICOVGA_PATH}/src/render/rp2350/vga_tilepersp4.S ) else() message(FATAL_ERROR "Unsupported PICO_PLATFORM='${PICO_PLATFORM}'") diff --git a/src/render/vga_tilepersp.S b/src/render/rp2040/vga_tilepersp.S similarity index 96% rename from src/render/vga_tilepersp.S rename to src/render/rp2040/vga_tilepersp.S index 26d260c..8378132 100644 --- a/src/render/vga_tilepersp.S +++ b/src/render/rp2040/vga_tilepersp.S @@ -11,7 +11,7 @@ // wb ... LOW8=number of bits of tile map width, HIGH8=number of bits of tile map height // wrapy ... segment height -#include "../define.h" // common definitions of C and ASM +#include "../../define.h" // common definitions of C and ASM #include "hardware/regs/sio.h" // registers of hardware divider #include "hardware/regs/addressmap.h" // SIO base address diff --git a/src/render/vga_tilepersp15.S b/src/render/rp2040/vga_tilepersp15.S similarity index 96% rename from src/render/vga_tilepersp15.S rename to src/render/rp2040/vga_tilepersp15.S index dcb498a..d8f5d40 100644 --- a/src/render/vga_tilepersp15.S +++ b/src/render/rp2040/vga_tilepersp15.S @@ -11,7 +11,7 @@ // wb ... LOW8=number of bits of tile map width, HIGH8=number of bits of tile map height // wrapy ... segment height -#include "../define.h" // common definitions of C and ASM +#include "../../define.h" // common definitions of C and ASM #include "hardware/regs/sio.h" // registers of hardware divider #include "hardware/regs/addressmap.h" // SIO base address diff --git a/src/render/vga_tilepersp2.S b/src/render/rp2040/vga_tilepersp2.S similarity index 96% rename from src/render/vga_tilepersp2.S rename to src/render/rp2040/vga_tilepersp2.S index b41a5db..a8cd1aa 100644 --- a/src/render/vga_tilepersp2.S +++ b/src/render/rp2040/vga_tilepersp2.S @@ -11,7 +11,7 @@ // wb ... LOW8=number of bits of tile map width, HIGH8=number of bits of tile map height // wrapy ... segment height -#include "../define.h" // common definitions of C and ASM +#include "../../define.h" // common definitions of C and ASM #include "hardware/regs/sio.h" // registers of hardware divider #include "hardware/regs/addressmap.h" // SIO base address diff --git a/src/render/vga_tilepersp3.S b/src/render/rp2040/vga_tilepersp3.S similarity index 96% rename from src/render/vga_tilepersp3.S rename to src/render/rp2040/vga_tilepersp3.S index 2a1af18..0ae045b 100644 --- a/src/render/vga_tilepersp3.S +++ b/src/render/rp2040/vga_tilepersp3.S @@ -11,7 +11,7 @@ // wb ... LOW8=number of bits of tile map width, HIGH8=number of bits of tile map height // wrapy ... segment height -#include "../define.h" // common definitions of C and ASM +#include "../../define.h" // common definitions of C and ASM #include "hardware/regs/sio.h" // registers of hardware divider #include "hardware/regs/addressmap.h" // SIO base address diff --git a/src/render/vga_tilepersp4.S b/src/render/rp2040/vga_tilepersp4.S similarity index 96% rename from src/render/vga_tilepersp4.S rename to src/render/rp2040/vga_tilepersp4.S index 1872f36..3a5b800 100644 --- a/src/render/vga_tilepersp4.S +++ b/src/render/rp2040/vga_tilepersp4.S @@ -11,7 +11,7 @@ // wb ... LOW8=number of bits of tile map width, HIGH8=number of bits of tile map height // wrapy ... segment height -#include "../define.h" // common definitions of C and ASM +#include "../../define.h" // common definitions of C and ASM #include "hardware/regs/sio.h" // registers of hardware divider #include "hardware/regs/addressmap.h" // SIO base address diff --git a/src/render/vga_tilepersp.rp2350.S b/src/render/rp2350/vga_tilepersp.S similarity index 96% rename from src/render/vga_tilepersp.rp2350.S rename to src/render/rp2350/vga_tilepersp.S index a58e20b..51728a1 100644 --- a/src/render/vga_tilepersp.rp2350.S +++ b/src/render/rp2350/vga_tilepersp.S @@ -11,7 +11,7 @@ // wb ... LOW8=number of bits of tile map width, HIGH8=number of bits of tile map height // wrapy ... segment height -#include "../define.h" // common definitions of C and ASM +#include "../../define.h" // common definitions of C and ASM #include "hardware/regs/sio.h" // registers of hardware divider #include "hardware/regs/addressmap.h" // SIO base address diff --git a/src/render/vga_tilepersp15.rp2350.S b/src/render/rp2350/vga_tilepersp15.S similarity index 96% rename from src/render/vga_tilepersp15.rp2350.S rename to src/render/rp2350/vga_tilepersp15.S index 6fa4d0e..3e5fb79 100644 --- a/src/render/vga_tilepersp15.rp2350.S +++ b/src/render/rp2350/vga_tilepersp15.S @@ -11,7 +11,7 @@ // wb ... LOW8=number of bits of tile map width, HIGH8=number of bits of tile map height // wrapy ... segment height -#include "../define.h" // common definitions of C and ASM +#include "../../define.h" // common definitions of C and ASM #include "hardware/regs/sio.h" // registers of hardware divider #include "hardware/regs/addressmap.h" // SIO base address diff --git a/src/render/vga_tilepersp2.rp2350.S b/src/render/rp2350/vga_tilepersp2.S similarity index 96% rename from src/render/vga_tilepersp2.rp2350.S rename to src/render/rp2350/vga_tilepersp2.S index 5ffdba4..96b1854 100644 --- a/src/render/vga_tilepersp2.rp2350.S +++ b/src/render/rp2350/vga_tilepersp2.S @@ -11,7 +11,7 @@ // wb ... LOW8=number of bits of tile map width, HIGH8=number of bits of tile map height // wrapy ... segment height -#include "../define.h" // common definitions of C and ASM +#include "../../define.h" // common definitions of C and ASM #include "hardware/regs/sio.h" // registers of hardware divider #include "hardware/regs/addressmap.h" // SIO base address diff --git a/src/render/vga_tilepersp3.rp2350.S b/src/render/rp2350/vga_tilepersp3.S similarity index 96% rename from src/render/vga_tilepersp3.rp2350.S rename to src/render/rp2350/vga_tilepersp3.S index 1959cda..0b3fd62 100644 --- a/src/render/vga_tilepersp3.rp2350.S +++ b/src/render/rp2350/vga_tilepersp3.S @@ -11,7 +11,7 @@ // wb ... LOW8=number of bits of tile map width, HIGH8=number of bits of tile map height // wrapy ... segment height -#include "../define.h" // common definitions of C and ASM +#include "../../define.h" // common definitions of C and ASM #include "hardware/regs/sio.h" // registers of hardware divider #include "hardware/regs/addressmap.h" // SIO base address diff --git a/src/render/vga_tilepersp4.rp2350.S b/src/render/rp2350/vga_tilepersp4.S similarity index 96% rename from src/render/vga_tilepersp4.rp2350.S rename to src/render/rp2350/vga_tilepersp4.S index 4f9a0c6..6fc7366 100644 --- a/src/render/vga_tilepersp4.rp2350.S +++ b/src/render/rp2350/vga_tilepersp4.S @@ -11,7 +11,7 @@ // wb ... LOW8=number of bits of tile map width, HIGH8=number of bits of tile map height // wrapy ... segment height -#include "../define.h" // common definitions of C and ASM +#include "../../define.h" // common definitions of C and ASM #include "hardware/regs/sio.h" // registers of hardware divider #include "hardware/regs/addressmap.h" // SIO base address