Refactor sysmodule

* Deprecate brightness control * Remove chainloader, implement config parsing in main sysmodule * Remove libstratosphere dependency * Simplify IPC API: remove profile subobjects * Clean up accumulated cruft
averne · May 4, 2024 · 1d337fc · 1d337fc
1 parent 438ffd6
commit 1d337fc
Show file tree

Hide file tree

Showing 55 changed files with 1,182 additions and 1,961 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -5,7 +5,7 @@ on: [push, pull_request]
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: devkitpro/devkita64:20220216
+    container: devkitpro/devkita64:latest
 
     steps:
     - name: Install 7z
@@ -19,7 +19,6 @@ jobs:
       run: |
         make -C common -j$(nproc)
         make dist -j$(nproc)
-        make dist-chl -j$(nproc)
 
     - uses: actions/upload-artifact@master
       with:

diff --git a/.gitmodules b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule "lib/inih/inih"]
 	path = lib/inih/inih
 	url = https://github.com/benhoyt/inih.git
-[submodule "lib/libstratosphere/libstratosphere"]
-	path = lib/libstratosphere/libstratosphere
-	url = https://github.com/averne/libstratosphere.git
 [submodule "lib/libtesla"]
 	path = lib/libtesla
 	url = https://github.com/WerWolv/libtesla.git

diff --git a/.vscode/Fizeau.code-workspace b/.vscode/Fizeau.code-workspace
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -8,7 +8,6 @@
                 "${workspaceFolder}/lib/imgui/include",
                 "${workspaceFolder}/lib/imgui-nx/include",
                 "${workspaceFolder}/lib/inih/include",
-                "${workspaceFolder}/lib/libstratosphere/include",
                 "${workspaceFolder}/lib/nvjpg/oss-nvjpg/include",
                 "${workspaceFolder}/lib/libtesla/include",
 
@@ -22,20 +21,16 @@
                 "${DEVKITPRO}/portlibs/switch/include",
 
                 "${DEVKITPRO}/devkitA64/aarch64-none-elf/include",
-                "${DEVKITPRO}/devkitA64/lib/gcc/aarch64-none-elf/*/include",
-
-                "/usr/include"
+                "${DEVKITPRO}/devkitA64/lib/gcc/aarch64-none-elf/*/include"
             ],
             "defines": [
                 "__aarch64__",
                 "__SWITCH__",
-                "DEBUG",
+                // "DEBUG",
                 "SYSMODULE",
                 // "TWILI",
                 "VERSION=\"0.0.0\"",
-                "COMMIT=\"0000000\"",
-                "ATMOSPHERE_IS_STRATOSPHERE",
-                "ATMOSPHERE_BOARD_NINTENDO_SWITCH"
+                "COMMIT=\"0000000\""
             ],
             "compilerPath": "${DEVKITPRO}/devkitA64/bin/aarch64-none-elf-gcc",
             "cStandard": "gnu11",

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -6,6 +6,4 @@
         "*.nacp": true,
         "*.nro": true
     },
-    "licenser.license": "GPLv2",
-    "licenser.projectName": "Fizeau",
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -46,6 +46,7 @@
             "command": "make",
             "args": [
                 "application",
+                "overlay",
                 "sysmodule",
                 "clean"
             ],
@@ -68,102 +69,6 @@
             },
             "problemMatcher": []
         },
-        {
-            "label": "application all",
-            "type": "shell",
-            "command": "make",
-            "args": [
-                "application",
-                "-j$(nproc)"
-            ],
-            "presentation": {
-                "reveal": "always",
-                "panel": "shared",
-                "clear": true
-            },
-            "problemMatcher": {
-                "base": "$gcc",
-                "fileLocation": "absolute"
-            }
-        },
-        {
-            "label": "application clean",
-            "type": "shell",
-            "command": "make",
-            "args": [
-                "application",
-                "clean"
-            ],
-            "presentation": {
-                "panel": "shared",
-                "reveal": "never"
-            },
-            "problemMatcher": []
-        },
-        {
-            "label": "sysmodule all",
-            "type": "shell",
-            "command": "make",
-            "args": [
-                "sysmodule",
-                "-j$(nproc)"
-            ],
-            "presentation": {
-                "reveal": "always",
-                "panel": "shared",
-                "clear": true
-            },
-            "problemMatcher": {
-                "base": "$gcc",
-                "fileLocation": "absolute"
-            }
-        },
-        {
-            "label": "sysmodule clean",
-            "type": "shell",
-            "command": "make",
-            "args": [
-                "sysmodule",
-                "clean"
-            ],
-            "presentation": {
-                "panel": "shared",
-                "reveal": "never"
-            },
-            "problemMatcher": []
-        },
-        {
-            "label": "overlay all",
-            "type": "shell",
-            "command": "make",
-            "args": [
-                "overlay",
-                "-j$(nproc)"
-            ],
-            "presentation": {
-                "reveal": "always",
-                "panel": "shared",
-                "clear": true
-            },
-            "problemMatcher": {
-                "base": "$gcc",
-                "fileLocation": "absolute"
-            }
-        },
-        {
-            "label": "overlay clean",
-            "type": "shell",
-            "command": "make",
-            "args": [
-                "overlay",
-                "clean"
-            ],
-            "presentation": {
-                "panel": "shared",
-                "reveal": "never"
-            },
-            "problemMatcher": []
-        },
         {
             "label": "application run",
             "type": "shell",

diff --git a/Makefile b/Makefile
@@ -1,7 +1,6 @@
 export FZ_VERSION =    2.4.3
 export FZ_COMMIT  =    $(shell git rev-parse --short HEAD)
 export FZ_TID     =    0100000000000F12
-export FZ_CHL_TID =    010000000000CF12
 
 # Vscode fails to parse non-english error codes
 export LANG       =    en
@@ -16,21 +15,20 @@ export FZ_COMMIT    :=    $(addsuffix -dirty,$(FZ_COMMIT))
 endif
 
 DIST_TARGET       =    $(OUT)/Fizeau-$(FZ_VERSION)-$(FZ_COMMIT).zip
-DIST_CHL_TARGET   =    $(OUT)/Fizeau-chl-$(FZ_VERSION)-$(FZ_COMMIT).zip
 
 # -----------------------------------------------
 
-MODULES           =    application sysmodule overlay chainloader
+MODULES           =    application sysmodule overlay
 
-.PHONY: all dist dist-chl clean mrproper $(MODULES)
+.PHONY: all dist clean mrproper $(MODULES)
 
 all: $(MODULES)
 	@:
 
 dist: $(DIST_TARGET)
 	@:
 
-$(DIST_TARGET): | application overlay sysmodule
+$(DIST_TARGET): | all
 	@rm -rf $(OUT)/Fizeau-?.?.?-*.zip
 
 	@mkdir -p $(OUT)/config/Fizeau
@@ -50,49 +48,20 @@ $(DIST_TARGET): | application overlay sysmodule
 	@rm -r $(OUT)/atmosphere $(OUT)/config $(OUT)/switch
 	@echo Compressed release to $@
 
-dist-chl: $(DIST_CHL_TARGET)
-	@:
-
-$(DIST_CHL_TARGET): | all
-	@rm -rf $(OUT)/Fizeau-chl*.zip
-
-	@mkdir -p $(OUT)/config/Fizeau
-	@mkdir -p $(OUT)/switch/Fizeau
-	@cp misc/default.ini $(OUT)/config/Fizeau/config.ini
-	@cp application/out/Fizeau.nro $(OUT)/switch/Fizeau/Fizeau.nro
-
-	@mkdir -p $(OUT)/switch/.overlays
-	@cp overlay/out/Fizeau.ovl $(OUT)/switch/.overlays/Fizeau.ovl
-
-	@mkdir -p $(OUT)/atmosphere/contents/$(FZ_TID)
-	@cp sysmodule/out/Fizeau.nsp $(OUT)/atmosphere/contents/$(FZ_TID)/exefs.nsp
-
-	@mkdir -p $(OUT)/atmosphere/contents/$(FZ_CHL_TID)/flags
-	@cp chainloader/out/Fizeau-chl.nsp $(OUT)/atmosphere/contents/$(FZ_CHL_TID)/exefs.nsp
-	@cp chainloader/toolbox.json $(OUT)/atmosphere/contents/$(FZ_CHL_TID)/toolbox.json
-	@touch $(OUT)/atmosphere/contents/$(FZ_CHL_TID)/flags/boot2.flag
-
-	@7z a $@ ./$(OUT)/atmosphere ./$(OUT)/config ./$(OUT)/switch >/dev/null
-	@rm -r $(OUT)/atmosphere $(OUT)/config $(OUT)/switch
-	@echo Compressed release to $@
-
 clean:
 	@rm -rf out
 
 mrproper: clean
 	@for dir in $(MODULES); do $(MAKE) --no-print-directory -C $$dir mrproper; done
 
 application:
-	@$(MAKE) -s -C $@ $(filter-out $(MODULES) dist dist-chl,$(MAKECMDGOALS)) --no-print-directory
+	@$(MAKE) -s -C $@ $(filter-out $(MODULES) dist,$(MAKECMDGOALS)) --no-print-directory
 
 sysmodule:
-	@$(MAKE) -s -C $@ $(filter-out $(MODULES) dist dist-chl,$(MAKECMDGOALS)) --no-print-directory
+	@$(MAKE) -s -C $@ $(filter-out $(MODULES) dist,$(MAKECMDGOALS)) --no-print-directory
 
 overlay:
-	@$(MAKE) -s -C $@ $(filter-out $(MODULES) dist dist-chl,$(MAKECMDGOALS)) --no-print-directory
-
-chainloader:
-	@$(MAKE) -s -C $@ $(filter-out $(MODULES) dist dist-chl,$(MAKECMDGOALS)) --no-print-directory
+	@$(MAKE) -s -C $@ $(filter-out $(MODULES) dist,$(MAKECMDGOALS)) --no-print-directory
 
 %:
 	@:
diff --git a/application/Makefile b/application/Makefile
@@ -22,8 +22,7 @@ CUSTOM_LIBS       =    ../common ../lib/imgui-nx ../lib/imgui ../lib/inih ../lib
 ROMFS             =    res
 
 DEFINES           =    __SWITCH__ VERSION=\"$(FZ_VERSION)\" COMMIT=\"$(FZ_COMMIT)\"      \
-                       ATMOSPHERE_IS_STRATOSPHERE ATMOSPHERE_BOARD_NINTENDO_NX           \
-                       ATMOSPHERE_ARCH_ARM64 ATMOSPHERE_OS_HORIZON APPLICATION TWILI
+                       APPLICATION NXLINK
 ARCH              =    -march=armv8-a+crc+crypto+simd -mtune=cortex-a57 -mtp=soft -fpie
 FLAGS             =    -Wall -pipe -g -O2 -ffunction-sections -fdata-sections
 CFLAGS            =    -std=gnu11

diff --git a/application/src/gfx.cpp b/application/src/gfx.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2020 averne
+// Copyright (c) 2024 averne
 //
 // This file is part of Fizeau.
 //
@@ -259,7 +259,7 @@ void exit() {
     deko3dExit();
 }
 
-void register_texture(dk::MemBlock memblk, dk::Image &image, const nj::Surface &surf, std::uint32_t sampler_id, std::uint32_t image_id) {
+void register_texture(dk::MemBlock &memblk, dk::Image &image, const nj::Surface &surf, std::uint32_t sampler_id, std::uint32_t image_id) {
     // upload data to deko3d
     std::tie(memblk, image) = surf.to_deko3d(s_device, 0);
 

diff --git a/application/src/gfx.hpp b/application/src/gfx.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2020 averne
+// Copyright (c) 2024 averne
 //
 // This file is part of Fizeau.
 //
@@ -29,6 +29,6 @@ bool loop();
 void render();
 void exit();
 
-void register_texture(dk::MemBlock memblk, dk::Image &image, const nj::Surface &surf, std::uint32_t sampler_id, std::uint32_t image_id);
+void register_texture(dk::MemBlock &memblk, dk::Image &image, const nj::Surface &surf, std::uint32_t sampler_id, std::uint32_t image_id);
 
 } // namespace fz::gfx