aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorJohn "Lameguy" Wilbert Villamor <lameguy64@gmail.com>2021-11-22 14:40:59 +0800
committerGitHub <noreply@github.com>2021-11-22 14:40:59 +0800
commit45123e1b968d1883fed9b8526157ce2c4bffc4a7 (patch)
treed20c80fbd4f5a5d1d3972669625972cea6b3684d /examples
parent538f28cfbbbb8163ab8a96de77d6887123856c81 (diff)
parent9b00e5f7ff163a8fc6f341dbf237d90c61dadddc (diff)
downloadpsn00bsdk-45123e1b968d1883fed9b8526157ce2c4bffc4a7.tar.gz
Merge pull request #43 from spicyjpeg/cmake
Even more CMake fixes, submodules, pads example
Diffstat (limited to 'examples')
-rw-r--r--examples/CMakeLists.txt24
-rw-r--r--examples/beginner/cppdemo/CMakeLists.txt4
-rw-r--r--examples/beginner/cppdemo/main.cpp2
-rw-r--r--examples/beginner/hello/CMakeLists.txt4
-rw-r--r--examples/cdrom/cdbrowse/CMakeLists.txt4
-rw-r--r--examples/cdrom/cdbrowse/main.c1
-rw-r--r--examples/cdrom/cdxa/CMakeLists.txt4
-rw-r--r--examples/cdrom/cdxa/main.c1
-rw-r--r--examples/demos/n00bdemo/CMakeLists.txt4
-rw-r--r--examples/demos/n00bdemo/logo.c1
-rw-r--r--examples/demos/n00bdemo/main.c9
-rw-r--r--examples/graphics/balls/CMakeLists.txt4
-rw-r--r--examples/graphics/billboard/CMakeLists.txt4
-rw-r--r--examples/graphics/fpscam/CMakeLists.txt6
-rw-r--r--examples/graphics/gte/CMakeLists.txt6
-rw-r--r--examples/graphics/hdtv/CMakeLists.txt4
-rw-r--r--examples/graphics/render2tex/CMakeLists.txt4
-rw-r--r--examples/graphics/rgb24/CMakeLists.txt4
-rw-r--r--examples/io/pads/CMakeLists.txt22
-rw-r--r--examples/io/pads/main.c279
-rw-r--r--examples/io/pads/spi.c218
-rw-r--r--examples/io/pads/spi.h61
-rw-r--r--examples/lowlevel/cartrom/CMakeLists.txt36
-rw-r--r--examples/lowlevel/cartrom/makefile14
-rw-r--r--examples/sound/vagsample/CMakeLists.txt4
-rw-r--r--examples/system/childexec/CMakeLists.txt4
-rw-r--r--examples/system/console/CMakeLists.txt4
-rw-r--r--examples/system/dynlink/CMakeLists.txt4
-rw-r--r--examples/system/dynlink/display.c8
-rw-r--r--examples/system/dynlink/library/balls.c2
-rw-r--r--examples/system/dynlink/library/cube.c2
-rw-r--r--examples/system/dynlink/library/dll_common.h1
-rw-r--r--examples/system/dynlink/main.c3
-rw-r--r--examples/system/timer/CMakeLists.txt4
-rw-r--r--examples/system/tty/CMakeLists.txt4
35 files changed, 692 insertions, 68 deletions
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 7cd7e98..15212c8 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,7 +1,7 @@
# PSn00bSDK examples build script
# (C) 2021 spicyjpeg - MPL licensed
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.20)
project(
PSn00bSDK-examples
@@ -10,16 +10,32 @@ project(
HOMEPAGE_URL "http://lameguy64.net/?page=psn00bsdk"
)
+include(GNUInstallDirs)
+
+# Find all subdirectories that contain a CMake build script. This includes the
+# top-level examples directory and this file as well, however we're going to
+# skip it.
file(
GLOB_RECURSE _examples
+ RELATIVE ${PROJECT_SOURCE_DIR}
${PROJECT_SOURCE_DIR}/CMakeLists.txt
)
foreach(_script IN LISTS _examples)
- cmake_path(GET _script PARENT_PATH _dir)
- if(_dir STREQUAL PROJECT_SOURCE_DIR)
+ if(_script STREQUAL "CMakeLists.txt")
continue()
endif()
- add_subdirectory(${_dir})
+ # CMake provides no way to override the install prefix of a subdirectory,
+ # as it "imports" its targets into the main project rather than treating it
+ # as a separate project. However, as the example subdirectories use
+ # install(... TYPE BIN) to install executables, it is possible to override
+ # CMAKE_INSTALL_BINDIR temporarily to place them in any directory within
+ # the install prefix. This is a hack, but it allows us to preserve the
+ # examples' folder hierarchy in the installation directory (it is already
+ # preserved by CMake in the build tree!) with minimal effort.
+ cmake_path(GET _script PARENT_PATH _dir)
+ cmake_path(GET _dir PARENT_PATH CMAKE_INSTALL_BINDIR)
+
+ add_subdirectory(${PROJECT_SOURCE_DIR}/${_dir})
endforeach()
diff --git a/examples/beginner/cppdemo/CMakeLists.txt b/examples/beginner/cppdemo/CMakeLists.txt
index 83f0f0a..becf464 100644
--- a/examples/beginner/cppdemo/CMakeLists.txt
+++ b/examples/beginner/cppdemo/CMakeLists.txt
@@ -1,7 +1,7 @@
# PSn00bSDK example CMake script
# (C) 2021 spicyjpeg - MPL licensed
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.20)
if(NOT DEFINED CMAKE_TOOLCHAIN_FILE AND DEFINED ENV{PSN00BSDK_LIBS})
set(CMAKE_TOOLCHAIN_FILE $ENV{PSN00BSDK_LIBS}/cmake/sdk.cmake)
@@ -19,4 +19,4 @@ file(GLOB _sources *.cpp)
psn00bsdk_add_executable(cppdemo STATIC ${_sources})
#psn00bsdk_add_cd_image(cppdemo_iso cppdemo iso.xml DEPENDS cppdemo)
-install(FILES ${PROJECT_BINARY_DIR}/cppdemo.exe DESTINATION .)
+install(FILES ${PROJECT_BINARY_DIR}/cppdemo.exe TYPE BIN)
diff --git a/examples/beginner/cppdemo/main.cpp b/examples/beginner/cppdemo/main.cpp
index 58bfcda..fd2e3a8 100644
--- a/examples/beginner/cppdemo/main.cpp
+++ b/examples/beginner/cppdemo/main.cpp
@@ -13,7 +13,7 @@
#include <sys/types.h>
#include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
#include <psxgte.h>
#include <psxgpu.h>
diff --git a/examples/beginner/hello/CMakeLists.txt b/examples/beginner/hello/CMakeLists.txt
index 40e30b0..7fb7c22 100644
--- a/examples/beginner/hello/CMakeLists.txt
+++ b/examples/beginner/hello/CMakeLists.txt
@@ -1,7 +1,7 @@
# PSn00bSDK example CMake script
# (C) 2021 spicyjpeg - MPL licensed
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.20)
if(NOT DEFINED CMAKE_TOOLCHAIN_FILE AND DEFINED ENV{PSN00BSDK_LIBS})
set(CMAKE_TOOLCHAIN_FILE $ENV{PSN00BSDK_LIBS}/cmake/sdk.cmake)
@@ -19,4 +19,4 @@ file(GLOB _sources *.c)
psn00bsdk_add_executable(hello STATIC ${_sources})
#psn00bsdk_add_cd_image(hello_iso hello iso.xml DEPENDS hello)
-install(FILES ${PROJECT_BINARY_DIR}/hello.exe DESTINATION .)
+install(FILES ${PROJECT_BINARY_DIR}/hello.exe TYPE BIN)
diff --git a/examples/cdrom/cdbrowse/CMakeLists.txt b/examples/cdrom/cdbrowse/CMakeLists.txt
index 6eb4cbb..e5ec759 100644
--- a/examples/cdrom/cdbrowse/CMakeLists.txt
+++ b/examples/cdrom/cdbrowse/CMakeLists.txt
@@ -1,7 +1,7 @@
# PSn00bSDK example CMake script
# (C) 2021 spicyjpeg - MPL licensed
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.20)
if(NOT DEFINED CMAKE_TOOLCHAIN_FILE AND DEFINED ENV{PSN00BSDK_LIBS})
set(CMAKE_TOOLCHAIN_FILE $ENV{PSN00BSDK_LIBS}/cmake/sdk.cmake)
@@ -23,5 +23,5 @@ install(
FILES
${PROJECT_BINARY_DIR}/cdbrowse.bin
${PROJECT_BINARY_DIR}/cdbrowse.cue
- DESTINATION .
+ TYPE BIN
)
diff --git a/examples/cdrom/cdbrowse/main.c b/examples/cdrom/cdbrowse/main.c
index ead2df0..9a1dbd0 100644
--- a/examples/cdrom/cdbrowse/main.c
+++ b/examples/cdrom/cdbrowse/main.c
@@ -67,7 +67,6 @@
#include <psxspu.h>
#include <psxcd.h>
-#include <malloc.h>
#include "ball16c.h"
diff --git a/examples/cdrom/cdxa/CMakeLists.txt b/examples/cdrom/cdxa/CMakeLists.txt
index b0c8d90..18dcc69 100644
--- a/examples/cdrom/cdxa/CMakeLists.txt
+++ b/examples/cdrom/cdxa/CMakeLists.txt
@@ -1,7 +1,7 @@
# PSn00bSDK example CMake script
# (C) 2021 spicyjpeg - MPL licensed
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.20)
if(NOT DEFINED CMAKE_TOOLCHAIN_FILE AND DEFINED ENV{PSN00BSDK_LIBS})
set(CMAKE_TOOLCHAIN_FILE $ENV{PSN00BSDK_LIBS}/cmake/sdk.cmake)
@@ -25,5 +25,5 @@ install(
#${PROJECT_BINARY_DIR}/cdxa.bin
#${PROJECT_BINARY_DIR}/cdxa.cue
${PROJECT_BINARY_DIR}/cdxa.exe
- DESTINATION .
+ TYPE BIN
)
diff --git a/examples/cdrom/cdxa/main.c b/examples/cdrom/cdxa/main.c
index 16f1c82..5f11d8d 100644
--- a/examples/cdrom/cdxa/main.c
+++ b/examples/cdrom/cdxa/main.c
@@ -129,7 +129,6 @@
#include <psxspu.h>
#include <psxcd.h>
-#include <malloc.h>
#include "ball16c.h"
diff --git a/examples/demos/n00bdemo/CMakeLists.txt b/examples/demos/n00bdemo/CMakeLists.txt
index 0b51beb..c62c4ef 100644
--- a/examples/demos/n00bdemo/CMakeLists.txt
+++ b/examples/demos/n00bdemo/CMakeLists.txt
@@ -1,7 +1,7 @@
# PSn00bSDK example CMake script
# (C) 2021 spicyjpeg - MPL licensed
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.20)
if(NOT DEFINED CMAKE_TOOLCHAIN_FILE AND DEFINED ENV{PSN00BSDK_LIBS})
set(CMAKE_TOOLCHAIN_FILE $ENV{PSN00BSDK_LIBS}/cmake/sdk.cmake)
@@ -47,4 +47,4 @@ target_include_directories(n00bdemo PRIVATE ${PROJECT_SOURCE_DIR})
add_custom_target(n00bdemo_data DEPENDS data.lzp)
add_dependencies(n00bdemo n00bdemo_data)
-install(FILES ${PROJECT_BINARY_DIR}/n00bdemo.exe DESTINATION .)
+install(FILES ${PROJECT_BINARY_DIR}/n00bdemo.exe TYPE BIN)
diff --git a/examples/demos/n00bdemo/logo.c b/examples/demos/n00bdemo/logo.c
index d10b5b4..40160e7 100644
--- a/examples/demos/n00bdemo/logo.c
+++ b/examples/demos/n00bdemo/logo.c
@@ -5,7 +5,6 @@
#include <psxgte.h>
#include <psxgpu.h>
#include <inline_c.h>
-#include "malloc.h"
#include "smd.h"
#include <lzp/lzp.h>
diff --git a/examples/demos/n00bdemo/main.c b/examples/demos/n00bdemo/main.c
index ba21d88..d2fe317 100644
--- a/examples/demos/n00bdemo/main.c
+++ b/examples/demos/n00bdemo/main.c
@@ -32,7 +32,6 @@
#include <lzp/lzp.h>
#include <lzp/lzqlp.h>
-#include "malloc.h"
#include "smd.h"
#include "data.h"
#include "disp.h"
@@ -617,7 +616,13 @@ void transition() {
if( comp >= 16 )
break;
-
+
+ // FIXME: for some reason this loop glitches out and hangs indefinitely
+ // in no$psx, *unless* there's a function somewhere that gets called
+ // with a pointer/string as first argument... wtf. It works fine in
+ // other emulators. If you are reading this, please help and enlighten
+ // me. -- spicyjpeg
+ puts(".");
}
DrawSync(0);
diff --git a/examples/graphics/balls/CMakeLists.txt b/examples/graphics/balls/CMakeLists.txt
index b063425..5886484 100644
--- a/examples/graphics/balls/CMakeLists.txt
+++ b/examples/graphics/balls/CMakeLists.txt
@@ -1,7 +1,7 @@
# PSn00bSDK example CMake script
# (C) 2021 spicyjpeg - MPL licensed
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.20)
if(NOT DEFINED CMAKE_TOOLCHAIN_FILE AND DEFINED ENV{PSN00BSDK_LIBS})
set(CMAKE_TOOLCHAIN_FILE $ENV{PSN00BSDK_LIBS}/cmake/sdk.cmake)
@@ -19,4 +19,4 @@ file(GLOB _sources *.c)
psn00bsdk_add_executable(balls STATIC ${_sources})
#psn00bsdk_add_cd_image(balls_iso balls iso.xml DEPENDS balls)
-install(FILES ${PROJECT_BINARY_DIR}/balls.exe DESTINATION .)
+install(FILES ${PROJECT_BINARY_DIR}/balls.exe TYPE BIN)
diff --git a/examples/graphics/billboard/CMakeLists.txt b/examples/graphics/billboard/CMakeLists.txt
index bf73297..8cd31a9 100644
--- a/examples/graphics/billboard/CMakeLists.txt
+++ b/examples/graphics/billboard/CMakeLists.txt
@@ -1,7 +1,7 @@
# PSn00bSDK example CMake script
# (C) 2021 spicyjpeg - MPL licensed
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.20)
if(NOT DEFINED CMAKE_TOOLCHAIN_FILE AND DEFINED ENV{PSN00BSDK_LIBS})
set(CMAKE_TOOLCHAIN_FILE $ENV{PSN00BSDK_LIBS}/cmake/sdk.cmake)
@@ -25,4 +25,4 @@ psn00bsdk_add_executable(
)
#psn00bsdk_add_cd_image(billboard_iso billboard iso.xml DEPENDS billboard)
-install(FILES ${PROJECT_BINARY_DIR}/billboard.exe DESTINATION .)
+install(FILES ${PROJECT_BINARY_DIR}/billboard.exe TYPE BIN)
diff --git a/examples/graphics/fpscam/CMakeLists.txt b/examples/graphics/fpscam/CMakeLists.txt
index 8fa66f2..791f6c2 100644
--- a/examples/graphics/fpscam/CMakeLists.txt
+++ b/examples/graphics/fpscam/CMakeLists.txt
@@ -1,14 +1,14 @@
# PSn00bSDK example CMake script
# (C) 2021 spicyjpeg - MPL licensed
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.20)
if(NOT DEFINED CMAKE_TOOLCHAIN_FILE AND DEFINED ENV{PSN00BSDK_LIBS})
set(CMAKE_TOOLCHAIN_FILE $ENV{PSN00BSDK_LIBS}/cmake/sdk.cmake)
endif()
project(
- hello
+ fpscam
LANGUAGES C
VERSION 1.0.0
DESCRIPTION "PSn00bSDK 3D camera controls example"
@@ -19,4 +19,4 @@ file(GLOB _sources *.c)
psn00bsdk_add_executable(fpscam STATIC ${_sources})
#psn00bsdk_add_cd_image(fpscam_iso fpscam iso.xml DEPENDS fpscam)
-install(FILES ${PROJECT_BINARY_DIR}/fpscam.exe DESTINATION .)
+install(FILES ${PROJECT_BINARY_DIR}/fpscam.exe TYPE BIN)
diff --git a/examples/graphics/gte/CMakeLists.txt b/examples/graphics/gte/CMakeLists.txt
index 3cdf2ff..85b2942 100644
--- a/examples/graphics/gte/CMakeLists.txt
+++ b/examples/graphics/gte/CMakeLists.txt
@@ -1,14 +1,14 @@
# PSn00bSDK example CMake script
# (C) 2021 spicyjpeg - MPL licensed
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.20)
if(NOT DEFINED CMAKE_TOOLCHAIN_FILE AND DEFINED ENV{PSN00BSDK_LIBS})
set(CMAKE_TOOLCHAIN_FILE $ENV{PSN00BSDK_LIBS}/cmake/sdk.cmake)
endif()
project(
- hello
+ gte
LANGUAGES C
VERSION 1.0.0
DESCRIPTION "PSn00bSDK GTE 3D cube example"
@@ -19,4 +19,4 @@ file(GLOB _sources *.c)
psn00bsdk_add_executable(gte STATIC ${_sources})
#psn00bsdk_add_cd_image(gte_iso gte iso.xml DEPENDS gte)
-install(FILES ${PROJECT_BINARY_DIR}/gte.exe DESTINATION .)
+install(FILES ${PROJECT_BINARY_DIR}/gte.exe TYPE BIN)
diff --git a/examples/graphics/hdtv/CMakeLists.txt b/examples/graphics/hdtv/CMakeLists.txt
index 98a0b3f..f92faeb 100644
--- a/examples/graphics/hdtv/CMakeLists.txt
+++ b/examples/graphics/hdtv/CMakeLists.txt
@@ -1,7 +1,7 @@
# PSn00bSDK example CMake script
# (C) 2021 spicyjpeg - MPL licensed
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.20)
if(NOT DEFINED CMAKE_TOOLCHAIN_FILE AND DEFINED ENV{PSN00BSDK_LIBS})
set(CMAKE_TOOLCHAIN_FILE $ENV{PSN00BSDK_LIBS}/cmake/sdk.cmake)
@@ -19,4 +19,4 @@ file(GLOB _sources *.c)
psn00bsdk_add_executable(hdtv STATIC ${_sources})
#psn00bsdk_add_cd_image(hdtv_iso hdtv iso.xml DEPENDS hdtv)
-install(FILES ${PROJECT_BINARY_DIR}/hdtv.exe DESTINATION .)
+install(FILES ${PROJECT_BINARY_DIR}/hdtv.exe TYPE BIN)
diff --git a/examples/graphics/render2tex/CMakeLists.txt b/examples/graphics/render2tex/CMakeLists.txt
index 42a063b..360840d 100644
--- a/examples/graphics/render2tex/CMakeLists.txt
+++ b/examples/graphics/render2tex/CMakeLists.txt
@@ -1,7 +1,7 @@
# PSn00bSDK example CMake script
# (C) 2021 spicyjpeg - MPL licensed
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.20)
if(NOT DEFINED CMAKE_TOOLCHAIN_FILE AND DEFINED ENV{PSN00BSDK_LIBS})
set(CMAKE_TOOLCHAIN_FILE $ENV{PSN00BSDK_LIBS}/cmake/sdk.cmake)
@@ -25,4 +25,4 @@ psn00bsdk_add_executable(
)
#psn00bsdk_add_cd_image(render2tex_iso render2tex iso.xml DEPENDS render2tex)
-install(FILES ${PROJECT_BINARY_DIR}/render2tex.exe DESTINATION .)
+install(FILES ${PROJECT_BINARY_DIR}/render2tex.exe TYPE BIN)
diff --git a/examples/graphics/rgb24/CMakeLists.txt b/examples/graphics/rgb24/CMakeLists.txt
index c66ae69..bf8a8fa 100644
--- a/examples/graphics/rgb24/CMakeLists.txt
+++ b/examples/graphics/rgb24/CMakeLists.txt
@@ -1,7 +1,7 @@
# PSn00bSDK example CMake script
# (C) 2021 spicyjpeg - MPL licensed
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.20)
if(NOT DEFINED CMAKE_TOOLCHAIN_FILE AND DEFINED ENV{PSN00BSDK_LIBS})
set(CMAKE_TOOLCHAIN_FILE $ENV{PSN00BSDK_LIBS}/cmake/sdk.cmake)
@@ -25,4 +25,4 @@ psn00bsdk_add_executable(
)
#psn00bsdk_add_cd_image(rgb24_iso rgb24 iso.xml DEPENDS rgb24)
-install(FILES ${PROJECT_BINARY_DIR}/rgb24.exe DESTINATION .)
+install(FILES ${PROJECT_BINARY_DIR}/rgb24.exe TYPE BIN)
diff --git a/examples/io/pads/CMakeLists.txt b/examples/io/pads/CMakeLists.txt
new file mode 100644
index 0000000..5bd7f5d
--- /dev/null
+++ b/examples/io/pads/CMakeLists.txt
@@ -0,0 +1,22 @@
+# PSn00bSDK example CMake script
+# (C) 2021 spicyjpeg - MPL licensed
+
+cmake_minimum_required(VERSION 3.20)
+
+if(NOT DEFINED CMAKE_TOOLCHAIN_FILE AND DEFINED ENV{PSN00BSDK_LIBS})
+ set(CMAKE_TOOLCHAIN_FILE $ENV{PSN00BSDK_LIBS}/cmake/sdk.cmake)
+endif()
+
+project(
+ pads
+ LANGUAGES C ASM
+ VERSION 1.0.0
+ DESCRIPTION "PSn00bSDK controller polling example"
+ HOMEPAGE_URL "http://lameguy64.net/?page=psn00bsdk"
+)
+
+file(GLOB _sources *.c *.s)
+psn00bsdk_add_executable(pads STATIC ${_sources})
+#psn00bsdk_add_cd_image(pads_iso pads iso.xml DEPENDS pads)
+
+install(FILES ${PROJECT_BINARY_DIR}/pads.exe TYPE BIN)
diff --git a/examples/io/pads/main.c b/examples/io/pads/main.c
new file mode 100644
index 0000000..92beb1c
--- /dev/null
+++ b/examples/io/pads/main.c
@@ -0,0 +1,279 @@
+/*
+ * PSn00bSDK controller polling example
+ * (C) 2021 spicyjpeg - MPL licensed
+ *
+ * This example shows how to poll controllers at high speeds (250 Hz) by using
+ * timer interrupts and communicating with devices on the SPI controller bus
+ * manually rather than relying on the BIOS pad driver, which is limited to
+ * 50/60 Hz and does not support custom commands. The example also demonstrates
+ * using configuration mode commands to force DualShock pads into analog mode
+ * and enable button pressure sensing on DualShock 2 (PS2) controllers.
+ *
+ * See spi.c for details on how the low-level SPI communication driver works.
+ * The DualShock handshaking logic is implemented here (see poll_cb() and
+ * dualshock_init_cb()). There is no support for memory cards in this example,
+ * but the code in spi.c can be used to read/write sectors on a memory card and
+ * combined with a higher-level filesystem driver for full support.
+ *
+ * IMPORTANT: this example hasn't yet been tested on real hardware and/or with
+ * unofficial controllers, which might behave differently at higher poll rates.
+ * Also keep in mind that many emulators emulate controllers and memory cards
+ * inaccurately. It is thus recommended to test controller I/O code extensively
+ * and handle as many edge cases as possible (e.g. partial but valid responses,
+ * zerofilled responses, slow replies) for maximum compatibility.
+ */
+
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <psxetc.h>
+#include <psxgpu.h>
+#include <psxpad.h>
+
+#include "spi.h"
+
+static const char *const PAD_TYPEIDS[] = {
+ "[UNKNOWN]",
+ "MOUSE",
+ "NEGCON",
+ "IRQ10_GUN",
+ "DIGITAL",
+ "ANALOG_STICK",
+ "GUNCON",
+ "ANALOG",
+ "MULTITAP",
+ "[UNKNOWN]",
+ "[UNKNOWN]",
+ "[UNKNOWN]",
+ "[UNKNOWN]",
+ "[UNKNOWN]",
+ "JOGCON",
+ "CONFIG_MODE"
+};
+
+/* Display/GPU context utilities */
+
+#define SCREEN_XRES 320
+#define SCREEN_YRES 240
+
+#define BGCOLOR_R 48
+#define BGCOLOR_G 24
+#define BGCOLOR_B 0
+
+typedef struct {
+ DISPENV disp;
+ DRAWENV draw;
+} DB;
+
+typedef struct {
+ DB db[2];
+ uint32_t db_active;
+} CONTEXT;
+
+void init_context(CONTEXT *ctx) {
+ DB *db;
+
+ ResetGraph(0);
+ ctx->db_active = 0;
+
+ db = &(ctx->db[0]);
+ SetDefDispEnv(&(db->disp), 0, 0, SCREEN_XRES, SCREEN_YRES);
+ SetDefDrawEnv(&(db->draw), SCREEN_XRES, 0, SCREEN_XRES, SCREEN_YRES);
+ setRGB0(&(db->draw), BGCOLOR_R, BGCOLOR_G, BGCOLOR_B);
+ db->draw.isbg = 1;
+ db->draw.dtd = 1;
+
+ db = &(ctx->db[1]);
+ SetDefDispEnv(&(db->disp), SCREEN_XRES, 0, SCREEN_XRES, SCREEN_YRES);
+ SetDefDrawEnv(&(db->draw), 0, 0, SCREEN_XRES, SCREEN_YRES);
+ setRGB0(&(db->draw), BGCOLOR_R, BGCOLOR_G, BGCOLOR_B);
+ db->draw.isbg = 1;
+ db->draw.dtd = 1;
+
+ PutDrawEnv(&(db->draw));
+ //PutDispEnv(&(db->disp));
+
+ // Create a text stream at the top of the screen.
+ FntLoad(960, 0);
+ FntOpen(8, 16, 304, 208, 2, 512);
+}
+
+void display(CONTEXT *ctx) {
+ DB *db;
+
+ DrawSync(0);
+ VSync(0);
+ ctx->db_active ^= 1;
+
+ db = &(ctx->db[ctx->db_active]);
+ PutDrawEnv(&(db->draw));
+ PutDispEnv(&(db->disp));
+ SetDispMask(1);
+}
+
+/* Pad buffers and callback */
+
+static volatile uint8_t pad_buff[2][34];
+static volatile size_t pad_buff_len[2];
+static volatile uint32_t pad_digital_only[2] = { 0, 0 };
+
+// Just a wrapper around spi_new_request(). This does not send the command
+// immediately but adds it to the driver's request queue.
+void send_pad_cmd(
+ uint32_t port,
+ PAD_COMMAND cmd,
+ uint8_t arg1,
+ uint8_t arg2,
+ SPICALLBACK callback
+) {
+ SPIREQUEST *req = spi_new_request();
+
+ req->len = 9;
+ req->port = port;
+ req->callback = callback;
+ req->pad_req.addr = 0x01;
+ req->pad_req.cmd = cmd;
+ req->pad_req.tap_mode = 0x00;
+ req->pad_req.motor_r = arg1;
+ req->pad_req.motor_l = arg2;
+
+ // The padding bytes must be 0xff when unlocking vibration motors.
+ memset(
+ req->pad_req.dummy,
+ (cmd == PAD_CMD_REQUEST_CONFIG) ? 0xff : 0x00,
+ 4
+ );
+}
+
+// This callback determines whether a pad that identified as digital is
+// actually a DualShock in digital mode by checking if it started identifying
+// as CONFIG_MODE after receiving a configuration command.
+void dualshock_init_cb(uint32_t port, const volatile uint8_t *buff, size_t rx_len) {
+ PADTYPE *pad = (PADTYPE *) buff;
+
+ if (
+ (rx_len < 2) ||
+ (pad->raw.prefix != 0x5a) ||
+ (pad->raw.type != PAD_ID_CONFIG_MODE)
+ ) {
+ printf("no, pad is digital-only (len = %d)\n", rx_len);
+
+ pad_digital_only[port] = 1;
+ return;
+ }
+
+ printf("yes, forcing analog mode (len = %d)\n", rx_len);
+
+ // Issue further commands to force analog mode on, unlock rumble (not used
+ // in this example) and enable longer responses containing button pressure
+ // readings.
+ // TODO: find out if passing 0x03 instead of 0x02 in PAD_CMD_SET_ANALOG
+ // locks the analog button, as emulated by DuckStation...
+ // https://gist.github.com/scanlime/5042071
+ send_pad_cmd(port, PAD_CMD_SET_ANALOG, 0x01, 0x02, 0);
+ send_pad_cmd(port, PAD_CMD_INIT_PRESSURE, 0x00, 0x00, 0); // Ignored by DualShock 1
+ send_pad_cmd(port, PAD_CMD_REQUEST_CONFIG, 0x00, 0x01, 0);
+ send_pad_cmd(port, PAD_CMD_RESPONSE_CONFIG, 0xff, 0xff, 0); // Ignored by DualShock 1
+ send_pad_cmd(port, PAD_CMD_CONFIG_MODE, 0x00, 0x00, 0);
+}
+
+// This function is called by the pad timer ISR each time a pad is polled and a
+// response (even an invalid/incomplete one) is received.
+void poll_cb(uint32_t port, const volatile uint8_t *buff, size_t rx_len) {
+ // Copy the response to a persistent buffer so it can be accessed from the
+ // main loop and displayed on screen.
+ pad_buff_len[port] = rx_len;
+ if (rx_len)
+ memcpy((void *) pad_buff[port], (void *) buff, rx_len);
+
+ PADTYPE *pad = (PADTYPE *) buff;
+
+ // If this pad identifies as a digital pad and hasn't been flagged as a
+ // digital-only pad already, attempt to put it into analog mode by entering
+ // configuration mode. It this fails, it will be flagged as digital-only.
+ // The digital-only flag is reset when the controller is unplugged or stops
+ // returning digital pad responses.
+ if (
+ rx_len &&
+ (pad->raw.prefix == 0x5a) &&
+ (pad->raw.type == PAD_ID_DIGITAL)
+ ) {
+ if (!pad_digital_only[port]) {
+ printf("Detecting if pad %d supports config mode... ", port + 1);
+
+ // The pad only identifies as CONFIG_MODE after at least another
+ // command is sent.
+ send_pad_cmd(port, PAD_CMD_CONFIG_MODE, 0x01, 0x00, 0);
+ send_pad_cmd(port, PAD_CMD_CONFIG_MODE, 0x01, 0x00, &dualshock_init_cb);
+ }
+
+ } else {
+ //printf("Clearing digital-only flag for pad %d\n", port + 1);
+
+ pad_digital_only[port] = 0;
+ }
+}
+
+/* Main */
+
+static CONTEXT ctx;
+
+int main(int argc, const char* argv[]) {
+ init_context(&ctx);
+ spi_init(&poll_cb);
+
+ uint32_t counter = 0;
+
+ while (1) {
+ FntPrint(-1, "COUNTER=%d", counter++);
+
+ for (uint32_t port = 0; port < 2; port++) {
+ // TODO.
+ if (!pad_buff_len[port]) {
+ FntPrint(-1, "\n\nPORT %d: NO DEVICE FOUND\n", port + 1);
+ if ((counter % 64) < 32)
+ FntPrint(-1, " CONNECT PAD NOW...");
+
+ continue;
+ }
+
+ PADTYPE *pad = (PADTYPE *) pad_buff[port];
+ PAD_TYPEID type = pad->raw.type;
+
+ // According to nocash docs, there is a hardware bug in DualShock
+ // controllers that causes the prefix byte (normally 0x5a) to turn
+ // into 0x00 if the analog button is pressed after configuration
+ // commands have been used. Thus making sure the prefix is 0x5a
+ // isn't enough to reliably detect pads.
+ /*if ((pad->raw.prefix != 0x5a) && (type != PAD_ID_ANALOG)) {
+ FntPrint(-1, "\n\nPORT %d: INVALID RESPONSE\n", port + 1);
+ if ((counter % 64) < 32)
+ FntPrint(-1, " CHECK CONNECTION...");
+
+ continue;
+ }*/
+
+ FntPrint(
+ -1,
+ "\n\nPORT %d: %s (TYPE=%d)\n",
+ port + 1,
+ PAD_TYPEIDS[type],
+ type
+ );
+
+ // Print a hexdump of the payload returned by the pad.
+ for (uint32_t i = 0; i < pad_buff_len[port]; i++)
+ FntPrint(
+ -1,
+ ((i - 2) % 8) ? " %02x" : "\n %02x",
+ pad_buff[port][i]
+ );
+ }
+
+ FntFlush(-1);
+ display(&ctx);
+ }
+
+ return 0;
+}
diff --git a/examples/io/pads/spi.c b/examples/io/pads/spi.c
new file mode 100644
index 0000000..e01b3f6
--- /dev/null
+++ b/examples/io/pads/spi.c
@@ -0,0 +1,218 @@
+/*
+ * PSn00bSDK controller polling example (SPI driver)
+ * (C) 2021 spicyjpeg - MPL licensed
+ *
+ * This is a fairly complete timer driven, asynchronous high-speed SPI driver,
+ * with support for sending custom commands (including memory card access), in
+ * about 200 lines of code. Feel free to copypaste and adapt it.
+ *
+ * The way this works is by maintaining a queue of requests to send, each with
+ * its own payload and callback. Timer 2 is configured to trigger an IRQ at
+ * regular intervals. On each tick, the next request in the queue (or a poll
+ * command if no request is pending) is prepared and the first byte is
+ * sent; if the controller asks for more data by pulling /ACK low, the next
+ * byte is sent and the received byte is placed into a buffer. This goes on
+ * until the last byte is exchanged and the controller stops asserting /ACK.
+ *
+ * On the next tick, the response buffer is passed to the request's callback
+ * and reset, and the next request in the queue is sent. This blindly assumes
+ * it only takes one tick for a request/response to be sent, which is the case
+ * for controllers' very small packets but not for memory cards. It is
+ * advisable to call spi_set_poll_rate() to temporarily reduce poll rate while
+ * accessing memory cards.
+ *
+ * Note that this driver completely takes over the SPI bus, so you won't be
+ * able to use any BIOS functions that rely on SPI access (i.e. pad and memory
+ * card APIs) alongside it.
+ */
+
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <psxetc.h>
+#include <psxapi.h>
+#include <psxpad.h>
+
+#include "spi.h"
+
+/* Register definitions */
+
+#define F_CPU 33868800UL
+
+#define TIM_VALUE(N) *((volatile uint32_t *) 0x1f801100 + 4 * (N))
+#define TIM_CTRL(N) *((volatile uint32_t *) 0x1f801104 + 4 * (N))
+#define TIM_RELOAD(N) *((volatile uint32_t *) 0x1f801108 + 4 * (N))
+
+// IMPORTANT: even though JOY_TXRX is a 32-bit register, it should only be
+// accessed as 8-bit. Reading it as 16 or 32-bit works fine on real hardware,
+// but leads to problems in some emulators.
+#define JOY_TXRX *((volatile uint8_t *) 0x1f801040)
+#define JOY_STAT *((volatile uint16_t *) 0x1f801044)
+#define JOY_MODE *((volatile uint16_t *) 0x1f801048)
+#define JOY_CTRL *((volatile uint16_t *) 0x1f80104a)
+#define JOY_BAUD *((volatile uint16_t *) 0x1f80104e)
+
+/* Internal structures and globals */
+
+typedef struct _SPICONTEXT {
+ uint8_t tx_buff[SPI_BUFF_LEN];
+ uint8_t rx_buff[SPI_BUFF_LEN];
+ uint32_t tx_len, rx_len, port;
+ SPICALLBACK callback;
+} SPICONTEXT;
+
+static volatile SPICONTEXT ctx;
+static volatile SPIREQUEST volatile *current_req;
+static SPICALLBACK default_cb;
+
+/* Request queue management */
+
+static void prepare_poll_req(void) {
+ PADREQUEST *req = (PADREQUEST *) ctx.tx_buff;
+
+ req->addr = 0x01;
+ req->cmd = PAD_CMD_READ;
+ req->tap_mode = 0x00; // 0x01 to enable extended multitap response
+ req->motor_l = 0x00;
+ req->motor_r = 0x00;
+
+ ctx.tx_len = 4;
+ ctx.rx_len = 0;
+ ctx.port ^= 1;
+ ctx.callback = default_cb;
+}
+
+static void prepare_next_req(void) {
+ // Copy the contents of the first request in the queue into the TX buffer.
+ memcpy((void *) ctx.tx_buff, (void *) current_req->data, current_req->len);
+
+ ctx.tx_len = current_req->len;
+ ctx.rx_len = 0;
+ ctx.port = current_req->port;
+ ctx.callback = current_req->callback;
+
+ // Pop the first request from the queue by deallocating it and adjusting
+ // the pointer to the first queue item.
+ SPIREQUEST *next = current_req->next;
+
+ free((void *) current_req);
+ current_req = next;
+}
+
+/* Interrupt handlers */
+
+static void poll_timer_tick(void) {
+ // Fetch the last response byte, which wasn't followed by a pulse on /ACK,
+ // from the RX FIFO.
+ if (JOY_STAT & 0x0002)
+ ctx.rx_buff[ctx.rx_len - 1] = (uint8_t) JOY_TXRX;
+
+ if (ctx.callback)
+ ctx.callback(ctx.port, ctx.rx_buff, ctx.rx_len);
+
+ // If the request queue is empty, create a pad polling request.
+ if (current_req)
+ prepare_next_req();
+ else
+ prepare_poll_req();
+
+ // Prepare the SPI port by clearing any pending IRQ, pulling /CS high and
+ // enabling the /ACK IRQ. In order to communicate with controllers, /CS has
+ // to be driven low again for about 20 us before sending the first byte.
+ JOY_CTRL = 0x0010;
+ for (uint32_t i = 0; i < 50; i++)
+ __asm__("nop");
+
+ JOY_CTRL = 0x1003 | (ctx.port << 13);
+ for (uint32_t i = 0; i < 500; i++)
+ __asm__("nop");
+
+ // Send the first byte indicating which device to address. If the matching
+ // device is connected, it will reply by triggering the /ACK IRQ.
+ JOY_TXRX = ctx.tx_buff[0];
+}
+
+static void spi_ack_handler(void) {
+ // Wait until /ACK is pulled up by the controller before sending the next
+ // byte. According to nocash docs, this has to be done before resetting the
+ // IRQ.
+ while (JOY_STAT & 0x0080)
+ __asm__("nop");
+
+ // Keep /CS pulled low and acknowledge the IRQ (bit 4) to ensure it can be
+ // triggered again.
+ JOY_CTRL = 0x1013 | (ctx.port << 13);
+
+ if (!ctx.rx_len) {
+ // We just sent the first address byte. Obviously the response we
+ // received was read from an open bus, so the SPI port's internal FIFO
+ // must be flushed (by performing dummy reads) to ensure we are only
+ // going to read valid data from now on.
+ JOY_TXRX;
+
+ } else if (ctx.rx_len <= SPI_BUFF_LEN) {
+ // If this is not the first byte, put it in the RX buffer.
+ ctx.rx_buff[ctx.rx_len - 1] = (uint8_t) JOY_TXRX;
+ }
+
+ // Send the next byte, or a null byte if there is no more data to send and
+ // we're just reading a response.
+ ctx.rx_len++;
+ if (ctx.rx_len < ctx.tx_len)
+ JOY_TXRX = (uint32_t) ctx.tx_buff[ctx.rx_len];
+ else
+ JOY_TXRX = 0x00;
+}
+
+/* Public API */
+
+SPIREQUEST *spi_new_request(void) {
+ SPIREQUEST *req = malloc(sizeof(SPIREQUEST));
+
+ req->len = 0;
+ req->port = 0;
+ req->callback = 0;
+ req->next = 0;
+
+ // Find the last queued request by traversing the linked list and append a
+ // pointer to the new request.
+ if (!current_req) {
+ current_req = req;
+ } else {
+ volatile SPIREQUEST *volatile last = current_req;
+ while (last->next)
+ last = last->next;
+
+ last->next = req;
+ }
+
+ return req;
+}
+
+void spi_set_poll_rate(uint32_t value) {
+ TIM_CTRL(2) = 0x0258; // CLK/8 input, IRQ on reload, disable one-shot IRQ
+
+ if (value < 65)
+ TIM_RELOAD(2) = 0xffff;
+ else
+ TIM_RELOAD(2) = (F_CPU / 8) / value;
+}
+
+void spi_init(SPICALLBACK callback) {
+ // Disable the BIOS timer handler (which for some stupid reason is enabled
+ // by default, even though it does nothing) and set up custom interrupt
+ // handlers.
+ EnterCriticalSection();
+ ChangeClearRCnt(2, 0);
+ InterruptCallback(6, &poll_timer_tick);
+ InterruptCallback(7, &spi_ack_handler);
+ ExitCriticalSection();
+
+ JOY_CTRL = 0x0040; // Reset all registers
+ JOY_MODE = 0x000d; // 1x multiplier, 8 data bits, no parity
+ JOY_BAUD = 0x0088; // 250000 bps
+
+ spi_set_poll_rate(250);
+ current_req = 0;
+ default_cb = callback;
+}
diff --git a/examples/io/pads/spi.h b/examples/io/pads/spi.h
new file mode 100644
index 0000000..1c473cd
--- /dev/null
+++ b/examples/io/pads/spi.h
@@ -0,0 +1,61 @@
+/*
+ * PSn00bSDK controller polling example (SPI driver)
+ * (C) 2021 spicyjpeg - MPL licensed
+ */
+
+#ifndef __SPI_H
+#define __SPI_H
+
+#include <stdint.h>
+#include <psxpad.h>
+
+//#define SPI_BUFF_LEN 34
+#define SPI_BUFF_LEN 140
+
+/* Request structures */
+
+typedef void (*SPICALLBACK)(uint32_t port, const volatile uint8_t *buff, size_t rx_len);
+
+typedef struct _SPIREQUEST {
+ union {
+ uint8_t data[SPI_BUFF_LEN];
+ PADREQUEST pad_req;
+ MCDREQUEST mcd_req;
+ };
+ uint32_t len, port;
+ SPICALLBACK callback;
+ struct _SPIREQUEST *next;
+} SPIREQUEST;
+
+/* Public API */
+
+/**
+ * @brief Allocates a new request object and adds it to the request queue. The
+ * object must be populated afterwards by setting the length, callback and
+ * filling in the TX data buffer.
+ */
+SPIREQUEST *spi_new_request(void);
+
+/**
+ * @brief Changes the controller polling rate. The lowest supported rate is 65
+ * Hz (requests sent every 1/65th of a second, each port polled at 32.5 Hz when
+ * no request is pending).
+ *
+ * @param value
+ */
+void spi_set_poll_rate(uint32_t value);
+
+/**
+ * @brief Installs the SPI and timer 2 interrupt handlers and starts the poll
+ * timer. By default the polling rate is set to 250 Hz (125 Hz per port),
+ * however it can be changed at any time by calling spi_set_poll_rate().
+ *
+ * The provided callback (if any) is called to report the result of poll
+ * requests, which are issued automatically when no other request is in the
+ * queue. Passing NULL as callback does not disable auto-polling.
+ *
+ * @param callback
+ */
+void spi_init(SPICALLBACK callback);
+
+#endif
diff --git a/examples/lowlevel/cartrom/CMakeLists.txt b/examples/lowlevel/cartrom/CMakeLists.txt
new file mode 100644
index 0000000..3e807a3
--- /dev/null
+++ b/examples/lowlevel/cartrom/CMakeLists.txt
@@ -0,0 +1,36 @@
+# PSn00bSDK example CMake script
+# (C) 2021 spicyjpeg - MPL licensed
+
+cmake_minimum_required(VERSION 3.21)
+
+if(NOT DEFINED CMAKE_TOOLCHAIN_FILE AND DEFINED ENV{PSN00BSDK_LIBS})
+ set(CMAKE_TOOLCHAIN_FILE $ENV{PSN00BSDK_LIBS}/cmake/sdk.cmake)
+endif()
+
+project(
+ cartrom
+ LANGUAGES C ASM
+ VERSION 1.0.0
+ DESCRIPTION "PSn00bSDK expansion port ROM example"
+ HOMEPAGE_URL "http://lameguy64.net/?page=psn00bsdk"
+)
+
+file(GLOB _sources *.c *.s)
+
+# This example only uses the toolchain (without the rest of the SDK), so the
+# executable has to be created manually and converted into raw binary format
+# (for testing on emulators or flashing to a cheat cartridge).
+add_executable (cartrom ${_sources})
+target_link_libraries(cartrom psn00bsdk_static_exe)
+set_target_properties(cartrom PROPERTIES PREFIX "" SUFFIX ".elf")
+target_link_options (cartrom PRIVATE -T${PROJECT_SOURCE_DIR}/rom.ld)
+
+target_include_directories(cartrom PRIVATE ${PROJECT_SOURCE_DIR})
+
+add_custom_command(
+ TARGET cartrom POST_BUILD
+ COMMAND ${CMAKE_OBJCOPY} -O binary cartrom.elf cartrom.bin
+ BYPRODUCTS cartrom.bin
+)
+
+install(FILES ${PROJECT_BINARY_DIR}/cartrom.bin TYPE BIN)
diff --git a/examples/lowlevel/cartrom/makefile b/examples/lowlevel/cartrom/makefile
deleted file mode 100644
index 2434685..0000000
--- a/examples/lowlevel/cartrom/makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-PREFIX = mipsel-unknown-elf-
-
-CC = $(PREFIX)gcc
-AS = $(PREFIX)as
-LD = $(PREFIX)ld
-
-all: rom.o
- $(LD) --oformat binary -T rom.ld -o cartrom.rom rom.o
-
-%.o: %.s
- $(AS) -msoft-float --warn $< -o $@
-
-clean:
- rm -f rom.o cartrom.rom \ No newline at end of file
diff --git a/examples/sound/vagsample/CMakeLists.txt b/examples/sound/vagsample/CMakeLists.txt
index 1f42608..1a15d9c 100644
--- a/examples/sound/vagsample/CMakeLists.txt
+++ b/examples/sound/vagsample/CMakeLists.txt
@@ -1,7 +1,7 @@
# PSn00bSDK example CMake script
# (C) 2021 spicyjpeg - MPL licensed
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.20)
if(NOT DEFINED CMAKE_TOOLCHAIN_FILE AND DEFINED ENV{PSN00BSDK_LIBS})
set(CMAKE_TOOLCHAIN_FILE $ENV{PSN00BSDK_LIBS}/cmake/sdk.cmake)
@@ -19,4 +19,4 @@ file(GLOB _sources *.c)
psn00bsdk_add_executable(vagsample STATIC ${_sources})
#psn00bsdk_add_cd_image(vagsample_iso vagsample iso.xml DEPENDS vagsample)
-install(FILES ${PROJECT_BINARY_DIR}/vagsample.exe DESTINATION .)
+install(FILES ${PROJECT_BINARY_DIR}/vagsample.exe TYPE BIN)
diff --git a/examples/system/childexec/CMakeLists.txt b/examples/system/childexec/CMakeLists.txt
index c9983c4..88168e0 100644
--- a/examples/system/childexec/CMakeLists.txt
+++ b/examples/system/childexec/CMakeLists.txt
@@ -1,7 +1,7 @@
# PSn00bSDK example CMake script
# (C) 2021 spicyjpeg - MPL licensed
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.20)
if(NOT DEFINED CMAKE_TOOLCHAIN_FILE AND DEFINED ENV{PSN00BSDK_LIBS})
set(CMAKE_TOOLCHAIN_FILE $ENV{PSN00BSDK_LIBS}/cmake/sdk.cmake)
@@ -38,4 +38,4 @@ target_link_options(child PRIVATE -Ttext=0x80030000)
# embedded via child_exe.s).
add_dependencies(parent child)
-install(FILES ${PROJECT_BINARY_DIR}/parent.exe DESTINATION .)
+install(FILES ${PROJECT_BINARY_DIR}/parent.exe TYPE BIN)
diff --git a/examples/system/console/CMakeLists.txt b/examples/system/console/CMakeLists.txt
index acae08f..6dc6154 100644
--- a/examples/system/console/CMakeLists.txt
+++ b/examples/system/console/CMakeLists.txt
@@ -1,7 +1,7 @@
# PSn00bSDK example CMake script
# (C) 2021 spicyjpeg - MPL licensed
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.20)
if(NOT DEFINED CMAKE_TOOLCHAIN_FILE AND DEFINED ENV{PSN00BSDK_LIBS})
set(CMAKE_TOOLCHAIN_FILE $ENV{PSN00BSDK_LIBS}/cmake/sdk.cmake)
@@ -19,4 +19,4 @@ file(GLOB _sources *.c)
psn00bsdk_add_executable(console STATIC ${_sources})
#psn00bsdk_add_cd_image(console_iso console iso.xml DEPENDS console)
-install(FILES ${PROJECT_BINARY_DIR}/console.exe DESTINATION .)
+install(FILES ${PROJECT_BINARY_DIR}/console.exe TYPE BIN)
diff --git a/examples/system/dynlink/CMakeLists.txt b/examples/system/dynlink/CMakeLists.txt
index 3af5d4b..5834647 100644
--- a/examples/system/dynlink/CMakeLists.txt
+++ b/examples/system/dynlink/CMakeLists.txt
@@ -1,7 +1,7 @@
# PSn00bSDK example CMake script
# (C) 2021 spicyjpeg - MPL licensed
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.20)
if(NOT DEFINED CMAKE_TOOLCHAIN_FILE AND DEFINED ENV{PSN00BSDK_LIBS})
set(CMAKE_TOOLCHAIN_FILE $ENV{PSN00BSDK_LIBS}/cmake/sdk.cmake)
@@ -28,5 +28,5 @@ install(
FILES
${PROJECT_BINARY_DIR}/dynlink.bin
${PROJECT_BINARY_DIR}/dynlink.cue
- DESTINATION .
+ TYPE BIN
)
diff --git a/examples/system/dynlink/display.c b/examples/system/dynlink/display.c
index d8ad3ed..573f17c 100644
--- a/examples/system/dynlink/display.c
+++ b/examples/system/dynlink/display.c
@@ -10,6 +10,10 @@
#define SCREEN_XRES 320
#define SCREEN_YRES 240
+#define BGCOLOR_R 48
+#define BGCOLOR_G 24
+#define BGCOLOR_B 0
+
/* Display/GPU context utilities */
void init_context(CONTEXT *ctx) {
@@ -23,14 +27,14 @@ void init_context(CONTEXT *ctx) {
db = &(ctx->db[0]);
SetDefDispEnv(&(db->disp), 0, 0, SCREEN_XRES, SCREEN_YRES);
SetDefDrawEnv(&(db->draw), SCREEN_XRES, 0, SCREEN_XRES, SCREEN_YRES);
- setRGB0(&(db->draw), 63, 0, 127);
+ setRGB0(&(db->draw), BGCOLOR_R, BGCOLOR_G, BGCOLOR_B);
db->draw.isbg = 1;
db->draw.dtd = 1;
db = &(ctx->db[1]);
SetDefDispEnv(&(db->disp), SCREEN_XRES, 0, SCREEN_XRES, SCREEN_YRES);
SetDefDrawEnv(&(db->draw), 0, 0, SCREEN_XRES, SCREEN_YRES);
- setRGB0(&(db->draw), 63, 0, 127);
+ setRGB0(&(db->draw), BGCOLOR_R, BGCOLOR_G, BGCOLOR_B);
db->draw.isbg = 1;
db->draw.dtd = 1;
diff --git a/examples/system/dynlink/library/balls.c b/examples/system/dynlink/library/balls.c
index 2a4d9f4..ef6993e 100644
--- a/examples/system/dynlink/library/balls.c
+++ b/examples/system/dynlink/library/balls.c
@@ -3,7 +3,7 @@
* (C) 2021 spicyjpeg - MPL licensed
*/
-#include <sys/types.h>
+#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <psxgpu.h>
diff --git a/examples/system/dynlink/library/cube.c b/examples/system/dynlink/library/cube.c
index 57f3e56..84fe552 100644
--- a/examples/system/dynlink/library/cube.c
+++ b/examples/system/dynlink/library/cube.c
@@ -3,7 +3,7 @@
* (C) 2021 spicyjpeg - MPL licensed
*/
-#include <sys/types.h>
+#include <stdint.h>
#include <stdio.h>
#include <psxgpu.h>
#include <psxgte.h>
diff --git a/examples/system/dynlink/library/dll_common.h b/examples/system/dynlink/library/dll_common.h
index 4f9314b..315a993 100644
--- a/examples/system/dynlink/library/dll_common.h
+++ b/examples/system/dynlink/library/dll_common.h
@@ -6,6 +6,7 @@
#ifndef __DLL_COMMON_H
#define __DLL_COMMON_H
+#include <stdint.h>
#include <psxgpu.h>
/* Common structures shared by the main executable and DLLs */
diff --git a/examples/system/dynlink/main.c b/examples/system/dynlink/main.c
index 33f6f44..6d93e71 100644
--- a/examples/system/dynlink/main.c
+++ b/examples/system/dynlink/main.c
@@ -36,12 +36,11 @@
* as plugins/mods/patches stored on a memory card.
*/
-#include <sys/types.h>
+#include <stdint.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <malloc.h>
#include <dlfcn.h>
#include <psxapi.h>
#include <psxetc.h>
diff --git a/examples/system/timer/CMakeLists.txt b/examples/system/timer/CMakeLists.txt
index 189bf87..58daf9b 100644
--- a/examples/system/timer/CMakeLists.txt
+++ b/examples/system/timer/CMakeLists.txt
@@ -1,7 +1,7 @@
# PSn00bSDK example CMake script
# (C) 2021 spicyjpeg - MPL licensed
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.20)
if(NOT DEFINED CMAKE_TOOLCHAIN_FILE AND DEFINED ENV{PSN00BSDK_LIBS})
set(CMAKE_TOOLCHAIN_FILE $ENV{PSN00BSDK_LIBS}/cmake/sdk.cmake)
@@ -19,4 +19,4 @@ file(GLOB _sources *.c)
psn00bsdk_add_executable(timer STATIC ${_sources})
#psn00bsdk_add_cd_image(timer_iso timer iso.xml DEPENDS timer)
-install(FILES ${PROJECT_BINARY_DIR}/timer.exe DESTINATION .)
+install(FILES ${PROJECT_BINARY_DIR}/timer.exe TYPE BIN)
diff --git a/examples/system/tty/CMakeLists.txt b/examples/system/tty/CMakeLists.txt
index 024ccd4..4e0ca36 100644
--- a/examples/system/tty/CMakeLists.txt
+++ b/examples/system/tty/CMakeLists.txt
@@ -1,7 +1,7 @@
# PSn00bSDK example CMake script
# (C) 2021 spicyjpeg - MPL licensed
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.20)
if(NOT DEFINED CMAKE_TOOLCHAIN_FILE AND DEFINED ENV{PSN00BSDK_LIBS})
set(CMAKE_TOOLCHAIN_FILE $ENV{PSN00BSDK_LIBS}/cmake/sdk.cmake)
@@ -19,4 +19,4 @@ file(GLOB _sources *.c)
psn00bsdk_add_executable(tty STATIC ${_sources})
#psn00bsdk_add_cd_image(tty_iso tty iso.xml DEPENDS tty)
-install(FILES ${PROJECT_BINARY_DIR}/tty.exe DESTINATION .)
+install(FILES ${PROJECT_BINARY_DIR}/tty.exe TYPE BIN)