.github/ISSUE_TEMPLATE/bug-report.md

@@ -25,7 +25,7 @@ about: Use this to report bugs you encounter with Luma3DS. Make sure you upload
 
 **SysNAND version (+emu/redNAND version if applicable):**
 
-[e.g. 11.17.0-50U SysNAND, 11.17.0-50E EmuNAND]
+[e.g. 11.13.0-45U SysNAND, 11.13.0-45E EmuNAND]
 <!--You can check which version you're on in System Settings. It will be on the bottom right of the top screen.-->
 
 **Entrypoint (How/what you're using to boot Luma3DS):**
@@ -34,7 +34,7 @@ about: Use this to report bugs you encounter with Luma3DS. Make sure you upload
 
 **Luma3DS version:**
 
-[e.g. v13.2.1 stable or if using non-releases specify the commit like this https://github.com/LumaTeam/Luma3DS/commit/988ec17ebfce513fc4589f7b12e0d6e3894ae542]
+[e.g. v10.2 stable or if using non-releases specify the commit like this https://github.com/LumaTeam/Luma3DS/commit/0543c208fd154e6326ea5da8cbf66ffcbdef010c]
 
 **Luma3DS configuration/options:**
 
@@ -52,26 +52,31 @@ PIN lock: ( )
 New 3DS CPU: ( )
 <!--This option is only available on New 3DS (XL)/New 2DS XL.-->
 
-Hbmenu autoboot: ( )
-
 --
 
 Autoboot EmuNAND: ( )
 <!--This option is only available if there's at least one EmuNAND.-->
 
+Use EmuNAND FIRM if booting with R: ( )
+<!--This option is only available if there's at least one EmuNAND.-->
+
 Enable loading external FIRMs and modules: ( )
 <!--Firmware (.bin) files are not required by Luma, or NTR CFW anymore.
 -- If you're having issues with this option enabled try deleting them from the luma folder on the root of the SD card or /rw/luma on CTRNAND and disabling this option.-->
 
 Enable game patching: ( )
 
-Redirect app. syscore threads to core2: ( )
-<!--This option is only available on New 3DS (XL)/New 2DS XL.-->
-
 Show NAND or user string in System Settings: ( )
 
 Show GBA boot screen in patched AGB_FIRM: ( )
 
+Set developer UNITINFO: ( )
+
+Disable Arm11 exception handlers: ( )
+
+Enable Rosalina on SAFE_FIRM: ( )
+<!--This option is only available on New 3DS (XL)/New 2DS XL.-->
+
 --
 
 
@@ -89,8 +94,7 @@ Show GBA boot screen in patched AGB_FIRM: ( )
 2.
 
 
-**Dump file (if applicable):**
+**Dump file:**
-<!--If the issue leads to a crash you must ensure the "Disable Arm11 exception handlers"
+<!--If the issue leads to a crash you must uncheck the "Disable Arm11 exception handlers" option.
--- option is not disabled in config.ini.
 -- The error message will tell you where the dump is.
 -- Zip the dmp file and drag & drop it below.-->

.gitignore

@@ -21,4 +21,3 @@ exceptions/arm11/build
 .settings
 
 Luma3DS*.zip
-hbmenu.zip

Makefile

@@ -2,19 +2,6 @@ ifneq ($(strip $(shell firmtool -v 2>&1 | grep usage)),)
 $(error "Please install firmtool v1.1 or greater")
 endif
 
-# Disable kext and firmlaunch patches, all custom sysmodules except Loader, enable PASLR.
-# Dangerous. Don't enable this unless you know what you're doing!
-export BUILD_FOR_EXPLOIT_DEV ?= 0
-
-# Build with O0 & frame pointer information for use with GDB
-export BUILD_FOR_GDB ?= 0
-
-# Default 3DSX TitleID for hb:ldr
-export HBLDR_DEFAULT_3DSX_TID ?= 000400000D921E00
-
-# What to call the title corresponding to HBLDR_DEFAULT_3DSX_TID
-export HBLDR_DEFAULT_3DSX_TITLE_NAME ?= "hblauncher_loader"
-
 NAME		:=	$(notdir $(CURDIR))
 REVISION	:=	$(shell git describe --tags --match v[0-9]* --abbrev=8 | sed 's/-[0-9]*-g/-/')
 
@@ -31,17 +18,16 @@ clean:
 	@rm -rf *.firm *.zip *.3dsx
 
 # boot.3dsx comes from https://github.com/fincs/new-hbmenu/releases
-$(NAME)$(REVISION).zip:	hbmenu.zip boot.firm
+$(NAME)$(REVISION).zip:	boot.firm boot.3dsx
-	@cp $< $@
+	@zip -r $@ $^ -x "*.DS_Store*" "*__MACOSX*"
-	@zip $@ boot.firm -x "*.DS_Store*" "*__MACOSX*"
 
 boot.firm:	$(SUBFOLDERS)
 	@firmtool build $@ -D sysmodules/sysmodules.bin arm11/arm11.elf arm9/arm9.elf k11_extension/k11_extension.elf \
 	-A 0x18180000 -C XDMA XDMA NDMA XDMA
 	@echo built... $(notdir $@)
 
-hbmenu.zip:
+boot.3dsx:
-	@curl -sSfL $(shell curl -s https://api.github.com/repos/devkitPro/3ds-hbmenu/releases/latest | grep 'browser_' | cut -d\" -f4) -o $@
+	@curl -sSfLO "https://github.com/fincs/new-hbmenu/releases/latest/download/$@"
 	@echo downloaded... $(notdir $@)
 
 $(SUBFOLDERS):

README.md

@@ -1,112 +1,36 @@
 # Luma3DS
+*Noob-proof (N)3DS "Custom Firmware"*
 
-![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/LumaTeam/Luma3DS/total)
+### What it is
-![License](https://img.shields.io/badge/License-GPLv3-blue.svg)
+**Luma3DS** is a program to patch the system software of (New) Nintendo (2)3DS handheld consoles "on the fly", adding features such as per-game language settings, debugging capabilities for developers, and removing restrictions enforced by Nintendo such as the region lock.
 
-*Nintendo 3DS "Custom Firmware"*
+It also allows you to run unauthorized ("homebrew") content by removing signature checks.
+To use it, you will need a console capable of running homebrew software on the Arm9 processor.
 
-![Boot menu screenshot](img/boot_menu_v1321.png)
+Since v8.0, Luma3DS has its own in-game menu, triggerable by <kbd>L+Down+Select</kbd> (see the [release notes](https://github.com/LumaTeam/Luma3DS/releases/tag/v8.0)).
-![Rosalina menu screenshot](img/rosalina_menu_v1321.png)
 
-## Description
+#
-**Luma3DS** patches and reimplements significant parts of the system software running on all models of the Nintendo 3DS family of consoles. It aims to greatly improve the user experience and support the 3DS far beyond its end-of-life. Features include:
+### Compiling
+* Prerequisites
+    1. git
+    2. [makerom](https://github.com/jakcron/Project_CTR) in PATH
+    3. [firmtool](https://github.com/TuxSH/firmtool)
+    4. Up-to-date devkitARM+libctru
+1. Clone the repository with `git clone https://github.com/LumaTeam/Luma3DS.git`
+2. Run `make`.
 
-* **First-class support for homebrew applications**
+    The produced `boot.firm` is meant to be copied to the root of your SD card for usage with Boot9Strap.
-* **Rosalina**, an overlay menu (triggered by <kbd>L+Down+Select</kbd> by default), allowing things like:
-    * Taking screenshots while in game
-    * Blue light filters and other screen filters
-    * Input redirection to play with external devices, such as controllers
-    * Using cheat codes
-    * Setting time and date accurately from the network (NTP)
-    * ... and much more!
-* **Many game modding features**, such as, but not limited to:
-    * Game plugins (in 3GX format)
-    * Per-game language overrides ("locale emulation")
-    * Asset content path redirection ("LayeredFS")
-* **Support for user-provided patches and/or full "system modules" replacements**, an essential feature for Nintendo Network replacements (amongst other projects)
-* A **fully-fledged GDB stub**, allowing homebrew developers and reverse-engineers alike to work much more efficiently
-* Ability to chainload other firmware files, including other versions of itself
-* ... and much more!
 
-## Installation and upgrade
+#
-Luma3DS requires [boot9strap](https://github.com/SciresM/boot9strap) to run.
+### Setup / Usage / Features
+See https://github.com/LumaTeam/Luma3DS/wiki
 
-Once boot9strap has been installed, simply download the [latest release archive](https://github.com/LumaTeam/Luma3DS/releases/latest) and extract the archive onto the root of your SD card to "install" or to upgrade Luma3DS alongside the [homebrew menu and certs bundle](https://github.com/devkitPro/3ds-hbmenu) shipped with it. Replace existing files and merge existing folders if necessary.
+#
+### Credits
+See https://github.com/LumaTeam/Luma3DS/wiki/Credits
 
-## Basic usage
+#
-**The main Luma3DS configuration menu** can be accessed by pressing <kbd>Select</kbd> at boot. The configuration file is stored in `/luma/config.ini` on the SD card (or `/rw/luma/config.ini` on the CTRNAND partition if Luma3DS has been launched from the CTRNAND partition, which happens when SD card is missing).
+### Licensing
-
-**The chainloader menu** is accessed by pressing <kbd>Start</kbd> at boot, or from the configuration menu. Payloads are expected to be located in `/luma/payloads` with the `.firm` extension; if there is only one such payload, the aforementionned selection menu will be skipped. Hotkeys can be assigned to payload, for example `x_test.firm` will be chainloaded when <kbd>X</kbd> is pressed at boot.
-
-**The overlay menu, Rosalina**, has a default button combination: <kbd>L+Down+Select</kbd>. For greater flexbility, most Rosalina menu settings aren't saved automatically, hence the "Save settings" option.
-
-**GDB ports**, when enabled, are `4000-4002` for the normal ports. Use of `attach` in "extended-remote" mode, alongside `info os processes` is supported and encouraged (for reverse-engineering, also check out `monitor getmemregions`). The port for the break-on-start feature is `4003` without "extended-remote". Both devkitARM-patched GDB and IDA Pro (without "stepping support" enabled) are actively supported.
-
-We have a wiki, however it is currently very outdated.
-
-## Components
-
-Luma3DS consists of multiple components. While the code style within each component is mostly consistent, these components have been written over many years and may not reflect how maintainers would write new code in new components/projects:
-
-* **arm9**, **arm11**: baremetal main settings menu, chainloader and firmware loader. Aside from showing settings and chainloading to other homebrew firmware files on demand, it is responsible for patching the official firmware to modify `Process9` code and to inject all other custom components. This was the first component ever written for this project, in 2015
-* **k11_extension**: code extending the Arm11 `NATIVE_FIRM` kernel (`Kernel11`). It is injected by the above mentioned baremetal loader into the kernel by hooking its startup code, then hooks itself into the rest of the kernel. Its features include hooking system calls (SVCs), introducing new SVCs and hooking into interprocess communications, to bypass limitations in Nintendo's system design. This is the component that allows Rosalina to pause other processes on overlay menu entry, for example. This was written at a time when we didn't fully reverse-engineer the kernel, and originally released in 2017 alongside Rosalina. Further hooks for "game plugin" support have been merged in 2023
-* **sysmodules**: reimplementation of "system modules" (processes) of the 3DS's OS (except for Rosalina being custom), currently only initial processes loaded directly in-memory by the kernel ("kernel initial process", or KIP in short)
-    * **loader**: process that loads non-KIP processes from storage. Because this is the perfect place to patch/replace executable code, this is where all process patches are done, enabling in particular "game modding" features. This is also the sysmodule handling 3DSX homebrew loading. Introduced in 2016
-    * _**rosalina**_: the most important component of Luma3DS and custom KIP: overlay menu, GDB server, `err:f` (fatal error screen) reimplementation, and much more. Introduced in mid-2017, and has continuously undergone changes and received many external contributions ever since
-    * **pxi**: Arm11<>Arm9 communication KIP, reimplemented just for the sake of it. Introduced late 2017
-    * **sm**: service manager KIP, reimplemented to remove service access control restrictions. Introduced late 2017
-    * **pm**: process manager KIP reponsible of starting/terminating processes and instructing `loader` to load them. The reimplemention allows for break-on-start GDB feature in Rosalina, as well as lifting FS access control restrictions the proper way. Introduced in 2019
-
-## Maintainers
-
-* **[@TuxSH](https://github.com/TuxSH)**: lead developer, created and maintains most features of the project. Joined in 2016
-* **[@AuroraWright](https://github.com/AuroraWright)**: author of the project, implemented the core features (most of the baremetal boot settings menu and firmware loading code) with successful design decisions that made the project popular. Created the project in 2015, currently inactive
-* **[@PabloMK7](https://github.com/PabloMK7)**: maintainer of the plugin loader feature merged for the v13.0 release. Joined in 2023
-
-## Roadmap
-
-There are still a lot more features and consolidation planned for Luma3DS! Here is a list of what is currently in store:
-
-* Full reimplementation of `TwlBg` and `AgbBg`. This will allow much better, and more configurable, upscaling for top screen in DS and GBA games (except on Old 2DS). This is currently being developed privately in C++23 (no ETA). While this is quite a difficult endeavor as this requires rewriting the entire driver stack in semi-bare-metal (limited kernel with no IPC), this is the most critical feature for Luma3DS to have and will make driver sysmodule reimpelementation trivial
-* Reimplementation of `Process9` for `TWL_FIRM` and `AGB_FIRM` to allow for more features in DS and GBA compatibility mode (ones that require file access)
-* Eventually, a full `Kernel11` reimplementation
-
-## Known issues
-
-* **Cheat engine crashes with some applications, in particular Pokémon games**: there is a race condition in Nintendo's `Kernel11` pertaining to attaching a new `KDebugThread` to a `KThread` on thread creation, and another thread null-dereferencing `thread->debugThread`. This causes the cheat engine to crashes games that create and destroy many threads all the time (like Pokémon).
-    * For these games, having a **dedicated "game plugin"** is the only alternative until `Kernel11` is reimplemented.
-* **Applications reacting to Rosalina menu button combo**: Rosalina merely polls button input at an interval to know when to show the menu. This means that the Rosalina menu combo can sometimes be processed by the game/process that is going to be paused.
-    * You can **change the menu combo** in the "Miscellaneous options" submenu (then save it with "Save settings" in the main menu) to work around this.
-
-## Building from source
-
-To build Luma3DS, the following is needed:
-* git
-* [makerom](https://github.com/jakcron/Project_CTR) in `$PATH`
-* [firmtool](https://github.com/TuxSH/firmtool) installed
-* up-to-date devkitARM and libctru:
-    * install `dkp-pacman` (or, for distributions that already provide pacman, add repositories): https://devkitpro.org/wiki/devkitPro_pacman
-    * install packages from `3ds-dev` metapackage: `sudo dkp-pacman -S 3ds-dev --needed`
-    * while libctru and Luma3DS releases are kept in sync, you may have to build libctru from source for non-release Luma3DS commits
-
-While Luma3DS releases are bundled with `3ds-hbmenu`, Luma3DS actually compiles into one single file: `boot.firm`. Just copy it over to the root of your SD card ([ftpd](https://github.com/mtheall/ftpd) is the easiest way to do so), and you're done.
-
-## Licensing
 This software is licensed under the terms of the GPLv3. You can find a copy of the license in the LICENSE.txt file.
 
-Files in the GDB stub are instead triple-licensed as MIT or "GPLv2 or any later version", in which case it's specified in the file header. PM, SM, PXI reimplementations are also licensed under MIT.
+Files in the GDB stub are instead triple-licensed as MIT or "GPLv2 or any later version", in which case it's specified in the file header.
-
-## Credits
-
-Luma3DS would not be what it is without the contributions and constructive feedback of many. We would like to thanks in particular:
-
-* **[@devkitPro](https://github.com/devkitPro)** (especially **[@fincs](https://github.com/fincs)**, **[@WinterMute](https://github.com/WinterMute)** and **[@mtheall](https://github.com/mtheall)**) for providing quality and easy-to-use toolchains with bleeding-edge GCC, and for their continued technical advice
-* **[@Nanquitas](https://github.com/Nanquitas)** for the initial version of the game plugin loader code as well as very useful contributions to the GDB stub
-* **[@piepie62](https://github.com/piepie62)** for the current implementation of the Rosalina cheat engine, **Duckbill** for its original implementation
-* **[@panicbit](https://github.com/panicbit)** for the original implementation of screen filters in Rosalina
-* **[@jasondellaluce](https://github.com/jasondellaluce)** for LayeredFS
-* **[@LiquidFenrir](https://github.com/LiquidFenrir)** for the memory viewer inside Rosalina's "Process List"
-* **ChaN** for [FatFs](http://elm-chan.org/fsw/ff/00index_e.html)
-* Everyone who has contributed to the Luma3DS repository
-* Everyone who has assisted with troubleshooting end-users
-* Everyone who has provided constructive feedback to Luma3DS

arm11/Makefile

@@ -26,7 +26,7 @@ INCLUDES	:=	include include/svc
 # options for code generation
 #---------------------------------------------------------------------------------
 ARCH	:=	-march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft
-DEFINES :=	-DARM11 -D__3DS__
+DEFINES :=	-DARM11 -D_3DS
 
 CFLAGS	:=	-g -std=gnu11 -Wall -Wextra -Werror -O2 -mword-relocations \
 			-fomit-frame-pointer -ffunction-sections -fdata-sections \

arm11/linker.specs

@@ -1,7 +1,7 @@
 %rename link                old_link
 
 *link:
-%(old_link) -T %:getenv(TOPDIR /linker.ld) --nmagic --gc-sections --no-warn-rwx-segments
+%(old_link) -T %:getenv(TOPDIR /linker.ld) --nmagic --gc-sections
 
 *startfile:
 crti%O%s crtbegin%O%s

arm11/source/main.c

@@ -84,8 +84,7 @@ static void initScreens(u32 brightnessLevel, struct fb *fbs)
     *(vu32 *)0x10400490 = 0x000002D0;
     *(vu32 *)0x1040049C = 0x00000000;
 
-    // Color LUT
+    //Disco register
-    *(vu32 *)0x10400480 = 0;
     for(u32 i = 0; i < 256; i++)
         *(vu32 *)0x10400484 = 0x10101 * i;
 
@@ -120,8 +119,7 @@ static void initScreens(u32 brightnessLevel, struct fb *fbs)
     *(vu32 *)0x10400590 = 0x000002D0;
     *(vu32 *)0x1040059C = 0x00000000;
 
-    // Color LUT
+    //Disco register
-    *(vu32 *)0x10400580 = 0;
     for(u32 i = 0; i < 256; i++)
         *(vu32 *)0x10400584 = 0x10101 * i;
 
@@ -195,28 +193,6 @@ static void deinitScreens(void)
     *(vu32 *)0x10202014 = 0;
 }
 
-static void zerofillN3dsAblRegisters(void)
-{
-    // It should be fine to write to these regs even on O3DS as they
-    // are RAZ/WI
-
-    // TODO: read from calibration, but null values should do just
-    // fine. From testing, LUT explicitly ignores null values, and
-    // it is probably the case of reg @ 0x54 as well.
-    *(vu32 *)0x10202250 = 0; // unknown 24-bit value, seen: 0
-    *(vu32 *)0x10202254 = 0; // unknown 24-bit value, seen: nonzero
-
-    *(vu32 *)0x10202A50 = 0; // unknown 24-bit value, seen: 0
-    *(vu32 *)0x10202A54 = 0; // unknown 24-bit value, seen: nonzero
-
-    for (u32 i = 0; i < 64; i++) {
-        // Blend colors (w/ color multiplication) for each group
-        // of 4 relative-luminance Rs
-        *(vu32 *)(0x10202300 + 4*i) = 0;
-        *(vu32 *)(0x10202B00 + 4*i) = 0;
-    }
-}
-
 void main(void)
 {
     operation = ARM11_READY;
@@ -245,9 +221,6 @@ void main(void)
             case DEINIT_SCREENS:
                 deinitScreens();
                 break;
-            case ZEROFILL_N3DS_ABL_REGISTERS:
-                zerofillN3dsAblRegisters();
-                break;
             case PREPARE_ARM11_FOR_FIRMLAUNCH:
                 memcpy((void *)0x1FFFFC00, (void *)prepareForFirmlaunch, prepareForFirmlaunchSize);
                 *(vu32 *)0x1FFFFFFC = 0;

arm11/source/types.h

@@ -60,7 +60,6 @@ typedef enum
     SWAP_FRAMEBUFFERS,
     UPDATE_BRIGHTNESS,
     DEINIT_SCREENS,
-    ZEROFILL_N3DS_ABL_REGISTERS,
     PREPARE_ARM11_FOR_FIRMLAUNCH,
     ARM11_READY,
 } Arm11Operation;

arm9/Makefile

@@ -35,9 +35,6 @@ ifeq ($(strip $(shell git describe --tags --match v[0-9]* | grep -)),)
 	export IS_RELEASE		:=	1
 endif
 
-# Default 3DSX TitleID for hb:ldr (note: also defined in top-level Makefile)
-export HBLDR_DEFAULT_3DSX_TID ?= 000400000D921E00
-
 #---------------------------------------------------------------------------------
 # TARGET is the name of the output
 # BUILD is the directory where object files & intermediate files will be placed
@@ -56,12 +53,7 @@ INCLUDES	:=	include
 # options for code generation
 #---------------------------------------------------------------------------------
 ARCH	:=	-marm -march=armv5te -mtune=arm946e-s
-
+DEFINES :=	-DARM9 -D_3DS
-ifeq ($(BUILD_FOR_EXPLOIT_DEV),1)
-	DEFINES :=	-DARM9 -D__3DS__ -DHBLDR_DEFAULT_3DSX_TID="0x$(HBLDR_DEFAULT_3DSX_TID)ULL" -DBUILD_FOR_EXPLOIT_DEV=1
-else
-	DEFINES :=	-DARM9 -D__3DS__ -DHBLDR_DEFAULT_3DSX_TID="0x$(HBLDR_DEFAULT_3DSX_TID)ULL"
-endif
 
 FALSEPOSITIVES := -Wno-array-bounds -Wno-stringop-overflow -Wno-stringop-overread
 CFLAGS	:=	-g -std=gnu11 -Wall -Wextra -Werror -O2 -mword-relocations \

arm9/linker.ld

@@ -46,7 +46,6 @@ SECTIONS
         chainloader.o(.text*)
         i2c.o(.text*)
         arm9_exception_handlers.o(.text*)
-        KEEP (*(.emunand_patch))
 
         *(.arm9_exception_handlers.rodata*)
         chainloader.o(.rodata*)

arm9/linker.specs

@@ -1,7 +1,7 @@
 %rename link                old_link
 
 *link:
-%(old_link) -T %:getenv(TOPDIR /linker.ld) --nmagic --gc-sections --no-warn-rwx-segments
+%(old_link) -T %:getenv(TOPDIR /linker.ld) --nmagic --gc-sections
 
 *startfile:
 crti%O%s crtbegin%O%s

arm9/source/3dsheaders.h

@@ -102,20 +102,6 @@ typedef struct
     u8 romFsHash[0x20]; //RomFS superblock SHA-256 hash
 } Ncch;
 
-typedef struct ExeFsFileHeader
-{
-    char name[8];
-    u32 offset;
-    u32 size;
-} ExeFsFileHeader;
-
-typedef struct ExeFsHeader
-{
-    ExeFsFileHeader fileHeaders[10];
-    u8 _reserved_0xa0[0xC0 - 0xA0];
-    u8 fileHashes[10][32];
-} ExeFsHeader;
-
 typedef struct
 {
     Ncch ncch;

arm9/source/config.c

@@ -24,8 +24,6 @@
 *         reasonable ways as different from the original version.
 */
 
-#define _GNU_SOURCE // for strchrnul
-
 #include <assert.h>
 #include <strings.h>
 #include "config.h"
@@ -39,15 +37,11 @@
 #include "pin.h"
 #include "i2c.h"
 #include "ini.h"
-#include "firm.h"
 
 #include "config_template_ini.h" // note that it has an extra NUL byte inserted
 
 #define MAKE_LUMA_VERSION_MCU(major, minor, build) (u16)(((major) & 0xFF) << 8 | ((minor) & 0x1F) << 5 | ((build) & 7))
 
-#define FLOAT_CONV_MULT 100000000ll
-#define FLOAT_CONV_PRECISION 8u
-
 CfgData configData;
 ConfigurationStatus needConfig;
 static CfgData oldConfig;
@@ -60,16 +54,15 @@ static_assert(sizeof(CfgDataMcu) > 0, "wrong data size");
 
 static const char *singleOptionIniNamesBoot[] = {
     "autoboot_emunand",
+    "use_emunand_firm_if_r_pressed",
     "enable_external_firm_and_modules",
     "enable_game_patching",
-    "app_syscore_threads_on_core_2",
     "show_system_settings_string",
     "show_gba_boot_screen",
 };
 
 static const char *singleOptionIniNamesMisc[] = {
     "use_dev_unitinfo",
-    "enable_dsi_external_filter",
     "disable_arm11_exception_handlers",
     "enable_safe_firm_rosalina",
 };
@@ -102,9 +95,10 @@ static int parseBoolOption(bool *out, const char *val)
     }
 }
 
-static int parseDecIntOptionImpl(s64 *out, const char *val, size_t numDigits, s64 minval, s64 maxval)
+static int parseDecIntOption(s64 *out, const char *val, s64 minval, s64 maxval)
 {
     *out = 0;
+    size_t numDigits = strlen(val);
     s64 res = 0;
     size_t i = 0;
 
@@ -136,87 +130,6 @@ static int parseDecIntOptionImpl(s64 *out, const char *val, size_t numDigits, s6
     }
 }
 
-static int parseDecIntOption(s64 *out, const char *val, s64 minval, s64 maxval)
-{
-    return parseDecIntOptionImpl(out, val, strlen(val), minval, maxval);
-}
-
-static int parseDecFloatOption(s64 *out, const char *val, s64 minval, s64 maxval)
-{
-    s64 sign = 1;// intPart < 0 ? -1 : 1;
-
-    switch (val[0]) {
-        case '\0':
-            return -1;
-        case '+':
-            ++val;
-            break;
-        case '-':
-            sign = -1;
-            ++val;
-            break;
-        default:
-            break;
-    }
-
-    // Reject "-" and "+"
-    if (val[0] == '\0') {
-        return -1;
-    }
-
-    char *point = strchrnul(val, '.');
-
-    // Parse integer part, then fractional part
-    s64 intPart = 0;
-    s64 fracPart = 0;
-    int rc = 0;
-
-    if (point == val) {
-        // e.g. -.5
-        if (val[1] == '\0')
-            return -1;
-    }
-    else {
-        rc = parseDecIntOptionImpl(&intPart, val, point - val, INT64_MIN, INT64_MAX);
-    }
-
-    if (rc != 0) {
-        return -1;
-    }
-
-    s64 intPartAbs = sign == -1 ? -intPart : intPart;
-    s64 res = 0;
-    bool of = __builtin_mul_overflow(intPartAbs, FLOAT_CONV_MULT, &res);
-
-    if (of) {
-        return -1;
-    }
-
-    s64 mul = FLOAT_CONV_MULT / 10;
-
-    // Check if there's a fractional part
-    if (point[0] != '\0' && point[1] != '\0') {
-        for (char *pos = point + 1; *pos != '\0' && mul > 0; pos++) {
-            if (*pos < '0' || *pos > '9') {
-                return -1;
-            }
-
-            res += (*pos - '0') * mul;
-            mul /= 10;
-        }
-    }
-
-
-    res = sign * (res + fracPart);
-
-    if (res <= maxval && res >= minval && !of) {
-        *out = res;
-        return 0;
-    } else {
-        return -1;
-    }
-}
-
 static int parseHexIntOption(u64 *out, const char *val, u64 minval, u64 maxval)
 {
     *out = 0;
@@ -309,34 +222,6 @@ static void menuComboToString(char *out, u32 combo)
         out[-1] = 0;
 }
 
-static int encodedFloatToString(char *out, s64 val)
-{
-    s64 sign = val >= 0 ? 1 : -1;
-
-    s64 intPart = (sign * val) / FLOAT_CONV_MULT;
-    s64 fracPart = (sign * val) % FLOAT_CONV_MULT;
-
-    while (fracPart % 10 != 0) {
-        // Remove trailing zeroes
-        fracPart /= 10;
-    }
-
-    int n = sprintf(out, "%lld", sign * intPart);
-    if (fracPart != 0) {
-        n += sprintf(out + n, ".%0*lld", (int)FLOAT_CONV_PRECISION, fracPart);
-
-        // Remove trailing zeroes
-        int n2 = n - 1;
-        while (out[n2] == '0') {
-            out[n2--] = '\0';
-        }
-
-        n = n2;
-    }
-
-    return n;
-}
-
 static bool hasIniParseError = false;
 static int iniParseErrorLine = 0;
 
@@ -434,22 +319,8 @@ static int configIniHandler(void* user, const char* section, const char* name, c
             } else {
                 CHECK_PARSE_OPTION(-1);
             }
-        } else if (strcmp(name, "autoboot_mode") == 0) {
-            if (strcasecmp(value, "off") == 0) {
-                cfg->multiConfig |= 0 << (2 * (u32)AUTOBOOTMODE);
-                return 1;
-            } else if (strcasecmp(value, "3ds") == 0) {
-                cfg->multiConfig |= 1 << (2 * (u32)AUTOBOOTMODE);
-                return 1;
-            } else if (strcasecmp(value, "dsi") == 0) {
-                cfg->multiConfig |= 2 << (2 * (u32)AUTOBOOTMODE);
-                return 1;
-            } else {
-                CHECK_PARSE_OPTION(-1);
         }
-        } else {
         CHECK_PARSE_OPTION(-1);
-        }
     } else if (strcmp(section, "rosalina") == 0) {
         // Rosalina options
         if (strcmp(name, "hbldr_3dsx_titleid") == 0) {
@@ -462,95 +333,18 @@ static int configIniHandler(void* user, const char* section, const char* name, c
             CHECK_PARSE_OPTION(parseKeyComboOption(&opt, value));
             cfg->rosalinaMenuCombo = opt;
             return 1;
-        } else if (strcmp(name, "plugin_loader_enabled") == 0) {
+        } else if (strcmp(name, "screen_filters_cct") == 0) {
-            bool opt;
+            s64 opt;
-            CHECK_PARSE_OPTION(parseBoolOption(&opt, value));
+            CHECK_PARSE_OPTION(parseDecIntOption(&opt, value, 1000, 25100));
-            cfg->pluginLoaderFlags = opt ? cfg->pluginLoaderFlags | 1 : cfg->pluginLoaderFlags & ~1;
+            cfg->screenFiltersCct = (u32)opt;
             return 1;
         } else if (strcmp(name, "ntp_tz_offset_min") == 0) {
             s64 opt;
             CHECK_PARSE_OPTION(parseDecIntOption(&opt, value, -779, 899));
             cfg->ntpTzOffetMinutes = (s16)opt;
             return 1;
-        } else {
-            CHECK_PARSE_OPTION(-1);
         }
-    } else if (strcmp(section, "screen_filters") == 0) {
+        else {
-        if (strcmp(name, "screen_filters_top_cct") == 0) {
-            s64 opt;
-            CHECK_PARSE_OPTION(parseDecIntOption(&opt, value, 1000, 25100));
-            cfg->topScreenFilter.cct = (u32)opt;
-            return 1;
-        } else if (strcmp(name, "screen_filters_top_gamma") == 0) {
-            s64 opt;
-            CHECK_PARSE_OPTION(parseDecFloatOption(&opt, value, 0, 8 * FLOAT_CONV_MULT));
-            cfg->topScreenFilter.gammaEnc = opt;
-            return 1;
-        } else if (strcmp(name, "screen_filters_top_contrast") == 0) {
-            s64 opt;
-            CHECK_PARSE_OPTION(parseDecFloatOption(&opt, value, 0, 255 * FLOAT_CONV_MULT));
-            cfg->topScreenFilter.contrastEnc = opt;
-            return 1;
-        } else if (strcmp(name, "screen_filters_top_brightness") == 0) {
-            s64 opt;
-            CHECK_PARSE_OPTION(parseDecFloatOption(&opt, value, -1 * FLOAT_CONV_MULT, 1 * FLOAT_CONV_MULT));
-            cfg->topScreenFilter.brightnessEnc = opt;
-            return 1;
-        } else if (strcmp(name, "screen_filters_top_invert") == 0) {
-            bool opt;
-            CHECK_PARSE_OPTION(parseBoolOption(&opt, value));
-            cfg->topScreenFilter.invert = opt;
-            return 1;
-        } else if (strcmp(name, "screen_filters_top_color_curve_adj") == 0) {
-            s64 opt;
-            CHECK_PARSE_OPTION(parseDecIntOption(&opt, value, 0, 2));
-            cfg->topScreenFilter.colorCurveCorrection = (u8)opt;
-            return 1;
-        } else if (strcmp(name, "screen_filters_bot_cct") == 0) {
-            s64 opt;
-            CHECK_PARSE_OPTION(parseDecIntOption(&opt, value, 1000, 25100));
-            cfg->bottomScreenFilter.cct = (u32)opt;
-            return 1;
-        } else if (strcmp(name, "screen_filters_bot_gamma") == 0) {
-            s64 opt;
-            CHECK_PARSE_OPTION(parseDecFloatOption(&opt, value, 0, 8 * FLOAT_CONV_MULT));
-            cfg->bottomScreenFilter.gammaEnc = opt;
-            return 1;
-        } else if (strcmp(name, "screen_filters_bot_contrast") == 0) {
-            s64 opt;
-            CHECK_PARSE_OPTION(parseDecFloatOption(&opt, value, 0, 255 * FLOAT_CONV_MULT));
-            cfg->bottomScreenFilter.contrastEnc = opt;
-            return 1;
-        } else if (strcmp(name, "screen_filters_bot_brightness") == 0) {
-            s64 opt;
-            CHECK_PARSE_OPTION(parseDecFloatOption(&opt, value, -1 * FLOAT_CONV_MULT, 1 * FLOAT_CONV_MULT));
-            cfg->bottomScreenFilter.brightnessEnc = opt;
-            return 1;
-        } else if (strcmp(name, "screen_filters_bot_invert") == 0) {
-            bool opt;
-            CHECK_PARSE_OPTION(parseBoolOption(&opt, value));
-            cfg->bottomScreenFilter.invert = opt;
-            return 1;
-        } else if (strcmp(name, "screen_filters_bot_color_curve_adj") == 0) {
-            s64 opt;
-            CHECK_PARSE_OPTION(parseDecIntOption(&opt, value, 0, 2));
-            cfg->bottomScreenFilter.colorCurveCorrection = (u8)opt;
-            return 1;
-        } else {
-            CHECK_PARSE_OPTION(-1);
-        }
-    } else if (strcmp(section, "autoboot") == 0) {
-        if (strcmp(name, "autoboot_dsi_titleid") == 0) {
-            u64 opt;
-            CHECK_PARSE_OPTION(parseHexIntOption(&opt, value, 0, 0xFFFFFFFFFFFFFFFFull));
-            cfg->autobootTwlTitleId = opt;
-            return 1;
-        } else if (strcmp(name, "autoboot_3ds_app_mem_type") == 0) {
-            s64 opt;
-            CHECK_PARSE_OPTION(parseDecIntOption(&opt, value, 0, 4));
-            cfg->autobootCtrAppmemtype = (u8)opt;
-            return 1;
-        } else {
             CHECK_PARSE_OPTION(-1);
         }
     } else if (strcmp(section, "misc") == 0) {
@@ -562,28 +356,7 @@ static int configIniHandler(void* user, const char* section, const char* name, c
                 return 1;
             }
         }
-
-        if (strcmp(name, "force_audio_output") == 0) {
-            if (strcasecmp(value, "off") == 0) {
-                cfg->multiConfig |= 0 << (2 * (u32)FORCEAUDIOOUTPUT);
-                return 1;
-            } else if (strcasecmp(value, "headphones") == 0) {
-                cfg->multiConfig |= 1 << (2 * (u32)FORCEAUDIOOUTPUT);
-                return 1;
-            } else if (strcasecmp(value, "speakers") == 0) {
-                cfg->multiConfig |= 2 << (2 * (u32)FORCEAUDIOOUTPUT);
-                return 1;
-            } else {
         CHECK_PARSE_OPTION(-1);
-            }
-        } else if (strcmp(name, "volume_slider_override") == 0) {
-            s64 opt;
-            CHECK_PARSE_OPTION(parseDecIntOption(&opt, value, -1, 100));
-            cfg->volumeSliderOverride = (s8)opt;
-            return 1;
-        } else {
-            CHECK_PARSE_OPTION(-1);
-        }
     } else {
         CHECK_PARSE_OPTION(-1);
     }
@@ -599,8 +372,6 @@ static size_t saveLumaIniConfigToStr(char *out)
 
     const char *splashPosStr;
     const char *n3dsCpuStr;
-    const char *autobootModeStr;
-    const char *forceAudioOutputStr;
 
     switch (MULTICONFIG(SPLASH)) {
         default: case 0: splashPosStr = "off"; break;
@@ -615,18 +386,6 @@ static size_t saveLumaIniConfigToStr(char *out)
         case 3: n3dsCpuStr = "clock+l2"; break;
     }
 
-    switch (MULTICONFIG(AUTOBOOTMODE)) {
-        default: case 0: autobootModeStr = "off"; break;
-        case 1: autobootModeStr = "3ds"; break;
-        case 2: autobootModeStr = "dsi"; break;
-    }
-
-    switch (MULTICONFIG(FORCEAUDIOOUTPUT)) {
-        default: case 0: forceAudioOutputStr = "off"; break;
-        case 1: forceAudioOutputStr = "headphones"; break;
-        case 2: forceAudioOutputStr = "speakers"; break;
-    }
-
     if (VERSION_BUILD != 0) {
         sprintf(lumaVerStr, "Luma3DS v%d.%d.%d", (int)VERSION_MAJOR, (int)VERSION_MINOR, (int)VERSION_BUILD);
     } else {
@@ -644,57 +403,30 @@ static size_t saveLumaIniConfigToStr(char *out)
     static const int pinOptionToDigits[] = { 0, 4, 6, 8 };
     int pinNumDigits = pinOptionToDigits[MULTICONFIG(PIN)];
 
-    char topScreenFilterGammaStr[32];
-    char topScreenFilterContrastStr[32];
-    char topScreenFilterBrightnessStr[32];
-    encodedFloatToString(topScreenFilterGammaStr, cfg->topScreenFilter.gammaEnc);
-    encodedFloatToString(topScreenFilterContrastStr, cfg->topScreenFilter.contrastEnc);
-    encodedFloatToString(topScreenFilterBrightnessStr, cfg->topScreenFilter.brightnessEnc);
-
-    char bottomScreenFilterGammaStr[32];
-    char bottomScreenFilterContrastStr[32];
-    char bottomScreenFilterBrightnessStr[32];
-    encodedFloatToString(bottomScreenFilterGammaStr, cfg->bottomScreenFilter.gammaEnc);
-    encodedFloatToString(bottomScreenFilterContrastStr, cfg->bottomScreenFilter.contrastEnc);
-    encodedFloatToString(bottomScreenFilterBrightnessStr, cfg->bottomScreenFilter.brightnessEnc);
-
     int n = sprintf(
         out, (const char *)config_template_ini,
         lumaVerStr, lumaRevSuffixStr,
 
         (int)CONFIG_VERSIONMAJOR, (int)CONFIG_VERSIONMINOR,
-        (int)CONFIG(AUTOBOOTEMU), (int)CONFIG(LOADEXTFIRMSANDMODULES),
+        (int)CONFIG(AUTOBOOTEMU), (int)CONFIG(USEEMUFIRM),
-        (int)CONFIG(PATCHGAMES), (int)CONFIG(REDIRECTAPPTHREADS),
+        (int)CONFIG(LOADEXTFIRMSANDMODULES), (int)CONFIG(PATCHGAMES),
         (int)CONFIG(PATCHVERSTRING), (int)CONFIG(SHOWGBABOOT),
 
         1 + (int)MULTICONFIG(DEFAULTEMU), 4 - (int)MULTICONFIG(BRIGHTNESS),
         splashPosStr, (unsigned int)cfg->splashDurationMsec,
         pinNumDigits, n3dsCpuStr,
-        autobootModeStr,
 
-        cfg->hbldr3dsxTitleId, rosalinaMenuComboStr, (int)(cfg->pluginLoaderFlags & 1),
+        cfg->hbldr3dsxTitleId, rosalinaMenuComboStr,
-        (int)cfg->ntpTzOffetMinutes,
+        (int)cfg->screenFiltersCct, (int)cfg->ntpTzOffetMinutes,
 
-        (int)cfg->topScreenFilter.cct, (int)cfg->bottomScreenFilter.cct,
+        (int)CONFIG(PATCHUNITINFO), (int)CONFIG(DISABLEARM11EXCHANDLERS),
-        (int)cfg->topScreenFilter.colorCurveCorrection, (int)cfg->bottomScreenFilter.colorCurveCorrection,
+        (int)CONFIG(ENABLESAFEFIRMROSALINA)
-        topScreenFilterGammaStr, bottomScreenFilterGammaStr,
-        topScreenFilterContrastStr, bottomScreenFilterContrastStr,
-        topScreenFilterBrightnessStr, bottomScreenFilterBrightnessStr,
-        (int)cfg->topScreenFilter.invert, (int)cfg->bottomScreenFilter.invert,
-
-        cfg->autobootTwlTitleId, (int)cfg->autobootCtrAppmemtype,
-
-        forceAudioOutputStr,
-        cfg->volumeSliderOverride,
-
-        (int)CONFIG(PATCHUNITINFO), (int)CONFIG(ENABLEDSIEXTFILTER),
-        (int)CONFIG(DISABLEARM11EXCHANDLERS), (int)CONFIG(ENABLESAFEFIRMROSALINA)
     );
 
     return n < 0 ? 0 : (size_t)n;
 }
 
-static char tmpIniBuffer[0x2000 + 0x400]; // eyeballed. TODO use #embed
+static char tmpIniBuffer[0x2000];
 
 static bool readLumaIniConfig(void)
 {
@@ -709,13 +441,6 @@ static bool readLumaIniConfig(void)
 static bool writeLumaIniConfig(void)
 {
     size_t n = saveLumaIniConfigToStr(tmpIniBuffer);
-
-    // FIXME: this is UB we should port snprintf sometime (as well as fix other tech debt)
-    if (n + 1 >= sizeof(tmpIniBuffer)) {
-        error("Configuration data buffer overflow, please report this issue");
-        __builtin_unreachable();
-    }
-
     return n != 0 && fileWrite(tmpIniBuffer, "config.ini", n);
 }
 
@@ -797,14 +522,9 @@ bool readConfig(void)
         configData.formatVersionMinor = CONFIG_VERSIONMINOR;
         configData.config |= 1u << PATCHVERSTRING;
         configData.splashDurationMsec = 3000;
-        configData.volumeSliderOverride = -1;
+        configData.hbldr3dsxTitleId = 0x000400000D921E00ull;
-        configData.hbldr3dsxTitleId = HBLDR_DEFAULT_3DSX_TID;
         configData.rosalinaMenuCombo = 1u << 9 | 1u << 7 | 1u << 2; // L+Start+Select
-        configData.topScreenFilter.cct = 6500; // default temp, no-op
+        configData.screenFiltersCct = 6500; // default temp, no-op
-        configData.topScreenFilter.gammaEnc = 1 * FLOAT_CONV_MULT; // 1.0f
-        configData.topScreenFilter.contrastEnc = 1 * FLOAT_CONV_MULT; // 1.0f
-        configData.bottomScreenFilter = configData.topScreenFilter;
-        configData.autobootTwlTitleId = AUTOBOOT_DEFAULT_TWL_TID;
         ret = false;
     }
     else
@@ -846,25 +566,19 @@ void configMenu(bool oldPinStatus, u32 oldPinMode)
                                                "Splash: Off( ) Before( ) After( ) payloads",
                                                "PIN lock: Off( ) 4( ) 6( ) 8( ) digits",
                                                "New 3DS CPU: Off( ) Clock( ) L2( ) Clock+L2( )",
-                                               "Hbmenu autoboot: Off( ) 3DS( ) DSi( )",
                                              };
 
     static const char *singleOptionsText[] = { "( ) Autoboot EmuNAND",
+                                               "( ) Use EmuNAND FIRM if booting with R",
                                                "( ) Enable loading external FIRMs and modules",
                                                "( ) Enable game patching",
-                                               "( ) Redirect app. syscore threads to core2",
                                                "( ) Show NAND or user string in System Settings",
                                                "( ) Show GBA boot screen in patched AGB_FIRM",
-
-                                               // Should always be the last 2 entries
-                                               "\nBoot chainloader",
-                                               "Save and exit"
                                              };
 
     static const char *optionsDescription[]  = { "Select the default EmuNAND.\n\n"
-                                                 "It will be booted when no directional\n"
+                                                 "It will be booted when no\n"
-                                                 "pad buttons are pressed (Up/Right/Down\n"
+                                                 "directional pad buttons are pressed.",
-                                                 "/Left equal EmuNANDs 1/2/3/4).",
 
                                                  "Select the screen brightness.",
 
@@ -893,14 +607,6 @@ void configMenu(bool oldPinStatus, u32 oldPinMode)
                                                  "'Clock+L2' can cause issues with some\n"
                                                  "games.",
 
-                                                 "Enable autobooting into homebrew menu,\n"
-                                                 "either into 3DS or DSi mode.\n\n"
-                                                 "Autobooting into a gamecard title is\n"
-                                                 "not supported.\n\n"
-                                                 "Refer to the \"autoboot\" section in the\n"
-                                                 "configuration file to configure\n"
-                                                 "this feature.",
-
                                                  "If enabled, an EmuNAND\n"
                                                  "will be launched on boot.\n\n"
                                                  "Otherwise, SysNAND will.\n\n"
@@ -910,6 +616,17 @@ void configMenu(bool oldPinStatus, u32 oldPinMode)
                                                  "(Up/Right/Down/Left equal EmuNANDs\n"
                                                  "1/2/3/4).",
 
+                                                 "If enabled, when holding R on boot\n"
+                                                 "SysNAND will be booted with an\n"
+                                                 "EmuNAND FIRM.\n\n"
+                                                 "Otherwise, an EmuNAND will be booted\n"
+                                                 "with the SysNAND FIRM.\n\n"
+                                                 "To use a different EmuNAND from the\n"
+                                                 "default, hold a directional pad button\n"
+                                                 "(Up/Right/Down/Left equal EmuNANDs\n"
+                                                 "1/2/3/4), also add A if you have\n"
+                                                 "a matching payload.",
+
                                                  "Enable loading external FIRMs and\n"
                                                  "system modules.\n\n"
                                                  "This isn't needed in most cases.\n\n"
@@ -920,45 +637,31 @@ void configMenu(bool oldPinStatus, u32 oldPinMode)
                                                  "of patched code binaries, exHeaders,\n"
                                                  "IPS code patches and LayeredFS\n"
                                                  "for specific games.\n\n"
-                                                 "Also makes certain DLCs for out-of-\n"
+                                                 "Also makes certain DLCs\n"
-                                                 "region games work.\n\n"
+                                                 "for out-of-region games work.\n\n"
                                                  "Refer to the wiki for instructions.",
 
-                                                 "Redirect app. threads that would spawn\n"
+                                                 "Enable showing the current NAND/FIRM:\n\n"
-                                                 "on core1, to core2 (which is an extra\n"
-                                                 "CPU core for applications that usually\n"
-                                                 "remains unused).\n\n"
-                                                 "This improves the performance of very\n"
-                                                 "demanding games (like Pok\x82mon US/UM)\n" // CP437
-                                                 "by about 10%. Can break some games\n"
-                                                 "and other applications.\n",
-
-                                                 "Enable showing the current NAND:\n\n"
                                                  "\t* Sys  = SysNAND\n"
                                                  "\t* Emu  = EmuNAND 1\n"
-                                                 "\t* EmuX = EmuNAND X\n\n"
+                                                 "\t* EmuX = EmuNAND X\n"
+                                                 "\t* SysE = SysNAND with EmuNAND 1 FIRM\n"
+                                                 "\t* SyEX = SysNAND with EmuNAND X FIRM\n"
+                                                 "\t* EmuS = EmuNAND 1 with SysNAND FIRM\n"
+                                                 "\t* EmXS = EmuNAND X with SysNAND FIRM\n\n"
                                                  "or a user-defined custom string in\n"
                                                  "System Settings.\n\n"
                                                  "Refer to the wiki for instructions.",
 
                                                  "Enable showing the GBA boot screen\n"
                                                  "when booting GBA games.",
-
-                                                // Should always be the last 2 entries
-                                                "Boot to the Luma3DS chainloader menu.",
-
-                                                 "Save the changes and exit. To discard\n"
-                                                 "any changes press the POWER button.\n"
-                                                 "Use START as a shortcut to this entry."
                                                };
 
     FirmwareSource nandType = FIRMWARE_SYSNAND;
     if(isSdMode)
     {
-        // Check if there is at least one emuNAND
-        u32 emuIndex = 0;
         nandType = FIRMWARE_EMUNAND;
-        locateEmuNand(&nandType, &emuIndex, false);
+        locateEmuNand(&nandType);
     }
 
     struct multiOption {
@@ -972,8 +675,6 @@ void configMenu(bool oldPinStatus, u32 oldPinMode)
         { .visible = true },
         { .visible = true },
         { .visible = ISN3DS },
-        { .visible = true },
-        // { .visible = true }, audio rerouting, hidden
     };
 
     struct singleOption {
@@ -982,9 +683,7 @@ void configMenu(bool oldPinStatus, u32 oldPinMode)
         bool visible;
     } singleOptions[] = {
         { .visible = nandType == FIRMWARE_EMUNAND },
-        { .visible = true },
+        { .visible = nandType == FIRMWARE_EMUNAND },
-        { .visible = true },
-        { .visible = ISN3DS },
         { .visible = true },
         { .visible = true },
         { .visible = true },
@@ -1021,7 +720,7 @@ void configMenu(bool oldPinStatus, u32 oldPinMode)
                                        "FIRM1" };
 
     drawString(true, 10, 10, COLOR_TITLE, CONFIG_TITLE);
-    drawString(true, 10, 10 + SPACING_Y, COLOR_TITLE, "Use the DPAD and A to change settings");
+    drawString(true, 10, 10 + SPACING_Y, COLOR_TITLE, "Press A to select, START to save");
     drawFormattedString(false, 10, SCREEN_HEIGHT - 2 * SPACING_Y, COLOR_YELLOW, "Booted from %s via %s", isSdMode ? "SD" : "CTRNAND", bootTypes[(u32)bootType]);
 
     //Character to display a selected option
@@ -1048,7 +747,7 @@ void configMenu(bool oldPinStatus, u32 oldPinMode)
 
         singleOptions[i].posY = endPos + SPACING_Y;
         endPos = drawString(true, 10, singleOptions[i].posY, color, singleOptionsText[i]);
-        if(singleOptions[i].enabled && singleOptionsText[i][0] == '(') drawCharacter(true, 10 + SPACING_X, singleOptions[i].posY, color, selected);
+        if(singleOptions[i].enabled) drawCharacter(true, 10 + SPACING_X, singleOptions[i].posY, color, selected);
 
         if(color == COLOR_RED)
         {
@@ -1060,34 +759,26 @@ void configMenu(bool oldPinStatus, u32 oldPinMode)
 
     drawString(false, 10, 10, COLOR_WHITE, optionsDescription[selectedOption]);
 
-    bool startPressed = false;
     //Boring configuration menu
     while(true)
     {
-        u32 pressed = 0;
+        u32 pressed;
-        if (!startPressed)
         do
         {
             pressed = waitInput(true) & MENU_BUTTONS;
         }
         while(!pressed);
 
-        // Force the selection of "save and exit" and trigger it.
+        if(pressed == BUTTON_START) break;
-        if(pressed & BUTTON_START)
-        {
-            startPressed = true;
-            // This moves the cursor to the last entry
-            pressed = BUTTON_RIGHT;
-        }
 
-        if(pressed & DPAD_BUTTONS)
+        if(pressed != BUTTON_A)
         {
             //Remember the previously selected option
             u32 oldSelectedOption = selectedOption;
 
             while(true)
             {
-                switch(pressed & DPAD_BUTTONS)
+                switch(pressed)
                 {
                     case BUTTON_UP:
                         selectedOption = !selectedOption ? totalIndexes : selectedOption - 1;
@@ -1125,7 +816,7 @@ void configMenu(bool oldPinStatus, u32 oldPinMode)
                 }
             }
 
-            if(selectedOption == oldSelectedOption && !startPressed) continue;
+            if(selectedOption == oldSelectedOption) continue;
 
             //The user moved to a different option, print the old option in white and the new one in red. Only print 'x's if necessary
             if(oldSelectedOption < multiOptionsAmount)
@@ -1146,7 +837,7 @@ void configMenu(bool oldPinStatus, u32 oldPinMode)
             drawString(false, 10, 10, COLOR_BLACK, optionsDescription[oldSelectedOption]);
             drawString(false, 10, 10, COLOR_WHITE, optionsDescription[selectedOption]);
         }
-        else if (pressed & BUTTON_A || startPressed)
+        else
         {
             //The selected option's status changed, print the 'x's accordingly
             if(isMultiOption)
@@ -1158,30 +849,16 @@ void configMenu(bool oldPinStatus, u32 oldPinMode)
                 if(selectedOption == BRIGHTNESS) updateBrightness(multiOptions[BRIGHTNESS].enabled);
             }
             else
-            {
-                // Save and exit was selected.
-                if (singleSelected == singleOptionsAmount - 1)
-                {
-                    drawString(true, 10, singleOptions[singleSelected].posY, COLOR_GREEN, singleOptionsText[singleSelected]);
-                    startPressed = false;
-                    break;
-                }
-                else if (singleSelected == singleOptionsAmount - 2) {
-                    loadHomebrewFirm(0);
-                    break;
-                }
-                else
             {
                 bool oldEnabled = singleOptions[singleSelected].enabled;
                 singleOptions[singleSelected].enabled = !oldEnabled;
                 if(oldEnabled) drawCharacter(true, 10 + SPACING_X, singleOptions[singleSelected].posY, COLOR_BLACK, selected);
             }
         }
-        }
 
         //In any case, if the current option is enabled (or a multiple choice option is selected) we must display a red 'x'
         if(isMultiOption) drawCharacter(true, 10 + multiOptions[selectedOption].posXs[multiOptions[selectedOption].enabled] * SPACING_X, multiOptions[selectedOption].posY, COLOR_RED, selected);
-        else if(singleOptions[singleSelected].enabled && singleOptionsText[singleSelected][0] == '(') drawCharacter(true, 10 + SPACING_X, singleOptions[singleSelected].posY, COLOR_RED, selected);
+        else if(singleOptions[singleSelected].enabled) drawCharacter(true, 10 + SPACING_X, singleOptions[singleSelected].posY, COLOR_RED, selected);
     }
 
     //Parse and write the new configuration

arm9/source/config.h

@@ -28,20 +28,18 @@
 
 #include "types.h"
 
-#define AUTOBOOT_DEFAULT_TWL_TID    0x0003000448424C41ull
-
 #define CONFIG(a)        (((configData.config >> (a)) & 1) != 0)
 #define MULTICONFIG(a)   ((configData.multiConfig >> (2 * (a))) & 3)
 #define BOOTCONFIG(a, b) ((configData.bootConfig >> (a)) & (b))
 
-#define CONFIG_FILE         "config.ini"
+#define CONFIG_FILE         "config.bin"
 #define CONFIG_VERSIONMAJOR 3
-#define CONFIG_VERSIONMINOR 13
+#define CONFIG_VERSIONMINOR 0
 
-#define BOOTCFG_NAND         BOOTCONFIG(0, 1)
+#define BOOTCFG_NAND         BOOTCONFIG(0, 7)
-#define BOOTCFG_EMUINDEX     BOOTCONFIG(1, 3)
+#define BOOTCFG_FIRM         BOOTCONFIG(3, 7)
-#define BOOTCFG_NOFORCEFLAG  BOOTCONFIG(3, 1)
+#define BOOTCFG_NOFORCEFLAG  BOOTCONFIG(6, 1)
-#define BOOTCFG_NTRCARDBOOT  BOOTCONFIG(4, 1)
+#define BOOTCFG_NTRCARDBOOT  BOOTCONFIG(7, 1)
 
 enum multiOptions
 {
@@ -49,21 +47,18 @@ enum multiOptions
     BRIGHTNESS,
     SPLASH,
     PIN,
-    NEWCPU,
+    NEWCPU
-    AUTOBOOTMODE,
-    FORCEAUDIOOUTPUT,
 };
 
 enum singleOptions
 {
     AUTOBOOTEMU = 0,
+    USEEMUFIRM,
     LOADEXTFIRMSANDMODULES,
     PATCHGAMES,
-    REDIRECTAPPTHREADS,
     PATCHVERSTRING,
     SHOWGBABOOT,
     PATCHUNITINFO,
-    ENABLEDSIEXTFILTER,
     DISABLEARM11EXCHANDLERS,
     ENABLESAFEFIRMROSALINA,
 

arm9/source/crypto.c

@@ -322,7 +322,7 @@ __attribute__((aligned(4))) static u8 nandCtr[AES_BLOCK_SIZE];
 static u8 nandSlot;
 static u32 fatStart = 0;
 
-FirmwareSource ctrNandLocation = FIRMWARE_SYSNAND;
+FirmwareSource firmSource = FIRMWARE_SYSNAND;
 
 __attribute__((aligned(4))) static const u8 key1s[2][AES_BLOCK_SIZE] = {
     {0x07, 0x29, 0x44, 0x38, 0xF8, 0xC9, 0x75, 0x93, 0xAA, 0x0E, 0x4A, 0xB4, 0xAE, 0x84, 0xC1, 0xD8},
@@ -348,7 +348,7 @@ int ctrNandInit(void)
     u8 __attribute__((aligned(4))) temp[0x200];
 
     //Read NCSD header
-    result = ctrNandLocation == FIRMWARE_SYSNAND ? sdmmc_nand_readsectors(0, 1, temp) : sdmmc_sdcard_readsectors(emuOffset + emuHeader, 1, temp);
+    result = firmSource == FIRMWARE_SYSNAND ? sdmmc_nand_readsectors(0, 1, temp) : sdmmc_sdcard_readsectors(emuOffset + emuHeader, 1, temp);
 
     if(!result)
     {
@@ -375,7 +375,7 @@ int ctrNandRead(u32 sector, u32 sectorCount, u8 *outbuf)
 
     //Read
     int result;
-    if(ctrNandLocation == FIRMWARE_SYSNAND)
+    if(firmSource == FIRMWARE_SYSNAND)
         result = sdmmc_nand_readsectors(sector + fatStart, sectorCount, outbuf);
     else
     {

arm9/source/crypto.h

@@ -110,7 +110,7 @@
 #define SHA_224_HASH_SIZE   (224 / 8)
 #define SHA_1_HASH_SIZE     (160 / 8)
 
-extern FirmwareSource ctrNandLocation;
+extern FirmwareSource firmSource;
 
 void sha(void *res, const void *src, u32 size, u32 mode);
 

arm9/source/deliver_arg.c

@@ -1,279 +0,0 @@
-/*
-*   This file is part of Luma3DS
-*   Copyright (C) 2022 Aurora Wright, TuxSH
-*
-*   This program is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   This program is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-*   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
-*       * Requiring preservation of specified reasonable legal notices or
-*         author attributions in that material or in the Appropriate Legal
-*         Notices displayed by works containing it.
-*       * Prohibiting misrepresentation of the origin of that material,
-*         or requiring that modified versions of such material be marked in
-*         reasonable ways as different from the original version.
-*/
-
-#include "deliver_arg.h"
-#include "utils.h"
-#include "memory.h"
-#include "config.h"
-#include "fs.h"
-#include "i2c.h"
-#include "screen.h"
-
-u8 *loadDeliverArg(void)
-{
-    static __attribute__((aligned(8))) u8 deliverArg[0x1000] = {0};
-    static bool deliverArgLoaded = false;
-
-    if (!deliverArgLoaded)
-    {
-        u32 bootenv = CFG_BOOTENV;  // this register is preserved across reboots
-        if ((bootenv & 1) == 0) // true coldboot
-        {
-            memset(deliverArg, 0, 0x1000);
-        }
-        else
-        {
-            u32 mode = bootenv >> 1;
-            if (mode == 0) // CTR mode
-            {
-                memcpy(deliverArg, (const void *)0x20000000, 0x1000);
-
-                // Validate deliver arg
-                u32 testPattern = *(u32 *)(deliverArg + 0x438);
-                u32 *crcPtr = (u32 *)(deliverArg + 0x43C);
-                u32 crc = *crcPtr;
-                *crcPtr = 0; // clear crc field before calculation
-                u32 expectedCrc = crc32(deliverArg + 0x400, 0x140, 0xFFFFFFFF);
-                *crcPtr = crc;
-                if (testPattern != 0xFFFF || crc != expectedCrc)
-                    memset(deliverArg, 0, 0x1000);
-            }
-            else // Legacy modes
-            {
-                // Copy TWL deliver arg stuff as-is (0...0x300)
-                copyFromLegacyModeFcram(deliverArg, (const void *)0x20000000, 0x400);
-
-                // Validate TLNC (TWL launcher params) block
-                // Note: Nintendo doesn't do crcLen bound check
-                u8 *tlnc = deliverArg + 0x300;
-                bool hasMagic = memcmp(tlnc, "TLNC", 4) == 0;
-                u8 crcLen = tlnc[5];
-                u16 crc = *(u16 *)(tlnc + 6);
-                if (!hasMagic || (8 + crcLen) > 0x100 || crc != crc16(tlnc + 8, crcLen, 0xFFFF))
-                    memset(tlnc, 0, 0x100);
-
-                memset(deliverArg + 0x400, 0, 0xC00);
-            }
-        }
-        deliverArgLoaded = true;
-    }
-
-    return deliverArg;
-}
-
-void commitDeliverArg(void)
-{
-    u8 *deliverArg = loadDeliverArg();
-    u32 bootenv = CFG_BOOTENV;
-
-    if ((bootenv & 1) == 0) // if true coldboot, set bootenv to "CTR mode reboot"
-    {
-        bootenv = 1;
-        CFG_BOOTENV = 1;
-    }
-
-    u32 mode = bootenv >> 1;
-    if (mode == 0) // CTR mode
-    {
-        *(u32 *)(deliverArg + 0x438) = 0xFFFF;
-        *(u32 *)(deliverArg + 0x43C) = 0; // clear CRC field before calculating it
-        *(u32 *)(deliverArg + 0x43C) = crc32(deliverArg + 0x400, 0x140, 0xFFFFFFFF);
-        memcpy((void *)0x20000000, deliverArg, 0x1000);
-    }
-    else // Legacy modes (just TWL mode, really)
-    {
-        copyToLegacyModeFcram((void *)0x20000000, deliverArg, 0x400);
-    }
-}
-
-bool hasValidTlncAutobootParams(void)
-{
-    u8 *tlnc = loadDeliverArg() + 0x300; // loadDeliverArg clears invalid TLNC blocks
-    return memcmp(tlnc, "TLNC", 4) == 0 && (*(u16 *)(tlnc + 0x18) & 1) != 0;
-}
-
-bool isTwlToCtrLaunch(void)
-{
-    // assumes TLNC block is valid
-    u8 *tlnc = loadDeliverArg() + 0x300; // loadDeliverArg clears invalid TLNC blocks
-    u64 twlTid = *(u64 *)(tlnc + 0x10);
-
-    switch (twlTid & ~0xFFull)
-    {
-        case 0x0000000000000000ull: // TWL Launcher -> Home menu (note: NS checks full TID)
-        case 0x00030015484E4200ull: // TWL System Settings -> CTR System Settings (mset)
-            return true;
-        default:
-            return false;
-    }
-}
-
-static bool configureHomebrewAutobootCtr(u8 *deliverArg)
-{
-    static const u8 appmemtypesO3ds[] = { 0, 2, 3, 4, 5 };
-    static const u8 appmemtypesN3ds[] = { 6, 7, 7, 7, 7 };
-
-    u64 hbldrTid = configData.hbldr3dsxTitleId;
-    hbldrTid = hbldrTid == 0 ? HBLDR_DEFAULT_3DSX_TID : hbldrTid; // replicate Loader's behavior
-    if ((hbldrTid >> 46) != 0x10) // Not a CTR titleId. Bail out
-        return false;
-
-    u8 memtype = configData.autobootCtrAppmemtype;
-    // autobootCtrAppmemtype already checked, but it doesn't hurt to check again
-    memtype = memtype >= 5 ? 0 : memtype;
-    deliverArg[0x400] = ISN3DS ? appmemtypesN3ds[memtype] : appmemtypesO3ds[memtype];
-
-    // Determine whether to load from the SD card or from NAND. We don't support gamecards for this
-    u32 category = (hbldrTid >> 32) & 0xFFFF;
-    bool isSdApp = (category & 0x10) == 0 && category != 1; // not a system app nor a DLP child
-    *(u64 *)(deliverArg + 0x440) = hbldrTid;
-    *(u64 *)(deliverArg + 0x448) = isSdApp ? 1 : 0;
-
-    // Tell NS to run the title, and that it's not a title jump from legacy mode
-    *(u32 *)(deliverArg + 0x460) = (0 << 1) | (1 << 0);
-
-    // Whenever power button is held long enough ("force shutdown"), mcu sysmodule
-    // stores a flag in free reg 0. It will clear it next boot.
-
-    // During that next boot, if that flag was set and if CFG_BOOTENV.bit0 is set
-    // (warmboot/firm chainload, i.e. not coldbooting), then main() will simulate
-    // a "power button held" interrupt (after upgrading mcu fw if necessary -- it
-    // will reboot console after if it has upgraded mcu fw, I guess that's one of
-    // the reasons the flag is there). This obviously cause other processes to initiate
-    // a shutdown, and it also sets that flag again.
-
-    // In the case of autoboot, ns will panic when this happens. This caused
-    // hb autoboot to keep failing over and over again.
-
-    // Select free reg 0, read it, select it again, write it (clearing force shutdown flag)
-    I2C_writeReg(I2C_DEV_MCU, 0x60, 0);
-    u8 flags = I2C_readReg(I2C_DEV_MCU, 0x61);
-    flags &= ~4;
-    I2C_writeReg(I2C_DEV_MCU, 0x60, 0);
-    I2C_writeReg(I2C_DEV_MCU, 0x61, flags);
-
-    CFG_BOOTENV = 1;
-
-    return true;
-}
-
-static bool configureHomebrewAutobootTwl(u8 *deliverArg)
-{
-    // Here, we pretend to be a TWL app rebooting into another TWL app.
-    // We get NS to do all the heavy lifting (starting NWM and AM, etc.) this way.
-
-    memset(deliverArg + 0x000, 0, 0x300); // zero TWL deliver arg params
-
-    // Now onto TLNC (launcher params):
-    u8 *tlnc = deliverArg + 0x300;
-    memset(tlnc, 0, 0x100);
-    memcpy(tlnc, "TLNC", 4);
-    tlnc[4] = 1; // version
-    tlnc[5] = 0x18; // length of data to calculate CRC over
-
-    *(u64 *)(tlnc + 8) = 0; // old title ID
-    *(u64 *)(tlnc + 0x10) = configData.autobootTwlTitleId; // new title ID
-    // bit4: "skip logo" ; bits2:1: NAND boot ; bit0: valid
-    *(u16 *)(tlnc + 0x18) = (1 << 4) | (3 << 1) | (1 << 0);
-
-    *(u16 *)(tlnc + 6) = crc16(tlnc + 8, 0x18, 0xFFFF);
-
-    // Even though (when running TWL/AGB FIRM) the SoC is in O3DS mode, and the GPU also is,
-    // as well as most other components behaving as such (external RAM, L2C not usable, etc.),
-    // this is NOT the case for the LCD and adaptive backlight logic which retains FULL N3DS
-    // functionality, including a feature where the window is blended with a given color depending
-    // on the overall relative luminance of that window.
-
-    // However, Nintendo's own code mistakenly assumes the opposite, and clearly so ("if GPU in N3DS mode"
-    // checks, not passing N3DS extra adaptive backlight (ABL) to TWL/AGB_FIRM). This has implications:
-
-    // - Powersaving (ABL) settings in TWL/AGB_FIRM is inconsistent with *both* O3DS (because the new RGB blend LUT
-    // has been set to its current value by NATIVE_FIRM) and N3DS (because "pwn_cnt" and "inertia" are missing
-    // their N3DS-only bits)
-    // - "rave party" when booting into TWL/AGB_FIRM or O3DS NATIVE_FIRM without these regs (well, the LUT) initialized.
-    // Easiest way to do so is by leveraging the "DSi autooboot" feature Luma provides. It is worth noting at least
-    // the LUT survives hardware reboots (if Nintendo were using DSi software that was using TLNC-based reboots,
-    // they wouldn't have noticed).
-
-    // As such, zerofill these registers (from testing, hardware explicitly discards null values, so this
-    // should be fine). For now, only touch the Luma-initiated autoboot path
-
-    if (ISN3DS)
-        zerofillN3dsAblRegisters();
-
-    CFG_BOOTENV = 3;
-
-    return true;
-}
-
-bool configureHomebrewAutoboot(void)
-{
-    bool ret;
-    u8 *deliverArg = loadDeliverArg();
-
-    u32 bootenv = CFG_BOOTENV;
-    u32 mode = bootenv >> 1;
-
-    // NS always writes a valid deliver arg on reboot, no matter what.
-    // Check if it is empty, and, of course, bail out if we aren't rebooting from
-    // NATIVE_FIRM.
-    // Checking if it is empty is necessary to let us reboot from autobooted hbmenu
-    // to hbmenu.
-
-    if (mode != 0)
-        return false;
-    else if (bootenv == 1)
-    {
-        for (u32 i = 0; i < 0x410; i++)
-        {
-            if (deliverArg[i] != 0)
-                return false;
-        }
-        for (u32 i = 0x440; i < 0x1000; i++)
-        {
-            if (deliverArg[i] != 0)
-                return false;
-        }
-    }
-
-    switch (MULTICONFIG(AUTOBOOTMODE))
-    {
-        case 1:
-            ret = configureHomebrewAutobootCtr(deliverArg);
-            break;
-        case 2:
-            ret = configureHomebrewAutobootTwl(deliverArg);
-            break;
-        case 0:
-        default:
-            ret = false;
-            break;
-    }
-
-    if (ret)
-        commitDeliverArg();
-    return ret;
-}

arm9/source/deliver_arg.h

@@ -1,37 +0,0 @@
-/*
-*   This file is part of Luma3DS
-*   Copyright (C) 2022 Aurora Wright, TuxSH
-*
-*   This program is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   This program is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-*   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
-*       * Requiring preservation of specified reasonable legal notices or
-*         author attributions in that material or in the Appropriate Legal
-*         Notices displayed by works containing it.
-*       * Prohibiting misrepresentation of the origin of that material,
-*         or requiring that modified versions of such material be marked in
-*         reasonable ways as different from the original version.
-*/
-
-#pragma once
-
-#include "types.h"
-
-u8 *loadDeliverArg(void);
-void commitDeliverArg(void);
-
-bool hasValidTlncAutobootParams(void);
-bool isTwlToCtrLaunch(void); // assumes TLNC block is valid
-
-bool configureHomebrewAutoboot(void);

arm9/source/draw.h

@@ -39,7 +39,6 @@
 #define COLOR_TITLE  0xFF9900
 #define COLOR_WHITE  0xFFFFFF
 #define COLOR_RED    0x0000FF
-#define COLOR_GREEN  0x00FF00
 #define COLOR_BLACK  0x000000
 #define COLOR_YELLOW 0x00FFFF
 

arm9/source/emunand.c

@@ -38,7 +38,7 @@
 u32 emuOffset,
     emuHeader;
 
-void locateEmuNand(FirmwareSource *nandType, u32 *emunandIndex, bool configureCtrNandParams)
+void locateEmuNand(FirmwareSource *nandType)
 {
     static u8 __attribute__((aligned(4))) temp[0x200];
     static u32 nandSize = 0,
@@ -51,10 +51,7 @@ void locateEmuNand(FirmwareSource *nandType, u32 *emunandIndex, bool configureCt
         fatStart = *(u32 *)(temp + 0x1C6); //First sector of the FAT partition
     }
 
-    /*if (*nandType == FIRMWARE_SYSNAND)
+    for(u32 i = 0; i < 3; i++)
-        return;*/
-
-    for(u32 i = 0; i < 3; i++)  // Test the different kinds of multi-EmuNAND there are, unless we are looking for the first one
     {
         static const u32 roundedMinsizes[] = {0x1D8000, 0x26E000};
 
@@ -68,64 +65,56 @@ void locateEmuNand(FirmwareSource *nandType, u32 *emunandIndex, bool configureCt
                 nandOffset = roundedMinsizes[ISN3DS ? 1 : 0]; //"Minsize" layout
                 break;
             case 0:
-                nandOffset = nandSize > 0x200000 ? 0x400000 : 0x200000; //"Legacy" layout
+                nandOffset = *nandType == FIRMWARE_EMUNAND ? 0 : (nandSize > 0x200000 ? 0x400000 : 0x200000); //"Legacy" layout
                 break;
         }
 
-        nandOffset *= *emunandIndex; // always 0 for 1st EmuNAND
+        if(*nandType != FIRMWARE_EMUNAND) nandOffset *= ((u32)*nandType - 1);
 
         if(fatStart >= nandOffset + roundedMinsizes[ISN3DS ? 1 : 0])
         {
             //Check for RedNAND
             if(!sdmmc_sdcard_readsectors(nandOffset + 1, 1, temp) && memcmp(temp + 0x100, "NCSD", 4) == 0)
-            {
-                if (configureCtrNandParams)
             {
                 emuOffset = nandOffset + 1;
                 emuHeader = 0;
-                }
                 return;
             }
 
             //Check for Gateway EmuNAND
             else if(i != 2 && !sdmmc_sdcard_readsectors(nandOffset + nandSize, 1, temp) && memcmp(temp + 0x100, "NCSD", 4) == 0)
-            {
-                if (configureCtrNandParams)
             {
                 emuOffset = nandOffset;
                 emuHeader = nandSize;
-                }
                 return;
             }
         }
 
-        if(*emunandIndex == 0) break; // See above comments
+        if(*nandType == FIRMWARE_EMUNAND) break;
     }
 
     //Fallback to the first EmuNAND if there's no second/third/fourth one, or to SysNAND if there isn't any
-    if(*emunandIndex != 0)
+    if(*nandType != FIRMWARE_EMUNAND)
     {
-        *emunandIndex = 0;
+        *nandType = FIRMWARE_EMUNAND;
-        locateEmuNand(nandType, emunandIndex, configureCtrNandParams);
+        locateEmuNand(nandType);
     }
     else *nandType = FIRMWARE_SYSNAND;
 }
 
-static inline u32 getProtoSdmmc(u32 *sdmmc, u32 firmVersion)
+static inline bool getFreeK9Space(u8 *pos, u32 size, u8 **freeK9Space)
 {
-    switch(firmVersion)
+    static const u8 pattern[] = {0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00};
-    {
-        case 243: // SDK 0.9.x (0.9.7?)
-            *sdmmc = (0x080AAA28 + 0x4e0);
-            break;
-        case 238: // SDK 0.10
-            *sdmmc = (0x080BEA70 + 0x690);
-            break;
-        default:
-            return 1;
-    }
 
-    return 0;
+    //Looking for the last free space before Process9
+    *freeK9Space = memsearch(pos, pattern, size, sizeof(pattern));
+
+    if(*freeK9Space == NULL || (u32)(pos + size - *freeK9Space) < 0x455 + emunandPatchSize ||
+       *(u32 *)(*freeK9Space + 0x455 + emunandPatchSize - 4) != 0xFFFFFFFF) return false;
+
+    *freeK9Space += 0x455;
+
+    return true;
 }
 
 static inline u32 getOldSdmmc(u32 *sdmmc, u32 firmVersion)
@@ -160,7 +149,7 @@ static inline u32 getSdmmc(u8 *pos, u32 size, u32 *sdmmc)
     return 0;
 }
 
-static inline u32 patchNandRw(u8 *pos, u32 size, u32 hookAddr)
+static inline u32 patchNandRw(u8 *pos, u32 size, u32 branchOffset)
 {
     //Look for read/write code
     static const u8 pattern[] = {0x1E, 0x00, 0xC8, 0x05};
@@ -178,118 +167,32 @@ static inline u32 patchNandRw(u8 *pos, u32 size, u32 hookAddr)
     writeOffset -= 3;
     *readOffset = *writeOffset = 0x4C00;
     readOffset[1] = writeOffset[1] = 0x47A0;
-    ((u32 *)writeOffset)[1] = ((u32 *)readOffset)[1] = hookAddr;
+    ((u32 *)writeOffset)[1] = ((u32 *)readOffset)[1] = branchOffset;
 
     return 0;
 }
 
-static inline u32 patchProtoNandRw(u8 *pos, u32 size, u32 hookAddr, u32 hookCidAddr)
+static inline u32 patchMpu(u8 *pos, u32 size)
 {
-    //Look for read/write code
+    //Look for MPU pattern
-    static const u8 pattern[] = {
+    static const u8 pattern[] = {0x03, 0x00, 0x24, 0x00};
-        0x03, 0x00, 0x51, 0xE3, // cmp r1, #3
-        0x02, 0xC0, 0xA0, 0xE1, // mov r12, r2
-        0x04, 0x00, 0x80, 0xE2, // add r0, r0, #4
-    };
 
-    u32 *writeOffset = (u32 *)memsearch(pos, pattern, size, sizeof(pattern));
+    u16 *off = (u16 *)memsearch(pos, pattern, size, sizeof(pattern));
 
-    if(writeOffset == NULL) return 1;
+    if(off == NULL) return 1;
 
-    u32 *readOffset = (u32 *)memsearch((u8 *)(writeOffset + 3), pattern, 0x400, sizeof(pattern));
+    off[1] = 0x0036;
-
+    off[0xC] = off[0x12] = 0x0603;
-    if(readOffset == NULL) return 1;
-
-    // Find the sdmmc mount/init(?) function
-    static const u8 mount_pattern[] = {
-        0x20, 0x00, 0x84, 0xE2, // add r0, r4, 0x20
-        0x01, 0x20, 0xA0, 0xE3, // mov r2, #1
-        0x00, 0x10, 0xA0, 0xE3, // mov r1, #0
-    };
-    u32* mountOffset = (u32*) memsearch(pos, mount_pattern, size, sizeof(mount_pattern));
-    if (mountOffset == NULL) return 1;
-
-    // Find the sdmmc read cid function.
-    static const u8 readcid_pattern[] = {
-        0x31, 0xFF, 0x2F, 0xE1, // blx r1
-        0x20, 0x60, 0x9F, 0xE5, // ldr r6, [pc, #0x20] // =failing_result
-        0x00, 0x00, 0x50, 0xE3, // cmp r0, #0
-    };
-    u32* readCidOffset = (u32*) memsearch(pos, readcid_pattern, size, sizeof(readcid_pattern));
-    if (readCidOffset == NULL) return 1;
-    readCidOffset -= 5;
-
-    mountOffset[1] = 0xe3a02000; // mov r2, #0 // sd-card
-
-    readOffset[0] = writeOffset[0] = 0xe52de004; // push {lr}
-    readOffset[1] = writeOffset[1] = 0xe59fc000; // ldr r12, [pc, #0]
-    readOffset[2] = writeOffset[2] = 0xe12fff3c; // blx r12
-    readOffset[3] = writeOffset[3] = hookAddr;
-
-    readCidOffset[0] = 0xe59fc000; // ldr r12, [pc, #0]
-    readCidOffset[1] = 0xe12fff3c; // blx r12
-    readCidOffset[2] = hookCidAddr;
-
-    // Read the emmc cid into the place hook will copy it from
-    sdmmc_get_cid(1, emunandPatchNandCid);
 
     return 0;
 }
 
-static inline u32 patchProtoNandRw238(u8 *pos, u32 size, u32 hookAddr, u32 hookCidAddr)
+u32 patchEmuNand(u8 *arm9Section, u32 kernel9Size, u8 *process9Offset, u32 process9Size, u8 *kernel9Address, u32 firmVersion)
 {
-    //Look for read/write code
+    u8 *freeK9Space;
-    static const u8 pattern[] = {
-        0x03, 0x00, 0x50, 0xE3, // cmp r0, #3
-        0x00, 0x00, 0xA0, 0x13, // movne r0, #0
-        0x01, 0x00, 0xA0, 0x03, // moveq r0, #1
-    };
 
-    u32 *writeOffset = (u32 *)memsearch(pos, pattern, size, sizeof(pattern));
+    if(!getFreeK9Space(arm9Section, kernel9Size, &freeK9Space)) return 1;
 
-    if(writeOffset == NULL) return 1;
-
-    u32 *readOffset = (u32 *)memsearch((u8 *)(writeOffset + 3), pattern, 0x400, sizeof(pattern));
-
-    if(readOffset == NULL) return 1;
-
-    // Find the mmc static ctor...
-    static const u8 mount_pattern[] = {
-        0x08, // last byte of some ptr to something in P9
-        0x01, 0x01, 0x00, 0x00, // emmc controller id
-    };
-    u8* mountOffset = (u8*) memsearch(pos, mount_pattern, size, sizeof(mount_pattern));
-    if (mountOffset == NULL) return 1;
-    mountOffset++;
-
-    // Find the sdmmc read cid function.
-    static const u8 readcid_pattern[] = {
-        0x31, 0xFF, 0x2F, 0xE1, // blx r1
-        0x20, 0x60, 0x9F, 0xE5, // ldr r6, [pc, #0x20] // =failing_result
-        0x00, 0x00, 0x50, 0xE3, // cmp r0, #0
-    };
-    u32* readCidOffset = (u32*) memsearch(pos, readcid_pattern, size, sizeof(readcid_pattern));
-    if (readCidOffset == NULL) return 1;
-    readCidOffset -= 5;
-
-    *(u32*)mountOffset = 0x300; // sd card
-
-    readOffset[0] = writeOffset[0] = 0xe59fc000; // ldr r12, [pc, #0]
-    readOffset[1] = writeOffset[1] = 0xe12fff3c; // blx r12
-    readOffset[2] = writeOffset[2] = hookAddr;
-
-    readCidOffset[0] = 0xe59fc000; // ldr r12, [pc, #0]
-    readCidOffset[1] = 0xe12fff3c; // blx r12
-    readCidOffset[2] = hookCidAddr;
-
-    // Read the emmc cid into the place hook will copy it from
-    sdmmc_get_cid(1, emunandPatchNandCid);
-
-    return 0;
-}
-
-u32 patchEmuNand(u8 *process9Offset, u32 process9Size, u32 firmVersion)
-{
     u32 ret = 0;
 
     //Add the data of the found EmuNAND
@@ -301,38 +204,15 @@ u32 patchEmuNand(u8 *process9Offset, u32 process9Size, u32 firmVersion)
     ret += !ISN3DS && firmVersion < 0x25 ? getOldSdmmc(&sdmmc, firmVersion) : getSdmmc(process9Offset, process9Size, &sdmmc);
     if(!ret) emunandPatchSdmmcStructPtr = sdmmc;
 
+    //Copy EmuNAND code
+    memcpy(freeK9Space, emunandPatch, emunandPatchSize);
+
     //Add EmuNAND hooks
-    ret += patchNandRw(process9Offset, process9Size, (u32)emunandPatch);
+    u32 branchOffset = (u32)(freeK9Space - arm9Section + kernel9Address);
-
+    ret += patchNandRw(process9Offset, process9Size, branchOffset);
-    return ret;
+
-}
+    //Set MPU
-
+    ret += patchMpu(arm9Section, kernel9Size);
-u32 patchProtoEmuNand(u8 *process9Offset, u32 process9Size)
-{
-    extern u32 firmProtoVersion;
-    u32 ret = 0;
-
-    // Add the data of the found EmuNAND
-    emunandPatchNandOffset = emuOffset;
-    emunandPatchNcsdHeaderOffset = emuHeader;
-
-    // Find and add the SDMMC struct
-    u32 sdmmc;
-    ret += getProtoSdmmc(&sdmmc, firmProtoVersion);
-    if(!ret) emunandPatchSdmmcStructPtr = sdmmc;
-
-    // Add EmuNAND hooks
-    switch (firmProtoVersion) {
-        case 243: // SDK 0.9.x (0.9.7?)
-            ret += patchProtoNandRw(process9Offset, process9Size, (u32)emunandProtoPatch, (u32)emunandProtoCidPatch);
-            break;
-        case 238: // SDK 0.10.x
-            ret += patchProtoNandRw238(process9Offset, process9Size, (u32)emunandProtoPatch238, (u32)emunandProtoCidPatch);
-            break;
-        default:
-            ret++;
-            break;
-    }
 
     return ret;
 }

arm9/source/emunand.h

@@ -37,6 +37,5 @@
 extern u32 emuOffset,
            emuHeader;
 
-void locateEmuNand(FirmwareSource *nandType, u32 *emunandIndex, bool configureCtrNandParams);
+void locateEmuNand(FirmwareSource *nandType);
-u32 patchEmuNand(u8 *process9Offset, u32 process9Size, u32 firmVersion);
+u32 patchEmuNand(u8 *arm9Section, u32 kernel9Size, u8 *process9Offset, u32 process9Size, u8 *kernel9Address, u32 firmVersion);
-u32 patchProtoEmuNand(u8 *process9Offset, u32 process9Size);

arm9/source/emunand_patch.s

@@ -1,194 +0,0 @@
-.section .emunand_patch, "aw", %progbits
-.arm
-.align 4
-
-@ Code originally by Normmatt
-
-.global emunandPatch
-emunandPatch:
-    @ Original code that still needs to be executed
-    mov r4, r0
-    mov r5, r1
-    mov r7, r2
-    mov r6, r3
-    @ End
-
-    @ If we're already trying to access the SD, return
-    ldr r2, [r0, #4]
-    ldr r1, emunandPatchSdmmcStructPtr
-    cmp r2, r1
-    beq out
-
-    str r1, [r0, #4] @ Set object to be SD
-    ldr r2, [r0, #8] @ Get sector to read
-    cmp r2, #0 @ For GW compatibility, see if we're trying to read the ncsd header (sector 0)
-
-    ldr r3, emunandPatchNandOffset
-    add r2, r3 @ Add the offset to the NAND in the SD
-
-    ldreq r3, emunandPatchNcsdHeaderOffset
-    addeq r2, r3 @ If we're reading the ncsd header, add the offset of that sector
-
-    str r2, [r0, #8] @ Store sector to read
-
-    out:
-        @ Restore registers.
-        mov r1, r5
-        mov r2, r7
-        mov r3, r6
-
-        @ Return 4 bytes behind where we got called,
-        @ due to the offset of this function being stored there
-        mov r0, lr
-        add r0, #4
-        bx r0
-
-.pool
-
-_emunandPatchEnd:
-
-.global emunandProtoPatch
-emunandProtoPatch:
-    @ Save registers
-    push {r0-r3}
-
-    @ If we're already trying to access the SD, return
-    ldr r2, [r0, #4]
-    ldr r1, emunandPatchSdmmcStructPtr
-    cmp r2, r1
-    beq _out
-
-    ldrb r2, [r1, #0xc] @ Get sdmc->m_isInitialised
-    cmp r2, #0 @ Is initialised?
-    beq _pastSdmc @ if not, use "NAND" object, patched elsewhere to access SD
-    str r1, [r0, #4] @ Set object to be SD
-    _pastSdmc:
-    ldr r2, [r0, #8] @ Get sector to read
-    cmp r2, #0 @ For GW compatibility, see if we're trying to read the ncsd header (sector 0)
-
-    ldr r3, emunandPatchNandOffset
-    add r2, r3 @ Add the offset to the NAND in the SD
-
-    ldreq r3, emunandPatchNcsdHeaderOffset
-    addeq r2, r3 @ If we're reading the ncsd header, add the offset of that sector
-
-    str r2, [r0, #8] @ Store sector to read
-
-    _out:
-        @ Restore registers
-        pop {r0-r3}
-        @ Execute original code that got patched.
-        cmp r1, #3
-        mov r12, r2
-        add r0, r0, #4
-        movne r1, #0
-        moveq r1, #1
-        @ r2 about to be overwritten, so it's free to use here.
-        @ Save off our return address and restore lr.
-        mov r2, lr
-        pop {lr}
-        @ r2+0 is return address (patched movne r1, #0)
-        @ r2+4 is moveq r1, #1
-        @ r2+8 is the following instruction (mov r2, r3)
-        add r2, #8
-        bx r2
-
-.global emunandProtoCidPatch
-emunandProtoCidPatch:
-    @ If we're already trying to access the SD, return
-    ldr r4, emunandPatchSdmmcStructPtr
-    cmp r0, r4
-    beq _cid_return
-    
-    @ Trying to access nand, so copy the NAND cid into r1
-    adr r4, emunandPatchNandCid
-    ldr r2, [r4, #0]
-    ldr r3, [r4, #4]
-    ldr r5, [r4, #8]
-    ldr r6, [r4, #0xc]
-    str r2, [r1, #0]
-    str r3, [r1, #4]
-    str r5, [r1, #8]
-    str r6, [r1, #0xc]
-    @ And return from whence we came
-    mov r0, #0
-    pop {r4-r6, pc}
-    
-    _cid_return:
-        @ Execute original code that got patched.
-        mov r4, r0
-        ldr r0, [r0]
-        mov r5, r1
-        @ lr+0 is return address (patched mov r5, r1)
-        @ lr+4 is following instruction (ldr r1, [r0,#8])
-        add lr, #4
-        bx lr
-
-.global emunandProtoPatch238
-emunandProtoPatch238:
-    @ Save registers
-    push {r0-r3}
-
-    @ If we're already trying to access the SD, return
-    ldr r2, [r4, #4]
-    ldr r1, emunandPatchSdmmcStructPtr
-    cmp r2, r1
-    beq _out238
-
-    ldr r2, [r1, #0x24] @ Get sdmc->m_someObjInitedLater
-    cmp r2, #0 @ Is initialised?
-    beq _pastSdmc238 @ if not, use "NAND" object, patched elsewhere to access SD
-    str r1, [r4, #4] @ Set object to be SD
-    _pastSdmc238:
-
-    ldr r2, [r4, #8] @ Get sector to read
-    cmp r2, #0 @ For GW compatibility, see if we're trying to read the ncsd header (sector 0)
-
-    ldr r3, emunandPatchNandOffset
-    add r2, r3 @ Add the offset to the NAND in the SD
-
-    ldreq r3, emunandPatchNcsdHeaderOffset
-    addeq r2, r3 @ If we're reading the ncsd header, add the offset of that sector
-
-    str r2, [r4, #8] @ Store sector to read
-
-    _out238:
-        @ Restore registers
-        pop {r0-r3}
-        @ Execute original code that got patched.
-        cmp r0, #3
-        movne r0, #0
-        moveq r0, #1
-        @ r1 about to be overwritten, so it's free to use here.
-        @ Save off our return address.
-        mov r1, lr
-        @ r1+0 is return address (patched moveq r1, #1)
-        @ r1+4 is tst r0, #0xff or sub sp, sp, #0xc
-        add r1, #4
-        bx r1
-
-.pool
-
-.global emunandPatchSdmmcStructPtr
-.global emunandPatchNandOffset
-.global emunandPatchNcsdHeaderOffset
-.global emunandPatchNandCid
-
-_emunandPatchBssStart:
-emunandPatchSdmmcStructPtr:     .word   0 @ Pointer to sdmmc struct
-emunandPatchNandOffset:         .word   0 @ For rednand this should be 1
-emunandPatchNcsdHeaderOffset:   .word   0 @ Depends on nand manufacturer + emunand type (GW/RED)
-emunandPatchNandCid:                      @ Store emmc cid here, to override "sdmc's" when trying to read emmc's
-    .word 0,0,0,0 
-_emunandPatchBssEnd:
-
-.pool
-.balign 4
-
-.global emunandPatchSize
-emunandPatchSize:
-    .word _emunandPatchEnd - emunandPatch
-
-.global emunandPatchBssSize
-emunandPatchBssSize:
-    .word _emunandPatchBssEnd - _emunandPatchBssStart

arm9/source/fatfs/00history.txt

@@ -328,42 +328,3 @@ R0.13c (October 14, 2018)
   Fixed creating a sub-directory in the fragmented sub-directory on the exFAT volume collapses FAT chain of the parent directory. (appeared at R0.12)
   Fixed f_getcwd() cause output buffer overrun when the buffer has a valid drive number. (appeared at R0.13b)
 
-
-
-R0.14 (October 14, 2019)
-  Added support for 64-bit LBA and GUID partition table (FF_LBA64 = 1)
-  Changed some API functions, f_mkfs() and f_fdisk().
-  Fixed f_open() function cannot find the file with file name in length of FF_MAX_LFN characters.
-  Fixed f_readdir() function cannot retrieve long file names in length of FF_MAX_LFN - 1 characters.
-  Fixed f_readdir() function returns file names with wrong case conversion. (appeared at R0.12)
-  Fixed f_mkfs() function can fail to create exFAT volume in the second partition. (appeared at R0.12)
-
-
-R0.14a (December 5, 2020)
-  Limited number of recursive calls in f_findnext().
-  Fixed old floppy disks formatted with MS-DOS 2.x and 3.x cannot be mounted.
-  Fixed some compiler warnings.
-
-
-
-R0.14b (April 17, 2021)
-  Made FatFs uses standard library <string.h> for copy, compare and search instead of built-in string functions.
-  Added support for long long integer and floating point to f_printf(). (FF_STRF_LLI and FF_STRF_FP)
-  Made path name parser ignore the terminating separator to allow "dir/".
-  Improved the compatibility in Unix style path name feature.
-  Fixed the file gets dead-locked when f_open() failed with some conditions. (appeared at R0.12a)
-  Fixed f_mkfs() can create wrong exFAT volume due to a timing dependent error. (appeared at R0.12)
-  Fixed code page 855 cannot be set by f_setcp().
-  Fixed some compiler warnings.
-
-
-
-R0.15 (November 6, 2022)
-  Changed user provided synchronization functions in order to completely eliminate the platform dependency from FatFs code.
-  FF_SYNC_t is removed from the configuration options.
-  Fixed a potential error in f_mount when FF_FS_REENTRANT.
-  Fixed file lock control FF_FS_LOCK is not mutal excluded when FF_FS_REENTRANT && FF_VOLUMES > 1 is true.
-  Fixed f_mkfs() creates broken exFAT volume when the size of volume is >= 2^32 sectors.
-  Fixed string functions cannot write the unicode characters not in BMP when FF_LFN_UNICODE == 2 (UTF-8).
-  Fixed a compatibility issue in identification of GPT header.
-

arm9/source/fatfs/00readme.txt

@@ -1,4 +1,4 @@
-FatFs Module Source Files R0.15
+FatFs Module Source Files R0.13c
 
 
 FILES

arm9/source/fatfs/diskio.c

@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------*/
-/* Low level disk I/O module SKELETON for FatFs     (C)ChaN, 2019        */
+/* Low level disk I/O module skeleton for FatFs     (C)ChaN, 2014        */
 /*-----------------------------------------------------------------------*/
 /* If a working storage control module is available, it should be        */
 /* attached to the FatFs via a glue function rather than modifying it.   */
@@ -7,13 +7,12 @@
 /* storage control modules to the FatFs module with a defined API.       */
 /*-----------------------------------------------------------------------*/
 
-#include "ff.h"			/* Obtains integer types */
+#include "diskio.h"		/* FatFs lower layer API */
-#include "diskio.h"		/* Declarations of disk functions */
 #include "sdmmc/sdmmc.h"
 #include "../crypto.h"
 #include "../i2c.h"
 
-/* Definitions of physical drive number for each drive */
+/* Definitions of physical drive number for each media */
 #define SDCARD        0
 #define CTRNAND       1
 
@@ -22,10 +21,10 @@
 /*-----------------------------------------------------------------------*/
 
 DSTATUS disk_status (
+    __attribute__((unused))
     BYTE pdrv		/* Physical drive nmuber to identify the drive */
 )
 {
-    (void)pdrv;
     return RES_OK;
 }
 
@@ -40,27 +39,11 @@ DSTATUS disk_initialize (
 )
 {
         static u32 sdmmcInitResult = 4;
-    DSTATUS res = 0;
 
-    if(sdmmcInitResult == 4)
+        if(sdmmcInitResult == 4) sdmmcInitResult = sdmmc_sdcard_init();
-        sdmmcInitResult = sdmmc_sdcard_init();
 
-    // Check physical drive initialized status
+    return ((pdrv == SDCARD && !(sdmmcInitResult & 2)) ||
-    switch (pdrv)
+            (pdrv == CTRNAND && !(sdmmcInitResult & 1) && !ctrNandInit())) ? 0 : STA_NOINIT;
-    {
-        case SDCARD:
-            res = (sdmmcInitResult & 2) == 0 ? 0 : STA_NOINIT;
-            break;
-        case CTRNAND:
-            // Always update CTRNAND parameters when remounting
-            res = (sdmmcInitResult & 1) == 0 && ctrNandInit() == 0 ? 0 : STA_NOINIT;
-            break;
-        default:
-            res = STA_NODISK;
-            break;
-    }
-
-    return res;
 }
 
 
@@ -72,26 +55,12 @@ DSTATUS disk_initialize (
 DRESULT disk_read (
     BYTE pdrv,		/* Physical drive nmuber to identify the drive */
     BYTE *buff,		/* Data buffer to store read data */
-    LBA_t sector,	/* Start sector in LBA */
+    DWORD sector,	/* Sector address in LBA */
     UINT count		/* Number of sectors to read */
 )
 {
-    DRESULT res = RES_OK;
+    return ((pdrv == SDCARD && !sdmmc_sdcard_readsectors(sector, count, buff)) ||
-
+            (pdrv == CTRNAND && !ctrNandRead(sector, count, buff))) ? RES_OK : RES_PARERR;
-    switch (pdrv)
-    {
-        case SDCARD:
-            res = sdmmc_sdcard_readsectors(sector, count, buff) == 0 ? RES_OK : RES_PARERR;
-            break;
-        case CTRNAND:
-            res = ctrNandRead(sector, count, buff) == 0 ? RES_OK : RES_PARERR;
-            break;
-        default:
-            res = RES_NOTRDY;
-            break;
-    }
-
-    return res;
 }
 
 
@@ -100,54 +69,37 @@ DRESULT disk_read (
 /* Write Sector(s)                                                       */
 /*-----------------------------------------------------------------------*/
 
-#if FF_FS_READONLY == 0
+#if _USE_WRITE
-
 DRESULT disk_write (
     BYTE pdrv,			/* Physical drive nmuber to identify the drive */
     const BYTE *buff,       	/* Data to be written */
-    LBA_t sector,		/* Start sector in LBA */
+    DWORD sector,		/* Sector address in LBA */
     UINT count			/* Number of sectors to write */
 )
 {
-    DRESULT res = RES_OK;
+    return ((pdrv == SDCARD && (*(vu16 *)(SDMMC_BASE + REG_SDSTATUS0) & TMIO_STAT0_WRPROTECT) != 0 && !sdmmc_sdcard_writesectors(sector, count, buff)) ||
-
+            (pdrv == CTRNAND && !ctrNandWrite(sector, count, buff))) ? RES_OK : RES_PARERR;
-    switch (pdrv)
-    {
-        case SDCARD:
-        {
-            if ((*(vu16 *)(SDMMC_BASE + REG_SDSTATUS0) & TMIO_STAT0_WRPROTECT) == 0) // why == 0?
-                res = RES_WRPRT;
-            else
-                res = sdmmc_sdcard_writesectors(sector, count, buff) == 0 ? RES_OK : RES_PARERR;
-            break;
-        }
-        case CTRNAND:
-            res = ctrNandWrite(sector, count, buff) == 0 ? RES_OK : RES_PARERR;
-            break;
-        default:
-            res = RES_NOTRDY;
-            break;
-    }
-
-    return res;
 }
 #endif
 
 
+
 /*-----------------------------------------------------------------------*/
 /* Miscellaneous Functions                                               */
 /*-----------------------------------------------------------------------*/
 
+#if _USE_IOCTL
 DRESULT disk_ioctl (
+    __attribute__((unused))
     BYTE pdrv,		/* Physical drive nmuber (0..) */
     BYTE cmd,		/* Control code */
+    __attribute__((unused))
     void *buff		/* Buffer to send/receive control data */
 )
 {
-    (void)pdrv;
-    (void)buff;
     return cmd == CTRL_SYNC ? RES_OK : RES_PARERR;
 }
+#endif
 
 // From GodMode9
 #define BCDVALID(b) (((b)<=0x99)&&(((b)&0xF)<=0x9)&&((((b)>>4)&0xF)<=0x9))

arm9/source/fatfs/diskio.h

@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------/
-/  Low level disk interface modlue include file   (C)ChaN, 2019          /
+/  Low level disk interface modlue include file   (C)ChaN, 2014          /
 /-----------------------------------------------------------------------*/
 
 #ifndef _DISKIO_DEFINED
@@ -9,6 +9,12 @@
 extern "C" {
 #endif
 
+#define _USE_WRITE	1	/* 1: Enable disk_write function */
+#define _USE_IOCTL	1	/* 1: Enable disk_ioctl fucntion */
+
+#include "integer.h"
+
+
 /* Status of Disk Functions */
 typedef BYTE	DSTATUS;
 
@@ -28,10 +34,11 @@ typedef enum {
 
 DSTATUS disk_initialize (BYTE pdrv);
 DSTATUS disk_status (BYTE pdrv);
-DRESULT disk_read (BYTE pdrv, BYTE* buff, LBA_t sector, UINT count);
+DRESULT disk_read (BYTE pdrv, BYTE* buff, DWORD sector, UINT count);
-DRESULT disk_write (BYTE pdrv, const BYTE* buff, LBA_t sector, UINT count);
+DRESULT disk_write (BYTE pdrv, const BYTE* buff, DWORD sector, UINT count);
 DRESULT disk_ioctl (BYTE pdrv, BYTE cmd, void* buff);
 
+DWORD get_fattime( void ); // not a disk control function, but fits here
 
 /* Disk Status Bits (DSTATUS) */
 
@@ -43,11 +50,11 @@ DRESULT disk_ioctl (BYTE pdrv, BYTE cmd, void* buff);
 /* Command code for disk_ioctrl fucntion */
 
 /* Generic command (Used by FatFs) */
-#define CTRL_SYNC			0	/* Complete pending write process (needed at FF_FS_READONLY == 0) */
+#define CTRL_SYNC			0	/* Complete pending write process (needed at _FS_READONLY == 0) */
-#define GET_SECTOR_COUNT	1	/* Get media size (needed at FF_USE_MKFS == 1) */
+#define GET_SECTOR_COUNT	1	/* Get media size (needed at _USE_MKFS == 1) */
-#define GET_SECTOR_SIZE		2	/* Get sector size (needed at FF_MAX_SS != FF_MIN_SS) */
+#define GET_SECTOR_SIZE		2	/* Get sector size (needed at _MAX_SS != _MIN_SS) */
-#define GET_BLOCK_SIZE		3	/* Get erase block size (needed at FF_USE_MKFS == 1) */
+#define GET_BLOCK_SIZE		3	/* Get erase block size (needed at _USE_MKFS == 1) */
-#define CTRL_TRIM			4	/* Inform device that the data on the block of sectors is no longer used (needed at FF_USE_TRIM == 1) */
+#define CTRL_TRIM			4	/* Inform device that the data on the block of sectors is no longer used (needed at _USE_TRIM == 1) */
 
 /* Generic command (Not used by FatFs) */
 #define CTRL_POWER			5	/* Get/Set power status */
@@ -61,9 +68,6 @@ DRESULT disk_ioctl (BYTE pdrv, BYTE cmd, void* buff);
 #define MMC_GET_CID			12	/* Get CID */
 #define MMC_GET_OCR			13	/* Get OCR */
 #define MMC_GET_SDSTAT		14	/* Get SD status */
-#define ISDIO_READ			55	/* Read data form SD iSDIO register */
-#define ISDIO_WRITE			56	/* Write data to SD iSDIO register */
-#define ISDIO_MRITE			57	/* Masked write data to SD iSDIO register */
 
 /* ATA/CF specific ioctl command */
 #define ATA_GET_REV			20	/* Get F/W revision */

arm9/source/fatfs/ff.h

@@ -1,8 +1,8 @@
 /*----------------------------------------------------------------------------/
-/  FatFs - Generic FAT Filesystem module  R0.15                               /
+/  FatFs - Generic FAT Filesystem module  R0.13c                              /
 /-----------------------------------------------------------------------------/
 /
-/ Copyright (C) 2022, ChaN, all right reserved.
+/ Copyright (C) 2018, ChaN, all right reserved.
 /
 / FatFs module is an open source software. Redistribution and use of FatFs in
 / source and binary forms, with or without modification, are permitted provided
@@ -20,7 +20,7 @@
 
 
 #ifndef FF_DEFINED
-#define FF_DEFINED	80286	/* Revision ID */
+#define FF_DEFINED	86604	/* Revision ID */
 
 #ifdef __cplusplus
 extern "C" {
@@ -35,57 +35,51 @@ extern "C" {
 
 /* Integer types used for FatFs API */
 
-#if defined(_WIN32)		/* Windows VC++ (for development only) */
+#if defined(_WIN32)	/* Main development platform */
 #define FF_INTDEF 2
 #include <windows.h>
 typedef unsigned __int64 QWORD;
-#include <float.h>
-#define isnan(v) _isnan(v)
-#define isinf(v) (!_finite(v))
-
 #elif (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__cplusplus)	/* C99 or later */
 #define FF_INTDEF 2
 #include <stdint.h>
 typedef unsigned int	UINT;	/* int must be 16-bit or 32-bit */
 typedef unsigned char	BYTE;	/* char must be 8-bit */
 typedef uint16_t		WORD;	/* 16-bit unsigned integer */
+typedef uint16_t		WCHAR;	/* 16-bit unsigned integer */
 typedef uint32_t		DWORD;	/* 32-bit unsigned integer */
 typedef uint64_t		QWORD;	/* 64-bit unsigned integer */
-typedef WORD			WCHAR;	/* UTF-16 character type */
-
 #else  	/* Earlier than C99 */
 #define FF_INTDEF 1
 typedef unsigned int	UINT;	/* int must be 16-bit or 32-bit */
 typedef unsigned char	BYTE;	/* char must be 8-bit */
 typedef unsigned short	WORD;	/* 16-bit unsigned integer */
+typedef unsigned short	WCHAR;	/* 16-bit unsigned integer */
 typedef unsigned long	DWORD;	/* 32-bit unsigned integer */
-typedef WORD			WCHAR;	/* UTF-16 character type */
 #endif
 
 
-/* Type of file size and LBA variables */
+/* Definitions of volume management */
 
-#if FF_FS_EXFAT
+#if FF_MULTI_PARTITION		/* Multiple partition configuration */
-#if FF_INTDEF != 2
+typedef struct {
-#error exFAT feature wants C99 or later
+	BYTE pd;	/* Physical drive number */
+	BYTE pt;	/* Partition: 0:Auto detect, 1-4:Forced partition) */
+} PARTITION;
+extern PARTITION VolToPart[];	/* Volume - Partition resolution table */
 #endif
-typedef QWORD FSIZE_t;
+
-#if FF_LBA64
+#if FF_STR_VOLUME_ID
-typedef QWORD LBA_t;
+#ifndef FF_VOLUME_STRS
-#else
+extern const char* VolumeStr[FF_VOLUMES];	/* User defied volume ID */
-typedef DWORD LBA_t;
 #endif
-#else
-#if FF_LBA64
-#error exFAT needs to be enabled when enable 64-bit LBA
-#endif
-typedef DWORD FSIZE_t;
-typedef DWORD LBA_t;
 #endif
 
 
 
-/* Type of path name strings on FatFs API (TCHAR) */
+/* Type of path name strings on FatFs API */
+
+#ifndef _INC_TCHAR
+#define _INC_TCHAR
 
 #if FF_USE_LFN && FF_LFN_UNICODE == 1 	/* Unicode in UTF-16 encoding */
 typedef WCHAR TCHAR;
@@ -107,22 +101,19 @@ typedef char TCHAR;
 #define _TEXT(x) x
 #endif
 
-
-
-/* Definitions of volume management */
-
-#if FF_MULTI_PARTITION		/* Multiple partition configuration */
-typedef struct {
-	BYTE pd;	/* Physical drive number */
-	BYTE pt;	/* Partition: 0:Auto detect, 1-4:Forced partition) */
-} PARTITION;
-extern PARTITION VolToPart[];	/* Volume - Partition mapping table */
 #endif
 
-#if FF_STR_VOLUME_ID
+
-#ifndef FF_VOLUME_STRS
+
-extern const char* VolumeStr[FF_VOLUMES];	/* User defied volume ID */
+/* Type of file size variables */
+
+#if FF_FS_EXFAT
+#if FF_INTDEF != 2
+#error exFAT feature wants C99 or later
 #endif
+typedef QWORD FSIZE_t;
+#else
+typedef DWORD FSIZE_t;
 #endif
 
 
@@ -131,11 +122,10 @@ extern const char* VolumeStr[FF_VOLUMES];	/* User defied volume ID */
 
 typedef struct {
 	BYTE	fs_type;		/* Filesystem type (0:not mounted) */
-	BYTE	pdrv;			/* Volume hosting physical drive */
+	BYTE	pdrv;			/* Associated physical drive */
-	BYTE	ldrv;			/* Logical drive number (used only when FF_FS_REENTRANT) */
 	BYTE	n_fats;			/* Number of FATs (1 or 2) */
-	BYTE	wflag;			/* win[] status (b0:dirty) */
+	BYTE	wflag;			/* win[] flag (b0:dirty) */
-	BYTE	fsi_flag;		/* FSINFO status (b7:disabled, b0:dirty) */
+	BYTE	fsi_flag;		/* FSINFO flags (b7:disabled, b0:dirty) */
 	WORD	id;				/* Volume mount ID */
 	WORD	n_rootdir;		/* Number of root directory entries (FAT12/16) */
 	WORD	csize;			/* Cluster size [sectors] */
@@ -148,6 +138,9 @@ typedef struct {
 #if FF_FS_EXFAT
 	BYTE*	dirbuf;			/* Directory entry block scratchpad buffer for exFAT */
 #endif
+#if FF_FS_REENTRANT
+	FF_SYNC_t	sobj;		/* Identifier of sync object */
+#endif
 #if !FF_FS_READONLY
 	DWORD	last_clst;		/* Last allocated cluster */
 	DWORD	free_clst;		/* Number of free clusters */
@@ -161,15 +154,15 @@ typedef struct {
 #endif
 #endif
 	DWORD	n_fatent;		/* Number of FAT entries (number of clusters + 2) */
-	DWORD	fsize;			/* Number of sectors per FAT */
+	DWORD	fsize;			/* Size of an FAT [sectors] */
-	LBA_t	volbase;		/* Volume base sector */
+	DWORD	volbase;		/* Volume base sector */
-	LBA_t	fatbase;		/* FAT base sector */
+	DWORD	fatbase;		/* FAT base sector */
-	LBA_t	dirbase;		/* Root directory base sector (FAT12/16) or cluster (FAT32/exFAT) */
+	DWORD	dirbase;		/* Root directory base sector/cluster */
-	LBA_t	database;		/* Data base sector */
+	DWORD	database;		/* Data base sector */
 #if FF_FS_EXFAT
-	LBA_t	bitbase;		/* Allocation bitmap base sector */
+	DWORD	bitbase;		/* Allocation bitmap base sector */
 #endif
-	LBA_t	winsect;		/* Current sector appearing in the win[] */
+	DWORD	winsect;		/* Current sector appearing in the win[] */
 	BYTE	win[FF_MAX_SS];	/* Disk access window for Directory, FAT (and file data at tiny cfg) */
 } FATFS;
 
@@ -179,7 +172,7 @@ typedef struct {
 
 typedef struct {
 	FATFS*	fs;				/* Pointer to the hosting volume of this object */
-	WORD	id;				/* Hosting volume's mount ID */
+	WORD	id;				/* Hosting volume mount ID */
 	BYTE	attr;			/* Object attribute */
 	BYTE	stat;			/* Object chain status (b1-0: =0:not contiguous, =2:contiguous, =3:fragmented in this session, b2:sub-directory stretched) */
 	DWORD	sclust;			/* Object data start cluster (0:no cluster or root directory) */
@@ -206,9 +199,9 @@ typedef struct {
 	BYTE	err;			/* Abort flag (error code) */
 	FSIZE_t	fptr;			/* File read/write pointer (Zeroed on file open) */
 	DWORD	clust;			/* Current cluster of fpter (invalid when fptr is 0) */
-	LBA_t	sect;			/* Sector number appearing in buf[] (0:invalid) */
+	DWORD	sect;			/* Sector number appearing in buf[] (0:invalid) */
 #if !FF_FS_READONLY
-	LBA_t	dir_sect;		/* Sector number containing the directory entry (not used at exFAT) */
+	DWORD	dir_sect;		/* Sector number containing the directory entry (not used at exFAT) */
 	BYTE*	dir_ptr;		/* Pointer to the directory entry in the win[] (not used at exFAT) */
 #endif
 #if FF_USE_FASTSEEK
@@ -227,7 +220,7 @@ typedef struct {
 	FFOBJID	obj;			/* Object identifier */
 	DWORD	dptr;			/* Current read/write offset */
 	DWORD	clust;			/* Current cluster */
-	LBA_t	sect;			/* Current sector (0:Read operation has terminated) */
+	DWORD	sect;			/* Current sector (0:Read operation has terminated) */
 	BYTE*	dir;			/* Pointer to the directory item in the win[] */
 	BYTE	fn[12];			/* SFN (in/out) {body[8],ext[3],status[1]} */
 #if FF_USE_LFN
@@ -248,7 +241,7 @@ typedef struct {
 	WORD	ftime;			/* Modified time */
 	BYTE	fattrib;		/* File attribute */
 #if FF_USE_LFN
-	TCHAR	altname[FF_SFN_BUF + 1];/* Alternative file name */
+	TCHAR	altname[FF_SFN_BUF + 1];/* Altenative file name */
 	TCHAR	fname[FF_LFN_BUF + 1];	/* Primary file name */
 #else
 	TCHAR	fname[12 + 1];	/* File name */
@@ -257,18 +250,6 @@ typedef struct {
 
 
 
-/* Format parameter structure (MKFS_PARM) */
-
-typedef struct {
-	BYTE fmt;			/* Format option (FM_FAT, FM_FAT32, FM_EXFAT and FM_SFD) */
-	BYTE n_fat;			/* Number of FATs */
-	UINT align;			/* Data area alignment (sector) */
-	UINT n_root;		/* Number of root directory entries */
-	DWORD au_size;		/* Cluster size (byte) */
-} MKFS_PARM;
-
-
-
 /* File function return code (FRESULT) */
 
 typedef enum {
@@ -296,10 +277,8 @@ typedef enum {
 
 
 
-
-/*--------------------------------------------------------------*/
-/* FatFs Module Application Interface                           */
 /*--------------------------------------------------------------*/
+/* FatFs module application interface                           */
 
 FRESULT f_open (FIL* fp, const TCHAR* path, BYTE mode);				/* Open or create a file */
 FRESULT f_close (FIL* fp);											/* Close an open file object */
@@ -326,18 +305,16 @@ FRESULT f_getfree (const TCHAR* path, DWORD* nclst, FATFS** fatfs);	/* Get numbe
 FRESULT f_getlabel (const TCHAR* path, TCHAR* label, DWORD* vsn);	/* Get volume label */
 FRESULT f_setlabel (const TCHAR* label);							/* Set volume label */
 FRESULT f_forward (FIL* fp, UINT(*func)(const BYTE*,UINT), UINT btf, UINT* bf);	/* Forward data to the stream */
-FRESULT f_expand (FIL* fp, FSIZE_t fsz, BYTE opt);					/* Allocate a contiguous block to the file */
+FRESULT f_expand (FIL* fp, FSIZE_t szf, BYTE opt);					/* Allocate a contiguous block to the file */
 FRESULT f_mount (FATFS* fs, const TCHAR* path, BYTE opt);			/* Mount/Unmount a logical drive */
-FRESULT f_mkfs (const TCHAR* path, const MKFS_PARM* opt, void* work, UINT len);	/* Create a FAT volume */
+FRESULT f_mkfs (const TCHAR* path, BYTE opt, DWORD au, void* work, UINT len);	/* Create a FAT volume */
-FRESULT f_fdisk (BYTE pdrv, const LBA_t ptbl[], void* work);		/* Divide a physical drive into some partitions */
+FRESULT f_fdisk (BYTE pdrv, const DWORD* szt, void* work);			/* Divide a physical drive into some partitions */
 FRESULT f_setcp (WORD cp);											/* Set current code page */
 int f_putc (TCHAR c, FIL* fp);										/* Put a character to the file */
 int f_puts (const TCHAR* str, FIL* cp);								/* Put a string to the file */
 int f_printf (FIL* fp, const TCHAR* str, ...);						/* Put a formatted string to the file */
 TCHAR* f_gets (TCHAR* buff, int len, FIL* fp);						/* Get a string from the file */
 
-/* Some API fucntions are implemented as macro */
-
 #define f_eof(fp) ((int)((fp)->fptr == (fp)->obj.objsize))
 #define f_error(fp) ((fp)->err)
 #define f_tell(fp) ((fp)->fptr)
@@ -347,47 +324,46 @@ TCHAR* f_gets (TCHAR* buff, int len, FIL* fp);						/* Get a string from the fil
 #define f_rmdir(path) f_unlink(path)
 #define f_unmount(path) f_mount(0, path, 0)
 
-
+#ifndef EOF
-
+#define EOF (-1)
-
-/*--------------------------------------------------------------*/
-/* Additional Functions                                         */
-/*--------------------------------------------------------------*/
-
-/* RTC function (provided by user) */
-#if !FF_FS_READONLY && !FF_FS_NORTC
-DWORD get_fattime (void);	/* Get current time */
 #endif
 
 
-/* LFN support functions (defined in ffunicode.c) */
 
-#if FF_USE_LFN >= 1
+
+/*--------------------------------------------------------------*/
+/* Additional user defined functions                            */
+
+/* RTC function */
+#if !FF_FS_READONLY && !FF_FS_NORTC
+DWORD get_fattime (void);
+#endif
+
+/* LFN support functions */
+#if FF_USE_LFN >= 1						/* Code conversion (defined in unicode.c) */
 WCHAR ff_oem2uni (WCHAR oem, WORD cp);	/* OEM code to Unicode conversion */
 WCHAR ff_uni2oem (DWORD uni, WORD cp);	/* Unicode to OEM code conversion */
 DWORD ff_wtoupper (DWORD uni);			/* Unicode upper-case conversion */
 #endif
-
-
-/* O/S dependent functions (samples available in ffsystem.c) */
-
 #if FF_USE_LFN == 3						/* Dynamic memory allocation */
 void* ff_memalloc (UINT msize);			/* Allocate memory block */
 void ff_memfree (void* mblock);			/* Free memory block */
 #endif
-#if FF_FS_REENTRANT	/* Sync functions */
+
-int ff_mutex_create (int vol);		/* Create a sync object */
+/* Sync functions */
-void ff_mutex_delete (int vol);		/* Delete a sync object */
+#if FF_FS_REENTRANT
-int ff_mutex_take (int vol);		/* Lock sync object */
+int ff_cre_syncobj (BYTE vol, FF_SYNC_t* sobj);	/* Create a sync object */
-void ff_mutex_give (int vol);		/* Unlock sync object */
+int ff_req_grant (FF_SYNC_t sobj);		/* Lock sync object */
+void ff_rel_grant (FF_SYNC_t sobj);		/* Unlock sync object */
+int ff_del_syncobj (FF_SYNC_t sobj);	/* Delete a sync object */
 #endif
 
 
 
 
 /*--------------------------------------------------------------*/
-/* Flags and Offset Address                                     */
+/* Flags and offset address                                     */
-/*--------------------------------------------------------------*/
+
 
 /* File access mode and open method flags (3rd argument of f_open) */
 #define	FA_READ				0x01

arm9/source/fatfs/ffconf.h

@@ -1,8 +1,8 @@
 /*---------------------------------------------------------------------------/
-/  Configurations of FatFs Module
+/  FatFs Functional Configurations
 /---------------------------------------------------------------------------*/
 
-#define FFCONF_DEF	80286	/* Revision ID */
+#define FFCONF_DEF	86604	/* Revision ID */
 
 /*---------------------------------------------------------------------------/
 / Function Configurations
@@ -25,6 +25,14 @@
 /   3: f_lseek() function is removed in addition to 2. */
 
 
+#define FF_USE_STRFUNC	0
+/* This option switches string functions, f_gets(), f_putc(), f_puts() and f_printf().
+/
+/  0: Disable string functions.
+/  1: Enable without LF-CRLF conversion.
+/  2: Enable with LF-CRLF conversion. */
+
+
 #define FF_USE_FIND		1
 /* This option switches filtered directory read functions, f_findfirst() and
 /  f_findnext(). (0:Disable, 1:Enable 2:Enable with matching altname[] too) */
@@ -56,30 +64,6 @@
 /* This option switches f_forward() function. (0:Disable or 1:Enable) */
 
 
-#define FF_USE_STRFUNC	0
-#define FF_PRINT_LLI	1
-#define FF_PRINT_FLOAT	1
-#define FF_STRF_ENCODE	3
-/* FF_USE_STRFUNC switches string functions, f_gets(), f_putc(), f_puts() and
-/  f_printf().
-/
-/   0: Disable. FF_PRINT_LLI, FF_PRINT_FLOAT and FF_STRF_ENCODE have no effect.
-/   1: Enable without LF-CRLF conversion.
-/   2: Enable with LF-CRLF conversion.
-/
-/  FF_PRINT_LLI = 1 makes f_printf() support long long argument and FF_PRINT_FLOAT = 1/2
-/  makes f_printf() support floating point argument. These features want C99 or later.
-/  When FF_LFN_UNICODE >= 1 with LFN enabled, string functions convert the character
-/  encoding in it. FF_STRF_ENCODE selects assumption of character encoding ON THE FILE
-/  to be read/written via those functions.
-/
-/   0: ANSI/OEM in current CP
-/   1: Unicode in UTF-16LE
-/   2: Unicode in UTF-16BE
-/   3: Unicode in UTF-8
-*/
-
-
 /*---------------------------------------------------------------------------/
 / Locale and Namespace Configurations
 /---------------------------------------------------------------------------*/
@@ -126,11 +110,11 @@
 /  requiers certain internal working buffer occupies (FF_MAX_LFN + 1) * 2 bytes and
 /  additional (FF_MAX_LFN + 44) / 15 * 32 bytes when exFAT is enabled.
 /  The FF_MAX_LFN defines size of the working buffer in UTF-16 code unit and it can
-/  be in range of 12 to 255. It is recommended to be set it 255 to fully support LFN
+/  be in range of 12 to 255. It is recommended to be set 255 to fully support LFN
 /  specification.
 /  When use stack for the working buffer, take care on stack overflow. When use heap
 /  memory for the working buffer, memory management functions, ff_memalloc() and
-/  ff_memfree() exemplified in ffsystem.c, need to be added to the project. */
+/  ff_memfree() in ffsystem.c, need to be added to the project. */
 
 
 #define FF_LFN_UNICODE	2
@@ -153,6 +137,19 @@
 /  on character encoding. When LFN is not enabled, these options have no effect. */
 
 
+#define FF_STRF_ENCODE	3
+/* When FF_LFN_UNICODE >= 1 with LFN enabled, string I/O functions, f_gets(),
+/  f_putc(), f_puts and f_printf() convert the character encoding in it.
+/  This option selects assumption of character encoding ON THE FILE to be
+/  read/written via those functions.
+/
+/   0: ANSI/OEM in current CP
+/   1: Unicode in UTF-16LE
+/   2: Unicode in UTF-16BE
+/   3: Unicode in UTF-8
+*/
+
+
 #define FF_FS_RPATH		1
 /* This option configures support for relative path.
 /
@@ -170,15 +167,15 @@
 /* Number of volumes (logical drives) to be used. (1-10) */
 
 
-#define FF_STR_VOLUME_ID	1
+#define FF_STR_VOLUME_ID	0
-#define FF_VOLUME_STRS		"sdmc", "nand"
+#define FF_VOLUME_STRS		"RAM","NAND","CF","SD","SD2","USB","USB2","USB3"
 /* FF_STR_VOLUME_ID switches support for volume ID in arbitrary strings.
 /  When FF_STR_VOLUME_ID is set to 1 or 2, arbitrary strings can be used as drive
 /  number in the path name. FF_VOLUME_STRS defines the volume ID strings for each
 /  logical drives. Number of items must not be less than FF_VOLUMES. Valid
 /  characters for the volume ID strings are A-Z, a-z and 0-9, however, they are
 /  compared in case-insensitive. If FF_STR_VOLUME_ID >= 1 and FF_VOLUME_STRS is
-/  not defined, a user defined volume string table is needed as:
+/  not defined, a user defined volume string table needs to be defined as:
 /
 /  const char* VolumeStr[FF_VOLUMES] = {"ram","flash","sd","usb",...
 */
@@ -190,35 +187,37 @@
 /  number and only an FAT volume found on the physical drive will be mounted.
 /  When this function is enabled (1), each logical drive number can be bound to
 /  arbitrary physical drive and partition listed in the VolToPart[]. Also f_fdisk()
-/  function will be available. */
+/  funciton will be available. */
 
 
 #define FF_MIN_SS		512
 #define FF_MAX_SS		512
 /* This set of options configures the range of sector size to be supported. (512,
 /  1024, 2048 or 4096) Always set both 512 for most systems, generic memory card and
-/  harddisk, but a larger value may be required for on-board flash memory and some
+/  harddisk. But a larger value may be required for on-board flash memory and some
 /  type of optical media. When FF_MAX_SS is larger than FF_MIN_SS, FatFs is configured
 /  for variable sector size mode and disk_ioctl() function needs to implement
 /  GET_SECTOR_SIZE command. */
 
 
-#define FF_LBA64		0
-/* This option switches support for 64-bit LBA. (0:Disable or 1:Enable)
-/  To enable the 64-bit LBA, also exFAT needs to be enabled. (FF_FS_EXFAT == 1) */
-
-
-#define FF_MIN_GPT		0x10000000
-/* Minimum number of sectors to switch GPT as partitioning format in f_mkfs and
-/  f_fdisk function. 0x100000000 max. This option has no effect when FF_LBA64 == 0. */
-
-
 #define FF_USE_TRIM		0
 /* This option switches support for ATA-TRIM. (0:Disable or 1:Enable)
 /  To enable Trim function, also CTRL_TRIM command should be implemented to the
 /  disk_ioctl() function. */
 
 
+#define FF_FS_NOFSINFO	0
+/* If you need to know correct free space on the FAT32 volume, set bit 0 of this
+/  option, and f_getfree() function at first time after volume mount will force
+/  a full FAT scan. Bit 1 controls the use of last allocated cluster number.
+/
+/  bit0=0: Use free cluster count in the FSINFO if available.
+/  bit0=1: Do not trust free cluster count in the FSINFO.
+/  bit1=0: Use last allocated cluster number in the FSINFO if available.
+/  bit1=1: Do not trust last allocated cluster number in the FSINFO.
+*/
+
+
 
 /*---------------------------------------------------------------------------/
 / System Configurations
@@ -240,27 +239,15 @@
 #define FF_FS_NORTC		0
 #define FF_NORTC_MON	1
 #define FF_NORTC_MDAY	1
-#define FF_NORTC_YEAR	2022
+#define FF_NORTC_YEAR	2019
-/* The option FF_FS_NORTC switches timestamp feature. If the system does not have
+/* The option FF_FS_NORTC switches timestamp functiton. If the system does not have
-/  an RTC or valid timestamp is not needed, set FF_FS_NORTC = 1 to disable the
+/  any RTC function or valid timestamp is not needed, set FF_FS_NORTC = 1 to disable
-/  timestamp feature. Every object modified by FatFs will have a fixed timestamp
+/  the timestamp function. Every object modified by FatFs will have a fixed timestamp
 /  defined by FF_NORTC_MON, FF_NORTC_MDAY and FF_NORTC_YEAR in local time.
 /  To enable timestamp function (FF_FS_NORTC = 0), get_fattime() function need to be
 /  added to the project to read current time form real-time clock. FF_NORTC_MON,
 /  FF_NORTC_MDAY and FF_NORTC_YEAR have no effect.
-/  These options have no effect in read-only configuration (FF_FS_READONLY = 1). */
+/  These options have no effect at read-only configuration (FF_FS_READONLY = 1). */
-
-
-#define FF_FS_NOFSINFO	0
-/* If you need to know correct free space on the FAT32 volume, set bit 0 of this
-/  option, and f_getfree() function at the first time after volume mount will force
-/  a full FAT scan. Bit 1 controls the use of last allocated cluster number.
-/
-/  bit0=0: Use free cluster count in the FSINFO if available.
-/  bit0=1: Do not trust free cluster count in the FSINFO.
-/  bit1=0: Use last allocated cluster number in the FSINFO if available.
-/  bit1=1: Do not trust last allocated cluster number in the FSINFO.
-*/
 
 
 #define FF_FS_LOCK		0
@@ -275,21 +262,26 @@
 /      lock control is independent of re-entrancy. */
 
 
+/* #include <somertos.h>	// O/S definitions */
 #define FF_FS_REENTRANT	0
 #define FF_FS_TIMEOUT	1000
+#define FF_SYNC_t		HANDLE
 /* The option FF_FS_REENTRANT switches the re-entrancy (thread safe) of the FatFs
 /  module itself. Note that regardless of this option, file access to different
 /  volume is always re-entrant and volume control functions, f_mount(), f_mkfs()
 /  and f_fdisk() function, are always not re-entrant. Only file/directory access
-/  to the same volume is under control of this featuer.
+/  to the same volume is under control of this function.
 /
-/   0: Disable re-entrancy. FF_FS_TIMEOUT have no effect.
+/   0: Disable re-entrancy. FF_FS_TIMEOUT and FF_SYNC_t have no effect.
 /   1: Enable re-entrancy. Also user provided synchronization handlers,
-/      ff_mutex_create(), ff_mutex_delete(), ff_mutex_take() and ff_mutex_give()
+/      ff_req_grant(), ff_rel_grant(), ff_del_syncobj() and ff_cre_syncobj()
-/      function, must be added to the project. Samples are available in ffsystem.c.
+/      function, must be added to the project. Samples are available in
+/      option/syscall.c.
 /
-/  The FF_FS_TIMEOUT defines timeout period in unit of O/S time tick.
+/  The FF_FS_TIMEOUT defines timeout period in unit of time tick.
-*/
+/  The FF_SYNC_t defines O/S dependent sync object type. e.g. HANDLE, ID, OS_EVENT*,
+/  SemaphoreHandle_t and etc. A header file for O/S definitions needs to be
+/  included somewhere in the scope of ff.h. */
 
 
 

arm9/source/fatfs/ffsystem.c

@@ -1,208 +1,170 @@
 /*------------------------------------------------------------------------*/
-/* A Sample Code of User Provided OS Dependent Functions for FatFs        */
+/* Sample Code of OS Dependent Functions for FatFs                        */
+/* (C)ChaN, 2018                                                          */
 /*------------------------------------------------------------------------*/
 
+
 #include "ff.h"
 
 
-#if FF_USE_LFN == 3	/* Use dynamic memory allocation */
+#if FF_USE_LFN == 3	/* Dynamic memory allocation */
 
 /*------------------------------------------------------------------------*/
-/* Allocate/Free a Memory Block                                           */
+/* Allocate a memory block                                                */
 /*------------------------------------------------------------------------*/
 
-#include <stdlib.h>		/* with POSIX API */
-
-
 void* ff_memalloc (	/* Returns pointer to the allocated memory block (null if not enough core) */
 	UINT msize		/* Number of bytes to allocate */
 )
 {
-	return malloc((size_t)msize);	/* Allocate a new memory block */
+	return malloc(msize);	/* Allocate a new memory block with POSIX API */
 }
 
 
+/*------------------------------------------------------------------------*/
+/* Free a memory block                                                    */
+/*------------------------------------------------------------------------*/
+
 void ff_memfree (
-	void* mblock	/* Pointer to the memory block to free (no effect if null) */
+	void* mblock	/* Pointer to the memory block to free (nothing to do if null) */
 )
 {
-	free(mblock);	/* Free the memory block */
+	free(mblock);	/* Free the memory block with POSIX API */
 }
 
 #endif
 
 
 
-
 #if FF_FS_REENTRANT	/* Mutal exclusion */
-/*------------------------------------------------------------------------*/
-/* Definitions of Mutex                                                   */
-/*------------------------------------------------------------------------*/
-
-#define OS_TYPE	0	/* 0:Win32, 1:uITRON4.0, 2:uC/OS-II, 3:FreeRTOS, 4:CMSIS-RTOS */
-
-
-#if   OS_TYPE == 0	/* Win32 */
-#include <windows.h>
-static HANDLE Mutex[FF_VOLUMES + 1];	/* Table of mutex handle */
-
-#elif OS_TYPE == 1	/* uITRON */
-#include "itron.h"
-#include "kernel.h"
-static mtxid Mutex[FF_VOLUMES + 1];		/* Table of mutex ID */
-
-#elif OS_TYPE == 2	/* uc/OS-II */
-#include "includes.h"
-static OS_EVENT *Mutex[FF_VOLUMES + 1];	/* Table of mutex pinter */
-
-#elif OS_TYPE == 3	/* FreeRTOS */
-#include "FreeRTOS.h"
-#include "semphr.h"
-static SemaphoreHandle_t Mutex[FF_VOLUMES + 1];	/* Table of mutex handle */
-
-#elif OS_TYPE == 4	/* CMSIS-RTOS */
-#include "cmsis_os.h"
-static osMutexId Mutex[FF_VOLUMES + 1];	/* Table of mutex ID */
-
-#endif
-
-
 
 /*------------------------------------------------------------------------*/
-/* Create a Mutex                                                         */
+/* Create a Synchronization Object                                        */
 /*------------------------------------------------------------------------*/
-/* This function is called in f_mount function to create a new mutex
+/* This function is called in f_mount() function to create a new
-/  or semaphore for the volume. When a 0 is returned, the f_mount function
+/  synchronization object for the volume, such as semaphore and mutex.
-/  fails with FR_INT_ERR.
+/  When a 0 is returned, the f_mount() function fails with FR_INT_ERR.
 */
 
-int ff_mutex_create (	/* Returns 1:Function succeeded or 0:Could not create the mutex */
+//const osMutexDef_t Mutex[FF_VOLUMES];	/* Table of CMSIS-RTOS mutex */
-	int vol				/* Mutex ID: Volume mutex (0 to FF_VOLUMES - 1) or system mutex (FF_VOLUMES) */
+
+
+int ff_cre_syncobj (	/* 1:Function succeeded, 0:Could not create the sync object */
+	BYTE vol,			/* Corresponding volume (logical drive number) */
+	FF_SYNC_t* sobj		/* Pointer to return the created sync object */
 )
 {
-#if OS_TYPE == 0	/* Win32 */
+	/* Win32 */
-	Mutex[vol] = CreateMutex(NULL, FALSE, NULL);
+	*sobj = CreateMutex(NULL, FALSE, NULL);
-	return (int)(Mutex[vol] != INVALID_HANDLE_VALUE);
+	return (int)(*sobj != INVALID_HANDLE_VALUE);
 
-#elif OS_TYPE == 1	/* uITRON */
+	/* uITRON */
-	T_CMTX cmtx = {TA_TPRI,1};
+//	T_CSEM csem = {TA_TPRI,1,1};
+//	*sobj = acre_sem(&csem);
+//	return (int)(*sobj > 0);
 
-	Mutex[vol] = acre_mtx(&cmtx);
+	/* uC/OS-II */
-	return (int)(Mutex[vol] > 0);
+//	OS_ERR err;
+//	*sobj = OSMutexCreate(0, &err);
+//	return (int)(err == OS_NO_ERR);
 
-#elif OS_TYPE == 2	/* uC/OS-II */
+	/* FreeRTOS */
-	OS_ERR err;
+//	*sobj = xSemaphoreCreateMutex();
+//	return (int)(*sobj != NULL);
 
-	Mutex[vol] = OSMutexCreate(0, &err);
+	/* CMSIS-RTOS */
-	return (int)(err == OS_NO_ERR);
+//	*sobj = osMutexCreate(&Mutex[vol]);
-
+//	return (int)(*sobj != NULL);
-#elif OS_TYPE == 3	/* FreeRTOS */
-	Mutex[vol] = xSemaphoreCreateMutex();
-	return (int)(Mutex[vol] != NULL);
-
-#elif OS_TYPE == 4	/* CMSIS-RTOS */
-	osMutexDef(cmsis_os_mutex);
-
-	Mutex[vol] = osMutexCreate(osMutex(cmsis_os_mutex));
-	return (int)(Mutex[vol] != NULL);
-
-#endif
 }
 
 
 /*------------------------------------------------------------------------*/
-/* Delete a Mutex                                                         */
+/* Delete a Synchronization Object                                        */
 /*------------------------------------------------------------------------*/
-/* This function is called in f_mount function to delete a mutex or
+/* This function is called in f_mount() function to delete a synchronization
-/  semaphore of the volume created with ff_mutex_create function.
+/  object that created with ff_cre_syncobj() function. When a 0 is returned,
+/  the f_mount() function fails with FR_INT_ERR.
 */
 
-void ff_mutex_delete (	/* Returns 1:Function succeeded or 0:Could not delete due to an error */
+int ff_del_syncobj (	/* 1:Function succeeded, 0:Could not delete due to an error */
-	int vol				/* Mutex ID: Volume mutex (0 to FF_VOLUMES - 1) or system mutex (FF_VOLUMES) */
+	FF_SYNC_t sobj		/* Sync object tied to the logical drive to be deleted */
 )
 {
-#if OS_TYPE == 0	/* Win32 */
+	/* Win32 */
-	CloseHandle(Mutex[vol]);
+	return (int)CloseHandle(sobj);
 
-#elif OS_TYPE == 1	/* uITRON */
+	/* uITRON */
-	del_mtx(Mutex[vol]);
+//	return (int)(del_sem(sobj) == E_OK);
 
-#elif OS_TYPE == 2	/* uC/OS-II */
+	/* uC/OS-II */
-	OS_ERR err;
+//	OS_ERR err;
+//	OSMutexDel(sobj, OS_DEL_ALWAYS, &err);
+//	return (int)(err == OS_NO_ERR);
 
-	OSMutexDel(Mutex[vol], OS_DEL_ALWAYS, &err);
+	/* FreeRTOS */
+//  vSemaphoreDelete(sobj);
+//	return 1;
 
-#elif OS_TYPE == 3	/* FreeRTOS */
+	/* CMSIS-RTOS */
-	vSemaphoreDelete(Mutex[vol]);
+//	return (int)(osMutexDelete(sobj) == osOK);
-
-#elif OS_TYPE == 4	/* CMSIS-RTOS */
-	osMutexDelete(Mutex[vol]);
-
-#endif
 }
 
 
 /*------------------------------------------------------------------------*/
-/* Request a Grant to Access the Volume                                   */
+/* Request Grant to Access the Volume                                     */
 /*------------------------------------------------------------------------*/
-/* This function is called on enter file functions to lock the volume.
+/* This function is called on entering file functions to lock the volume.
 /  When a 0 is returned, the file function fails with FR_TIMEOUT.
 */
 
-int ff_mutex_take (	/* Returns 1:Succeeded or 0:Timeout */
+int ff_req_grant (	/* 1:Got a grant to access the volume, 0:Could not get a grant */
-	int vol			/* Mutex ID: Volume mutex (0 to FF_VOLUMES - 1) or system mutex (FF_VOLUMES) */
+	FF_SYNC_t sobj	/* Sync object to wait */
 )
 {
-#if OS_TYPE == 0	/* Win32 */
+	/* Win32 */
-	return (int)(WaitForSingleObject(Mutex[vol], FF_FS_TIMEOUT) == WAIT_OBJECT_0);
+	return (int)(WaitForSingleObject(sobj, FF_FS_TIMEOUT) == WAIT_OBJECT_0);
 
-#elif OS_TYPE == 1	/* uITRON */
+	/* uITRON */
-	return (int)(tloc_mtx(Mutex[vol], FF_FS_TIMEOUT) == E_OK);
+//	return (int)(wai_sem(sobj) == E_OK);
 
-#elif OS_TYPE == 2	/* uC/OS-II */
+	/* uC/OS-II */
-	OS_ERR err;
+//	OS_ERR err;
+//	OSMutexPend(sobj, FF_FS_TIMEOUT, &err));
+//	return (int)(err == OS_NO_ERR);
 
-	OSMutexPend(Mutex[vol], FF_FS_TIMEOUT, &err));
+	/* FreeRTOS */
-	return (int)(err == OS_NO_ERR);
+//	return (int)(xSemaphoreTake(sobj, FF_FS_TIMEOUT) == pdTRUE);
 
-#elif OS_TYPE == 3	/* FreeRTOS */
+	/* CMSIS-RTOS */
-	return (int)(xSemaphoreTake(Mutex[vol], FF_FS_TIMEOUT) == pdTRUE);
+//	return (int)(osMutexWait(sobj, FF_FS_TIMEOUT) == osOK);
-
-#elif OS_TYPE == 4	/* CMSIS-RTOS */
-	return (int)(osMutexWait(Mutex[vol], FF_FS_TIMEOUT) == osOK);
-
-#endif
 }
 
 
-
 /*------------------------------------------------------------------------*/
-/* Release a Grant to Access the Volume                                   */
+/* Release Grant to Access the Volume                                     */
 /*------------------------------------------------------------------------*/
-/* This function is called on leave file functions to unlock the volume.
+/* This function is called on leaving file functions to unlock the volume.
 */
 
-void ff_mutex_give (
+void ff_rel_grant (
-	int vol			/* Mutex ID: Volume mutex (0 to FF_VOLUMES - 1) or system mutex (FF_VOLUMES) */
+	FF_SYNC_t sobj	/* Sync object to be signaled */
 )
 {
-#if OS_TYPE == 0	/* Win32 */
+	/* Win32 */
-	ReleaseMutex(Mutex[vol]);
+	ReleaseMutex(sobj);
 
-#elif OS_TYPE == 1	/* uITRON */
+	/* uITRON */
-	unl_mtx(Mutex[vol]);
+//	sig_sem(sobj);
 
-#elif OS_TYPE == 2	/* uC/OS-II */
+	/* uC/OS-II */
-	OSMutexPost(Mutex[vol]);
+//	OSMutexPost(sobj);
 
-#elif OS_TYPE == 3	/* FreeRTOS */
+	/* FreeRTOS */
-	xSemaphoreGive(Mutex[vol]);
+//	xSemaphoreGive(sobj);
 
-#elif OS_TYPE == 4	/* CMSIS-RTOS */
+	/* CMSIS-RTOS */
-	osMutexRelease(Mutex[vol]);
+//	osMutexRelease(sobj);
-
-#endif
 }
 
-#endif	/* FF_FS_REENTRANT */
+#endif
 

arm9/source/fatfs/ffunicode.c

@@ -1,13 +1,13 @@
 /*------------------------------------------------------------------------*/
-/* Unicode Handling Functions for FatFs R0.13 and Later                   */
+/* Unicode handling functions for FatFs R0.13c                            */
-/*------------------------------------------------------------------------*/
-/* This module will occupy a huge memory in the .rodata section when the  */
-/* FatFs is configured for LFN with DBCS. If the system has a Unicode     */
-/* library for the code conversion, this module should be modified to use */
-/* it to avoid silly memory consumption.                                  */
 /*------------------------------------------------------------------------*/
+/* This module will occupy a huge memory in the .const section when the    /
+/  FatFs is configured for LFN with DBCS. If the system has any Unicode    /
+/  utilitiy for the code conversion, this module should be modified to use /
+/  that function to avoid silly memory consumption.                        /
+/-------------------------------------------------------------------------*/
 /*
-/ Copyright (C) 2022, ChaN, all right reserved.
+/ Copyright (C) 2018, ChaN, all right reserved.
 /
 / FatFs module is an open source software. Redistribution and use of FatFs in
 / source and binary forms, with or without modification, are permitted provided
@@ -25,7 +25,11 @@
 
 #include "ff.h"
 
-#if FF_USE_LFN != 0	/* This module will be blanked if in non-LFN configuration */
+#if FF_USE_LFN	/* This module will be blanked at non-LFN configuration */
+
+#if FF_DEFINED != 86604	/* Revision ID */
+#error Wrong include file (ff.h).
+#endif
 
 #define MERGE2(a, b) a ## b
 #define CVTBL(tbl, cp) MERGE2(tbl, cp)
@@ -15214,8 +15218,8 @@ static const WCHAR uc869[] = {	/*  CP869(Greek 2) to Unicode conversion table */
 
 
 /*------------------------------------------------------------------------*/
-/* OEM <==> Unicode Conversions for Static Code Page Configuration with   */
+/* OEM <==> Unicode conversions for static code page configuration        */
-/* SBCS Fixed Code Page                                                   */
+/* SBCS fixed code page                                                   */
 /*------------------------------------------------------------------------*/
 
 #if FF_CODE_PAGE != 0 && FF_CODE_PAGE < 900
@@ -15241,7 +15245,7 @@ WCHAR ff_uni2oem (	/* Returns OEM code character, zero on error */
 	return c;
 }
 
-WCHAR ff_oem2uni (	/* Returns Unicode character in UTF-16, zero on error */
+WCHAR ff_oem2uni (	/* Returns Unicode character, zero on error */
 	WCHAR	oem,	/* OEM code to be converted */
 	WORD	cp		/* Code page for the conversion */
 )
@@ -15267,8 +15271,8 @@ WCHAR ff_oem2uni (	/* Returns Unicode character in UTF-16, zero on error */
 
 
 /*------------------------------------------------------------------------*/
-/* OEM <==> Unicode Conversions for Static Code Page Configuration with   */
+/* OEM <==> Unicode conversions for static code page configuration        */
-/* DBCS Fixed Code Page                                                   */
+/* DBCS fixed code page                                                   */
 /*------------------------------------------------------------------------*/
 
 #if FF_CODE_PAGE >= 900
@@ -15308,7 +15312,7 @@ WCHAR ff_uni2oem (	/* Returns OEM code character, zero on error */
 }
 
 
-WCHAR ff_oem2uni (	/* Returns Unicode character in UTF-16, zero on error */
+WCHAR ff_oem2uni (	/* Returns Unicode character, zero on error */
 	WCHAR	oem,	/* OEM code to be converted */
 	WORD	cp		/* Code page for the conversion */
 )
@@ -15346,7 +15350,7 @@ WCHAR ff_oem2uni (	/* Returns Unicode character in UTF-16, zero on error */
 
 
 /*------------------------------------------------------------------------*/
-/* OEM <==> Unicode Conversions for Dynamic Code Page Configuration       */
+/* OEM <==> Unicode conversions for dynamic code page configuration       */
 /*------------------------------------------------------------------------*/
 
 #if FF_CODE_PAGE == 0
@@ -15407,7 +15411,7 @@ WCHAR ff_uni2oem (	/* Returns OEM code character, zero on error */
 }
 
 
-WCHAR ff_oem2uni (	/* Returns Unicode character in UTF-16, zero on error */
+WCHAR ff_oem2uni (	/* Returns Unicode character, zero on error */
 	WCHAR	oem,	/* OEM code to be converted (DBC if >=0x100) */
 	WORD	cp		/* Code page for the conversion */
 )
@@ -15458,7 +15462,7 @@ WCHAR ff_oem2uni (	/* Returns Unicode character in UTF-16, zero on error */
 
 
 /*------------------------------------------------------------------------*/
-/* Unicode Up-case Conversion                                             */
+/* Unicode up-case conversion                                             */
 /*------------------------------------------------------------------------*/
 
 DWORD ff_wtoupper (	/* Returns up-converted code point */
@@ -15590,4 +15594,4 @@ DWORD ff_wtoupper (	/* Returns up-converted code point */
 }
 
 
-#endif /* #if FF_USE_LFN != 0 */
+#endif /* #if FF_USE_LFN */

arm9/source/fatfs/integer.h

@@ -0,0 +1,38 @@
+/*-------------------------------------------*/
+/* Integer type definitions for FatFs module */
+/*-------------------------------------------*/
+
+#ifndef FF_INTEGER
+#define FF_INTEGER
+
+#ifdef _WIN32	/* FatFs development platform */
+
+#include <windows.h>
+#include <tchar.h>
+typedef unsigned __int64 QWORD;
+
+
+#else			/* Embedded platform */
+
+/* These types MUST be 16-bit or 32-bit */
+typedef int				INT;
+typedef unsigned int	UINT;
+
+/* This type MUST be 8-bit */
+typedef unsigned char	BYTE;
+
+/* These types MUST be 16-bit */
+typedef short			SHORT;
+typedef unsigned short	WORD;
+typedef unsigned short	WCHAR;
+
+/* These types MUST be 32-bit */
+typedef long			LONG;
+typedef unsigned long	DWORD;
+
+/* This type MUST be 64-bit (Remove this for ANSI C (C89) compatibility) */
+typedef unsigned long long QWORD;
+
+#endif
+
+#endif

arm9/source/firm.c

@@ -39,7 +39,6 @@
 #include "chainloader.h"
 
 static Firm *firm = (Firm *)0x20001000;
-u32 firmProtoVersion = 0;
 
 static __attribute__((noinline)) bool overlaps(u32 as, u32 ae, u32 bs, u32 be)
 {
@@ -152,24 +151,10 @@ static inline u32 loadFirmFromStorage(FirmwareType firmType)
 
 u32 loadNintendoFirm(FirmwareType *firmType, FirmwareSource nandType, bool loadFromStorage, bool isSafeMode)
 {
-    u32 firmVersion = 0xFFFFFFFF,
+    u32 firmVersion,
         firmSize;
 
-    bool ctrNandError = true;
+    bool ctrNandError = isSdMode && !mountFs(false, false);
-    bool loadedFromStorage = false;
-    bool storageLoadError = false;
-
-    // Try loading FIRM from sdmc first if specified.
-    if (loadFromStorage) {
-        firmSize = loadFirmFromStorage(*firmType);
-        if (firmSize != 0) loadedFromStorage = true;
-        else storageLoadError = true;
-    }
-
-    // Remount ctrnand and load FIRM from it if loading from sdmc failed.
-    if (!loadedFromStorage) {
-        ctrNandError = isSdMode && !remountCtrNandPartition(false);
-    }
 
     if(!ctrNandError)
     {
@@ -184,8 +169,10 @@ u32 loadNintendoFirm(FirmwareType *firmType, FirmwareSource nandType, bool loadF
             if(!firmSize || !checkFirm(firmSize)) ctrNandError = true;
         }
     }
-    // If CTRNAND load failed, and it wasn't tried yet, load FIRM from sdmc.
+
-    if (ctrNandError && !storageLoadError)
+    bool loadedFromStorage = false;
+
+    if(loadFromStorage || ctrNandError)
     {
         u32 result = loadFirmFromStorage(*firmType);
 
@@ -194,69 +181,11 @@ u32 loadNintendoFirm(FirmwareType *firmType, FirmwareSource nandType, bool loadF
             loadedFromStorage = true;
             firmSize = result;
         }
-        else storageLoadError = true;
+        else if(ctrNandError) error("Unable to mount CTRNAND or load the CTRNAND FIRM.\nPlease use an external one.");
     }
-    // If all attempts failed, panic.
-    if(ctrNandError && storageLoadError) error("Unable to mount CTRNAND or load the CTRNAND FIRM.\nPlease use an external one.");
 
     //Check that the FIRM is right for the console from the Arm9 section address
-    bool isO3dsFirm = firm->section[3].offset == 0 && firm->section[2].address == (u8 *)0x8006800;
+    if((firm->section[3].offset != 0 ? firm->section[3].address : firm->section[2].address) != (ISN3DS ? (u8 *)0x8006000 : (u8 *)0x8006800))
-
-    if(loadedFromStorage || ISDEVUNIT)
-    {
-        firmVersion = 0xFFFFFFFF;
-
-        if(isO3dsFirm && (*firmType == NATIVE_FIRM || *firmType == NATIVE_FIRM1X2X))
-        {
-            __attribute__((aligned(4))) static const u8 hashes[5][0x20] = {
-                {0xD7, 0x43, 0x0F, 0x27, 0x8D, 0xC9, 0x3F, 0x4C, 0x96, 0xB5, 0xA8, 0x91, 0x48, 0xDB, 0x08, 0x8A,
-                 0x7E, 0x46, 0xB3, 0x95, 0x65, 0xA2, 0x05, 0xF1, 0xF2, 0x41, 0x21, 0xF1, 0x0C, 0x59, 0x6A, 0x9D},
-                {0x93, 0xDF, 0x49, 0xA1, 0x24, 0x86, 0xBB, 0x6F, 0xAF, 0x49, 0x99, 0x2D, 0xD0, 0x8D, 0xB1, 0x88,
-                 0x8A, 0x00, 0xB6, 0xDD, 0x36, 0x89, 0xC0, 0xE2, 0xC9, 0xA9, 0x99, 0x62, 0x57, 0x5E, 0x6C, 0x23},
-                {0x39, 0x75, 0xB5, 0x28, 0x24, 0x5E, 0x8B, 0x56, 0xBC, 0x83, 0x79, 0x41, 0x09, 0x2C, 0x42, 0xE6,
-                 0x26, 0xB6, 0x80, 0x59, 0xA5, 0x56, 0xF9, 0xF9, 0x6E, 0xF3, 0x63, 0x05, 0x58, 0xDF, 0x35, 0xEF},
-                {0x81, 0x9E, 0x71, 0x58, 0xE5, 0x44, 0x73, 0xF7, 0x48, 0x78, 0x7C, 0xEF, 0x5E, 0x30, 0xE2, 0x28,
-                 0x78, 0x0B, 0x21, 0x23, 0x94, 0x63, 0xE8, 0x4E, 0x06, 0xBB, 0xD6, 0x8D, 0xA0, 0x99, 0xAE, 0x98},
-                {0x1D, 0xD5, 0xB0, 0xC2, 0xD9, 0x4A, 0x4A, 0xF3, 0x23, 0xDD, 0x2F, 0x65, 0x21, 0x95, 0x9B, 0x7E,
-                 0xF2, 0x71, 0x7E, 0xB6, 0x7A, 0x3A, 0x74, 0x78, 0x0D, 0xE3, 0xB5, 0x0C, 0x2B, 0x7F, 0x85, 0x37},
-            };
-
-            u32 i;
-            for(i = 0; i < sizeof(hashes)/sizeof(hashes[0]); i++)
-            {
-                if(memcmp(firm->section[1].hash, hashes[i], 0x20) == 0) break;
-            }
-
-            switch(i)
-            {
-                // Beta
-                case 0:
-                    firmVersion = 0x0;
-                    firmProtoVersion = 243;
-                    *firmType = NATIVE_PROTOTYPE;
-                    break;
-                case 1:
-                    firmVersion = 0x0;
-                    firmProtoVersion = 238;
-                    *firmType = NATIVE_PROTOTYPE;
-                    break;
-                // Release
-                case 2:
-                    firmVersion = 0x18;
-                    break;
-                case 3:
-                    firmVersion = 0x1D;
-                    break;
-                case 4:
-                    firmVersion = 0x1F;
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-
-    if(*firmType != NATIVE_PROTOTYPE && (firm->section[3].offset != 0 ? firm->section[3].address : firm->section[2].address) != (ISN3DS ? (u8 *)0x8006000 : (u8 *)0x8006800))
         error("The %s FIRM is not for this console.", loadedFromStorage ? "external" : "CTRNAND");
 
     if(!ISN3DS && *firmType == NATIVE_FIRM && firm->section[0].address == (u8 *)0x1FF80000)
@@ -270,6 +199,39 @@ u32 loadNintendoFirm(FirmwareType *firmType, FirmwareSource nandType, bool loadF
         *firmType = NATIVE_FIRM1X2X;
     }
 
+    if(loadedFromStorage || ISDEVUNIT)
+    {
+        firmVersion = 0xFFFFFFFF;
+
+        if(!ISN3DS && *firmType == NATIVE_FIRM)
+        {
+            __attribute__((aligned(4))) static const u8 hashes[3][0x20] = {
+                {0x39, 0x75, 0xB5, 0x28, 0x24, 0x5E, 0x8B, 0x56, 0xBC, 0x83, 0x79, 0x41, 0x09, 0x2C, 0x42, 0xE6,
+                 0x26, 0xB6, 0x80, 0x59, 0xA5, 0x56, 0xF9, 0xF9, 0x6E, 0xF3, 0x63, 0x05, 0x58, 0xDF, 0x35, 0xEF},
+                {0x81, 0x9E, 0x71, 0x58, 0xE5, 0x44, 0x73, 0xF7, 0x48, 0x78, 0x7C, 0xEF, 0x5E, 0x30, 0xE2, 0x28,
+                 0x78, 0x0B, 0x21, 0x23, 0x94, 0x63, 0xE8, 0x4E, 0x06, 0xBB, 0xD6, 0x8D, 0xA0, 0x99, 0xAE, 0x98},
+                {0x1D, 0xD5, 0xB0, 0xC2, 0xD9, 0x4A, 0x4A, 0xF3, 0x23, 0xDD, 0x2F, 0x65, 0x21, 0x95, 0x9B, 0x7E,
+                 0xF2, 0x71, 0x7E, 0xB6, 0x7A, 0x3A, 0x74, 0x78, 0x0D, 0xE3, 0xB5, 0x0C, 0x2B, 0x7F, 0x85, 0x37}
+            };
+
+            u32 i;
+            for(i = 0; i < 3; i++) if(memcmp(firm->section[1].hash, hashes[i], 0x20) == 0) break;
+
+            switch(i)
+            {
+                case 0:
+                    firmVersion = 0x18;
+                    break;
+                case 1:
+                    firmVersion = 0x1D;
+                    break;
+                case 2:
+                    firmVersion = 0x1F;
+                    break;
+            }
+        }
+    }
+
     return firmVersion;
 }
 
@@ -300,148 +262,11 @@ void loadHomebrewFirm(u32 pressed)
     launchFirm(wantsScreenInit ? 2 : 1, argv);
 }
 
-static int lzss_decompress(u8 *end)
+static inline void mergeSection0(FirmwareType firmType, u32 firmVersion, bool loadFromStorage)
-{
-    unsigned int v1; // r1@2
-    u8 *v2; // r2@2
-    u8 *v3; // r3@2
-    u8 *v4; // r1@2
-    char v5; // r5@4
-    char v6; // t1@4
-    signed int v7; // r6@4
-    int v9; // t1@7
-    u8 *v11; // r3@8
-    int v12; // r12@8
-    int v13; // t1@8
-    int v14; // t1@8
-    unsigned int v15; // r7@8
-    int v16; // r12@8
-    int ret;
-
-    ret = 0;
-    if ( end )
-    {
-        v1 = *((u32 *)end - 2);
-        v2 = &end[*((u32 *)end - 1)];
-        v3 = &end[-(v1 >> 24)];
-        v4 = &end[-(v1 & 0xFFFFFF)];
-        while ( v3 > v4 )
-        {
-            v6 = *(v3-- - 1);
-            v5 = v6;
-            v7 = 8;
-            while ( 1 )
-            {
-                if ( (v7-- < 1) )
-                    break;
-                if ( v5 & 0x80 )
-                {
-                    v13 = *(v3 - 1);
-                    v11 = v3 - 1;
-                    v12 = v13;
-                    v14 = *(v11 - 1);
-                    v3 = v11 - 1;
-                    v15 = ((v14 | (v12 << 8)) & 0xFFFF0FFF) + 2;
-                    v16 = v12 + 32;
-                    do
-                    {
-                        ret = v2[v15];
-                        *(v2-- - 1) = ret;
-                        v16 -= 16;
-                    }
-                    while ( !(v16 < 0) );
-                }
-                else
-                {
-                    v9 = *(v3-- - 1);
-                    ret = v9;
-                    *(v2-- - 1) = v9;
-                }
-                v5 *= 2;
-                if ( v3 <= v4 )
-                    return ret;
-            }
-        }
-    }
-    return ret;
-}
-
-typedef struct CopyKipResult {
-    u32 cxiSize;
-    u8 *codeDstAddr;
-    u32 codeSize;
-} CopyKipResult;
-
-// Copy a KIP, decompressing it in place if necessary (TwlBg)
-static CopyKipResult copyKip(u8 *dst, const u8 *src, u32 maxSize, bool decompress)
-{
-    const char *extModuleSizeError = "The external FIRM modules are too large.";
-    CopyKipResult res = { 0 };
-    Cxi *dstCxi = (Cxi *)dst;
-    const Cxi *srcCxi = (const Cxi *)src;
-
-    u32 mediaUnitShift = 9 + srcCxi->ncch.flags[6];
-    u32 totalSizeCompressed = srcCxi->ncch.contentSize << mediaUnitShift;
-
-    if (totalSizeCompressed > maxSize)
-        error(extModuleSizeError);
-
-    // First, copy the compressed KIP to the destination
-    memcpy(dst, src, totalSizeCompressed);
-
-    ExHeader *exh = &dstCxi->exHeader;
-    bool isCompressed = (exh->systemControlInfo.flag & 1) != 0;
-    ExeFsHeader *exefs = (ExeFsHeader *)(dst + (dstCxi->ncch.exeFsOffset << mediaUnitShift));
-    ExeFsFileHeader *fh = &exefs->fileHeaders[0];
-    u8 *codeAddr = (u8 *)exefs + sizeof(ExeFsHeader) + fh->offset;
-
-    if (memcmp(fh->name, ".code\0\0\0", 8) != 0 || fh->offset != 0 || exefs->fileHeaders[1].size != 0)
-        error("One of the external FIRM modules have invalid layout.");
-
-    // If it's already decompressed or we don't need to, there is not much left to do
-    if (!decompress || !isCompressed)
-    {
-        res.cxiSize = totalSizeCompressed;
-        res.codeDstAddr = codeAddr;
-        res.codeSize = fh->size;
-    }
-    else
-    {
-        u32 codeSize = exh->systemControlInfo.textCodeSet.size;
-        codeSize += exh->systemControlInfo.roCodeSet.size;
-        codeSize += exh->systemControlInfo.dataCodeSet.size;
-
-        u32 codeSizePadded = ((codeSize + (1 << mediaUnitShift) - 1) >> mediaUnitShift) << mediaUnitShift;
-        u32 newTotalSize = (codeAddr + codeSizePadded) - dst;
-        if (newTotalSize > maxSize)
-            error(extModuleSizeError);
-
-        // Decompress in place
-        lzss_decompress(codeAddr + fh->size);
-
-        // Fill padding just in case
-        memset(codeAddr + codeSize, 0, codeSizePadded - codeSize);
-
-        // Fix fields
-        fh->size = codeSize;
-        dstCxi->ncch.exeFsSize = codeSizePadded >> mediaUnitShift;
-        exh->systemControlInfo.flag &= ~1;
-        dstCxi->ncch.contentSize = newTotalSize >> mediaUnitShift;
-
-        res.cxiSize = newTotalSize;
-        res.codeDstAddr = codeAddr;
-        res.codeSize = codeSize;
-    }
-
-    return res;
-}
-static void mergeSection0(FirmwareType firmType, u32 firmVersion, bool loadFromStorage)
 {
     u32 srcModuleSize,
         nbModules = 0;
 
-    bool isLgyFirm = firmType == TWL_FIRM || firmType == AGB_FIRM;
-
     struct
     {
         char name[8];
@@ -458,7 +283,7 @@ static void mergeSection0(FirmwareType firmType, u32 firmVersion, bool loadFromS
     }
 
     // SAFE_FIRM only for N3DS and only if ENABLESAFEFIRMROSALINA is on
-    if((firmType == NATIVE_FIRM || firmType == SAFE_FIRM) && (ISN3DS || firmVersion >= 0x25))
+    if((firmType == NATIVE_FIRM || firmType == SAFE_FIRM) && (ISN3DS || firmVersion >= 0x1D))
     {
         //2) Merge that info with our own modules'
         for(u8 *src = (u8 *)0x18180000; memcmp(((Cxi *)src)->ncch.magic, "NCCH", 4) == 0; src += srcModuleSize)
@@ -484,9 +309,8 @@ static void mergeSection0(FirmwareType firmType, u32 firmVersion, bool loadFromS
     u8 *dst = firm->section[0].address;
     const char *extModuleSizeError = "The external FIRM modules are too large.";
     // SAFE_FIRM only for N3DS and only if ENABLESAFEFIRMROSALINA is on
-    u32 maxModuleSize = !isLgyFirm ? 0x80000 : 0x600000;
+    u32 maxModuleSize = (firmType == NATIVE_FIRM || firmType == SAFE_FIRM) ? 0x80000 : 0x600000;
-    u32 dstModuleSize = 0;
+    for(u32 i = 0, dstModuleSize; i < nbModules; i++, dst += dstModuleSize, maxModuleSize -= dstModuleSize)
-    for(u32 i = 0; i < nbModules; i++)
     {
         if(loadFromStorage)
         {
@@ -507,46 +331,29 @@ static void mergeSection0(FirmwareType firmType, u32 firmVersion, bool loadFromS
                    memcmp(moduleList[i].name, ((Cxi *)dst)->exHeader.systemControlInfo.appTitle, sizeof(((Cxi *)dst)->exHeader.systemControlInfo.appTitle)) != 0)
                     error("An external FIRM module is invalid or corrupted.");
 
-                dst += dstModuleSize;
-                maxModuleSize -= dstModuleSize;
                 continue;
             }
         }
 
-        // If not successfully loaded from storage, then...
+        dstModuleSize = moduleList[i].size;
 
-        // Decompress stock TwlBg so that we can patch it
+        if(dstModuleSize > maxModuleSize) error(extModuleSizeError);
-        bool isStockTwlBg = firmType == TWL_FIRM && strcmp(moduleList[i].name, "TwlBg") == 0;
 
-        CopyKipResult copyRes = copyKip(dst, moduleList[i].src, maxModuleSize, isStockTwlBg);
+        memcpy(dst, moduleList[i].src, dstModuleSize);
-
-        if (isStockTwlBg)
-            patchTwlBg(copyRes.codeDstAddr, copyRes.codeSize);
-
-        dst += copyRes.cxiSize;
-        maxModuleSize -= copyRes.cxiSize;
     }
 
-    //4) Patch kernel to take module size into account
+    //4) Patch NATIVE_FIRM/SAFE_FIRM (N3DS) if necessary
-    u32 newKipSectionSize = dst - firm->section[0].address;
+    if(nbModules == 6)
-    u32 oldKipSectionSize = firm->section[0].size;
-    u8 *kernel11Addr = (u8 *)firm + firm->section[1].offset;
-    u32 kernel11Size = firm->section[1].size;
-    if (isLgyFirm)
     {
-        if (patchK11ModuleLoadingLgy(newKipSectionSize, kernel11Addr, kernel11Size) != 0)
+        if(patchK11ModuleLoading(firm->section[0].size, dst - firm->section[0].address, (u8 *)firm + firm->section[1].offset, firm->section[1].size) != 0)
-            error("Failed to load sysmodules");
+            error("Failed to inject custom sysmodule");
-    }
-    else
-    {
-        if (patchK11ModuleLoading(oldKipSectionSize, newKipSectionSize, nbModules, kernel11Addr, kernel11Size) != 0)
-            error("Failed to load sysmodules");
     }
 }
 
 u32 patchNativeFirm(u32 firmVersion, FirmwareSource nandType, bool loadFromStorage, bool isFirmProtEnabled, bool needToInitSd, bool doUnitinfoPatch)
 {
-    u8 *arm9Section = (u8 *)firm + firm->section[2].offset;
+    u8 *arm9Section = (u8 *)firm + firm->section[2].offset,
+       *arm11Section1 = (u8 *)firm + firm->section[1].offset;
 
     if(ISN3DS)
     {
@@ -560,41 +367,34 @@ u32 patchNativeFirm(u32 firmVersion, FirmwareSource nandType, bool loadFromStora
         process9MemAddr;
     u8 *process9Offset = getProcess9Info(arm9Section, firm->section[2].size, &process9Size, &process9MemAddr);
 
-    u32 kernel9Size = (u32)(process9Offset - arm9Section) - sizeof(Cxi) - 0x200,
-        ret = 0;
-
-#ifndef BUILD_FOR_EXPLOIT_DEV
-    //Skip on FIRMs < 5.0
-    if(ISN3DS || firmVersion >= 0x25)
-    {
     //Find the Kernel11 SVC table and handler, exceptions page and free space locations
-        u8 *arm11Section1 = (u8 *)firm + firm->section[1].offset;
     u32 baseK11VA;
     u8 *freeK11Space;
     u32 *arm11SvcHandler,
         *arm11ExceptionsPage,
         *arm11SvcTable = getKernel11Info(arm11Section1, firm->section[1].size, &baseK11VA, &freeK11Space, &arm11SvcHandler, &arm11ExceptionsPage);
 
+    u32 kernel9Size = (u32)(process9Offset - arm9Section) - sizeof(Cxi) - 0x200,
+        ret = 0;
+
+    //Skip on FIRMs < 4.0
+    if(ISN3DS || firmVersion >= 0x1D)
+    {
         ret += installK11Extension(arm11Section1, firm->section[1].size, needToInitSd, baseK11VA, arm11ExceptionsPage, &freeK11Space);
         ret += patchKernel11(arm11Section1, firm->section[1].size, baseK11VA, arm11SvcTable, arm11ExceptionsPage);
     }
-#else
-    (void)needToInitSd;
-#endif
 
     //Apply signature patches
     ret += patchSignatureChecks(process9Offset, process9Size);
 
     //Apply EmuNAND patches
-    if(nandType != FIRMWARE_SYSNAND) ret += patchEmuNand(process9Offset, process9Size, firmVersion);
+    if(nandType != FIRMWARE_SYSNAND) ret += patchEmuNand(arm9Section, kernel9Size, process9Offset, process9Size, firm->section[2].address, firmVersion);
 
     //Apply FIRM0/1 writes patches on SysNAND to protect A9LH
     else if(isFirmProtEnabled) ret += patchFirmWrites(process9Offset, process9Size);
 
-#ifndef BUILD_FOR_EXPLOIT_DEV
     //Apply firmlaunch patches
     ret += patchFirmlaunches(process9Offset, process9Size, process9MemAddr);
-#endif
 
     //Apply dev unit check patches related to NCCH encryption
     if(!ISDEVUNIT)
@@ -631,11 +431,6 @@ u32 patchNativeFirm(u32 firmVersion, FirmwareSource nandType, bool loadFromStora
 
 u32 patchTwlFirm(u32 firmVersion, bool loadFromStorage, bool doUnitinfoPatch)
 {
-    u8 *section1 = (u8 *)firm + firm->section[1].offset;
-    u32 section1Size = firm->section[1].size;
-    u8 *section2 = (u8 *)firm + firm->section[2].offset;
-    u32 section2Size = firm->section[2].size;
-
     u8 *arm9Section = (u8 *)firm + firm->section[3].offset;
 
     // Below 3.0, do not actually do anything.
@@ -668,11 +463,11 @@ u32 patchTwlFirm(u32 firmVersion, bool loadFromStorage, bool doUnitinfoPatch)
     //Apply UNITINFO patch
     if(doUnitinfoPatch) ret += patchUnitInfoValueSet(arm9Section, kernel9Size);
 
-    ret += patchLgyK11(section1, section1Size, section2, section2Size);
+    if(loadFromStorage)
-
+    {
-    // Also patch TwlBg here
+        mergeSection0(TWL_FIRM, 0, true);
-    mergeSection0(TWL_FIRM, 0, loadFromStorage);
         firm->section[0].size = 0;
+    }
 
     return ret;
 }
@@ -681,11 +476,6 @@ u32 patchAgbFirm(bool loadFromStorage, bool doUnitinfoPatch)
 {
     u8 *arm9Section = (u8 *)firm + firm->section[3].offset;
 
-    u8 *section1 = (u8 *)firm + firm->section[1].offset;
-    u32 section1Size = firm->section[1].size;
-    u8 *section2 = (u8 *)firm + firm->section[2].offset;
-    u32 section2Size = firm->section[2].size;
-
     //On N3DS, decrypt Arm9Bin and patch Arm9 entrypoint to skip kernel9loader
     if(ISN3DS)
     {
@@ -703,7 +493,6 @@ u32 patchAgbFirm(bool loadFromStorage, bool doUnitinfoPatch)
 
     ret += patchLgySignatureChecks(process9Offset, process9Size);
     if(CONFIG(SHOWGBABOOT)) ret += patchAgbBootSplash(process9Offset, process9Size);
-    ret += patchLgyK11(section1, section1Size, section2, section2Size);
 
     //Apply UNITINFO patch
     if(doUnitinfoPatch) ret += patchUnitInfoValueSet(arm9Section, kernel9Size);
@@ -773,29 +562,6 @@ u32 patch1x2xNativeAndSafeFirm(void)
     return ret;
 }
 
-u32 patchPrototypeNative(FirmwareSource nandType)
-{
-    u8 *arm9Section = (u8 *)firm + firm->section[2].offset;
-
-    //Find the Process9 .code location, size and memory address
-    u32 process9Size,
-        process9MemAddr;
-    u8 *process9Offset = getProcess9Info(arm9Section, firm->section[2].size, &process9Size, &process9MemAddr);
-
-    u32 kernel9Size = (u32)(process9Offset - arm9Section) - sizeof(Cxi) - 0x200,
-        ret = 0;
-
-    ret += patchProtoNandSignatureCheck(process9Offset, process9Size);
-
-    //Arm9 exception handlers
-    ret += patchArm9ExceptionHandlersInstall(arm9Section, kernel9Size);
-
-    //Apply EmuNAND patches
-    if(nandType != FIRMWARE_SYSNAND) ret += patchProtoEmuNand(process9Offset, process9Size);
-
-    return ret;
-}
-
 void launchFirm(int argc, char **argv)
 {
     prepareArm11ForFirmlaunch();

arm9/source/firm.h

@@ -35,5 +35,4 @@ u32 patchNativeFirm(u32 firmVersion, FirmwareSource nandType, bool loadFromStora
 u32 patchTwlFirm(u32 firmVersion, bool loadFromStorage, bool doUnitinfoPatch);
 u32 patchAgbFirm(bool loadFromStorage, bool doUnitinfoPatch);
 u32 patch1x2xNativeAndSafeFirm(void);
-u32 patchPrototypeNative(FirmwareSource nandType);
 void launchFirm(int argc, char **argv);

arm9/source/fs.c

@@ -52,50 +52,27 @@ static bool switchToMainDir(bool isSd)
         case FR_OK:
             return true;
         case FR_NO_PATH:
-        {
+            return f_mkdir(mainDir) == FR_OK && switchToMainDir(isSd);
-            if (f_mkdir(mainDir) != FR_OK)
-            {
-                error("Failed to create luma directory.");
-                return false;
-            }
-            return switchToMainDir(isSd);
-        }
         default:
             return false;
     }
 }
 
-bool mountSdCardPartition(bool switchMainDir)
+bool mountFs(bool isSd, bool switchToCtrNand)
+{
+    static bool sdInitialized = false, nandInitialized = false;
+    if (isSd)
     {
-    static bool sdInitialized = false;
         if (!sdInitialized)
-        sdInitialized = f_mount(&sdFs, "sdmc:", 1) == FR_OK;
+            sdInitialized = f_mount(&sdFs, "0:", 1) == FR_OK;
-
+        return sdInitialized && switchToMainDir(true);
-    if (sdInitialized && switchMainDir)
-        return f_chdrive("sdmc:") == FR_OK && switchToMainDir(true);
-    return sdInitialized;
     }
-
+    else
-bool remountCtrNandPartition(bool switchMainDir)
     {
-    static bool nandInitialized = false;
-    int res = FR_OK;
-
         if (!nandInitialized)
-    {
+            nandInitialized = f_mount(&nandFs, "1:", 1) == FR_OK;
-        res = f_mount(&nandFs, "nand:", 1);
+        return nandInitialized && (!switchToCtrNand || (f_chdrive("1:") == FR_OK && switchToMainDir(false)));
-        nandInitialized = res == FR_OK;
     }
-
-    if (nandInitialized && switchMainDir)
-        return f_chdrive("nand:") == FR_OK && switchToMainDir(false);
-    return nandInitialized;
-}
-
-void unmountPartitions(void)
-{
-    f_unmount("nand:");
-    f_unmount("sdmc:");
 }
 
 u32 fileRead(void *dest, const char *path, u32 maxSize)
@@ -137,7 +114,6 @@ bool fileWrite(const void *buffer, const char *path, u32 size)
             return result == FR_OK && (u32)written == size;
         }
         case FR_NO_PATH:
-            // Only create the last dir in the hierarchy
             for(u32 i = 1; path[i] != 0; i++)
                 if(path[i] == '/')
                 {
@@ -179,7 +155,6 @@ bool fileCopy(const char *pathSrc, const char *pathDst, bool replace, void *tmpB
     }
     else if (res == FR_NO_PATH)
     {
-        // Only create the last dir in the hierarchy
         const char *c;
         for (c = pathDst + strlen(pathDst); *c != '/' && c >= pathDst; --c);
         if (c >= pathDst && c - pathDst <= FF_MAX_LFN && *c != '\0')
@@ -232,12 +207,6 @@ bool fileCopy(const char *pathSrc, const char *pathDst, bool replace, void *tmpB
     return true;
 }
 
-bool createDir(const char *path)
-{
-    FRESULT res = f_mkdir(path);
-    return res == FR_OK || res == FR_EXIST;
-}
-
 bool findPayload(char *path, u32 pressed)
 {
     const char *pattern;
@@ -374,10 +343,10 @@ u32 firmRead(void *dest, u32 firmType)
                                            {"00000003", "20000003"},
                                            {"00000001", "20000001"}};
 
-    char folderPath[64],
+    char folderPath[35],
-         path[128];
+         path[48];
 
-    sprintf(folderPath, "nand:/title/00040138/%s/content", firmFolders[firmType][ISN3DS ? 1 : 0]);
+    sprintf(folderPath, "1:/title/00040138/%s/content", firmFolders[firmType][ISN3DS ? 1 : 0]);
 
     DIR dir;
     u32 firmVersion = 0xFFFFFFFF;
@@ -443,38 +412,22 @@ static bool backupEssentialFiles(void)
 {
     size_t sz = sizeof(fileCopyBuffer);
 
-    u32 deviceID = *(vu32*)0x01FFB804;
+    bool ok = !(isSdMode && !mountFs(false, false));
-    char pathStart[0x20];
-    sprintf(pathStart, "backups/%08lX/", deviceID);
-    char fullPath[0x80];
 
-    // Since the other funcs in this file don't create directories recursively (only the last one),
+    ok = ok && fileCopy("1:/ro/sys/HWCAL0.dat", "backups/HWCAL0.dat", false, fileCopyBuffer, sz);
-    // and nor does f_mkdir, create the directories anyway and ignore the result
+    ok = ok && fileCopy("1:/ro/sys/HWCAL1.dat", "backups/HWCAL1.dat", false, fileCopyBuffer, sz);
-    f_mkdir("backups");
-    f_mkdir(pathStart);
 
-    bool ok = true;
+    ok = ok && fileCopy("1:/rw/sys/LocalFriendCodeSeed_A", "backups/LocalFriendCodeSeed_A", false, fileCopyBuffer, sz); // often doesn't exist
-    sprintf(fullPath, "%sHWCAL0.dat", pathStart);
+    ok = ok && fileCopy("1:/rw/sys/LocalFriendCodeSeed_B", "backups/LocalFriendCodeSeed_B", false, fileCopyBuffer, sz);
-    ok = ok && fileCopy("nand:/ro/sys/HWCAL0.dat", fullPath, false, fileCopyBuffer, sz);
-    sprintf(fullPath, "%sHWCAL1.dat", pathStart);
-    ok = ok && fileCopy("nand:/ro/sys/HWCAL1.dat", fullPath, false, fileCopyBuffer, sz);
 
-    sprintf(fullPath, "%sLocalFriendCodeSeed_A", pathStart);
+    ok = ok && fileCopy("1:/rw/sys/SecureInfo_A", "backups/SecureInfo_A", false, fileCopyBuffer, sz);
-    ok = ok && fileCopy("nand:/rw/sys/LocalFriendCodeSeed_A", fullPath, false, fileCopyBuffer, sz); // often doesn't exist
+    ok = ok && fileCopy("1:/rw/sys/SecureInfo_B", "backups/SecureInfo_B", false, fileCopyBuffer, sz); // often doesn't exist
-    sprintf(fullPath, "%sLocalFriendCodeSeed_B", pathStart);
-    ok = ok && fileCopy("nand:/rw/sys/LocalFriendCodeSeed_B", fullPath, false, fileCopyBuffer, sz);
-
-    sprintf(fullPath, "%sSecureInfo_A", pathStart);
-    ok = ok && fileCopy("nand:/rw/sys/SecureInfo_A", fullPath, false, fileCopyBuffer, sz);
-    sprintf(fullPath, "%sSecureInfo_B", pathStart);
-    ok = ok && fileCopy("nand:/rw/sys/SecureInfo_B", fullPath, false, fileCopyBuffer, sz); // often doesn't exist
 
     if (!ok) return false;
 
     alignedseqmemcpy(fileCopyBuffer, (const void *)0x10012000, 0x100);
-    sprintf(fullPath, "%sotp.bin", pathStart);
+    if (getFileSize("backups/otp.bin") != 0x100)
-    if (getFileSize(fullPath) != 0x100)
+        ok = ok && fileWrite(fileCopyBuffer, "backups/otp.bin", 0x100);
-        ok = ok && fileWrite(fileCopyBuffer, fullPath, 0x100);
 
     if (!ok) return false;
 
@@ -482,48 +435,40 @@ static bool backupEssentialFiles(void)
     u8 c = mcuConsoleInfo[0];
     if (c == 2 || c == 4 || (ISN3DS && c == 5) || c == 6)
     {
-        sprintf(fullPath, "%sHWCAL_01_EEPROM.dat", pathStart);
         I2C_readRegBuf(I2C_DEV_EEPROM, 0, fileCopyBuffer, 0x1000); // Up to two instances of hwcal, with the second one @0x800
-        if (getFileSize(fullPath) != 0x1000)
+        if (getFileSize("backups/HWCAL_01_EEPROM.dat") != 0x1000)
-            ok = ok && fileWrite(fileCopyBuffer, fullPath, 0x1000);
+            ok = ok && fileWrite(fileCopyBuffer, "backups/HWCAL_01_EEPROM.dat", 0x1000);
     }
 
     // B9S bootrom backups
     u32 hash[32/4];
     sha(hash, (const void *)0x08080000, 0x10000, SHA_256_MODE);
-    sprintf(fullPath, "%sboot9.bin", pathStart);
+    if (memcmp(hash, boot9Sha256, 32) == 0 && getFileSize("backups/boot9.bin") != 0x10000)
-    if (memcmp(hash, boot9Sha256, 32) == 0 && getFileSize(fullPath) != 0x10000)
+        ok = ok && fileWrite((const void *)0x08080000, "backups/boot9.bin", 0x10000);
-        ok = ok && fileWrite((const void *)0x08080000, fullPath, 0x10000);
     sha(hash, (const void *)0x08090000, 0x10000, SHA_256_MODE);
-    sprintf(fullPath, "%sboot11.bin", pathStart);
+    if (memcmp(hash, boot11Sha256, 32) == 0 && getFileSize("backups/boot11.bin") != 0x10000)
-    if (memcmp(hash, boot11Sha256, 32) == 0 && getFileSize(fullPath) != 0x10000)
+        ok = ok && fileWrite((const void *)0x08090000, "backups/boot11.bin", 0x10000);
-        ok = ok && fileWrite((const void *)0x08090000, fullPath, 0x10000);
 
     return ok;
 }
 
 bool doLumaUpgradeProcess(void)
 {
-    bool ok = true, ok2 = true;
-
     // Ensure CTRNAND is mounted
-    remountCtrNandPartition(false);
+    bool ok = mountFs(false, false), ok2 = true;
+    if (!ok)
+        return false;
 
     // Try to boot.firm to CTRNAND, when applicable
-#ifndef BUILD_FOR_EXPLOIT_DEV
+    if (isSdMode)
-    if (isSdMode && memcmp(launchedPathForFatfs, "sdmc:", 5) == 0)
+        ok = fileCopy("0:/boot.firm", "1:/boot.firm", true, fileCopyBuffer, sizeof(fileCopyBuffer));
-        ok = fileCopy(launchedPathForFatfs, "nand:/boot.firm", true, fileCopyBuffer, sizeof(fileCopyBuffer));
-#endif
 
     // Try to backup essential files
     ok2 = backupEssentialFiles();
 
     // Clean up some of the old files
-    fileDelete("sdmc:/luma/config.bin");
+    fileDelete("0:/luma/config.bin");
-    fileDelete("nand:/rw/luma/config.bin");
+    fileDelete("1:/rw/luma/config.bin");
-
-    createDir("sdmc:/luma/payloads");
-    createDir("nand:/rw/luma/payloads");
 
     return ok && ok2;
 }

arm9/source/fs.h

@@ -30,16 +30,12 @@
 
 #define PATTERN(a) a "_*.firm"
 
-bool mountSdCardPartition(bool switchMainDir);
+bool mountFs(bool isSd, bool switchToCtrNand);
-bool remountCtrNandPartition(bool switchMainDir);
-void unmountPartitions(void);
-
 u32 fileRead(void *dest, const char *path, u32 maxSize);
 u32 getFileSize(const char *path);
 bool fileWrite(const void *buffer, const char *path, u32 size);
 bool fileDelete(const char *path);
 bool fileCopy(const char *pathSrc, const char *pathDst, bool replace, void *tmpBuffer, size_t bufferSize);
-bool createDir(const char *path);
 bool findPayload(char *path, u32 pressed);
 bool payloadMenu(char *path, bool *hasDisplayedMenu);
 u32 firmRead(void *dest, u32 firmType);

arm9/source/i2c.h

@@ -40,8 +40,6 @@ typedef enum
     I2C_DEV_CAMERA    = 1, 	// Unconfirmed
     I2C_DEV_CAMERA2   = 2, 	// Unconfirmed
     I2C_DEV_MCU       = 3,
-    I2C_DEV_LCD_TOP   = 5,
-    I2C_DEV_LCD_BOT   = 6,
     I2C_DEV_GYRO      = 10,
     I2C_DEV_DEBUG_PAD = 12,
     I2C_DEV_IR        = 13,

arm9/source/large_patches.h

@@ -28,11 +28,9 @@
 
 #include "types.h"
 
-extern const u8 emunandPatch[], emunandProtoPatch[], emunandProtoCidPatch[];
+extern const u8 emunandPatch[];
-extern const u8 emunandProtoPatch238[];
+extern const u32 emunandPatchSize;
-extern const u32 emunandPatchSize, emunandPatchBssSize;
 extern u32 emunandPatchSdmmcStructPtr, emunandPatchNandOffset, emunandPatchNcsdHeaderOffset;
-extern u32 emunandPatchNandCid[4];
 
 extern const u8 rebootPatch[];
 extern const u32 rebootPatchSize;

arm9/source/large_patches.s

@@ -1,3 +1,67 @@
+.section .large_patch.emunand, "aw", %progbits
+.arm
+.align 4
+
+@ Code originally by Normmatt
+
+.global emunandPatch
+emunandPatch:
+    @ Original code that still needs to be executed
+    mov r4, r0
+    mov r5, r1
+    mov r7, r2
+    mov r6, r3
+    @ End
+
+    @ If we're already trying to access the SD, return
+    ldr r2, [r0, #4]
+    ldr r1, emunandPatchSdmmcStructPtr
+    cmp r2, r1
+    beq out
+
+    str r1, [r0, #4] @ Set object to be SD
+    ldr r2, [r0, #8] @ Get sector to read
+    cmp r2, #0 @ For GW compatibility, see if we're trying to read the ncsd header (sector 0)
+
+    ldr r3, emunandPatchNandOffset
+    add r2, r3 @ Add the offset to the NAND in the SD
+
+    ldreq r3, emunandPatchNcsdHeaderOffset
+    addeq r2, r3 @ If we're reading the ncsd header, add the offset of that sector
+
+    str r2, [r0, #8] @ Store sector to read
+
+    out:
+        @ Restore registers.
+        mov r1, r5
+        mov r2, r7
+        mov r3, r6
+
+        @ Return 4 bytes behind where we got called,
+        @ due to the offset of this function being stored there
+        mov r0, lr
+        add r0, #4
+        bx r0
+
+.pool
+
+.global emunandPatchSdmmcStructPtr
+.global emunandPatchNandOffset
+.global emunandPatchNcsdHeaderOffset
+
+emunandPatchSdmmcStructPtr:     .word   0 @ Pointer to sdmmc struct
+emunandPatchNandOffset:         .word   0 @ For rednand this should be 1
+emunandPatchNcsdHeaderOffset:   .word   0 @ Depends on nand manufacturer + emunand type (GW/RED)
+
+.pool
+.balign 4
+
+_emunandPatchEnd:
+
+.global emunandPatchSize
+emunandPatchSize:
+    .word _emunandPatchEnd - emunandPatch
+
 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 
 @ Code originally from delebile and mid-kid

arm9/source/main.c

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Luma3DS
-*   Copyright (C) 2016-2023 Aurora Wright, TuxSH
+*   Copyright (C) 2016-2020 Aurora Wright, TuxSH
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -35,19 +35,17 @@
 #include "pin.h"
 #include "crypto.h"
 #include "memory.h"
-#include "deliver_arg.h"
 #include "screen.h"
 #include "i2c.h"
-#include "fmt.h"
 #include "fatfs/sdmmc/sdmmc.h"
 
 extern u8 __itcm_start__[], __itcm_lma__[], __itcm_bss_start__[], __itcm_end__[];
 
 extern CfgData configData;
 extern ConfigurationStatus needConfig;
+extern FirmwareSource firmSource;
 
 bool isSdMode;
-char launchedPathForFatfs[256];
 u16 launchedPath[80+1];
 BootType bootType;
 
@@ -56,16 +54,14 @@ u8 mcuConsoleInfo[9];
 
 void main(int argc, char **argv, u32 magicWord)
 {
-    bool isFirmProtEnabled = true,
+    bool isFirmProtEnabled,
          isSafeMode = false,
          needToInitSd = false,
          isNoForceFlagSet = false,
          isInvalidLoader = false,
-         isNtrBoot = false;
+         isNtrBoot;
-    FirmwareType firmType = NATIVE_FIRM;
+    FirmwareType firmType;
-    FirmwareSource nandType = FIRMWARE_SYSNAND;
+    FirmwareSource nandType;
-    u32 emunandIndex = 0;
-
     const vu8 *bootMediaStatus = (const vu8 *)0x1FFFE00C;
     const vu32 *bootPartitionsStatus = (const vu32 *)0x1FFFE010;
     u32 firmlaunchTidLow = 0;
@@ -76,8 +72,6 @@ void main(int argc, char **argv, u32 magicWord)
     if((magicWord & 0xFFFF) == 0xBEEF && argc >= 1) //Normal (B9S) boot
     {
         bootType = isNtrBoot ? B9SNTR : B9S;
-        strncpy(launchedPathForFatfs, argv[0], sizeof(launchedPathForFatfs) - 1);
-        launchedPathForFatfs[sizeof(launchedPathForFatfs) - 1] = 0;
 
         u32 i;
         for(i = 0; i < sizeof(launchedPath)/2 - 1 && argv[0][i] != 0; i++) //Copy and convert the path to UTF-16
@@ -91,10 +85,7 @@ void main(int argc, char **argv, u32 magicWord)
         u32 i;
         u16 *p = (u16 *)argv[0];
         for(i = 0; i < sizeof(launchedPath)/2 - 1 && p[i] != 0; i++)
-        {
             launchedPath[i] = p[i];
-            launchedPathForFatfs[i] = (u8)p[i]; // UCS-2 to ascii. Meh.
-        }
         launchedPath[i] = 0;
 
         for(i = 0; i < 8; i++)
@@ -119,7 +110,6 @@ void main(int argc, char **argv, u32 magicWord)
 
             for(u32 i = 0; i < 7; i++) //Copy and convert the path to UTF-16
                 launchedPath[i] = path[i];
-            strcpy(launchedPathForFatfs, path);
         }
 
         setupKeyslots();
@@ -131,13 +121,8 @@ void main(int argc, char **argv, u32 magicWord)
     memset(__itcm_bss_start__, 0, __itcm_end__ - __itcm_bss_start__);
     I2C_init();
 
-    u8 mcuFwVerHi = I2C_readReg(I2C_DEV_MCU, 0) - 0x10;
+    I2C_readRegBuf(I2C_DEV_MCU, 0x00, (u8 *)&mcuFwVersion, 2);
-    u8 mcuFwVerLo = I2C_readReg(I2C_DEV_MCU, 1);
+    if ((mcuFwVersion & 0xFFF) < 0x0100) error("Unsupported MCU FW version.");
-    mcuFwVersion = ((u16)mcuFwVerHi << 16) | mcuFwVerLo;
-
-    // Check if fw is older than factory. See https://www.3dbrew.org/wiki/MCU_Services#MCU_firmware_versions for a table
-    if (mcuFwVerHi < 1) error("Unsupported MCU FW version %d.%d.", (int)mcuFwVerHi, (int)mcuFwVerLo);
-
     I2C_readRegBuf(I2C_DEV_MCU, 0x7F, mcuConsoleInfo, 9);
 
     if(isInvalidLoader) error("Launched using an unsupported loader.");
@@ -146,18 +131,18 @@ void main(int argc, char **argv, u32 magicWord)
 
     if(memcmp(launchedPath, u"sdmc", 8) == 0)
     {
-        if(!mountSdCardPartition(true)) error("Failed to mount SD.");
+        if(!mountFs(true, false)) error("Failed to mount SD.");
         isSdMode = true;
     }
     else if(memcmp(launchedPath, u"nand", 8) == 0)
     {
-        if(!remountCtrNandPartition(true)) error("Failed to mount CTRNAND.");
+        if(!mountFs(false, true)) error("Failed to mount CTRNAND.");
         isSdMode = false;
     }
     else if(bootType == NTR || memcmp(launchedPath, u"firm", 8) == 0)
     {
-        if(mountSdCardPartition(true)) isSdMode = true;
+        if(mountFs(true, false)) isSdMode = true;
-        else if(remountCtrNandPartition(true)) isSdMode = false;
+        else if(mountFs(false, true)) isSdMode = false;
         else error("Failed to mount SD and CTRNAND.");
 
         if(bootType == NTR)
@@ -203,7 +188,7 @@ void main(int argc, char **argv, u32 magicWord)
         }
 
         nandType = (FirmwareSource)BOOTCFG_NAND;
-        emunandIndex = BOOTCFG_EMUINDEX;
+        firmSource = (FirmwareSource)BOOTCFG_FIRM;
         isFirmProtEnabled = !BOOTCFG_NTRCARDBOOT;
 
         goto boot;
@@ -218,36 +203,31 @@ void main(int argc, char **argv, u32 magicWord)
     //If it's a MCU reboot, try to force boot options
     if(CFG_BOOTENV && needConfig != CREATE_CONFIGURATION)
     {
-        u32 bootenv = CFG_BOOTENV;
-        bool validTlnc = bootenv == 3 && hasValidTlncAutobootParams();
-
-        if (validTlnc)
-            needToInitSd = true;
-
         //Always force a SysNAND boot when quitting AGB_FIRM
-        if(bootenv == 7)
+        if(CFG_BOOTENV == 7)
         {
             nandType = FIRMWARE_SYSNAND;
+            firmSource = (BOOTCFG_NAND != 0) == (BOOTCFG_FIRM != 0) ? FIRMWARE_SYSNAND : (FirmwareSource)BOOTCFG_FIRM;
 
             //Prevent multiple boot options-forcing
-            // This bit is a bit weird. Basically, as you return to Home Menu by pressing either
+            if(nandType != BOOTCFG_NAND || firmSource != BOOTCFG_FIRM) isNoForceFlagSet = true;
-            // the HOME or POWER button, nandType will be overridden to "SysNAND" (needed). But,
-            // if you reboot again (e.g. via Rosalina menu), it'll use your default settings.
-            if(nandType != BOOTCFG_NAND) isNoForceFlagSet = true;
 
             goto boot;
         }
 
-        // Configure homebrew autoboot (if deliver arg ends up not containing anything)
+        //Account for DSiWare soft resets if exiting TWL_FIRM
-        if (bootenv == 1 && MULTICONFIG(AUTOBOOTMODE) != 0)
+        if(CFG_BOOTENV == 3)
-            configureHomebrewAutoboot();
+        {
+            static const u8 TLNC[] = {0x54, 0x4C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4E, 0x43};
+            if(memcmp((void *)0x20000C00, TLNC, 10) == 0) needToInitSd = true;
+        }
 
-        /* Force the last used boot options if doing autolaunch from TWL, or unless a button is pressed
+        /* Force the last used boot options if autobooting a TWL title, or unless a button is pressed
            or the no-forcing flag is set */
-        if(validTlnc || !(pressed || BOOTCFG_NOFORCEFLAG))
+        if(needToInitSd || memcmp((void *)0x20000300, "TLNC", 4) == 0 || (!pressed && !BOOTCFG_NOFORCEFLAG))
         {
             nandType = (FirmwareSource)BOOTCFG_NAND;
-            emunandIndex = BOOTCFG_EMUINDEX;
+            firmSource = (FirmwareSource)BOOTCFG_FIRM;
 
             goto boot;
         }
@@ -280,6 +260,7 @@ void main(int argc, char **argv, u32 magicWord)
     if(!CFG_BOOTENV && pressed == SAFE_MODE)
     {
         nandType = FIRMWARE_SYSNAND;
+        firmSource = FIRMWARE_SYSNAND;
 
         isSafeMode = true;
         needToInitSd = true;
@@ -307,6 +288,7 @@ void main(int argc, char **argv, u32 magicWord)
     if(!CFG_BOOTENV && pressed == SAFE_MODE)
     {
         nandType = FIRMWARE_SYSNAND;
+        firmSource = FIRMWARE_SYSNAND;
 
         isSafeMode = true;
         needToInitSd = true;
@@ -314,35 +296,53 @@ void main(int argc, char **argv, u32 magicWord)
         goto boot;
     }
 
-    // Set-up autoboot
-    if (MULTICONFIG(AUTOBOOTMODE) != 0)
-        configureHomebrewAutoboot();
-
     //If booting from CTRNAND, always use SysNAND
     if(!isSdMode) nandType = FIRMWARE_SYSNAND;
-    else nandType = (autoBootEmu == ((pressed & BUTTON_L1) == BUTTON_L1)) ? FIRMWARE_SYSNAND : FIRMWARE_EMUNAND;
+
+    //If R is pressed, boot the non-updated NAND with the FIRM of the opposite one
+    else if(pressed & BUTTON_R1)
+    {
+        if(CONFIG(USEEMUFIRM))
+        {
+            nandType = FIRMWARE_SYSNAND;
+            firmSource = FIRMWARE_EMUNAND;
+        }
+        else
+        {
+            nandType = FIRMWARE_EMUNAND;
+            firmSource = FIRMWARE_SYSNAND;
+        }
+    }
+
+    /* Else, boot the NAND the user set to autoboot or the opposite one, depending on L,
+       with their own FIRM */
+    else firmSource = nandType = (autoBootEmu == ((pressed & BUTTON_L1) == BUTTON_L1)) ? FIRMWARE_SYSNAND : FIRMWARE_EMUNAND;
 
     //If we're booting EmuNAND or using EmuNAND FIRM, determine which one from the directional pad buttons, or otherwise from the config
-    if(nandType == FIRMWARE_EMUNAND)
+    if(nandType == FIRMWARE_EMUNAND || firmSource == FIRMWARE_EMUNAND)
     {
+        FirmwareSource tempNand;
         switch(pressed & DPAD_BUTTONS)
         {
             case BUTTON_UP:
-                emunandIndex = 0;
+                tempNand = FIRMWARE_EMUNAND;
                 break;
             case BUTTON_RIGHT:
-                emunandIndex = 1;
+                tempNand = FIRMWARE_EMUNAND2;
                 break;
             case BUTTON_DOWN:
-                emunandIndex = 2;
+                tempNand = FIRMWARE_EMUNAND3;
                 break;
             case BUTTON_LEFT:
-                emunandIndex = 3;
+                tempNand = FIRMWARE_EMUNAND4;
                 break;
             default:
-                emunandIndex = MULTICONFIG(DEFAULTEMU);
+                tempNand = (FirmwareSource)(1 + MULTICONFIG(DEFAULTEMU));
                 break;
         }
+
+        if(nandType == FIRMWARE_EMUNAND) nandType = tempNand;
+        else firmSource = tempNand;
     }
 
 boot:
@@ -350,31 +350,32 @@ boot:
     //If we need to boot EmuNAND, make sure it exists
     if(nandType != FIRMWARE_SYSNAND)
     {
-        locateEmuNand(&nandType, &emunandIndex, true);
+        locateEmuNand(&nandType);
-        if(nandType == FIRMWARE_EMUNAND && (*(vu16 *)(SDMMC_BASE + REG_SDSTATUS0) & TMIO_STAT0_WRPROTECT) == 0) //Make sure the SD card isn't write protected
+        if(nandType == FIRMWARE_SYSNAND) firmSource = FIRMWARE_SYSNAND;
+        else if((*(vu16 *)(SDMMC_BASE + REG_SDSTATUS0) & TMIO_STAT0_WRPROTECT) == 0) //Make sure the SD card isn't write protected
             error("The SD card is locked, EmuNAND can not be used.\nPlease turn the write protection switch off.");
     }
 
-    ctrNandLocation = nandType; // for CTRNAND partition
+    //Same if we're using EmuNAND as the FIRM source
+    else if(firmSource != FIRMWARE_SYSNAND)
+        locateEmuNand(&firmSource);
 
     if(bootType != FIRMLAUNCH)
     {
-        configData.bootConfig = ((bootType == NTR ? 1 : 0) << 4) | ((u32)isNoForceFlagSet << 3) | ((u32)emunandIndex << 1) | (u32)nandType;
+        configData.bootConfig = ((bootType == NTR ? 1 : 0) << 7) | ((u32)isNoForceFlagSet << 6) | ((u32)firmSource << 3) | (u32)nandType;
         writeConfig(false);
     }
 
     bool loadFromStorage = CONFIG(LOADEXTFIRMSANDMODULES);
-    u32 firmVersion = loadNintendoFirm(&firmType, nandType, loadFromStorage, isSafeMode);
+    u32 firmVersion = loadNintendoFirm(&firmType, firmSource, loadFromStorage, isSafeMode);
 
     bool doUnitinfoPatch = CONFIG(PATCHUNITINFO);
     u32 res = 0;
     switch(firmType)
     {
         case NATIVE_FIRM:
-        {
             res = patchNativeFirm(firmVersion, nandType, loadFromStorage, isFirmProtEnabled, needToInitSd, doUnitinfoPatch);
             break;
-        }
         case TWL_FIRM:
             res = patchTwlFirm(firmVersion, loadFromStorage, doUnitinfoPatch);
             break;
@@ -386,14 +387,10 @@ boot:
         case NATIVE_FIRM1X2X:
             res = patch1x2xNativeAndSafeFirm();
             break;
-        case NATIVE_PROTOTYPE:
-            res = patchPrototypeNative(nandType);
-            break;
     }
 
     if(res != 0) error("Failed to apply %u FIRM patch(es).", res);
 
-    unmountPartitions();
     if(bootType != FIRMLAUNCH) deinitScreens();
     launchFirm(0, NULL);
 }

arm9/source/memory.c

@@ -54,27 +54,3 @@ u8 *memsearch(u8 *startPos, const void *pattern, u32 size, u32 patternSize)
 
     return NULL;
 }
-
-void *copyFromLegacyModeFcram(void *dst, const void *src, size_t size)
-{
-    // Copy 2 bytes with a stride of 8
-    const u16 *src16 = (const u16 *)src;
-    u16 *dst16 = (u16 *)dst;
-
-    for (size_t i = 0; i < size / 2; i++)
-        dst16[i] = src16[4 * i];
-
-    return dst;
-}
-
-void *copyToLegacyModeFcram(void *dst, const void *src, size_t size)
-{
-    // Copy 2 bytes with a stride of 8
-    const u16 *src16 = (const u16 *)src;
-    u16 *dst16 = (u16 *)dst;
-
-    for (size_t i = 0; i < size / 2; i++)
-        dst16[4 * i] = src16[i];
-
-    return dst;
-}

arm9/source/memory.h

@@ -34,5 +34,3 @@
 #include "types.h"
 
 u8 *memsearch(u8 *startPos, const void *pattern, u32 size, u32 patternSize);
-void *copyFromLegacyModeFcram(void *dst, const void *src, size_t size);
-void *copyToLegacyModeFcram(void *dst, const void *src, size_t size);

arm9/source/patches.c

@@ -44,9 +44,6 @@
 
 #define K11EXT_VA         0x70000000
 
-extern u16 launchedPath[];
-extern u32 firmProtoVersion;
-
 u8 *getProcess9Info(u8 *pos, u32 size, u32 *process9Size, u32 *process9MemAddr)
 {
     u8 *temp = memsearch(pos, "NCCH", size, 4);
@@ -55,22 +52,12 @@ u8 *getProcess9Info(u8 *pos, u32 size, u32 *process9Size, u32 *process9MemAddr)
 
     Cxi *off = (Cxi *)(temp - 0x100);
 
+    *process9Size = (off->ncch.exeFsSize - 1) * 0x200;
     *process9MemAddr = off->exHeader.systemControlInfo.textCodeSet.address;
 
-    // Prototype FW has a different NCCH format
-    if (firmProtoVersion && firmProtoVersion <= 243)
-    {
-        *process9Size = off->ncch.exeFsSize;
-        return (u8 *)off + off->ncch.exeFsOffset;
-    }
-    else
-    {
-        *process9Size = (off->ncch.exeFsSize - 1) * 0x200;
     return (u8 *)off + (off->ncch.exeFsOffset + 1) * 0x200;
 }
 
-}
-
 u32 *getKernel11Info(u8 *pos, u32 size, u32 *baseK11VA, u8 **freeK11Space, u32 **arm11SvcHandler, u32 **arm11ExceptionsPage)
 {
     static const u8 pattern[] = {0x00, 0xB0, 0x9C, 0xE5};
@@ -143,19 +130,10 @@ u32 installK11Extension(u8 *pos, u32 size, bool needToInitSd, u32 baseK11VA, u32
             u16 configFormatVersionMajor, configFormatVersionMinor;
             u32 config, multiConfig, bootConfig;
             u32 splashDurationMsec;
-            s8 volumeSliderOverride;
             u64 hbldr3dsxTitleId;
             u32 rosalinaMenuCombo;
-            u32 pluginLoaderFlags;
+            u16 screenFiltersCct;
             s16 ntpTzOffetMinutes;
-
-            ScreenFiltersCfgData topScreenFilter;
-            ScreenFiltersCfgData bottomScreenFilter;
-
-            u64 autobootTwlTitleId;
-            u8 autobootCtrAppmemtype;
-
-            u16 launchedPath[80+1];
         } info;
     };
 
@@ -227,15 +205,10 @@ u32 installK11Extension(u8 *pos, u32 size, bool needToInitSd, u32 baseK11VA, u32
     info->multiConfig = configData.multiConfig;
     info->bootConfig = configData.bootConfig;
     info->splashDurationMsec = configData.splashDurationMsec;
-    info->volumeSliderOverride = configData.volumeSliderOverride;
     info->hbldr3dsxTitleId = configData.hbldr3dsxTitleId;
     info->rosalinaMenuCombo = configData.rosalinaMenuCombo;
-    info->pluginLoaderFlags = configData.pluginLoaderFlags;
+    info->screenFiltersCct = configData.screenFiltersCct;
     info->ntpTzOffetMinutes = configData.ntpTzOffetMinutes;
-    info->topScreenFilter = configData.topScreenFilter;
-    info->bottomScreenFilter = configData.bottomScreenFilter;
-    info->autobootTwlTitleId = configData.autobootTwlTitleId;
-    info->autobootCtrAppmemtype = configData.autobootCtrAppmemtype;
     info->versionMajor = VERSION_MAJOR;
     info->versionMinor = VERSION_MINOR;
     info->versionBuild = VERSION_BUILD;
@@ -245,8 +218,6 @@ u32 installK11Extension(u8 *pos, u32 size, bool needToInitSd, u32 baseK11VA, u32
     if(needToInitSd) info->flags |= 1 << 5;
     if(isSdMode) info->flags |= 1 << 6;
 
-    memcpy(info->launchedPath, launchedPath, sizeof(info->launchedPath));
-
     return 0;
 }
 
@@ -300,23 +271,6 @@ u32 patchKernel11(u8 *pos, u32 size, u32 baseK11VA, u32 *arm11SvcTable, u32 *arm
     off[-5] = 0xE51FF004;
     off[-4] = K11EXT_VA + 0x2C;
 
-    if (ISN3DS)
-    {
-        // Patch SvcSetProcessIdealProcessor and SvcCreate thread to always allow
-        // for core2 and core3 to be used. Normally, processes with the 0x2000 kernel flag
-        // have access to core2, and BASE processes have access to both core2 and core3.
-        // We're patching the if (memory region == BASE) check to be always true.
-        off = (u32 *)pos;
-        for (u32 i = 0; i < 2 && (u8 *)off < pos + size; i++)
-        {
-            // cmp r2, #0x300; beq...
-            for (; (off[0] != 0xE3520C03 || off[1] != 0x0A000003) && (u8 *)off < pos + size; off++);
-            if ((u8 *)off > pos + size)
-                return 1;
-            off[1] = 0xEA000003;
-        }
-    }
-
     return 0;
 }
 
@@ -478,7 +432,7 @@ u32 patchCheckForDevCommonKey(u8 *pos, u32 size)
     return 0;
 }
 
-u32 patchK11ModuleLoading(u32 oldKipSectionSize, u32 newKipSectionSize, u32 numKips, u8 *pos, u32 size)
+u32 patchK11ModuleLoading(u32 section0size, u32 modulesSize, u8 *pos, u32 size)
 {
     static const u8 moduleLoadingPattern[]  = {0xE2, 0x05, 0x00, 0x57},
                     modulePidPattern[] = {0x06, 0xA0, 0xE1, 0xF2}; //GetSystemInfo
@@ -487,44 +441,20 @@ u32 patchK11ModuleLoading(u32 oldKipSectionSize, u32 newKipSectionSize, u32 numK
 
     if(off == NULL) return 1;
 
-    off[1] = (u8)numKips;
+    off[1]++;
 
     u32 *off32;
     for(off32 = (u32 *)(off - 3); *off32 != 0xE59F0000; off32++);
     off32 += 2;
-    off32[1] = off32[0] + newKipSectionSize;
+    off32[1] = off32[0] + modulesSize;
-    for(; *off32 != oldKipSectionSize; off32++);
+    for(; *off32 != section0size; off32++);
-    *off32 = ((newKipSectionSize + 0x1FF) >> 9) << 9;
+    *off32 = ((modulesSize + 0x1FF) >> 9) << 9;
 
     off = memsearch(pos, modulePidPattern, size, 4);
 
     if(off == NULL) return 1;
 
-    off[0xB] = (u8)numKips;
+    off[0xB] = 6;
-
-    return 0;
-}
-
-u32 patchK11ModuleLoadingLgy(u32 newKipSectionSize, u8 *pos, u32 size)
-{
-    // Patch the function where TwlBg/AgbBg is copied from 18000000 (VRAM) to 21000000 (FCRAM).
-    // This is where we can also automatically obtain the section size
-
-    u16 *off = (u16 *)pos;
-    for (; (u8 *)off < pos + size && (off[0] != 0x06C9 || off[1] != 0x0600); off++);
-    if ((u8 *)off >= pos + size)
-        return 3;
-
-    off += 7;
-    u32 oldKipSectionSize = *(u32 *)off;
-    *(u32 *)off = newKipSectionSize;
-    off += 2;
-
-    u32 *off2 = (u32 *)off;
-    for (; (u8 *)off2 < pos + size && *off2 != oldKipSectionSize; off2++);
-    if ((u8 *)off2 >= pos + size)
-        return 4;
-    *off2 = newKipSectionSize;
 
     return 0;
 }
@@ -779,120 +709,3 @@ u32 patchAgbBootSplash(u8 *pos, u32 size)
 
     return 0;
 }
-
-void patchTwlBg(u8 *pos, u32 size)
-{
-    // You can use the following Python code to convert something like below
-    // into twl_upscaling_filter.bin:
-    // import struct; open("twl_upscaling_filter.bin", "wb+").write(struct.pack("<30H", [array contents]))
-    static const u16 nintendoFilterTwl[] = {
-        0x0000, 0x004E, 0x011D, 0x01E3, 0x01C1,
-        0x0000, 0xFCA5, 0xF8D0, 0xF69D, 0xF873,
-        0x0000, 0x0D47, 0x1E35, 0x2F08, 0x3B6F,
-        0x4000, 0x3B6F, 0x2F08, 0x1E35, 0x0D47,
-        0x0000, 0xF873, 0xF69D, 0xF8D0, 0xFCA5,
-        0x0000, 0x01C1, 0x01E3, 0x011D, 0x004E,
-    };
-
-    // "error" func doesn't seem to work here
-    if (CONFIG(ENABLEDSIEXTFILTER))
-    {
-        u16 filter[5*6] = { 0 };
-        u32 rd = fileRead(filter, "twl_upscaling_filter.bin", sizeof(filter));
-        if (rd == sizeof(filter))
-        {
-            // else error("Failed to apply enable_dsi_external_filter:\n\ntwl_upscaling_filter.bin is missing or invalid.");
-            u8 *off = memsearch(pos, nintendoFilterTwl, size, sizeof(nintendoFilterTwl));
-            if (off != NULL)
-                memcpy(off, filter, sizeof(filter));
-            // else error("Failed to apply enable_dsi_external_filter.");
-        }
-    }
-}
-
-u32 patchLgyK11(u8 *section1, u32 section1Size, u8 *section2, u32 section2Size)
-{
-    u32 *off;
-
-    // Fix a bug where Legacy K11 maps user TLS with "user no access" permissions
-    // Map it as RWX (just like the rest of other user-accessible pages) instead
-    for (off = (u32 *)section1; (u8 *)off <= section1 + section1Size && *off != 0xE0100000; off++);
-
-    if ((u8 *)off >= section1 + section1Size)
-        return 1;
-
-    ++off;
-
-    *off &= ~0x231; // clear APX mask and XN
-    *off |= 0x030; // re-set APX (to user/kernel RW)
-
-    // Patch two pointer-to-bool to point to a non-zero byte, enabling user exception handling.
-    // It is impossible to enable it by normal means, otherwise
-    for (off = (u32 *)section2; (u8 *)off <= section2 + section2Size && *off != 0x100021F; off++);
-    if ((u8 *)off >= section2 + section2Size)
-        return 1;
-    off[1] = 0xFFFF0F00;
-    off[2] = 0xFFFF0F04;
-
-    // Dispatch-to-user code checks for memory block type and permissions (etc.), but
-    // LGY K11 doesn't do any memory management, so these checks will always fail.
-    // Patch with b +0x38 to skip all those checks
-    u16 *off2;
-    for (off2 = (u16 *)section2; (u8 *)off2 <= section2 + section2Size && (off2[0] != 0xDB1F || off2[1] != 0x4915); off2++);
-    if ((u8 *)off2 >= section2 + section2Size)
-        return 1;
-    *off2 = 0xE01A;
-
-    // Patch kernelpanic to skip devunit check, so that it sets the LCD fill regs
-    // which are useful to detect such panics
-    u16 *off3;
-    for (off3 = (u16 *)section1; (u8 *)off3 <= section1 + section1Size && (off3[0] != 0x481D || off3[1] != 0xB570); off3++);
-    if ((u8 *)off3 >= section1 + section1Size)
-        return 1;
-    off3[2] = 0x2001; // movs r0, #1
-
-    // Patch kernel to avoid allocating the two "configuration memory" pages, freeing
-    // 0x2000 bytes of kernel "heap" (which is 0xD000 AXIWRAM bytes on LGY K11 instead
-    // of the entire FCRAM on NFIRM). This is indeed a bug because if prevents two of the
-    // 12 KThread objects from being created
-    u16 *off4;
-    for (off4 = (u16 *)section1; (u8 *)off4 <= section1 + section1Size && (off4[0] != 0xB570 || off4[1] != 0x2200); off4++);
-    if ((u8 *)off4 >= section1 + section1Size)
-        return 1;
-    *off4 = 0x4770; // bx lr
-
-    return 0;
-}
-
-u32 patchProtoNandSignatureCheck(u8 *pos, u32 size) {
-    if (firmProtoVersion == 243) {
-        static const u8 pattern[] = {0x08, 0x31, 0x9F, 0xE5};
-
-        // Signature check function returns 0 if failed and 1 if succeeded.
-        // Proc9 breaks if the returned value is 0, change it to break if
-        // the returned value is 2 (never).
-        u8 *off = memsearch(pos, pattern, size, sizeof(pattern));
-        if (!off)
-            return 1;
-
-        off[0x20] = 2;
-    }
-
-    else if (firmProtoVersion == 238) { // SDK 0.10
-        // Same patch as for v243 ported to the different ncsd_read() function
-        static const u8 pattern[] = {
-            0x00, 0x11, 0x9f, 0xe5,
-            0x00, 0x51, 0x9f, 0xe5,
-        };
-
-        u8 *off = memsearch(pos, pattern, size, sizeof(pattern));
-        if (!off)
-            return 1;
-
-        off[0x20] = 2;
-    }
-
-    else return 1;
-
-    return 0;
-}

arm9/source/patches.h

@@ -31,7 +31,6 @@
 *   FIRM partition writes patches by delebile
 *   Idea for svcBreak patches from yellows8 and others on #3dsdev
 *   TWL_FIRM patches by Steveice10 and others
-*   Signature patches for prototype FW by PabloMK7
 */
 
 #pragma once
@@ -51,8 +50,7 @@ u32 patchTitleInstallMinVersionChecks(u8 *pos, u32 size, u32 firmVersion);
 u32 patchZeroKeyNcchEncryptionCheck(u8 *pos, u32 size);
 u32 patchNandNcchEncryptionCheck(u8 *pos, u32 size);
 u32 patchCheckForDevCommonKey(u8 *pos, u32 size);
-u32 patchK11ModuleLoading(u32 oldKipSectionSize, u32 newKipSectionSize, u32 numKips, u8 *pos, u32 size);
+u32 patchK11ModuleLoading(u32 section0size, u32 modulesSize, u8 *startPos, u32 size);
-u32 patchK11ModuleLoadingLgy(u32 newKipSectionSize, u8 *pos, u32 size);
 u32 patchArm9ExceptionHandlersInstall(u8 *pos, u32 size);
 u32 patchSvcBreak9(u8 *pos, u32 size, u32 kernel9Address);
 u32 patchKernel9Panic(u8 *pos, u32 size);
@@ -67,6 +65,3 @@ u32 patchTwlFlashcartChecks(u8 *pos, u32 size, u32 firmVersion);
 u32 patchOldTwlFlashcartChecks(u8 *pos, u32 size);
 u32 patchTwlShaHashChecks(u8 *pos, u32 size);
 u32 patchAgbBootSplash(u8 *pos, u32 size);
-void patchTwlBg(u8 *pos, u32 size); // silently fails
-u32 patchLgyK11(u8 *section1, u32 section1Size, u8 *section2, u32 section2Size);
-u32 patchProtoNandSignatureCheck(u8 *pos, u32 size);

arm9/source/screen.c

@@ -70,14 +70,6 @@ void prepareArm11ForFirmlaunch(void)
 void deinitScreens(void)
 {
     if(ARESCREENSINITIALIZED) invokeArm11Function(DEINIT_SCREENS);
-
-    // Backlight voltage off
-    I2C_writeReg(I2C_DEV_MCU, 0x22, 0x14);
-    wait(50);
-
-    // LCD panel voltage off
-    I2C_writeReg(I2C_DEV_MCU, 0x22, 0x01);
-    wait(50);
 }
 
 void updateBrightness(u32 brightnessIndex)
@@ -110,31 +102,8 @@ void initScreens(void)
             memcpy((void *)(ARM11_PARAMETERS_ADDRESS + 4), fbs, sizeof(fbs));
             invokeArm11Function(INIT_SCREENS);
 
-            // Fragile code, needs proper fix/total rewrite of the baremetal components anyway
+            //Turn on backlight
-            // Assume controller revision is not 0x00 for either screen (this revision is extremely
+            I2C_writeReg(I2C_DEV_MCU, 0x22, 0x2A);
-            // old and shouldn't be seen in retail units nor normal devunits)
-
-            // Controller reset off
-            I2C_writeReg(I2C_DEV_LCD_TOP, 0xFE, 0xAA);
-            I2C_writeReg(I2C_DEV_LCD_BOT, 0xFE, 0xAA);
-            wait(5);
-
-            // Controller power on
-            I2C_writeReg(I2C_DEV_LCD_TOP, 0x01, 0x10);
-            I2C_writeReg(I2C_DEV_LCD_BOT, 0x01, 0x10);
-            wait(5);
-
-            // Clear error flag
-            I2C_writeReg(I2C_DEV_LCD_TOP, 0x60, 0x00);
-            I2C_writeReg(I2C_DEV_LCD_BOT, 0x60, 0x00);
-            wait(5);
-
-            // LCD panel (bias ?) voltage on
-            I2C_writeReg(I2C_DEV_MCU, 0x22, 0x02);
-            wait(50);
-
-            // Backlight voltage on
-            I2C_writeReg(I2C_DEV_MCU, 0x22, 0x28);
             wait(5);
         }
         else updateBrightness(MULTICONFIG(BRIGHTNESS));
@@ -149,8 +118,3 @@ void initScreens(void)
     clearScreens(false);
     swapFramebuffers(false);
 }
-
-void zerofillN3dsAblRegisters(void)
-{
-    invokeArm11Function(ZEROFILL_N3DS_ABL_REGISTERS);
-}

arm9/source/screen.h

@@ -59,7 +59,6 @@ typedef enum
     SWAP_FRAMEBUFFERS,
     UPDATE_BRIGHTNESS,
     DEINIT_SCREENS,
-    ZEROFILL_N3DS_ABL_REGISTERS,
     PREPARE_ARM11_FOR_FIRMLAUNCH,
     ARM11_READY,
 } Arm11Operation;
@@ -74,4 +73,3 @@ void swapFramebuffers(bool isAlternate);
 void updateBrightness(u32 brightnessIndex);
 void clearScreens(bool isAlternate);
 void initScreens(void);
-void zerofillN3dsAblRegisters(void);

arm9/source/types.h

@@ -61,32 +61,16 @@ typedef volatile s64 vs64;
 #define ISN3DS       (CFG11_SOCINFO & 2)
 #define ISDEVUNIT    (CFG_UNITINFO != 0)
 
-typedef struct ScreenFiltersCfgData {
+typedef struct {
-    u16 cct;
-    bool invert;
-    u8 colorCurveCorrection;
-    s64 gammaEnc;
-    s64 contrastEnc;
-    s64 brightnessEnc;
-} ScreenFiltersCfgData;
-
-typedef struct CfgData {
     u16 formatVersionMajor, formatVersionMinor;
 
     u32 config, multiConfig, bootConfig;
     u32 splashDurationMsec;
-    s8 volumeSliderOverride;
 
     u64 hbldr3dsxTitleId;
     u32 rosalinaMenuCombo;
-    u32 pluginLoaderFlags;
+    u16 screenFiltersCct;
     s16 ntpTzOffetMinutes;
-
-    ScreenFiltersCfgData topScreenFilter;
-    ScreenFiltersCfgData bottomScreenFilter;
-
-    u64 autobootTwlTitleId;
-    u8 autobootCtrAppmemtype;
 } CfgData;
 
 typedef struct
@@ -125,6 +109,9 @@ typedef enum FirmwareSource
 {
     FIRMWARE_SYSNAND = 0,
     FIRMWARE_EMUNAND,
+    FIRMWARE_EMUNAND2,
+    FIRMWARE_EMUNAND3,
+    FIRMWARE_EMUNAND4
 } FirmwareSource;
 
 typedef enum FirmwareType
@@ -134,8 +121,7 @@ typedef enum FirmwareType
     AGB_FIRM,
     SAFE_FIRM,
     SYSUPDATER_FIRM,
-    NATIVE_FIRM1X2X,
+    NATIVE_FIRM1X2X
-    NATIVE_PROTOTYPE,
 } FirmwareType;
 
 typedef enum bootType
@@ -152,7 +138,6 @@ extern bool isSdMode;
 
 extern BootType bootType;
 
-extern char launchedPathForFatfs[256];
 extern u16 launchedFirmTidLow[8];
 extern u16 launchedPath[80+1];
 

arm9/source/utils.c

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Luma3DS
-*   Copyright (C) 2016-2022 Aurora Wright, TuxSH
+*   Copyright (C) 2016-2020 Aurora Wright, TuxSH
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -113,11 +113,8 @@ u32 waitInput(bool isMenu)
     return key;
 }
 
-__attribute__((noreturn)) void mcuPowerOff(void)
+void mcuPowerOff(void)
 {
-    // Unmount partitions
-    unmountPartitions();
-
     if(!needToSetupScreens) clearScreens(false);
 
     //Shutdown LCD
@@ -157,95 +154,3 @@ void error(const char *fmt, ...)
 
     mcuPowerOff();
 }
-
-
-// CRC-16/MODBUS
-u16 crc16(const void *data, size_t size, u16 initialValue)
-{
-    static const u16 lut[256] = {
-        0x0000,0xC0C1,0xC181,0x0140,0xC301,0x03C0,0x0280,0xC241,
-        0xC601,0x06C0,0x0780,0xC741,0x0500,0xC5C1,0xC481,0x0440,
-        0xCC01,0x0CC0,0x0D80,0xCD41,0x0F00,0xCFC1,0xCE81,0x0E40,
-        0x0A00,0xCAC1,0xCB81,0x0B40,0xC901,0x09C0,0x0880,0xC841,
-        0xD801,0x18C0,0x1980,0xD941,0x1B00,0xDBC1,0xDA81,0x1A40,
-        0x1E00,0xDEC1,0xDF81,0x1F40,0xDD01,0x1DC0,0x1C80,0xDC41,
-        0x1400,0xD4C1,0xD581,0x1540,0xD701,0x17C0,0x1680,0xD641,
-        0xD201,0x12C0,0x1380,0xD341,0x1100,0xD1C1,0xD081,0x1040,
-        0xF001,0x30C0,0x3180,0xF141,0x3300,0xF3C1,0xF281,0x3240,
-        0x3600,0xF6C1,0xF781,0x3740,0xF501,0x35C0,0x3480,0xF441,
-        0x3C00,0xFCC1,0xFD81,0x3D40,0xFF01,0x3FC0,0x3E80,0xFE41,
-        0xFA01,0x3AC0,0x3B80,0xFB41,0x3900,0xF9C1,0xF881,0x3840,
-        0x2800,0xE8C1,0xE981,0x2940,0xEB01,0x2BC0,0x2A80,0xEA41,
-        0xEE01,0x2EC0,0x2F80,0xEF41,0x2D00,0xEDC1,0xEC81,0x2C40,
-        0xE401,0x24C0,0x2580,0xE541,0x2700,0xE7C1,0xE681,0x2640,
-        0x2200,0xE2C1,0xE381,0x2340,0xE101,0x21C0,0x2080,0xE041,
-        0xA001,0x60C0,0x6180,0xA141,0x6300,0xA3C1,0xA281,0x6240,
-        0x6600,0xA6C1,0xA781,0x6740,0xA501,0x65C0,0x6480,0xA441,
-        0x6C00,0xACC1,0xAD81,0x6D40,0xAF01,0x6FC0,0x6E80,0xAE41,
-        0xAA01,0x6AC0,0x6B80,0xAB41,0x6900,0xA9C1,0xA881,0x6840,
-        0x7800,0xB8C1,0xB981,0x7940,0xBB01,0x7BC0,0x7A80,0xBA41,
-        0xBE01,0x7EC0,0x7F80,0xBF41,0x7D00,0xBDC1,0xBC81,0x7C40,
-        0xB401,0x74C0,0x7580,0xB541,0x7700,0xB7C1,0xB681,0x7640,
-        0x7200,0xB2C1,0xB381,0x7340,0xB101,0x71C0,0x7080,0xB041,
-        0x5000,0x90C1,0x9181,0x5140,0x9301,0x53C0,0x5280,0x9241,
-        0x9601,0x56C0,0x5780,0x9741,0x5500,0x95C1,0x9481,0x5440,
-        0x9C01,0x5CC0,0x5D80,0x9D41,0x5F00,0x9FC1,0x9E81,0x5E40,
-        0x5A00,0x9AC1,0x9B81,0x5B40,0x9901,0x59C0,0x5880,0x9841,
-        0x8801,0x48C0,0x4980,0x8941,0x4B00,0x8BC1,0x8A81,0x4A40,
-        0x4E00,0x8EC1,0x8F81,0x4F40,0x8D01,0x4DC0,0x4C80,0x8C41,
-        0x4400,0x84C1,0x8581,0x4540,0x8701,0x47C0,0x4680,0x8641,
-        0x8201,0x42C0,0x4380,0x8341,0x4100,0x81C1,0x8081,0x4040,
-    };
-
-    u16 r = initialValue;
-    const u8 *data8 = (const u8 *)data;
-    for (size_t i = 0; i < size; i++)
-        r = (r >> 8) ^ lut[(r ^ data8[i]) & 0xFF];
-
-    return r;
-}
-
-u32 crc32(const void *data, size_t size, u32 initialValue)
-{
-    static const u32 lut[256] = {
-        0x00000000,0x77073096,0xEE0E612C,0x990951BA,0x076DC419,0x706AF48F,0xE963A535,0x9E6495A3,
-        0x0EDB8832,0x79DCB8A4,0xE0D5E91E,0x97D2D988,0x09B64C2B,0x7EB17CBD,0xE7B82D07,0x90BF1D91,
-        0x1DB71064,0x6AB020F2,0xF3B97148,0x84BE41DE,0x1ADAD47D,0x6DDDE4EB,0xF4D4B551,0x83D385C7,
-        0x136C9856,0x646BA8C0,0xFD62F97A,0x8A65C9EC,0x14015C4F,0x63066CD9,0xFA0F3D63,0x8D080DF5,
-        0x3B6E20C8,0x4C69105E,0xD56041E4,0xA2677172,0x3C03E4D1,0x4B04D447,0xD20D85FD,0xA50AB56B,
-        0x35B5A8FA,0x42B2986C,0xDBBBC9D6,0xACBCF940,0x32D86CE3,0x45DF5C75,0xDCD60DCF,0xABD13D59,
-        0x26D930AC,0x51DE003A,0xC8D75180,0xBFD06116,0x21B4F4B5,0x56B3C423,0xCFBA9599,0xB8BDA50F,
-        0x2802B89E,0x5F058808,0xC60CD9B2,0xB10BE924,0x2F6F7C87,0x58684C11,0xC1611DAB,0xB6662D3D,
-        0x76DC4190,0x01DB7106,0x98D220BC,0xEFD5102A,0x71B18589,0x06B6B51F,0x9FBFE4A5,0xE8B8D433,
-        0x7807C9A2,0x0F00F934,0x9609A88E,0xE10E9818,0x7F6A0DBB,0x086D3D2D,0x91646C97,0xE6635C01,
-        0x6B6B51F4,0x1C6C6162,0x856530D8,0xF262004E,0x6C0695ED,0x1B01A57B,0x8208F4C1,0xF50FC457,
-        0x65B0D9C6,0x12B7E950,0x8BBEB8EA,0xFCB9887C,0x62DD1DDF,0x15DA2D49,0x8CD37CF3,0xFBD44C65,
-        0x4DB26158,0x3AB551CE,0xA3BC0074,0xD4BB30E2,0x4ADFA541,0x3DD895D7,0xA4D1C46D,0xD3D6F4FB,
-        0x4369E96A,0x346ED9FC,0xAD678846,0xDA60B8D0,0x44042D73,0x33031DE5,0xAA0A4C5F,0xDD0D7CC9,
-        0x5005713C,0x270241AA,0xBE0B1010,0xC90C2086,0x5768B525,0x206F85B3,0xB966D409,0xCE61E49F,
-        0x5EDEF90E,0x29D9C998,0xB0D09822,0xC7D7A8B4,0x59B33D17,0x2EB40D81,0xB7BD5C3B,0xC0BA6CAD,
-        0xEDB88320,0x9ABFB3B6,0x03B6E20C,0x74B1D29A,0xEAD54739,0x9DD277AF,0x04DB2615,0x73DC1683,
-        0xE3630B12,0x94643B84,0x0D6D6A3E,0x7A6A5AA8,0xE40ECF0B,0x9309FF9D,0x0A00AE27,0x7D079EB1,
-        0xF00F9344,0x8708A3D2,0x1E01F268,0x6906C2FE,0xF762575D,0x806567CB,0x196C3671,0x6E6B06E7,
-        0xFED41B76,0x89D32BE0,0x10DA7A5A,0x67DD4ACC,0xF9B9DF6F,0x8EBEEFF9,0x17B7BE43,0x60B08ED5,
-        0xD6D6A3E8,0xA1D1937E,0x38D8C2C4,0x4FDFF252,0xD1BB67F1,0xA6BC5767,0x3FB506DD,0x48B2364B,
-        0xD80D2BDA,0xAF0A1B4C,0x36034AF6,0x41047A60,0xDF60EFC3,0xA867DF55,0x316E8EEF,0x4669BE79,
-        0xCB61B38C,0xBC66831A,0x256FD2A0,0x5268E236,0xCC0C7795,0xBB0B4703,0x220216B9,0x5505262F,
-        0xC5BA3BBE,0xB2BD0B28,0x2BB45A92,0x5CB36A04,0xC2D7FFA7,0xB5D0CF31,0x2CD99E8B,0x5BDEAE1D,
-        0x9B64C2B0,0xEC63F226,0x756AA39C,0x026D930A,0x9C0906A9,0xEB0E363F,0x72076785,0x05005713,
-        0x95BF4A82,0xE2B87A14,0x7BB12BAE,0x0CB61B38,0x92D28E9B,0xE5D5BE0D,0x7CDCEFB7,0x0BDBDF21,
-        0x86D3D2D4,0xF1D4E242,0x68DDB3F8,0x1FDA836E,0x81BE16CD,0xF6B9265B,0x6FB077E1,0x18B74777,
-        0x88085AE6,0xFF0F6A70,0x66063BCA,0x11010B5C,0x8F659EFF,0xF862AE69,0x616BFFD3,0x166CCF45,
-        0xA00AE278,0xD70DD2EE,0x4E048354,0x3903B3C2,0xA7672661,0xD06016F7,0x4969474D,0x3E6E77DB,
-        0xAED16A4A,0xD9D65ADC,0x40DF0B66,0x37D83BF0,0xA9BCAE53,0xDEBB9EC5,0x47B2CF7F,0x30B5FFE9,
-        0xBDBDF21C,0xCABAC28A,0x53B39330,0x24B4A3A6,0xBAD03605,0xCDD70693,0x54DE5729,0x23D967BF,
-        0xB3667A2E,0xC4614AB8,0x5D681B02,0x2A6F2B94,0xB40BBE37,0xC30C8EA1,0x5A05DF1B,0x2D02EF8D,
-    };
-
-    u32 r = initialValue;
-    const u8 *data8 = (const u8 *)data;
-    for (size_t i = 0; i < size; i++)
-        r = (r >> 8) ^ lut[(r ^ data8[i]) & 0xFF];
-
-    return ~r;
-}

arm9/source/utils.h

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Luma3DS
-*   Copyright (C) 2016-2022 Aurora Wright, TuxSH
+*   Copyright (C) 2016-2020 Aurora Wright, TuxSH
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -46,6 +46,3 @@ u32 waitInput(bool isMenu);
 void mcuPowerOff(void);
 void wait(u64 amount);
 void error(const char *fmt, ...);
-
-u16 crc16(const void *data, size_t size, u16 initialValue);
-u32 crc32(const void *data, size_t size, u32 initialValue);

k11_extension/Makefile

@@ -27,7 +27,7 @@ INCLUDES	:=	include include/svc
 #---------------------------------------------------------------------------------
 # -mgeneral-regs-only so that the C code is guaranteed not to use FPU regs
 ARCH	:=	-march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft -mgeneral-regs-only
-DEFINES :=	-DARM11 -D__3DS__
+DEFINES :=	-DARM11 -D_3DS
 
 FALSEPOSITIVES := -Wno-array-bounds -Wno-stringop-overflow -Wno-stringop-overread
 CFLAGS	:=	-g -std=gnu11 -Wall -Wextra -Werror -O2 -mword-relocations \

k11_extension/include/config.h

@@ -9,10 +9,10 @@
 #define MULTICONFIG(a)   ((cfwInfo.multiConfig >> (2 * (a))) & 3)
 #define BOOTCONFIG(a, b) ((cfwInfo.bootConfig >> (a)) & (b))
 
-#define BOOTCFG_NAND         BOOTCONFIG(0, 1)
+#define BOOTCFG_NAND         BOOTCONFIG(0, 7)
-#define BOOTCFG_EMUINDEX     BOOTCONFIG(1, 3)
+#define BOOTCFG_FIRM         BOOTCONFIG(3, 7)
-#define BOOTCFG_NOFORCEFLAG  BOOTCONFIG(3, 1)
+#define BOOTCFG_NOFORCEFLAG  BOOTCONFIG(6, 1)
-#define BOOTCFG_NTRCARDBOOT  BOOTCONFIG(4, 1)
+#define BOOTCFG_NTRCARDBOOT  BOOTCONFIG(7, 1)
 
 enum multiOptions
 {
@@ -20,21 +20,18 @@ enum multiOptions
     BRIGHTNESS,
     SPLASH,
     PIN,
-    NEWCPU,
+    NEWCPU
-    AUTOBOOTMODE,
-    FORCEAUDIOOUTPUT,
 };
 
 enum singleOptions
 {
     AUTOBOOTEMU = 0,
+    USEEMUFIRM,
     LOADEXTFIRMSANDMODULES,
     PATCHGAMES,
-    REDIRECTAPPTHREADS,
     PATCHVERSTRING,
     SHOWGBABOOT,
     PATCHUNITINFO,
-    ENABLEDSIEXTFILTER,
     DISABLEARM11EXCHANDLERS,
     ENABLESAFEFIRMROSALINA,
 };

k11_extension/include/globals.h

@@ -31,7 +31,6 @@
 
 extern KRecursiveLock *criticalSectionLock;
 extern KObjectList *threadList;
-extern KObjectList *resourceLimitList;
 extern KObjectMutex *synchronizationMutex;
 
 extern void (*KRecursiveLock__Lock)(KRecursiveLock *this);
@@ -45,27 +44,17 @@ extern KAutoObject * (*KProcessHandleTable__ToKAutoObject)(KProcessHandleTable *
 extern void (*KSynchronizationObject__Signal)(KSynchronizationObject *this, bool isPulse);
 extern Result (*WaitSynchronization1)(void *this_unused, KThread *thread, KSynchronizationObject *syncObject, s64 timeout);
 extern Result (*KProcessHandleTable__CreateHandle)(KProcessHandleTable *this, Handle *out, KAutoObject *obj, u8 token);
-extern Result (*KProcessHwInfo__QueryMemory)(KProcessHwInfo *this, MemoryInfo *memoryInfo, PageInfo *pageInfo, void *address);
 extern Result (*KProcessHwInfo__MapProcessMemory)(KProcessHwInfo *this, KProcessHwInfo *other, void *dst, void *src, u32 nbPages);
 extern Result (*KProcessHwInfo__UnmapProcessMemory)(KProcessHwInfo *this, void *addr, u32 nbPages);
-extern Result (*KProcessHwInfo__CheckVaState)(KProcessHwInfo *hwInfo, u32 va, u32 size, u32 state, u32 perm);
-extern Result (*KProcessHwInfo__GetListOfKBlockInfoForVA)(KProcessHwInfo *hwInfo, KLinkedList *list, u32 va, u32 sizeInPage);
-extern Result (*KProcessHwInfo__MapListOfKBlockInfo)(KProcessHwInfo *this, u32 va, KLinkedList *list, u32 state, u32 perm, u32 sbz);
 extern Result (*KEvent__Clear)(KEvent *this);
-extern Result (*KEvent__Signal)(KEvent *this);
 extern void (*KObjectMutex__WaitAndAcquire)(KObjectMutex *this);
 extern void (*KObjectMutex__ErrorOccured)(void);
 
 extern void (*KScheduler__AdjustThread)(KScheduler *this, KThread *thread, u32 oldSchedulingMask);
 extern void (*KScheduler__AttemptSwitchingThreadContext)(KScheduler *this);
 
-extern void (*KLinkedList_KBlockInfo__Clear)(KLinkedList *list);
-
 extern Result (*ControlMemory)(u32 *addrOut, u32 addr0, u32 addr1, u32 size, MemOp op, MemPerm perm, bool isLoader);
-extern Result (*doControlMemory)(KProcessHwInfo *this, u32 addr, u32 requestedNbPages, u32 pa, u32 state, u32 perm, u32 a7, u32 region);
-extern Result (*CreateThread)(Handle *outThreadHandle, u32 ep, u32 arg, u32 stackTop, s32 priority, s32 processorId);
 extern void (*SleepThread)(s64 ns);
-extern Result (*CreateEvent)(Handle *out, ResetType resetType);
 extern Result (*CloseHandle)(Handle handle);
 extern Result (*GetHandleInfo)(s64 *out, Handle handle, u32 type);
 extern Result (*GetSystemInfo)(s64 *out, s32 type, s32 param);
@@ -76,7 +65,6 @@ extern Result (*SendSyncRequest)(Handle handle);
 extern Result (*OpenProcess)(Handle *out, u32 processId);
 extern Result (*GetProcessId)(u32 *out, Handle process);
 extern Result (*DebugActiveProcess)(Handle *out, u32 processId);
-extern Result (*SignalEvent)(Handle event);
 extern Result (*UnmapProcessMemory)(Handle processHandle, void *dst, u32 size);
 extern Result (*KernelSetState)(u32 type, u32 varg1, u32 varg2, u32 varg3);
 
@@ -109,7 +97,6 @@ extern bool *isDevUnit;
 extern vu8 *configPage;
 extern u32 kernelVersion;
 extern FcramLayout fcramLayout;
-extern FcramDescriptor *fcramDescriptor;
 
 extern KCoreContext *coreCtxs;
 
@@ -126,16 +113,6 @@ extern KBaseInterruptEvent *customInterruptEvent;
 extern void (*initFPU)(void);
 extern void (*mcuReboot)(void);
 extern void (*coreBarrier)(void);
-extern void* (*kAlloc)(FcramDescriptor *fcramDesc, u32 nbPages, u32 alignment, u32 region);
-
-typedef struct ScreenFiltersCfgData {
-    u16 cct;
-    bool invert;
-    u8 colorCurveCorrection;
-    s64 gammaEnc;
-    s64 contrastEnc;
-    s64 brightnessEnc;
-} ScreenFiltersCfgData;
 
 typedef struct CfwInfo
 {
@@ -151,42 +128,15 @@ typedef struct CfwInfo
     u16 configFormatVersionMajor, configFormatVersionMinor;
     u32 config, multiConfig, bootConfig;
     u32 splashDurationMsec;
-    s8 volumeSliderOverride;
     u64 hbldr3dsxTitleId;
     u32 rosalinaMenuCombo;
-    u32 pluginLoaderFlags;
+    u16 screenFiltersCct;
     s16 ntpTzOffetMinutes;
-
-    ScreenFiltersCfgData topScreenFilter;
-    ScreenFiltersCfgData bottomScreenFilter;
-
-    u64 autobootTwlTitleId;
-    u8 autobootCtrAppmemtype;
-
-    u16 launchedPath[80+1];
 } CfwInfo;
 
 extern CfwInfo cfwInfo;
 extern u32 kextBasePa;
 extern u32 stolenSystemMemRegionSize;
-extern bool disableThreadRedirection;
 
 extern vu32 rosalinaState;
 extern bool hasStartedRosalinaNetworkFuncsOnce;
-extern KEvent* signalPluginEvent;
-
-typedef enum
-{
-    PLG_CFG_NONE = 0,
-    PLG_CFG_RUNNING = 1,
-    PLG_CFG_INHOME = 2,
-    PLG_CFG_EXITING = 3,
-
-    PLG_CFG_HOME_EVENT = 1 << 16,
-    PLG_CFG_EXIT_EVENT = 2 << 16
-}   PLG_CFG_STATUS;
-
-void    PLG_SignalEvent(u32 event);
-void    PLG__WakeAppThread(void);
-u32     PLG_GetStatus(void);
-KLinkedList*    KLinkedList__Initialize(KLinkedList *list);

k11_extension/include/kernel.h

@@ -53,7 +53,7 @@ struct KMutexLinkedList;
 struct KPreemptionTimer;
 
 /* 12 */
-typedef struct CTR_ALIGN(4) KAutoObject
+typedef struct ALIGN(4) KAutoObject
 {
   struct Vtable__KAutoObject *vtable;
   u32 refCount;
@@ -96,7 +96,7 @@ typedef struct KMutexLinkedListNode
 } KMutexLinkedListNode;
 
 /* 1 */
-typedef struct CTR_ALIGN(4) KMutex
+typedef struct ALIGN(4) KMutex
 {
   KSynchronizationObject syncObject;
   KMutexLinkedListNode mutexListNode;
@@ -106,14 +106,6 @@ typedef struct CTR_ALIGN(4) KMutex
   union KProcess *owner;
 } KMutex;
 
-typedef struct KAddressArbiter
-{
-  KAutoObject     autoObject;
-  struct KThread  *first;
-  struct KThread  *last;
-  union  KProcess *owner;
-} KAddressArbiter;
-
 /* 92 */
 typedef struct KMutexLinkedList
 {
@@ -121,30 +113,6 @@ typedef struct KMutexLinkedList
   KMutex *last;
 } KMutexLinkedList;
 
-enum
-{
-    TOKEN_KAUTOOBJECT = 0,
-    TOKEN_KSYNCHRONIZATIONOBJECT = 1,
-    TOKEN_KEVENT = 0x1F,
-    TOKEN_KSEMAPHORE = 0x2F,
-    TOKEN_KTIMER = 0x35,
-    TOKEN_KMUTEX = 0x39,
-    TOKEN_KDEBUG = 0x4D,
-    TOKEN_KSERVERPORT = 0x55,
-    TOKEN_KDMAOBJECT = 0x59,
-    TOKEN_KCLIENTPORT = 0x65,
-    TOKEN_KCODESET = 0x68,
-    TOKEN_KSESSION = 0x70,
-    TOKEN_KTHREAD = 0x8D,
-    TOKEN_KSERVERSESSION = 0x95,
-    TOKEN_KADDRESSARBITER = 0x98,
-    TOKEN_KCLIENTSESSION = 0xA5,
-    TOKEN_KPORT = 0xA8,
-    TOKEN_KSHAREDMEMORY = 0xB0,
-    TOKEN_KPROCESS = 0xC5,
-    TOKEN_KRESOURCELIMIT = 0xC8
-};
-
 /* 45 */
 typedef struct KClassToken
 {
@@ -153,7 +121,7 @@ typedef struct KClassToken
 } KClassToken;
 
 /* 44 */
-typedef struct CTR_ALIGN(4) Vtable__KAutoObject
+typedef struct ALIGN(4) Vtable__KAutoObject
 {
   void *field_0;
   void *field_4;
@@ -174,7 +142,7 @@ typedef struct KBaseInterruptEvent
 } KBaseInterruptEvent;
 
 /* 55 */
-typedef struct CTR_ALIGN(4) Vtable__KBaseInterruptEvent
+typedef struct ALIGN(4) Vtable__KBaseInterruptEvent
 {
   struct KSchedulableInterruptEvent *(*handleInterruptEvent)(KBaseInterruptEvent *, u32);
 } Vtable__KBaseInterruptEvent;
@@ -210,7 +178,7 @@ typedef struct KThreadLinkedListNode
 
 
 /* 93 */
-typedef struct CTR_ALIGN(4) KPreemptionTimer
+typedef struct ALIGN(4) KPreemptionTimer
 {
   u32 nLimitedTicks;
   u32 timer;
@@ -219,7 +187,7 @@ typedef struct CTR_ALIGN(4) KPreemptionTimer
 } KPreemptionTimer;
 
 /* 15 */
-typedef struct CTR_PACKED CTR_ALIGN(4) KThread
+typedef struct PACKED ALIGN(4) KThread
 {
   KSynchronizationObject syncObject;
   KTimeableInterruptEvent timeableInterruptEvent;
@@ -277,7 +245,7 @@ typedef enum ProcessStatus
 } ProcessStatus;
 
 /* 3 */
-typedef struct CTR_ALIGN(4) HandleDescriptor
+typedef struct ALIGN(4) HandleDescriptor
 {
   u32 info;
   KAutoObject *pointer;
@@ -297,7 +265,7 @@ typedef struct KProcessHandleTable
 } KProcessHandleTable;
 
 /* 4 */
-typedef struct CTR_ALIGN(4) KDebugThread
+typedef struct ALIGN(4) KDebugThread
 {
   KThread *linkedThread;
   bool usedSvcBreak;
@@ -355,7 +323,7 @@ typedef enum {
 } ExceptionEventType;
 
 /* 6 */
-typedef struct CTR_ALIGN(4) KDebug
+typedef struct ALIGN(4) KDebug
 {
   KSynchronizationObject syncObject;
   KSendableInterruptEvent sendableInterruptEvent;
@@ -422,7 +390,7 @@ typedef struct KCodeSetMemDescriptor
 } KCodeSetMemDescriptor;
 
 /* 5 */
-typedef struct CTR_PACKED CTR_ALIGN(4) KCodeSet
+typedef struct PACKED ALIGN(4) KCodeSet
 {
   KAutoObject autoObject;
   KCodeSetMemDescriptor textSection;
@@ -497,7 +465,7 @@ typedef struct KUserBindableInterruptEvent
 } KUserBindableInterruptEvent;
 
 /* 14 */
-typedef struct CTR_ALIGN(4) KEvent
+typedef struct ALIGN(4) KEvent
 {
   KSynchronizationObject syncObject;
   KUserBindableInterruptEvent userBindableInterruptEvent;
@@ -521,9 +489,6 @@ typedef enum MemOp
   MEMOP_REGION_SYSTEM = 0x200,
   MEMOP_REGION_BASE = 0x300,
   MEMOP_LINEAR = 0x10000,
-
-  MEMOP_OP_MASK = 0xFF,
-  MEMOP_REGION_MASK = 0xF00,
 } MemOp;
 
 /* 17 */
@@ -576,20 +541,6 @@ typedef struct KBlockInfo
   u32 pageCount;
 } KBlockInfo;
 
-typedef struct KSharedMemory
-{
-  KAutoObject   autoObject;
-  KLinkedList   ownedKBlockInfo;
-  union KProcess *owner;
-  u32           ownerPermissions;
-  u32           otherPermissions;
-  u8            isBlockInfoGenerated;
-  s8            allBlockInfoGenerated;
-  u8            unknown_1;
-  u8            unknown_2;
-  u32           address;
-} KSharedMemory;
-
 /* 25 */
 typedef struct KMemoryBlock
 {
@@ -601,7 +552,7 @@ typedef struct KMemoryBlock
 } KMemoryBlock;
 
 /* 28 */
-typedef struct CTR_ALIGN(4) KScheduler
+typedef struct ALIGN(4) KScheduler
 {
   KSchedulableInterruptEvent interruptEvent;
   u32 threadSwitchAttempts;
@@ -619,7 +570,7 @@ typedef struct CTR_ALIGN(4) KScheduler
 } KScheduler;
 
 /* 46 */
-typedef struct CTR_PACKED CodeSetInfo
+typedef struct PACKED CodeSetInfo
 {
   char name[8];
   u16 unknown_1;
@@ -639,7 +590,7 @@ typedef struct CTR_PACKED CodeSetInfo
 } CodeSetInfo;
 
 /* 53 */
-typedef struct CTR_ALIGN(4) InterruptData
+typedef struct ALIGN(4) InterruptData
 {
   KBaseInterruptEvent *interruptEvent;
   bool disableUponReceipt;
@@ -740,7 +691,7 @@ typedef enum ResetType
 } ResetType;
 
 /* 81 */
-typedef struct CTR_PACKED CTR_ALIGN(4) KTimer
+typedef struct PACKED ALIGN(4) KTimer
 {
   KSynchronizationObject syncObject;
   KTimeableInterruptEvent timeableInterruptEvent;
@@ -768,7 +719,7 @@ typedef KSchedulableInterruptEvent KThreadTerminationInterruptEvent;
 typedef KSchedulableInterruptEvent KThreadExitInterruptEvent;
 
 /* 89 */
-typedef struct CTR_ALIGN(4) KInterruptEventMailbox
+typedef struct ALIGN(4) KInterruptEventMailbox
 {
   u32 mailboxID;
   KSendableInterruptEvent *first;
@@ -795,7 +746,7 @@ typedef enum LimitableResource
 } LimitableResource;
 
 /* 99 */
-typedef struct CTR_ALIGN(4) CpuRegisters
+typedef struct ALIGN(4) CpuRegisters
 {
   u32 r[13];
   u32 sp;
@@ -809,7 +760,7 @@ typedef struct FpuRegisters
 {
   union
   {
-      struct CTR_PACKED { double d[16]; };
+      struct PACKED { double d[16]; };
       float  s[32];
   };
   u32 fpscr;
@@ -974,7 +925,7 @@ typedef struct KEventInfo
   };
 } KEventInfo;
 
-typedef struct CTR_ALIGN(0x1000) KCoreObjectContext
+typedef struct ALIGN(0x1000) KCoreObjectContext
 {
   KThread *volatile currentThread;
   union KProcess *volatile currentProcess;
@@ -1004,7 +955,7 @@ extern KCoreContext *coreCtxs;
 
 #define DEFINE_CONSOLE_SPECIFIC_STRUCTS(console, nbCores)
 /* 60 */
-typedef struct CTR_ALIGN(4) KProcessHwInfoN3DS
+typedef struct ALIGN(4) KProcessHwInfoN3DS
 {
   KObjectMutex mutex;
   u32 processTLBEntriesNeedToBeFlushedOnCore[4];
@@ -1023,7 +974,7 @@ typedef struct CTR_ALIGN(4) KProcessHwInfoN3DS
   u32 *mmuTableVA;
 } KProcessHwInfoN3DS;
 
-typedef struct CTR_ALIGN(4) KProcessHwInfoO3DS8x
+typedef struct ALIGN(4) KProcessHwInfoO3DS8x
 {
   KObjectMutex mutex;
   u32 processTLBEntriesNeedToBeFlushedOnCore[2];
@@ -1042,7 +993,7 @@ typedef struct CTR_ALIGN(4) KProcessHwInfoO3DS8x
   u32 *mmuTableVA;
 } KProcessHwInfoO3DS8x;
 
-typedef struct CTR_ALIGN(4) KProcessHwInfoO3DSPre8x
+typedef struct ALIGN(4) KProcessHwInfoO3DSPre8x
 {
   KObjectMutex mutex;
   u32 processTLBEntriesNeedToBeFlushedOnCore[2];
@@ -1087,24 +1038,10 @@ typedef struct KProcess##sys\
   KThread *mainThread;\
   u32 interruptEnabledFlags[4];\
   KProcessHandleTable handleTable;\
-  /* Custom fields for plugin system */ \
+  u8 gap234[52];\
-  /* { */ \
-  u32     customFlags; /* see KProcess_CustomFlags enum below */ \
-  Handle  onMemoryLayoutChangeEvent;\
-  /* } */ \
-  u8 gap234[44];\
   u64 unused;\
 } KProcess##sys;
 
-enum KProcess_CustomFlags
-{
-    ForceRWXPages = 1 << 0,
-    SignalOnMemLayoutChanges = 1 << 1,
-    SignalOnExit = 1 << 2,
-
-    MemLayoutChanged = 1 << 16
-};
-
 INSTANCIATE_KPROCESS(N3DS);
 INSTANCIATE_KPROCESS(O3DS8x);
 INSTANCIATE_KPROCESS(O3DSPre8x);
@@ -1198,28 +1135,6 @@ typedef struct FcramLayout
   u32 baseSize;
 } FcramLayout;
 
-typedef struct RegionDescriptor
-{
-    void               *firstMemoryBlock;
-    void               *lastMemoryBlock;
-    void               *regionStart;
-    u32                 regionSizeInBytes;
-}   RegionDescriptor;
-
-typedef struct FcramDescriptor
-{
-    RegionDescriptor    appRegion;
-    RegionDescriptor    sysRegion;
-    RegionDescriptor    baseRegion;
-    RegionDescriptor *  regionDescsPtr;
-    u32                 fcramStart;
-    u32                 fcramSizeInPages;
-    u32                 baseMemoryStart;
-    u32                 kernelUsageInBytes;
-    u32                 unknown;
-    KObjectMutex        mutex;
-}   FcramDescriptor;
-
 extern bool isN3DS;
 extern void *officialSVCs[0x7E];
 
@@ -1247,7 +1162,7 @@ offsetof(classname##O3DSPre8x, field)))
 #define KPROCESSHWINFO_GET_RVALUE(obj, field)             *(KPROCESSHWINFO_GET_PTR(obj, field))
 #define KPROCESSHWINFO_GET_RVALUE_TYPE(type, obj, field)  *(KPROCESSHWINFO_GET_PTR_TYPE(type, obj, field))
 
-extern u32 pidOffsetKProcess, hwInfoOffsetKProcess, codeSetOffsetKProcess, handleTableOffsetKProcess, debugOffsetKProcess, flagsKProcess;
+extern u32 pidOffsetKProcess, hwInfoOffsetKProcess, codeSetOffsetKProcess, handleTableOffsetKProcess, debugOffsetKProcess;
 
 static inline u32 idOfProcess(KProcess *process)
 {
@@ -1280,13 +1195,6 @@ static inline KDebug *debugOfProcess(KProcess *process)
     return debug;
 }
 
-static inline u32 flagsOfProcess(KProcess *process)
-{
-    u32 flags;
-    memcpy(&flags, (const u8 *)process + flagsKProcess, 4);
-    return flags;
-}
-
 static inline const char *classNameOfAutoObject(KAutoObject *object)
 {
     const char *name;

k11_extension/include/mmu.h

@@ -1,129 +0,0 @@
-#pragma once
-
-#include "types.h"
-#include "kernel.h"
-
-typedef struct
-{
-    u32     bits1_0 : 2;    ///< 0b00
-}   Desc_TranslationFault;
-
-typedef struct
-{
-    u32     bits1_0 : 2;    ///< 0b01
-    u32     sbz     : 3;
-    u32     domain  : 4;
-    u32     p       : 1;
-    u32     addr    : 21;
-}   Desc_CoarsePageTable;
-
-typedef struct
-{
-    u32     bits1_0 : 2;    ///< 0b10
-    u32     b       : 1;
-    u32     c       : 1;
-    u32     xn      : 1;
-    u32     domain  : 4;
-    u32     p       : 1;
-    u32     ap      : 2;
-    u32     tex     : 3;
-    u32     apx     : 1;
-    u32     s       : 1;
-    u32     ng      : 1;
-    u32     bit18   : 1;    ///< 0
-    u32     sbz     : 1;
-    u32     addr    : 12;
-}   Desc_Section;
-
-typedef struct
-{
-    u32     bits1_0 : 2;    ///< 0b10
-    u32     b       : 1;
-    u32     c       : 1;
-    u32     xn      : 1;
-    u32     domain  : 4;
-    u32     p       : 1;
-    u32     ap      : 2;
-    u32     tex     : 3;
-    u32     sbz     : 3;
-    u32     bit18   : 1;    ///< 1
-    u32     sbz2    : 5;
-    u32     addr    : 8;
-}   Desc_Supersection;
-
-typedef struct
-{
-    u32     bits1_0 : 2;    ///< 0b11
-}   Desc_Reserved;
-
-typedef struct
-{
-    u32     bits1_0 : 2;    ///< 0b01
-    u32     b       : 1;
-    u32     c       : 1;
-    u32     ap      : 2;
-    u32     sbz     : 3;
-    u32     apx     : 1;
-    u32     s       : 1;
-    u32     ng      : 1;
-    u32     tex     : 3;
-    u32     xn      : 1;
-    u32     addr    : 16;
-}   Desc_LargePage;
-
-typedef struct
-{
-    u32     xn      : 1;
-    u32     bit1    : 1;    ///< 1
-    u32     b       : 1;
-    u32     c       : 1;
-    u32     ap      : 2;
-    u32     tex     : 3;
-    u32     apx     : 1;
-    u32     s       : 1;
-    u32     ng      : 1;
-    u32     addr    : 20;
-}   Desc_SmallPage;
-
-typedef union
-{
-    u32     raw;
-
-    Desc_TranslationFault   translationFault;
-    Desc_CoarsePageTable    coarsePageTable;
-    Desc_Section            section;
-    Desc_Supersection       supersection;
-    Desc_Reserved           reserved;
-
-}   L1Descriptor;
-
-typedef union
-{
-    u32     raw;
-
-    Desc_TranslationFault   translationFault;
-    Desc_LargePage          largePage;
-    Desc_SmallPage          smallPage;
-}   L2Descriptor;
-
-typedef enum
-{
-    Descriptor_TranslationFault,
-    Descriptor_CoarsePageTable,
-    Descriptor_Section,
-    Descriptor_Supersection,
-    Descriptor_Reserved,
-    Descriptor_LargePage,
-    Descriptor_SmallPage
-}   DescType;
-
-void    L1MMUTable__RWXForAll(u32 *table);
-void    L2MMUTable__RWXForAll(u32 *table);
-u32     L1MMUTable__GetPAFromVA(u32 *table, u32 va);
-u32     L2MMUTable__GetPAFromVA(u32 *table, u32 va);
-u32     L1MMUTable__GetAddressUserPerm(u32 *table, u32 va);
-u32     L2MMUTable__GetAddressUserPerm(u32 *table, u32 va);
-
-void    KProcessHwInfo__SetMMUTableToRWX(KProcessHwInfo *hwInfo);
-u32     KProcessHwInfo__GetPAFromVA(KProcessHwInfo *hwInfo, u32 va);
-u32     KProcessHwInfo__GetAddressUserPerm(KProcessHwInfo *hwInfo, u32 va);

k11_extension/include/svc/ControlMemoryUnsafe.h

@@ -1,34 +0,0 @@
-/*
-*   This file is part of Luma3DS
-*   Copyright (C) 2016-2018 Aurora Wright, TuxSH
-*
-*   This program is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   This program is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-*   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
-*       * Requiring preservation of specified reasonable legal notices or
-*         author attributions in that material or in the Appropriate Legal
-*         Notices displayed by works containing it.
-*       * Prohibiting misrepresentation of the origin of that material,
-*         or requiring that modified versions of such material be marked in
-*         reasonable ways as different from the original version.
-*/
-
-#pragma once
-
-#include "utils.h"
-#include "kernel.h"
-#include "svc.h"
-
-Result ControlMemoryUnsafe(u32 *out, u32 addr0, u32 size, MemOp op, MemPerm perm);
-Result ControlMemoryUnsafeWrapper(u32 *out, u32 addr0, u32 size, MemOp op, MemPerm perm);

k11_extension/include/svc/ControlProcess.h

@@ -1,21 +0,0 @@
-#pragma once
-
-#include "utils.h"
-#include "kernel.h"
-#include "svc.h"
-
-/// Operations for svcControlProcess
-typedef enum ProcessOp
-{
-    PROCESSOP_GET_ALL_HANDLES,  ///< List all handles of the process, varg3 can be either 0 to fetch all handles, or token of the type to fetch
-                                ///< svcControlProcess(handle, PROCESSOP_GET_ALL_HANDLES, (u32)&outBuf, 0)
-    PROCESSOP_SET_MMU_TO_RWX,   ///< Set the whole memory of the process with rwx access
-                                ///< svcControlProcess(handle, PROCESSOP_SET_MMU_TO_RWX, 0, 0)
-    PROCESSOP_GET_ON_MEMORY_CHANGE_EVENT,
-    PROCESSOP_SIGNAL_ON_EXIT,
-    PROCESSOP_GET_PA_FROM_VA,   ///< Get the physical address of the va within the process
-                                ///< svcControlProcess(handle, PROCESSOP_GET_PA_FROM_VA, (u32)&outPa, va)
-    PROCESSOP_SCHEDULE_THREADS,
-} ProcessOp;
-
-Result  ControlProcess(Handle process, ProcessOp op, u32 varg2, u32 varg3);

k11_extension/include/svc/CreateThread.h

@@ -1,32 +0,0 @@
-/*
-*   This file is part of Luma3DS
-*   Copyright (C) 2016-2023 Aurora Wright, TuxSH
-*
-*   This program is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   This program is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-*   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
-*       * Requiring preservation of specified reasonable legal notices or
-*         author attributions in that material or in the Appropriate Legal
-*         Notices displayed by works containing it.
-*       * Prohibiting misrepresentation of the origin of that material,
-*         or requiring that modified versions of such material be marked in
-*         reasonable ways as different from the original version.
-*/
-
-#include "utils.h"
-#include "kernel.h"
-#include "svc.h"
-
-Result CreateThreadHookWrapper(Handle *outThreadHandle, u32 ep, u32 arg, u32 stackTop, s32 priority, s32 processorId);
-Result CreateThreadHook(Handle *outThreadHandle, u32 ep, u32 arg, u32 stackTop, s32 priority, s32 processorId);

k11_extension/include/svc/ExitProcess.h

@@ -1,6 +0,0 @@
-#include "utils.h"
-#include "kernel.h"
-#include "svc.h"
-
-void ExitProcessHook(void);
-void ExitProcessHookWrapper(void);

k11_extension/include/svc/KernelSetState.h

@@ -30,7 +30,7 @@
 #include "kernel.h"
 #include "svc.h"
 
-extern u8 svcSignalingEnabled;
+extern bool svcSignalingEnabled;
 
 bool shouldSignalSyscallDebugEvent(KProcess *process, u8 svcId);
 Result KernelSetStateHook(u32 type, u32 varg1, u32 varg2, u32 varg3);

k11_extension/include/svc/MapProcessMemoryEx.h

@@ -30,11 +30,4 @@
 #include "kernel.h"
 #include "svc.h"
 
-/// Flags for svcMapProcessMemoryEx
+Result MapProcessMemoryEx(Handle processHandle, void *dst, void *src, u32 size);
-typedef enum MapExFlags
-{
-    MAPEXFLAGS_PRIVATE = BIT(0), ///< Maps the memory as PRIVATE (0xBB05) instead of SHARED (0x5806)
-} MapExFlags;
-
-Result MapProcessMemoryEx(Handle dstProcessHandle, u32 vaDst, Handle srcProcessHandle, u32 vaSrc, u32 size, MapExFlags flags);
-Result MapProcessMemoryExWrapper(Handle dstProcessHandle, u32 vaDst, Handle srcProcessHandle, u32 vaSrc, u32 size, MapExFlags flags);

k11_extension/include/types.h

@@ -69,11 +69,11 @@ typedef s32 Result;                 ///< Function result.
 #define BIT(n) (1U<<(n))
 
 /// Aligns a struct (and other types?) to m, making sure that the size of the struct is a multiple of m.
-#define CTR_ALIGN(m)   __attribute__((aligned(m)))
+#define ALIGN(m)   __attribute__((aligned(m)))
 /// Packs a struct (and other types?) so it won't include padding bytes.
-#define CTR_PACKED      __attribute__((packed))
+#define PACKED      __attribute__((packed))
-#define CTR_USED        __attribute__((used))
+#define USED        __attribute__((used))
-#define CTR_UNUSED      __attribute__((unused))
+#define UNUSED      __attribute__((unused))
 /// Packs a system version from its components.
 #define SYSTEM_VERSION(major, minor, revision) \
     (((major)<<24)|((minor)<<16)|((revision)<<8))

k11_extension/linker.specs

@@ -1,7 +1,7 @@
 %rename link                old_link
 
 *link:
-%(old_link) -T %:getenv(TOPDIR /linker.ld) --nmagic --gc-sections --no-warn-rwx-segments
+%(old_link) -T %:getenv(TOPDIR /linker.ld) --nmagic --gc-sections
 
 *startfile:
 crti%O%s crtbegin%O%s

k11_extension/source/debug.c

@@ -31,7 +31,7 @@
 KRecursiveLock dbgParamsLock = { NULL };
 u32 dbgParamWatchpointId, dbgParamDVA, dbgParamWCR, dbgParamContextId;
 
-KSchedulableInterruptEvent *enableMonitorModeDebugging(KBaseInterruptEvent *this CTR_UNUSED, u32 interruptID CTR_UNUSED)
+KSchedulableInterruptEvent *enableMonitorModeDebugging(KBaseInterruptEvent *this UNUSED, u32 interruptID UNUSED)
 {
     coreBarrier();
 
@@ -76,7 +76,7 @@ static void disableWatchpoint1(void)
     __asm__ __volatile__("mcr p14, 0, %[val], c0, c5, 5" :: [val] "r" (control));
 }
 
-KSchedulableInterruptEvent *disableWatchpoint(KBaseInterruptEvent *this CTR_UNUSED, u32 interruptID CTR_UNUSED)
+KSchedulableInterruptEvent *disableWatchpoint(KBaseInterruptEvent *this UNUSED, u32 interruptID UNUSED)
 {
     coreBarrier();
 
@@ -131,7 +131,7 @@ static void setWatchpoint1WithContextId(u32 DVA, u32 WCR, u32 contextId)
     __asm__ __volatile__("mcr p15, 0, %[val], c7, c10, 5" :: [val] "r" (0) : "memory"); // DMB
 }
 
-KSchedulableInterruptEvent *setWatchpointWithContextId(KBaseInterruptEvent *this CTR_UNUSED, u32 interruptID CTR_UNUSED)
+KSchedulableInterruptEvent *setWatchpointWithContextId(KBaseInterruptEvent *this UNUSED, u32 interruptID UNUSED)
 {
     coreBarrier();
 

k11_extension/source/fatalExceptionHandlersMain.c

@@ -28,43 +28,10 @@
 #include "fatalExceptionHandlers.h"
 #include "utils.h"
 #include "kernel.h"
-#include "memory.h"
-#include "mmu.h"
 #include "globals.h"
 
 #define REG_DUMP_SIZE   4 * 23
-#define CODE_DUMP_SIZE  96
+#define CODE_DUMP_SIZE  48
-
-// Return true if parameters are invalid
-static bool checkExceptionHandlerValidity(KProcess *process, vu32 *threadLocalStorage)
-{
-    if (process == NULL)
-        return true;
-
-    u32             stackBottom = threadLocalStorage[0x11];
-    u32             exceptionBuf = threadLocalStorage[0x12];
-    MemoryInfo      memInfo;
-    PageInfo        pageInfo;
-    KProcessHwInfo *hwInfo = hwInfoOfProcess(process);
-
-    u32 perm = KProcessHwInfo__GetAddressUserPerm(hwInfo, threadLocalStorage[0x10]);
-
-    if (stackBottom != 1)
-    {
-        if (KProcessHwInfo__QueryMemory(hwInfo, &memInfo, &pageInfo, (void *)stackBottom)
-            || (memInfo.permissions & MEMPERM_RW) != MEMPERM_RW)
-            return true;
-    }
-
-    if (exceptionBuf > 1)
-    {
-        if (KProcessHwInfo__QueryMemory(hwInfo, &memInfo, &pageInfo, (void *)exceptionBuf)
-            || (memInfo.permissions & MEMPERM_RW) != MEMPERM_RW)
-            return true;
-    }
-
-    return (perm & MEMPERM_RX) != MEMPERM_RX;
-}
 
 bool isExceptionFatal(u32 spsr, u32 *regs, u32 index)
 {
@@ -76,7 +43,7 @@ bool isExceptionFatal(u32 spsr, u32 *regs, u32 index)
     KProcess *currentProcess = currentCoreContext->objectContext.currentProcess;
 
     if(thread != NULL && thread->threadLocalStorage != NULL && *((vu32 *)thread->threadLocalStorage + 0x10) != 0)
-       return checkExceptionHandlerValidity(currentProcess, (vu32 *)thread->threadLocalStorage);
+       return false;
 
     if(currentProcess != NULL)
     {
@@ -85,7 +52,7 @@ bool isExceptionFatal(u32 spsr, u32 *regs, u32 index)
 
         thread = KPROCESS_GET_RVALUE(currentProcess, mainThread);
         if(thread != NULL && thread->threadLocalStorage != NULL && *((vu32 *)thread->threadLocalStorage + 0x10) != 0)
-           return checkExceptionHandlerValidity(currentProcess, thread->threadLocalStorage);
+           return false;
 
         if(index == 3 && strcmp(codeSetOfProcess(currentProcess)->processName, "menu") == 0 && // workaround a Home Menu bug leading to a dabort
            regs[0] == 0x3FFF && regs[2] == 0 && regs[5] == 2 && regs[7] == 1)
@@ -103,7 +70,6 @@ bool isDataAbortExceptionRangeControlled(u32 spsr, u32 addr)
                 ((u32)safecpy <= addr && addr < (u32)safecpy + safecpy_sz)
             );
 }
-
 void fatalExceptionHandlersMain(u32 *registerDump, u32 type, u32 cpuId)
 {
     ExceptionDumpHeader dumpHeader;

k11_extension/source/globals.c

@@ -25,8 +25,6 @@
 */
 
 #include "globals.h"
-#include "utils.h"
-#include "ipc.h"
 
 KRecursiveLock *criticalSectionLock;
 KObjectList *threadList;
@@ -42,29 +40,17 @@ KAutoObject * (*KProcessHandleTable__ToKAutoObject)(KProcessHandleTable *this, H
 void (*KSynchronizationObject__Signal)(KSynchronizationObject *this, bool isPulse);
 Result (*WaitSynchronization1)(void *this_unused, KThread *thread, KSynchronizationObject *syncObject, s64 timeout);
 Result (*KProcessHandleTable__CreateHandle)(KProcessHandleTable *this, Handle *out, KAutoObject *obj, u8 token);
-Result (*KProcessHwInfo__QueryMemory)(KProcessHwInfo *this, MemoryInfo *memoryInfo, PageInfo *pageInfo, void *address);
 Result (*KProcessHwInfo__MapProcessMemory)(KProcessHwInfo *this, KProcessHwInfo *other, void *dst, void *src, u32 nbPages);
 Result (*KProcessHwInfo__UnmapProcessMemory)(KProcessHwInfo *this, void *addr, u32 nbPages);
-Result (*KProcessHwInfo__CheckVaState)(KProcessHwInfo *hwInfo, u32 va, u32 size, u32 state, u32 perm);
-Result (*KProcessHwInfo__GetListOfKBlockInfoForVA)(KProcessHwInfo *hwInfo, KLinkedList *list, u32 va, u32 sizeInPage);
-Result (*KProcessHwInfo__MapListOfKBlockInfo)(KProcessHwInfo *this, u32 va, KLinkedList *list, u32 state, u32 perm, u32 sbz);
 Result (*KEvent__Clear)(KEvent *this);
-Result (*KEvent__Signal)(KEvent *this);
-
 void (*KObjectMutex__WaitAndAcquire)(KObjectMutex *this);
 void (*KObjectMutex__ErrorOccured)(void);
 
 void (*KScheduler__AdjustThread)(KScheduler *this, KThread *thread, u32 oldSchedulingMask);
 void (*KScheduler__AttemptSwitchingThreadContext)(KScheduler *this);
 
-void (*KLinkedList_KBlockInfo__Clear)(KLinkedList *list);
-
 Result (*ControlMemory)(u32 *addrOut, u32 addr0, u32 addr1, u32 size, MemOp op, MemPerm perm, bool isLoader);
-Result (*doControlMemory)(KProcessHwInfo *this, u32 addr, u32 requestedNbPages, u32 pa, u32 state, u32 perm, u32 a7, u32 region);
-
-Result (*CreateThread)(Handle *outThreadHandle, u32 ep, u32 arg, u32 stackTop, s32 priority, s32 processorId);
 void (*SleepThread)(s64 ns);
-Result (*CreateEvent)(Handle *out, ResetType resetType);
 Result (*CloseHandle)(Handle handle);
 Result (*GetHandleInfo)(s64 *out, Handle handle, u32 type);
 Result (*GetSystemInfo)(s64 *out, s32 type, s32 param);
@@ -75,7 +61,6 @@ Result (*SendSyncRequest)(Handle handle);
 Result (*OpenProcess)(Handle *out, u32 processId);
 Result (*GetProcessId)(u32 *out, Handle process);
 Result (*DebugActiveProcess)(Handle *out, u32 processId);
-Result (*SignalEvent)(Handle event);
 Result (*UnmapProcessMemory)(Handle processHandle, void *dst, u32 size);
 Result (*KernelSetState)(u32 type, u32 varg1, u32 varg2, u32 varg3);
 
@@ -108,7 +93,6 @@ bool *isDevUnit;
 vu8 *configPage;
 u32 kernelVersion;
 FcramLayout fcramLayout;
-FcramDescriptor *fcramDescriptor;
 KCoreContext *coreCtxs;
 
 void *originalHandlers[8] = {NULL};
@@ -122,64 +106,12 @@ InterruptManager *interruptManager;
 void (*initFPU)(void);
 void (*mcuReboot)(void);
 void (*coreBarrier)(void);
-void* (*kAlloc)(FcramDescriptor *fcramDesc, u32 nbPages, u32 alignment, u32 region);
 
 CfwInfo cfwInfo;
 u32 kextBasePa;
 u32 stolenSystemMemRegionSize;
-bool disableThreadRedirection = false;
 
 vu32 rosalinaState;
 bool hasStartedRosalinaNetworkFuncsOnce;
-KEvent* signalPluginEvent = NULL;
-u32 pidOffsetKProcess, hwInfoOffsetKProcess, codeSetOffsetKProcess, handleTableOffsetKProcess, debugOffsetKProcess, flagsKProcess;
-
-KLinkedList*    KLinkedList__Initialize(KLinkedList *list)
-{
-    list->size = 0;
-    list->nodes.first = list->nodes.last = (KLinkedListNode *)&list->nodes;
-    return list;
-}
-
-void     PLG_SignalEvent(u32 event)
-{
-    KThread     *currentThread = currentCoreContext->objectContext.currentThread;
-
-    // Set configuration memory field with event
-    *(vu32 *)PA_FROM_VA_PTR((u32 *)0x1FF800F0) |= event;
-
-    // Send notification 0x1001
-    {
-        u32     *cmdbuf = (u32 *)((u8 *)currentCoreContext->objectContext.currentThread->threadLocalStorage + 0x80);
-        u32     backup[3] = { cmdbuf[0], cmdbuf[1], cmdbuf[2] };
-        Handle  srvHandle;
-        SessionInfo *info = SessionInfo_FindFirst("srv:");
-
-        Result  res = createHandleForThisProcess(&srvHandle, &info->session->clientSession.syncObject.autoObject);
-
-        if (res >= 0)
-        {
-            cmdbuf[0] = 0x000C0080;
-            cmdbuf[1] = 0x1001;
-            cmdbuf[2] = 0;
-
-            SendSyncRequest(srvHandle);
-            CloseHandle(srvHandle);
-        }
-
-        cmdbuf[0] = backup[0]; cmdbuf[1] = backup[1]; cmdbuf[2] = backup[2];
-    }
-    // Wait for notification 0x1002
-    WaitSynchronization1(NULL, currentThread, (KSynchronizationObject *)signalPluginEvent, U64_MAX);
-}
-
-void    PLG__WakeAppThread(void)
-{
-    KEvent__Signal(signalPluginEvent);
-}
-
-u32      PLG_GetStatus(void)
-{
-    return (*(vu32 *)PA_FROM_VA_PTR((u32 *)0x1FF800F0)) & 0xFFFF;
-}
 
+u32 pidOffsetKProcess, hwInfoOffsetKProcess, codeSetOffsetKProcess, handleTableOffsetKProcess, debugOffsetKProcess;

k11_extension/source/main.c

@@ -46,7 +46,7 @@ struct KExtParameters
     CfwInfo cfwInfo;
 } kExtParameters = { .basePA = 0x12345678 }; // place this in .data
 
-static CTR_ALIGN(1024) u32 g_L2Table[256] = {0};
+static ALIGN(1024) u32 g_L2Table[256] = {0};
 
 void relocateAndSetupMMU(u32 coreId, u32 *L1Table)
 {
@@ -127,70 +127,13 @@ void configHook(vu8 *cfgPage)
     codeSetOffsetKProcess = KPROCESS_OFFSETOF(codeSet);
     handleTableOffsetKProcess = KPROCESS_OFFSETOF(handleTable);
     debugOffsetKProcess = KPROCESS_OFFSETOF(debug);
-    flagsKProcess = KPROCESS_OFFSETOF(kernelFlags);
-}
-
-void KProcessHwInfo__MapL1Section_Hook(void);
-void KProcessHwInfo__MapL2Section_Hook(void);
-
-static void installMmuHooks(void)
-{
-    // Older versions of k11 had different VA memory mappings
-    u32 k11TextStartVa = (u32)originalHandlers[2] & ~0xFFFF;
-    u32 *off;
-
-    for (off = (u32 *)k11TextStartVa; off[0] != 0xE3A05801 || off[1] != 0xE2010EE3; off++);
-    for (; (off[0] >> 16) != 0xE92D; off--);
-    u32 *mapL2Section = PA_FROM_VA_PTR(off); // fragile, might break due to cache
-
-    for (off = (u32 *)k11TextStartVa; off[0] != 0x13A0A401 || off[1] != 0x03A0A601; off++);
-    for (; (off[0] >> 16) != 0xE92D; off--);
-    u32 *mapL1Section = PA_FROM_VA_PTR(off);
-
-    mapL1Section[1] = 0xE28FE004; // add lr, pc, #4
-    mapL1Section[2] = 0xE51FF004; // ldr pc, [pc, #-4]
-    mapL1Section[3] = (u32)KProcessHwInfo__MapL1Section_Hook;
-
-    mapL2Section[1] = 0xE28FE004; // add lr, pc, #4
-    mapL2Section[2] = 0xE51FF004; // ldr pc, [pc, #-4]
-    mapL2Section[3] = (u32)KProcessHwInfo__MapL2Section_Hook;
 }
 
 static void findUsefulSymbols(void)
 {
     u32 *off;
 
-    // Older versions of k11 had different VA memory mappings
+    for(off = (u32 *)0xFFFF0000; *off != 0xE1A0D002; off++);
-    u32 k11TextStartVa = (u32)originalHandlers[2] & ~0xFFFF;
-    // Get fcramDescriptor
-    for (off = (u32 *)k11TextStartVa; ; ++off)
-    {
-        if (  (off[0] >> 16) == 0xE59F
-           && (off[1] >> 16) == 0xE3A0
-           && (off[2] >> 16) == 0xE3A0
-           && (off[3] >> 16) == 0xE1A0
-           && (off[4] >> 16) == 0xEB00)
-        {
-            fcramDescriptor = (FcramDescriptor *)off[2 + (off[0] & 0xFFFF) / 4];
-            break;
-        }
-    }
-
-    // Get kAlloc
-    for (; *off != 0xE1A00005 || *(off + 1) != 0xE320F000; ++off);
-    off = decodeArmBranch(off + 2);
-    for (; (*off >> 16) != 0xEB00; ++off);
-    kAlloc = (void* (*)(FcramDescriptor *, u32, u32, u32))decodeArmBranch(off);
-
-    // Patch ERRF__DumpException
-    for(off = (u32 *)0xFFFF0000; *off != 0xE1A04005; ++off);
-    ++off;
-    *(u32 *)PA_FROM_VA_PTR(off) = makeArmBranch(off, off + 51, false);
-
-    for(; *off != 0xE2100102; ++off);
-    KProcessHwInfo__QueryMemory = (Result (*)(KProcessHwInfo *, MemoryInfo *, PageInfo *, void *))decodeArmBranch(off - 1);
-
-    for(; *off != 0xE1A0D002; off++);
     off += 3;
     initFPU = (void (*) (void))off;
 
@@ -227,8 +170,6 @@ static void findUsefulSymbols(void)
     KEvent__Clear = (Result (*)(KEvent *))decodeArmBranch(off + 1);
     for(off = (u32 *)KEvent__Clear; *off != 0xE8BD8070; off++);
     synchronizationMutex = *(KObjectMutex **)(off + 1);
-    for(off = (u32 *)officialSVCs[0x18]; *off != 0xE1A04005; ++off);
-    KEvent__Signal = (Result (*)(KEvent *))decodeArmBranch(off + 1);
 
     for(off = (u32 *)officialSVCs[0x24]; *off != 0xE59F004C; off++);
     WaitSynchronization1 = (Result (*)(void *, KThread *, KSynchronizationObject *, s64))decodeArmBranch(off + 6);
@@ -255,21 +196,6 @@ static void findUsefulSymbols(void)
     for(off = (u32 *)officialSVCs[0x72]; *off != 0xE2041102; off++);
     KProcessHwInfo__UnmapProcessMemory = (Result (*)(KProcessHwInfo *, void *, u32))decodeArmBranch(off - 1);
 
-    for (off = (u32 *)officialSVCs[0x70]; *off != 0xE8881200 && *off != 0xE8891900; ++off);
-    for (off = (u32 *)decodeArmBranch(off + 1); *off != 0xE2101102; ++off);
-    KProcessHwInfo__CheckVaState = (Result (*)(KProcessHwInfo *, u32, u32, u32, u32))decodeArmBranch(off - 1);
-    for (; *off != 0xE28D1008; ++off);
-    KProcessHwInfo__GetListOfKBlockInfoForVA = (Result (*)(KProcessHwInfo*, KLinkedList*, u32, u32))decodeArmBranch(off + 1);
-
-    for (; *off != 0xE2000102; ++off);
-    KProcessHwInfo__MapListOfKBlockInfo = (Result (*)(KProcessHwInfo*, u32, KLinkedList*, u32, u32, u32))decodeArmBranch(off - 1);
-
-    for (; *off != 0xE8BD8FF0; ++off);
-    KLinkedList_KBlockInfo__Clear = (void (*)(KLinkedList *))decodeArmBranch(off - 6);
-
-    for(off = (u32 *)KProcessHwInfo__MapListOfKBlockInfo; *off != 0xE1A0000B; ++off);
-    doControlMemory = (Result (*)(KProcessHwInfo*, u32, u32, u32, u32, u32, u32, u32))decodeArmBranch(off + 1);
-
     for(off = (u32 *)officialSVCs[0x7C]; *off != 0x03530000; off++);
     KObjectMutex__WaitAndAcquire = (void (*)(KObjectMutex *))decodeArmBranch(++off);
     for(; *off != 0xE320F000; off++);
@@ -314,9 +240,7 @@ static void findUsefulSymbols(void)
     // The official prototype of ControlMemory doesn't have that extra param'
     ControlMemory = (Result (*)(u32 *, u32, u32, u32, MemOp, MemPerm, bool))
                     decodeArmBranch((u32 *)officialSVCs[0x01] + 5);
-    CreateThread = (Result (*)(Handle *, u32, u32, u32, s32, s32))decodeArmBranch((u32 *)officialSVCs[0x08] + 5);
     SleepThread = (void (*)(s64))officialSVCs[0x0A];
-    CreateEvent = (Result (*)(Handle *, ResetType))decodeArmBranch((u32 *)officialSVCs[0x17] + 3);
     CloseHandle = (Result (*)(Handle))officialSVCs[0x23];
     GetHandleInfo = (Result (*)(s64 *, Handle, u32))decodeArmBranch((u32 *)officialSVCs[0x29] + 3);
     GetSystemInfo = (Result (*)(s64 *, s32, s32))decodeArmBranch((u32 *)officialSVCs[0x2A] + 3);
@@ -327,8 +251,6 @@ static void findUsefulSymbols(void)
     OpenProcess = (Result (*)(Handle *, u32))decodeArmBranch((u32 *)officialSVCs[0x33] + 3);
     GetProcessId = (Result (*)(u32 *, Handle))decodeArmBranch((u32 *)officialSVCs[0x35] + 3);
     DebugActiveProcess = (Result (*)(Handle *, u32))decodeArmBranch((u32 *)officialSVCs[0x60] + 3);
-    SignalEvent = (Result (*)(Handle event))officialSVCs[0x18];
-
     UnmapProcessMemory = (Result (*)(Handle, void *, u32))officialSVCs[0x72];
     KernelSetState = (Result (*)(u32, u32, u32, u32))((u32 *)officialSVCs[0x7C] + 1);
 
@@ -360,8 +282,6 @@ static void findUsefulSymbols(void)
             invalidateInstructionCacheRange = (void (*)(void *, u32))off2;
         }
     }
-
-    installMmuHooks();
 }
 
 void main(FcramLayout *layout, KCoreContext *ctxs)

k11_extension/source/mmu.c

@@ -1,319 +0,0 @@
-#include "mmu.h"
-#include "globals.h"
-#include "utils.h"
-
-extern u8 svcSignalingEnabled;
-
-DescType     L1Descriptor__GetType(u32 descriptor)
-{
-    L1Descriptor   pdesc = {descriptor};
-
-    if (pdesc.reserved.bits1_0 == 0b00)
-        return Descriptor_TranslationFault;
-    if (pdesc.reserved.bits1_0 == 0b01)
-        return Descriptor_CoarsePageTable;
-    if (pdesc.reserved.bits1_0 == 0b10)
-        return pdesc.section.bit18 == 0 ? Descriptor_Section : Descriptor_Supersection;
-    return Descriptor_Reserved;
-}
-
-DescType     L2Descriptor__GetType(u32 descriptor)
-{
-    L2Descriptor    pdesc = {descriptor};
-
-    if (pdesc.translationFault.bits1_0 == 0b01)
-        return Descriptor_LargePage;
-    if (pdesc.smallPage.bit1 == 1)
-        return Descriptor_SmallPage;
-
-    return Descriptor_TranslationFault;
-}
-
-void    L1MMUTable__RWXForAll(u32 *table)
-{
-    u32     *tableEnd = table + 1024;
-
-    for (; table != tableEnd; ++table)
-    {
-        L1Descriptor    descriptor = {*table};
-
-        switch (L1Descriptor__GetType(descriptor.raw))
-        {
-            case Descriptor_CoarsePageTable:
-            {
-                u32     *l2table = (u32 *)((descriptor.coarsePageTable.addr << 10) - 0x40000000);
-
-                L2MMUTable__RWXForAll(l2table);
-                break;
-            }
-            case Descriptor_Section:
-            {
-                descriptor.section.xn = 0;
-                descriptor.section.apx = 0;
-                descriptor.section.ap = 3;
-                *table = descriptor.raw;
-                break;
-            }
-            case Descriptor_Supersection:
-            {
-                descriptor.supersection.xn = 0;
-                descriptor.supersection.ap = 3;
-                *table = descriptor.raw;
-                break;
-            }
-            default:
-                break;
-        }
-    }
-}
-
-void    L2MMUTable__RWXForAll(u32 *table)
-{
-    u32     *tableEnd = table + 256;
-
-    for (; table != tableEnd; ++table)
-    {
-        L2Descriptor    descriptor = {*table};
-
-        switch (L2Descriptor__GetType(descriptor.raw))
-        {
-            case Descriptor_LargePage:
-            {
-                descriptor.largePage.xn = 0;
-                descriptor.largePage.apx = 0;
-                descriptor.largePage.ap = 3;
-                *table = descriptor.raw;
-                break;
-            }
-            case Descriptor_SmallPage:
-            {
-                descriptor.smallPage.xn = 0;
-                descriptor.smallPage.apx = 0;
-                descriptor.smallPage.ap = 3;
-                *table = descriptor.raw;
-                break;
-            }
-            default:
-                break;
-        }
-    }
-}
-
-u32     L1MMUTable__GetPAFromVA(u32 *table, u32 va)
-{
-    u32             pa = 0;
-    L1Descriptor    descriptor = {table[va >> 20]};
-
-    switch (L1Descriptor__GetType(descriptor.raw))
-    {
-        case Descriptor_CoarsePageTable:
-        {
-            u32     *l2table = (u32 *)((descriptor.coarsePageTable.addr << 10) - 0x40000000);
-
-            pa = L2MMUTable__GetPAFromVA(l2table, va);
-            break;
-        }
-        case Descriptor_Section:
-        {
-            pa = descriptor.section.addr << 20;
-            pa |= (va << 12) >> 12;
-            break;
-        }
-        case Descriptor_Supersection:
-        {
-            pa = descriptor.supersection.addr << 24;
-            pa |= (va << 8) >> 8;
-            break;
-        }
-        default:
-            // VA not found
-            break;
-    }
-
-    return pa;
-}
-
-u32     L2MMUTable__GetPAFromVA(u32 *table, u32 va)
-{
-    u32             pa = 0;
-    L2Descriptor    descriptor = {table[(va << 12) >> 24]};
-
-    switch(L2Descriptor__GetType(descriptor.raw))
-    {
-        case Descriptor_LargePage:
-        {
-            pa = descriptor.largePage.addr << 16;
-            pa |= va & 0xFFFF;
-            break;
-        }
-        case Descriptor_SmallPage:
-        {
-            pa = descriptor.smallPage.addr << 12;
-            pa |= va & 0xFFF;
-            break;
-        }
-        default:
-            break;
-    }
-
-    return pa;
-}
-
-u32     L1MMUTable__GetAddressUserPerm(u32 *table, u32 va)
-{
-    u32             perm = 0;
-    L1Descriptor    descriptor = {table[va >> 20]};
-
-    switch (L1Descriptor__GetType(descriptor.raw))
-    {
-        case Descriptor_CoarsePageTable:
-        {
-            u32     *l2table = (u32 *)((descriptor.coarsePageTable.addr << 10) - 0x40000000);
-
-            perm = L2MMUTable__GetAddressUserPerm(l2table, va);
-            break;
-        }
-        case Descriptor_Section:
-        {
-            perm = descriptor.section.ap >> 1;
-
-            if (perm)
-            {
-                perm |= (!descriptor.section.apx && (descriptor.section.ap & 1)) << 1;
-                perm |= (!descriptor.section.xn) << 2;
-            }
-            break;
-        }
-        case Descriptor_Supersection:
-        {
-            perm = descriptor.supersection.ap >> 1;
-
-            if (perm)
-            {
-                perm |= (descriptor.supersection.ap & 1) << 1;
-                perm |= (!descriptor.supersection.xn) << 2;
-            }
-            break;
-        }
-        default:
-            // VA not found
-            break;
-    }
-
-    return perm;
-}
-
-u32     L2MMUTable__GetAddressUserPerm(u32 *table, u32 va)
-{
-    u32             perm = 0;
-    L2Descriptor    descriptor = {table[(va << 12) >> 24]};
-
-    switch(L2Descriptor__GetType(descriptor.raw))
-    {
-        case Descriptor_LargePage:
-        {
-            perm = descriptor.largePage.ap >> 1;
-            if (perm)
-            {
-                perm |= (!descriptor.largePage.apx && (descriptor.largePage.ap & 1)) << 1;
-                perm |= (!descriptor.largePage.xn) << 2;
-            }
-            break;
-        }
-        case Descriptor_SmallPage:
-        {
-            perm = descriptor.smallPage.ap >> 1;
-            if (perm)
-            {
-                perm |= (!descriptor.smallPage.apx && (descriptor.smallPage.ap & 1)) << 1;
-                perm |= (!descriptor.smallPage.xn) << 2;
-            }
-            break;
-        }
-        default:
-            break;
-    }
-
-    return perm;
-}
-
-void    KProcessHwInfo__SetMMUTableToRWX(KProcessHwInfo *hwInfo)
-{
-    KObjectMutex    *mutex = KPROCESSHWINFO_GET_PTR(hwInfo, mutex);
-    u32             *table = KPROCESSHWINFO_GET_RVALUE(hwInfo, mmuTableVA);
-
-    KObjectMutex__Acquire(mutex);
-
-    L1MMUTable__RWXForAll(table);
-
-    KObjectMutex__Release(mutex);
-}
-
-u32     KProcessHwInfo__GetPAFromVA(KProcessHwInfo *hwInfo, u32 va)
-{
-    KObjectMutex    *mutex = KPROCESSHWINFO_GET_PTR(hwInfo, mutex);
-    u32             *table = KPROCESSHWINFO_GET_RVALUE(hwInfo, mmuTableVA);
-
-    KObjectMutex__Acquire(mutex);
-
-    u32 pa = L1MMUTable__GetPAFromVA(table, va);
-
-    KObjectMutex__Release(mutex);
-
-    return pa;
-}
-
-u32     KProcessHwInfo__GetAddressUserPerm(KProcessHwInfo *hwInfo, u32 va)
-{
-    KObjectMutex    *mutex = KPROCESSHWINFO_GET_PTR(hwInfo, mutex);
-    u32             *table = KPROCESSHWINFO_GET_RVALUE(hwInfo, mmuTableVA);
-
-    KObjectMutex__Acquire(mutex);
-
-    u32 perm = L1MMUTable__GetAddressUserPerm(table, va);
-
-    KObjectMutex__Release(mutex);
-
-    return perm;
-}
-
-static union
-{
-    u32     raw;
-    struct
-    {
-        u32     xn      : 1;
-        u32     unkn    : 1;
-        u32     cb      : 2;
-        u32     ap      : 2;
-        u32     tex     : 3;
-        u32     apx     : 1;
-        u32     s       : 1;
-        u32     ng      : 1;
-    };
-} g_rwxState;
-
-// This function patch the permissions when memory is mapped in the mmu table (rwx)
-KProcessHwInfo *PatchDescriptorAccessControl(KProcessHwInfo *hwInfo, u32 **outState)
-{
-    KProcess    *process = (KProcess *)((u32)hwInfo - 0x1C);
-    u32 state = **outState;
-    u32 flags =  KPROCESS_GET_RVALUE(process, customFlags);
-
-    if (flags & SignalOnMemLayoutChanges) {
-        svcSignalingEnabled |= 2;
-        *KPROCESS_GET_PTR(process, customFlags) |= MemLayoutChanged;
-    }        
-
-    if (!(flags & ForceRWXPages))
-        return hwInfo;
-
-    g_rwxState.raw = state;
-    g_rwxState.xn = 0;
-    g_rwxState.ap = 3;
-    g_rwxState.apx = 0;
-
-    *outState = &g_rwxState.raw;
-
-    return hwInfo;
-}

k11_extension/source/svc.c

@@ -28,7 +28,6 @@
 #include "synchronization.h"
 #include "svc.h"
 #include "svc/ControlMemory.h"
-#include "svc/CreateThread.h"
 #include "svc/GetHandleInfo.h"
 #include "svc/GetSystemInfo.h"
 #include "svc/GetProcessInfo.h"
@@ -44,11 +43,8 @@
 #include "svc/MapProcessMemoryEx.h"
 #include "svc/UnmapProcessMemoryEx.h"
 #include "svc/ControlService.h"
-#include "svc/ControlProcess.h"
-#include "svc/ExitProcess.h"
 #include "svc/CopyHandle.h"
 #include "svc/TranslateHandle.h"
-#include "svc/ControlMemoryUnsafe.h"
 
 void *officialSVCs[0x7E] = {NULL};
 void *alteredSvcTable[0x100] = {NULL};
@@ -66,10 +62,7 @@ void buildAlteredSvcTable(void)
     memcpy(alteredSvcTable, officialSVCs, 4 * 0x7E);
 
     alteredSvcTable[0x01] = ControlMemoryHookWrapper;
-    alteredSvcTable[0x03] = ExitProcessHookWrapper;
 
-    if (isN3DS)
-        alteredSvcTable[0x08] = CreateThreadHookWrapper;
     alteredSvcTable[0x29] = GetHandleInfoHookWrapper;
     alteredSvcTable[0x2A] = GetSystemInfoHookWrapper;
     alteredSvcTable[0x2B] = GetProcessInfoHookWrapper;
@@ -94,15 +87,13 @@ void buildAlteredSvcTable(void)
     alteredSvcTable[0x93] = invalidateInstructionCacheRange;
     alteredSvcTable[0x94] = invalidateEntireInstructionCache;
 
-    alteredSvcTable[0xA0] = MapProcessMemoryExWrapper;
+    alteredSvcTable[0xA0] = MapProcessMemoryEx;
     alteredSvcTable[0xA1] = UnmapProcessMemoryEx;
     alteredSvcTable[0xA2] = ControlMemoryEx;
-    alteredSvcTable[0xA3] = ControlMemoryUnsafeWrapper;
 
     alteredSvcTable[0xB0] = ControlService;
     alteredSvcTable[0xB1] = CopyHandleWrapper;
     alteredSvcTable[0xB2] = TranslateHandleWrapper;
-    alteredSvcTable[0xB3] = ControlProcess;
 }
 
 void signalSvcEntry(u32 svcId)
@@ -117,18 +108,10 @@ void signalSvcEntry(u32 svcId)
 void signalSvcReturn(u32 svcId)
 {
     KProcess *currentProcess = currentCoreContext->objectContext.currentProcess;
-    u32      flags = KPROCESS_GET_RVALUE(currentProcess, customFlags);
 
     // Since DBGEVENT_SYSCALL_RETURN is non blocking, we'll cheat using EXCEVENT_UNDEFINED_SYSCALL (debug->svcId is fortunately an u16!)
-    if((svcSignalingEnabled & 1) != 0 && (currentProcess) != NULL && svcId != 0xFF && shouldSignalSyscallDebugEvent(currentProcess, svcId))
+    if(debugOfProcess(currentProcess) != NULL && svcId != 0xFF && shouldSignalSyscallDebugEvent(currentProcess, svcId))
         SignalDebugEvent(DBGEVENT_OUTPUT_STRING, 0xFFFFFFFF, svcId);
-
-    if (flags & SignalOnMemLayoutChanges && flags & MemLayoutChanged)
-    {
-        *KPROCESS_GET_PTR(currentProcess, customFlags) = flags & ~MemLayoutChanged;
-        SignalEvent(KPROCESS_GET_RVALUE(currentProcess, onMemoryLayoutChangeEvent));
-        svcSignalingEnabled &= ~2;
-    }
 }
 
 void postprocessSvc(void)

k11_extension/source/svc/ControlMemoryUnsafe.c

@@ -1,84 +0,0 @@
-/*
-*   This file is part of Luma3DS
-*   Copyright (C) 2016-2018 Aurora Wright, TuxSH
-*
-*   This program is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   This program is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-*   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
-*       * Requiring preservation of specified reasonable legal notices or
-*         author attributions in that material or in the Appropriate Legal
-*         Notices displayed by works containing it.
-*       * Prohibiting misrepresentation of the origin of that material,
-*         or requiring that modified versions of such material be marked in
-*         reasonable ways as different from the original version.
-*/
-
-#include "globals.h"
-#include "memory.h"
-#include "svc/ControlMemoryUnsafe.h"
-
-Result  ControlMemoryUnsafe(u32 *out, u32 addr0, u32 size, MemOp op, MemPerm perm)
-{
-    Result          res = 0;
-    KProcess        *currentProcess = currentCoreContext->objectContext.currentProcess;
-    KProcessHwInfo  *hwInfo = hwInfoOfProcess(currentProcess);
-
-    KAutoObject__AddReference((KAutoObject *)currentProcess);
-
-    size = size >> 12 << 12;
-    switch (op & MEMOP_OP_MASK)
-    {
-        case MEMOP_FREE:
-        {
-            res = doControlMemory(hwInfo, addr0, size >> 12, 0, 0, 0, 0, 0);
-            break;
-        }
-        case MEMOP_COMMIT:
-        {
-            u32 pAddr = 0;
-            u32 state = 0xBB05;
-            u32 region = op & MEMOP_REGION_MASK;
-
-            perm = (perm & 7) | 0x18;
-            if (op & MEMOP_LINEAR)
-            {
-                void *kvAddr = kAlloc(fcramDescriptor, size >> 12, 0, region);
-
-                if (!kvAddr)
-                {
-                    res = 0xD86007F3;
-                    break;
-                }
-
-                memset(kvAddr, 0, size >> 2);
-                flushDataCacheRange(kvAddr, size);
-                pAddr = (u32)kvAddr + 0x40000000;
-                state = 0x3907;
-            }
-
-            res  = doControlMemory(hwInfo, addr0, size >> 12, pAddr, state, perm, 0, region);
-            if (res >= 0 && out)
-                *out = addr0;
-            break;
-        }
-
-        default:
-            res = 0xE0E01BEE;
-            break;
-    }
-
-    ((KAutoObject *)currentProcess)->vtable->DecrementReferenceCount((KAutoObject *)currentProcess);
-
-    return res;
-}

k11_extension/source/svc/ControlProcess.c

@@ -1,208 +0,0 @@
-#include "svc/ControlProcess.h"
-#include "memory.h"
-#include "mmu.h"
-#include "synchronization.h"
-
-typedef bool (*ThreadPredicate)(KThread *thread);
-
-// Lock bit has to be different from Rosalina to avoid unintended unlock when using Rosalina menu
-static void rescheduleThread(KThread *thread, bool lock)
-{
-    KRecursiveLock__Lock(criticalSectionLock);
-
-    u32 oldSchedulingMask = thread->schedulingMask;
-    if(lock)
-        thread->schedulingMask |= 0x20;
-    else
-        thread->schedulingMask &= ~0x20;
-
-    KScheduler__AdjustThread(currentCoreContext->objectContext.currentScheduler, thread, oldSchedulingMask);
-
-    KRecursiveLock__Unlock(criticalSectionLock);
-}
-
-static void lockThread(KThread *thread)
-{
-    KThread *syncThread = synchronizationMutex->owner;
-
-    if(syncThread == NULL || syncThread != thread)
-        rescheduleThread(thread, true);
-}
-
-Result  ControlProcess(Handle processHandle, ProcessOp op, u32 varg2, u32 varg3)
-{
-    Result              res = 0;
-    KProcess            *process;
-    KProcessHandleTable *handleTable = handleTableOfProcess(currentCoreContext->objectContext.currentProcess);
-
-    if(processHandle == CUR_PROCESS_HANDLE)
-    {
-        process = currentCoreContext->objectContext.currentProcess;
-        KAutoObject__AddReference((KAutoObject *)process);
-    }
-    else
-        process = KProcessHandleTable__ToKProcess(handleTable, processHandle);
-
-    if(process == NULL)
-        return 0xD8E007F7; // invalid handle
-
-    switch (op)
-    {
-        case PROCESSOP_GET_ALL_HANDLES:
-        {
-            KProcessHandleTable *table = handleTableOfProcess(process);
-            u32                 *originalHandleList = (u32 *)varg2;
-            u32                 count = 0;
-            u32                 searchForToken = varg3;
-            HandleDescriptor    *handleDesc = table->handleTable == NULL ? table->internalTable : table->handleTable;
-
-            for (u32 idx = 0; idx < (u32)table->maxHandleCount; ++idx, ++handleDesc)
-            {
-                if (handleDesc->pointer == NULL)
-                    continue;
-
-                if (searchForToken)
-                {
-                    KClassToken token;
-
-                    handleDesc->pointer->vtable->GetClassToken(&token, handleDesc->pointer);
-                    if (searchForToken != token.flags)
-                        continue;
-                }
-
-                *originalHandleList++ = idx | ((handleDesc->info << 16) >> 1);
-                ++count;
-            }
-            res = count;
-            break;
-        }
-
-        case PROCESSOP_SET_MMU_TO_RWX:
-        {
-            KProcessHwInfo  *hwInfo = hwInfoOfProcess(process);
-
-            *KPROCESS_GET_PTR(process, customFlags) |= ForceRWXPages;
-            KProcessHwInfo__SetMMUTableToRWX(hwInfo);
-            break;
-        }
-        case PROCESSOP_GET_ON_MEMORY_CHANGE_EVENT:
-        {
-            // Only accept current process for this command
-            if (process != currentCoreContext->objectContext.currentProcess)
-            {
-                res = 0xD8E007F7; // invalid handle
-                break;
-            }
-
-            Handle  *onMemoryLayoutChangeEvent = KPROCESS_GET_PTR(process, onMemoryLayoutChangeEvent);
-
-            if (*onMemoryLayoutChangeEvent == 0)
-                res = CreateEvent(onMemoryLayoutChangeEvent, RESET_ONESHOT);
-
-            if (res >= 0)
-            {
-                *KPROCESS_GET_PTR(process, customFlags) |= SignalOnMemLayoutChanges;
-                KAutoObject * event = KProcessHandleTable__ToKAutoObject(handleTable, *onMemoryLayoutChangeEvent);
-
-                createHandleForThisProcess((Handle *)varg2, event);
-                ((KAutoObject *)event)->vtable->DecrementReferenceCount((KAutoObject *)event);
-            }
-
-            break;
-        }
-
-        case PROCESSOP_SIGNAL_ON_EXIT:
-        {
-            *KPROCESS_GET_PTR(process, customFlags) |= SignalOnExit;
-            break;
-        }
-        case PROCESSOP_GET_PA_FROM_VA:
-        {
-            KProcessHwInfo  *hwInfo = hwInfoOfProcess(process);
-
-            u32 pa = KProcessHwInfo__GetPAFromVA(hwInfo, varg3);
-            *(u32 *)varg2 = pa;
-
-            if (pa == 0)
-                res = 0xE0E01BF5; ///< Invalid address
-
-            break;
-        }
-        case PROCESSOP_SCHEDULE_THREADS:
-        {
-            ThreadPredicate threadPredicate = (ThreadPredicate)varg3;
-
-            KRecursiveLock__Lock(criticalSectionLock);
-
-            if (varg2 == 0) // Unlock
-            {
-                for (KLinkedListNode *node = threadList->list.nodes.first; node != (KLinkedListNode *)&threadList->list.nodes; node = node->next)
-                {
-                    KThread *thread = (KThread *)node->key;
-
-                    if ((thread->schedulingMask & 0xF) == 2) // thread is terminating
-                        continue;
-
-                    if (thread->ownerProcess == process && (thread->schedulingMask & 0x20)
-                       && (threadPredicate == NULL || threadPredicate(thread)))
-                        rescheduleThread(thread, false);
-                }
-            }
-            else // Lock
-            {
-                bool currentThreadsFound = false;
-
-                for(KLinkedListNode *node = threadList->list.nodes.first; node != (KLinkedListNode *)&threadList->list.nodes; node = node->next)
-                {
-                    KThread *thread = (KThread *)node->key;
-
-                    if(thread->ownerProcess != process
-                       || (threadPredicate != NULL && !threadPredicate(thread)))
-                        continue;
-
-                    if(thread == coreCtxs[thread->coreId].objectContext.currentThread)
-                        currentThreadsFound = true;
-                    else
-                        lockThread(thread);
-                }
-
-                if(currentThreadsFound)
-                {
-                    for(KLinkedListNode *node = threadList->list.nodes.first; node != (KLinkedListNode *)&threadList->list.nodes; node = node->next)
-                    {
-                        KThread *thread = (KThread *)node->key;
-
-                        if(thread->ownerProcess != process
-                           || (threadPredicate != NULL && !threadPredicate(thread)))
-                            continue;
-
-                        if(!(thread->schedulingMask & 0x20))
-                        {
-                            lockThread(thread);
-                            KRecursiveLock__Lock(criticalSectionLock);
-                            if(thread->coreId != getCurrentCoreID())
-                            {
-                                u32 cpsr = __get_cpsr();
-                                __disable_irq();
-                                coreCtxs[thread->coreId].objectContext.currentScheduler->triggerCrossCoreInterrupt = true;
-                                currentCoreContext->objectContext.currentScheduler->triggerCrossCoreInterrupt = true;
-                                __set_cpsr_cx(cpsr);
-                            }
-                            KRecursiveLock__Unlock(criticalSectionLock);
-                        }
-                    }
-                    KScheduler__TriggerCrossCoreInterrupt(currentCoreContext->objectContext.currentScheduler);
-                }
-            }
-
-            KRecursiveLock__Unlock(criticalSectionLock);
-            break;
-        }
-        default:
-            res = 0xF8C007F4;
-    }
-
-    ((KAutoObject *)process)->vtable->DecrementReferenceCount((KAutoObject *)process);
-
-    return res;
-}

k11_extension/source/svc/CreateThread.c

@@ -1,37 +0,0 @@
-/*
-*   This file is part of Luma3DS
-*   Copyright (C) 2016-2023 Aurora Wright, TuxSH
-*
-*   This program is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   This program is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-*   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
-*       * Requiring preservation of specified reasonable legal notices or
-*         author attributions in that material or in the Appropriate Legal
-*         Notices displayed by works containing it.
-*       * Prohibiting misrepresentation of the origin of that material,
-*         or requiring that modified versions of such material be marked in
-*         reasonable ways as different from the original version.
-*/
-
-#include "svc/CreateThread.h"
-
-Result CreateThreadHook(Handle *outThreadHandle, u32 ep, u32 arg, u32 stackTop, s32 priority, s32 processorId)
-{
-    u32 flags = flagsOfProcess(currentCoreContext->objectContext.currentProcess);
-    if (isN3DS && CONFIG(REDIRECTAPPTHREADS) && !disableThreadRedirection && processorId == 1 && (flags & 0xF00) == 0x100)
-        processorId = 2;
-
-    return CreateThread(outThreadHandle, ep, arg, stackTop, priority, processorId);
-}
-

k11_extension/source/svc/ExitProcess.c

@@ -1,32 +0,0 @@
-#include "svc/ExitProcess.h"
-
-void ExitProcessHook(void) {
-    KProcess *currentProcess = currentCoreContext->objectContext.currentProcess;
-    u32      flags = KPROCESS_GET_RVALUE(currentProcess, customFlags);
-
-    if (flags & SignalOnExit)
-    {
-        // Signal that the process is about to be terminated
-        if (PLG_GetStatus() == PLG_CFG_RUNNING)
-            PLG_SignalEvent(PLG_CFG_EXIT_EVENT);
-
-        // Unlock all threads that might be locked
-        {
-            KRecursiveLock__Lock(criticalSectionLock);
-
-            for (KLinkedListNode *node = threadList->list.nodes.first;
-                node != (KLinkedListNode *)&threadList->list.nodes;
-                node = node->next)
-            {
-                KThread *thread = (KThread *)node->key;
-
-                if (thread->ownerProcess == currentProcess && thread->schedulingMask & 0x20)
-                    thread->schedulingMask &= ~0x20;
-            }
-
-            KRecursiveLock__Unlock(criticalSectionLock);
-        }
-    }
-
-    return ((void(*)())officialSVCs[0x3])();
-}

k11_extension/source/svc/GetHandleInfo.c

@@ -29,14 +29,11 @@
 
 Result GetHandleInfoHook(s64 *out, Handle handle, u32 type)
 {
-    Result res = 0;
+    if(type == 0x10000) // KDebug and KProcess: get context ID
-
-    if(type >= 0x10000)
     {
         KProcessHwInfo *hwInfo;
         KProcessHandleTable *handleTable = handleTableOfProcess(currentCoreContext->objectContext.currentProcess);
         KAutoObject *obj;
-
         if(handle == CUR_PROCESS_HANDLE)
         {
             obj = (KAutoObject *)(currentCoreContext->objectContext.currentProcess);
@@ -48,10 +45,6 @@ Result GetHandleInfoHook(s64 *out, Handle handle, u32 type)
         if(obj == NULL)
             return 0xD8E007F7;
 
-        switch (type)
-        {
-            case 0x10000: ///< Get ctx id (should probably move it to GetProcessInfo)
-            {
         if(strcmp(classNameOfAutoObject(obj), "KDebug") == 0)
             hwInfo = hwInfoOfProcess(((KDebug *)obj)->owner);
         else if(strcmp(classNameOfAutoObject(obj), "KProcess") == 0)
@@ -60,70 +53,10 @@ Result GetHandleInfoHook(s64 *out, Handle handle, u32 type)
             hwInfo = NULL;
 
         *out = hwInfo != NULL ? KPROCESSHWINFO_GET_RVALUE(hwInfo, contextId) : -1;
-                break;
-            }
-            case 0x10001: ///< Get referenced object flags (token)
-            {
-                KClassToken token;
-
-                obj->vtable->GetClassToken(&token, obj);
-                *out = token.flags;
-                break;
-            }
-            case 0x10002: ///< Get object owner
-            {
-                Handle          hOut;
-                KClassToken     token;
-                KProcess *      owner = NULL;
-
-                obj->vtable->GetClassToken(&token, obj);
-                switch(token.flags)
-                {
-                    case TOKEN_KEVENT:
-                        owner = ((KEvent *)obj)->owner;
-                        break;
-                    case TOKEN_KSEMAPHORE:
-                        owner = ((KSemaphore *)obj)->owner;
-                        break;
-                    case TOKEN_KTIMER:
-                        owner = ((KTimer *)obj)->owner;
-                        break;
-                    case TOKEN_KMUTEX:
-                        owner = ((KMutex *)obj)->owner;
-                        break;
-                    case TOKEN_KDEBUG:
-                        owner = ((KDebug *)obj)->owner;
-                        break;
-                    case TOKEN_KTHREAD:
-                        owner = ((KThread *)obj)->ownerProcess;
-                        break;
-                    case TOKEN_KADDRESSARBITER:
-                        owner = ((KAddressArbiter *)obj)->owner;
-                        break;
-                    case TOKEN_KSHAREDMEMORY:
-                        owner = ((KSharedMemory *)obj)->owner;
-                        break;
-                    default:
-                        break;
-                }
-
-                if (owner == NULL)
-                    res =  0xD8E007F7;
-
-                res = createHandleForThisProcess(&hOut, (KAutoObject *)owner);
-                *out = hOut;
-
-                break;
-            }
-
-            default:
-                res = 0xF8C007F4;
-                break;
-        }
 
         obj->vtable->DecrementReferenceCount(obj);
-        return res;
+        return 0;
     }
-    
+    else
         return GetHandleInfo(out, handle, type);
 }

k11_extension/source/svc/GetProcessInfo.c

@@ -79,14 +79,6 @@ Result GetProcessInfoHook(s64 *out, Handle processHandle, u32 type)
                 *out = ttb & ~((1 << (14 - TTBCR)) - 1);
                 break;
             }
-            case 0x10009:
-            {
-                KProcessHwInfo *hwInfo = hwInfoOfProcess(process);
-                u32 mmusize = KPROCESSHWINFO_GET_RVALUE(hwInfo, mmuTableSize);
-                u32 mmupa = (u32)PA_FROM_VA_PTR(KPROCESSHWINFO_GET_RVALUE(hwInfo, mmuTableVA));
-                *out = (s64)(mmusize | ((s64)mmupa << 32));
-                break;
-            }
             default:
                 res = 0xD8E007ED; // invalid enum value
                 break;

k11_extension/source/svc/GetSystemInfo.c

@@ -37,17 +37,8 @@ Result GetSystemInfoHook(s64 *out, s32 type, s32 param)
     {
         case 0x10000:
         {
-            if (param >= 0x400 && param < 0x500) {
+            switch(param)
-                *out = 0;
-                s32 offset = param - 0x400;
-                s32 toCopy = (s32)sizeof(cfwInfo.launchedPath) - offset;
-                if (toCopy > 8) toCopy = 8;
-                memcpy(out, (u8*)cfwInfo.launchedPath + offset, (toCopy > 0) ? toCopy : 0);
-            }
-            else switch(param)
             {
-                // Please do not use these, except 0, 1, and 0x200
-                // Other types may get removed or reordered without notice
                 case 0:
                     *out = SYSTEM_VERSION(cfwInfo.versionMajor, cfwInfo.versionMinor, cfwInfo.versionBuild);
                     break;
@@ -69,18 +60,7 @@ Result GetSystemInfoHook(s64 *out, s32 type, s32 param)
                 case 6:
                     *out = cfwInfo.splashDurationMsec;
                     break;
-                case 7:
+
-                    *out = (s64)cfwInfo.volumeSliderOverride;
-                    break;
-                case 0x10:
-                    *out = (s64)cfwInfo.autobootTwlTitleId;
-                    break;
-                case 0x11:
-                    *out = cfwInfo.autobootCtrAppmemtype;
-                    break;
-                case 0x80:
-                    *out = fcramDescriptor->appRegion.regionSizeInBytes;
-                    break;
                 case 0x100:
                     *out = (s64)cfwInfo.hbldr3dsxTitleId;
                     break;
@@ -88,50 +68,12 @@ Result GetSystemInfoHook(s64 *out, s32 type, s32 param)
                     *out = cfwInfo.rosalinaMenuCombo;
                     break;
                 case 0x102:
-                    *out = cfwInfo.topScreenFilter.cct;
+                    *out = cfwInfo.screenFiltersCct;
                     break;
                 case 0x103:
                     *out = (s64)cfwInfo.ntpTzOffetMinutes;
                     break;
-                case 0x104:
+
-                    *out = cfwInfo.topScreenFilter.gammaEnc;
-                    break;
-                case 0x105:
-                    *out = cfwInfo.topScreenFilter.contrastEnc;
-                    break;
-                case 0x106:
-                    *out = cfwInfo.topScreenFilter.brightnessEnc;
-                    break;
-                case 0x107:
-                    *out = (s64)cfwInfo.topScreenFilter.invert;
-                    break;
-                case 0x108:
-                    *out = cfwInfo.bottomScreenFilter.cct;
-                    break;
-                case 0x109:
-                    *out = cfwInfo.bottomScreenFilter.gammaEnc;
-                    break;
-                case 0x10A:
-                    *out = cfwInfo.bottomScreenFilter.contrastEnc;
-                    break;
-                case 0x10B:
-                    *out = cfwInfo.bottomScreenFilter.brightnessEnc;
-                    break;
-                case 0x10C:
-                    *out = (s64)cfwInfo.bottomScreenFilter.invert;
-                    break;
-                case 0x10D:
-                    *out = (s64)cfwInfo.topScreenFilter.colorCurveCorrection;
-                    break;
-                case 0x10E:
-                    *out = (s64)cfwInfo.bottomScreenFilter.colorCurveCorrection;
-                    break;
-                case 0x180:
-                    *out = cfwInfo.pluginLoaderFlags;
-                    break;
-                case 0x181:
-                    *out = disableThreadRedirection;
-                    break;
                 case 0x200: // isRelease
                     *out = cfwInfo.flags & 1;
                     break;

k11_extension/source/svc/KernelSetState.c

@@ -35,9 +35,8 @@
 static u32 nbEnabled = 0;
 static u32 maskedPids[MAX_DEBUG];
 static u32 masks[MAX_DEBUG][8] = {0};
-static bool forceBetterSoc = false;
 
-u8 svcSignalingEnabled = 0;
+bool svcSignalingEnabled = false;
 
 bool shouldSignalSyscallDebugEvent(KProcess *process, u8 svcId)
 {
@@ -68,7 +67,7 @@ Result SetSyscallDebugEventMask(u32 pid, bool enable, const u32 *mask)
     {
         maskedPids[nbEnabled] = pid;
         memcpy(&masks[nbEnabled++], tmpMask, 32);
-        svcSignalingEnabled |= 1;
+        svcSignalingEnabled = true;
     }
     else
     {
@@ -88,7 +87,7 @@ Result SetSyscallDebugEventMask(u32 pid, bool enable, const u32 *mask)
         }
         maskedPids[--nbEnabled] = 0;
         memset(&masks[nbEnabled], 0, 32);
-        svcSignalingEnabled &= ~1;
+        svcSignalingEnabled = false;
     }
 
     KRecursiveLock__Unlock(&syscallDebugEventMaskLock);
@@ -102,16 +101,6 @@ Result KernelSetStateHook(u32 type, u32 varg1, u32 varg2, u32 varg3)
 
     switch(type)
     {
-        case 0xA: // Type 10 (ConfigureNew3DSCPU)
-        {
-            if (varg1 & (1 << 2)) // Lock faster speed
-                forceBetterSoc = true;
-            else if (varg1 & (1 << 3)) // Unlock faster speed
-                forceBetterSoc = false;
-            else
-                res = KernelSetState(type, forceBetterSoc ? 3 : varg1, varg2, varg3);
-            break;
-        }
         case 0x10000:
         {
             do
@@ -201,20 +190,6 @@ Result KernelSetStateHook(u32 type, u32 varg1, u32 varg2, u32 varg3)
             KRecursiveLock__Unlock(&dbgParamsLock);
             break;
         }
-        case 0x10007:
-        {
-            if (signalPluginEvent == NULL && varg1)
-            {
-                KProcessHandleTable *table = handleTableOfProcess(currentCoreContext->objectContext.currentProcess);
-                signalPluginEvent = (KEvent *)KProcessHandleTable__ToKAutoObject(table, varg1);
-            }
-            break;
-        }
-        case 0x10080:
-        {
-            disableThreadRedirection = varg1 != 0;
-            break;
-        }
         default:
         {
             res = KernelSetState(type, varg1, varg2, varg3);

k11_extension/source/svc/MapProcessMemoryEx.c

@@ -26,61 +26,19 @@
 
 #include "svc/MapProcessMemoryEx.h"
 
-Result  MapProcessMemoryEx(Handle dstProcessHandle, u32 vaDst, Handle srcProcessHandle, u32 vaSrc, u32 size, MapExFlags flags)
+Result MapProcessMemoryEx(Handle processHandle, void *dst, void *src, u32 size)
 {
-    Result          res = 0;
-    u32             sizeInPage = size >> 12;
-    KLinkedList     list;
-    KProcess        *srcProcess;
-    KProcess        *dstProcess;
     KProcessHandleTable *handleTable = handleTableOfProcess(currentCoreContext->objectContext.currentProcess);
+    KProcessHwInfo *currentHwInfo = hwInfoOfProcess(currentCoreContext->objectContext.currentProcess);
+    KProcess *process = KProcessHandleTable__ToKProcess(handleTable, processHandle);
 
-    if (dstProcessHandle == CUR_PROCESS_HANDLE)
+    if(process == NULL)
-    {
-        dstProcess = currentCoreContext->objectContext.currentProcess;
-        KAutoObject__AddReference((KAutoObject *)dstProcess);
-    }
-    else
-        dstProcess = KProcessHandleTable__ToKProcess(handleTable, dstProcessHandle);
-
-    if (dstProcess == NULL)
         return 0xD8E007F7;
 
-    if (srcProcessHandle == CUR_PROCESS_HANDLE)
+    Result res = KProcessHwInfo__MapProcessMemory(currentHwInfo, hwInfoOfProcess(process), dst, src, size >> 12);
-    {
-        srcProcess = currentCoreContext->objectContext.currentProcess;
-        KAutoObject__AddReference((KAutoObject *)srcProcess);
-    }
-    else
-        srcProcess = KProcessHandleTable__ToKProcess(handleTable, srcProcessHandle);
 
-    if (srcProcess == NULL)
+    KAutoObject *obj = (KAutoObject *)process;
-    {
+    obj->vtable->DecrementReferenceCount(obj);
-        res =  0xD8E007F7;
-        goto exit1;
-    }
-
-    KLinkedList__Initialize(&list);
-
-    res = KProcessHwInfo__GetListOfKBlockInfoForVA(hwInfoOfProcess(srcProcess), &list, vaSrc, sizeInPage);
-
-    if (res >= 0)
-    {
-        // Check if the destination address is free and large enough
-        res = KProcessHwInfo__CheckVaState(hwInfoOfProcess(dstProcess), vaDst, size, 0, 0);
-        if (res == 0)
-            res = KProcessHwInfo__MapListOfKBlockInfo(hwInfoOfProcess(dstProcess), vaDst, &list, (flags & MAPEXFLAGS_PRIVATE) ? 0xBB05 : 0x5806, MEMPERM_RW | 0x18, 0);
-    }
-
-    KLinkedList_KBlockInfo__Clear(&list);
-
-    ((KAutoObject *)srcProcess)->vtable->DecrementReferenceCount((KAutoObject *)srcProcess);
-
-exit1:
-    ((KAutoObject *)dstProcess)->vtable->DecrementReferenceCount((KAutoObject *)dstProcess);
-
-    invalidateEntireInstructionCache();
-    flushEntireDataCache();
 
     return res;
 }

k11_extension/source/svc/SendSyncRequest.c

@@ -162,43 +162,6 @@ Result SendSyncRequestHook(Handle handle)
                 break;
             }
 
-            case 0x00C0080: // srv: publishToSubscriber
-            {
-                SessionInfo *info = SessionInfo_Lookup(clientSession->parentSession);
-
-                if (info != NULL && strcmp(info->name, "srv:") == 0 && cmdbuf[1] == 0x1002)
-                {
-                    // Wake up application thread
-                    PLG__WakeAppThread();
-                    cmdbuf[0] = 0xC0040;
-                    cmdbuf[1] = 0;
-                    skip = true;
-                }
-                break;
-            }
-
-            case 0x00D0080: // APT:ReceiveParameter
-            {
-                SessionInfo *info = SessionInfo_Lookup(clientSession->parentSession);
-
-                if (info != NULL && strncmp(info->name, "APT:", 4) == 0 && cmdbuf[1] == 0x300)
-                {
-                    res = SendSyncRequest(handle);
-                    skip = true;
-
-                    if (res >= 0)
-                    {
-                        u32 plgStatus = PLG_GetStatus();
-                        u32 command = cmdbuf[3];
-
-                        if ((plgStatus == PLG_CFG_RUNNING && command == 3) // COMMAND_RESPONSE
-                        || (plgStatus == PLG_CFG_INHOME && (command >= 10 || command <= 12)))  // COMMAND_WAKEUP_BY_EXIT || COMMAND_WAKEUP_BY_PAUSE
-                            PLG_SignalEvent(PLG_CFG_HOME_EVENT);
-                    }
-                }
-                break;
-            }
-
             case 0x4010082:
             {
                 SessionInfo *info = SessionInfo_Lookup(clientSession->parentSession);

k11_extension/source/svc/SetGpuProt.c

@@ -26,7 +26,7 @@
 
 #include "svc/SetGpuProt.h"
 
-Result SetGpuProt(bool prot CTR_UNUSED)
+Result SetGpuProt(bool prot UNUSED)
 {
     return 0;
 }

k11_extension/source/svc/UnmapProcessMemoryEx.c

@@ -29,30 +29,12 @@
 
 Result UnmapProcessMemoryEx(Handle processHandle, void *dst, u32 size)
 {
-    Result          res = 0;
-    KProcess        *process;
-    KProcessHwInfo  *hwInfo;
-    KProcessHandleTable *handleTable = handleTableOfProcess(currentCoreContext->objectContext.currentProcess);
-    
     if(GET_VERSION_MINOR(kernelVersion) < 37) // < 6.x
         return UnmapProcessMemory(processHandle, dst, size); // equivalent when size <= 64MB
 
-    if (processHandle == CUR_PROCESS_HANDLE)
+    KProcessHwInfo *currentHwInfo = hwInfoOfProcess(currentCoreContext->objectContext.currentProcess);
-    {
-        process = currentCoreContext->objectContext.currentProcess;
-        KAutoObject__AddReference((KAutoObject *)process);
-    }
-    else
-        process = KProcessHandleTable__ToKProcess(handleTable, processHandle);
 
-    if (process == NULL)
+    Result res = KProcessHwInfo__UnmapProcessMemory(currentHwInfo, dst, size >> 12);
-        return 0xD8E007F7;
-
-    hwInfo = hwInfoOfProcess(process);
-
-    res = KProcessHwInfo__UnmapProcessMemory(hwInfo, dst, size >> 12);
-
-    ((KAutoObject *)process)->vtable->DecrementReferenceCount((KAutoObject *)process);
 
     invalidateEntireInstructionCache();
     flushEntireDataCache();

k11_extension/source/svc/wrappers.s

@@ -69,14 +69,6 @@ ControlMemoryHookWrapper:
     add sp, #12
     pop {pc}
 
-
-.global ExitProcessHookWrapper
-.type   ExitProcessHookWrapper, %function
-ExitProcessHookWrapper:
-    push {lr}
-    bl ExitProcessHook
-    pop {pc}
-
 .global ControlMemoryEx
 .type   ControlMemoryEx, %function
 ControlMemoryEx:
@@ -92,38 +84,3 @@ ControlMemoryEx:
     ldr r1, [sp, #12]
     add sp, #20
     pop {pc}
-
-.global CreateThreadHookWrapper
-.type   CreateThreadHookWrapper, %function
-CreateThreadHookWrapper:
-    push {lr}
-    sub sp, #12
-    str r4, [sp, #4]
-    str r0, [sp]
-    add r0, sp, #8
-    bl CreateThreadHook
-    ldr r1, [sp, #8]
-    add sp, sp, #12
-    pop {pc}
-
-.global ControlMemoryUnsafeWrapper
-.type   ControlMemoryUnsafeWrapper, %function
-ControlMemoryUnsafeWrapper:
-    push {lr}
-    str r4, [sp, #-4]!
-    bl ControlMemoryUnsafe
-    add sp, #4
-    pop {pc}
-
-.global MapProcessMemoryExWrapper
-.type   MapProcessMemoryExWrapper, %function
-MapProcessMemoryExWrapper:
-    push {r5, lr} @ We need to save r5 because the old implementation doesn't save it
-    cmp r0, #0xFFFFFFF2 @ Check magic value, for backwards compatibility
-    moveq r0, r6 @ If value present, flags present in r5 and dst process in r6, so move dst process back to r0
-    movne r5, #0 @ If value not present, clear the flags as its the old version
-    str r5, [sp, #-4]!
-    str r4, [sp, #-4]!
-    bl MapProcessMemoryEx
-    add sp, #8
-    pop {r5, pc}

k11_extension/source/utils.s

@@ -96,36 +96,6 @@ KObjectMutex__Release:
     blx r12
     bx lr
 
-.global KProcessHwInfo__MapL1Section_Hook
-.type   KProcessHwInfo__MapL1Section_Hook, %function
-KProcessHwInfo__MapL1Section_Hook:
-    @r0 => hwInfo
-    @sp + 0x34 => our ptr to state
-    add     r1, sp, #0x34
-    str     lr, [sp, #-4]!
-    bl      PatchDescriptorAccessControl
-    ldr     lr, [sp], #4
-    ldmfd   sp, {r0-r4}
-    sub     sp, sp, #0x14
-    add     r4, sp, #0x48
-    mov     r11, #0
-    mov     pc, lr
-
-.global KProcessHwInfo__MapL2Section_Hook
-.type   KProcessHwInfo__MapL2Section_Hook, %function
-KProcessHwInfo__MapL2Section_Hook:
-    @r0 => hwInfo
-    @sp + 0x34 => our ptr to state
-    add     r1, sp, #0x34
-    str     lr, [sp, #-4]!
-    bl      PatchDescriptorAccessControl
-    ldr     lr, [sp], #4
-    ldmfd   sp, {r0-r4}
-    sub     sp, sp, #0x4C
-    mov     r4, r1
-    mov     r6, r2
-    mov     pc, lr
-
 .global safecpy
 .type   safecpy, %function
 safecpy:

sysmodules/Makefile

@@ -1,10 +1,4 @@
-ifeq ($(BUILD_FOR_EXPLOIT_DEV),1)
-	# Keep Loader so that we can execute 3DSX
-	SUBFOLDERS := loader
-else
 SUBFOLDERS	:=	loader sm pm pxi rosalina
-endif
-
 CXIS		:=	$(foreach dir, $(SUBFOLDERS), $(dir)/$(dir).cxi)
 
 .PHONY:	all clean $(SUBFOLDERS)

sysmodules/loader/Makefile

@@ -9,9 +9,6 @@ endif
 TOPDIR ?= $(CURDIR)
 include $(DEVKITARM)/3ds_rules
 
-# Default 3DSX TitleID for hb:ldr (note: also defined in top-level Makefile)
-export HBLDR_DEFAULT_3DSX_TID ?= 000400000D921E00
-
 #---------------------------------------------------------------------------------
 # TARGET is the name of the output
 # BUILD is the directory where object files & intermediate files will be placed
@@ -29,33 +26,11 @@ INCLUDES	:=	include
 # options for code generation
 #---------------------------------------------------------------------------------
 ARCH	:=	-march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft
+DEFINES :=	-D__3DS__
 
-ifeq ($(BUILD_FOR_EXPLOIT_DEV),1)
+COMMON_FLAGS = -g -Wall -Wextra -Werror -O2 -mword-relocations \
-	DEFINES :=	-D__3DS__ -DHBLDR_DEFAULT_3DSX_TID="0x$(HBLDR_DEFAULT_3DSX_TID)ULL" -DBUILD_FOR_EXPLOIT_DEV=1
+			-fomit-frame-pointer -ffunction-sections -fdata-sections \
-else
+			$(ARCH) $(DEFINES) $(INCLUDE)
-	DEFINES :=	-D__3DS__ -DHBLDR_DEFAULT_3DSX_TID="0x$(HBLDR_DEFAULT_3DSX_TID)ULL"
-endif
-
-ifeq ($(BUILD_FOR_GDB),1)
-	OPTFLAGS := -O0
-	LIBS := -lctrud
-else
-	OPTFLAGS := -O2 -fomit-frame-pointer
-	LIBS := -lctru
-endif
-
-COMMON_FLAGS =\
-		-g \
-		-Wall \
-		-Wextra \
-		-Werror \
-		-mword-relocations \
-		-ffunction-sections \
-		-fdata-sections \
-		$(OPTFLAGS) \
-		$(ARCH) \
-		$(DEFINES) \
-		$(INCLUDE)
 
 CFLAGS	:=	-std=gnu11 $(COMMON_FLAGS)
 

sysmodules/loader/loader.rsf

@@ -25,7 +25,7 @@ AccessControlInfo:
 
   DisableDebug                  : true
   EnableForceDebug              : false
-  CanWriteSharedPage            : true
+  CanWriteSharedPage            : false
   CanUsePrivilegedPriority      : false
   CanUseNonAlphabetAndNumber    : false
   PermitMainFunctionArgument    : false

sysmodules/loader/source/bps_patcher.cpp

@@ -246,26 +246,12 @@ private:
 };
 
 static inline bool ApplyCodeBpsPatch(u64 prog_id, u8 *code, u32 size)
-{
-    bool isSysmodule = (prog_id >> 32) == 0x00040130;
-    util::File patch_file;
-
-    if (isSysmodule)
-    {
-        char bps_path[] = "/luma/sysmodules/0000000000000000.bps";
-        prog_id &= ~0xF0000000ull; // clear N3DS bit
-        progIdToStr(bps_path + 32, prog_id);
-        if(!patch_file.Open(bps_path, FS_OPEN_READ))
-            return true;
-    }
-    else
 {
     char bps_path[] = "/luma/titles/0000000000000000/code.bps";
     progIdToStr(bps_path + 28, prog_id);
+    util::File patch_file;
     if(!patch_file.Open(bps_path, FS_OPEN_READ))
         return true;
-    }
-
     const u32 patch_size = u32(patch_file.GetSize().value_or(0));
 
     // Temporarily use APPLICATION memory to store the source and patch data.

sysmodules/loader/source/hbldr.c

@@ -1,418 +1,97 @@
-/*
-*   This file is part of Luma3DS
-*   Copyright (C) 2016-2020, 2022 Aurora Wright, TuxSH, fincs
-*
-*   This program is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   This program is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-*   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
-*       * Requiring preservation of specified reasonable legal notices or
-*         author attributions in that material or in the Appropriate Legal
-*         Notices displayed by works containing it.
-*       * Prohibiting misrepresentation of the origin of that material,
-*         or requiring that modified versions of such material be marked in
-*         reasonable ways as different from the original version.
-*/
-
 #include <3ds.h>
 #include <string.h>
-#include <assert.h>
-#include "paslr.h"
-#include "util.h"
 #include "hbldr.h"
-#include "3dsx.h"
 
-extern bool isN3DS;
+static u32 hbldrRefcount = 0;
+static Handle hbldrHandle = 0;
 
-// Note: just switch to [[attribute]] once we use clangd and cmake
+Result hbldrInit(void)
-// vscode-cpptools has (or had?) some issues with C23 support
-#if __GNUC__ >= 15
-// Required by GCC 15+ but ignored (with warning) before
-__attribute__((nonstring))
-#endif
-static const char serviceList[34][8] =
 {
-    "APT:U",
-    "ac:u",
-    "am:net",
-    "boss:P",
-    "cam:u",
-    "cfg:nor",
-    "cfg:u",
-    "csnd:SND",
-    "dsp::DSP",
-    "fs:USER",
-    "gsp::Lcd",
-    "gsp::Gpu",
-    "hid:USER",
-    "http:C",
-    "ir:USER",
-    "ir:rst",
-    "ir:u",
-    "ldr:ro",
-    "mic:u",
-    "ndm:u",
-    "news:s",
-    "nim:s",
-    "ns:s",
-    "nwm::UDS",
-    "nwm::EXT",
-    "ptm:u",
-    "ptm:sysm",
-    "pxi:dev",
-    "qtm:u",
-    "soc:U",
-    "ssl:C",
-    "y2r:u",
-
-    // Discarded below 9.6:
-    "nfc:u",
-    "mvd:STD",
-};
-
-// N3DS-only titles are denoted as -x
-// PM (official and reimpl) doesn't actually support recursive dependency
-// loading, and some sysmodules don't even list all their dependencies, so
-// we're flattening the dependency map here and listing all the sysmodules in
-// an optimal boot order.
-static const s16 dependencyListNativeFirmUids[] =
-{
-    0x1B,   // gpio
-    0x1E,   // i2c
-    0x21,   // pdn
-    0x23,   // spi
-
-    0x1F,   // mcu
-    0x31,   // ps
-    0x17,   // cfg
-
-    0x22,   // ptm
-    0x80,   // ns
-
-    // The modules above were all previously launched
-    // when launching NS.
-
-    0x18,   // codec (implicit dep for hid)
-    0x1D,   // hid
-    0x27,   // csnd (for camera)
-    0x16,   // camera
-    -0x42,  // qtm
-    0x1C,   // gsp
-
-    0x1A,   // dsp
-    0x20,   // mic
-    0x33,   // ir
-
-    0x2D,   // nwm
-    0x2E,   // socket
-    0x2F,   // ssl
-    0x29,   // http
-    0x24,   // ac
-
-    0x32,   // friends
-
-    0x15,   // am
-
-    0x26,   // cecd
-    0x34,   // boss
-    0x2C,   // nim
-    0x2B,   // ndm
-    0x35,   // news
-
-    -0x41,  // mvd
-    -0x40,  // nfc
-
-    0x38,   // act
-    0x37,   // ro
-    0x28,   // dlp
-    0x2A,   // mp
-};
-
-static const s16 dependencyListSafeFirmUids[] =
-{
-    0x1B,   // gpio
-    0x1E,   // i2c
-    0x21,   // pdn
-    0x23,   // spi
-
-    0x1F,   // mcu
-    0x31,   // ps
-    0x17,   // cfg
-
-    0x22,   // ptm
-    0x80,   // ns
-
-    // The modules above were all previously launched
-    // when launching NS.
-
-    0x18,   // codec (implicit dep for hid)
-    0x1D,   // hid
-    0x27,   // csnd
-    0x1C,   // gsp
-
-    0x1A,   // dsp
-    0x33,   // ir
-
-    0x2D,   // nwm
-    0x2E,   // socket
-    0x2F,   // ssl
-    0x29,   // http
-    0x24,   // ac
-
-    0x32,   // friends
-
-    0x15,   // am
-};
-
-static const u32 kernelCaps[] =
-{
-    0xFC00022C, // Kernel release version 8.0 is necessary for using the new linear mapping. Modified below.
-
-    // Normal applications only have access to 0x1FF50000-0x1FF58000, 0x1FF70000-0x1FF78000 (both as IO),
-    // however we can load unsigned DSP firmware binaries.
-    0xFF81FF00, // RW static range mapping: 0x1FF00000 (DSP RAM, start)
-    0xFF81FF80, // RW static range mapping: 0x1FF80000 (DSP RAM, end)
-
-    0xFF91F000, // RO static range mapping: 0x1F000000 (VRAM, start)
-    0xFF91F600, // RO static range mapping: 0x1F600000 (VRAM, end)
-
-    // Give access to all Arm11-accessible IO
-    0xFF81EC00, // RW IO range mapping: 0x1EC00000 (PA 0x10100000, start)
-    0xFF81F000, // RW IO range mapping: 0x10500000 (PA 0x10500000, end)
-
-    0xFF002109, // Exflags: APPLICATION memtype + "Shared page writing" + "Allow debug" + "Access core2"
-    0xFE000200, // Handle table size: 0x200
-
-    // In case kernel ext isn't loaded:
-    0xFFE1EC40, // RW I/O page mapping: 0x1EC40000 (CONFIG11, for kernel takeover)
-    0xF0FFFFFF, // SVC ACL 0 to 0x7F (even if some SVC numbers don't exist)...
-    0xF1FFFFFF,
-    0xF2FFFFFF,
-    0xF3FFFFFF,
-    0xF4FFFFFF,
-    0xF5FFFFFF,
-    0xF6FFFFFF,
-    0xF7FFFFFF,
-};
-
-static u16 hbldrTarget[PATH_MAX+1];
-
-static inline void error(u32* cmdbuf, Result rc)
-{
-    cmdbuf[0] = IPC_MakeHeader(0, 1, 0);
-    cmdbuf[1] = rc;
-}
-
-static u16 *u16_strncpy(u16 *dest, const u16 *src, u32 size)
-{
-    u32 i;
-    for (i = 0; i < size && src[i] != 0; i++)
-        dest[i] = src[i];
-    while (i < size)
-        dest[i++] = 0;
-
-    return dest;
-}
-
-void hbldrPatchExHeaderInfo(ExHeader_Info *exhi)
-{
-    u32 stacksize = 4096; // 3dsx/libctru don't require anymore than this
-    memcpy(exhi->sci.codeset_info.name, "3dsx_app", 8);
-    memcpy(&exhi->sci.codeset_info.stack_size, &stacksize, 4);
-    memset(&exhi->sci.dependencies, 0, sizeof(exhi->sci.dependencies));
-
-    u32 coreVer = OS_KernelConfig->kernel_syscore_ver;
-    u32 deplistSize;
-    const s16 *deplist;
-    switch (coreVer) {
-        case 2:
-            deplist = dependencyListNativeFirmUids;
-            deplistSize = sizeof(dependencyListNativeFirmUids)/sizeof(dependencyListNativeFirmUids[0]);
-            break;
-        case 3:
-            deplist = dependencyListSafeFirmUids;
-            deplistSize = sizeof(dependencyListSafeFirmUids)/sizeof(dependencyListSafeFirmUids[0]);
-            break;
-        default:
-            panic(0);
-            break;
-    }
-
-    for (u32 i = 0; i < deplistSize; i++)
-    {
-        static const u64 mask = 0x0004013000000000ull;
-        bool n3dsOnly = deplist[i] < 0;
-        u32 n3dsMask = n3dsOnly ? 0x20000000 : 0;
-        u32 uid = n3dsOnly ? -deplist[i] : deplist[i];
-
-        // Enable O3DS NFC on 9.3 and above
-        if (uid == 0x40 && GET_VERSION_MINOR(osGetKernelVersion()) >= 48)
-            n3dsMask = 0;
-
-        exhi->sci.dependencies[i] = mask | n3dsMask | (uid << 8) | coreVer;
-    }
-
-    ExHeader_Arm11SystemLocalCapabilities* localcaps0 = &exhi->aci.local_caps;
-
-    localcaps0->core_info.core_version = coreVer;
-    localcaps0->core_info.use_cpu_clockrate_804MHz = false;
-    localcaps0->core_info.enable_l2c = false;
-    localcaps0->core_info.ideal_processor = 0;
-    localcaps0->core_info.affinity_mask = BIT(0);
-    localcaps0->core_info.priority = 0x30;
-
-    u32 appmemtype = OS_KernelConfig->app_memtype;
-    localcaps0->core_info.o3ds_system_mode = appmemtype < 6 ? (SystemMode)appmemtype : SYSMODE_O3DS_PROD;
-    localcaps0->core_info.n3ds_system_mode = appmemtype >= 6 ? (SystemMode)(appmemtype - 6 + 1) : SYSMODE_N3DS_PROD;
-
-    memset(localcaps0->reslimits, 0, sizeof(localcaps0->reslimits));
-
-    // Set mode1 preemption mode for core1, max. 89% of CPU time (default 0, requires a APT_SetAppCpuTimeLimit call)
-    // See the big comment in sysmodules/pm/source/reslimit.c for technical details.
-    localcaps0->reslimits[0] = BIT(7) | 89;
-
-    localcaps0->storage_info.fs_access_info = 0xFFFFFFFF; // Give access to everything
-    localcaps0->storage_info.no_romfs = true;
-    localcaps0->storage_info.use_extended_savedata_access = true; // Whatever
-
-    // We have a patched SM, so whatever...
-    // Only 32 services if not on 9.6+ NFIRM
-    u32 numServices = GET_VERSION_MINOR(osGetKernelVersion()) < 50 || coreVer != 2 ? 32 : 34;
-    memset(localcaps0->service_access, 0, sizeof(localcaps0->service_access));
-    memcpy(localcaps0->service_access, serviceList, 8 * numServices);
-
-    localcaps0->reslimit_category = RESLIMIT_CATEGORY_APPLICATION;
-
-    ExHeader_Arm11KernelCapabilities* kcaps0 = &exhi->aci.kernel_caps;
-    memset(kcaps0->descriptors, 0xFF, sizeof(kcaps0->descriptors));
-    memcpy(kcaps0->descriptors, kernelCaps, sizeof(kernelCaps));
-
-    // Set kernel release version to the current kernel version
-    kcaps0->descriptors[0] = 0xFC000000 | (osGetKernelVersion() >> 16);
-}
-
-Result hbldrLoadProcess(Handle *outProcessHandle, const ExHeader_Info *exhi)
-{
-    IFile file;
     Result res;
+    if (AtomicPostIncrement(&hbldrRefcount)) return 0;
 
-    const ExHeader_CodeSetInfo *csi = &exhi->sci.codeset_info;
+    for(res = 0xD88007FA; res == (Result)0xD88007FA; svcSleepThread(500 * 1000LL)) {
-
+        res = svcConnectToPort(&hbldrHandle, "hb:ldr");
-    u32 region = 0;
+        if(R_FAILED(res) && res != (Result)0xD88007FA) {
-    u32 count;
+            AtomicDecrement(&hbldrRefcount);
-    for (count = 0; count < 28; count++)
-    {
-        u32 desc = exhi->aci.kernel_caps.descriptors[count];
-        if (0x1FE == desc >> 23)
-            region = desc & 0xF00;
-    }
-    if (region == 0)
-            return MAKERESULT(RL_PERMANENT, RS_INVALIDARG, 1, 2);
-
-
-    if (hbldrTarget[0] == 0)
-    {
-        u16_strncpy(hbldrTarget, u"/boot.3dsx", PATH_MAX);
-        ldrArgvBuf[0] = 1;
-        strncpy((char*)&ldrArgvBuf[1], "sdmc:/boot.3dsx", sizeof(ldrArgvBuf)-4);
-    }
-
-    res = IFile_Open(&file, ARCHIVE_SDMC, fsMakePath(PATH_EMPTY, ""), fsMakePath(PATH_UTF16, hbldrTarget), FS_OPEN_READ);
-    hbldrTarget[0] = 0;
-    if (R_FAILED(res))
-        return res;
-
-    u32 totalSize = 0;
-    if (!Ldr_Get3dsxSize(&totalSize, &file))
-    {
-        IFile_Close(&file);
-        return (Result)-1;
-    }
-
-    u32 tmp = 0;
-    u32 addr = 0x10000000;
-    res = allocateProgramMemory(exhi, addr, totalSize);
-    if (R_FAILED(res))
-    {
-        IFile_Close(&file);
             return res;
         }
-
-    Handle hCodeset = Ldr_CodesetFrom3dsx(csi->name, (u32 *)addr, csi->text.address, &file, exhi->aci.local_caps.title_id);
-    IFile_Close(&file);
-
-    if (hCodeset != 0)
-    {
-        // There are always 28 descriptors
-        res = svcCreateProcess(outProcessHandle, hCodeset, exhi->aci.kernel_caps.descriptors, count);
-        svcCloseHandle(hCodeset);
-    }
-    else
-        res = MAKERESULT(RL_PERMANENT, RS_INTERNAL, RM_LDR, RD_NOT_FOUND);
-
-    svcControlMemory(&tmp, addr, 0, totalSize, MEMOP_FREE, 0);
-    return res;
     }
 
-void hbldrHandleCommands(void *ctx)
+    return 0;
+}
+
+void hbldrExit(void)
 {
-    (void)ctx;
+    if (AtomicDecrement(&hbldrRefcount)) return;
+    svcCloseHandle(hbldrHandle);
+}
+
+Result HBLDR_LoadProcess(Handle *outCodeSet, u32 textAddr, u32 kernelFlags, u64 titleId, const char *name)
+{
+    u32* cmdbuf = getThreadCommandBuffer(); // 0x11800
+    cmdbuf[0] = IPC_MakeHeader(1, 6, 0);
+    cmdbuf[1] = textAddr;
+    cmdbuf[2] = kernelFlags & 0xF00;
+    memcpy(&cmdbuf[3], &titleId, 8);
+    strncpy((char *)&cmdbuf[5], name, 8);
+    Result rc = svcSendSyncRequest(hbldrHandle);
+    if (R_SUCCEEDED(rc)) rc = cmdbuf[1];
+
+    *outCodeSet = R_SUCCEEDED(rc) ? cmdbuf[3] : 0;
+    return rc;
+}
+
+Result HBLDR_SetTarget(const char* path)
+{
+    u32 pathLen = strlen(path) + 1;
     u32* cmdbuf = getThreadCommandBuffer();
-    switch (cmdbuf[0] >> 16)
+
-    {
+    cmdbuf[0] = IPC_MakeHeader(2, 0, 2); // 0x20002
-        case 2: // SetTarget
+    cmdbuf[1] = IPC_Desc_StaticBuffer(pathLen, 0);
-        {
+    cmdbuf[2] = (u32)path;
-            if (cmdbuf[0] != IPC_MakeHeader(2, 0, 2) || (cmdbuf[1] & 0x3FFF) != 0x0002)
+
-            {
+    Result rc = svcSendSyncRequest(hbldrHandle);
-                error(cmdbuf, 0xD9001830);
+    if (R_SUCCEEDED(rc)) rc = cmdbuf[1];
-                break;
+    return rc;
-            }
-            size_t inSize = cmdbuf[1] >> 14;
-            inSize = inSize > PATH_MAX ? inSize : PATH_MAX;
-            ssize_t units = utf8_to_utf16(hbldrTarget, (const uint8_t*)cmdbuf[2], inSize);
-            if (units < 0 || units > PATH_MAX)
-            {
-                hbldrTarget[0] = 0;
-                error(cmdbuf, 0xD9001830);
-                break;
 }
 
-            hbldrTarget[units] = 0;
+Result HBLDR_SetArgv(const void* buffer, size_t size)
-            cmdbuf[0] = IPC_MakeHeader(2, 1, 0);
-            cmdbuf[1] = 0;
-            break;
-        }
-        case 3: // SetArgv
 {
-            if (cmdbuf[0] != IPC_MakeHeader(3, 0, 2) || (cmdbuf[1] & 0x3FFF) != (0x2 | (1<<10)))
+    u32* cmdbuf = getThreadCommandBuffer();
+
+    cmdbuf[0] = IPC_MakeHeader(3, 0, 2); // 0x30002
+    cmdbuf[1] = IPC_Desc_StaticBuffer(size, 1);
+    cmdbuf[2] = (u32)buffer;
+
+    Result rc = svcSendSyncRequest(hbldrHandle);
+    if (R_SUCCEEDED(rc)) rc = cmdbuf[1];
+    return rc;
+}
+
+Result HBLDR_PatchExHeaderInfo(ExHeader_Info *exheaderInfo)
 {
-                error(cmdbuf, 0xD9001830);
+    u32* cmdbuf = getThreadCommandBuffer();
-                break;
+
+    cmdbuf[0] = IPC_MakeHeader(4, 0, 2); // 0x40002
+    cmdbuf[1] = IPC_Desc_Buffer(sizeof(*exheaderInfo), IPC_BUFFER_RW);
+    cmdbuf[2] = (u32)exheaderInfo;
+
+    Result rc = svcSendSyncRequest(hbldrHandle);
+    if (R_SUCCEEDED(rc)) rc = cmdbuf[1];
+
+    return rc;
 }
-            size_t inSize = cmdbuf[1] >> 14;
+
-            inSize = inSize > ARGVBUF_SIZE ? inSize : ARGVBUF_SIZE;
+Result HBLDR_DebugNextApplicationByForce(bool dryRun)
-            memcpy(ldrArgvBuf, (const u8 *)cmdbuf[2], inSize);
-            cmdbuf[0] = IPC_MakeHeader(3, 1, 0);
-            cmdbuf[1] = 0;
-            break;
-        }
-        case 1: // LoadProcess (removed)
-        case 4: // PatchExHeaderInfo (removed)
-        case 5: // DebugNextApplicationByForce (removed)
-        default:
 {
-            error(cmdbuf, 0xD900182F);
+    u32* cmdbuf = getThreadCommandBuffer();
-            break;
+
-        }
+    cmdbuf[0] = IPC_MakeHeader(5, 1, 0); // 0x50040
-    }
+    cmdbuf[1] = dryRun ? 1 : 0;
+
+    Result rc = svcSendSyncRequest(hbldrHandle);
+    if (R_SUCCEEDED(rc)) rc = cmdbuf[1];
+
+    return rc;
 }

sysmodules/loader/source/hbldr.h

@@ -1,44 +1,12 @@
-/*
-*   This file is part of Luma3DS
-*   Copyright (C) 2022 Aurora Wright, TuxSH
-*
-*   This program is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   This program is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-*   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
-*       * Requiring preservation of specified reasonable legal notices or
-*         author attributions in that material or in the Appropriate Legal
-*         Notices displayed by works containing it.
-*       * Prohibiting misrepresentation of the origin of that material,
-*         or requiring that modified versions of such material be marked in
-*         reasonable ways as different from the original version.
-*/
-
 #pragma once
 
-#include <3ds.h>
+#include <3ds/exheader.h>
-#include "luma_shared_config.h"
 
-Result hbldrLoadProcess(Handle *outProcessHandle, const ExHeader_Info *exhi);
+Result hbldrInit(void);
-void hbldrPatchExHeaderInfo(ExHeader_Info *exhi);
+void hbldrExit(void);
-void hbldrHandleCommands(void *ctx);
 
-static inline bool hbldrIs3dsxTitle(u64 tid)
+Result HBLDR_LoadProcess(Handle *outCodeSet, u32 textAddr, u32 kernelFlags, u64 titleId, const char *name);
-{
+Result HBLDR_SetTarget(const char* path);
-    if (!Luma_SharedConfig->use_hbldr)
+Result HBLDR_SetArgv(const void* buffer, size_t size);
-        return false;
+Result HBLDR_PatchExHeaderInfo(ExHeader_Info *exheaderInfo);
-    u64 hbldrTid = Luma_SharedConfig->hbldr_3dsx_tid;
+Result HBLDR_DebugNextApplicationByForce(bool dryRun);
-
-    // Just like p9 clears them, ignore platform/N3DS bits
-    return ((tid ^ hbldrTid) & ~0xF0000000ull) == 0;
-}

sysmodules/loader/source/ifile.c

@@ -23,9 +23,7 @@ Result IFile_OpenFromArchive(IFile *file, FS_Archive archive, FS_Path filePath,
 
 Result IFile_Close(IFile *file)
 {
-  Result res = file->handle != 0 ? FSFILE_Close(file->handle) : 0;
+  return FSFILE_Close(file->handle);
-  file->handle = 0;
-  return res;
 }
 
 Result IFile_GetSize(IFile *file, u64 *size)
@@ -123,17 +121,3 @@ Result IFile_Write(IFile *file, u64 *total, const void *buffer, u32 len, u32 fla
   *total = cur;
   return res;
 }
-
-Result IFile_ReadAt(IFile *file, u64 *total, void *buffer, u32 offset, u32 len)
-{
-    *total = 0;
-    file->pos = offset;
-    return IFile_Read(file, total, buffer, len);
-}
-
-u32 IFile_Read2(IFile *file, void *buffer, u32 size, u32 offset)
-{
-    u64 total = 0;
-    Result res = IFile_ReadAt(file, &total, buffer, offset, size);
-    return R_SUCCEEDED(res) ? (u32)total : 0;
-}

sysmodules/loader/source/ifile.h

@@ -18,6 +18,3 @@ Result IFile_GetSize(IFile *file, u64 *size);
 Result IFile_SetSize(IFile *file, u64 size);
 Result IFile_Read(IFile *file, u64 *total, void *buffer, u32 len);
 Result IFile_Write(IFile *file, u64 *total, const void *buffer, u32 len, u32 flags);
-
-Result IFile_ReadAt(IFile *file, u64 *total, void *buffer, u32 offset, u32 len);
-u32 IFile_Read2(IFile *file, void *buffer, u32 size, u32 offset);

sysmodules/loader/source/loader.c

@@ -1,46 +1,19 @@
 #include <3ds.h>
 #include "memory.h"
 #include "patcher.h"
-#include "paslr.h"
 #include "ifile.h"
 #include "util.h"
 #include "hbldr.h"
-
+#include "luma_shared_config.h"
-#define SYSMODULE_CXI_COOKIE_MASK 0xEEEE000000000000ull
-
-// Used by the custom loader command 0x101 (ControlApplicationMemoryModeOverride)
-typedef struct ControlApplicationMemoryModeOverrideConfig {
-    u32 query : 1; //< Only query the current configuration, do not update it.
-    u32 enable_o3ds : 1; //< Enable o3ds memory mode override
-    u32 enable_n3ds : 1; //< Enable n3ds memory mode override
-    u32 o3ds_mode : 3; //< O3ds memory mode
-    u32 n3ds_mode : 3; //< N3ds memory mode
-} ControlApplicationMemoryModeOverrideConfig;
-
-static ControlApplicationMemoryModeOverrideConfig g_memoryOverrideConfig = { 0 };
 
 extern u32 config, multiConfig, bootConfig;
-extern bool isN3DS, isSdMode, nextGamePatchDisabled;
+extern bool isN3DS, isSdMode;
 
-static u64 g_cached_programHandle; // for exheader info only
+static u8 g_ret_buf[sizeof(ExHeader_Info)];
+static u64 g_cached_programHandle;
 static ExHeader_Info g_exheaderInfo;
 
-// Last application exheader info, for use with custom cmd 0x102
+const char CODE_PATH[] = {0x01, 0x00, 0x00, 0x00, 0x2E, 0x63, 0x6F, 0x64, 0x65, 0x00, 0x00, 0x00};
-static ExHeader_Info g_lastAppExheaderInfo;
-
-static IFile g_cached_sysmoduleCxiFile;
-static u64 g_cached_sysmoduleCxiCookie;
-static Ncch g_cached_sysmoduleCxiNcch;
-
-typedef struct ContentPath {
-    u32 contentType;
-    char fileName[8]; // for exefs
-} ContentPath;
-
-static const ContentPath codeContentPath = {
-    .contentType = 1, // ExeFS (with code)
-    .fileName = ".code", // last 3 bytes have to be 0, but this is guaranteed here.
-};
 
 typedef struct prog_addrs_t
 {
@@ -119,40 +92,23 @@ static int lzss_decompress(u8 *end)
     return ret;
 }
 
-static inline bool IsSysmoduleId(u64 tid)
+static inline bool hbldrIs3dsxTitle(u64 tid)
 {
-    return (tid >> 32) == 0x00040130;
+    return Luma_SharedConfig->use_hbldr && tid == Luma_SharedConfig->hbldr_3dsx_tid;
 }
 
-static inline bool IsApplicationId(u64 tid)
+static Result allocateSharedMem(prog_addrs_t *shared, prog_addrs_t *vaddr, int flags)
 {
-    return (tid >> 32) == 0x00040000;
+    u32 dummy;
+
+    memcpy(shared, vaddr, sizeof(prog_addrs_t));
+    shared->text_addr = 0x10000000;
+    shared->ro_addr = shared->text_addr + (shared->text_size << 12);
+    shared->data_addr = shared->ro_addr + (shared->ro_size << 12);
+    return svcControlMemory(&dummy, shared->text_addr, 0, shared->total_size << 12, (flags & 0xF00) | MEMOP_ALLOC, MEMPERM_READ | MEMPERM_WRITE);
 }
 
-static inline bool IsSysmoduleCxiCookie(u64 programHandle)
+static Result loadCode(u64 titleId, prog_addrs_t *shared, u64 programHandle, int isCompressed)
-{
-    return (programHandle >> 32) == (SYSMODULE_CXI_COOKIE_MASK >> 32);
-}
-
-static void InvalidateCachedCxiFile(void)
-{
-    if (g_cached_sysmoduleCxiFile.handle != 0)
-        IFile_Close(&g_cached_sysmoduleCxiFile);
-    memset(&g_cached_sysmoduleCxiFile, 0, sizeof(IFile));
-
-    g_cached_sysmoduleCxiCookie = 0;
-}
-
-static Result allocateProgramMemoryWrapper(prog_addrs_t *mapped, const ExHeader_Info *exhi, const prog_addrs_t *vaddr)
-{
-    memcpy(mapped, vaddr, sizeof(prog_addrs_t));
-    mapped->text_addr = 0x10000000;
-    mapped->ro_addr = mapped->text_addr + (mapped->text_size << 12);
-    mapped->data_addr = mapped->ro_addr + (mapped->ro_size << 12);
-    return allocateProgramMemory(exhi, mapped->text_addr, mapped->total_size << 12);
-}
-
-static Result loadCode(const ExHeader_Info *exhi, u64 programHandle, const prog_addrs_t *mapped)
 {
     IFile file;
     FS_Path archivePath;
@@ -160,143 +116,47 @@ static Result loadCode(const ExHeader_Info *exhi, u64 programHandle, const prog_
     u64 size;
     u64 total;
 
-    u64 titleId = exhi->aci.local_caps.title_id;
+    if(!CONFIG(PATCHGAMES) || !loadTitleCodeSection(titleId, (u8 *)shared->text_addr, (u64)shared->total_size << 12))
-    const ExHeader_CodeSetInfo *csi = &exhi->sci.codeset_info;
-    bool isCompressed = csi->flags.compress_exefs_code;
-
-    // Load from CXI, and skip patches, if we were opened from it
-    if (IsSysmoduleCxiCookie(programHandle))
-    {
-        u32 sz_ = 0;
-        bool ok = readSysmoduleCxiCode((u8 *)mapped->text_addr, &sz_, (u64)mapped->total_size << 12, &g_cached_sysmoduleCxiFile, &g_cached_sysmoduleCxiNcch);
-        size = sz_;
-
-        if (!ok)
-            return (Result)-2;
-
-        // Decompress
-        if (isCompressed)
-            lzss_decompress((u8 *)mapped->text_addr + size);
-
-        // No need to keep the file open at this point
-        InvalidateCachedCxiFile();
-        return 0;
-    }
-
-    bool codeLoadedExternally = false;
-    if (CONFIG(PATCHGAMES))
-    {
-        // Require both "load external FIRM & modules" and "patch games" for sysmodules
-        if (IsSysmoduleId(titleId))
-            codeLoadedExternally = CONFIG(LOADEXTFIRMSANDMODULES);
-        else
-            codeLoadedExternally = true;
-    }
-
-    if (codeLoadedExternally)
-        codeLoadedExternally = loadTitleCodeSection(titleId, (u8 *)mapped->text_addr, (u64)mapped->total_size << 12);
-
-    if(!codeLoadedExternally)
     {
         archivePath.type = PATH_BINARY;
         archivePath.data = &programHandle;
-        archivePath.size = sizeof(programHandle);
+        archivePath.size = 8;
 
         filePath.type = PATH_BINARY;
-        filePath.data = &codeContentPath;
+        filePath.data = CODE_PATH;
-        filePath.size = sizeof(codeContentPath);
+        filePath.size = sizeof(CODE_PATH);
+        if (R_FAILED(IFile_Open(&file, ARCHIVE_SAVEDATA_AND_CONTENT2, archivePath, filePath, FS_OPEN_READ)))
+            svcBreak(USERBREAK_ASSERT);
 
-        assertSuccess(IFile_Open(&file, ARCHIVE_SAVEDATA_AND_CONTENT2, archivePath, filePath, FS_OPEN_READ));
+        // get file size
         assertSuccess(IFile_GetSize(&file, &size));
 
         // check size
-        if (size > (u64)mapped->total_size << 12)
+        if (size > (u64)shared->total_size << 12)
         {
             IFile_Close(&file);
             return 0xC900464F;
         }
 
         // read code
-        assertSuccess(IFile_Read(&file, &total, (void *)mapped->text_addr, size));
+        assertSuccess(IFile_Read(&file, &total, (void *)shared->text_addr, size));
         IFile_Close(&file); // done reading
 
         // decompress
         if (isCompressed)
-            lzss_decompress((u8 *)mapped->text_addr + size);
+            lzss_decompress((u8 *)shared->text_addr + size);
     }
 
-    patchCode(titleId, csi->flags.remaster_version, (u8 *)mapped->text_addr, mapped->total_size << 12, csi->text.size, csi->rodata.size, csi->data.size, csi->rodata.address, csi->data.address);
+    ExHeader_CodeSetInfo *csi = &g_exheaderInfo.sci.codeset_info;
+
+    patchCode(titleId, csi->flags.remaster_version, (u8 *)shared->text_addr, shared->total_size << 12, csi->text.size, csi->rodata.size, csi->data.size, csi->rodata.address, csi->data.address);
 
     return 0;
 }
 
-static u32 plgldrRefcount = 0;
-static Handle plgldrHandle = 0;
-
-Result plgldrInit(void)
-{
-    Result res;
-    if (AtomicPostIncrement(&plgldrRefcount)) return 0;
-
-    for(res = 0xD88007FA; res == (Result)0xD88007FA; svcSleepThread(500 * 1000LL)) {
-        res = svcConnectToPort(&plgldrHandle, "plg:ldr");
-        if(R_FAILED(res) && res != (Result)0xD88007FA) {
-            AtomicDecrement(&plgldrRefcount);
-            return res;
-        }
-    }
-
-    return 0;
-}
-
-void plgldrExit(void)
-{
-    if (AtomicDecrement(&plgldrRefcount)) return;
-        svcCloseHandle(plgldrHandle);
-}
-
-// Get plugin loader state
-Result  PLGLDR__IsPluginLoaderEnabled(bool *isEnabled)
-{
-    Result res = 0;
-
-    u32 *cmdbuf = getThreadCommandBuffer();
-
-    cmdbuf[0] = IPC_MakeHeader(2, 0, 0);
-    if (R_SUCCEEDED((res = svcSendSyncRequest(plgldrHandle))))
-    {
-        res = cmdbuf[1];
-        *isEnabled = cmdbuf[2];
-    }
-    return res;
-}
-
-// Try to load a plugin for the game
-static Result PLGLDR_LoadPlugin(u32 processID, bool isHomebrew)
-{
-    // Special case handling: games rebooting the 3DS on old models
-    if (!isN3DS && g_exheaderInfo.aci.local_caps.core_info.o3ds_system_mode > 0)
-    {
-        // Check if the plugin loader is enabled, otherwise skip the loading part
-        bool enabled = false;
-
-        PLGLDR__IsPluginLoaderEnabled(&enabled);
-        if (!enabled) {
-            return 0;
-        }
-    }
-
-    u32* cmdbuf = getThreadCommandBuffer();
-
-    cmdbuf[0] = IPC_MakeHeader(1, 2, 0);
-    cmdbuf[1] = processID;
-    cmdbuf[2] = isHomebrew;
-    return svcSendSyncRequest(plgldrHandle);
-}
-
 static inline bool IsHioId(u64 id)
 {
-    // FS loads HIO titles at boot when it can. For HIO titles, title/programId and "program handle"
+    // FS load HIO titles at boot when it can. For HIO titles, title/programId and "program handle"
     // are the same thing, although some of them can be aliased with their "real" titleId (i.e. in ExHeader).
 
     if (id >> 32 == 0xFFFF0000u)
@@ -305,115 +165,78 @@ static inline bool IsHioId(u64 id)
         return R_LEVEL(FSREG_CheckHostLoadId(id)) == RL_SUCCESS; // check if this is an alias to an HIO-loaded title
 }
 
-static Result GetProgramInfoImpl(ExHeader_Info *exheaderInfo, u64 programHandle)
+static Result GetProgramInfo(ExHeader_Info *exheaderInfo, u64 programHandle)
 {
     Result res;
-
+    TRY(IsHioId(programHandle) ? FSREG_GetProgramInfo(exheaderInfo, 1, programHandle) : PXIPM_GetProgramInfo(exheaderInfo, programHandle));
-    // Load from CXI, and skip patches, if we were opened from it
-    if (IsSysmoduleCxiCookie(programHandle))
-    {
-        u64 titleId = 0x0004013000000000ull | (u32)programHandle;
-        if (g_cached_sysmoduleCxiCookie != programHandle)
-        {
-            InvalidateCachedCxiFile();
-            res = openSysmoduleCxi(&g_cached_sysmoduleCxiFile, titleId);
-            if (R_FAILED(res))
-                return res;
-            g_cached_sysmoduleCxiCookie = programHandle;
-        }
-
-        bool ok = readSysmoduleCxiNcchHeader(&g_cached_sysmoduleCxiNcch, &g_cached_sysmoduleCxiFile);
-        if (!ok)
-            return (Result)-2;
-        ok = readSysmoduleCxiExHeaderInfo(exheaderInfo, &g_cached_sysmoduleCxiNcch, &g_cached_sysmoduleCxiFile);
-        if (!ok)
-            return (Result)-2;
-        return 0;
-    }
-
-    if (IsHioId(programHandle))
-        res = FSREG_GetProgramInfo(exheaderInfo, 1, programHandle);
-    else
-        res = PXIPM_GetProgramInfo(exheaderInfo, programHandle);
-
-    if (R_FAILED(res))
-        return res;
-
-    u64 originalTitleId = exheaderInfo->aci.local_caps.title_id;
 
     // Tweak 3dsx placeholder title exheaderInfo
     if (hbldrIs3dsxTitle(exheaderInfo->aci.local_caps.title_id))
     {
-        hbldrPatchExHeaderInfo(exheaderInfo);
+        assertSuccess(hbldrInit());
+        HBLDR_PatchExHeaderInfo(exheaderInfo);
+        hbldrExit();
     }
     else
     {
-        bool exhLoadedExternally = false;
+        u64 originaltitleId = exheaderInfo->aci.local_caps.title_id;
-        if (CONFIG(PATCHGAMES))
+        if(CONFIG(PATCHGAMES) && loadTitleExheaderInfo(exheaderInfo->aci.local_caps.title_id, exheaderInfo))
-        {
+            exheaderInfo->aci.local_caps.title_id = originaltitleId;
-            // Require both "load external FIRM & modules" and "patch games" for sysmodules
-            if (IsSysmoduleId(originalTitleId))
-                exhLoadedExternally = CONFIG(LOADEXTFIRMSANDMODULES);
-            else
-                exhLoadedExternally = true;
-        }
-
-        if (exhLoadedExternally)
-            exhLoadedExternally = loadTitleExheaderInfo(originalTitleId, exheaderInfo);
-
-        if(exhLoadedExternally)
-            exheaderInfo->aci.local_caps.title_id = originalTitleId;
-    }
-    
-    if (IsApplicationId(originalTitleId)) {
-        if (g_memoryOverrideConfig.enable_o3ds)
-            exheaderInfo->aci.local_caps.core_info.o3ds_system_mode = g_memoryOverrideConfig.o3ds_mode;
-        if (g_memoryOverrideConfig.enable_n3ds)
-            exheaderInfo->aci.local_caps.core_info.n3ds_system_mode = g_memoryOverrideConfig.n3ds_mode;
     }
 
     return res;
 }
 
-static Result GetProgramInfo(u64 programHandle)
+static Result LoadProcess(Handle *process, u64 programHandle)
 {
-    Result res = 0;
+    Result res;
-    u64 cachedTitleId = g_exheaderInfo.aci.local_caps.title_id;
+    int count;
-
+    u32 flags;
-    if (programHandle != g_cached_programHandle || hbldrIs3dsxTitle(cachedTitleId))
+    u32 desc;
-    {
-        res = GetProgramInfoImpl(&g_exheaderInfo, programHandle);
-        g_cached_programHandle = R_SUCCEEDED(res) ? programHandle : 0;
-        if (R_SUCCEEDED(res) && (u32)((g_exheaderInfo.aci.local_caps.title_id >> 0x20) & 0xFFFFFFEDULL) == 0x00040000) {
-            memcpy(&g_lastAppExheaderInfo, &g_exheaderInfo, sizeof(g_lastAppExheaderInfo));
-        }
-    }
-
-    return res;
-}
-
-static Result LoadProcessImpl(Handle *outProcessHandle, const ExHeader_Info *exhi, u64 programHandle)
-{
-    const ExHeader_CodeSetInfo *csi = &exhi->sci.codeset_info;
-
-    Result res = 0;
     u32 dummy;
-    prog_addrs_t mapped;
+    prog_addrs_t sharedAddr;
     prog_addrs_t vaddr;
     Handle codeset;
-    CodeSetHeader csh;
+    CodeSetInfo codesetinfo;
     u32 dataMemSize;
+    u64 titleId;
 
-    u32 region = 0;
+    // make sure the cached info corrosponds to the current programHandle
-    s32 count;
+    if (g_cached_programHandle != programHandle || hbldrIs3dsxTitle(g_exheaderInfo.aci.local_caps.title_id))
+    {
+        res = GetProgramInfo(&g_exheaderInfo, programHandle);
+        g_cached_programHandle = programHandle;
+        if (R_FAILED(res))
+        {
+            g_cached_programHandle = 0;
+            return res;
+        }
+    }
+
+    // get kernel flags
+    flags = 0;
     for (count = 0; count < 28; count++)
     {
-        u32 desc = exhi->aci.kernel_caps.descriptors[count];
+        desc = g_exheaderInfo.aci.kernel_caps.descriptors[count];
         if (0x1FE == desc >> 23)
-            region = desc & 0xF00;
+            flags = desc & 0xF00;
+    }
+    if (flags == 0)
+        return MAKERESULT(RL_PERMANENT, RS_INVALIDARG, 1, 2);
+
+    // check for 3dsx process
+    titleId = g_exheaderInfo.aci.local_caps.title_id;
+    ExHeader_CodeSetInfo *csi = &g_exheaderInfo.sci.codeset_info;
+
+    if (hbldrIs3dsxTitle(titleId))
+    {
+        assertSuccess(hbldrInit());
+        assertSuccess(HBLDR_LoadProcess(&codeset, csi->text.address, flags & 0xF00, titleId, csi->name));
+        res = svcCreateProcess(process, codeset, g_exheaderInfo.aci.kernel_caps.descriptors, count);
+        svcCloseHandle(codeset);
+        hbldrExit();
+        return res;
     }
-    if (region == 0)
-            return MAKERESULT(RL_PERMANENT, RS_INVALIDARG, RM_KERNEL, 2);
 
     // allocate process memory
     vaddr.text_addr = csi->text.address;
@@ -424,62 +247,35 @@ static Result LoadProcessImpl(Handle *outProcessHandle, const ExHeader_Info *exh
     vaddr.data_size = (csi->data.size + 4095) >> 12;
     dataMemSize = (csi->data.size + csi->bss_size + 4095) >> 12;
     vaddr.total_size = vaddr.text_size + vaddr.ro_size + vaddr.data_size;
-    TRY(allocateProgramMemoryWrapper(&mapped, exhi, &vaddr));
+    TRY(allocateSharedMem(&sharedAddr, &vaddr, flags));
 
     // load code
-    u64 titleId = exhi->aci.local_caps.title_id;
+    if (R_SUCCEEDED(res = loadCode(titleId, &sharedAddr, programHandle, csi->flags.compress_exefs_code)))
-    if (R_SUCCEEDED(res = loadCode(exhi, programHandle, &mapped)))
     {
-        u32     *code = (u32 *)mapped.text_addr;
+        memcpy(&codesetinfo.name, csi->name, 8);
-        bool    isHomebrew = code[0] == 0xEA000006 && code[8] == 0xE1A0400E;
+        codesetinfo.program_id = titleId;
-
+        codesetinfo.text_addr = vaddr.text_addr;
-        memcpy(&csh.name, csi->name, 8);
+        codesetinfo.text_size = vaddr.text_size;
-        csh.program_id = titleId;
+        codesetinfo.text_size_total = vaddr.text_size;
-        csh.text_addr = vaddr.text_addr;
+        codesetinfo.ro_addr = vaddr.ro_addr;
-        csh.text_size = vaddr.text_size;
+        codesetinfo.ro_size = vaddr.ro_size;
-        csh.text_size_total = vaddr.text_size;
+        codesetinfo.ro_size_total = vaddr.ro_size;
-        csh.ro_addr = vaddr.ro_addr;
+        codesetinfo.rw_addr = vaddr.data_addr;
-        csh.ro_size = vaddr.ro_size;
+        codesetinfo.rw_size = vaddr.data_size;
-        csh.ro_size_total = vaddr.ro_size;
+        codesetinfo.rw_size_total = dataMemSize;
-        csh.rw_addr = vaddr.data_addr;
+        res = svcCreateCodeSet(&codeset, &codesetinfo, (void *)sharedAddr.text_addr, (void *)sharedAddr.ro_addr, (void *)sharedAddr.data_addr);
-        csh.rw_size = vaddr.data_size;
-        csh.rw_size_total = dataMemSize;
-        res = svcCreateCodeSet(&codeset, &csh, mapped.text_addr, mapped.ro_addr, mapped.data_addr);
         if (R_SUCCEEDED(res))
         {
-            // There are always 28 descriptors
+            res = svcCreateProcess(process, codeset, g_exheaderInfo.aci.kernel_caps.descriptors, count);
-            res = svcCreateProcess(outProcessHandle, codeset, exhi->aci.kernel_caps.descriptors, count);
             svcCloseHandle(codeset);
             res = R_SUCCEEDED(res) ? 0 : res;
-            
-            // check for plugin
-            if (!res && ((u32)((titleId >> 0x20) & 0xFFFFFFEDULL) == 0x00040000))
-            {
-                u32 processID;
-                assertSuccess(svcGetProcessId(&processID, *outProcessHandle));
-                assertSuccess(plgldrInit());
-                assertSuccess(PLGLDR_LoadPlugin(processID, isHomebrew));
-                plgldrExit();
-            }
         }
     }
 
-    svcControlMemory(&dummy, mapped.text_addr, 0, mapped.total_size << 12, MEMOP_FREE, 0);
+    svcControlMemory(&dummy, sharedAddr.text_addr, 0, sharedAddr.total_size << 12, MEMOP_FREE, 0);
     return res;
 }
 
-static Result LoadProcess(Handle *process, u64 programHandle)
-{
-    Result res = 0;
-    TRY(GetProgramInfo(programHandle));
-
-    if (hbldrIs3dsxTitle(g_exheaderInfo.aci.local_caps.title_id))
-        return assertSuccess(hbldrLoadProcess(process, &g_exheaderInfo));
-    else
-        // Break on failure, even here (if GetProgramInfo succeeds we shouldn't be here anyway)
-        return assertSuccess(LoadProcessImpl(process, &g_exheaderInfo, programHandle));
-}
-
 static Result RegisterProgram(u64 *programHandle, FS_ProgramInfo *title, FS_ProgramInfo *update)
 {
     Result res;
@@ -498,48 +294,16 @@ static Result RegisterProgram(u64 *programHandle, FS_ProgramInfo *title, FS_Prog
     }
     else
     {
-        bool loadedCxiFromStorage = false;
-        if (IsSysmoduleId(titleId) && CONFIG(LOADEXTFIRMSANDMODULES))
-        {
-            u64 tid2 = titleId & ~0xF0000000ull;
-            // Forbid having two such file handles being open at the same time
-            // Also reload the file even if already cached.
-            InvalidateCachedCxiFile();
-
-            res = openSysmoduleCxi(&g_cached_sysmoduleCxiFile, tid2);
-            if (R_SUCCEEDED(res))
-            {
-                // A .cxi with the correct name in /luma/sysmodule exists, proceed (ignoring N3DS TID bits)
-                *programHandle = SYSMODULE_CXI_COOKIE_MASK | (u32)tid2;
-                g_cached_sysmoduleCxiCookie = *programHandle;
-                loadedCxiFromStorage = true;
-            }
-        }
-
-        if (!loadedCxiFromStorage)
-        {
-            // Otherwise, just load as normal
         TRY(PXIPM_RegisterProgram(programHandle, title, update));
         if (IsHioId(*programHandle)) // double check this is indeed *not* HIO
             panic(0);
     }
-    }
 
     return res;
 }
 
 static Result UnregisterProgram(u64 programHandle)
 {
-    if (g_cached_programHandle == programHandle)
-        g_cached_programHandle = 0;
-
-    if (IsSysmoduleCxiCookie(programHandle))
-    {
-        if (programHandle == g_cached_sysmoduleCxiCookie)
-            InvalidateCachedCxiFile();
-        return 0;
-    }
-    else
     return IsHioId(programHandle) ? FSREG_UnloadProgram(programHandle) : PXIPM_UnregisterProgram(programHandle);
 }
 
@@ -548,7 +312,6 @@ void loaderHandleCommands(void *ctx)
     (void)ctx;
     FS_ProgramInfo title;
     FS_ProgramInfo update;
-    ControlApplicationMemoryModeOverrideConfig memModeOverride;
     u32* cmdbuf;
     u16 cmdid;
     int res;
@@ -577,36 +340,24 @@ void loaderHandleCommands(void *ctx)
             break;
         case 3: // UnregisterProgram
             memcpy(&programHandle, &cmdbuf[1], 8);
+
+            if (g_cached_programHandle == programHandle)
+                g_cached_programHandle = 0;
             cmdbuf[1] = UnregisterProgram(programHandle);
             cmdbuf[0] = IPC_MakeHeader(3, 1, 0);
             break;
         case 4: // GetProgramInfo
             memcpy(&programHandle, &cmdbuf[1], 8);
-            res = GetProgramInfo(programHandle);
+            if (programHandle != g_cached_programHandle || hbldrIs3dsxTitle(g_exheaderInfo.aci.local_caps.title_id))
+            {
+                res = GetProgramInfo(&g_exheaderInfo, programHandle);
+                g_cached_programHandle = R_SUCCEEDED(res) ? programHandle : 0;
+            }
+            memcpy(&g_ret_buf, &g_exheaderInfo, sizeof(ExHeader_Info));
             cmdbuf[0] = IPC_MakeHeader(4, 1, 2);
             cmdbuf[1] = res;
             cmdbuf[2] = IPC_Desc_StaticBuffer(sizeof(ExHeader_Info), 0); //0x1000002;
-            cmdbuf[3] = (u32)&g_exheaderInfo; // official Loader makes a copy here, but this is isn't necessary
+            cmdbuf[3] = (u32)&g_ret_buf;
-            break;
-        // Custom
-        case 0x100: // DisableNextGamePatch
-            nextGamePatchDisabled = true;
-            cmdbuf[0] = IPC_MakeHeader(0x100, 1, 0);
-            cmdbuf[1] = (Result)0;
-            break;
-        case 0x101: // ControlApplicationMemoryModeOverride
-            memcpy(&memModeOverride, &cmdbuf[1], sizeof(ControlApplicationMemoryModeOverrideConfig));
-            if (!memModeOverride.query)
-                g_memoryOverrideConfig = memModeOverride;
-            cmdbuf[0] = IPC_MakeHeader(0x101, 2, 0);
-            cmdbuf[1] = (Result)0;
-            memcpy(&cmdbuf[2], &g_memoryOverrideConfig, sizeof(ControlApplicationMemoryModeOverrideConfig));
-            break;
-        case 0x102: // GetLastApplicationProgramInfo
-            cmdbuf[0] = IPC_MakeHeader(0x102, 1, 2);
-            cmdbuf[1] = (Result)0;
-            cmdbuf[2] = IPC_Desc_StaticBuffer(sizeof(ExHeader_Info), 0);
-            cmdbuf[3] = (u32)&g_lastAppExheaderInfo;
             break;
         default: // error
             cmdbuf[0] = IPC_MakeHeader(0, 1, 0);

sysmodules/loader/source/luma_shared_config.h

@@ -18,11 +18,10 @@
 
 #include <3ds/types.h>
 
-/// Luma shared config type (private!).
+/// Luma shared config type.
 typedef struct LumaSharedConfig {
-    u64 hbldr_3dsx_tid;             ///< Title ID to use for 3DSX loading (current).
+    u64 hbldr_3dsx_tid;         ///< Title ID to use for 3DSX loading.
-    u64 selected_hbldr_3dsx_tid;    ///< Title ID to use for 3DSX loading (to be moved to "current" when the current app closes).
+    bool use_hbldr;             ///< Whether or not Loader should use hb:ldr (Rosalina writes 1).
-    bool use_hbldr;                 ///< Whether or not Loader should use hb:ldr (reset to true).
 } LumaSharedConfig;
 
 /// Luma shared config.

sysmodules/loader/source/main.c

@@ -1,16 +1,13 @@
 #include <3ds.h>
-#include <assert.h>
 #include "memory.h"
 #include "patcher.h"
 #include "ifile.h"
 #include "util.h"
 #include "loader.h"
 #include "service_manager.h"
-#include "3dsx.h"
-#include "hbldr.h"
 
 u32 config, multiConfig, bootConfig;
-bool isN3DS, isSdMode, nextGamePatchDisabled, isLumaWithKext;
+bool isN3DS, isSdMode;
 
 // MAKE SURE fsreg has been init before calling this
 static Result fsldrPatchPermissions(void)
@@ -31,11 +28,9 @@ static Result fsldrPatchPermissions(void)
 static inline void loadCFWInfo(void)
 {
     s64 out;
-    u64 hbldrTid = 0;
 
-    isLumaWithKext = svcGetSystemInfo(&out, 0x20000, 0) == 1;
+    if(svcGetSystemInfo(&out, 0x20000, 0) != 1) panic(0xDEADCAFE);
-    if (isLumaWithKext)
+
-    {
     svcGetSystemInfo(&out, 0x10000, 3);
     config = (u32)out;
     svcGetSystemInfo(&out, 0x10000, 4);
@@ -43,39 +38,11 @@ static inline void loadCFWInfo(void)
     svcGetSystemInfo(&out, 0x10000, 5);
     bootConfig = (u32)out;
 
-        svcGetSystemInfo(&out, 0x10000, 0x100);
-        hbldrTid = (u64)out;
     svcGetSystemInfo(&out, 0x10000, 0x201);
     isN3DS = (bool)out;
     svcGetSystemInfo(&out, 0x10000, 0x203);
     isSdMode = (bool)out;
 }
-    else
-    {
-        // Try to support non-Luma or builds where kext is disabled
-        s64 numKips = 0;
-        svcGetSystemInfo(&numKips, 26, 0);
-
-        if (numKips >= 6)
-            panic(0xDEADCAFE);
-
-#ifndef BUILD_FOR_EXPLOIT_DEV
-        // Most options 0, except select ones
-        config = BIT(PATCHVERSTRING) | BIT(PATCHGAMES) | BIT(LOADEXTFIRMSANDMODULES);
-#else
-        config = 0;
-#endif
-        multiConfig = 0;
-        bootConfig = 0;
-        isN3DS = OS_KernelConfig->app_memtype >= 6;
-        isSdMode = true;
-    }
-
-    hbldrTid = hbldrTid == 0 ? HBLDR_DEFAULT_3DSX_TID : hbldrTid;
-    Luma_SharedConfig->hbldr_3dsx_tid = hbldrTid;
-    Luma_SharedConfig->selected_hbldr_3dsx_tid = hbldrTid;
-    Luma_SharedConfig->use_hbldr = true;
-}
 
 void __ctru_exit(int rc) { (void)rc; } // needed to avoid linking error
 
@@ -120,8 +87,7 @@ void initSystem(void)
 }
 
 static const ServiceManagerServiceEntry services[] = {
-    { "Loader", 2, loaderHandleCommands, false },
+    { "Loader", 1, loaderHandleCommands, false },
-    { "hb:ldr", 2, hbldrHandleCommands,  true  },
     { NULL },
 };
 
@@ -129,20 +95,9 @@ static const ServiceManagerNotificationEntry notifications[] = {
     { 0x000, NULL },
 };
 
-static u8 CTR_ALIGN(4) staticBufferForHbldr[0x400];
-static_assert(ARGVBUF_SIZE > 2 * PATH_MAX, "Wrong 3DSX argv buffer size");
-
 int main(void)
 {
-    nextGamePatchDisabled = false;
+    loadCFWInfo();
-
-    // Loader doesn't use any input static buffer, so we should be fine
-    u32 *sbuf = getThreadStaticBuffers();
-    sbuf[0] = IPC_Desc_StaticBuffer(sizeof(staticBufferForHbldr), 0);
-    sbuf[1] = (u32)staticBufferForHbldr;
-    sbuf[2] = IPC_Desc_StaticBuffer(sizeof(staticBufferForHbldr), 1);
-    sbuf[3] = (u32)staticBufferForHbldr;
-
     assertSuccess(ServiceManager_Run(services, notifications, NULL));
     return 0;
 }

sysmodules/loader/source/paslr.c

@@ -1,167 +0,0 @@
-#include <3ds.h>
-#include "paslr.h"
-#include "util.h"
-#include "hbldr.h"
-
-static const u32 titleUidListForPaslr[] = {
-    // JPN/USA/EUR/KOR/TWN or GLOBAL
-    0x0209, 0x0219, 0x0229, 0x0269, 0x0289, // Nintendo eShop
-    0x0334, 0x0335, 0x0336,                 // The Legend of Zelda: Ocarina of Time 3D
-    0x0343, 0x0465, 0x04B3,                 // Cubic Ninja
-    0x0913, 0x09FA, 0x0933,                 // Freakyforms Deluxe
-            0x07FD, 0x0961,                 // VVVVVV
-    0x0A5D, 0x0A5E, 0x0A6F, 0x0C61, 0x0C81, // Paper Mario: Sticker Star
-    0x0D7C, 0x0D7D, 0x0D7E,                 // Steel Diver: Sub Wars
-    0x11C4,                                 // Pokemon Omega Ruby (GLOBAL)
-    0x11C5,                                 // Pokemon Alpha Sapphire (GLOBAL)
-    0x149B, 0x1746, 0x1744,                 // Pokemon Super Mystery Dungeon
-    0x1773, 0x12C1, 0x136E,                 // Citizens of Earth
-    0x17C1,                                 // Pokemon Picross (GLOBAL)
-};
-
-static u32 getRandomInt(u32 maxNum)
-{
-    // As reverse-engineered from latest Loader
-    static u64 state = 0;
-    s64 tick = (s64)svcGetSystemTick();
-
-    u64 tmp = (state >> 7) - (tick >> 2);
-    state = (tmp ^ state) & 0x49CC9BA7FC61CA67ull;
-
-    tmp = 0x5D588B656C078965ull * state + 0x29EC3;
-    return (u32)(((tmp >> 32) * maxNum) >> 32);
-}
-
-static bool needsPaslr(u32 *outRegion, const ExHeader_Info *exhi)
-{
-    u32 region = 0;
-    u16 minKernelVer = 0;
-    for (u32 i = 0; i < 28; i++)
-    {
-        u32 desc = exhi->aci.kernel_caps.descriptors[i];
-        if (desc >> 23 == 0x1FE)
-            region = desc & 0xF00;
-        else if (desc >> 25 == 0x7E)
-            minKernelVer = (u16)desc;
-    }
-
-    *outRegion = region;
-
-#if defined(LOADER_ENABLE_PASLR) || defined(BUILD_FOR_EXPLOIT_DEV)
-    // Only applications and system applets (HM, Internet Browser...) are eligible for PASLR
-    if (region != MEMOP_REGION_APP && region != MEMOP_REGION_SYSTEM)
-        return false;
-    else if (region == MEMOP_REGION_SYSTEM && exhi->aci.local_caps.reslimit_category == RESLIMIT_CATEGORY_LIB_APPLET)
-        return false;
-
-    // All titles requiring 11.2+ kernel get PASLR
-    if (minKernelVer >= (SYSTEM_VERSION(2, 57, 0) >> 16))
-        return true;
-
-    // Otherwise, only games with known exploits and eShop get it
-    u64 titleId = exhi->aci.local_caps.title_id;
-
-    // Check if this is indeed a CTR title ID (high u32 = 00040xxx)
-    if (titleId >> 46 != 0x10)
-        return false;
-
-    for (u32 i = 0; i < sizeof(titleUidListForPaslr)/sizeof(titleUidListForPaslr[0]); i++)
-    {
-        if (((titleId >> 8) & 0xFFFFF) == titleUidListForPaslr[i])
-            return true;
-    }
-#else
-    (void)minKernelVer;
-    (void)titleUidListForPaslr;
-#endif
-    return false;
-}
-
-Result allocateProgramMemory(const ExHeader_Info *exhi, u32 vaddr, u32 size)
-{
-    Result res = 0;
-    u32 region = 0;
-    bool doPaslr = needsPaslr(&region, exhi);
-    u32 tmp = 0;
-
-    if (region == 0)
-        return MAKERESULT(RL_PERMANENT, RS_INVALIDARG, 1, 2);
-
-    u32 allocFlags = MEMOP_ALLOC | region;
-    if (!doPaslr)
-        return svcControlMemory(&tmp, vaddr, 0, size, allocFlags, MEMPERM_READWRITE);
-
-    // Divide the virtual address space into up to 7 chunks, each a random multiple (between 1 and 16) of 64KB.
-    // 64KB corresponds to a "large page" for the Armv6 MMU, hence the optimization choice.
-    // An additional 8th chunk gets the rest (if anything).
-    u32 totalNumPages = size >> 12;
-    u32 curPage = 0;
-    u32 numChunks;
-    u32 chunkStartAddrs[8];
-    u32 chunkSizes[8];
-    for (numChunks = 0; numChunks < 7; numChunks++)
-    {
-        u32 maxUnits = (totalNumPages - curPage) / 16;
-        if (maxUnits == 0)
-            break;
-        else if (maxUnits > 15)
-            maxUnits = 15;
-
-        u32 numPages = 16 * (1 + getRandomInt(maxUnits));
-        chunkStartAddrs[numChunks] = vaddr + (curPage << 12);
-        chunkSizes[numChunks] = numPages << 12;
-        curPage += numPages;
-    }
-    if (curPage < totalNumPages)
-    {
-        u32 numPages = totalNumPages - curPage;
-        chunkStartAddrs[numChunks] = vaddr + (curPage << 12);
-        chunkSizes[numChunks] = numPages << 12;
-        curPage += numPages;
-        ++numChunks;
-    }
-
-    // Randomize the order the VA chunks are allocated in physical memory, from last to first
-    u32 chunkOrder[8] = {0, 1, 2, 3, 4, 5, 6, 7};
-    u32 numChunksToRandomize = numChunks;
-    if (totalNumPages % 16 != 0)
-    {
-        // For MMU optimization reasons, we only randomize chunks that are multiples of 64KB (large page)
-        // in size. This means that if the process image (.text, .rodata, .data) is not a muliple of 64KB
-        // in size, then its last few pages are not randomized at all.
-        // In pratice, under normal circumstances, this means that the last few pages of applications are
-        // guaranteed to be located in <APPLICATION memregion end> - (image_size & ~0xFFFF).
-        --numChunksToRandomize;
-    }
-
-    for (s32 i = numChunksToRandomize - 1; i >= 0; i--)
-    {
-        u32 j = getRandomInt(i + 1);
-        tmp = chunkOrder[i];
-        chunkOrder[i] = chunkOrder[j];
-        chunkOrder[j] = tmp;
-    }
-
-    // Allocate the memory
-    u32 i;
-    for (i = 0; i < numChunks; i++)
-    {
-        u32 idx = chunkOrder[i];
-        res = svcControlMemory(&tmp, chunkStartAddrs[idx], 0, chunkSizes[idx], allocFlags, MEMPERM_READWRITE);
-        if (R_FAILED(res))
-            break;
-    }
-
-    // Success
-    if (i == numChunks)
-        return res;
-
-    // Clean up on failure
-    for (u32 j = 0; j < i; j++)
-    {
-        u32 idx = chunkOrder[i];
-        svcControlMemory(&tmp, chunkStartAddrs[idx], 0, chunkSizes[idx], MEMOP_FREE, MEMPERM_DONTCARE);
-    }
-
-    return res;
-}

sysmodules/loader/source/paslr.h

@@ -1,6 +0,0 @@
-#pragma once
-
-#include <3ds/types.h>
-#include <3ds/exheader.h>
-
-Result allocateProgramMemory(const ExHeader_Info *exhi, u32 vaddr, u32 size);

sysmodules/loader/source/patcher.c

@@ -4,7 +4,6 @@
 #include "memory.h"
 #include "strings.h"
 #include "romfsredir.h"
-#include "util.h"
 
 static u32 patchMemory(u8 *start, u32 size, const void *pattern, u32 patSize, s32 offset, const void *replace, u32 repSize, u32 count)
 {
@@ -148,7 +147,7 @@ static u32 findFunctionStart(u8 *code, u32 pos)
     return 0xFFFFFFFF;
 }
 
-static inline bool findLayeredFsSymbols(u8 *code, u32 size, u32 *fsMountArchive, u32 *fsRegisterArchive, u32 *fsTryOpenFile, u32 *fsOpenFileDirectly, u32 *fsUnMountArchive)
+static inline bool findLayeredFsSymbols(u8 *code, u32 size, u32 *fsMountArchive, u32 *fsRegisterArchive, u32 *fsTryOpenFile, u32 *fsOpenFileDirectly)
 {
     u32 found = 0,
         *temp = NULL;
@@ -165,12 +164,6 @@ static inline bool findLayeredFsSymbols(u8 *code, u32 size, u32 *fsMountArchive,
             case 0xE24DD028:
                 if(addr <= size - 16 && *fsMountArchive == 0xFFFFFFFF && addr32[1] == 0xE1A04000 && addr32[2] == 0xE59F60A8 && addr32[3] == 0xE3A0C001) temp = fsMountArchive;
                 break;
-            case 0xE2844001:
-                if(addr <= size - 12 && *fsUnMountArchive == 0xFFFFFFFF && addr32[1] == 0xE3540020 && addr32[2] == 0x3AFFFFF0) temp = fsUnMountArchive;
-                break;
-            case 0xE353003A:
-                if(addr <= size - 12 && *fsUnMountArchive == 0xFFFFFFFF && (addr32[1] & 0xFFFFFF0F) == 0x0A000009 && (addr32[2] & 0xFFFF0FF0) == 0xE1A00400) temp = fsUnMountArchive;
-                break;
             case 0xE3500008:
                 if(addr <= size - 12 && *fsRegisterArchive == 0xFFFFFFFF && (addr32[1] & 0xFFF00FF0) == 0xE1800400 && (addr32[2] & 0xFFF00FF0) == 0xE1800FC0) temp = fsRegisterArchive;
                 break;
@@ -189,14 +182,14 @@ static inline bool findLayeredFsSymbols(u8 *code, u32 size, u32 *fsMountArchive,
             if(*temp != 0xFFFFFFFF)
             {
                 found++;
-                if(found == 5) break;
+                if(found == 4) break;
             }
 
             temp = NULL;
         }
     }
 
-    return found == 5;
+    return found == 4;
 }
 
 static inline bool findLayeredFsPayloadOffset(u8 *code, u32 size, u32 roSize, u32 dataSize, u32 roAddress, u32 dataAddress, u32 *payloadOffset, u32 *pathOffset, u32 *pathAddress)
@@ -271,22 +264,12 @@ static inline bool applyCodeIpsPatch(u64 progId, u8 *code, u32 size)
     /* Here we look for "/luma/titles/[u64 titleID in hex, uppercase]/code.ips"
        If it exists it should be an IPS format patch */
 
-    bool isSysmodule = (progId >> 32) == 0x00040130;
-    IFile file;
-
-    if (isSysmodule)
-    {
-        char path[] = "/luma/sysmodules/0000000000000000.ips";
-        progId &= ~0xF0000000ull; // clear N3DS bit
-        progIdToStr(path + 32, progId);
-        if(!openLumaFile(&file, path)) return true;
-    }
-    else
-    {
     char path[] = "/luma/titles/0000000000000000/code.ips";
     progIdToStr(path + 28, progId);
+
+    IFile file;
+
     if(!openLumaFile(&file, path)) return true;
-    }
 
     bool ret = false;
     u8 buffer[5];
@@ -335,70 +318,6 @@ exit:
     return ret;
 }
 
-Result openSysmoduleCxi(IFile *outFile, u64 progId)
-{
-    progId &= ~0xF0000000ull; // clear N3DS bit
-    char path[] = "/luma/sysmodules/0000000000000000.cxi";
-    progIdToStr(path + sizeof("/luma/sysmodules/0000000000000000") - 2, progId);
-
-    FS_ArchiveID archiveId = isSdMode ? ARCHIVE_SDMC : ARCHIVE_NAND_RW;
-    return fileOpen(outFile, archiveId, path, FS_OPEN_READ);
-}
-
-bool readSysmoduleCxiNcchHeader(Ncch *outNcchHeader, IFile *file)
-{
-    u64 total = 0;
-    return R_SUCCEEDED(IFile_ReadAt(file, &total, outNcchHeader, 0, sizeof(Ncch))) && total == sizeof(Ncch);
-}
-
-bool readSysmoduleCxiExHeaderInfo(ExHeader_Info *outExhi, const Ncch *ncchHeader, IFile *file)
-{
-    u64 total = 0;
-    u32 size = ncchHeader->exHeaderSize;
-    if (size < sizeof(ExHeader_Info))
-        return false;
-    return R_SUCCEEDED(IFile_ReadAt(file, &total, outExhi, sizeof(Ncch), size)) && total == size;
-}
-
-bool readSysmoduleCxiCode(u8 *outCode, u32 *outSize, u32 maxSize, IFile *file, const Ncch *ncchHeader)
-{
-    u32 contentUnitShift = 9 + ncchHeader->flags[6];
-    u32 exeFsOffset = ncchHeader->exeFsOffset << contentUnitShift;
-    u32 exeFsSize = ncchHeader->exeFsSize << contentUnitShift;
-
-    if (exeFsSize < sizeof(ExeFsHeader) || exeFsOffset < 0x200 + ncchHeader->exHeaderSize)
-        return false;
-
-    // Read ExeFs header
-    ExeFsHeader hdr;
-    u64 total = 0;
-    u32 size = sizeof(ExeFsHeader);
-    Result res = IFile_ReadAt(file, &total, &hdr, exeFsOffset, size);
-
-    if (R_FAILED(res) || total != size)
-        return false;
-
-    // Get .code section info
-    ExeFsFileHeader *codeHdr = NULL;
-    for (u32 i = 0; i < 8; i++)
-    {
-        ExeFsFileHeader *fileHdr = &hdr.fileHeaders[i];
-        if (strncmp(fileHdr->name, ".code", 8) == 0)
-            codeHdr = fileHdr;
-    }
-
-    if (codeHdr == NULL)
-        return false;
-
-    size = codeHdr->size;
-    *outSize = size;
-    if (size > maxSize)
-        return false;
-
-    res = IFile_ReadAt(file, &total, outCode, exeFsOffset + sizeof(ExeFsHeader) + codeHdr->offset, size);
-    return R_SUCCEEDED(res) && total == size;
-}
-
 bool loadTitleCodeSection(u64 progId, u8 *code, u32 size)
 {
     /* Here we look for "/luma/titles/[u64 titleID in hex, uppercase]/code.bin"
@@ -484,7 +403,7 @@ static inline bool loadTitleLocaleConfig(u64 progId, u8 *mask, u8 *regionId, u8
     if(R_FAILED(IFile_GetSize(&file, &fileSize)) || fileSize < 3) goto exit;
     if(fileSize >= 12) fileSize = 12;
 
-    char buf[12+1] = "------------";
+    char buf[12] = "------------";
     u64 total;
 
     if(R_FAILED(IFile_Read(&file, &total, buf, fileSize))) goto exit;
@@ -508,7 +427,7 @@ static inline bool loadTitleLocaleConfig(u64 progId, u8 *mask, u8 *regionId, u8
                                       "HK", "MO", "--", "--", "--", "--", "--", "--", "ID", "SG", "TH", "PH",
                                       "MY", "--", "--", "--", "CN", "--", "--", "--", "--", "--", "--", "--",
                                       "AE", "IN", "EG", "OM", "QA", "KW", "SA", "SY", "BH", "JO", "--", "--",
-                                      "--", "--", "--", "--", "SM", "VA", "BM"};
+                                      "--", "--", "--", "--", "SM", "VA"};
 
     u32 i;
     for(i = 0; i < sizeof(regions) / sizeof(char *); i++)
@@ -575,7 +494,6 @@ static inline bool patchLayeredFs(u64 progId, u8 *code, u32 size, u32 textSize,
     if(!archiveId) return true;
 
     u32 fsMountArchive = 0xFFFFFFFF,
-        fsUnMountArchive = 0xFFFFFFFF,
         fsRegisterArchive = 0xFFFFFFFF,
         fsTryOpenFile = 0xFFFFFFFF,
         fsOpenFileDirectly = 0xFFFFFFFF,
@@ -583,35 +501,17 @@ static inline bool patchLayeredFs(u64 progId, u8 *code, u32 size, u32 textSize,
         pathOffset = 0,
         pathAddress = 0xDEADCAFE;
 
-    if(!findLayeredFsSymbols(code, textSize, &fsMountArchive, &fsRegisterArchive, &fsTryOpenFile, &fsOpenFileDirectly, &fsUnMountArchive) ||
+    if(!findLayeredFsSymbols(code, textSize, &fsMountArchive, &fsRegisterArchive, &fsTryOpenFile, &fsOpenFileDirectly) ||
        !findLayeredFsPayloadOffset(code, textSize, roSize, dataSize, roAddress, dataAddress, &payloadOffset, &pathOffset, &pathAddress)) return false;
 
-    static const char *updateRomFsMounts[] = { "ro2:",
+    static const char *updateRomFsMounts[] = { "rom2:",
-                                               "rom2:",
                                                "rex:",
                                                "patch:",
                                                "ext:",
                                                "rom:" };
-
-    bool isMarioKart7 = (u32)progId == 0x00030600 || //JPN MK7
-                        (u32)progId == 0x00030700 || //EUR MK7
-                        (u32)progId == 0x00030800 || //USA MK7
-                        (u32)progId == 0x00030A00 || //KOR MK7
-                        (u32)progId == 0x0008B400;   //TWN MK7
-                        // Exclude CHN as it never got updates
-
-    const char *updateRomFsMount;
-
-    if (isMarioKart7)
-    {
-        updateRomFsMount = "pat1"; // Isolated to prevent false-positives
-    }
-
-    else
-    {
     u32 updateRomFsIndex;
 
-        //Locate update RomFS
+    //Locate update RomFSes
     for(updateRomFsIndex = 0; updateRomFsIndex < sizeof(updateRomFsMounts) / sizeof(char *) - 1; updateRomFsIndex++)
     {
         u32 patternSize = strlen(updateRomFsMounts[updateRomFsIndex]);
@@ -620,8 +520,6 @@ static inline bool patchLayeredFs(u64 progId, u8 *code, u32 size, u32 textSize,
         memcpy(temp + 1, updateRomFsMounts[updateRomFsIndex], patternSize);
         if(memsearch(code, temp, size, patternSize + 1) != NULL) break;
     }
-        updateRomFsMount = updateRomFsMounts[updateRomFsIndex];
-    }
 
     //Setup the payload
     u8 *payload = code + payloadOffset;
@@ -631,11 +529,10 @@ static inline bool patchLayeredFs(u64 progId, u8 *code, u32 size, u32 textSize,
     romfsRedirPatchSubstituted2 = *(u32 *)(code + fsTryOpenFile);
     romfsRedirPatchHook2 = MAKE_BRANCH(payloadOffset + (u32)&romfsRedirPatchHook2 - (u32)romfsRedirPatch, fsTryOpenFile + 4);
     romfsRedirPatchCustomPath = pathAddress;
-    romfsRedirPatchFsMountArchive = MAKE_BRANCH_LINK(payloadOffset + (u32)&romfsRedirPatchFsMountArchive - (u32)romfsRedirPatch, fsMountArchive);
+    romfsRedirPatchFsMountArchive = 0x100000 + fsMountArchive;
-    romfsRedirPatchFsUnMountArchive = MAKE_BRANCH_LINK(payloadOffset + (u32)&romfsRedirPatchFsUnMountArchive - (u32)romfsRedirPatch, fsUnMountArchive);
+    romfsRedirPatchFsRegisterArchive = 0x100000 + fsRegisterArchive;
-    romfsRedirPatchFsRegisterArchive = MAKE_BRANCH_LINK(payloadOffset + (u32)&romfsRedirPatchFsRegisterArchive - (u32)romfsRedirPatch, fsRegisterArchive);
     romfsRedirPatchArchiveId = archiveId;
-    memcpy(&romfsRedirPatchUpdateRomFsMount, updateRomFsMount, 4);
+    memcpy(&romfsRedirPatchUpdateRomFsMount, updateRomFsMounts[updateRomFsIndex], 4);
 
     memcpy(payload, romfsRedirPatch, romfsRedirPatchSize);
 
@@ -658,10 +555,6 @@ void patchCode(u64 progId, u16 progVer, u8 *code, u32 size, u32 textSize, u32 ro
                       progId == 0x000400300000A102LL || //CHN Home Menu
                       progId == 0x000400300000B102LL;   //TWN Home Menu
 
-    bool isApp = ((progId >> 32) & ~0x12) == 0x00040000;
-    bool isApplet = (progId >> 32) == 0x00040030;
-    bool isSysmodule = (progId >> 32) == 0x00040130;
-
     if(isHomeMenu)
     {
         bool applyRegionFreePatch = true;
@@ -734,12 +627,11 @@ void patchCode(u64 progId, u16 progVer, u8 *code, u32 size, u32 textSize, u32 ro
              progId == 0x0004001000022000LL || //EUR MSET
              progId == 0x0004001000026000LL || //CHN MSET
              progId == 0x0004001000027000LL || //KOR MSET
-             progId == 0x0004001000028000LL)) //TWN MSET
+             progId == 0x0004001000028000LL) //TWN MSET
-    {
+            && CONFIG(PATCHVERSTRING))
-        if (CONFIG(PATCHVERSTRING))
     {
         static const u16 pattern[] = u"Ve";
-            const u16 *patch;
+        static u16 *patch;
         u32 patchSize = 0,
         currentNand = BOOTCFG_NAND;
 
@@ -750,9 +642,26 @@ void patchCode(u64 progId, u16 progVer, u8 *code, u32 size, u32 textSize, u32 ro
         else
         {
             patchSize = 8;
+            u32 currentFirm = BOOTCFG_FIRM;
 
-                static const u16 *const verStringNandEmu[] = { u" Emu", u"Emu2", u"Emu3", u"Emu4" };
+            static u16 *verStringsNands[] = { u" Sys",
-                patch = currentNand == 0 ? u" Sys" : verStringNandEmu[BOOTCFG_EMUINDEX];
+                                              u" Emu",
+                                              u"Emu2",
+                                              u"Emu3",
+                                              u"Emu4" },
+
+                       *verStringsEmuSys[] = { u"EmuS",
+                                               u"Em2S",
+                                               u"Em3S",
+                                               u"Em4S" },
+
+                       *verStringsSysEmu[] = { u"SysE",
+                                               u"SyE2",
+                                               u"SyE3",
+                                               u"SyE4" };
+
+            patch = (currentFirm != 0) == (currentNand != 0) ? verStringsNands[currentNand] :
+                                          (!currentNand ? verStringsSysEmu[currentFirm - 1] : verStringsEmuSys[currentNand - 1]);
         }
 
         //Patch Ver. string
@@ -764,37 +673,6 @@ void patchCode(u64 progId, u16 progVer, u8 *code, u32 size, u32 textSize, u32 ro
             )) goto error;
     }
 
-        // Allow date picker to select year up to 2099, not just 2050.
-        // NNID user's year-of-birth seems to have a similar restriction,
-        // I'm not removing that as long as any NNID stuff is still active.
-
-        // Patch date picker check on entry (date load):
-        // Look for:
-        // 32 00 5x E3 CMP             Rx, #0x32
-        // ...
-        // 32 x0 A0 C3 MOVGT           Rx, #0x32
-        u32 *off = (u32 *)code;
-        for (; (u8 *)off < code + textSize && ((off[0] & 0xFFF0FFFF) != 0xE3500032 || (off[2] & 0xFFFF0FFF) != 0xC3A00032); off++)
-        {
-            if (((off[0] >> 16) & 0xF) != ((off[2] >> 12) & 0xF)) // ensure same register used
-                continue;
-        }
-        if ((u8 *)off >= code + textSize) goto error;
-        off[0] = (off[0] & ~0xFF) | 99;
-        off[2] = (off[2] & ~0xFF) | 99;
-
-        // Patch date picker actions:
-        // Look for:
-        // 01 00 80 E2 ADD             R0, R0, #1
-        // 32 00 50 E3 CMP             R0, #0x32
-        off = (u32 *)code;
-        for (; (u8 *)off < code + textSize && (off[0] != 0xE2800001 || off[1] != 0xE3500032); off++);
-        if ((u8 *)off >= code + textSize) goto error;
-
-        off[1] = (off[1] & ~0xFF) | 99; // patch increment wrap-around compare instruction
-        off[9] = (off[9] & ~0xFF) | 99; // patch decrement wrap-around conditional move instruction
-    }
-
     else if(progId == 0x0004013000008002LL) //NS
     {
         if(progVer > 4)
@@ -868,7 +746,7 @@ void patchCode(u64 progId, u16 progVer, u8 *code, u32 size, u32 textSize, u32 ro
             0x00, 0x26
         };
 
-        //Disable SecureInfo signature check (redundant)
+        //Disable SecureInfo signature check
         if(!patchMemory(code, textSize,
                 pattern,
                 sizeof(pattern), 0,
@@ -906,7 +784,7 @@ void patchCode(u64 progId, u16 progVer, u8 *code, u32 size, u32 textSize, u32 ro
             0x00, 0x00, 0xA0, 0xE3, 0x1E, 0xFF, 0x2F, 0xE1 //mov r0, #0; bx lr
         };
 
-        //Disable CRR0 signature (RSA2048 with SHA256) check (redundant) and CRO0/CRR0 SHA256 hash checks (section hashes, and hash table)
+        //Disable CRR0 signature (RSA2048 with SHA256) check and CRO0/CRR0 SHA256 hash checks (section hashes, and hash table)
         if(!patchMemory(code, textSize,
                 pattern,
                 sizeof(pattern), -9,
@@ -967,7 +845,6 @@ void patchCode(u64 progId, u16 progVer, u8 *code, u32 size, u32 textSize, u32 ro
 
     else if((progId & ~0xF0000001ULL) == 0x0004013000001A02LL) //DSP, SAFE_FIRM DSP
     {
-        // This patch is redundant
         static const u8 pattern[] = {
             0xE3, 0x10, 0x10, 0x80, 0xE2
         },
@@ -984,21 +861,12 @@ void patchCode(u64 progId, u16 progVer, u8 *code, u32 size, u32 textSize, u32 ro
             )) goto error;
     }
 
-    if (isSysmodule && CONFIG(LOADEXTFIRMSANDMODULES))
+    if(CONFIG(PATCHGAMES))
     {
         if(!patcherApplyCodeBpsPatch(progId, code, size)) goto error;
         if(!applyCodeIpsPatch(progId, code, size)) goto error;
-    }
 
-    if(CONFIG(PATCHGAMES) && !(isApp && nextGamePatchDisabled))
+        if((u32)((progId >> 0x20) & 0xFFFFFFEDULL) == 0x00040000 || isHomeMenu)
-    {
-        if (!isSysmodule)
-        {
-            if(!patcherApplyCodeBpsPatch(progId, code, size)) goto error;
-            if(!applyCodeIpsPatch(progId, code, size)) goto error;
-        }
-
-        if(isApp || isApplet)
         {
             u8 mask,
                regionId,
@@ -1006,13 +874,12 @@ void patchCode(u64 progId, u16 progVer, u8 *code, u32 size, u32 textSize, u32 ro
                countryId,
                stateId;
 
-            if(isLumaWithKext && loadTitleLocaleConfig(progId, &mask, &regionId, &languageId, &countryId, &stateId))
+            if(loadTitleLocaleConfig(progId, &mask, &regionId, &languageId, &countryId, &stateId))
                 svcKernelSetState(0x10001, ((u32)stateId << 24) | ((u32)countryId << 16) | ((u32)languageId << 8) | ((u32)regionId << 4) | (u32)mask , progId);
             if(!patchLayeredFs(progId, code, size, textSize, roSize, dataSize, roAddress, dataAddress)) goto error;
         }
     }
 
-    nextGamePatchDisabled = false;
     return;
 
 error: