docs: add basic changelog for 1.3.0

README.md

@@ -3,7 +3,7 @@
 =====
 
 ![License](https://img.shields.io/badge/License-GPLv2-blue.svg)
-[![Chat on Discord](https://img.shields.io/badge/Discord-5865f2?logo=discord&logoColor=white)](https://discordapp.com/invite/ZdqEhed)
+[![Chat on Discord](https://camo.githubusercontent.com/b4175720ede4f2621aa066ffbabb70ae30044679/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f636861742d446973636f72642d627269676874677265656e2e737667)](https://discordapp.com/invite/ZdqEhed)
 
 Atmosphère is a work-in-progress customized firmware for the Nintendo Switch.
 
@@ -27,6 +27,7 @@ This software is licensed under the terms of the GPLv2, with exemptions for spec
 You can find a copy of the license in the [LICENSE file](LICENSE).
 
 Exemptions:
+* The [yuzu Nintendo Switch emulator](https://github.com/yuzu-emu/yuzu) and the [Ryujinx Team and Contributors](https://github.com/orgs/Ryujinx) are exempt from GPLv2 licensing. They are permitted, each at their individual discretion, to instead license any source code authored for the Atmosphère project as either GPLv2 or later or the [MIT license](https://github.com/Atmosphere-NX/Atmosphere/blob/master/docs/licensing_exemptions/MIT_LICENSE). In doing so, they may alter, supplement, or entirely remove the copyright notice for each file they choose to relicense. Neither the Atmosphère project nor its individual contributors shall assert their moral rights against any of the aforementioned projects.
 * [Nintendo](https://github.com/Nintendo) is exempt from GPLv2 licensing and may (at its option) instead license any source code authored for the Atmosphère project under the Zero-Clause BSD license.
 
 Credits
@@ -37,7 +38,7 @@ In no particular order, we credit the following for their invaluable contributio
 
 * __switchbrew__ for the [libnx](https://github.com/switchbrew/libnx) project and the extensive [documentation, research and tool development](http://switchbrew.org) pertaining to the Nintendo Switch.
 * __devkitPro__ for the [devkitA64](https://devkitpro.org/) toolchain and libnx support.
-* __ReSwitched Team__ for additional [documentation, research and tool development](https://reswitched.github.io/) pertaining to the Nintendo Switch.
+* __ReSwitched Team__ for additional [documentation, research and tool development](https://reswitched.team/) pertaining to the Nintendo Switch.
 * __ChaN__ for the [FatFs](http://elm-chan.org/fsw/ff/00index_e.html) module.
 * __Marcus Geelnard__ for the [bcl-1.2.0](https://sourceforge.net/projects/bcl/files/bcl/bcl-1.2.0) library.
 * __naehrwert__ and __st4rk__ for the original [hekate](https://github.com/nwert/hekate) project and its hwinit code base.

atmosphere.mk

@@ -51,8 +51,6 @@ dist: dist-no-debug
 	cp $(CURRENT_DIRECTORY)/stratosphere/spl/$(ATMOSPHERE_OUT_DIR)/spl.elf $(DIST_DIR)/spl.elf
 	cp $(CURRENT_DIRECTORY)/stratosphere/TioServer/$(ATMOSPHERE_OUT_DIR)/TioServer.elf $(DIST_DIR)/TioServer.elf
 	cp $(CURRENT_DIRECTORY)/troposphere/daybreak/daybreak.elf $(DIST_DIR)/daybreak.elf
-	cp $(CURRENT_DIRECTORY)/troposphere/haze/haze.elf $(DIST_DIR)/haze.elf
-	cp $(CURRENT_DIRECTORY)/troposphere/reboot_to_payload/reboot_to_payload.elf $(DIST_DIR)/reboot_to_payload.elf
 	cd $(DIST_DIR); zip -r ../atmosphere-$(ATMOSPHERE_VERSION)-debug.zip ./*; cd ../;
 	rm -rf $(DIST_DIR)
 
@@ -84,7 +82,7 @@ dist-no-debug: package3 $(CURRENT_DIRECTORY)/$(ATMOSPHERE_OUT_DIR)
 	mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/0100000000000034
 	mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/0100000000000036
 	mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/0100000000000037
-	#mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000003c
+	mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000003c
 	mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/0100000000000042
 	mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/0100000000000420
 	mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000b240
@@ -98,7 +96,7 @@ dist-no-debug: package3 $(CURRENT_DIRECTORY)/$(ATMOSPHERE_OUT_DIR)
 	cp stratosphere/fatal/$(ATMOSPHERE_OUT_DIR)/fatal.nsp $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/0100000000000034/exefs.nsp
 	cp stratosphere/creport/$(ATMOSPHERE_OUT_DIR)/creport.nsp $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/0100000000000036/exefs.nsp
 	cp stratosphere/ro/$(ATMOSPHERE_OUT_DIR)/ro.nsp $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/0100000000000037/exefs.nsp
-	#cp stratosphere/jpegdec/$(ATMOSPHERE_OUT_DIR)/jpegdec.nsp $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000003c/exefs.nsp
+	cp stratosphere/jpegdec/$(ATMOSPHERE_OUT_DIR)/jpegdec.nsp $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000003c/exefs.nsp
 	cp stratosphere/pgl/$(ATMOSPHERE_OUT_DIR)/pgl.nsp $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/0100000000000042/exefs.nsp
 	cp stratosphere/LogManager/$(ATMOSPHERE_OUT_DIR)/LogManager.nsp $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/0100000000000420/exefs.nsp
 	cp stratosphere/htc/$(ATMOSPHERE_OUT_DIR)/htc.nsp $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000b240/exefs.nsp
@@ -108,7 +106,6 @@ dist-no-debug: package3 $(CURRENT_DIRECTORY)/$(ATMOSPHERE_OUT_DIR)
 	rm -r $(DIST_DIR)/stratosphere_romfs
 	cp troposphere/reboot_to_payload/reboot_to_payload.nro $(DIST_DIR)/switch/reboot_to_payload.nro
 	cp troposphere/daybreak/daybreak.nro $(DIST_DIR)/switch/daybreak.nro
-	cp troposphere/haze/haze.nro $(DIST_DIR)/switch/haze.nro
 	cd $(DIST_DIR); zip -r ../atmosphere-$(ATMOSPHERE_VERSION).zip ./*; cd ../;
 	rm -rf $(DIST_DIR)
 	cp fusee/$(ATMOSPHERE_BOOT_OUT_DIR)/fusee.bin $(CURRENT_DIRECTORY)/$(ATMOSPHERE_OUT_DIR)/fusee.bin

config_templates/exosphere.ini

@@ -1,6 +1,6 @@
 # Key: debugmode, default: 1.
 #  Desc: Controls whether kernel is debug mode.
-#   Disabling this will break Atmosphere.
+#   Disabling this may break Atmosphere's debugger in a future release.
 
 # Key: debugmode_user, default: 0.
 #  Desc: Controls whether userland is debug mode.

config_templates/system_settings.ini

@@ -67,10 +67,6 @@
 ; Note that this setting is ignored (and treated as 1) when htc is enabled.
 ; 0 = Disabled, 1 = Enabled
 ; enable_log_manager = u8!0x0
-; Controls whether the bluetooth pairing database is redirected to the SD card (shared across sysmmc/all emummcs)
-; NOTE: On <13.0.0, the database size was 10 instead of 20; booting pre-13.0.0 will truncate the database.
-; 0 = Disabled, 1 = Enabled
-; enable_external_bluetooth_db = u8!0x0
 [hbloader]
 ; Controls the size of the homebrew heap when running as applet.
 ; If set to zero, all available applet memory is used as heap.

docs/changelog.md

@@ -1,175 +1,4 @@
 # Changelog
-## 1.8.0
-+ Basic support was added for 19.0.0.
-  + The console should boot and atmosphère should be fully functional. However, not all modules have been fully updated to reflect the latest changes.
-    + There shouldn't be anything user visible resulting from this, but it will be addressed in a future atmosphère update. There is still one action item from 18.0.0 to be addressed, as well.
-  + `exosphère` was updated to reflect the latest official secure monitor behavior.
-  + `mesosphère` was updated to reflect the latest official kernel behavior.
-  + `loader` was updated to reflect the latest official behavior.
-  + `pm` was updated to reflect the latest official behavior.
-  + `ro` was updated to reflect the latest official behavior.
-+ `creport`'s file acces patterns were optimized, greatly improving performance when generating a crash report.
-+ Atmosphère now uses `relr` relocations where possible.
-  + This reduces the filesize of a number of atmosphère's modules.
-+ A number of minor issues were fixed and improvements were made, including:
-  + Support was fixed for running Atmosphère on newer units with specific Hynix/Micron DRAM chips.
-+ General system stability improvements to enhance the user's experience.
-## 1.7.1
-+ Support was added for 18.1.0.
-+ Atmosphère was updated to use GCC 14/newlib (latest devkitA64/devkitARM releases).
-+ Further changes were for 18.0.0:
-  + `loader` was updated to reflect the latest official behavior.
-+ General system stability improvements to enhance the user's experience.
-## 1.7.0
-+ Basic support was added for 18.0.0.
-  + The console should boot and atmosphère should be fully functional. However, not all modules have been fully updated to reflect the latest changes.
-    + There shouldn't be anything user visible resulting from this, but it will be addressed in a future atmosphère update, once I am not traveling so much.
-  + `exosphère` was updated to reflect the latest official secure monitor behavior.
-  + `mesosphère` was updated to reflect the latest official kernel behavior.
-  + `spl` was updated to reflect the latest official behavior.
-+ `fusee`'s no longer supports applying IPS patches to KIPs.
-  + The only KIPs that are ever present are a) atmosphère modules, b) custom system modules, or c) FS.
-  + The IPS subsystem was originally designed to make nogc patches work for FS, but these are now internal, and it appears the literal only kip patches that exist are for piracy.
-    + I could not find any kip patches posted anywhere made for any other purpose.
-  + It fundamentally does not make sense to slow down boot for every normal user for a feature that has no actual use-case, especially when `fusee` seeks to be a minimal bootloader.
-+ Minor improvements were made to atmosphere's gdbstub, including:
-  + Support was added for QStartNoAckMode.
-  + An issue was fixed that could cause a fatal error when creating too many breakpoints.
-+ A number of minor issues were fixed and improvements were made, including:
-  + `pt-BR` (`PortugueseBr`) is now accepted as a valid language when overriding game locales.
-  + A bug was fixed that could cause atmosphere to incorrectly serialize output object IDs over IPC when using domain objects.
-  + A bug was fixed in `pm`'s resource limit boost logic that could potentially cause legitimate boosts to fail in certain circumstances.
-  + `loader`/`ro` will now throw a fatal error when using invalid IPS patches that go out of bounds, instead of corrupting memory.
-  + Support was fixed for booting using a memory configuration of half of the true available memory (e.g. forcing a 4GB configuration on an 8GB board).
-+ General system stability improvements to enhance the user's experience.
-## 1.6.2
-+ Support was finished for 17.0.0.
-  + `erpt` was updated to support the latest official behavior.
-  + `jpegdec` was updated to support the latest official behavior.
-  + `pm` was updated to support the latest official behavior.
-+ General system stability improvements to enhance the user's experience.
-## 1.6.1
-+ An improved solution to [the problem that would cause consoles which had previously re-built their SYSTEM partition to brick on update-to-17.0.0](https://gist.github.com/SciresM/2ddb708c812ed585c4d99f54e25205ff) was added.
-  + In particular, booting atmosphère will now automatically detect the problem and unbrick any consoles which have fallen into this state.
-+ Some improvements were made to `haze`, including:
-  + Performance was greatly improved:
-    + Support was added for GetObjectPropList, which decreases the amount of requests made by ~8x.
-    + Haze now performs rendering on the GPU, freeing up the CPU to respond to requests in a more timely manner.
-  + An issue was fixed with how `haze` configures `bMaxPacketSize0` which improves support for USB3.
-+ General system stability improvements to enhance the user's experience.
-## 1.6.0
-+ Basic support was added for 17.0.0.
-  + The console should boot and atmosphère should be fully functional. However, not all modules have been fully updated to reflect the latest changes.
-    + There shouldn't be anything user visible resulting from this, but it will be addressed in a soon-to-come atmosphère update.
-  + `exosphère` was updated to reflect the latest official secure monitor behavior.
-  + `mesosphère` was updated to reflect the latest official kernel behavior.
-  + `ncm` was updated to reflect the latest official behavior.
-  + `erpt` was partially updated to support the latest official behavior.
-+ Atmosphere's gdbstub now supports waiting to attach to a specific program id on launch (as opposed to any application).
-  + The monitor command for this is `monitor wait <hex program id>`, where program id can optionally have an `0x` prefix.
-+ Support was added to `haze` for editing files in-place and performing 64-bit transfers (files larger than 4 GB).
-+ `bpc.mitm` was enabled on Mariko units, and now triggers pmic-based shutdowns/reboots (thanks @CTCaer).
-  + This should cause the console to no longer wake ~15 seconds after shutdown on Mariko.
-+ A number of minor issues were fixed and improvements were made, including:
-  + A workaround was added for a change in 17.0.0 that would cause consoles which had previously re-built their SYSTEM partition to brick on update-to-17.0.0.
-+ General system stability improvements to enhance the user's experience.
-## 1.5.5
-+ Support was added for 16.1.0.
-+ General system stability improvements to enhance the user's experience.
-## 1.5.4
-+ Experimental new functionality was implemented to prevent crashing when building romfs for certain games with obscene file counts.
-  + This includes both Fire Emblem: Engage (~190000 files), and The Legend of Zelda: Tears of the Kingdom (~300000) files.
-  + The solution involved adding functionality to ams.mitm/pm to dynamically steal memory from the application (and system) pool as needed when the games have romfs mods.
-    + No memory is taken, and there is no cost to this functionality when playing without mods (or with overrides disabled).
-  + The Legend of Zelda: Tears of the Kingdom is currently the absolute worst case game, requiring ~48 MB of memory to build a romfs image to play with mods.
-    + Right now, the memory is sourced as follows: 32 MB (base ams.mitm heap), 10 MB (stolen from application pool), 8 MB (dynamically stolen from system pool).
-    + This is 50 MB, which allows a little overhead in the worst case (prevents crashing due to exhausting the heap for other allocations in ams.mitm).
-    + Zelda is remarkably sensitive to memory being stolen from the application pool, tolerating no more than 16 MB on 1.0.0 and 12 MB on 1.1.0. I have chosen to steal 10 MB, to be safe, for now.
-      + This may break on a future game update, but I will fix it if and when that happens. There is no perfect solution; the game simply requires too much memory to support mods flawlessly, and I am forced to compromise.
-  + As usual, if you encounter a game that exhausts ams.mitm's memory (crashing it) when loading layeredfs mods, please contact `SciresM#0524`.
-    "I am jinxing myself by saying this, but it's really hard to imagine any game being worse than The Legend of Zelda: Tears of the Kingdom, but if it happens again I will drop everything to fix it as usual".
-+ General system stability improvements to enhance the user's experience.
-## 1.5.3
-+ Support was added for 16.0.3.
-+ Atmosphère was updated to use GCC 13/newlib (latest devkitA64/devkitARM releases).
-  + **Please note**: This introduces a known issue, which is currently being worked on.
-    + As you may recall from the 1.4.1 changelog, Fire Emblem: Engage requires enormous amounts of memory to support using layeredfs mods with the game.
-    + Latest GCC/newlib slightly increases malloc overhead size, which makes the previous memory increase insufficient.
-    + A general-case solution to this is in the works, which should hopefully fix the problem in a way that doesn't jinx me for the future.
-+ A number of minor issues were fixed and improvements were made, including:
-  + An issue was fixed that caused system font replacement to not work on 16.0.0+.
-  + An minor accuracy issue was addressed in mesosphere's management of certain memory ranges; this issue would have had zero visible impact to the end-user.
-+ General system stability improvements to enhance the user's experience.
-## 1.5.2
-+ A homebrew application (`haze`) was added for performing USB file transfer (with thanks to @liamwhite for both design and implementation).
-  + `haze` is included with atmosphère, and provides access to the SD card via the PTP/MTP protocol.
-    + **Please note**: haze will show inside the homebrew menu under the name "USB File Transfer".
-  + **Please note**: Atmosphère cannot be updated at runtime, and trying to install an atmosphère update via haze will fail as usual.
-+ General system stability improvements to enhance the user's experience.
-## 1.5.1
-+ `fatal` was updated to reduce memory footprint.
-  + Starting in 16.0.0, official `fatal` has no framebuffer or rendering logic, and instead calls other system service commands to draw the screen.
-  + However, these commands aren't usable by atmosphère (too small rendering window, bad color support).
-  + To reduce the relative memory footprint differential between atmosphère and official code, the framebuffer (2 MB) is now dynamically allocated when needed.
-    + This will try to allocate from multiple pools (preferring System > System_NonSecure > Application).
-    + This technically requires that 2 MB be available in at least one of these pools for the fatal screen to render (otherwise, a reboot-to-black-and-white-fatal will occur), but this should be a non-issue in almost all cases.
-+ A feature was added to optionally mirror the bluetooth pairing database to the SD card (thanks @ndeadly).
-  + This allows device pairings to be automatically kept in-sync across sysmmc/all emummcs.
-  + This is opt-in, and can be controlled by setting `atmosphere!enable_external_bluetooth_db = u8!0x1`.
-  + When enabled, the pairing database will be synchronized to `/atmosphere/bluetooth_devices.db`.
-+ General system stability improvements to enhance the user's experience.
-## 1.5.0
-+ Support was added for 16.0.0
-  + `mesosphère` was updated to reflect the latest official kernel behavior.
-  + `ncm` was updated to reflect the latest official behavior.
-  + Many FS apis were updated under the hood to reflect the latest official behavior.
-  + **Please Note**: 16.0.0 made breaking changes to a number of system APIs, including in FS/NCM/Shared Font commands that some homebrew programs may use.
-    + These programs may encounter strange errors, and may need to be recompiled with a libnx updated to support 16.0.0's changes to function properly.
-+ A number of minor issues were fixed and improvements were made, including:
-  + An issue was fixed that could cause GPIO outputs to be misconfigured under certain circumstances.
-+ General system stability improvements to enhance the user's experience.
-## 1.4.1
-+ A number of minor issues were fixed and improvements were made, including:
-  + `dmnt` cheat toggle files are no longer ignored when they are missing a trailing newline.
-  + The mechanism for automatically cleaning up `erpt_reports` added in 1.3.0 was fixed.
-    + This was actually just very fundamentally broken and has never worked, but it is verified working now.
-  + Minor fixes were made in `mesosphère` to match official kernel behavior (spin lock assembly was corrected, wrong result on failure in in GetProcessId was corrected).
-  + A missing call to GetSdStatus when initializing SD cards at non uhs-i mode was added in the sdmmc driver.
-+ `ams.mitm`'s memory usage was increased by 16 MB, to prevent crashing when building romfs for games with obscene file counts.
-  + To quote the changelog for 1.2.3: "Animal Crossing's 2.0.0 update contains >99000 files [...] It's really hard to imagine any game being worse than Animal Crossing".
-  + As it turns out, Fire Emblem: Engage has ~186000 files, and is approximately twice as bad as animal crossing.
-  + The additional memory here is taken from the applet pool; no issues are expected to arise from this, but please report anything you may run into.
-  + As usual, if you encounter a game that exhausts ams.mitm's memory (crashing it) when loading layeredfs mods, please contact `SciresM#0524`.
-    + I am jinxing myself by saying this, but it's really hard to imagine any game being worse than Fire Emblem: Engage, but if it happens again I will drop everything to fix it as usual.
-+ General system stability improvements to enhance the user's experience.
-## 1.4.0
-+ Support was added for 15.0.0.
-  + `mesosphère` was updated to reflect the latest official kernel behavior.
-  + `ncm` was updated to reflect the latest official behavior.
-+ A number of minor issues were fixed and improvements were made, including:
-  + The capacity limit on registered add-on contents was fixed in NCM to reflect the increase that occurred in 12.0.0.
-  + An off-by-one was fixed in mesosphere when computing the new value for an address arbiter signaled with ModifyByWaitingCountIfEqual.
-  + dmnt.gen2's gdbstub now sanitizes thread names to prevent invalid characters from breaking gdb.
-  + dmnt.gen2's gdbstub now reports the architecture tag correctly when attached to 32-bit processes.
-  + Support for program-specific html manual content overrides was added for non-hbl takeover context.
-  + A bug was fixed in how emummc constructed the alternate Nintendo directory path.
-    + Previously, this was using `/*/Nintendo/Nintendo` instead of `/*/Nintendo`.
-    + Code was added to automatically move the old folders to the new ones when booting into emummc.
-  + A bug was fixed in boot that caused an incorrectly low input voltage limit to be set.
-+ General system stability improvements to enhance the user's experience.
-## 1.3.2
-+ Support was improved for 14.0.0+.
-  + `loader` was updated to reflect the latest official behaviors.
-  + `ro` was  updated to reflect the latest official behaviors.
-+ A number of minor issues were fixed and improvements were made, including:
-  + A memory leak was fixed in filesystem path management; this could cause a crash when launching games ~100 times, or when deleting/re-downloading games.
-  + A bug was fixed that could cause threads to not see a newly signaled semaphore.
-  + A number of minor inaccuracies were fixed in the updated FileSystem APIs.
-+ General system stability improvements to enhance the user's experience.
-## 1.3.1
-+ Support was added for 14.1.0.
-+ A number of minor under the hood improvements to accuracy were made to better reflect latest official system module behavior, particularly around FS apis.
-+ General system stability improvements to enhance the user's experience.
 ## 1.3.0
 + Support was added for 14.0.0.
   + `mesosphère` was updated to reflect the latest official kernel behavior.
@@ -186,10 +15,9 @@
     + If you are a developer interested in adding support for another target, please reach out to `SciresM#0524` on discord.
   + This is intended to finally allow sanely testing Atmosphère's code, by allowing most of it to run on a PC (with access to a debugger) instead of on game console hardware.
   + In addition, this will allow making PC tools which reuse code written for Atmosphère directly..
-  + **Please Note**: This has no relation to interacting with official software on PC whatsoever. This really allows for making tests and self-contained atmosphère-based command-line tools; the Atmosphère project continues to have zero interest in attempting to run official software of any kind.
-  + In the course of adding this support (and working on tooling using it), a number of fairly major revisions were made to stratosphere (particularly surrounding filesystem code).
-    + **Please Note**: A number of changes made for this (and ones necessary in the process of adding support for 14.0.0) are api-breaking.
-      + If you're a developer and any of this caused your code to break, please feel free to contact `SciresM#0524` for help updating your program.
+  + **Please Note**: This has no relation to interacting with official software on PC whatsoever. This does not and is not intended to enable anything with official software, it only really allows for making tests and self-contained atmosphère-based tools.
+  + In the course of adding this support (and working on tooling using it), a number of major revisions were added to stratosphere:
+    +
 + General system stability improvements to enhance the user's experience.
 ## 1.2.6
 + Support was added for 13.2.1.

docs/faq.md

@@ -1,18 +0,0 @@
-# Frequently Asked Questions
-
-This document serves as a place to store answers for common questions received about Atmosphère.
-
-## What does "June 15th" mean?
-When Atmosphère began development in February 2018, "June 15" was given as the estimate/target date for a first release, to coincide with the planned disclosure of a vulnerability.
-
-This deadline was missed, hard.
-
-People made rather a lot of fun of me (SciresM) for this.
-
-Several months later, when the first Atmosphère release occurred, I captioned it "Happy June 15th!" and pretended like I hadn't missed the first deadline.
-
-This amused me a lot, and so the practice has been kept up for every single release since.
-
-Depending on who you ask, you may be told that this is a dumb joke and it is not funny.
-
-This is incorrect. It is definitely a dumb joke, but it is also hilarious.

docs/features/cheats.md

@@ -49,7 +49,7 @@ Code type 0x0 allows writing a static value to a memory address.
 `0TMR00AA AAAAAAAA VVVVVVVV (VVVVVVVV)`
 
 + T: Width of memory write (1, 2, 4, or 8 bytes).
-+ M: Memory region to write to (0 = Main NSO, 1 = Heap, 2 = Alias, 3 = Aslr, 4 = non-relative).
++ M: Memory region to write to (0 = Main NSO, 1 = Heap, 2 = Alias, 3 = Aslr).
 + R: Register to use as an offset from memory region base.
 + A: Immediate offset to use from memory region base.
 + V: Value to write.
@@ -62,13 +62,11 @@ Code type 0x1 performs a comparison of the contents of memory to a static value.
 If the condition is not met, all instructions until the appropriate End or Else conditional block terminator are skipped.
 
 #### Encoding
-`1TMCXrAA AAAAAAAA VVVVVVVV (VVVVVVVV)`
+`1TMC00AA AAAAAAAA VVVVVVVV (VVVVVVVV)`
 
-+ T: Width of memory read (1, 2, 4, or 8 bytes).
-+ M: Memory region to read from (0 = Main NSO, 1 = Heap, 2 = Alias, 3 = Aslr, 4 = non-relative).
++ T: Width of memory write (1, 2, 4, or 8 bytes).
++ M: Memory region to write to (0 = Main NSO, 1 = Heap, 2 = Alias, 3 = Aslr).
 + C: Condition to use, see below.
-+ X: Operand Type, see below.
-+ r: Offset Register (operand types 1).
 + A: Immediate offset to use from memory region base.
 + V: Value to compare to.
 
@@ -80,9 +78,6 @@ If the condition is not met, all instructions until the appropriate End or Else
 + 5: ==
 + 6: !=
 
-#### Operand Type
-+ 0: Memory Base + Relative Offset
-+ 1: Memory Base + Offset Register + Relative Offset
 ---
 
 ### Code Type 0x2: End Conditional Block
@@ -131,7 +126,7 @@ Code type 0x5 allows loading a value from memory into a register, either using a
 `5TMR00AA AAAAAAAA`
 
 + T: Width of memory read (1, 2, 4, or 8 bytes).
-+ M: Memory region to write to (0 = Main NSO, 1 = Heap, 2 = Alias, 3 = Aslr, 4 = non-relative).
++ M: Memory region to write to (0 = Main NSO, 1 = Heap, 2 = Alias, 3 = Aslr).
 + R: Register to load value into.
 + A: Immediate offset to use from memory region base.
 
@@ -142,22 +137,6 @@ Code type 0x5 allows loading a value from memory into a register, either using a
 + R: Register to load value into. (This register is also used as the base memory address).
 + A: Immediate offset to use from register R.
 
-#### Load from Register Address Encoding
-`5T0R2SAA AAAAAAAA`
-
-+ T: Width of memory read (1, 2, 4, or 8 bytes).
-+ R: Register to load value into. 
-+ S: Register to use as the base memory address.
-+ A: Immediate offset to use from register R.
-
-#### Load From Fixed Address Encoding with offset register
-`5TMR3SAA AAAAAAAA`
-
-+ T: Width of memory read (1, 2, 4, or 8 bytes).
-+ M: Memory region to write to (0 = Main NSO, 1 = Heap, 2 = Alias, 3 = Aslr, 4 = non-relative).
-+ R: Register to load value into.
-+ S: Register to use as offset register.
-+ A: Immediate offset to use from memory region base.
 ---
 
 ### Code Type 0x6: Store Static Value to Register Memory Address
@@ -271,10 +250,7 @@ Code type 0x9 allows performing arithmetic on registers.
 + 7: Logical Not (discards right-hand operand)
 + 8: Logical Xor
 + 9: None/Move (discards right-hand operand)
-+ 10: Float Addition, T==4 single T==8 double
-+ 11: Float Subtraction, T==4 single T==8 double
-+ 12: Float Multiplication, T==4 single T==8 double
-+ 13: Float Division, T==4 single T==8 double
+
 ---
 
 ### Code Type 0xA: Store Register to Memory Address
@@ -404,61 +380,6 @@ Code type 0xC3 reads or writes a static register with a given register.
 
 ---
 
-### Code Type 0xC4: Begin Extended Keypress Conditional Block
-Code type 0xC4 enters or skips a conditional block based on whether a key combination is pressed.
-
-#### Encoding
-`C4r00000 kkkkkkkk kkkkkkkk`
-
-+ r: Auto-repeat, see below.
-+ kkkkkkkkkk: Keypad mask to check against output of `hidKeysDown()`.
-
-Note that for multiple button combinations, the bitmasks should be OR'd together.
-
-#### Auto-repeat
-
-+ 0: The conditional block executes only once when the keypad mask matches. The mask must stop matching to reset for the next trigger.
-+ 1: The conditional block executes as long as the keypad mask matches.
-
-#### Keypad Values
-Note: This is the direct output of `hidKeysDown()`.
-
-+ 000000001: A
-+ 000000002: B
-+ 000000004: X
-+ 000000008: Y
-+ 000000010: Left Stick Pressed
-+ 000000020: Right Stick Pressed
-+ 000000040: L
-+ 000000080: R
-+ 000000100: ZL
-+ 000000200: ZR
-+ 000000400: Plus
-+ 000000800: Minus
-+ 000001000: Left
-+ 000002000: Up
-+ 000004000: Right
-+ 000008000: Down
-+ 000010000: Left Stick Left
-+ 000020000: Left Stick Up
-+ 000040000: Left Stick Right
-+ 000080000: Left Stick Down
-+ 000100000: Right Stick Left
-+ 000200000: Right Stick Up
-+ 000400000: Right Stick Right
-+ 000800000: Right Stick Down
-+ 001000000: SL Left Joy-Con
-+ 002000000: SR Left Joy-Con
-+ 004000000: SL Right Joy-Con
-+ 008000000: SR Right Joy-Con
-+ 010000000: Top button on Poké Ball Plus (Palma) controller
-+ 020000000: Verification
-+ 040000000: B button on Left NES/HVC controller in Handheld mode
-+ 080000000: Left C button in N64 controller
-+ 100000000: Up C button in N64 controller
-+ 200000000: Right C button in N64 controller
-+ 400000000: Down C button in N64 controller
-
 ### Code Type 0xF0: Double Extended-Width Instruction
 Code Type 0xF0 signals to the VM to treat the upper three nybbles of the first dword as instruction type, instead of just the upper nybble.
 

docs/main.md

@@ -27,6 +27,3 @@ A list of planned features for Atmosphère can be found [here](roadmap.md).
 
 ## Release History
 A changelog of previous versions of Atmosphère can be found [here](changelog.md).
-
-## Frequently Asked Questions
-Answers to one or more frequently asked questions may be found [here](faq.md).

emummc/.gitrepo

@@ -4,9 +4,9 @@
 ; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme
 ;
 [subrepo]
-	remote = https://github.com/m4xw/emummc
+	remote = https://github.com/m4xw/emuMMC
 	branch = develop
-	commit = d248ea6f700c3e6987549e30a1e2eeb609ce9f8c
-	parent = 9112461620330ba73a74926edd4c08b3cc0310f0
+	commit = a9d56959460fc794ce2cb6405402c25a3e89c47f
+	parent = ff719641396c635b735873fb2b020c910f768a04
 	method = merge
 	cmdver = 0.4.1

emummc/README.md

@@ -2,7 +2,7 @@
 *A SDMMC driver replacement for Nintendo's Filesystem Services, by **m4xw***  
 
 ### Supported Horizon Versions
-**1.0.0 - 19.0.0**
+**1.0.0 - 13.1.0**
 
 ## Features
 * Arbitrary SDMMC backend selection  

emummc/source/FS/FS_offsets.c

@@ -61,20 +61,6 @@
 #include "offsets/1310_exfat.h"
 #include "offsets/1400.h"
 #include "offsets/1400_exfat.h"
-#include "offsets/1500.h"
-#include "offsets/1500_exfat.h"
-#include "offsets/1600.h"
-#include "offsets/1600_exfat.h"
-#include "offsets/1603.h"
-#include "offsets/1603_exfat.h"
-#include "offsets/1700.h"
-#include "offsets/1700_exfat.h"
-#include "offsets/1800.h"
-#include "offsets/1800_exfat.h"
-#include "offsets/1810.h"
-#include "offsets/1810_exfat.h"
-#include "offsets/1900.h"
-#include "offsets/1900_exfat.h"
 #include "../utils/fatal.h"
 
 #define GET_OFFSET_STRUCT_NAME(vers) g_offsets##vers
@@ -147,20 +133,6 @@ DEFINE_OFFSET_STRUCT(_1310);
 DEFINE_OFFSET_STRUCT(_1310_EXFAT);
 DEFINE_OFFSET_STRUCT(_1400);
 DEFINE_OFFSET_STRUCT(_1400_EXFAT);
-DEFINE_OFFSET_STRUCT(_1500);
-DEFINE_OFFSET_STRUCT(_1500_EXFAT);
-DEFINE_OFFSET_STRUCT(_1600);
-DEFINE_OFFSET_STRUCT(_1600_EXFAT);
-DEFINE_OFFSET_STRUCT(_1603);
-DEFINE_OFFSET_STRUCT(_1603_EXFAT);
-DEFINE_OFFSET_STRUCT(_1700);
-DEFINE_OFFSET_STRUCT(_1700_EXFAT);
-DEFINE_OFFSET_STRUCT(_1800);
-DEFINE_OFFSET_STRUCT(_1800_EXFAT);
-DEFINE_OFFSET_STRUCT(_1810);
-DEFINE_OFFSET_STRUCT(_1810_EXFAT);
-DEFINE_OFFSET_STRUCT(_1900);
-DEFINE_OFFSET_STRUCT(_1900_EXFAT);
 
 const fs_offsets_t *get_fs_offsets(enum FS_VER version) {
     switch (version) {
@@ -254,34 +226,6 @@ const fs_offsets_t *get_fs_offsets(enum FS_VER version) {
             return &(GET_OFFSET_STRUCT_NAME(_1400));
         case FS_VER_14_0_0_EXFAT:
             return &(GET_OFFSET_STRUCT_NAME(_1400_EXFAT));
-        case FS_VER_15_0_0:
-            return &(GET_OFFSET_STRUCT_NAME(_1500));
-        case FS_VER_15_0_0_EXFAT:
-            return &(GET_OFFSET_STRUCT_NAME(_1500_EXFAT));
-        case FS_VER_16_0_0:
-            return &(GET_OFFSET_STRUCT_NAME(_1600));
-        case FS_VER_16_0_0_EXFAT:
-            return &(GET_OFFSET_STRUCT_NAME(_1600_EXFAT));
-        case FS_VER_16_0_3:
-            return &(GET_OFFSET_STRUCT_NAME(_1603));
-        case FS_VER_16_0_3_EXFAT:
-            return &(GET_OFFSET_STRUCT_NAME(_1603_EXFAT));
-        case FS_VER_17_0_0:
-            return &(GET_OFFSET_STRUCT_NAME(_1700));
-        case FS_VER_17_0_0_EXFAT:
-            return &(GET_OFFSET_STRUCT_NAME(_1700_EXFAT));
-        case FS_VER_18_0_0:
-            return &(GET_OFFSET_STRUCT_NAME(_1800));
-        case FS_VER_18_0_0_EXFAT:
-            return &(GET_OFFSET_STRUCT_NAME(_1800_EXFAT));
-        case FS_VER_18_1_0:
-            return &(GET_OFFSET_STRUCT_NAME(_1810));
-        case FS_VER_18_1_0_EXFAT:
-            return &(GET_OFFSET_STRUCT_NAME(_1810_EXFAT));
-        case FS_VER_19_0_0:
-            return &(GET_OFFSET_STRUCT_NAME(_1900));
-        case FS_VER_19_0_0_EXFAT:
-            return &(GET_OFFSET_STRUCT_NAME(_1900_EXFAT));
         default:
             fatal_abort(Fatal_UnknownVersion);
     }

emummc/source/FS/FS_versions.h

@@ -89,27 +89,6 @@ enum FS_VER
     FS_VER_14_0_0,
     FS_VER_14_0_0_EXFAT,
 
-    FS_VER_15_0_0,
-    FS_VER_15_0_0_EXFAT,
-
-    FS_VER_16_0_0,
-    FS_VER_16_0_0_EXFAT,
-
-    FS_VER_16_0_3,
-    FS_VER_16_0_3_EXFAT,
-
-    FS_VER_17_0_0,
-    FS_VER_17_0_0_EXFAT,
-
-    FS_VER_18_0_0,
-    FS_VER_18_0_0_EXFAT,
-
-    FS_VER_18_1_0,
-    FS_VER_18_1_0_EXFAT,
-
-    FS_VER_19_0_0,
-    FS_VER_19_0_0_EXFAT,
-
     FS_VER_MAX,
 };
 

emummc/source/FS/offsets/1500.h

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2019 m4xw <m4x@m4xw.net>
- * Copyright (c) 2019 Atmosphere-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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/>.
- */
-#ifndef __FS_1500_H__
-#define __FS_1500_H__
-
-// Accessor vtable getters
-#define FS_OFFSET_1500_SDMMC_ACCESSOR_GC   0x183E20
-#define FS_OFFSET_1500_SDMMC_ACCESSOR_SD   0x185AA0
-#define FS_OFFSET_1500_SDMMC_ACCESSOR_NAND 0x1842E0
-
-// Hooks
-#define FS_OFFSET_1500_SDMMC_WRAPPER_READ  0x17FCF0
-#define FS_OFFSET_1500_SDMMC_WRAPPER_WRITE 0x17FD50
-#define FS_OFFSET_1500_RTLD                0x26518
-#define FS_OFFSET_1500_RTLD_DESTINATION    ((uintptr_t)(INT64_C(-0x3C)))
-
-#define FS_OFFSET_1500_CLKRST_SET_MIN_V_CLK_RATE 0x1A0870
-
-// Misc funcs
-#define FS_OFFSET_1500_LOCK_MUTEX          0x1791A0
-#define FS_OFFSET_1500_UNLOCK_MUTEX        0x1791F0
-
-#define FS_OFFSET_1500_SDMMC_WRAPPER_CONTROLLER_OPEN  0x17FCB0
-#define FS_OFFSET_1500_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x17FCD0
-
-// Misc Data
-#define FS_OFFSET_1500_SD_MUTEX            0xFF33F0
-#define FS_OFFSET_1500_NAND_MUTEX          0xFEE2E8
-#define FS_OFFSET_1500_ACTIVE_PARTITION    0xFEE328
-#define FS_OFFSET_1500_SDMMC_DAS_HANDLE    0xFD38D8
-
-// NOPs
-#define FS_OFFSET_1500_SD_DAS_INIT         0x25454
-
-// Nintendo Paths
-#define FS_OFFSET_1500_NINTENDO_PATHS \
-{ \
-	{.opcode_reg = 3, .adrp_offset = 0x00063050, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x0006FDE8, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x000768D4, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x00089364, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
-}
-
-#endif // __FS_1500_H__

emummc/source/FS/offsets/1500_exfat.h

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2019 m4xw <m4x@m4xw.net>
- * Copyright (c) 2019 Atmosphere-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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/>.
- */
-#ifndef __FS_1500_EXFAT_H__
-#define __FS_1500_EXFAT_H__
-
-// Accessor vtable getters
-#define FS_OFFSET_1500_EXFAT_SDMMC_ACCESSOR_GC   0x18EDB0
-#define FS_OFFSET_1500_EXFAT_SDMMC_ACCESSOR_SD   0x190A30
-#define FS_OFFSET_1500_EXFAT_SDMMC_ACCESSOR_NAND 0x18F270
-
-// Hooks
-#define FS_OFFSET_1500_EXFAT_SDMMC_WRAPPER_READ  0x18AC80
-#define FS_OFFSET_1500_EXFAT_SDMMC_WRAPPER_WRITE 0x18ACE0
-#define FS_OFFSET_1500_EXFAT_RTLD                0x26518
-#define FS_OFFSET_1500_EXFAT_RTLD_DESTINATION    ((uintptr_t)(INT64_C(-0x3C)))
-
-#define FS_OFFSET_1500_EXFAT_CLKRST_SET_MIN_V_CLK_RATE 0x1AB800
-
-// Misc funcs
-#define FS_OFFSET_1500_EXFAT_LOCK_MUTEX          0x184130
-#define FS_OFFSET_1500_EXFAT_UNLOCK_MUTEX        0x184180
-
-#define FS_OFFSET_1500_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0x18AC40
-#define FS_OFFSET_1500_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x18AC60
-
-// Misc Data
-#define FS_OFFSET_1500_EXFAT_SD_MUTEX            0x10053F0
-#define FS_OFFSET_1500_EXFAT_NAND_MUTEX          0x10002E8
-#define FS_OFFSET_1500_EXFAT_ACTIVE_PARTITION    0x1000328
-#define FS_OFFSET_1500_EXFAT_SDMMC_DAS_HANDLE    0xFE08D8
-
-// NOPs
-#define FS_OFFSET_1500_EXFAT_SD_DAS_INIT         0x25454
-
-// Nintendo Paths
-#define FS_OFFSET_1500_EXFAT_NINTENDO_PATHS \
-{ \
-	{.opcode_reg = 3, .adrp_offset = 0x00063050, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x0006FDE8, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x000768D4, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x00089364, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
-}
-
-#endif // __FS_1500_EXFAT_H__

emummc/source/FS/offsets/1600.h

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2019 m4xw <m4x@m4xw.net>
- * Copyright (c) 2019 Atmosphere-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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/>.
- */
-#ifndef __FS_1600_H__
-#define __FS_1600_H__
-
-// Accessor vtable getters
-#define FS_OFFSET_1600_SDMMC_ACCESSOR_GC   0x1862A0
-#define FS_OFFSET_1600_SDMMC_ACCESSOR_SD   0x187F20
-#define FS_OFFSET_1600_SDMMC_ACCESSOR_NAND 0x186760
-
-// Hooks
-#define FS_OFFSET_1600_SDMMC_WRAPPER_READ  0x1821F0
-#define FS_OFFSET_1600_SDMMC_WRAPPER_WRITE 0x182250
-#define FS_OFFSET_1600_RTLD                0x269B0
-#define FS_OFFSET_1600_RTLD_DESTINATION    ((uintptr_t)(INT64_C(-0x3C)))
-
-#define FS_OFFSET_1600_CLKRST_SET_MIN_V_CLK_RATE 0x1A2D30
-
-// Misc funcs
-#define FS_OFFSET_1600_LOCK_MUTEX          0x17B730
-#define FS_OFFSET_1600_UNLOCK_MUTEX        0x17B780
-
-#define FS_OFFSET_1600_SDMMC_WRAPPER_CONTROLLER_OPEN  0x1821B0
-#define FS_OFFSET_1600_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1821D0
-
-// Misc Data
-#define FS_OFFSET_1600_SD_MUTEX            0xFFB3F0
-#define FS_OFFSET_1600_NAND_MUTEX          0xFF6B58
-#define FS_OFFSET_1600_ACTIVE_PARTITION    0xFF6B98
-#define FS_OFFSET_1600_SDMMC_DAS_HANDLE    0xFDC8B0
-
-// NOPs
-#define FS_OFFSET_1600_SD_DAS_INIT         0x258D4
-
-// Nintendo Paths
-#define FS_OFFSET_1600_NINTENDO_PATHS \
-{ \
-	{.opcode_reg = 3, .adrp_offset = 0x00063B48, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x00070D6C, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x0007790C, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x0008A754, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
-}
-
-#endif // __FS_1600_H__

emummc/source/FS/offsets/1600_exfat.h

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2019 m4xw <m4x@m4xw.net>
- * Copyright (c) 2019 Atmosphere-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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/>.
- */
-#ifndef __FS_1600_EXFAT_H__
-#define __FS_1600_EXFAT_H__
-
-// Accessor vtable getters
-#define FS_OFFSET_1600_EXFAT_SDMMC_ACCESSOR_GC   0x190F80
-#define FS_OFFSET_1600_EXFAT_SDMMC_ACCESSOR_SD   0x192C00
-#define FS_OFFSET_1600_EXFAT_SDMMC_ACCESSOR_NAND 0x191440
-
-// Hooks
-#define FS_OFFSET_1600_EXFAT_SDMMC_WRAPPER_READ  0x18CED0
-#define FS_OFFSET_1600_EXFAT_SDMMC_WRAPPER_WRITE 0x18CF30
-#define FS_OFFSET_1600_EXFAT_RTLD                0x269B0
-#define FS_OFFSET_1600_EXFAT_RTLD_DESTINATION    ((uintptr_t)(INT64_C(-0x3C)))
-
-#define FS_OFFSET_1600_EXFAT_CLKRST_SET_MIN_V_CLK_RATE 0x1ADA10
-
-// Misc funcs
-#define FS_OFFSET_1600_EXFAT_LOCK_MUTEX          0x186410
-#define FS_OFFSET_1600_EXFAT_UNLOCK_MUTEX        0x186460
-
-#define FS_OFFSET_1600_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0x18CE90
-#define FS_OFFSET_1600_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x18CEB0
-
-// Misc Data
-#define FS_OFFSET_1600_EXFAT_SD_MUTEX            0x100D3F0
-#define FS_OFFSET_1600_EXFAT_NAND_MUTEX          0x1008B58
-#define FS_OFFSET_1600_EXFAT_ACTIVE_PARTITION    0x1008B98
-#define FS_OFFSET_1600_EXFAT_SDMMC_DAS_HANDLE    0xFE98B0
-
-// NOPs
-#define FS_OFFSET_1600_EXFAT_SD_DAS_INIT         0x258D4
-
-// Nintendo Paths
-#define FS_OFFSET_1600_EXFAT_NINTENDO_PATHS \
-{ \
-	{.opcode_reg = 3, .adrp_offset = 0x00063B48, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x00070D6C, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x0007790C, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x0008A754, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
-}
-
-#endif // __FS_1600_EXFAT_H__

emummc/source/FS/offsets/1603.h

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2019 m4xw <m4x@m4xw.net>
- * Copyright (c) 2019 Atmosphere-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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/>.
- */
-#ifndef __FS_1603_H__
-#define __FS_1603_H__
-
-// Accessor vtable getters
-#define FS_OFFSET_1603_SDMMC_ACCESSOR_GC   0x1862F0
-#define FS_OFFSET_1603_SDMMC_ACCESSOR_SD   0x187F70
-#define FS_OFFSET_1603_SDMMC_ACCESSOR_NAND 0x1867B0
-
-// Hooks
-#define FS_OFFSET_1603_SDMMC_WRAPPER_READ  0x182240
-#define FS_OFFSET_1603_SDMMC_WRAPPER_WRITE 0x1822A0
-#define FS_OFFSET_1603_RTLD                0x269B0
-#define FS_OFFSET_1603_RTLD_DESTINATION    ((uintptr_t)(INT64_C(-0x3C)))
-
-#define FS_OFFSET_1603_CLKRST_SET_MIN_V_CLK_RATE 0x1A2D80
-
-// Misc funcs
-#define FS_OFFSET_1603_LOCK_MUTEX          0x17B780
-#define FS_OFFSET_1603_UNLOCK_MUTEX        0x17B7D0
-
-#define FS_OFFSET_1603_SDMMC_WRAPPER_CONTROLLER_OPEN  0x182200
-#define FS_OFFSET_1603_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x182220
-
-// Misc Data
-#define FS_OFFSET_1603_SD_MUTEX            0xFFB3F0
-#define FS_OFFSET_1603_NAND_MUTEX          0xFF6B58
-#define FS_OFFSET_1603_ACTIVE_PARTITION    0xFF6B98
-#define FS_OFFSET_1603_SDMMC_DAS_HANDLE    0xFDC8B0
-
-// NOPs
-#define FS_OFFSET_1603_SD_DAS_INIT         0x258D4
-
-// Nintendo Paths
-#define FS_OFFSET_1603_NINTENDO_PATHS \
-{ \
-	{.opcode_reg = 3, .adrp_offset = 0x00063B98, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x00070DBC, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x0007795C, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x0008A7A4, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
-}
-
-#endif // __FS_1603_H__

emummc/source/FS/offsets/1603_exfat.h

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2019 m4xw <m4x@m4xw.net>
- * Copyright (c) 2019 Atmosphere-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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/>.
- */
-#ifndef __FS_1603_EXFAT_H__
-#define __FS_1603_EXFAT_H__
-
-// Accessor vtable getters
-#define FS_OFFSET_1603_EXFAT_SDMMC_ACCESSOR_GC   0x190FD0
-#define FS_OFFSET_1603_EXFAT_SDMMC_ACCESSOR_SD   0x192C50
-#define FS_OFFSET_1603_EXFAT_SDMMC_ACCESSOR_NAND 0x191490
-
-// Hooks
-#define FS_OFFSET_1603_EXFAT_SDMMC_WRAPPER_READ  0x18CF20
-#define FS_OFFSET_1603_EXFAT_SDMMC_WRAPPER_WRITE 0x18CF80
-#define FS_OFFSET_1603_EXFAT_RTLD                0x269B0
-#define FS_OFFSET_1603_EXFAT_RTLD_DESTINATION    ((uintptr_t)(INT64_C(-0x3C)))
-
-#define FS_OFFSET_1603_EXFAT_CLKRST_SET_MIN_V_CLK_RATE 0x1ADA60
-
-// Misc funcs
-#define FS_OFFSET_1603_EXFAT_LOCK_MUTEX          0x186460
-#define FS_OFFSET_1603_EXFAT_UNLOCK_MUTEX        0x1864B0
-
-#define FS_OFFSET_1603_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0x18CEE0
-#define FS_OFFSET_1603_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x18CF00
-
-// Misc Data
-#define FS_OFFSET_1603_EXFAT_SD_MUTEX            0x100D3F0
-#define FS_OFFSET_1603_EXFAT_NAND_MUTEX          0x1008B58
-#define FS_OFFSET_1603_EXFAT_ACTIVE_PARTITION    0x1008B98
-#define FS_OFFSET_1603_EXFAT_SDMMC_DAS_HANDLE    0xFE98B0
-
-// NOPs
-#define FS_OFFSET_1603_EXFAT_SD_DAS_INIT         0x258D4
-
-// Nintendo Paths
-#define FS_OFFSET_1603_EXFAT_NINTENDO_PATHS \
-{ \
-	{.opcode_reg = 3, .adrp_offset = 0x00063B98, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x00070DBC, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x0007795C, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x0008A7A4, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
-}
-
-#endif // __FS_1603_EXFAT_H__

emummc/source/FS/offsets/1700.h

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2019 m4xw <m4x@m4xw.net>
- * Copyright (c) 2019 Atmosphere-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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/>.
- */
-#ifndef __FS_1700_H__
-#define __FS_1700_H__
-
-// Accessor vtable getters
-#define FS_OFFSET_1700_SDMMC_ACCESSOR_GC   0x18AD00
-#define FS_OFFSET_1700_SDMMC_ACCESSOR_SD   0x18C9D0
-#define FS_OFFSET_1700_SDMMC_ACCESSOR_NAND 0x18B1D0
-
-// Hooks
-#define FS_OFFSET_1700_SDMMC_WRAPPER_READ  0x186BC0
-#define FS_OFFSET_1700_SDMMC_WRAPPER_WRITE 0x186C20
-#define FS_OFFSET_1700_RTLD                0x29D10
-#define FS_OFFSET_1700_RTLD_DESTINATION    ((uintptr_t)(INT64_C(-0x3C)))
-
-#define FS_OFFSET_1700_CLKRST_SET_MIN_V_CLK_RATE 0x1A7B60
-
-// Misc funcs
-#define FS_OFFSET_1700_LOCK_MUTEX          0x17FEA0
-#define FS_OFFSET_1700_UNLOCK_MUTEX        0x17FEF0
-
-#define FS_OFFSET_1700_SDMMC_WRAPPER_CONTROLLER_OPEN  0x186B80
-#define FS_OFFSET_1700_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x186BA0
-
-// Misc Data
-#define FS_OFFSET_1700_SD_MUTEX            0xFCE3F0
-#define FS_OFFSET_1700_NAND_MUTEX          0xFC9B78
-#define FS_OFFSET_1700_ACTIVE_PARTITION    0xFC9BB8
-#define FS_OFFSET_1700_SDMMC_DAS_HANDLE    0xFAF840
-
-// NOPs
-#define FS_OFFSET_1700_SD_DAS_INIT         0x28C64
-
-// Nintendo Paths
-#define FS_OFFSET_1700_NINTENDO_PATHS \
-{ \
-	{.opcode_reg = 3, .adrp_offset = 0x00068068, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x0007510C, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x0007BEAC, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x0008F674, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
-}
-
-#endif // __FS_1700_H__

emummc/source/FS/offsets/1700_exfat.h

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2019 m4xw <m4x@m4xw.net>
- * Copyright (c) 2019 Atmosphere-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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/>.
- */
-#ifndef __FS_1700_EXFAT_H__
-#define __FS_1700_EXFAT_H__
-
-// Accessor vtable getters
-#define FS_OFFSET_1700_EXFAT_SDMMC_ACCESSOR_GC   0x195B60
-#define FS_OFFSET_1700_EXFAT_SDMMC_ACCESSOR_SD   0x197830
-#define FS_OFFSET_1700_EXFAT_SDMMC_ACCESSOR_NAND 0x196030
-
-// Hooks
-#define FS_OFFSET_1700_EXFAT_SDMMC_WRAPPER_READ  0x191A20
-#define FS_OFFSET_1700_EXFAT_SDMMC_WRAPPER_WRITE 0x191A80
-#define FS_OFFSET_1700_EXFAT_RTLD                0x29D10
-#define FS_OFFSET_1700_EXFAT_RTLD_DESTINATION    ((uintptr_t)(INT64_C(-0x3C)))
-
-#define FS_OFFSET_1700_EXFAT_CLKRST_SET_MIN_V_CLK_RATE 0x1B29C0
-
-// Misc funcs
-#define FS_OFFSET_1700_EXFAT_LOCK_MUTEX          0x18AD00
-#define FS_OFFSET_1700_EXFAT_UNLOCK_MUTEX        0x18AD50
-
-#define FS_OFFSET_1700_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0x1919E0
-#define FS_OFFSET_1700_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x191A00
-
-// Misc Data
-#define FS_OFFSET_1700_EXFAT_SD_MUTEX            0xFE03F0
-#define FS_OFFSET_1700_EXFAT_NAND_MUTEX          0xFDBB78
-#define FS_OFFSET_1700_EXFAT_ACTIVE_PARTITION    0xFDBBB8
-#define FS_OFFSET_1700_EXFAT_SDMMC_DAS_HANDLE    0xFBC840
-
-// NOPs
-#define FS_OFFSET_1700_EXFAT_SD_DAS_INIT         0x28C64
-
-// Nintendo Paths
-#define FS_OFFSET_1700_EXFAT_NINTENDO_PATHS \
-{ \
-	{.opcode_reg = 3, .adrp_offset = 0x00068068, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x0007510C, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x0007BEAC, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x0008F674, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
-}
-
-#endif // __FS_1700_EXFAT_H__

emummc/source/FS/offsets/1800.h

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2019 m4xw <m4x@m4xw.net>
- * Copyright (c) 2019 Atmosphere-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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/>.
- */
-#ifndef __FS_1800_H__
-#define __FS_1800_H__
-
-// Accessor vtable getters
-#define FS_OFFSET_1800_SDMMC_ACCESSOR_GC   0x18AB00
-#define FS_OFFSET_1800_SDMMC_ACCESSOR_SD   0x18C800
-#define FS_OFFSET_1800_SDMMC_ACCESSOR_NAND 0x18AFE0
-
-// Hooks
-#define FS_OFFSET_1800_SDMMC_WRAPPER_READ  0x186A50
-#define FS_OFFSET_1800_SDMMC_WRAPPER_WRITE 0x186AB0
-#define FS_OFFSET_1800_RTLD                0x2A3A4
-#define FS_OFFSET_1800_RTLD_DESTINATION    ((uintptr_t)(INT64_C(-0x44)))
-
-#define FS_OFFSET_1800_CLKRST_SET_MIN_V_CLK_RATE 0x1A77D0
-
-// Misc funcs
-#define FS_OFFSET_1800_LOCK_MUTEX          0x17FCC0
-#define FS_OFFSET_1800_UNLOCK_MUTEX        0x17FD10
-
-#define FS_OFFSET_1800_SDMMC_WRAPPER_CONTROLLER_OPEN  0x186A10
-#define FS_OFFSET_1800_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x186A30
-
-// Misc Data
-#define FS_OFFSET_1800_SD_MUTEX            0xFD13F0
-#define FS_OFFSET_1800_NAND_MUTEX          0xFCCB28
-#define FS_OFFSET_1800_ACTIVE_PARTITION    0xFCCB68
-#define FS_OFFSET_1800_SDMMC_DAS_HANDLE    0xFB1950
-
-// NOPs
-#define FS_OFFSET_1800_SD_DAS_INIT         0x28F24
-
-// Nintendo Paths
-#define FS_OFFSET_1800_NINTENDO_PATHS \
-{ \
-	{.opcode_reg = 3, .adrp_offset = 0x00068B08, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x000758DC, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x0007C77C, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x000905C4, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
-}
-
-#endif // __FS_1800_H__

emummc/source/FS/offsets/1800_exfat.h

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2019 m4xw <m4x@m4xw.net>
- * Copyright (c) 2019 Atmosphere-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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/>.
- */
-#ifndef __FS_1800_EXFAT_H__
-#define __FS_1800_EXFAT_H__
-
-// Accessor vtable getters
-#define FS_OFFSET_1800_EXFAT_SDMMC_ACCESSOR_GC   0x195B90
-#define FS_OFFSET_1800_EXFAT_SDMMC_ACCESSOR_SD   0x197890
-#define FS_OFFSET_1800_EXFAT_SDMMC_ACCESSOR_NAND 0x196070
-
-// Hooks
-#define FS_OFFSET_1800_EXFAT_SDMMC_WRAPPER_READ  0x191AE0
-#define FS_OFFSET_1800_EXFAT_SDMMC_WRAPPER_WRITE 0x191B40
-#define FS_OFFSET_1800_EXFAT_RTLD                0x2A3A4
-#define FS_OFFSET_1800_EXFAT_RTLD_DESTINATION    ((uintptr_t)(INT64_C(-0x44)))
-
-#define FS_OFFSET_1800_EXFAT_CLKRST_SET_MIN_V_CLK_RATE 0x1B2860
-
-// Misc funcs
-#define FS_OFFSET_1800_EXFAT_LOCK_MUTEX          0x18AD50
-#define FS_OFFSET_1800_EXFAT_UNLOCK_MUTEX        0x18ADA0
-
-#define FS_OFFSET_1800_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0x191AA0
-#define FS_OFFSET_1800_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x191AC0
-
-// Misc Data
-#define FS_OFFSET_1800_EXFAT_SD_MUTEX            0xFE33F0
-#define FS_OFFSET_1800_EXFAT_NAND_MUTEX          0xFDEB28
-#define FS_OFFSET_1800_EXFAT_ACTIVE_PARTITION    0xFDEB68
-#define FS_OFFSET_1800_EXFAT_SDMMC_DAS_HANDLE    0xFBE950
-
-// NOPs
-#define FS_OFFSET_1800_EXFAT_SD_DAS_INIT         0x28F24
-
-// Nintendo Paths
-#define FS_OFFSET_1800_EXFAT_NINTENDO_PATHS \
-{ \
-	{.opcode_reg = 3, .adrp_offset = 0x00068B08, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x000758DC, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x0007C77C, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x000905C4, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
-}
-
-#endif // __FS_1800_EXFAT_H__

emummc/source/FS/offsets/1810.h

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2019 m4xw <m4x@m4xw.net>
- * Copyright (c) 2019 Atmosphere-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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/>.
- */
-#ifndef __FS_1810_H__
-#define __FS_1810_H__
-
-// Accessor vtable getters
-#define FS_OFFSET_1810_SDMMC_ACCESSOR_GC   0x18AB00
-#define FS_OFFSET_1810_SDMMC_ACCESSOR_SD   0x18C800
-#define FS_OFFSET_1810_SDMMC_ACCESSOR_NAND 0x18AFE0
-
-// Hooks
-#define FS_OFFSET_1810_SDMMC_WRAPPER_READ  0x186A50
-#define FS_OFFSET_1810_SDMMC_WRAPPER_WRITE 0x186AB0
-#define FS_OFFSET_1810_RTLD                0x2A3A4
-#define FS_OFFSET_1810_RTLD_DESTINATION    ((uintptr_t)(INT64_C(-0x44)))
-
-#define FS_OFFSET_1810_CLKRST_SET_MIN_V_CLK_RATE 0x1A77D0
-
-// Misc funcs
-#define FS_OFFSET_1810_LOCK_MUTEX          0x17FCC0
-#define FS_OFFSET_1810_UNLOCK_MUTEX        0x17FD10
-
-#define FS_OFFSET_1810_SDMMC_WRAPPER_CONTROLLER_OPEN  0x186A10
-#define FS_OFFSET_1810_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x186A30
-
-// Misc Data
-#define FS_OFFSET_1810_SD_MUTEX            0xFD13F0
-#define FS_OFFSET_1810_NAND_MUTEX          0xFCCB28
-#define FS_OFFSET_1810_ACTIVE_PARTITION    0xFCCB68
-#define FS_OFFSET_1810_SDMMC_DAS_HANDLE    0xFB1950
-
-// NOPs
-#define FS_OFFSET_1810_SD_DAS_INIT         0x28F24
-
-// Nintendo Paths
-#define FS_OFFSET_1810_NINTENDO_PATHS \
-{ \
-	{.opcode_reg = 3, .adrp_offset = 0x00068B08, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x000758DC, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x0007C77C, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x000905C4, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
-}
-
-#endif // __FS_1810_H__

emummc/source/FS/offsets/1810_exfat.h

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2019 m4xw <m4x@m4xw.net>
- * Copyright (c) 2019 Atmosphere-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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/>.
- */
-#ifndef __FS_1810_EXFAT_H__
-#define __FS_1810_EXFAT_H__
-
-// Accessor vtable getters
-#define FS_OFFSET_1810_EXFAT_SDMMC_ACCESSOR_GC   0x195B90
-#define FS_OFFSET_1810_EXFAT_SDMMC_ACCESSOR_SD   0x197890
-#define FS_OFFSET_1810_EXFAT_SDMMC_ACCESSOR_NAND 0x196070
-
-// Hooks
-#define FS_OFFSET_1810_EXFAT_SDMMC_WRAPPER_READ  0x191AE0
-#define FS_OFFSET_1810_EXFAT_SDMMC_WRAPPER_WRITE 0x191B40
-#define FS_OFFSET_1810_EXFAT_RTLD                0x2A3A4
-#define FS_OFFSET_1810_EXFAT_RTLD_DESTINATION    ((uintptr_t)(INT64_C(-0x44)))
-
-#define FS_OFFSET_1810_EXFAT_CLKRST_SET_MIN_V_CLK_RATE 0x1B2860
-
-// Misc funcs
-#define FS_OFFSET_1810_EXFAT_LOCK_MUTEX          0x18AD50
-#define FS_OFFSET_1810_EXFAT_UNLOCK_MUTEX        0x18ADA0
-
-#define FS_OFFSET_1810_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0x191AA0
-#define FS_OFFSET_1810_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x191AC0
-
-// Misc Data
-#define FS_OFFSET_1810_EXFAT_SD_MUTEX            0xFE33F0
-#define FS_OFFSET_1810_EXFAT_NAND_MUTEX          0xFDEB28
-#define FS_OFFSET_1810_EXFAT_ACTIVE_PARTITION    0xFDEB68
-#define FS_OFFSET_1810_EXFAT_SDMMC_DAS_HANDLE    0xFBE950
-
-// NOPs
-#define FS_OFFSET_1810_EXFAT_SD_DAS_INIT         0x28F24
-
-// Nintendo Paths
-#define FS_OFFSET_1810_EXFAT_NINTENDO_PATHS \
-{ \
-	{.opcode_reg = 3, .adrp_offset = 0x00068B08, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x000758DC, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x0007C77C, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x000905C4, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
-}
-
-#endif // __FS_1810_EXFAT_H__

emummc/source/FS/offsets/1900.h

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2019 m4xw <m4x@m4xw.net>
- * Copyright (c) 2019 Atmosphere-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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/>.
- */
-#ifndef __FS_1900_H__
-#define __FS_1900_H__
-
-// Accessor vtable getters
-#define FS_OFFSET_1900_SDMMC_ACCESSOR_GC   0x195C00
-#define FS_OFFSET_1900_SDMMC_ACCESSOR_SD   0x197F80
-#define FS_OFFSET_1900_SDMMC_ACCESSOR_NAND 0x1963B0
-
-// Hooks
-#define FS_OFFSET_1900_SDMMC_WRAPPER_READ  0x191A70
-#define FS_OFFSET_1900_SDMMC_WRAPPER_WRITE 0x191AD0
-#define FS_OFFSET_1900_RTLD                0x275F0
-#define FS_OFFSET_1900_RTLD_DESTINATION    ((uintptr_t)(INT64_C(-0x50)))
-
-#define FS_OFFSET_1900_CLKRST_SET_MIN_V_CLK_RATE 0x1B3880
-
-// Misc funcs
-#define FS_OFFSET_1900_LOCK_MUTEX          0x18AC20
-#define FS_OFFSET_1900_UNLOCK_MUTEX        0x18AC70
-
-#define FS_OFFSET_1900_SDMMC_WRAPPER_CONTROLLER_OPEN  0x191A30
-#define FS_OFFSET_1900_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x191A50
-
-// Misc Data
-#define FS_OFFSET_1900_SD_MUTEX            0xFE1408
-#define FS_OFFSET_1900_NAND_MUTEX          0xFDCB60
-#define FS_OFFSET_1900_ACTIVE_PARTITION    0xFDCBA0
-#define FS_OFFSET_1900_SDMMC_DAS_HANDLE    0xFC1908
-
-// NOPs
-#define FS_OFFSET_1900_SD_DAS_INIT         0x260C4
-
-// Nintendo Paths
-#define FS_OFFSET_1900_NINTENDO_PATHS \
-{ \
-	{.opcode_reg = 3, .adrp_offset = 0x00067FC8, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x00075D6C, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x0007D1E8, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x00092818, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
-}
-
-#endif // __FS_1900_H__

emummc/source/FS/offsets/1900_exfat.h

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2019 m4xw <m4x@m4xw.net>
- * Copyright (c) 2019 Atmosphere-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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/>.
- */
-#ifndef __FS_1900_EXFAT_H__
-#define __FS_1900_EXFAT_H__
-
-// Accessor vtable getters
-#define FS_OFFSET_1900_EXFAT_SDMMC_ACCESSOR_GC   0x1A1430
-#define FS_OFFSET_1900_EXFAT_SDMMC_ACCESSOR_SD   0x1A37B0
-#define FS_OFFSET_1900_EXFAT_SDMMC_ACCESSOR_NAND 0x1A1BE0
-
-// Hooks
-#define FS_OFFSET_1900_EXFAT_SDMMC_WRAPPER_READ  0x19D2A0
-#define FS_OFFSET_1900_EXFAT_SDMMC_WRAPPER_WRITE 0x19D300
-#define FS_OFFSET_1900_EXFAT_RTLD                0x275F0
-#define FS_OFFSET_1900_EXFAT_RTLD_DESTINATION    ((uintptr_t)(INT64_C(-0x50)))
-
-#define FS_OFFSET_1900_EXFAT_CLKRST_SET_MIN_V_CLK_RATE 0x1BF0B0
-
-// Misc funcs
-#define FS_OFFSET_1900_EXFAT_LOCK_MUTEX          0x196450
-#define FS_OFFSET_1900_EXFAT_UNLOCK_MUTEX        0x1964A0
-
-#define FS_OFFSET_1900_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0x19D260
-#define FS_OFFSET_1900_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x19D280
-
-// Misc Data
-#define FS_OFFSET_1900_EXFAT_SD_MUTEX            0xFF4408
-#define FS_OFFSET_1900_EXFAT_NAND_MUTEX          0xFEFB60
-#define FS_OFFSET_1900_EXFAT_ACTIVE_PARTITION    0xFEFBA0
-#define FS_OFFSET_1900_EXFAT_SDMMC_DAS_HANDLE    0xFCF908
-
-// NOPs
-#define FS_OFFSET_1900_EXFAT_SD_DAS_INIT         0x260C4
-
-// Nintendo Paths
-#define FS_OFFSET_1900_EXFAT_NINTENDO_PATHS \
-{ \
-	{.opcode_reg = 3, .adrp_offset = 0x00067FC8, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x00075D6C, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x0007D1E8, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x00092818, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
-}
-
-#endif // __FS_1900_EXFAT_H__

emummc/source/nx/cache.s

@@ -27,10 +27,6 @@ CODE_BEGIN armDCacheFlush
 	bic x8, x0, x10
 	mov x10, x1
 
-	mov w1, #1
-	mrs x0, tpidrro_el0
-	strb w1, [x0, #0x104]
-
 armDCacheFlush_L0:
 	dc  civac, x8
 	add x8, x8, x9
@@ -38,9 +34,6 @@ armDCacheFlush_L0:
 	bcc armDCacheFlush_L0
 
 	dsb sy
-
-	strb wzr, [x0, #0x104]
-
 	ret
 CODE_END
 
@@ -55,10 +48,6 @@ CODE_BEGIN armDCacheClean
 	bic x8, x0, x10
 	mov x10, x1
 
-	mov w1, #1
-	mrs x0, tpidrro_el0
-	strb w1, [x0, #0x104]
-
 armDCacheClean_L0:
 	dc  cvac, x8
 	add x8, x8, x9
@@ -66,9 +55,6 @@ armDCacheClean_L0:
 	bcc armDCacheClean_L0
 
 	dsb sy
-
-	strb wzr, [x0, #0x104]
-
 	ret
 CODE_END
 
@@ -82,10 +68,6 @@ CODE_BEGIN armICacheInvalidate
 	bic x8, x0, x10
 	mov x10, x1
 
-	mov w1, #1
-	mrs x0, tpidrro_el0
-	strb w1, [x0, #0x104]
-
 armICacheInvalidate_L0:
 	ic  ivau, x8
 	add x8, x8, x9
@@ -93,9 +75,6 @@ armICacheInvalidate_L0:
 	bcc armICacheInvalidate_L0
 
 	dsb sy
-
-	strb wzr, [x0, #0x104]
-
 	ret
 CODE_END
 
@@ -110,10 +89,6 @@ CODE_BEGIN armDCacheZero
 	bic x8, x0, x10
 	mov x10, x1
 
-	mov w1, #1
-	mrs x0, tpidrro_el0
-	strb w1, [x0, #0x104]
-
 armDCacheZero_L0:
 	dc  zva, x8
 	add x8, x8, x9
@@ -121,8 +96,5 @@ armDCacheZero_L0:
 	bcc armDCacheZero_L0
 
 	dsb sy
-
-	strb wzr, [x0, #0x104]
-
 	ret
 CODE_END

emummc/source/utils/types.h

@@ -18,7 +18,6 @@
 #define _TYPES_H_
 
 #include <stdint.h>
-#include <stdbool.h>
 
 #define ALIGN(x, a) (((x) + (a) - 1) & ~((a) - 1))
 #define MAX(a, b) ((a) > (b) ? (a) : (b))
@@ -59,6 +58,12 @@ typedef u32 Result; ///< Function error code result type.
 #define INVALID_HANDLE ((Handle) 0)
 #define CUR_PROCESS_HANDLE ((Handle) 0xFFFF8001)
 
+#ifndef __cplusplus
+typedef int bool;
+#define true  1
+#define false 0
+#endif /* __cplusplus */
+
 #define BOOT_CFG_AUTOBOOT_EN (1 << 0)
 #define BOOT_CFG_FROM_LAUNCH (1 << 1)
 #define BOOT_CFG_SEPT_RUN    (1 << 7)

exosphere/loader_stub/loader_stub.mk

@@ -15,12 +15,13 @@ ifneq ($(__RECURSIVE__),1)
 export ATMOSPHERE_TOPDIR := $(CURRENT_DIRECTORY)
 
 export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) $(CURDIR)/include \
-			$(foreach dir,$(DATA),$(CURDIR)/$(dir))
+			$(foreach dir,$(DATA),$(CURDIR)/$(dir)) \
+            $(CURRENT_DIRECTORY)/../program/$(ATMOSPHERE_OUT_DIR)
 
 CFILES      :=	$(call FIND_SOURCE_FILES,$(SOURCES),c)
 CPPFILES    :=	$(call FIND_SOURCE_FILES,$(SOURCES),cpp)
 SFILES      :=	$(call FIND_SOURCE_FILES,$(SOURCES),s)
-BINFILES    :=
+BINFILES    := program.lz4 boot_code.lz4
 
 #---------------------------------------------------------------------------------
 # use CXX for linking C++ projects, CC for standard C
@@ -101,7 +102,13 @@ $(OUTPUT).elf	:	$(OFILES)
 
 $(OFILES)	:	 $(ATMOSPHERE_LIBRARIES_DIR)/libexosphere/$(ATMOSPHERE_LIBRARY_DIR)/libexosphere.a
 
-secmon_loader_main.o: CXXFLAGS += --embed-dir="$(CURRENT_DIRECTORY)/../program/$(ATMOSPHERE_OUT_DIR)/"
+program.lz4.o: program.lz4
+	@echo $(notdir $<)
+	@$(bin2o)
+
+boot_code.lz4.o: boot_code.lz4
+	@echo $(notdir $<)
+	@$(bin2o)
 
 %.elf:
 	@echo linking $(notdir $@)
@@ -110,6 +117,14 @@ secmon_loader_main.o: CXXFLAGS += --embed-dir="$(CURRENT_DIRECTORY)/../program/$
 
 $(OFILES_SRC)	: $(OFILES_BIN)
 
+#---------------------------------------------------------------------------------
+# you need a rule like this for each extension you use as binary data
+#---------------------------------------------------------------------------------
+%.bin.o	%_bin.h:	%.bin
+#---------------------------------------------------------------------------------
+	@echo $(notdir $<)
+	@$(bin2o)
+
 -include $(DEPENDS)
 
 #---------------------------------------------------------------------------------------

exosphere/loader_stub/source/secmon_loader_main.cpp

@@ -15,31 +15,21 @@
  */
 #include <exosphere.hpp>
 #include "secmon_loader_uncompress.hpp"
+#include "program_lz4.h"
+#include "boot_code_lz4.h"
 
 namespace ams::secmon::loader {
 
-    namespace {
-
-        constexpr const u8 SecmonProgramLz4[] = {
-            #embed <program.lz4>
-        };
-
-        constexpr const u8 SecmonBootCodeLz4[] = {
-            #embed <boot_code.lz4>
-        };
-
-    }
-
-    NORETURN void UncompressAndExecute() {
+    NORETURN void UncompressAndExecute(const void *program, const void *boot_code) {
         /* Uncompress the program image. */
-        Uncompress(secmon::MemoryRegionPhysicalTzramFullProgramImage.GetPointer(), secmon::MemoryRegionPhysicalTzramFullProgramImage.GetSize(), SecmonProgramLz4, sizeof(SecmonProgramLz4));
+        Uncompress(secmon::MemoryRegionPhysicalTzramFullProgramImage.GetPointer(), secmon::MemoryRegionPhysicalTzramFullProgramImage.GetSize(), program, program_lz4_size);
 
         /* Copy the boot image to the end of IRAM */
-        u8 *relocated_boot_code = secmon::MemoryRegionPhysicalIramBootCodeImage.GetEndPointer<u8>() - sizeof(SecmonBootCodeLz4);
-        std::memcpy(relocated_boot_code, SecmonBootCodeLz4, sizeof(SecmonBootCodeLz4));
+        u8 *relocated_boot_code = secmon::MemoryRegionPhysicalIramBootCodeImage.GetEndPointer<u8>() - boot_code_lz4_size;
+        std::memcpy(relocated_boot_code, boot_code, boot_code_lz4_size);
 
         /* Uncompress the boot image. */
-        Uncompress(secmon::MemoryRegionPhysicalIramBootCodeImage.GetPointer(), secmon::MemoryRegionPhysicalIramBootCodeImage.GetSize(), relocated_boot_code, sizeof(SecmonBootCodeLz4));
+        Uncompress(secmon::MemoryRegionPhysicalIramBootCodeImage.GetPointer(), secmon::MemoryRegionPhysicalIramBootCodeImage.GetSize(), relocated_boot_code, boot_code_lz4_size);
 
         /* Jump to the boot image. */
         reinterpret_cast<void (*)()>(secmon::MemoryRegionPhysicalIramBootCodeImage.GetAddress())();

exosphere/loader_stub/source/start.s

@@ -98,5 +98,8 @@ _start:
     ldr x20, =0x7C020000
     mov sp, x20
 
+    adr x0, program_lz4
+    adr x1, boot_code_lz4
+
     /* Uncompress the program and iram boot code images. */
-    b _ZN3ams6secmon6loader20UncompressAndExecuteEv
+    b _ZN3ams6secmon6loader20UncompressAndExecuteEPKvS3_

exosphere/mariko_fatal/source/fatal_save_context.cpp

@@ -62,7 +62,7 @@ namespace ams::secmon::fatal {
         /* Write the context to the file. */
         R_TRY(fs::WriteFile(file, 0, ctx, sizeof(*ctx), fs::WriteOption::Flush));
 
-        R_SUCCEED();
+        return ResultSuccess();
     }
 
 }

exosphere/mariko_fatal/source/fatal_sdmmc.cpp

@@ -48,11 +48,11 @@ namespace ams::secmon::fatal {
         //sdmmc::Deactivate(Port);
         R_TRY(sdmmc::Activate(Port));
 
-        R_SUCCEED();
+        return ResultSuccess();
     }
 
     Result CheckSdCardConnection(sdmmc::SpeedMode *out_sm, sdmmc::BusWidth *out_bw) {
-        R_RETURN(sdmmc::CheckSdCardConnection(out_sm, out_bw, Port));
+        return sdmmc::CheckSdCardConnection(out_sm, out_bw, Port);
     }
 
     Result ReadSdCard(void *dst, size_t size, size_t sector_index, size_t sector_count) {
@@ -78,7 +78,7 @@ namespace ams::secmon::fatal {
             sector_count -= cur_sectors;
         }
 
-        R_SUCCEED();
+        return ResultSuccess();
     }
 
     Result WriteSdCard(size_t sector_index, size_t sector_count, const void *src, size_t size) {
@@ -104,7 +104,7 @@ namespace ams::secmon::fatal {
             sector_count -= cur_sectors;
         }
 
-        R_SUCCEED();
+        return ResultSuccess();
     }
 
 }

exosphere/mariko_fatal/source/fs/fatal_fs_api.cpp

@@ -34,45 +34,45 @@ namespace ams::fs {
         Result TranslateFatFsError(FRESULT res) {
             switch (res) {
                 case FR_OK:
-                    R_SUCCEED();
+                    return ResultSuccess();
                 case FR_DISK_ERR:
-                    R_THROW(fs::ResultMmcAccessFailed());
+                    return fs::ResultMmcAccessFailed();
                 case FR_INT_ERR:
-                    R_THROW(fs::ResultPreconditionViolation());
+                    return fs::ResultPreconditionViolation();
                 case FR_NOT_READY:
-                    R_THROW(fs::ResultMmcAccessFailed());
+                    return fs::ResultMmcAccessFailed();
                 case FR_NO_FILE:
-                    R_THROW(fs::ResultPathNotFound());
+                    return fs::ResultPathNotFound();
                 case FR_NO_PATH:
-                    R_THROW(fs::ResultPathNotFound());
+                    return fs::ResultPathNotFound();
                 case FR_INVALID_NAME:
-                    R_THROW(fs::ResultInvalidPath());
+                    return fs::ResultInvalidPath();
                 case FR_DENIED:
-                    R_THROW(fs::ResultPermissionDenied());
+                    return fs::ResultPermissionDenied();
                 case FR_EXIST:
-                    R_THROW(fs::ResultPathAlreadyExists());
+                    return fs::ResultPathAlreadyExists();
                 case FR_INVALID_OBJECT:
-                    R_THROW(fs::ResultInvalidArgument());
+                    return fs::ResultInvalidArgument();
                 case FR_WRITE_PROTECTED:
-                    R_THROW(fs::ResultWriteNotPermitted());
+                    return fs::ResultWriteNotPermitted();
                 case FR_INVALID_DRIVE:
-                    R_THROW(fs::ResultInvalidMountName());
+                    return fs::ResultInvalidMountName();
                 case FR_NOT_ENABLED:
-                    R_THROW(fs::ResultInvalidMountName()); /* BAD/TODO */
+                    return fs::ResultInvalidMountName(); /* BAD/TODO */
                 case FR_NO_FILESYSTEM:
-                    R_THROW(fs::ResultInvalidMountName()); /* BAD/TODO */
+                    return fs::ResultInvalidMountName(); /* BAD/TODO */
                 case FR_TIMEOUT:
-                    R_THROW(fs::ResultTargetLocked()); /* BAD/TODO */
+                    return fs::ResultTargetLocked(); /* BAD/TODO */
                 case FR_LOCKED:
-                    R_THROW(fs::ResultTargetLocked());
+                    return fs::ResultTargetLocked();
                 case FR_NOT_ENOUGH_CORE:
-                    R_THROW(fs::ResultPreconditionViolation()); /* BAD/TODO */
+                    return fs::ResultPreconditionViolation(); /* BAD/TODO */
                 case FR_TOO_MANY_OPEN_FILES:
-                    R_THROW(fs::ResultPreconditionViolation()); /* BAD/TODO */
+                    return fs::ResultPreconditionViolation(); /* BAD/TODO */
                 case FR_INVALID_PARAMETER:
-                    R_THROW(fs::ResultInvalidArgument());
+                    return fs::ResultInvalidArgument();
                 default:
-                    R_THROW(fs::ResultInternal());
+                    return fs::ResultInternal();
             }
         }
 
@@ -125,11 +125,11 @@ namespace ams::fs {
         /* Expand the file. */
         R_TRY(TranslateFatFsError(f_expand(std::addressof(fp), size, 1)));
 
-        R_SUCCEED();
+        return ResultSuccess();
     }
 
     Result CreateDirectory(const char *path) {
-        R_RETURN(TranslateFatFsError(f_mkdir(path)));
+        return TranslateFatFsError(f_mkdir(path));
     }
 
     Result OpenFile(FileHandle *out_file, const char *path, int mode) {
@@ -144,10 +144,10 @@ namespace ams::fs {
                 out_file->_handle = fp;
                 g_files_opened[i] = true;
                 g_open_modes[i] = mode;
-                R_SUCCEED();
+                return ResultSuccess();
             }
         }
-        R_THROW(fs::ResultOpenCountLimit());
+        return fs::ResultOpenCountLimit();
     }
 
     Result ReadFile(FileHandle handle, s64 offset, void *buffer, size_t size, const fs::ReadOption &option) {
@@ -164,11 +164,11 @@ namespace ams::fs {
         /* Check that we read the correct amount. */
         R_UNLESS(br == size, fs::ResultOutOfRange());
 
-        R_SUCCEED();
+        return ResultSuccess();
     }
 
     Result ReadFile(FileHandle handle, s64 offset, void *buffer, size_t size) {
-        R_RETURN(ReadFile(handle, offset, buffer, size, fs::ReadOption::None));
+        return ReadFile(handle, offset, buffer, size, fs::ReadOption::None);
     }
 
     Result ReadFile(size_t *out, FileHandle handle, s64 offset, void *buffer, size_t size, const fs::ReadOption &option) {
@@ -185,21 +185,21 @@ namespace ams::fs {
         /* Set the output size. */
         *out = br;
 
-        R_SUCCEED();
+        return ResultSuccess();
     }
 
     Result ReadFile(size_t *out, FileHandle handle, s64 offset, void *buffer, size_t size) {
-        R_RETURN(ReadFile(out, handle, offset, buffer, size, fs::ReadOption::None));
+        return ReadFile(out, handle, offset, buffer, size, fs::ReadOption::None);
     }
 
     Result GetFileSize(s64 *out, FileHandle handle) {
         FIL *fp = GetInternalFile(handle);
         *out = f_size(fp);
-        R_SUCCEED();
+        return ResultSuccess();
     }
 
     Result FlushFile(FileHandle handle) {
-        R_RETURN(TranslateFatFsError(f_sync(GetInternalFile(handle))));
+        return TranslateFatFsError(f_sync(GetInternalFile(handle)));
     }
 
     Result WriteFile(FileHandle handle, s64 offset, const void *buffer, size_t size, const fs::WriteOption &option) {
@@ -218,7 +218,7 @@ namespace ams::fs {
             R_TRY(FlushFile(handle));
         }
 
-        R_SUCCEED();
+        return ResultSuccess();
     }
 
     Result SetFileSize(FileHandle handle, s64 size) {
@@ -242,7 +242,7 @@ namespace ams::fs {
         /* Check that our expansion succeeded. */
         AMS_ASSERT(f_size(fp) == static_cast<FSIZE_t>(size));
 
-        R_SUCCEED();
+        return ResultSuccess();
     }
 
     int GetFileOpenMode(FileHandle handle) {

exosphere/program/program.ld

@@ -106,7 +106,6 @@ SECTIONS
     .debug_code : {
         KEEP (*(.text._ZN3ams3log6PrintfEPKcz .text._ZN3ams3log7VPrintfEPKcSt9__va_list .text._ZN3ams3log4DumpEPKvm))
         KEEP (*(.text._ZN3ams4util10TVSNPrintfEPcmPKcSt9__va_list .text._ZN3ams4util12_GLOBAL__N_114TVSNPrintfImplEPcmPKcSt9__va_list .text._ZZN3ams4util12_GLOBAL__N_114TVSNPrintfImplEPcmPKcSt9__va_listENKUlbmE3_clEbm))
-        KEEP (*(.text._ZN3ams4util12_GLOBAL__N_1L14TVSNPrintfImplEPcmPKcSt9__va_list .text._ZZN3ams4util12_GLOBAL__N_1L14TVSNPrintfImplEPcmPKcSt9__va_listENKUlbmE_clEbm))
         KEEP(secmon_exception_handler.o(.text*))
         secmon_exception_handler.o(.rodata*)
         secmon_exception_handler.o(.data*)

exosphere/program/source/boot/secmon_boot_key_data.s

@@ -85,10 +85,10 @@ _ZN3ams6secmon4boot15VolatileKeyDataE:
 /* We can get away with only including latest because exosphere supports newer-than-expected master key in engine. */
 /* TODO: Update on next change of keys. */
 /* Mariko Development Master Kek Source. */
-.byte 0x65, 0x7B, 0x11, 0x46, 0x0E, 0xC2, 0x22, 0x5D, 0xB9, 0xF1, 0xF5, 0x00, 0xF9, 0x3E, 0x1F, 0x70
+.byte 0xEC, 0x5E, 0xB5, 0x11, 0xD5, 0x43, 0x1E, 0x6A, 0x4E, 0x54, 0x6F, 0xD4, 0xD3, 0x22, 0xCE, 0x87
 
 /* Mariko Production Master Kek Source. */
-.byte 0x31, 0xBE, 0x25, 0xFB, 0xDB, 0xB4, 0xEE, 0x49, 0x5C, 0x77, 0x05, 0xC2, 0x36, 0x9F, 0x34, 0x80
+.byte 0xD2, 0x68, 0xC6, 0x53, 0x9D, 0x94, 0xF9, 0xA8, 0xA5, 0xA8, 0xA7, 0xC8, 0x8F, 0x53, 0x4B, 0x7A
 
 /* Development Master Key Vectors. */
 .byte 0x46, 0x22, 0xB4, 0x51, 0x9A, 0x7E, 0xA7, 0x7F, 0x62, 0xA1, 0x1F, 0x8F, 0xC5, 0x3A, 0xDB, 0xFE /* Zeroes encrypted with Master Key 00. */
@@ -105,11 +105,6 @@ _ZN3ams6secmon4boot15VolatileKeyDataE:
 .byte 0x21, 0x88, 0x6B, 0x10, 0x9E, 0x83, 0xD6, 0x52, 0xAB, 0x08, 0xDB, 0x6D, 0x39, 0xFF, 0x1C, 0x9C /* Master key 0A encrypted with Master key 0B. */
 .byte 0x8A, 0xCE, 0xC4, 0x7F, 0xBE, 0x08, 0x61, 0x88, 0xD3, 0x73, 0x64, 0x51, 0xE2, 0xB6, 0x53, 0x15 /* Master key 0B encrypted with Master key 0C. */
 .byte 0x08, 0xE0, 0xF4, 0xBE, 0xAA, 0x6E, 0x5A, 0xC3, 0xA6, 0xBC, 0xFE, 0xB9, 0xE2, 0xA3, 0x24, 0x12 /* Master key 0C encrypted with Master key 0D. */
-.byte 0xD6, 0x80, 0x98, 0xC0, 0xFA, 0xC7, 0x13, 0xCB, 0x93, 0xD2, 0x0B, 0x82, 0x4C, 0xA1, 0x7B, 0x8D /* Master key 0D encrypted with Master key 0E. */
-.byte 0x78, 0x66, 0x19, 0xBD, 0x86, 0xE7, 0xC1, 0x09, 0x9B, 0x6F, 0x92, 0xB2, 0x58, 0x7D, 0xCF, 0x26 /* Master key 0E encrypted with Master key 0F. */
-.byte 0x39, 0x1E, 0x7E, 0xF8, 0x7E, 0x73, 0xEA, 0x6F, 0xAF, 0x00, 0x3A, 0xB4, 0xAA, 0xB8, 0xB7, 0x59 /* Master key 0F encrypted with Master key 10. */
-.byte 0x0C, 0x75, 0x39, 0x15, 0x53, 0xEA, 0x81, 0x11, 0xA3, 0xE0, 0xDC, 0x3D, 0x0E, 0x76, 0xC6, 0xB8 /* Master key 10 encrypted with Master key 11. */
-.byte 0x90, 0x64, 0xF9, 0x08, 0x29, 0x88, 0xD4, 0xDC, 0x73, 0xA4, 0xA1, 0x13, 0x9E, 0x59, 0x85, 0xA0 /* Master key 11 encrypted with Master key 12. */
 
 /* Production Master Key Vectors. */
 .byte 0x0C, 0xF0, 0x59, 0xAC, 0x85, 0xF6, 0x26, 0x65, 0xE1, 0xE9, 0x19, 0x55, 0xE6, 0xF2, 0x67, 0x3D /* Zeroes encrypted with Master Key 00. */
@@ -126,11 +121,6 @@ _ZN3ams6secmon4boot15VolatileKeyDataE:
 .byte 0xC1, 0x8D, 0x16, 0xBB, 0x2A, 0xE4, 0x1D, 0xD4, 0xC2, 0xC1, 0xB6, 0x40, 0x94, 0x35, 0x63, 0x98 /* Master key 0A encrypted with Master key 0B. */
 .byte 0xA3, 0x24, 0x65, 0x75, 0xEA, 0xCC, 0x6E, 0x8D, 0xFB, 0x5A, 0x16, 0x50, 0x74, 0xD2, 0x15, 0x06 /* Master key 0B encrypted with Master key 0C. */
 .byte 0x83, 0x67, 0xAF, 0x01, 0xCF, 0x93, 0xA1, 0xAB, 0x80, 0x45, 0xF7, 0x3F, 0x72, 0xFD, 0x3B, 0x38 /* Master key 0C encrypted with Master key 0D. */
-.byte 0xB1, 0x81, 0xA6, 0x0D, 0x72, 0xC7, 0xEE, 0x15, 0x21, 0xF3, 0xC0, 0xB5, 0x6B, 0x61, 0x6D, 0xE7 /* Master key 0D encrypted with Master key 0E. */
-.byte 0xAF, 0x11, 0x4C, 0x67, 0x17, 0x7A, 0x52, 0x43, 0xF7, 0x70, 0x2F, 0xC7, 0xEF, 0x81, 0x72, 0x16 /* Master key 0E encrypted with Master key 0F. */
-.byte 0x25, 0x12, 0x8B, 0xCB, 0xB5, 0x46, 0xA1, 0xF8, 0xE0, 0x52, 0x15, 0xB7, 0x0B, 0x57, 0x00, 0xBD /* Master key 0F encrypted with Master key 10. */
-.byte 0x58, 0x15, 0xD2, 0xF6, 0x8A, 0xE8, 0x19, 0xAB, 0xFB, 0x2D, 0x52, 0x9D, 0xE7, 0x55, 0xF3, 0x93 /* Master key 10 encrypted with Master key 11. */
-.byte 0x4A, 0x01, 0x3B, 0xC7, 0x44, 0x6E, 0x45, 0xBD, 0xE6, 0x5E, 0x2B, 0xEC, 0x07, 0x37, 0x52, 0x86 /* Master key 11 encrypted with Master key 12. */
 
 /* Device Master Key Source Sources. */
 .byte 0x8B, 0x4E, 0x1C, 0x22, 0x42, 0x07, 0xC8, 0x73, 0x56, 0x94, 0x08, 0x8B, 0xCC, 0x47, 0x0F, 0x5D /* 4.0.0  Device Master Key Source Source. */
@@ -144,11 +134,6 @@ _ZN3ams6secmon4boot15VolatileKeyDataE:
 .byte 0xAA, 0xFD, 0xBC, 0xBB, 0x25, 0xC3, 0xA4, 0xEF, 0xE3, 0xEE, 0x58, 0x53, 0xB7, 0xF8, 0xDD, 0xD6 /* 12.1.0 Device Master Key Source Source. */
 .byte 0xE4, 0xF3, 0x45, 0x6F, 0x18, 0xA1, 0x89, 0xF8, 0xDA, 0x4C, 0x64, 0x75, 0x68, 0xE6, 0xBD, 0x4F /* 13.0.0 Device Master Key Source Source. */
 .byte 0x5B, 0x94, 0x63, 0xF7, 0xAD, 0x96, 0x1B, 0xA6, 0x23, 0x30, 0x06, 0x4D, 0x01, 0xE4, 0xCE, 0x1D /* 14.0.0 Device Master Key Source Source. */
-.byte 0x5E, 0xC9, 0xC5, 0x0A, 0xD0, 0x5F, 0x8B, 0x7B, 0xA7, 0x39, 0xEA, 0xBC, 0x60, 0x0F, 0x74, 0xE6 /* 15.0.0 Device Master Key Source Source. */
-.byte 0xEA, 0x90, 0x6E, 0xA8, 0xAE, 0x92, 0x99, 0x64, 0x36, 0xC1, 0xF3, 0x1C, 0xC6, 0x32, 0x83, 0x8C /* 16.0.0 Device Master Key Source Source. */
-.byte 0xDA, 0xB9, 0xD6, 0x77, 0x52, 0x2D, 0x1F, 0x78, 0x73, 0xC9, 0x98, 0x5B, 0x06, 0xFE, 0xA0, 0x52 /* 17.0.0 Device Master Key Source Source. */
-.byte 0x14, 0xF5, 0xA5, 0xD0, 0x73, 0x6D, 0x44, 0x80, 0x5F, 0x31, 0x5A, 0x8F, 0x1E, 0xD4, 0x0D, 0x63 /* 18.0.0 Device Master Key Source Source. */
-.byte 0x07, 0x38, 0x9A, 0xEC, 0x9C, 0xBD, 0x50, 0x4A, 0x4C, 0x1F, 0x04, 0xDA, 0x40, 0x68, 0x29, 0xE3 /* 19.0.0 Device Master Key Source Source. */
 
 /* Development Device Master Kek Sources. */
 .byte 0xD6, 0xBD, 0x9F, 0xC6, 0x18, 0x09, 0xE1, 0x96, 0x20, 0x39, 0x60, 0xD2, 0x89, 0x83, 0x31, 0x34 /* 4.0.0  Device Master Kek Source. */
@@ -162,11 +147,6 @@ _ZN3ams6secmon4boot15VolatileKeyDataE:
 .byte 0xC4, 0xBB, 0xF3, 0x9F, 0xA3, 0xAA, 0x00, 0x99, 0x7C, 0x97, 0xAD, 0x91, 0x8F, 0xE8, 0x45, 0xCB /* 12.1.0 Device Master Kek Source. */
 .byte 0x20, 0x20, 0xAA, 0xFB, 0x89, 0xC2, 0xF0, 0x70, 0xB5, 0xE0, 0xA3, 0x11, 0x8A, 0x29, 0x8D, 0x0F /* 13.0.0 Device Master Kek Source. */
 .byte 0xCE, 0x14, 0x74, 0x66, 0x98, 0xA8, 0x6D, 0x7D, 0xBD, 0x54, 0x91, 0x68, 0x5F, 0x1D, 0x0E, 0xEA /* 14.0.0 Device Master Kek Source. */
-.byte 0xAE, 0x05, 0x48, 0x65, 0xAB, 0x17, 0x9D, 0x3D, 0x51, 0xB7, 0x56, 0xBD, 0x9B, 0x0B, 0x5B, 0x6E /* 15.0.0 Device Master Kek Source. */
-.byte 0xFF, 0xF6, 0x4B, 0x0F, 0xFF, 0x0D, 0xC0, 0x4F, 0x56, 0x8A, 0x40, 0x74, 0x67, 0xC5, 0xFE, 0x9F /* 16.0.0 Device Master Kek Source. */
-.byte 0x4E, 0xCE, 0x7B, 0x2A, 0xEA, 0x2E, 0x3D, 0x16, 0xD5, 0x2A, 0xDE, 0xF6, 0xF8, 0x6A, 0x7D, 0x43 /* 17.0.0 Device Master Kek Source. */
-.byte 0x3B, 0x00, 0x89, 0xD7, 0xA9, 0x9E, 0xB7, 0x70, 0x86, 0x00, 0xC3, 0x49, 0x52, 0x8C, 0xA4, 0xAF /* 18.0.0 Device Master Kek Source. */
-.byte 0xAE, 0x78, 0x36, 0xB6, 0x91, 0xEB, 0xAF, 0x9C, 0x18, 0xF1, 0xC0, 0xD5, 0x8A, 0x0C, 0x7C, 0xA1 /* 19.0.0 Device Master Kek Source. */
 
 /* Production Device Master Kek Sources. */
 .byte 0x88, 0x62, 0x34, 0x6E, 0xFA, 0xF7, 0xD8, 0x3F, 0xE1, 0x30, 0x39, 0x50, 0xF0, 0xB7, 0x5D, 0x5D /* 4.0.0  Device Master Kek Source. */
@@ -180,8 +160,3 @@ _ZN3ams6secmon4boot15VolatileKeyDataE:
 .byte 0xC2, 0x65, 0x34, 0x6E, 0xC7, 0xC6, 0x5D, 0x97, 0x3E, 0x34, 0x5C, 0x6B, 0xB3, 0x7E, 0xC6, 0xE3 /* 12.1.0 Device Master Kek Source. */
 .byte 0x77, 0x52, 0x92, 0xF0, 0xAA, 0xE3, 0xFB, 0xE0, 0x60, 0x16, 0xB3, 0x78, 0x68, 0x53, 0xF7, 0xA8 /* 13.0.0 Device Master Kek Source. */
 .byte 0x67, 0xD5, 0xD6, 0x0C, 0x08, 0xF5, 0xA3, 0x11, 0xBD, 0x6D, 0x5A, 0xEB, 0x96, 0x24, 0xB0, 0xD2 /* 14.0.0 Device Master Kek Source. */
-.byte 0x7C, 0x30, 0xED, 0x8B, 0x39, 0x25, 0x2C, 0x08, 0x8F, 0x48, 0xDC, 0x28, 0xE6, 0x1A, 0x6B, 0x49 /* 15.0.0 Device Master Kek Source. */
-.byte 0xF0, 0xF3, 0xFF, 0x52, 0x75, 0x2F, 0xBA, 0x4D, 0x09, 0x72, 0x30, 0x89, 0xA9, 0xDF, 0xFE, 0x1F /* 16.0.0 Device Master Kek Source. */
-.byte 0x21, 0xD6, 0x35, 0xF1, 0x0F, 0x7A, 0xF0, 0x5D, 0xDF, 0x79, 0x1C, 0x7A, 0xE4, 0x32, 0x82, 0x9E /* 17.0.0 Device Master Kek Source. */
-.byte 0xE7, 0x85, 0x8C, 0xA2, 0xF4, 0x49, 0xCB, 0x07, 0xD1, 0x8E, 0x48, 0x1B, 0xE8, 0x1E, 0x28, 0x3B /* 18.0.0 Device Master Kek Source. */
-.byte 0x9B, 0xA5, 0xFD, 0x74, 0x7F, 0xCD, 0x23, 0xD1, 0xD9, 0xBD, 0x6C, 0x51, 0x72, 0x5F, 0x3D, 0x1F /* 19.0.0 Device Master Kek Source. */

exosphere/program/source/boot/secmon_package2.cpp

@@ -94,7 +94,7 @@ namespace ams::secmon::boot {
         }
 
         /* Check that the key generation is one that we can use. */
-        static_assert(pkg1::KeyGeneration_Count == 19);
+        static_assert(pkg1::KeyGeneration_Count == 14);
         if (key_generation >= pkg1::KeyGeneration_Count) {
             return false;
         }

exosphere/program/source/secmon_user_power_management.cpp

@@ -70,15 +70,6 @@ namespace ams::secmon {
 
     }
 
-    void PerformUserRebootByPmic() {
-        /* Ensure that i2c-5 is usable for communicating with the pmic. */
-        clkrst::EnableI2c5Clock();
-        i2c::Initialize(i2c::Port_5);
-
-        /* Reboot. */
-        pmic::ShutdownSystem(true);
-    }
-
     void PerformUserRebootToRcm() {
         /* Configure the bootrom to boot to rcm. */
         reg::Write(PMC + APBDEV_PMC_SCRATCH0, 0x2);
@@ -109,20 +100,11 @@ namespace ams::secmon {
     }
 
     void PerformUserShutDown() {
-        if (fuse::GetSocType() == fuse::SocType_Mariko) {
-            /* Ensure that i2c-5 is usable for communicating with the pmic. */
-            clkrst::EnableI2c5Clock();
-            i2c::Initialize(i2c::Port_5);
+        /* Load our reboot stub to iram. */
+        LoadRebootStub(RebootStubAction_ShutDown);
 
-            /* On Mariko shutdown via pmic. */
-            pmic::ShutdownSystem(false);
-        } else /* if (fuse::GetSocType() == fuse::SocType_Erista) */ {
-            /* Load our reboot stub to iram. */
-            LoadRebootStub(RebootStubAction_ShutDown);
-
-            /* Reboot. */
-            PerformPmcReboot();
-        }
+        /* Reboot. */
+        PerformPmcReboot();
     }
 
 }

exosphere/program/source/secmon_user_power_management.hpp

@@ -23,13 +23,11 @@ namespace ams::secmon {
         UserRebootType_ToRcm        = 1,
         UserRebootType_ToPayload    = 2,
         UserRebootType_ToFatalError = 3,
-        UserRebootType_ByPmic       = 4,
     };
 
     void PerformUserRebootToRcm();
     void PerformUserRebootToPayload();
     void PerformUserRebootToFatalError();
-    void PerformUserRebootByPmic();
     void PerformUserShutDown();
 
 }

exosphere/program/source/smc/secmon_smc_aes.cpp

@@ -161,7 +161,6 @@ namespace ams::secmon::smc {
         constexpr const u8 EsCommonKeySources[EsCommonKeyType_Count][AesKeySize] = {
             [EsCommonKeyType_TitleKey]   = { 0x1E, 0xDC, 0x7B, 0x3B, 0x60, 0xE6, 0xB4, 0xD8, 0x78, 0xB8, 0x17, 0x15, 0x98, 0x5E, 0x62, 0x9B },
             [EsCommonKeyType_ArchiveKey] = { 0x3B, 0x78, 0xF2, 0x61, 0x0F, 0x9D, 0x5A, 0xE2, 0x7B, 0x4E, 0x45, 0xAF, 0xCB, 0x0B, 0x67, 0x4D },
-            [EsCommonKeyType_Unknown2]   = { 0x42, 0x64, 0x0B, 0xE3, 0x5F, 0xC6, 0xBE, 0x47, 0xC7, 0xB4, 0x84, 0xC5, 0xEB, 0x63, 0xAA, 0x02 },
         };
 
         constexpr const u8 EsSealKeySource[AesKeySize] = {

exosphere/program/source/smc/secmon_smc_aes.hpp

@@ -22,7 +22,6 @@ namespace ams::secmon::smc {
     enum EsCommonKeyType {
         EsCommonKeyType_TitleKey   = 0,
         EsCommonKeyType_ArchiveKey = 1,
-        EsCommonKeyType_Unknown2   = 2,
 
         EsCommonKeyType_Count,
     };

exosphere/program/source/smc/secmon_smc_info.cpp

@@ -52,7 +52,7 @@ namespace ams::secmon::smc {
             [fuse::DramId_IcosaSamsung6GB]    = pkg1::MemorySize_6GB,
             [fuse::DramId_HoagHynix1y4GB]     = pkg1::MemorySize_4GB,
             [fuse::DramId_AulaHynix1y4GB]     = pkg1::MemorySize_4GB,
-            [fuse::DramId_Deprecated7]        = pkg1::MemorySize_4GB,
+            [fuse::DramId_IowaX1X2Samsung4GB] = pkg1::MemorySize_4GB,
             [fuse::DramId_IowaSansung4GB]     = pkg1::MemorySize_4GB,
             [fuse::DramId_IowaSamsung8GB]     = pkg1::MemorySize_8GB,
             [fuse::DramId_IowaHynix4GB]       = pkg1::MemorySize_4GB,
@@ -61,7 +61,7 @@ namespace ams::secmon::smc {
             [fuse::DramId_HoagSamsung8GB]     = pkg1::MemorySize_8GB,
             [fuse::DramId_HoagHynix4GB]       = pkg1::MemorySize_4GB,
             [fuse::DramId_HoagMicron4GB]      = pkg1::MemorySize_4GB,
-            [fuse::DramId_Deprecated16]       = pkg1::MemorySize_4GB,
+            [fuse::DramId_IowaSamsung4GBY]    = pkg1::MemorySize_4GB,
             [fuse::DramId_IowaSamsung1y4GBX]  = pkg1::MemorySize_4GB,
             [fuse::DramId_IowaSamsung1y8GBX]  = pkg1::MemorySize_8GB,
             [fuse::DramId_HoagSamsung1y4GBX]  = pkg1::MemorySize_4GB,
@@ -74,12 +74,6 @@ namespace ams::secmon::smc {
             [fuse::DramId_HoagMicron1y4GB]    = pkg1::MemorySize_4GB,
             [fuse::DramId_AulaMicron1y4GB]    = pkg1::MemorySize_4GB,
             [fuse::DramId_AulaSamsung1y8GBX]  = pkg1::MemorySize_8GB,
-            [fuse::DramId_IowaX1X2Samsung4GB] = pkg1::MemorySize_4GB,
-            [fuse::DramId_HoagX1X2Samsung4GB] = pkg1::MemorySize_4GB,
-            [fuse::DramId_AulaX1X2Samsung4GB] = pkg1::MemorySize_4GB,
-            [fuse::DramId_IowaSamsung4GBY]    = pkg1::MemorySize_4GB,
-            [fuse::DramId_HoagSamsung4GBY]    = pkg1::MemorySize_4GB,
-            [fuse::DramId_AulaSamsung4GBY]    = pkg1::MemorySize_4GB,
         };
 
         constexpr const pkg1::MemoryMode MemoryModes[] = {
@@ -357,9 +351,6 @@ namespace ams::secmon::smc {
                             case UserRebootType_ToFatalError:
                                 PerformUserRebootToFatalError();
                                 break;
-                            case UserRebootType_ByPmic:
-                                PerformUserRebootByPmic();
-                                break;
                             default:
                                 return SmcResult::InvalidArgument;
                         }
@@ -368,17 +359,18 @@ namespace ams::secmon::smc {
                             case UserRebootType_ToFatalError:
                                 PerformUserRebootToFatalError();
                                 break;
-                            case UserRebootType_ByPmic:
-                                PerformUserRebootByPmic();
-                                break;
                             default:
                                 return SmcResult::InvalidArgument;
                         }
                     }
                     break;
                 case ConfigItem::ExosphereNeedsShutdown:
-                    if (args.r[3] != 0) {
-                        PerformUserShutDown();
+                    if (soc_type == fuse::SocType_Erista) {
+                        if (args.r[3] != 0) {
+                            PerformUserShutDown();
+                        }
+                    } else /* if (soc_type == fuse::SocType_Mariko) */ {
+                        return SmcResult::NotSupported;
                     }
                     break;
                 case ConfigItem::ExospherePayloadAddress:

exosphere/program/source/smc/secmon_smc_rsa.cpp

@@ -32,8 +32,8 @@ namespace ams::secmon::smc {
 
         struct PrepareEsDeviceUniqueKeyOption {
             using KeyGeneration = util::BitPack32::Field<0,  6, int>;
-            using Type          = util::BitPack32::Field<6,  2, EsCommonKeyType>;
-            using Reserved      = util::BitPack32::Field<8, 24, u32>;
+            using Type          = util::BitPack32::Field<6,  1, EsCommonKeyType>;
+            using Reserved      = util::BitPack32::Field<7, 25, u32>;
         };
 
         constexpr const u8 ModularExponentiateByStorageKeyTable[] = {

fusee/loader_stub/source/fusee_loader_uncompress.cpp

@@ -96,7 +96,7 @@ namespace ams::nxboot::loader {
     }
 
     void Uncompress(void *dst, size_t dst_size, const void *src, size_t src_size) {
-        /* Create and execute a decompressor. */
+        /* Create an execute a decompressor. */
         Lz4Uncompressor(dst, dst_size, src, src_size).Uncompress();
     }