libstratosphere: fix building after PCH related build changes

.gitattributes

@@ -1,14 +1 @@
 config_templates/hbl_html/accessible-urls/accessible-urls.txt text eol=lf
-
-# Mark C++ "include" files as C++
-*.inc linguist-language=C++
-
-# Mark RapidJSON include as vendored
-libraries/include/stratosphere/rapidjson/** linguist-vendored
-
-# Mark emummc as vendored
-emummc/** linguist-vendored
-
-# Mark fatfs as vendored
-exosphere/mariko_fatal/source/fatfs/** linguist-vendored
-fusee/program/source/fatfs/** linguist-vendored

.github/ISSUE_TEMPLATE/bug_report.md

@@ -49,8 +49,6 @@ X.X.X</br>
      - [ Ex: Kosmos' distribution of Atmosphère ]
 - Do you have additional kips or sysmodules you're loading:
 - Homebrew software installed: [ * ]
-- EmuMMC or SysNAND:
-  - [ If using an EmuMMC, include whether it's partition-based or file-based. ]
 
 ### Additional context?
 

.gitignore

@@ -79,8 +79,9 @@ dkms.conf
 *.nam
 *.til
 
-# Compiled python files.
+# KEYS file for sept-secondary.
 *.pyc
+sept/sept-secondary/KEYS.py
 
 .**/
 
@@ -90,11 +91,3 @@ dkms.conf
 
 **/out
 **/build
-**/build_nintendo_nx_arm64
-**/build_nintendo_nx_arm
-**/build_nintendo_nx_x64
-**/build_nintendo_nx_x86
-
-package3
-
-stratosphere/test/

Makefile

@@ -1,9 +1,3 @@
-ifeq ($(strip $(DEVKITPRO)),)
-$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitPro)
-endif
-
-include $(DEVKITPRO)/devkitA64/base_tools
-
 TOPTARGETS := all clean dist-no-debug dist
 AMSBRANCH := $(shell git symbolic-ref --short HEAD)
 AMSHASH := $(shell git rev-parse --short HEAD)
@@ -13,29 +7,9 @@ ifneq (, $(strip $(shell git status --porcelain 2>/dev/null)))
     AMSREV := $(AMSREV)-dirty
 endif
 
-COMPONENTS := fusee stratosphere mesosphere exosphere emummc thermosphere troposphere libraries
+COMPONENTS := fusee stratosphere mesosphere exosphere thermosphere troposphere libraries
 
 all: $(COMPONENTS)
-	$(eval MAJORVER = $(shell grep 'define ATMOSPHERE_RELEASE_VERSION_MAJOR\b' libraries/libvapours/include/vapours/ams/ams_api_version.h \
-		| tr -s [:blank:] \
-		| cut -d' ' -f3))
-	$(eval MINORVER = $(shell grep 'define ATMOSPHERE_RELEASE_VERSION_MINOR\b' libraries/libvapours/include/vapours/ams/ams_api_version.h \
-		| tr -s [:blank:] \
-		| cut -d' ' -f3))
-	$(eval MICROVER = $(shell grep 'define ATMOSPHERE_RELEASE_VERSION_MICRO\b' libraries/libvapours/include/vapours/ams/ams_api_version.h \
-		| tr -s [:blank:] \
-		| cut -d' ' -f3))
-	$(eval S_MAJORVER = $(shell grep 'define ATMOSPHERE_SUPPORTED_HOS_VERSION_MAJOR\b' libraries/libvapours/include/vapours/ams/ams_api_version.h \
-		| tr -s [:blank:] \
-		| cut -d' ' -f3))
-	$(eval S_MINORVER = $(shell grep 'define ATMOSPHERE_SUPPORTED_HOS_VERSION_MINOR\b' libraries/libvapours/include/vapours/ams/ams_api_version.h \
-		| tr -s [:blank:] \
-		| cut -d' ' -f3))
-	$(eval S_MICROVER = $(shell grep 'define ATMOSPHERE_SUPPORTED_HOS_VERSION_MICRO\b' libraries/libvapours/include/vapours/ams/ams_api_version.h \
-		| tr -s [:blank:] \
-		| cut -d' ' -f3))
-	@python fusee/build_package3.py $(CURDIR) release $(AMSHASH) $(MAJORVER) $(MINORVER) $(MICROVER) 0 $(S_MAJORVER) $(S_MINORVER) $(S_MICROVER) 0
-	@echo "Built package3!"
 
 thermosphere:
 	$(MAKE) -C thermosphere all
@@ -52,10 +26,10 @@ mesosphere: exosphere libraries
 troposphere: stratosphere
 	$(MAKE) -C troposphere all
 
-emummc:
-	$(MAKE) -C emummc all
+sept: exosphere
+	$(MAKE) -C sept all
 
-fusee: exosphere mesosphere stratosphere
+fusee: exosphere mesosphere stratosphere sept
 	$(MAKE) -C $@ all
 
 libraries:
@@ -63,12 +37,6 @@ libraries:
 
 clean:
 	$(MAKE) -C fusee clean
-	$(MAKE) -C emummc clean
-	$(MAKE) -C libraries clean
-	$(MAKE) -C exosphere clean
-	$(MAKE) -C thermosphere clean
-	$(MAKE) -C mesosphere clean
-	$(MAKE) -C stratosphere clean
 	rm -rf out
 
 dist-no-debug: all
@@ -86,55 +54,60 @@ dist-no-debug: all
 	rm -rf out
 	mkdir atmosphere-$(AMSVER)
 	mkdir atmosphere-$(AMSVER)/atmosphere
+	mkdir atmosphere-$(AMSVER)/sept
 	mkdir atmosphere-$(AMSVER)/switch
+	mkdir -p atmosphere-$(AMSVER)/atmosphere/contents/0100000000000008
+	mkdir -p atmosphere-$(AMSVER)/atmosphere/contents/010000000000000D
+	mkdir -p atmosphere-$(AMSVER)/atmosphere/contents/010000000000002B
+	mkdir -p atmosphere-$(AMSVER)/atmosphere/contents/0100000000000032
+	mkdir -p atmosphere-$(AMSVER)/atmosphere/contents/0100000000000034
+	mkdir -p atmosphere-$(AMSVER)/atmosphere/contents/0100000000000036
+	mkdir -p atmosphere-$(AMSVER)/atmosphere/contents/0100000000000037
+	mkdir -p atmosphere-$(AMSVER)/atmosphere/contents/010000000000003C
+	mkdir -p atmosphere-$(AMSVER)/atmosphere/contents/0100000000000042
 	mkdir -p atmosphere-$(AMSVER)/atmosphere/fatal_errors
 	mkdir -p atmosphere-$(AMSVER)/atmosphere/config_templates
 	mkdir -p atmosphere-$(AMSVER)/atmosphere/config
-	mkdir -p atmosphere-$(AMSVER)/atmosphere/flags
-	cp fusee/fusee.bin atmosphere-$(AMSVER)/atmosphere/reboot_payload.bin
-	cp fusee/package3 atmosphere-$(AMSVER)/atmosphere/package3
-	cp config_templates/stratosphere.ini atmosphere-$(AMSVER)/atmosphere/config_templates/stratosphere.ini
+	cp fusee/fusee-primary/fusee-primary.bin atmosphere-$(AMSVER)/atmosphere/reboot_payload.bin
+	cp fusee/fusee-mtc/fusee-mtc.bin atmosphere-$(AMSVER)/atmosphere/fusee-mtc.bin
+	cp fusee/fusee-secondary/fusee-secondary-experimental.bin atmosphere-$(AMSVER)/atmosphere/fusee-secondary.bin
+	cp fusee/fusee-secondary/fusee-secondary-experimental.bin atmosphere-$(AMSVER)/sept/payload.bin
+	cp sept/sept-primary/sept-primary.bin atmosphere-$(AMSVER)/sept/sept-primary.bin
+	cp sept/sept-secondary/sept-secondary.bin atmosphere-$(AMSVER)/sept/sept-secondary.bin
+	cp sept/sept-secondary/sept-secondary_00.enc atmosphere-$(AMSVER)/sept/sept-secondary_00.enc
+	cp sept/sept-secondary/sept-secondary_01.enc atmosphere-$(AMSVER)/sept/sept-secondary_01.enc
+	cp sept/sept-secondary/sept-secondary_dev_00.enc atmosphere-$(AMSVER)/sept/sept-secondary_dev_00.enc
+	cp sept/sept-secondary/sept-secondary_dev_01.enc atmosphere-$(AMSVER)/sept/sept-secondary_dev_01.enc
+	cp config_templates/BCT.ini atmosphere-$(AMSVER)/atmosphere/config/BCT.ini
 	cp config_templates/override_config.ini atmosphere-$(AMSVER)/atmosphere/config_templates/override_config.ini
 	cp config_templates/system_settings.ini atmosphere-$(AMSVER)/atmosphere/config_templates/system_settings.ini
 	cp config_templates/exosphere.ini atmosphere-$(AMSVER)/atmosphere/config_templates/exosphere.ini
-	mkdir -p config_templates/kip_patches
 	cp -r config_templates/kip_patches atmosphere-$(AMSVER)/atmosphere/kip_patches
 	cp -r config_templates/hbl_html atmosphere-$(AMSVER)/atmosphere/hbl_html
-	mkdir -p atmosphere-$(AMSVER)/stratosphere_romfs/atmosphere/contents/0100000000000008
-	mkdir -p atmosphere-$(AMSVER)/stratosphere_romfs/atmosphere/contents/010000000000000D
-	mkdir -p atmosphere-$(AMSVER)/stratosphere_romfs/atmosphere/contents/0100000000000017
-	mkdir -p atmosphere-$(AMSVER)/stratosphere_romfs/atmosphere/contents/010000000000002B
-	mkdir -p atmosphere-$(AMSVER)/stratosphere_romfs/atmosphere/contents/0100000000000032
-	mkdir -p atmosphere-$(AMSVER)/stratosphere_romfs/atmosphere/contents/0100000000000034
-	mkdir -p atmosphere-$(AMSVER)/stratosphere_romfs/atmosphere/contents/0100000000000036
-	mkdir -p atmosphere-$(AMSVER)/stratosphere_romfs/atmosphere/contents/0100000000000037
-	mkdir -p atmosphere-$(AMSVER)/stratosphere_romfs/atmosphere/contents/010000000000003C
-	mkdir -p atmosphere-$(AMSVER)/stratosphere_romfs/atmosphere/contents/0100000000000042
-	mkdir -p atmosphere-$(AMSVER)/stratosphere_romfs/atmosphere/contents/0100000000000420
-	mkdir -p atmosphere-$(AMSVER)/stratosphere_romfs/atmosphere/contents/010000000000B240
-	mkdir -p atmosphere-$(AMSVER)/stratosphere_romfs/atmosphere/contents/010000000000D623
-	cp stratosphere/boot2/boot2.nsp atmosphere-$(AMSVER)/stratosphere_romfs/atmosphere/contents/0100000000000008/exefs.nsp
-	cp stratosphere/dmnt/dmnt.nsp atmosphere-$(AMSVER)/stratosphere_romfs/atmosphere/contents/010000000000000D/exefs.nsp
-	cp stratosphere/cs/cs.nsp atmosphere-$(AMSVER)/stratosphere_romfs/atmosphere/contents/0100000000000017/exefs.nsp
-	cp stratosphere/erpt/erpt.nsp atmosphere-$(AMSVER)/stratosphere_romfs/atmosphere/contents/010000000000002B/exefs.nsp
-	cp stratosphere/eclct.stub/eclct.stub.nsp atmosphere-$(AMSVER)/stratosphere_romfs/atmosphere/contents/0100000000000032/exefs.nsp
-	cp stratosphere/fatal/fatal.nsp atmosphere-$(AMSVER)/stratosphere_romfs/atmosphere/contents/0100000000000034/exefs.nsp
-	cp stratosphere/creport/creport.nsp atmosphere-$(AMSVER)/stratosphere_romfs/atmosphere/contents/0100000000000036/exefs.nsp
-	cp stratosphere/ro/ro.nsp atmosphere-$(AMSVER)/stratosphere_romfs/atmosphere/contents/0100000000000037/exefs.nsp
-	cp stratosphere/jpegdec/jpegdec.nsp atmosphere-$(AMSVER)/stratosphere_romfs/atmosphere/contents/010000000000003C/exefs.nsp
-	cp stratosphere/pgl/pgl.nsp atmosphere-$(AMSVER)/stratosphere_romfs/atmosphere/contents/0100000000000042/exefs.nsp
-	cp stratosphere/LogManager/LogManager.nsp atmosphere-$(AMSVER)/stratosphere_romfs/atmosphere/contents/0100000000000420/exefs.nsp
-	cp stratosphere/htc/htc.nsp atmosphere-$(AMSVER)/stratosphere_romfs/atmosphere/contents/010000000000B240/exefs.nsp
-	cp stratosphere/TioServer/TioServer.nsp atmosphere-$(AMSVER)/stratosphere_romfs/atmosphere/contents/010000000000D623/exefs.nsp
-	@build_romfs atmosphere-$(AMSVER)/stratosphere_romfs atmosphere-$(AMSVER)/atmosphere/stratosphere.romfs
-	rm -r atmosphere-$(AMSVER)/stratosphere_romfs
+	cp stratosphere/boot2/boot2.nsp atmosphere-$(AMSVER)/atmosphere/contents/0100000000000008/exefs.nsp
+	cp stratosphere/dmnt/dmnt.nsp atmosphere-$(AMSVER)/atmosphere/contents/010000000000000D/exefs.nsp
+	cp stratosphere/erpt/erpt.nsp atmosphere-$(AMSVER)/atmosphere/contents/010000000000002B/exefs.nsp
+	cp stratosphere/eclct.stub/eclct.stub.nsp atmosphere-$(AMSVER)/atmosphere/contents/0100000000000032/exefs.nsp
+	cp stratosphere/fatal/fatal.nsp atmosphere-$(AMSVER)/atmosphere/contents/0100000000000034/exefs.nsp
+	cp stratosphere/creport/creport.nsp atmosphere-$(AMSVER)/atmosphere/contents/0100000000000036/exefs.nsp
+	cp stratosphere/ro/ro.nsp atmosphere-$(AMSVER)/atmosphere/contents/0100000000000037/exefs.nsp
+	cp stratosphere/jpegdec/jpegdec.nsp atmosphere-$(AMSVER)/atmosphere/contents/010000000000003C/exefs.nsp
+	cp stratosphere/pgl/pgl.nsp atmosphere-$(AMSVER)/atmosphere/contents/0100000000000042/exefs.nsp
+	mkdir -p atmosphere-$(AMSVER)/atmosphere/contents/0100000000000032/flags
+	touch atmosphere-$(AMSVER)/atmosphere/contents/0100000000000032/flags/boot2.flag
+	mkdir -p atmosphere-$(AMSVER)/atmosphere/contents/0100000000000037/flags
+	touch atmosphere-$(AMSVER)/atmosphere/contents/0100000000000037/flags/boot2.flag
 	cp troposphere/reboot_to_payload/reboot_to_payload.nro atmosphere-$(AMSVER)/switch/reboot_to_payload.nro
 	cp troposphere/daybreak/daybreak.nro atmosphere-$(AMSVER)/switch/daybreak.nro
+	cd atmosphere-$(AMSVER); zip -r ../atmosphere-EXPERIMENTAL-$(AMSVER).zip ./*; cd ../;
+	cp fusee/fusee-secondary/fusee-secondary.bin atmosphere-$(AMSVER)/atmosphere/fusee-secondary.bin
+	cp fusee/fusee-secondary/fusee-secondary.bin atmosphere-$(AMSVER)/sept/payload.bin
 	cd atmosphere-$(AMSVER); zip -r ../atmosphere-$(AMSVER).zip ./*; cd ../;
-	rm -rf atmosphere-$(AMSVER)
+	rm -r atmosphere-$(AMSVER)
 	mkdir out
+	mv atmosphere-EXPERIMENTAL-$(AMSVER).zip out/atmosphere-EXPERIMENTAL-$(AMSVER).zip
 	mv atmosphere-$(AMSVER).zip out/atmosphere-$(AMSVER).zip
-	cp fusee/fusee.bin out/fusee.bin
+	cp fusee/fusee-primary/fusee-primary.bin out/fusee-primary.bin
 
 dist: dist-no-debug
 	$(eval MAJORVER = $(shell grep 'define ATMOSPHERE_RELEASE_VERSION_MAJOR\b' libraries/libvapours/include/vapours/ams/ams_api_version.h \
@@ -149,32 +122,33 @@ dist: dist-no-debug
 	$(eval AMSVER = $(MAJORVER).$(MINORVER).$(MICROVER)-$(AMSREV))
 	rm -rf atmosphere-$(AMSVER)-debug
 	mkdir atmosphere-$(AMSVER)-debug
-	cp fusee/loader_stub/loader_stub.elf atmosphere-$(AMSVER)-debug/fusee-loader-stub.elf
-	cp fusee/program/program.elf atmosphere-$(AMSVER)-debug/fusee-program.elf
+	cp fusee/fusee-primary/fusee-primary.elf atmosphere-$(AMSVER)-debug/fusee-primary.elf
+	cp fusee/fusee-mtc/fusee-mtc.elf atmosphere-$(AMSVER)-debug/fusee-mtc.elf
+	cp fusee/fusee-secondary/fusee-secondary-experimental.elf atmosphere-$(AMSVER)-debug/fusee-secondary.elf
+	cp sept/sept-primary/sept-primary.elf atmosphere-$(AMSVER)-debug/sept-primary.elf
+	cp sept/sept-secondary/sept-secondary.elf atmosphere-$(AMSVER)-debug/sept-secondary.elf
+	cp sept/sept-secondary/key_derivation/key_derivation.elf atmosphere-$(AMSVER)-debug/sept-secondary-key-derivation.elf
 	cp exosphere/loader_stub/loader_stub.elf atmosphere-$(AMSVER)-debug/exosphere-loader-stub.elf
 	cp exosphere/program/program.elf atmosphere-$(AMSVER)-debug/exosphere-program.elf
 	cp exosphere/warmboot/warmboot.elf atmosphere-$(AMSVER)-debug/exosphere-warmboot.elf
-	cp exosphere/mariko_fatal/mariko_fatal.elf atmosphere-$(AMSVER)-debug/exosphere-mariko-fatal.elf
 	cp exosphere/program/sc7fw/sc7fw.elf atmosphere-$(AMSVER)-debug/exosphere-sc7fw.elf
 	cp exosphere/program/rebootstub/rebootstub.elf atmosphere-$(AMSVER)-debug/exosphere-rebootstub.elf
 	cp mesosphere/kernel_ldr/kernel_ldr.elf atmosphere-$(AMSVER)-debug/kernel_ldr.elf
-	cp mesosphere/kernel/kernel.elf atmosphere-$(AMSVER)-debug/kernel.elf
 	cp stratosphere/ams_mitm/ams_mitm.elf atmosphere-$(AMSVER)-debug/ams_mitm.elf
 	cp stratosphere/boot/boot.elf atmosphere-$(AMSVER)-debug/boot.elf
 	cp stratosphere/boot2/boot2.elf atmosphere-$(AMSVER)-debug/boot2.elf
 	cp stratosphere/creport/creport.elf atmosphere-$(AMSVER)-debug/creport.elf
 	cp stratosphere/dmnt/dmnt.elf atmosphere-$(AMSVER)-debug/dmnt.elf
 	cp stratosphere/eclct.stub/eclct.stub.elf atmosphere-$(AMSVER)-debug/eclct.stub.elf
-	cp stratosphere/erpt/erpt.elf atmosphere-$(AMSVER)-debug/erpt.elf
 	cp stratosphere/fatal/fatal.elf atmosphere-$(AMSVER)-debug/fatal.elf
-	cp stratosphere/jpegdec/jpegdec.elf atmosphere-$(AMSVER)-debug/jpegdec.elf
 	cp stratosphere/loader/loader.elf atmosphere-$(AMSVER)-debug/loader.elf
-	cp stratosphere/ncm/ncm.elf atmosphere-$(AMSVER)-debug/ncm.elf
-	cp stratosphere/pgl/pgl.elf atmosphere-$(AMSVER)-debug/pgl.elf
 	cp stratosphere/pm/pm.elf atmosphere-$(AMSVER)-debug/pm.elf
 	cp stratosphere/ro/ro.elf atmosphere-$(AMSVER)-debug/ro.elf
 	cp stratosphere/sm/sm.elf atmosphere-$(AMSVER)-debug/sm.elf
 	cp stratosphere/spl/spl.elf atmosphere-$(AMSVER)-debug/spl.elf
+	cp stratosphere/erpt/erpt.elf atmosphere-$(AMSVER)-debug/erpt.elf
+	cp stratosphere/jpegdec/jpegdec.elf atmosphere-$(AMSVER)-debug/jpegdec.elf
+	cp stratosphere/pgl/pgl.elf atmosphere-$(AMSVER)-debug/pgl.elf
 	cp troposphere/daybreak/daybreak.elf atmosphere-$(AMSVER)-debug/daybreak.elf
 	cd atmosphere-$(AMSVER)-debug; zip -r ../atmosphere-$(AMSVER)-debug.zip ./*; cd ../;
 	rm -r atmosphere-$(AMSVER)-debug

config_templates/BCT.ini

@@ -0,0 +1,12 @@
+BCT0
+[stage1]
+stage2_path = atmosphere/fusee-secondary.bin
+stage2_mtc_path = atmosphere/fusee-mtc.bin
+stage2_addr = 0xF0000000
+stage2_entrypoint = 0xF0000000
+
+[stratosphere]
+; To force-enable nogc, add nogc = 1
+; To force-disable nogc, add nogc = 0
+
+; To opt out of using Atmosphere's NCM reimplementation, add disable_ncm = 1

config_templates/exosphere.ini

@@ -35,17 +35,6 @@
 #    mmc space, encrypted to prevent detection. This backup can be used
 #    to prevent unrecoverable edits in emergencies.
 
-# Key: log_port, default: 0.
-#  Desc: Controls what uart port exosphere will set up for logging.
-#  NOTE: 0 = UART-A, 1 = UART-B, 2 = UART-C, 3 = UART-D
-
-# Key: log_baud_rate, default: 115200
-#  Desc: Controls the baud rate exosphere will set up for logging.
-#  NOTE: 0 is treated as equivalent to 115200.
-
-# Key: log_inverted, default: 0.
-#  Desc: Controls whether the logging uart port is inverted.
-
 [exosphere]
 debugmode=1
 debugmode_user=0
@@ -54,6 +43,3 @@ enable_user_pmu_access=0
 blank_prodinfo_sysmmc=0
 blank_prodinfo_emummc=0
 allow_writing_to_cal_sysmmc=0
-log_port=0
-log_baud_rate=115200
-log_inverted=0

config_templates/override_config.ini

@@ -1,10 +1,9 @@
 [hbl_config]
 ; Program Specific Config
 ; Up to 8 program-specific configurations can be set.
-; These use `program_id_#`, `override_address_space_#`, and `override_key_#`
+; These use `program_id_#` and `override_key_#`
 ; where # is in range [0,7].
 ; program_id_0=010000000000100D
-; override_address_space=39_bit
 ; override_key_0=!R
 
 ; Any Application Config
@@ -13,7 +12,6 @@
 ; by a program specific config.
 ; override_any_app=true
 ; override_any_app_key=R
-; override_any_app_address_space=39_bit
 ; path=atmosphere/hbl.nsp
 
 [default_config]

config_templates/stratosphere.ini

@@ -1,4 +0,0 @@
-[stratosphere]
-; To force-enable nogc, add nogc = 1
-; To force-disable nogc, add nogc = 0
-

config_templates/system_settings.ini

@@ -1,21 +1,10 @@
-[eupld]
 ; Disable uploading error reports to Nintendo
+[eupld]
 ; upload_enabled = u8!0x0
-[usb]
-; Enable USB 3.0 superspeed for homebrew
-; 0 = USB 3.0 support is system default (usually disabled), 1 = USB 3.0 support is enabled.
-; usb30_force_enabled = u8!0x0
-[ro]
 ; Control whether RO should ease its validation of NROs.
 ; (note: this is normally not necessary, and ips patches can be used.)
+[ro]
 ; ease_nro_restriction = u8!0x1
-[lm]
-; Control whether lm should log to the SD card.
-; Note that this setting does nothing when log manager is not enabled.
-; enable_sd_card_logging = u8!0x1
-; Control the output directory for SD card logs.
-; Note that this setting does nothing when log manager is not enabled/sd card logging is not enabled.
-; sd_card_log_output_directory = str!atmosphere/binlogs
 ; Atmosphere custom settings
 [atmosphere]
 ; Reboot from fatal automatically after some number of milliseconds.
@@ -43,27 +32,12 @@
 ; NOTE: EXPERIMENTAL
 ; If you do not know what you are doing, do not touch this yet.
 ; fsmitm_redirect_saves_to_sd = u8!0x0
-; Controls whether am sees system settings "DebugModeFlag" as
-; enabled or disabled.
-; 0 = Disabled (not debug mode), 1 = Enabled (debug mode)
-; enable_am_debug_mode = u8!0x0
-; Controls whether dns.mitm is enabled
-; 0 = Disabled, 1 = Enabled
-; enable_dns_mitm = u8!0x1
-; Controls whether dns.mitm uses the default redirections in addition to
-; whatever is specified in the user's hosts file.
-; 0 = Disabled (use hosts file contents), 1 = Enabled (use defaults and hosts file contents)
-; add_defaults_to_dns_hosts = u8!0x1
-; Controls whether dns.mitm logs to the sd card for debugging
-; 0 = Disabled, 1 = Enabled
-; enable_dns_mitm_debug_log = u8!0x0
-; Controls whether htc is enabled
-; 0 = Disabled, 1 = Enabled
-; enable_htc = u8!0x0
-; Controls whether atmosphere's log manager is enabled
-; 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 to enable the deprecated hid mitm
+; to fix compatibility with old homebrew.
+; 0 = Do not enable, 1 = Enable.
+; Please note this setting may be removed in a
+; future release of Atmosphere.
+; enable_deprecated_hid_mitm = 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/building.md

@@ -5,20 +5,23 @@ Building Atmosphère is a very straightforward process that relies almost exclus
 + [devkitA64](https://devkitpro.org)
 + [devkitARM](https://devkitpro.org)
 + [Python 2](https://www.python.org) (Python 3 may work as well, but this is not guaranteed)
-+ [LZ4](https://pypi.org/project/lz4)
 + [PyCryptodome](https://pypi.org/project/pycryptodome) (optional)
 
 ## Instructions
-1. Follow the guide located [here](https://devkitpro.org/wiki/Getting_Started) to install and configure all the tools necessary for the build process.
+1. Follow the guide located [here](https://devkitpro.org/wiki/Getting_Started) to install and configure all the tools necessary for the build process. 
 
 2. Install the following packages via (dkp-)pacman:
     + `switch-dev`
-    + `switch-glm`
     + `switch-libjpeg-turbo`
     + `devkitARM`
     + `devkitarm-rules`
 
-3. Install the following library via python's package manager `pip`, required by [exosphere](components/exosphere.md):
-    + `lz4`
+3. (Optional) In order to build [sept](components/sept.md) the pycryptodome PyPi package is required, which can be installed by running `pip install pycryptodome` under the installed Python environment of your choice or by installing the complete zip package to support the `make dist` recipe. This is an optional step included for advanced users who have the ability to provide the necessary encryption/signing keys themselves.
 
-4. Finally, clone the Atmosphère repository and run `make` under its root directory.
+4. It is, instead, possible to build [sept](components/sept.md) by providing previously encrypted/signed binaries distributed by official Atmosphère release packages. In order to do so, export the following variables in your current environment:
+    + `SEPT_00_ENC_PATH` (must point to the `sept-secondary_00.enc` file)
+    + `SEPT_01_ENC_PATH` (must point to the `sept-secondary_01.enc` file)
+    + `SEPT_DEV_00_ENC_PATH` (must point to the `sept-secondary_dev_00.enc` file)
+    + `SEPT_DEV_01_ENC_PATH` (must point to the `sept-secondary_dev_01.enc` file)
+
+5. Finally, clone the Atmosphère repository and run `make` under its root directory.

docs/changelog.md

@@ -1,267 +1,4 @@
 # Changelog
-## 1.1.1
-+ A bug was fixed which caused some memory to leak when launching a game with mods enabled, eventually causing a crash after enough game launches without rebooting.
-+ General system stability improvements to enhance the user's experience.
-## 1.1.0
-+ Support was implemented for 13.0.0.
-  + `mesosphère` was updated to reflect the latest official kernel behavior.
-  + `ncm` was updated to reflect the latest official behaviors.
-  + `erpt` was  updated to reflect the latest official behaviors.
-    + Two new services ("sprofile") were added to `erpt`, and have been fully reimplemented.
-    + **Please Note**: These services provide a way for settings to be pushed to consoles over the internet without system update.
-      + Because there appear to be no settings pushed out yet, this implementation fundamentally cannot be fully tested right now, but hopefully there are no issues once settings begin being distributed.
-+ The `LogManager` system module was reimplemented.
-  + This system module provides services that some games use for logging.
-  + Atmosphere's reimplementation supports logging to the SD card (if `lm!enable_sd_card_logging` is true) and to ams.TMA.
-    + To control the directory where logs are saved, modify the `lm!sd_card_log_output_directory` setting.
-  + Atmosphere's reimplementation is disabled by default (in order to save memory), but can be enabled by setting `lm!enable_log_manager` to true.
-    + This will allow reading over logs from games which use the services (or potentially logging from homebrew in the future), which can be useful to developers.
-    + Please note that when TMA is fully implemented in the future, enabling TMA will forcibly enable `LogManager`.
-+ General system stability improvements to enhance the user's experience.
-## 1.0.0
-+ `fusee` was completely re-written in C++ to use the same atmosphere-libs APIs as the rest of atmosphere's code.
-  + The rewrite was performed with a big emphasis on ensuring a good boot speed, and generally boot should be much faster than it was previously.
-    + Depending on SD card/environment, boot speed may now be slightly faster than, roughly the same as, or slightly slower than when booting with hekate.
-    + The obvious low-hanging fruit for performance improvements has been picked, so hopefully the improved performance is to everybody's liking.
-  + SD card compatibility was improved: fusee should now have SD card compatibility identical to the official OS driver.
-  + **Please Note**: various components were renamed (fusee-primary.bin -> fusee.bin, fusee-secondary.bin -> package3).
-    + If you use another bootloader (like hekate), you may need to update your configuration to use the new layout.
-  + **Please Note**: BCT.ini no longer exists, nogc configuration has been moved to `/atmosphere/stratosphere.ini`.
-    + If you rely on custom nogc configuration, please be sure to update accordingly.
-  + Custom splash screen BMP parsing is no longer supported (as it slows down boot for 99% of users).
-    + To compensate for this, a script to insert a custom splash screen into a `package3` binary has been added to the `utilities` folder of the atmosphere repository.
-    + The release build should be equivalent to running the following command from the root of the atmosphere repository: `python utilities/insert_splash_screen.py img/splash.png fusee/package3`
-+ A number of pending changes were made, following the end of the relevant testing periods:
-  + `mesosphere` is no longer opt-out, and stratosphere code will begin depending on its being present/in use.
-  + `NCM` is no longer opt-out.
-  + The cleanup to ease the transition from < 0.19.0 to 0.19.0 has been removed.
-+ General system stability improvements to enhance the user's experience.
-## 0.20.1
-+ An issue was fixed that caused severely degraded performance after wake-from-sleep on Mariko hardware.
-  + This was due to Mariko MTC resulting in a frequency of 1599.999MHz instead of 1600MHz.
-  + Due to this off-by-one, Nintendo's EMC management code failed to initialize/take over, and after wake from sleep RAM would be in a strange state.
-+ General system stability improvements to enhance the user's experience.
-## 0.20.0
-+ DRAM training (MTC) was implemented for Mariko hardware, increasing RAM speed from 204MHz to 1600MHz.
-  + This significantly optimizes Mariko boot speed, cutting boot time roughly in half.
-  + Typical boot time reductions (measured as "select fusee" to "home menu visible"):
-    + Normal (Iowa): ~35 seconds -> ~18 seconds.
-    + Lite (Hoag): ~65 seconds -> ~30 seconds.
-  + NOTE: Work is being started on a re-written `fusee` component, with an eye specifically towards ensuring a good boot speed.
-    + With any luck, boot will be much much faster on all units (Mariko and Erista) in an upcoming release.
-+ Sept was replaced, and deleted from the repository.
-  + Erista units now use a custom TSEC firmware to manage key derivation.
-    + For more details, contact SciresM#0524 on discord.
-  + This has a number of benefits, including:
-    + This greatly simplifies key derivation logic by making it consistent on all firmwares.
-      + Fusee no longer accesses/uses keyblobs at all, so units which have accidentally destroyed/lost keyblobs can boot without them.
-    + This greatly increases stability (sept was the biggest source of boot failures).
-    + This improves boot speed (sept rebooted multiple times, performed hardware init multiple times, and was generally very slow).
-    + Atmosphère build process is now much saner.
-+ A number of improvements were made to the dmnt cheat engine.
-  + Cheats which take in a memory region operand may now use types "2" or "3" to perform accesses relative to the alias/aslr regions, respectively.
-  + Support was added for an "else" opcode in the cheat engine, to make writing certain conditional logic more natural.
-  + Support was added for a cheat orchestrator homebrew (like edizon) to detach from a cheat process/set the master cheat programmatically.
-+ Daybreak now provides a warning when attempting to install a firmware newer than the highest version atmosphère knows it supports.
-  + To facilitate this, exosphere now exposes the supported HOS version via an extension ConfigItem.
-+ A number of minor issues were fixed, including:
-  + Several mesosphere debug SVC implementations were updated to reflect the semantics of the latest kernel.
-  + Support was fixed for deriving BIS encryption keys on certain prototype hardware.
-+ General system stability improvements to enhance the user's experience.
-## 0.19.5
-+ Support was added for 12.1.0.
-+ LayeredFS support was added for OpenDataStorageWithProgramIndex commands.
-  + Certain games using newer (7.0.0+ APIs) which include multiple programs under a single title previously could not be modified.
-  + These are now supported as normal, and LayeredFS should have 100% compatibility again.
-+ A number of minor issues were fixed, including:
-  + The Reboot to Payload NRO was updated to allow the OS to save state prior to rebooting (thanks @AuroraWright)!
-  + An issue was fixed that could cause dns.mitm to fail when games requested resolution of an empty string.
-  + An issue was fixed that caused a memory leak in the erpt system module.
-    + This would eventually cause a system crash after ~540 reports were generated without rebooting.
-+ A number of minor improvements were made to improve mesosphere's accuracy.
-+ General system stability improvements to enhance the user's experience.
-## 0.19.4
-+ Support was added for 12.0.3.
-+ A number of minor issues were fixed, including:
-  + An issue was fixed that could cause heap memory corruption when allocation was highly contended.
-  + An issue was fixed that could cause sleep to fail under certain conditions.
-  + An issue was fixed that could cause a scheduler slow path to be taken more often than necessary.
-+ General system stability improvements to enhance the user's experience.
-## 0.19.3
-+ Support was added for 12.0.2.
-+ A number of minor issues were fixed, including:
-  + An issue was fixed in dns.mitm that caused a crash when games attempted to resolve the IP address of nullptr.
-  + An issue was fixed in erpt that would cause an abort when booting without having ever booted stock previously.
-  + An issue was fixed in (file-based) emummc that caused an error on system format/downloading certain games.
-+ General system stability improvements to enhance the user's experience.
-## 0.19.2
-+ Atmosphère's components were further updated to reflect latest official behaviors as of 12.0.0.
-  + Notably, `erpt` was updated to implement the new forced shutdown detection feature.
-    + When a forced-shutdown occurs, an erpt_report will be generated and saved to the SD card on the next boot.
-+ Atmosphere-libs was updated to use GCC 11 (latest devkitA64/devkitARM releases).
-  + Initial inspections show mild-to-moderate optimizer improvements in several important places (kernel is 0x3000 smaller).
-  + General system stability improvements to enhance the user's experience.
-+ A number of minor issues were fixed, including:
-  + A bug was fixed that caused a black screen when attempting to boot firmware versions 2.0.0-4.1.0.
-  + A bug was fixed that caused sm to abort when at the session limit, rather than returning error codes.
-  + A bug was fixed that allowed for resource exhaustion on 12.0.0, under certain circumstances.
-+ Several issues were fixed, and usability and stability were improved.
-## 0.19.1
-+ An issue was fixed that caused a fatal error when using official `migration` services to transfer data between consoles.
-+ An issue was fixed in `ncm` that caused an error when the OS tried to enumerate installed SD card content.
-+ Several issues were fixed, and usability and stability were improved.
-## 0.19.0
-+ Support was added for 12.0.0.
-  + `mesosphère` was updated to reflect the latest official kernel behavior.
-  + `sm`, `boot2`, `pgl` were updated to reflect the latest official behaviors.
-    + **Please Note**: 12.0.0 added a new protocol for IPC ("tipc"), which has been freshly reimplemented in its entirety.
-      + It is possible there may be as of yet unfound issues; if there are, please send the appropriate crash reports to SciresM (SciresM#0524 on discord).
-      + Homebrew which uses atmosphere extensions (including the mitm API) will need to be re-compiled in order to function on 0.19.0.
-        + I apologize for this, but it's unavoidable for technical reasons. If you're affected by this and mad about it, please contact SciresM to complain.
-  + `erpt` was partially updated to reflect the latest official behaviors.
-    + New features were added to erpt to track the activity of running applets, and to detect when a forced shutdown occurs.
-    + These behaviors have been temporarily stubbed, as they are not necessary for 12.0.0 to run (and their outputs won't be saved anywhere).
-    + A future atmosphère update will implement these behaviors, in the interest of reflecting official logic as faithfully as we can.
-+ Atmosphère no longer uses the /contents/ folder for its own programs.
-  + Atmosphère's system modules are now bundled together in the single file "stratosphere.romfs".
-    + For those working on developing for atmosphère, executables inside the /contents/ directory will be preferred to those in "stratosphere.romfs".
-  + **Please Note**: In order to facilitate this change (and the desired behavior), the first time you boot after extracting a release zip, atmosphère system modules inside /contents/ will be deleted.
-    + This will have no impact on user programs (it only removes programs with specific program ids).
-+ Improvements were made to mesosphere, including:
-  + An extension InfoType was added for getting the current process handle, without having to spawn a thread and do IPC with oneself.
-  + An issue was fixed in SvcSetDebugThreadContext.
-  + An issue was fixed when doing IPC with user buffers.
-+ Support was fixed for toggling the custom setting `usb!usb30_force_enabled` on 9.0.0+.
-  + This was broken by Nintendo's introducing a dependency that made USB a requirement to launch before custom settings are parsed.
-  + Since the fix, you can now toggle the setting (as you could prior to atmosphère 0.9.4), and it will work as expected.
-  + **Please Note**: Enabling USB 3.0 often severely impacts wireless communications.
-    + Because of this, the setting will default to off. If you experience issues with it enabled, consider disabling it.
-+ A warning was added to daybreak when resetting the console to factory settings.
-+ Substantial work was completed towards atmosphere's upcoming implementation of the host target connection protocol.
-  + Once completed, users will be able to interact with a Switch running atmosphère via a PC application ("Starlink") currently under development.
-    + Planned eventual features for connected consoles include a gdbstub, interacting with memory (for cheat development), streaming gameplay audio and video, and accessing the Switch's SD card filesystem.
-    + Switch homebrew will also have access to a (configurable and sandboxed) filesystem on the host PC, while connected.
-  + Towards this end, the following was accomplished:
-    + The "htc" system module was reimplemented completely.
-    + The system module which provides remote access to the SD card was reimplemented completely.
-  + This is currently the active focus of atmosphère's development.
-  + **Please Note**: Support is not yet completed, and users are disadvised from interacting with the related settings for the time being, unless they particularly know what they're doing.
-+ A number of minor issues were fixed, including:
-  + A bug was fixed in `dmnt` that could cause a fatal when launching certain games with cheats active.
-  + An issue was fixed that could cause an abort in `sm` when using a large number of custom system modules.
-  + An issue was fixed that prevented launching gamecards on 1.0.0.
-  + Minor issues were fixed in the cheat virtual machine's behavior.
-+ Several issues were fixed, and usability and stability were improved.
-## 0.18.1
-+ A number of minor issues were fixed, including:
-  + The new `dns.mitm` module added in 0.18.0 no longer fatal errors when receiving port=nullptr.
-    + This fixes youtube ad-blocking, and possibly other usecases.
-  + A bug was fixed that caused ams.mitm to incorrectly cache data storages.
-    + This potentially broke DLC when using romfs mods, and could have caused other issues (e.g. with custom themes, and maybe other cases).
-  + A bug was fixed in power state control module registration.
-    + This might fix a weird edge case with system module dependencies on sleep/wake, but probably nobody should notice any differences.
-  + A bug was fixed where mesosphere sometimes treated virtual core IDs as though they were physical core IDs.
-    + This had zero impact, because for Switch virtual core == physical core, but it could have affected future platforms if it had remained unresolved.
-+ Several issues were fixed, and usability and stability were improved.
-## 0.18.0
-+ A new mitm module was added (`dns.mitm`).
-  + This provides a highly configurable mechanism for redirecting DNS resolution requests.
-  + By default atmosphère redirects resolution requests for official telemetry servers to a loopback address.
-  + Documentation on how to configure `dns.mitm` to meet your more specific needs may be found [here](https://github.com/Atmosphere-NX/Atmosphere/blob/master/docs/features/dns_mitm.md).
-+ The service framework API (`sf`) was refactored to be more accurate to official logic and greatly reduce memory requirements.
-  + The comparison of atmosphère module memory usage versus Nintendo's found [here](https://github.com/Atmosphere-NX/Atmosphere/wiki/Memory-Comparisons) was updated to reflect this.
-  + **Please Note**: If you are a developer using the libstratosphere service APIs, some updating may be required. Contact SciresM#0524 on discord for assistance if required.
-+ A number of deprecations were removed, following a general codebase cleanup:
-  + The `sm` extension to not unregister services on connection close was superseded by official opt-in logic in 11.0.0, and has been removed in favor of official logic.
-    + This should have zero impact on users.
-  + The temporary `hid-mitm` added in 0.9.0 has finally been removed, following over a year of deprecation.
-    + There shouldn't be any homebrew in use still affected by this, but the situation will be monitored.
-    + If this is somehow still a real issue, an unaffiliated hid mitm sysmodule providing the same functionality can be created and released, separate from atmosphère itself.
-+ Several issues were fixed, and usability and stability were improved.
-## 0.17.1
-+ A number of atmosphère's modules were using more memory than their Nintendo equivalent's in 0.17.0; a number of code generatio tweaks have been applied to fix this across the board.
-  + A detailed comparison of atmosphère module memory usage versus Nintendo's was made and can be found [here](https://github.com/Atmosphere-NX/Atmosphere/wiki/Memory-Comparisons).
-+ Several minor bugs were fixed, including:
-  + A bug was fixed in mesosphère that caused games which attempt to map more memory than the Switch has to fail.
-    + This affected "Piczle Lines DX 500 More Puzzles!", and possibly other games.
-  + Enabling configuration to "blank" PRODINFO no longer causes a hang on Mariko devices (or any devices with newer format).
-+ Several issues were fixed, and usability and stability were improved.
-## 0.17.0
-+ fusee was heavily rewritten in order to add support for Mariko hardware.
-  + **Please Note**: Mariko hardware currently has no (and may not ever have any) software exploits; fusee works when loaded from bootloader context with the right keys in the security engine. No means of getting the system into this state is provided.
-+ An issue was fixed in the way shutdown was performed on Erista hardware.
-  + This fixes an issue that caused OFW to black screen on boot after power off from atmosphere without first doing a reboot.
-  + This also substantially improves power drain when the system is shut off; consoles powered off from Atmosphere should now drain battery at the same reduced rate as original firmware.
-+ A number of minor changes were made, including:
-  + A number of inconsistencies in the build system were fixed.
-    + For those building atmosphère at home, the `boot` sysmodule will no longer rebuild every time make is invoked.
-    + This substantially improves build times during development iteration.
-  + `sm` was updated to more accurately reflect how official code manages request deferral.
-  + `mesosphère` was updated to more accurately reflect official kernel management of the trace buffer.
-  + `mesosphère` was updated to improve kernel loader's logic by taking advantage of the assumption that we only boot our kernel, not Nintendo's.
-+ As it has been a few months with zero reported issues, `mesosphère` is now opt-out.
-    + Users who wish to begin using or continue using mesosphere should use the standard/cool kids zip ("atmosphere-").
-    + Users who wish to opt-out of mesosphere should download and extract the opt-out zip ("atmosphere-WITHOUT_MESOSPHERE-").
-+ Several issues were fixed, and usability and stability were improved.
-## 0.16.2
-+ Atmosphère release zips no longer bundle BCT.ini, instead relying on defaults in code.
-  + This means atmosphere updates should no longer overwrite any user configuration at all.
-  + If you wish to modify BCT.ini config, copy the template from /config_templates/ as with other configuration.
-+ `pgl` and `creport` were further updated to reflect differences in official behavior in 11.0.0.
-+ An issue was fixed that caused creport to be launched multiple times on process crash.
-  + This fixes the "duplicate reports" issue that sometimes plagued people.
-+ A new system setting (`atmosphere!enable_am_debug_mode`) configuring am to use debug mode.
-  + If you are not a developer or don't see a clear use for this, leave it configured to the default (off).
-+ Reboot to payload NRO was updated to fix support with certain payloads.
-+ Support was fixed for atmosphere's extension to support homebrew use of new (8.0.0+) kernel mappings.
-  + In particular, when running tracing debug builds of `mesosphère`, hbloader now has access to the kernel trace buffer.
-+ Several issues were fixed, and usability and stability were improved.
-## 0.16.1
-+ Support was added for 11.0.1.
-  + `mesosphère` was updated to reflect the latest official kernel behavior.
-    + A new svc::InfoType added in 11.0.0 was implemented (it wasn't discovered before 0.16.0 released).
-    + The new Control Flow Integrity (CFI) logic added in 11.0.0 kernel was implemented.
-+ `fs` logic was refactored and cleaned up to reflect some newer sysmodule behavioral and structural changes.
-+ `exosphère` was updated to allow dynamic control of what uart port is used for logging.
-  + This can be controlled by editing the `log_port`, `log_baud_rate`, and `log_inverted` fields in `exosphere.ini`.
-+ `mesosphère` was updated to improve debugging capabilities.
-  + This is still a work in progress, but developers may be interested.
-+ A bug was fixed that caused `fatal` to fatal error if the fatal process was already being debugged.
-+ Several issues were fixed, and usability and stability were improved.
-## 0.16.0
-+ Support was added for 11.0.0.
-  + `exosphère` was updated to reflect the latest official secure monitor behavior.
-  + `mesosphère` was updated to reflect the latest official kernel behavior.
-  + `loader`, `sm`, `boot`, `pgl` were updated to reflect the latest official behaviors.
-    + **Please Note**: 11.0.0 implements an opt-in version of the atmosphère `sm` extension that allows for closing session without unregistering services.
-      + Correspondingly, the extension will be deprecated in favor of the new official opt-in command. In 0.17.0, it will be removed entirely.
-      + If your custom system module relies on this extension (however unlikely that seems to me), please update it accordingly.
-  + `erpt` was partially updated to provide compatibility with 11.0.0.
-    + The latest firmware attaches additional fields and context information to logs.
-    + A future atmosphère update will implement this logic, so that users who are interested can also get the new information when examining their logs.
-  + **Please Note**: 11.0.0 introduced breaking changes to the `usb` system module's `usb:ds` API.
-    + Homebrew which uses the `usb:ds` service should rebuild with the latest libnx version to support running on 11.0.0.
-+ The `boot` system module was rewritten to reflect the huge driver changes introduced in 8.0.0.
-  + This includes a number of improvements to both logo display and battery management logic.
-+ Support was added for configuring the address space width for `hbl`.
-  + The `hbl_config!override_address_space_(#)` and `hbl_config!override_any_app_address_space` can now be set to `39_bit`, `36_bit`, or `32_bit` to control the address space for hbl on a per-override basis.
-  + If a configuration has not been set, hbl will now default to 39-bit address space.
-    + Previously, a legacy 36-bit address space was always used to maintain compatibility with 1.0.0.
-    + A new loader extension was added to support 39-bit whenever possible (including mesosphere-on-1.0.0), with fallback to 36-bit when unavailable.
-+ Support was added to a number of components for running on Mariko hardware.
-  + The `boot` system module can now safely be run on mariko hardware, performing correct hardware initialization.
-  + Daybreak (and generally, system update logic) were updated to be usable on Mariko.
-  + Boot0 protection/management logic was updated to perform correct actions on Mariko.
-  + Reboot to payload does not and cannot work on Mariko. Correspondingly, A "fatal error" handler was written, to display and save fatal errors from within TrustZone.
-  + **Please Note:** Atmosphere is still not properly usable on Mariko hardware.
-    + In particular, wake-from-sleep will not properly function (the magic numbers aren't set correctly), among a few other minor issues.
-+ `exosphère` received support for building under debug configuration.
-  + A small (otherwise unused) portion of IRAM is now reserved for debug-only exosphere code (this region is unused/untouched under release config).
-  + This enables logging (including printf) to uart from the secure monitor, for those interested.
-+ A number of bugs were fixed, including:
-  + Minor issues in a number of filesystem related code were fixed.
-  + An issue was fixed that could cause NCM to abort on consoles which came with 3.0.x and were never updated.
-+ Several issues were fixed, and usability and stability were improved.
 ## 0.15.0
 + fusee-primary's panic display was updated to automatically identify and give suggestions to resolve many of the most common errors users encounter.
 + Having been tested as well as I can alone, `mesosphere` (atmosphère's reimplementation of the Nintendo Switch kernel) is now available for users interested in trying it.

docs/components/detail/exosphere_memory_layout.txt

@@ -1,103 +0,0 @@
-exosphere, storage requirements:
-
-Nonvolatile memory:
-0xE000
-
-Volatile memory: 0x2000
-
-Physical Address Space:
--0x7C010000-0x7C012000 - boot code/volatile memory
--0x7C012000-0x7C01E000 - program region
--0x7C01E000-0x7C01F000 - global data/context
--0x7C01F000-0x7C020000 - L2/L3 page table
-
--0x7C020000-0x7C040000 - Mariko-only program region
--0x7C040000-0x7C048000 - Mariko-only program stack
--0x7C048000-0x7C050000 - Reserved Mariko TZRAM (SE context carveouts, etc)
-
-Virtual Address Space:
-
-L1: 0x40 bytes.
-
-L1 Entries:
-    -0 (0x000000000-0x040000000): Empty
-    -1 (0x040000000-0x080000000): Identity Mapping/Empty
-    -2 (0x080000000-0x0C0000000): DRAM Mapping/Empty
-    -3 (0x0C0000000-0x100000000): DRAM Mapping/Empty
-    -4 (0x100000000-0x140000000): Empty
-    -5 (0x140000000-0x180000000): Empty
-    -6 (0x180000000-0x1C0000000): Empty
-    -7 (0x1C0000000-0x200000000): Virtual Region
-
-L2 Page and L3 page are both0x7C01F000
-
-L2 Entries:
-    -0x040000000 (Identity IRAM Table)
-        - Entry Used: 0x000
-    -0x07C000000 (Identity TZRAM Table)
-        - Entry Used: 0x1E0
-    -0x1F0000000 (Virtual Region Table)
-        - Entry Used: 0x180
-
-L3 Entries:
-    - Identity TZRAM mapping (0x7C010000-0x7C020000)
-        - Entry Used: 0x010-0x01F
-    - Identity IRAM mapping  (0x40020000-0x40040000)
-        - Entry Used: 0x020-0x03F
-    - Virtual Device region (0x1F0040000-0x1F0080000)
-        - Entry Used: 0x040-0x07F
-    - Read Only TZRAM Alias (0x1F00A0000-0x1F00B0000)
-        - Entry Used: 0x0A0-0x0AF
-    - Program region        (0x1F00C0000-0x1F00CC000)
-        - Entry Used: 0x0C0-0x0CB
-    - Mariko Program region (0x1F00D0000-0x1F00F0000)
-        - Entry Used: 0x0D0-0x0EF
-    - Mariko Program stack  (0x1F00F4000-0x1F00FC000)
-        - Entry Used: 0x0F4-0x0FB
-    - Secure DRAM Storage   (0x1F0100000-0x1F0110000)
-        - Entry Used: 0x100-0x10F
-    - Debug DRAM Storage    (0x1F0110000-0x1F0114000)
-        - Entry Used: 0x110-0x113
-    - SC7 IRAM Work Space   (0x1F0120000-0x1F0130000)
-        - Entry Used: 0x120-0x12F
-    - SC7 IRAM Firmware     (0x1F0140000-0x1F0141000)
-        - Entry Used: 0x140-0x140
-    - Debug Code            (0x1F0150000-0x1F0154000)
-        - Entry Used: 0x150-0x153
-    - Reserved For Debug    (0x1F0160000-0x1F0170000)
-        - Entry Used: 0x160-0x16F
-    - Boot Code             (0x1F01C0000-0x1F01C2000)
-        - Entry Used: 0x1C0-0x1C1
-    - AMS IRAM Page         (0x1F01F2000-0x1F01F2000)
-        - Entry Used: 0x1F2-0x1F2
-    - AMS User Page         (0x1F01F4000-0x1F01F4000)
-        - Entry Used: 0x1F4-0x1F4
-    - SMC User Page         (0x1F01F6000-0x1F01F6000)
-        - Entry Used: 0x1F6-0x1F6
-    - Volatile (Data)       (0x1F01F8000-0x1F01F9000)
-        - Entry Used: 0x1F8-0x1F8
-    - Volatile (Stacks)     (0x1F01FA000-0x1F01FB000)
-        - Entry Used: 0x1FA-0x1FA
-    - Global Data           (0x1F01FC000-0x1F01FD000)
-
-
-NV Global Data needs:
-    Exosphere + Emummc Config (<=0x200)
-    Boot Config[0x400]
-    RSA Context(0x100)
-    Old Device Keys[0x20][0x10];
-    Old Master Keys[0x20][0x10];
-    Imported Rsa Keys[4][0x200];
-    CPU Ctx[4][0x100];
-
-Total: 0x1700
-
-Global Data Page (accessible via X18):
-    0x000-0x200: Exosphere Config
-    0x200-0x400: Emummc Config
-    0x400-0x800: Sealed AES Keys
-    0x800-0xC00: Boot Config
-    0xC00-0xFFF: CPU contexts. Can be replaced, but this fits exactly so minimizes program space waste.
-
-Volatile Global Data needs:
-    Random Cache 0x400 bytes

docs/components/fusee.md

@@ -1,8 +1,22 @@
 # fusée
 fusée is a custom bootloader used to start the Atmosphère environment.
+It is divided into three sub-components: fusée-primary, fusée-mtc and fusée-secondary.
 
-## fusée
-fusée is the first piece of Atmosphère's code that runs on the hardware.
+fusée is also capable of chainloading other payloads (e.g.: Android).
+
+fusée's behavior can be configured via the [BCT.ini](../features/configurations.md) file located on the SD card.
+
+## fusée-primary
+fusée-primary is the first piece of Atmosphère's code that runs on the hardware.
 It is distributed as a standalone payload designed to be launched via RCM by abusing the CVE-2018-6242 vulnerability.
 
-This payload is responsible for all the low-level hardware initialization required by the Nintendo Switch, setting up the cryptosystem, mounting/emulating the eMMC, injecting/patching system modules, and launching the exosphère component.
+This payload is responsible for all the low-level hardware initialization required by the Nintendo Switch, plus the extra task of initializing the SD card and reading the next fusée sub-components from it.
+
+## fusée-mtc
+fusée-mtc is an optional, but heavily recommended sub-component that performs DRAM memory training.
+This ensures a proper environment for running the final fusée sub-component.
+
+## fusée-secondary
+fusée-secondary is the last fusée sub-component that runs on the system.
+It is responsible for configuring and bootstrapping the Atmosphère environment by mimicking the Horizon OS's design.
+This includes setting up the cryptosystem, mounting or emulating the eMMC, injecting or patching system modules and launching the exosphère component.

docs/components/modules/ams_mitm.md

@@ -33,8 +33,3 @@ in settings as `#.#.#|AMS #.#.#|?` with `? = S` when running under system eMMC o
 ### System Settings
 set_mitm intercepts the `GetSettingsItemValueSize` and `GetSettingsItemValue` commands for all requesters.
 It does so in order to enable user configuration of system settings, which are parsed from `/atmosphere/system_settings.ini` on boot. See [here](../../features/configurations.md) for more information on the system settings format.
-
-## dns_mitm
-dns_mitm enables intercepting requests to dns resolution services, to enable redirecting requests for specified hostnames.
-
-For documentation, see [here](../../features/dns_mitm.md).

docs/components/sept.md

@@ -0,0 +1,14 @@
+# sept
+Sept is a payload that facilitates booting Atmosphère when targeting firmware version 7.0.0+.
+
+It consists of a primary and a secondary payload.
+
+## sept-primary
+sept-primary is essentially a stand-in for Nintendo's package1ldr, on 7.0.0+. To use it, the caller (normally fusée-secondary) loads the sept-primary binary to `0x4003F000`, loads the 7.0.0+ TSEC firmware to `0x40010F00`, and loads a signed, encrypted payload to `0x40016FE0`.
+
+This signed, encrypted payload is normally sept-secondary.
+
+## sept-secondary
+sept-secondary is a payload that performs 7.0.0+ key derivation, and then chainloads to `sept/payload.bin`.
+
+It is normally stored encrypted/signed. Therefore, if one wishes to build sept-secondary instead of using release builds, one must bring their own keys.

docs/features/cheats.md

@@ -19,8 +19,6 @@ This behavior ensures that cheat codes are only loaded when the user would want
 
 In cases where `dmnt` has not activated the cheat manager, but the user wants to make it do so anyway, the cheat manager's service API provides a `ForceOpenCheatProcess` command that homebrew can use. This command will cause the cheat manager to try to force itself to attach to the process.
 
-In cases where `dmnt` has activated the cheat manager, but the user wants to use an alternate debugger, the cheat manager's service API provides a `ForceCloseCheatProcess` command that homebrew can use. This command will cause the cheat manager to detach itself from the process.
-
 By default, all cheat codes listed in the loaded .txt file will be toggled on. This is configurable by the user by editing the `atmosphere!dmnt_cheats_enabled_by_default` [system setting](configurations.md).
 
 Users may use homebrew programs to toggle cheats on and off at runtime via the cheat manager's service API.
@@ -42,30 +40,30 @@ The following provides documentation of the instruction format for the virtual m
 
 Typically, instruction type is encoded in the upper nybble of the first instruction u32.
 
-### Code Type 0x0: Store Static Value to Memory
-Code type 0x0 allows writing a static value to a memory address.
+### Code Type 0: Store Static Value to Memory
+Code type 0 allows writing a static value to a memory address.
 
 #### Encoding
 `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).
++ M: Memory region to write to (0 = Main NSO, 1 = Heap).
 + R: Register to use as an offset from memory region base.
 + A: Immediate offset to use from memory region base.
 + V: Value to write.
 
 ---
 
-### Code Type 0x1: Begin Conditional Block
-Code type 0x1 performs a comparison of the contents of memory to a static value.
+### Code Type 1: Begin Conditional Block
+Code type 1 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.
+If the condition is not met, all instructions until the appropriate conditional block terminator are skipped.
 
 #### Encoding
 `1TMC00AA 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).
++ M: Memory region to write to (0 = Main NSO, 1 = Heap).
 + C: Condition to use, see below.
 + A: Immediate offset to use from memory region base.
 + V: Value to compare to.
@@ -80,20 +78,16 @@ If the condition is not met, all instructions until the appropriate End or Else
 
 ---
 
-### Code Type 0x2: End Conditional Block
-Code type 0x2 marks the end of a conditional block (started by Code Type 0x1 or Code Type 0x8).
-
-When an Else is executed, all instructions until the appropriate End conditional block terminator are skipped.
+### Code Type 2: End Conditional Block
+Code type 2 marks the end of a conditional block (started by Code Type 1 or Code Type 8).
 
 #### Encoding
-`2X000000`
-
-+ X: End type (0 = End, 1 = Else).
+`20000000`
 
 ---
 
-### Code Type 0x3: Start/End Loop
-Code type 0x3 allows for iterating in a loop a fixed number of times.
+### Code Type 3: Start/End Loop
+Code type 3 allows for iterating in a loop a fixed number of times.
 
 #### Start Loop Encoding
 `300R0000 VVVVVVVV`
@@ -108,8 +102,8 @@ Code type 0x3 allows for iterating in a loop a fixed number of times.
 
 ---
 
-### Code Type 0x4: Load Register with Static Value
-Code type 0x4 allows setting a register to a constant value.
+### Code Type 4: Load Register with Static Value
+Code type 4 allows setting a register to a constant value.
 
 #### Encoding
 `400R0000 VVVVVVVV VVVVVVVV`
@@ -119,28 +113,29 @@ Code type 0x4 allows setting a register to a constant value.
 
 ---
 
-### Code Type 0x5: Load Register with Memory Value
-Code type 0x5 allows loading a value from memory into a register, either using a fixed address or by dereferencing the destination register.
+### Code Type 5: Load Register with Memory Value
+Code type 5 allows loading a value from memory into a register, either using a fixed address or by dereferencing the destination register.
 
 #### Load From Fixed Address Encoding
 `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).
++ M: Memory region to write to (0 = Main NSO, 1 = Heap).
 + R: Register to load value into.
 + A: Immediate offset to use from memory region base.
 
 #### Load from Register Address Encoding
-`5T0R10AA AAAAAAAA`
+`5TMR10AA AAAAAAAA`
 
 + T: Width of memory read (1, 2, 4, or 8 bytes).
-+ R: Register to load value into. (This register is also used as the base memory address).
++ M: Memory region to write to (0 = Main NSO, 1 = Heap).
++ R: Register to load value into.
 + A: Immediate offset to use from register R.
 
 ---
 
-### Code Type 0x6: Store Static Value to Register Memory Address
-Code type 0x6 allows writing a fixed value to a memory address specified by a register.
+### Code Type 6: Store Static Value to Register Memory Address
+Code type 6 allows writing a fixed value to a memory address specified by a register.
 
 #### Encoding
 `6T0RIor0 VVVVVVVV VVVVVVVV`
@@ -154,10 +149,10 @@ Code type 0x6 allows writing a fixed value to a memory address specified by a re
 
 ---
 
-### Code Type 0x7: Legacy Arithmetic
-Code type 0x7 allows performing arithmetic on registers.
+### Code Type 7: Legacy Arithmetic
+Code type 7 allows performing arithmetic on registers.
 
-However, it has been deprecated by Code type 0x9, and is only kept for backwards compatibility.
+However, it has been deprecated by Code type 9, and is only kept for backwards compatibility.
 
 #### Encoding
 `7T0RC000 VVVVVVVV`
@@ -176,8 +171,8 @@ However, it has been deprecated by Code type 0x9, and is only kept for backwards
 
 ---
 
-### Code Type 0x8: Begin Keypress Conditional Block
-Code type 0x8 enters or skips a conditional block based on whether a key combination is pressed.
+### Code Type 8: Begin Keypress Conditional Block
+Code type 8 enters or skips a conditional block based on whether a key combination is pressed.
 
 #### Encoding
 `8kkkkkkk`
@@ -218,8 +213,8 @@ Note: This is the direct output of `hidKeysDown()`.
 
 ---
 
-### Code Type 0x9: Perform Arithmetic
-Code type 0x9 allows performing arithmetic on registers.
+### Code Type 9: Perform Arithmetic
+Code type 9 allows performing arithmetic on registers.
 
 #### Register Arithmetic Encoding
 `9TCRS0s0`
@@ -253,8 +248,8 @@ Code type 0x9 allows performing arithmetic on registers.
 
 ---
 
-### Code Type 0xA: Store Register to Memory Address
-Code type 0xA allows writing a register to memory.
+### Code Type 10: Store Register to Memory Address
+Code type 10 allows writing a register to memory.
 
 #### Encoding
 `ATSRIOxa (aaaaaaaa)`
@@ -277,13 +272,13 @@ Code type 0xA allows writing a register to memory.
 
 ---
 
-### Code Type 0xB: Reserved
-Code Type 0xB is currently reserved for future use.
+### Code Type 11: Reserved
+Code Type 11 is currently reserved for future use.
 
 ---
 
-### Code Type 0xC-0xF: Extended-Width Instruction
-Code Types 0xC-0xF signal to the VM to treat the upper two nybbles of the first dword as instruction type, instead of just the upper nybble.
+### Code Type 12-15: Extended-Width Instruction
+Code Types 12-15 signal to the VM to treat the upper two nybbles of the first dword as instruction type, instead of just the upper nybble.
 
 This reserves an additional 64 opcodes for future use.
 

docs/features/configurations.md

@@ -1,10 +1,21 @@
 # Configurations
 Atmosphère provides a variety of customizable configurations to better adjust to users' needs.
 
-## stratosphere.ini
-This is the configuration file used by fusée for configuring user-space system modules.
+## BCT.ini
+This is the configuration file used by fusée.
 This file is located under the `/atmosphere/config/` folder on your SD card and a default template can be found inside the `/atmosphere/config_templates/` folder.
 
+### Adding a Custom Boot Splashscreen
+Atmosphère provides its own default splashscreen which is displayed at boot time. However, this can be replaced at will.
+
+The boot splashscreen must be a BMP file, it must be 720x1280 (1280x720 rotated 90 degrees left/counterclockwise/anti-clockwise) resolution, and be in 32-bit ARGB format. You can use image editing software such as GIMP or Photoshop to export the image in this format.
+
+Add the following lines to BCT.ini and change the value of `custom_splash` to the actual path and filename of your boot splashscreen:
+```
+[stage2]
+custom_splash = /path/to/your/bootlogo.bmp
+```
+
 ### Configuring "nogc" Protection
 "nogc" is a feature provided by fusée-secondary which disables the Nintendo Switch's Game Card reader. Its purpose is to prevent the reader from being updated when the console has been updated, without burning fuses, from a lower firmware version. More specifically, from firmware versions 4.0.0 or 9.0.0 which introduced updates to the Game Card reader's firmware. By default, Atmosphère will protect the Game Card reader automatically, but you are free to change it.
 
@@ -18,15 +29,32 @@ nogc = X
 0 = force-disable nogc, so Atmosphère will always enable the Game Card reader.
 ```
 
-## Adding a Custom Boot Splashscreen
-Atmosphère provides its own default splashscreen which is displayed at boot time. However, this can be replaced at will.
+### NCM opt-out
+Atmosphère provides a reimplementation of the [ncm](../components/modules/ncm.md) system module. If you wish to disable this reimplementation add the following line to the `stratosphere` section:
+```
+[stratosphere]
+disable_ncm = 1
+```
 
-Boot splash screens must be 1280x720 resolution.
+### Logging
+This is an advanced feature aimed at developers trying to debug boot time issues. It enables logging of the fusée stages to be displayed on screen.
 
-A script can be found inside the source tree (`/utilities/insert_splash_screen.py`) for inserting a custom splash screen into a release binary.
+Add the following lines to BCT.ini and change the value of `X` according to the following list:
+```
+[config]
+log_level = X
+```
+```
+0 = NONE
+1 = ERROR
+2 = WARNING
+3 = MANDATORY
+4 = INFO
+5 = DEBUG
+```
 
-To do so, execute the following command on the script:
-`python insert_splash_screen.py <path to your splash screen image> <path to /atmosphere/package3 on your SD card>`
+A special level is also provided to prevent prefix creation. To use it, do a bitwise OR with this mask:
+`0x100 = NO_PREFIX`
 
 ## emummc.ini
 This is the configuration file used for the [emummc](../components/emummc.md) component.

docs/features/dns_mitm.md

@@ -1,53 +0,0 @@
-# DNS.mitm
-As of 0.18.0, atmosphère provides a mechanism for redirecting DNS resolution requests.
-
-By default, atmosphère redirects resolution requests for official telemetry servers, redirecting them to a loopback address.
-
-## Hosts files
-
-DNS.mitm can be configured through the usage of a slightly-extended `hosts` file format, which is parsed only once on system startup.
-
-In particular, hosts files parsed by DNS.mitm have the following extensions to the usual format:
-+ `*` is treated as a wildcard character, matching any collection of 0 or more characters wherever it occurs in a hostname.
-+ `%` is treated as a stand-in for the value of `nsd!environment_identifier`. This is always `lp1`, on production devices.
-
-If multiple entries in a host file match a domain, the last-defined match is used.
-
-Please note that homebrew may trigger a hosts file re-parse by sending the extension IPC command 65000 ("AtmosphereReloadHostsFile") to a connected `sfdnsres` session.
-
-### Hosts file selection
-
-Atmosphère will try to read hosts from the following file paths, in order, stopping once it successfully performs a file read:
-
-+ (emummc only) `/atmosphere/hosts/emummc_%04lx.txt`, formatted with the emummc's id number (see `emummc.ini`).
-+ (emummc only) `/atmosphere/hosts/emummc.txt`.
-+ (sysmmc only) `/atmosphere/hosts/sysmmc.txt`.
-+ `/atmosphere/hosts/default.txt`
-
-If `/atmosphere/hosts/default.txt` does not exist, atmosphère will create it to contain the defaults.
-
-### Atmosphère defaults
-
-By default, atmosphère's default redirections are parsed **in addition to** the contents of the loaded hosts file.
-
-This is equivalent to thinking of the loaded hosts file as having the atmosphère defaults prepended to it.
-
-This setting is considered desirable, because it minimizes the telemetry risks if a user forgets to update a custom hosts file on a system update which changes the telemetry servers.
-
-This behavior can be opted-out from by setting `atmosphere!add_defaults_to_dns_hosts = u8!0x0` in `system_settings.ini`.
-
-The current default redirections are:
-
-```
-# Nintendo telemetry servers
-127.0.0.1 receive-%.dg.srv.nintendo.net receive-%.er.srv.nintendo.net
-```
-
-## Debugging
-
-On startup (or on hosts file re-parse), DNS.mitm will log both what hosts file it selected and the contents of all redirections it parses to `/atmosphere/logs/dns_mitm_startup.log`.
-
-In addition, if the user sets `atmosphere!enable_dns_mitm_debug_log = u8!0x1` in `system_settings.ini`, DNS.mitm will log all requests to GetHostByName/GetAddrInfo to `/atmosphere/logs/dns_mitm_debug.log`. All redirections will be noted when they occur.
-
-## Opting-out of DNS.mitm entirely
-If you wish to disable DNS.mitm entirely, `system_settings.ini` can be edited to set `atmosphere!enable_dns_mitm = u8!0x0`.

docs/main.md

@@ -12,6 +12,7 @@ Atmosphère provides six core components, mimicking to some degree the various l
 
 Additionally, Atmosphère also provides the following secondary components:
 + [emummc](components/emummc.md)
++ [sept](components/sept.md)
 + [libraries](components/libraries.md)
 
 ## Features

docs/roadmap.md

@@ -1,32 +1,42 @@
 # Planned Features
 atmosphère has a number of features that are either works-in-progress or planned. Please note that while time-estimates are given, they are loose, and things may be completed sooner or later than advertised.
 
-The following descriptions were last updated on January 14th, 2021
+The following descriptions were last updated on July 7th, 2020.
+
+## ams-on-mariko
+* **Description**: Atmosphere cannot run as-is on Mariko hardware. A large number of changes are needed in many components. Although secure monitor support is complete in exosphere, additional work is needed on the bootloader and stratosphere sides as well. Mariko support will also require further design thought; atmosphere's debugging design heavily relies on reboot-to-payload and (more generally) the ability to perform warmboot bootrom hax at will. This is not possible on Mariko, and will require a new design/software support for whatever solution is chosen.
+* **Development Status**: Planned.
+* **Estimated Time**: Summer 2020
+
+## settings reimplementation
+* **Description**: A planned reimplementation of the settings system module, and with it a removal of the settings mitm. This will greatly simplify atmosphère's boot process, and will allow much more flexible control over the various system settings.
+* **Development Status**: Undergoing research/initial development by Adubbz.
+* **Estimated Time**: Mid 2020
+
+## mesosphere
+* **Description**: mesosphère is a reimplementation of the Horizon operating system's Kernel. It aims to provide an open-source reference for Nintendo's code.
+* **Development Status**: Under active development by SciresM.
+* **Estimated Time**: Mid-to-Late 2020
 
 ## tma reimplementation
 * **Description** tma ("target manager agent") is a system module that manages communication between the Switch and a client PC. Atmosphere's implementation will allow homebrew on the switch to communicate with a connected PC to do various operations such as exchanging data or interacting with files. It will also serve as the communicator for Atmosphère's planned debugger. This will also include PC-side software for interacting with the Switch.
 * **Development Status**: Planned. Switch-side code is fully implemented but needs heavy refactoring/rebasing, as the code was originally authored in 2018.
-* **Estimated Time**: 2021-2022.
+* **Estimated Time**: Late 2020-2021.
 
 ## dmnt.gen2 reimplementation
 * **Description**: A reimplementation of the Switch's debug monitor, dmnt will provide an interface for debugging applications or system modules running on the Switch. This will include a gdbstub for debugging actively-running system components or applications.
 * **Development Status**: Planned
-* **Estimated Time**: 2021-2022
+* **Estimated Time**: 2021
 
 ## fs reimplementation
 * **Description**: Following mesosphère's completion, atmosphère will have reimplemented all components of the BootImagePackage firmware except for the filesystem services system module. Reimplementing fs will allow for fixing Nintendo bugs (such as corruption when using exFAT filesystems and encoding inconsistencies with UTF-8 and Shift-JIS).
 * **Development Status**: Planned.
 * **Estimated Time**: 2021-2022.
 
-## settings reimplementation
-* **Description**: A planned reimplementation of the settings system module, and with it a removal of the settings mitm. This will greatly simplify atmosphère's boot process, and will allow much more flexible control over the various system settings.
-* **Development Status**: Pending development by Adubbz.
-* **Estimated Time**: Unclear, pending developer availability.
-
 ## thermosphère
 * **Description**: A general-purpose hypervisor, thermosphère will enable the virtualization of the Switch's operating system; this is planned to enable debugging of the Switch's kernel.
-* **Development Status**: Pending development by TuxSH.
-* **Estimated Time**: Unclear, pending developer availability.
+* **Development Status**: Under semi-active development by TuxSH.
+* **Estimated Time**: 2020-2021.
 
 ## other planned features
 * **Description**: General system stability improvements to enhance the user's experience.
@@ -49,12 +59,4 @@ Please note that this is not an exhaustive list of features present in atmosphè
 
 ## exosphere re-write
 * **Description**: exosphère, atmosphère's reimplementation of Horizon's Secure Monitor, was the first component authored for the project in early 2018. It is written in C, and in a style very different from the rest of atmosphère's code. In addition, exosphère was written to conform to constraints that no longer apply in an environment where it is not launched from the web browser, and where using a custom firmware image to orchestrate wake-from-sleep is possible. exosphère currently uses all but 1 KB of the space available to it, putting it at risk of breaking as future firmware updates are supported. A re-write will solve these issues.
-* **Completion Time**: June 2020
-
-## mesosphere
-* **Description**: mesosphère is a reimplementation of the Horizon operating system's Kernel. It aims to provide an open-source reference for Nintendo's code.
-* **Estimated Time**: September 2020
-
-## ams-on-mariko
-* **Description**: Atmosphere cannot run as-is on Mariko hardware. A large number of changes are needed in many components. Although secure monitor support is complete in exosphere, additional work is needed on the bootloader and stratosphere sides as well. Mariko support will also require further design thought; atmosphere's debugging design heavily relies on reboot-to-payload and (more generally) the ability to perform warmboot bootrom hax at will. This is not possible on Mariko, and will require a new design/software support for whatever solution is chosen.
-* **Completion Time**: January 2021
+* **Completion Time**: June 2020

emummc/.gitrepo

@@ -5,8 +5,8 @@
 ;
 [subrepo]
 	remote = https://github.com/m4xw/emuMMC
-	branch = develop
-	commit = f66087313546161a000ee196a788f0626caf80fa
-	parent = 38f9a76ba028995ed3274da3a45b0254f09d1f59
+	branch = exo2
+	commit = 6a814ebbe72cf5245b863b9edea9cd3801437a12
+	parent = f551ca4461a79908c37307db10cd8cacf8b98f17
 	method = rebase
 	cmdver = 0.4.1

emummc/Makefile

@@ -32,7 +32,7 @@ CFLAGS	+=	$(INCLUDE) -D__SWITCH__
 CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++17
 
 ASFLAGS	:=	-g $(ARCH)
-LDFLAGS	=	-specs=$(EMUMMCDIR)/emummc.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
+LDFLAGS	=	-specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
 
 ifneq ($(BUILD),$(notdir $(CURDIR)))
 
@@ -98,10 +98,7 @@ else
 
 DEPENDS	:=	$(OFILES:.o=.d)
 
-all	:	$(OUTPUT)_unpacked.kip
-
-$(OUTPUT)_unpacked.kip	:	$(OUTPUT).kip
-	@hactool -t kip --uncompressed=$(OUTPUT)_unpacked.kip $(OUTPUT).kip
+all	:	$(OUTPUT).kip
 
 $(OUTPUT).kip	:	$(OUTPUT).elf
 

emummc/README.md

@@ -1,21 +1,21 @@
 # emuMMC
-*A SDMMC driver replacement for Nintendo's Filesystem Services, by **m4xw***
+*A SDMMC driver replacement for Nintendo's Filesystem Services, by **m4xw***  
 
 ### Supported Horizon Versions
-**1.0.0 - 13.0.0**
+**1.0.0 - 10.0.0**
 
 ## Features
-* Arbitrary SDMMC backend selection
+* Arbitrary SDMMC backend selection  
   **This allows loading eMMC from SD or even SD from eMMC**
-* On the fly hooking / patching, fully self-infesting
+* On the fly hooking / patching, fully self-infesting  
   **Only one payload required for all versions!**
-* File-based SDMMC backend support (from SD)
+* File-based SDMMC backend support (from SD)  
   **This allows loading eMMC images from hekate-backups (split or not)**
-* SDMMC device based sector offset (*currently eMMC only*)
+* SDMMC device based sector offset (*currently eMMC only*)  
   **Raw partition support for eMMC from SD with less performance overhead**
-* Full support for `/Nintendo` folder redirection to a arbitrary path
+* Full support for `/Nintendo` folder redirection to a arbitrary path  
   **No 8 char length restriction!**
-* exosphere based context configuration
+* exosphere based context configuration  
   **This includes full support for multiple emuMMC images**
 
 ## Compiling

emummc/emummc.ld

@@ -1,201 +0,0 @@
-OUTPUT_ARCH(aarch64)
-ENTRY(_start)
-
-PHDRS
-{
-	code   PT_LOAD FLAGS(5) /* Read | Execute */;
-	rodata PT_LOAD FLAGS(4) /* Read */;
-	data   PT_LOAD FLAGS(6) /* Read | Write */;
-	dyn    PT_DYNAMIC;
-}
-
-SECTIONS
-{
-	/* =========== CODE section =========== */
-	PROVIDE(__start__ = 0x0);
-	. = __start__;
-	__code_start = . ;
-
-	.crt0 :
-	{
-		KEEP (*(.crt0))
-		. = ALIGN(8);
-	} :code
-
-	.init :
-	{
-		KEEP( *(.init) )
-		. = ALIGN(8);
-	} :code
-
-	.plt :
-	{
-		*(.plt)
-		*(.iplt)
-		. = ALIGN(8);
-	} :code
-
-	.text :
-	{
-		*(.text.unlikely .text.*_unlikely .text.unlikely.*)
-		*(.text.exit .text.exit.*)
-		*(.text.startup .text.startup.*)
-		*(.text.hot .text.hot.*)
-		*(.text .stub .text.* .gnu.linkonce.t.*)
-		. = ALIGN(8);
-	} :code
-
-	.fini :
-	{
-		KEEP( *(.fini) )
-		. = ALIGN(8);
-	} :code
-
-	/* =========== RODATA section =========== */
-	. = ALIGN(0x1000);
-	__rodata_start = . ;
-
-	.nx-module-name : { KEEP (*(.nx-module-name)) } :rodata
-
-	.rodata :
-	{
-		*(.rodata .rodata.* .gnu.linkonce.r.*)
-		. = ALIGN(8);
-	} :rodata
-
-	.eh_frame_hdr     : { __eh_frame_hdr_start = .; *(.eh_frame_hdr) *(.eh_frame_entry .eh_frame_entry.*) __eh_frame_hdr_end = .; } :rodata
-	.eh_frame         : ONLY_IF_RO { KEEP (*(.eh_frame)) *(.eh_frame.*) } :rodata
-	.gcc_except_table : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) } :rodata
-	.gnu_extab        : ONLY_IF_RO { *(.gnu_extab*) } : rodata
-
-	.dynamic           : { *(.dynamic) } :rodata :dyn
-	.dynsym            : { *(.dynsym) } :rodata
-	.dynstr            : { *(.dynstr) } :rodata
-	.rela.dyn          : { *(.rela.*) } :rodata
-	.interp            : { *(.interp) } :rodata
-	.hash              : { *(.hash) } :rodata
-	.gnu.hash          : { *(.gnu.hash) } :rodata
-	.gnu.version       : { *(.gnu.version) } :rodata
-	.gnu.version_d     : { *(.gnu.version_d) } :rodata
-	.gnu.version_r     : { *(.gnu.version_r) } :rodata
-	.note.gnu.build-id : { *(.note.gnu.build-id) } :rodata
-
-	/* =========== DATA section =========== */
-	. = ALIGN(0x1000);
-	__data_start = . ;
-
-	.eh_frame : ONLY_IF_RW { KEEP (*(.eh_frame)) *(.eh_frame.*) } :data
-	.gcc_except_table : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) } :data
-	.gnu_extab : ONLY_IF_RW { *(.gnu_extab*) } : data
-	.exception_ranges : ONLY_IF_RW { *(.exception_ranges .exception_ranges*) } :data
-
-	.tdata ALIGN(8) :
-	{
-		__tdata_lma = .;
-		*(.tdata .tdata.* .gnu.linkonce.td.*)
-		. = ALIGN(8);
-		__tdata_lma_end = .;
-	} :data
-
-	.tbss ALIGN(8) :
-	{
-		*(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon)
-		. = ALIGN(8);
-	} :data
-
-	.preinit_array ALIGN(8) :
-	{
-		PROVIDE (__preinit_array_start = .);
-		KEEP (*(.preinit_array))
-		PROVIDE (__preinit_array_end = .);
-	} :data
-
-	.init_array ALIGN(8) :
-	{
-		PROVIDE (__init_array_start = .);
-		KEEP( *(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)) )
-		KEEP( *(.init_array .ctors) )
-		PROVIDE (__init_array_end = .);
-	} :data
-
-	.fini_array ALIGN(8) :
-	{
-		PROVIDE (__fini_array_start = .);
-		KEEP( *(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)) )
-		KEEP( *(.fini_array .dtors) )
-		PROVIDE (__fini_array_end = .);
-	} :data
-
-	__got_start__ = .;
-
-	.got            : { *(.got) *(.igot) } :data
-	.got.plt        : { *(.got.plt)  *(.igot.plt) } :data
-
-	__got_end__ = .;
-
-	.data ALIGN(8) :
-	{
-		*(.data .data.* .gnu.linkonce.d.*)
-		SORT(CONSTRUCTORS)
-	} :data
-
-	__bss_start__ = .;
-	.bss ALIGN(8) :
-	{
-		*(.dynbss)
-		*(.bss .bss.* .gnu.linkonce.b.*)
-		*(COMMON)
-		. = ALIGN(8);
-
-		/* Reserve space for the TLS segment of the main thread */
-		__tls_start = .;
-		. += + SIZEOF(.tdata) + SIZEOF(.tbss);
-		__tls_end = .;
-	} : data
-	__bss_end__ = .;
-
-	__end__ = ABSOLUTE(.) ;
-
-	. = ALIGN(0x1000);
-	__argdata__ = ABSOLUTE(.) ;
-
-	/* ==================
-	   ==== Metadata ====
-	   ================== */
-
-	/* Discard sections that difficult post-processing */
-	/DISCARD/ : { *(.group .comment .note) }
-
-	/* Stabs debugging sections. */
-	.stab          0 : { *(.stab) }
-	.stabstr       0 : { *(.stabstr) }
-	.stab.excl     0 : { *(.stab.excl) }
-	.stab.exclstr  0 : { *(.stab.exclstr) }
-	.stab.index    0 : { *(.stab.index) }
-	.stab.indexstr 0 : { *(.stab.indexstr) }
-
-	/* DWARF debug sections.
-	   Symbols in the DWARF debugging sections are relative to the beginning
-	   of the section so we begin them at 0. */
-
-	/* DWARF 1 */
-	.debug          0 : { *(.debug) }
-	.line           0 : { *(.line) }
-
-	/* GNU DWARF 1 extensions */
-	.debug_srcinfo  0 : { *(.debug_srcinfo) }
-	.debug_sfnames  0 : { *(.debug_sfnames) }
-
-	/* DWARF 1.1 and DWARF 2 */
-	.debug_aranges  0 : { *(.debug_aranges) }
-	.debug_pubnames 0 : { *(.debug_pubnames) }
-
-	/* DWARF 2 */
-	.debug_info     0 : { *(.debug_info) }
-	.debug_abbrev   0 : { *(.debug_abbrev) }
-	.debug_line     0 : { *(.debug_line) }
-	.debug_frame    0 : { *(.debug_frame) }
-	.debug_str      0 : { *(.debug_str) }
-	.debug_loc      0 : { *(.debug_loc) }
-	.debug_macinfo  0 : { *(.debug_macinfo) }
-}

emummc/emummc.specs

@@ -1,8 +0,0 @@
-%rename link                old_link
-
-*link:
-%(old_link) -T %:getenv(TOPDIR /emummc.ld) -pie --no-dynamic-linker --spare-dynamic-tags=0 --gc-sections -z text -z nodynamic-undefined-weak --build-id=sha1 --nx-module-name
-
-*startfile:
-crti%O%s crtbegin%O%s
-

emummc/source/FS/FS.h

@@ -37,15 +37,4 @@
 #define BOOT_PARTITION_SIZE 0x2000
 #define FS_READ_WRITE_ERROR 1048
 
-#define NAND_PATROL_SECTOR 0xC20
-#define NAND_PATROL_OFFSET 0x184000
-
-typedef struct _fs_nand_patrol_t
-{
-	uint8_t hmac[0x20];
-	unsigned int offset;
-	unsigned int count;
-	uint8_t rsvd[0x1D8];
-} fs_nand_patrol_t;
-
 #endif /* __FS_H__ */

emummc/source/FS/FS_offsets.c

@@ -49,14 +49,6 @@
 #include "offsets/1000_exfat.h"
 #include "offsets/1020.h"
 #include "offsets/1020_exfat.h"
-#include "offsets/1100.h"
-#include "offsets/1100_exfat.h"
-#include "offsets/1200.h"
-#include "offsets/1200_exfat.h"
-#include "offsets/1203.h"
-#include "offsets/1203_exfat.h"
-#include "offsets/1300.h"
-#include "offsets/1300_exfat.h"
 #include "../utils/fatal.h"
 
 #define GET_OFFSET_STRUCT_NAME(vers) g_offsets##vers
@@ -77,7 +69,6 @@ static const fs_offsets_t GET_OFFSET_STRUCT_NAME(vers) = { \
     .nand_mutex                      = FS_OFFSET##vers##_NAND_MUTEX, \
     .active_partition                = FS_OFFSET##vers##_ACTIVE_PARTITION, \
     .sdmmc_das_handle                = FS_OFFSET##vers##_SDMMC_DAS_HANDLE, \
-    .sdmmc_accessor_controller_open  = FS_OFFSET##vers##_SDMMC_WRAPPER_CONTROLLER_OPEN, \
     .sdmmc_accessor_controller_close = FS_OFFSET##vers##_SDMMC_WRAPPER_CONTROLLER_CLOSE, \
     .sd_das_init                     = FS_OFFSET##vers##_SD_DAS_INIT, \
     .nintendo_paths                  = FS_OFFSET##vers##_NINTENDO_PATHS, \
@@ -117,14 +108,6 @@ DEFINE_OFFSET_STRUCT(_1000);
 DEFINE_OFFSET_STRUCT(_1000_EXFAT);
 DEFINE_OFFSET_STRUCT(_1020);
 DEFINE_OFFSET_STRUCT(_1020_EXFAT);
-DEFINE_OFFSET_STRUCT(_1100);
-DEFINE_OFFSET_STRUCT(_1100_EXFAT);
-DEFINE_OFFSET_STRUCT(_1200);
-DEFINE_OFFSET_STRUCT(_1200_EXFAT);
-DEFINE_OFFSET_STRUCT(_1203);
-DEFINE_OFFSET_STRUCT(_1203_EXFAT);
-DEFINE_OFFSET_STRUCT(_1300);
-DEFINE_OFFSET_STRUCT(_1300_EXFAT);
 
 const fs_offsets_t *get_fs_offsets(enum FS_VER version) {
     switch (version) {
@@ -194,22 +177,6 @@ const fs_offsets_t *get_fs_offsets(enum FS_VER version) {
             return &(GET_OFFSET_STRUCT_NAME(_1020));
         case FS_VER_10_2_0_EXFAT:
             return &(GET_OFFSET_STRUCT_NAME(_1020_EXFAT));
-        case FS_VER_11_0_0:
-            return &(GET_OFFSET_STRUCT_NAME(_1100));
-        case FS_VER_11_0_0_EXFAT:
-            return &(GET_OFFSET_STRUCT_NAME(_1100_EXFAT));
-        case FS_VER_12_0_0:
-            return &(GET_OFFSET_STRUCT_NAME(_1200));
-        case FS_VER_12_0_0_EXFAT:
-            return &(GET_OFFSET_STRUCT_NAME(_1200_EXFAT));
-        case FS_VER_12_0_3:
-            return &(GET_OFFSET_STRUCT_NAME(_1203));
-        case FS_VER_12_0_3_EXFAT:
-            return &(GET_OFFSET_STRUCT_NAME(_1203_EXFAT));
-        case FS_VER_13_0_0:
-            return &(GET_OFFSET_STRUCT_NAME(_1300));
-        case FS_VER_13_0_0_EXFAT:
-            return &(GET_OFFSET_STRUCT_NAME(_1300_EXFAT));
         default:
             fatal_abort(Fatal_UnknownVersion);
     }

emummc/source/FS/FS_offsets.h

@@ -41,7 +41,6 @@ typedef struct {
     // Misc funcs
     uintptr_t lock_mutex;
     uintptr_t unlock_mutex;
-    uintptr_t sdmmc_accessor_controller_open;
     uintptr_t sdmmc_accessor_controller_close;
     // Misc data
     uintptr_t sd_mutex;

emummc/source/FS/FS_structs.h

@@ -35,7 +35,7 @@ typedef struct sdmmc_accessor_vt
     void *dtor;
     void *map_device_addr_space;
     void *unmap_device_addr_space;
-    uint64_t (*sdmmc_accessor_controller_open)(void *);
+    void *controller_open;
     uint64_t (*sdmmc_accessor_controller_close)(void *);
     uint64_t (*read_write)(void *, uint64_t, uint64_t, void *, uint64_t, uint64_t);
     // More not included because we don't use it.

emummc/source/FS/FS_versions.h

@@ -71,18 +71,6 @@ enum FS_VER
     FS_VER_10_2_0,
     FS_VER_10_2_0_EXFAT,
 
-    FS_VER_11_0_0,
-    FS_VER_11_0_0_EXFAT,
-
-    FS_VER_12_0_0,
-    FS_VER_12_0_0_EXFAT,
-
-    FS_VER_12_0_3,
-    FS_VER_12_0_3_EXFAT,
-
-    FS_VER_13_0_0,
-    FS_VER_13_0_0_EXFAT,
-
     FS_VER_MAX,
 };
 

emummc/source/FS/offsets/100.h

@@ -34,7 +34,6 @@
 #define FS_OFFSET_100_LOCK_MUTEX          0x2884
 #define FS_OFFSET_100_UNLOCK_MUTEX        0x28F0
 
-#define FS_OFFSET_100_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_100_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x6A8AC
 
 // Misc Data

emummc/source/FS/offsets/1000.h

@@ -34,7 +34,6 @@
 #define FS_OFFSET_1000_LOCK_MUTEX          0x28910
 #define FS_OFFSET_1000_UNLOCK_MUTEX        0x28960
 
-#define FS_OFFSET_1000_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_1000_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1422E0
 
 // Misc Data

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

@@ -34,7 +34,6 @@
 #define FS_OFFSET_1000_EXFAT_LOCK_MUTEX          0x28910
 #define FS_OFFSET_1000_EXFAT_UNLOCK_MUTEX        0x28960
 
-#define FS_OFFSET_1000_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_1000_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1422E0
 
 // Misc Data

emummc/source/FS/offsets/1020.h

@@ -34,7 +34,6 @@
 #define FS_OFFSET_1020_LOCK_MUTEX          0x28910
 #define FS_OFFSET_1020_UNLOCK_MUTEX        0x28960
 
-#define FS_OFFSET_1020_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_1020_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x142740
 
 // Misc Data

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

@@ -34,7 +34,6 @@
 #define FS_OFFSET_1020_EXFAT_LOCK_MUTEX          0x28910
 #define FS_OFFSET_1020_EXFAT_UNLOCK_MUTEX        0x28960
 
-#define FS_OFFSET_1020_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_1020_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x142740
 
 // Misc Data

emummc/source/FS/offsets/1100.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_1100_H__
-#define __FS_1100_H__
-
-// Accessor vtable getters
-#define FS_OFFSET_1100_SDMMC_ACCESSOR_GC   0x156D90
-#define FS_OFFSET_1100_SDMMC_ACCESSOR_SD   0x154F40
-#define FS_OFFSET_1100_SDMMC_ACCESSOR_NAND 0x1500F0
-
-// Hooks
-#define FS_OFFSET_1100_SDMMC_WRAPPER_READ  0x14B990
-#define FS_OFFSET_1100_SDMMC_WRAPPER_WRITE 0x14BA70
-#define FS_OFFSET_1100_RTLD                0x688
-#define FS_OFFSET_1100_RTLD_DESTINATION    ((uintptr_t)(INT64_C(-0x3C)))
-
-#define FS_OFFSET_1100_CLKRST_SET_MIN_V_CLK_RATE 0x14AC40
-
-// Misc funcs
-#define FS_OFFSET_1100_LOCK_MUTEX          0x28FF0
-#define FS_OFFSET_1100_UNLOCK_MUTEX        0x29040
-
-#define FS_OFFSET_1100_SDMMC_WRAPPER_CONTROLLER_OPEN  0x14B840
-#define FS_OFFSET_1100_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x14B8F0
-
-// Misc Data
-#define FS_OFFSET_1100_SD_MUTEX            0xE323E8
-#define FS_OFFSET_1100_NAND_MUTEX          0xE2D338
-#define FS_OFFSET_1100_ACTIVE_PARTITION    0xE2D378
-#define FS_OFFSET_1100_SDMMC_DAS_HANDLE    0xE15D40
-
-// NOPs
-#define FS_OFFSET_1100_SD_DAS_INIT         0x273B4
-
-// Nintendo Paths
-#define FS_OFFSET_1100_NINTENDO_PATHS \
-{ \
-	{.opcode_reg = 3, .adrp_offset = 0x0006D944, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x0007A3C0, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x00080708, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x00092198, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
-}
-
-#endif // __FS_1100_H__

emummc/source/FS/offsets/1100_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_1100_EXFAT_H__
-#define __FS_1100_EXFAT_H__
-
-// Accessor vtable getters
-#define FS_OFFSET_1100_EXFAT_SDMMC_ACCESSOR_GC   0x156D90
-#define FS_OFFSET_1100_EXFAT_SDMMC_ACCESSOR_SD   0x154F40
-#define FS_OFFSET_1100_EXFAT_SDMMC_ACCESSOR_NAND 0x1500F0
-
-// Hooks
-#define FS_OFFSET_1100_EXFAT_SDMMC_WRAPPER_READ  0x14B990
-#define FS_OFFSET_1100_EXFAT_SDMMC_WRAPPER_WRITE 0x14BA70
-#define FS_OFFSET_1100_EXFAT_RTLD                0x688
-#define FS_OFFSET_1100_EXFAT_RTLD_DESTINATION    ((uintptr_t)(INT64_C(-0x3C)))
-
-#define FS_OFFSET_1100_EXFAT_CLKRST_SET_MIN_V_CLK_RATE 0x14AC40
-
-// Misc funcs
-#define FS_OFFSET_1100_EXFAT_LOCK_MUTEX          0x28FF0
-#define FS_OFFSET_1100_EXFAT_UNLOCK_MUTEX        0x29040
-
-#define FS_OFFSET_1100_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0x14B840
-#define FS_OFFSET_1100_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x14B8F0
-
-// Misc Data
-#define FS_OFFSET_1100_EXFAT_SD_MUTEX            0xE403E8
-#define FS_OFFSET_1100_EXFAT_NAND_MUTEX          0xE3B338
-#define FS_OFFSET_1100_EXFAT_ACTIVE_PARTITION    0xE3B378
-#define FS_OFFSET_1100_EXFAT_SDMMC_DAS_HANDLE    0xE23D40
-
-// NOPs
-#define FS_OFFSET_1100_EXFAT_SD_DAS_INIT         0x273B4
-
-// Nintendo Paths
-#define FS_OFFSET_1100_EXFAT_NINTENDO_PATHS \
-{ \
-	{.opcode_reg = 3, .adrp_offset = 0x0006D944, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x0007A3C0, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x00080708, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x00092198, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
-}
-
-#endif // __FS_1100_EXFAT_H__

emummc/source/FS/offsets/1200.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_1200_H__
-#define __FS_1200_H__
-
-// Accessor vtable getters
-#define FS_OFFSET_1200_SDMMC_ACCESSOR_GC   0x154FD0
-#define FS_OFFSET_1200_SDMMC_ACCESSOR_SD   0x156DE0
-#define FS_OFFSET_1200_SDMMC_ACCESSOR_NAND 0x155500
-
-// Hooks
-#define FS_OFFSET_1200_SDMMC_WRAPPER_READ  0x150970
-#define FS_OFFSET_1200_SDMMC_WRAPPER_WRITE 0x150A30
-#define FS_OFFSET_1200_RTLD                0x688
-#define FS_OFFSET_1200_RTLD_DESTINATION    ((uintptr_t)(INT64_C(-0x3C)))
-
-#define FS_OFFSET_1200_CLKRST_SET_MIN_V_CLK_RATE 0x14FCC0
-
-// Misc funcs
-#define FS_OFFSET_1200_LOCK_MUTEX          0x29350
-#define FS_OFFSET_1200_UNLOCK_MUTEX        0x293A0
-
-#define FS_OFFSET_1200_SDMMC_WRAPPER_CONTROLLER_OPEN  0x150850
-#define FS_OFFSET_1200_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1508E0
-
-// Misc Data
-#define FS_OFFSET_1200_SD_MUTEX            0xE3D3E8
-#define FS_OFFSET_1200_NAND_MUTEX          0xE38768
-#define FS_OFFSET_1200_ACTIVE_PARTITION    0xE387A8
-#define FS_OFFSET_1200_SDMMC_DAS_HANDLE    0xE20DB0
-
-// NOPs
-#define FS_OFFSET_1200_SD_DAS_INIT         0x27244
-
-// Nintendo Paths
-#define FS_OFFSET_1200_NINTENDO_PATHS \
-{ \
-	{.opcode_reg = 3, .adrp_offset = 0x0006E810, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x0007AEC0, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x00081254, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x00092850, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
-}
-
-#endif // __FS_1200_H__

emummc/source/FS/offsets/1200_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_1200_EXFAT_H__
-#define __FS_1200_EXFAT_H__
-
-// Accessor vtable getters
-#define FS_OFFSET_1200_EXFAT_SDMMC_ACCESSOR_GC   0x154FD0
-#define FS_OFFSET_1200_EXFAT_SDMMC_ACCESSOR_SD   0x156DE0
-#define FS_OFFSET_1200_EXFAT_SDMMC_ACCESSOR_NAND 0x155500
-
-// Hooks
-#define FS_OFFSET_1200_EXFAT_SDMMC_WRAPPER_READ  0x150970
-#define FS_OFFSET_1200_EXFAT_SDMMC_WRAPPER_WRITE 0x150A30
-#define FS_OFFSET_1200_EXFAT_RTLD                0x688
-#define FS_OFFSET_1200_EXFAT_RTLD_DESTINATION    ((uintptr_t)(INT64_C(-0x3C)))
-
-#define FS_OFFSET_1200_EXFAT_CLKRST_SET_MIN_V_CLK_RATE 0x14FCC0
-
-// Misc funcs
-#define FS_OFFSET_1200_EXFAT_LOCK_MUTEX          0x29350
-#define FS_OFFSET_1200_EXFAT_UNLOCK_MUTEX        0x293A0
-
-#define FS_OFFSET_1200_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0x150850
-#define FS_OFFSET_1200_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1508E0
-
-// Misc Data
-#define FS_OFFSET_1200_EXFAT_SD_MUTEX            0xE4B3E8
-#define FS_OFFSET_1200_EXFAT_NAND_MUTEX          0xE46768
-#define FS_OFFSET_1200_EXFAT_ACTIVE_PARTITION    0xE467A8
-#define FS_OFFSET_1200_EXFAT_SDMMC_DAS_HANDLE    0xE2EDB0
-
-// NOPs
-#define FS_OFFSET_1200_EXFAT_SD_DAS_INIT         0x27244
-
-// Nintendo Paths
-#define FS_OFFSET_1200_EXFAT_NINTENDO_PATHS \
-{ \
-	{.opcode_reg = 3, .adrp_offset = 0x0006E810, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x0007AEC0, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x00081254, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x00092850, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
-}
-
-#endif // __FS_1200_EXFAT_H__

emummc/source/FS/offsets/1203.h

@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2019 m4xw <m4x@m4xw.net>
- * Copyright (c) 2019 Atmosphere-NX
- * Copyright (c) 2021 CTCaer
- *
- * 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_1203_H__
-#define __FS_1203_H__
-
-// Accessor vtable getters
-#define FS_OFFSET_1203_SDMMC_ACCESSOR_GC   0x1550E0
-#define FS_OFFSET_1203_SDMMC_ACCESSOR_SD   0x156EF0
-#define FS_OFFSET_1203_SDMMC_ACCESSOR_NAND 0x155610
-
-// Hooks
-#define FS_OFFSET_1203_SDMMC_WRAPPER_READ  0x150A80
-#define FS_OFFSET_1203_SDMMC_WRAPPER_WRITE 0x150B40
-#define FS_OFFSET_1203_RTLD                0x688
-#define FS_OFFSET_1203_RTLD_DESTINATION    ((uintptr_t)(INT64_C(-0x3C)))
-
-#define FS_OFFSET_1203_CLKRST_SET_MIN_V_CLK_RATE 0x14FDD0
-
-// Misc funcs
-#define FS_OFFSET_1203_LOCK_MUTEX          0x29350
-#define FS_OFFSET_1203_UNLOCK_MUTEX        0x293A0
-
-#define FS_OFFSET_1203_SDMMC_WRAPPER_CONTROLLER_OPEN  0x150960
-#define FS_OFFSET_1203_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1509F0
-
-// Misc Data
-#define FS_OFFSET_1203_SD_MUTEX            0xE3D3E8
-#define FS_OFFSET_1203_NAND_MUTEX          0xE38768
-#define FS_OFFSET_1203_ACTIVE_PARTITION    0xE387A8
-#define FS_OFFSET_1203_SDMMC_DAS_HANDLE    0xE20DB0
-
-// NOPs
-#define FS_OFFSET_1203_SD_DAS_INIT         0x27244
-
-// Nintendo Paths
-#define FS_OFFSET_1203_NINTENDO_PATHS \
-{ \
-	{.opcode_reg = 3, .adrp_offset = 0x0006E920, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x0007AFD0, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x00081364, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x00092960, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
-}
-
-#endif // __FS_1203_H__

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

@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2019 m4xw <m4x@m4xw.net>
- * Copyright (c) 2019 Atmosphere-NX
- * Copyright (c) 2021 CTCaer
- *
- * 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_1203_EXFAT_H__
-#define __FS_1203_EXFAT_H__
-
-// Accessor vtable getters
-#define FS_OFFSET_1203_EXFAT_SDMMC_ACCESSOR_GC   0x1550E0
-#define FS_OFFSET_1203_EXFAT_SDMMC_ACCESSOR_SD   0x156EF0
-#define FS_OFFSET_1203_EXFAT_SDMMC_ACCESSOR_NAND 0x155610
-
-// Hooks
-#define FS_OFFSET_1203_EXFAT_SDMMC_WRAPPER_READ  0x150A80
-#define FS_OFFSET_1203_EXFAT_SDMMC_WRAPPER_WRITE 0x150B40
-#define FS_OFFSET_1203_EXFAT_RTLD                0x688
-#define FS_OFFSET_1203_EXFAT_RTLD_DESTINATION    ((uintptr_t)(INT64_C(-0x3C)))
-
-#define FS_OFFSET_1203_EXFAT_CLKRST_SET_MIN_V_CLK_RATE 0x14FDD0
-
-// Misc funcs
-#define FS_OFFSET_1203_EXFAT_LOCK_MUTEX          0x29350
-#define FS_OFFSET_1203_EXFAT_UNLOCK_MUTEX        0x293A0
-
-#define FS_OFFSET_1203_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0x150960
-#define FS_OFFSET_1203_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1509F0
-
-// Misc Data
-#define FS_OFFSET_1203_EXFAT_SD_MUTEX            0xE4B3E8
-#define FS_OFFSET_1203_EXFAT_NAND_MUTEX          0xE46768
-#define FS_OFFSET_1203_EXFAT_ACTIVE_PARTITION    0xE467A8
-#define FS_OFFSET_1203_EXFAT_SDMMC_DAS_HANDLE    0xE2EDB0
-
-// NOPs
-#define FS_OFFSET_1203_EXFAT_SD_DAS_INIT         0x27244
-
-// Nintendo Paths
-#define FS_OFFSET_1203_EXFAT_NINTENDO_PATHS \
-{ \
-	{.opcode_reg = 3, .adrp_offset = 0x0006E920, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x0007AFD0, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x00081364, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x00092960, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
-}
-
-#endif // __FS_1203_EXFAT_H__

emummc/source/FS/offsets/1300.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_1300_H__
-#define __FS_1300_H__
-
-// Accessor vtable getters
-#define FS_OFFSET_1300_SDMMC_ACCESSOR_GC   0x158C80
-#define FS_OFFSET_1300_SDMMC_ACCESSOR_SD   0x15AA90
-#define FS_OFFSET_1300_SDMMC_ACCESSOR_NAND 0x1591B0
-
-// Hooks
-#define FS_OFFSET_1300_SDMMC_WRAPPER_READ  0x154620
-#define FS_OFFSET_1300_SDMMC_WRAPPER_WRITE 0x1546E0
-#define FS_OFFSET_1300_RTLD                0x688
-#define FS_OFFSET_1300_RTLD_DESTINATION    ((uintptr_t)(INT64_C(-0x3C)))
-
-#define FS_OFFSET_1300_CLKRST_SET_MIN_V_CLK_RATE 0x153820
-
-// Misc funcs
-#define FS_OFFSET_1300_LOCK_MUTEX          0x29690
-#define FS_OFFSET_1300_UNLOCK_MUTEX        0x296E0
-
-#define FS_OFFSET_1300_SDMMC_WRAPPER_CONTROLLER_OPEN  0x154500
-#define FS_OFFSET_1300_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x154590
-
-// Misc Data
-#define FS_OFFSET_1300_SD_MUTEX            0xE133E8
-#define FS_OFFSET_1300_NAND_MUTEX          0xE0E768
-#define FS_OFFSET_1300_ACTIVE_PARTITION    0xE0E7A8
-#define FS_OFFSET_1300_SDMMC_DAS_HANDLE    0xDF6E18
-
-// NOPs
-#define FS_OFFSET_1300_SD_DAS_INIT         0x27744
-
-// Nintendo Paths
-#define FS_OFFSET_1300_NINTENDO_PATHS \
-{ \
-	{.opcode_reg = 3, .adrp_offset = 0x0006EBE0, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x0007BEEC, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x00082294, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x0009422C, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
-}
-
-#endif // __FS_1300_H__

emummc/source/FS/offsets/1300_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_1300_EXFAT_H__
-#define __FS_1300_EXFAT_H__
-
-// Accessor vtable getters
-#define FS_OFFSET_1300_EXFAT_SDMMC_ACCESSOR_GC   0x158C80
-#define FS_OFFSET_1300_EXFAT_SDMMC_ACCESSOR_SD   0x15AA90
-#define FS_OFFSET_1300_EXFAT_SDMMC_ACCESSOR_NAND 0x1591B0
-
-// Hooks
-#define FS_OFFSET_1300_EXFAT_SDMMC_WRAPPER_READ  0x154620
-#define FS_OFFSET_1300_EXFAT_SDMMC_WRAPPER_WRITE 0x1546E0
-#define FS_OFFSET_1300_EXFAT_RTLD                0x688
-#define FS_OFFSET_1300_EXFAT_RTLD_DESTINATION    ((uintptr_t)(INT64_C(-0x3C)))
-
-#define FS_OFFSET_1300_EXFAT_CLKRST_SET_MIN_V_CLK_RATE 0x153820
-
-// Misc funcs
-#define FS_OFFSET_1300_EXFAT_LOCK_MUTEX          0x29690
-#define FS_OFFSET_1300_EXFAT_UNLOCK_MUTEX        0x296E0
-
-#define FS_OFFSET_1300_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0x154500
-#define FS_OFFSET_1300_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x154590
-
-// Misc Data
-#define FS_OFFSET_1300_EXFAT_SD_MUTEX            0xE203E8
-#define FS_OFFSET_1300_EXFAT_NAND_MUTEX          0xE1B768
-#define FS_OFFSET_1300_EXFAT_ACTIVE_PARTITION    0xE1B7A8
-#define FS_OFFSET_1300_EXFAT_SDMMC_DAS_HANDLE    0xE03E18
-
-// NOPs
-#define FS_OFFSET_1300_EXFAT_SD_DAS_INIT         0x27744
-
-// Nintendo Paths
-#define FS_OFFSET_1300_EXFAT_NINTENDO_PATHS \
-{ \
-	{.opcode_reg = 3, .adrp_offset = 0x0006EBE0, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x0007BEEC, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x00082294, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x0009422C, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
-}
-
-#endif // __FS_1300_EXFAT_H__

emummc/source/FS/offsets/200.h

@@ -34,7 +34,6 @@
 #define FS_OFFSET_200_LOCK_MUTEX          0x3264
 #define FS_OFFSET_200_UNLOCK_MUTEX        0x32D0
 
-#define FS_OFFSET_200_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_200_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x733F4
 
 // Misc Data

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

@@ -34,7 +34,6 @@
 #define FS_OFFSET_200_EXFAT_LOCK_MUTEX          0x3264
 #define FS_OFFSET_200_EXFAT_UNLOCK_MUTEX        0x32D0
 
-#define FS_OFFSET_200_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_200_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x733F4
 
 // Misc Data

emummc/source/FS/offsets/210.h

@@ -34,7 +34,6 @@
 #define FS_OFFSET_210_LOCK_MUTEX          0x3264
 #define FS_OFFSET_210_UNLOCK_MUTEX        0x32D0
 
-#define FS_OFFSET_210_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_210_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x737D4
 
 // Misc Data

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

@@ -34,7 +34,6 @@
 #define FS_OFFSET_210_EXFAT_LOCK_MUTEX          0x3264
 #define FS_OFFSET_210_EXFAT_UNLOCK_MUTEX        0x32D0
 
-#define FS_OFFSET_210_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_210_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x737D4
 
 // Misc Data

emummc/source/FS/offsets/300.h

@@ -34,7 +34,6 @@
 #define FS_OFFSET_300_LOCK_MUTEX          0x35CC
 #define FS_OFFSET_300_UNLOCK_MUTEX        0x3638
 
-#define FS_OFFSET_300_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_300_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x8A270
 
 // Misc Data

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

@@ -34,7 +34,6 @@
 #define FS_OFFSET_300_EXFAT_LOCK_MUTEX          0x35CC
 #define FS_OFFSET_300_EXFAT_UNLOCK_MUTEX        0x3638
 
-#define FS_OFFSET_300_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_300_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x8A270
 
 // Misc Data

emummc/source/FS/offsets/301.h

@@ -34,7 +34,6 @@
 #define FS_OFFSET_301_LOCK_MUTEX          0x3638
 #define FS_OFFSET_301_UNLOCK_MUTEX        0x36A4
 
-#define FS_OFFSET_301_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_301_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x8A32C
 
 // Misc Data

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

@@ -34,7 +34,6 @@
 #define FS_OFFSET_301_EXFAT_LOCK_MUTEX          0x3638
 #define FS_OFFSET_301_EXFAT_UNLOCK_MUTEX        0x36A4
 
-#define FS_OFFSET_301_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_301_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x8A32C
 
 // Misc Data

emummc/source/FS/offsets/400.h

@@ -34,7 +34,6 @@
 #define FS_OFFSET_400_LOCK_MUTEX          0x39A0
 #define FS_OFFSET_400_UNLOCK_MUTEX        0x3A0C
 
-#define FS_OFFSET_400_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_400_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x9DB48
 
 // Misc Data

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

@@ -34,7 +34,6 @@
 #define FS_OFFSET_400_EXFAT_LOCK_MUTEX          0x39A0
 #define FS_OFFSET_400_EXFAT_UNLOCK_MUTEX        0x3A0C
 
-#define FS_OFFSET_400_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_400_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x9DB48
 
 // Misc Data

emummc/source/FS/offsets/410.h

@@ -34,8 +34,7 @@
 #define FS_OFFSET_410_LOCK_MUTEX          0x39A0
 #define FS_OFFSET_410_UNLOCK_MUTEX        0x3A0C
 
-#define FS_OFFSET_410_SDMMC_WRAPPER_CONTROLLER_OPEN  0
-#define FS_OFFSET_410_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x9DBAC
+#define FS_OFFSET_410_SDMMC_WRAPPER_CONTROLLER_CLOSE        0x9DBAC
 
 // Misc Data
 #define FS_OFFSET_410_SD_MUTEX            0xE80268

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

@@ -34,7 +34,6 @@
 #define FS_OFFSET_410_EXFAT_LOCK_MUTEX          0x39A0
 #define FS_OFFSET_410_EXFAT_UNLOCK_MUTEX        0x3A0C
 
-#define FS_OFFSET_410_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_410_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x9DBAC
 
 // Misc Data

emummc/source/FS/offsets/500.h

@@ -34,7 +34,6 @@
 #define FS_OFFSET_500_LOCK_MUTEX          0x4080
 #define FS_OFFSET_500_UNLOCK_MUTEX        0x40D0
 
-#define FS_OFFSET_500_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_500_SDMMC_WRAPPER_CONTROLLER_CLOSE 0xC9380
 
 // Misc Data

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

@@ -34,7 +34,6 @@
 #define FS_OFFSET_500_EXFAT_LOCK_MUTEX          0x4080
 #define FS_OFFSET_500_EXFAT_UNLOCK_MUTEX        0x40D0
 
-#define FS_OFFSET_500_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_500_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0xC9380
 
 // Misc Data

emummc/source/FS/offsets/510.h

@@ -34,7 +34,6 @@
 #define FS_OFFSET_510_LOCK_MUTEX          0x4080
 #define FS_OFFSET_510_UNLOCK_MUTEX        0x40D0
 
-#define FS_OFFSET_510_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_510_SDMMC_WRAPPER_CONTROLLER_CLOSE 0xC9750
 
 // Misc Data

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

@@ -34,7 +34,6 @@
 #define FS_OFFSET_510_EXFAT_LOCK_MUTEX          0x4080
 #define FS_OFFSET_510_EXFAT_UNLOCK_MUTEX        0x40D0
 
-#define FS_OFFSET_510_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_510_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0xC9750
 
 // Misc Data

emummc/source/FS/offsets/600.h

@@ -34,7 +34,6 @@
 #define FS_OFFSET_600_LOCK_MUTEX          0x1412C0
 #define FS_OFFSET_600_UNLOCK_MUTEX        0x141310
 
-#define FS_OFFSET_600_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_600_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x148500
 
 // Misc Data

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

@@ -34,7 +34,6 @@
 #define FS_OFFSET_600_EXFAT_LOCK_MUTEX          0x14C9C0
 #define FS_OFFSET_600_EXFAT_UNLOCK_MUTEX        0x14CA10
 
-#define FS_OFFSET_600_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_600_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x153C00
 
 // Misc Data

emummc/source/FS/offsets/700.h

@@ -34,7 +34,6 @@
 #define FS_OFFSET_700_LOCK_MUTEX          0x148A90
 #define FS_OFFSET_700_UNLOCK_MUTEX        0x148AE0
 
-#define FS_OFFSET_700_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_700_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x14FD50
 
 // Misc Data

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

@@ -34,7 +34,6 @@
 #define FS_OFFSET_700_EXFAT_LOCK_MUTEX          0x154040
 #define FS_OFFSET_700_EXFAT_UNLOCK_MUTEX        0x154090
 
-#define FS_OFFSET_700_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_700_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x15B300
 
 // Misc Data

emummc/source/FS/offsets/800.h

@@ -34,7 +34,6 @@
 #define FS_OFFSET_800_LOCK_MUTEX          0x14B6D0
 #define FS_OFFSET_800_UNLOCK_MUTEX        0x14B720
 
-#define FS_OFFSET_800_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_800_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1529E0
 
 // Misc Data

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

@@ -34,7 +34,6 @@
 #define FS_OFFSET_800_EXFAT_LOCK_MUTEX          0x156C80
 #define FS_OFFSET_800_EXFAT_UNLOCK_MUTEX        0x156CD0
 
-#define FS_OFFSET_800_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_800_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x15DF90
 
 // Misc Data

emummc/source/FS/offsets/810.h

@@ -34,7 +34,6 @@
 #define FS_OFFSET_810_LOCK_MUTEX          0x14B6D0
 #define FS_OFFSET_810_UNLOCK_MUTEX        0x14B720
 
-#define FS_OFFSET_810_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_810_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1529E0
 
 // Misc Data

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

@@ -34,7 +34,6 @@
 #define FS_OFFSET_810_EXFAT_LOCK_MUTEX          0x156C80
 #define FS_OFFSET_810_EXFAT_UNLOCK_MUTEX        0x156CD0
 
-#define FS_OFFSET_810_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_810_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x15DF90
 
 // Misc Data

emummc/source/FS/offsets/900.h

@@ -34,7 +34,6 @@
 #define FS_OFFSET_900_LOCK_MUTEX          0x25280
 #define FS_OFFSET_900_UNLOCK_MUTEX        0x252D0
 
-#define FS_OFFSET_900_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_900_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x137740
 
 // Misc Data

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

@@ -34,7 +34,6 @@
 #define FS_OFFSET_900_EXFAT_LOCK_MUTEX          0x25280
 #define FS_OFFSET_900_EXFAT_UNLOCK_MUTEX        0x252D0
 
-#define FS_OFFSET_900_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_900_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x137740
 
 // Misc Data

emummc/source/FS/offsets/910.h

@@ -34,7 +34,6 @@
 #define FS_OFFSET_910_LOCK_MUTEX          0x25280
 #define FS_OFFSET_910_UNLOCK_MUTEX        0x252D0
 
-#define FS_OFFSET_910_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_910_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x137750
 
 // Misc Data

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

@@ -34,7 +34,6 @@
 #define FS_OFFSET_910_EXFAT_LOCK_MUTEX          0x25280
 #define FS_OFFSET_910_EXFAT_UNLOCK_MUTEX        0x252D0
 
-#define FS_OFFSET_910_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_910_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x137750
 
 // Misc Data

emummc/source/emmc/mmc.h

@@ -136,8 +136,8 @@ c : clear by read
 #define R1_WP_ERASE_SKIP	(1 << 15)	/* sx, c */
 #define R1_CARD_ECC_DISABLED	(1 << 14)	/* sx, a */
 #define R1_ERASE_RESET		(1 << 13)	/* sr, c */
-#define R1_STATUS(x)            ((x) & 0xFFFFE000)
-#define R1_CURRENT_STATE(x)	(((x) & 0x00001E00) >> 9)	/* sx, b (4 bits) */
+#define R1_STATUS(x)            (x & 0xFFFFE000)
+#define R1_CURRENT_STATE(x)	((x & 0x00001E00) >> 9)	/* sx, b (4 bits) */
 #define R1_READY_FOR_DATA	(1 << 8)	/* sx, a */
 #define R1_SWITCH_ERROR		(1 << 7)	/* sx, c */
 #define R1_EXCEPTION_EVENT	(1 << 6)	/* sr, a */

emummc/source/emmc/sd.h

@@ -1,4 +1,6 @@
 /*
+ *  include/linux/mmc/sd.h
+ *
  *  Copyright (c) 2005-2007 Pierre Ossman, All Rights Reserved.
  *  Copyright (c) 2018 CTCaer
  *
@@ -8,8 +10,8 @@
  * your option) any later version.
  */
 
-#ifndef MMC_SD_H
-#define MMC_SD_H
+#ifndef LINUX_MMC_SD_H
+#define LINUX_MMC_SD_H
 
 /* SD commands                           type  argument     response */
 /* class 0 */

emummc/source/emmc/sdmmc.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2018 naehrwert
- * Copyright (c) 2018-2020 CTCaer
+ * Copyright (c) 2018-2019 CTCaer
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -156,7 +156,7 @@ int sdmmc_calculate_fitting_dma_index(sdmmc_accessor_t *_this, unsigned int num_
             }
         }
     }
-
+	
 	sdmmc_memcpy_buf = true;
     return dma_buf_idx;
 }
@@ -164,18 +164,15 @@ int sdmmc_calculate_fitting_dma_index(sdmmc_accessor_t *_this, unsigned int num_
 static int _sdmmc_storage_check_result(u32 res)
 {
 	//Error mask:
-	//TODO: R1_SWITCH_ERROR can be skipped for certain card types.
-	if (res &
-		(R1_OUT_OF_RANGE       | R1_ADDRESS_ERROR | R1_BLOCK_LEN_ERROR |
-		 R1_ERASE_SEQ_ERROR    | R1_ERASE_PARAM   | R1_WP_VIOLATION    |
-		 R1_LOCK_UNLOCK_FAILED | R1_COM_CRC_ERROR | R1_ILLEGAL_COMMAND |
-		 R1_CARD_ECC_FAILED    | R1_CC_ERROR      | R1_ERROR           |
-		 R1_CID_CSD_OVERWRITE  | R1_WP_ERASE_SKIP | R1_ERASE_RESET     |
-		 R1_SWITCH_ERROR))
-		return 0;
-
-	// No errors.
-	return 1;
+	//R1_OUT_OF_RANGE, R1_ADDRESS_ERROR, R1_BLOCK_LEN_ERROR,
+	//R1_ERASE_SEQ_ERROR, R1_ERASE_PARAM, R1_WP_VIOLATION,
+	//R1_LOCK_UNLOCK_FAILED, R1_COM_CRC_ERROR, R1_ILLEGAL_COMMAND,
+	//R1_CARD_ECC_FAILED, R1_CC_ERROR, R1_ERROR, R1_CID_CSD_OVERWRITE,
+	//R1_WP_ERASE_SKIP, R1_ERASE_RESET, R1_SWITCH_ERROR
+	if (!(res & 0xFDF9A080))
+		return 1;
+	//TODO: R1_SWITCH_ERROR we can skip for certain card types.
+	return 0;
 }
 
 static int _sdmmc_storage_execute_cmd_type1_ex(sdmmc_storage_t *storage, u32 *resp, u32 cmd, u32 arg, u32 check_busy, u32 expected_state, u32 mask)
@@ -288,23 +285,14 @@ int sdmmc_storage_end(sdmmc_storage_t *storage)
 
 	sdmmc_end(storage->sdmmc);
 
-	storage->initialized = 0;
-
 	return 1;
 }
 
 static int _sdmmc_storage_readwrite(sdmmc_storage_t *storage, u32 sector, u32 num_sectors, void *buf, u32 is_write)
 {
 	u8 *bbuf = (u8 *)buf;
-	u32 sct_off = sector;
-	u32 sct_total = num_sectors;
-	bool first_reinit = true;
-
-	// Exit if not initialized.
-	if (!storage->initialized)
-		return 0;
-
-	while (sct_total)
+	bool first_reinit = false;
+	while (num_sectors)
 	{
 		u32 blkcnt = 0;
 		// Retry 5 times if failed.
@@ -312,7 +300,7 @@ static int _sdmmc_storage_readwrite(sdmmc_storage_t *storage, u32 sector, u32 nu
 		do
 		{
 reinit_try:
-			if (_sdmmc_storage_readwrite_ex(storage, &blkcnt, sct_off, MIN(sct_total, 0xFFFF), bbuf, is_write))
+			if (_sdmmc_storage_readwrite_ex(storage, &blkcnt, sector, MIN(num_sectors, 0xFFFF), bbuf, is_write))
 				goto out;
 			else
 				retries--;
@@ -325,33 +313,24 @@ reinit_try:
 		{
 			int res;
 
-			if (first_reinit)
+			if (!first_reinit)
 				res = nx_sd_initialize(true);
 			else
 				res = nx_sd_init_retry(true);
 
-			// Reset values for a retry.
-			blkcnt = 0;
 			retries = 3;
-			first_reinit = false;
+			first_reinit = true;
 
-			// If succesful reinit, restart xfer.
 			if (res)
-			{
-				bbuf = (u8 *)buf;
-				sct_off = sector;
-				sct_total = num_sectors;
-
 				goto reinit_try;
-			}
 		}
 
-		// Failed.
 		return 0;
 
 out:
-		sct_off += blkcnt;
-		sct_total -= blkcnt;
+DPRINTF("readwrite: %08X\n", blkcnt);
+		sector += blkcnt;
+		num_sectors -= blkcnt;
 		bbuf += 512 * blkcnt;
 	}
 
@@ -480,11 +459,9 @@ static int _mmc_storage_get_op_cond_inner(sdmmc_storage_t *storage, u32 *pout, u
 	case SDMMC_POWER_1_8:
 		arg = SD_OCR_CCS | SD_OCR_VDD_18;
 		break;
-
 	case SDMMC_POWER_3_3:
 		arg = SD_OCR_CCS | SD_OCR_VDD_27_34;
 		break;
-
 	default:
 		return 0;
 	}
@@ -541,7 +518,6 @@ static void _mmc_storage_parse_cid(sdmmc_storage_t *storage)
 		storage->cid.fwrev  = unstuff_bits(raw_cid, 40, 4);
 		storage->cid.serial = unstuff_bits(raw_cid, 16, 24);
 		break;
-
 	case 2: /* MMC v2.0 - v2.2 */
 	case 3: /* MMC v3.1 - v3.3 */
 	case 4: /* MMC v4 */
@@ -551,7 +527,6 @@ static void _mmc_storage_parse_cid(sdmmc_storage_t *storage)
 		storage->cid.prv      = unstuff_bits(raw_cid, 48, 8);
 		storage->cid.serial   = unstuff_bits(raw_cid, 16, 32);
 		break;
-
 	default:
 		break;
 	}
@@ -596,10 +571,6 @@ static void _mmc_storage_parse_ext_csd(sdmmc_storage_t *storage, u8 *buf)
 	storage->ext_csd.bkops_en = buf[EXT_CSD_BKOPS_EN];
 	storage->ext_csd.bkops_status = buf[EXT_CSD_BKOPS_STATUS];
 
-	storage->ext_csd.pre_eol_info = buf[EXT_CSD_PRE_EOL_INFO];
-	storage->ext_csd.dev_life_est_a = buf[EXT_CSD_DEVICE_LIFE_TIME_EST_TYP_A];
-	storage->ext_csd.dev_life_est_b = buf[EXT_CSD_DEVICE_LIFE_TIME_EST_TYP_B];
-
 	storage->sec_cnt  = *(u32 *)&buf[EXT_CSD_SEC_CNT];
 }
 
@@ -642,7 +613,6 @@ static int _mmc_storage_switch_buswidth(sdmmc_storage_t *storage, u32 bus_width)
 	case SDMMC_BUS_WIDTH_4:
 		arg = SDMMC_SWITCH(MMC_SWITCH_MODE_WRITE_BYTE, EXT_CSD_BUS_WIDTH, EXT_CSD_BUS_WIDTH_4);
 		break;
-
 	case SDMMC_BUS_WIDTH_8:
 		arg = SDMMC_SWITCH(MMC_SWITCH_MODE_WRITE_BYTE, EXT_CSD_BUS_WIDTH, EXT_CSD_BUS_WIDTH_8);
 		break;
@@ -701,7 +671,7 @@ static int _mmc_storage_enable_HS400(sdmmc_storage_t *storage)
 	if (!_mmc_storage_enable_HS200(storage))
 		return 0;
 
-	sdmmc_save_tap_value(storage->sdmmc);
+	sdmmc_set_tap_value(storage->sdmmc);
 
 	if (!_mmc_storage_enable_HS(storage, 0))
 		return 0;
@@ -757,7 +727,7 @@ int sdmmc_storage_init_mmc(sdmmc_storage_t *storage, sdmmc_t *sdmmc, u32 bus_wid
 	storage->sdmmc = sdmmc;
 	storage->rca = 2; //TODO: this could be a config item.
 
-	if (!sdmmc_init(sdmmc, SDMMC_4, SDMMC_POWER_1_8, SDMMC_BUS_WIDTH_1, SDHCI_TIMING_MMC_ID, SDMMC_POWER_SAVE_DISABLE))
+	if (!sdmmc_init(sdmmc, SDMMC_4, SDMMC_POWER_1_8, SDMMC_BUS_WIDTH_1, SDHCI_TIMING_MMC_ID, SDMMC_AUTO_CAL_DISABLE))
 		return 0;
 DPRINTF("[MMC] after init\n");
 
@@ -828,9 +798,7 @@ DPRINTF("[MMC] BKOPS enabled\n");
 		return 0;
 DPRINTF("[MMC] succesfully switched to HS mode\n");
 
-	sdmmc_card_clock_powersave(storage->sdmmc, SDMMC_POWER_SAVE_ENABLE);
-
-	storage->initialized = 1;
+	sdmmc_card_clock_ctrl(storage->sdmmc, SDMMC_AUTO_CAL_ENABLE);
 
 	return 1;
 }
@@ -844,7 +812,6 @@ int sdmmc_storage_set_mmc_partition(sdmmc_storage_t *storage, u32 partition)
 		return 0;
 
 	storage->partition = partition;
-
 	return 1;
 }
 
@@ -883,7 +850,7 @@ static int _sd_storage_send_if_cond(sdmmc_storage_t *storage)
 	return (resp & 0xFF) == 0xAA ? 0 : 2;
 }
 
-static int _sd_storage_get_op_cond_once(sdmmc_storage_t *storage, u32 *cond, int is_version_1, int bus_low_voltage_support)
+static int _sd_storage_get_op_cond_once(sdmmc_storage_t *storage, u32 *cond, int is_version_1, int supports_low_voltage)
 {
 	sdmmc_cmd_t cmdbuf;
 	// Support for Current > 150mA
@@ -891,7 +858,7 @@ static int _sd_storage_get_op_cond_once(sdmmc_storage_t *storage, u32 *cond, int
 	// Support for handling block-addressed SDHC cards
 	arg	|= (~is_version_1 & 1) ? SD_OCR_CCS : 0;
 	// Support for 1.8V
-	arg |= (bus_low_voltage_support & ~is_version_1 & 1) ? SD_OCR_S18R : 0;
+	arg |= (supports_low_voltage & ~is_version_1 & 1) ? SD_OCR_S18R : 0;
 	// This is needed for most cards. Do not set bit7 even if 1.8V is supported.
 	arg |= SD_OCR_VDD_32_33;
 	sdmmc_init_cmd(&cmdbuf, SD_APP_OP_COND, arg, SDMMC_RSP_TYPE_3, 0);
@@ -901,24 +868,22 @@ static int _sd_storage_get_op_cond_once(sdmmc_storage_t *storage, u32 *cond, int
 	return sdmmc_get_rsp(storage->sdmmc, cond, 4, SDMMC_RSP_TYPE_3);
 }
 
-static int _sd_storage_get_op_cond(sdmmc_storage_t *storage, int is_version_1, int bus_low_voltage_support)
+static int _sd_storage_get_op_cond(sdmmc_storage_t *storage, int is_version_1, int supports_low_voltage)
 {
 	u64 timeout = get_tmr_ms() + 1500;
 
 	while (1)
 	{
 		u32 cond = 0;
-		if (!_sd_storage_get_op_cond_once(storage, &cond, is_version_1, bus_low_voltage_support))
+		if (!_sd_storage_get_op_cond_once(storage, &cond, is_version_1, supports_low_voltage))
 			break;
 		if (cond & MMC_CARD_BUSY)
 		{
-DPRINTF("[SD] cond: %08X, lv: %d\n", cond, bus_low_voltage_support);
-
 			if (cond & SD_OCR_CCS)
 				storage->has_sector_access = 1;
 
 			// Check if card supports 1.8V signaling.
-			if (cond & SD_ROCR_S18A && bus_low_voltage_support)
+			if (cond & SD_ROCR_S18A && supports_low_voltage)
 			{
 				//The low voltage regulator configuration is valid for SDMMC1 only.
 				if (storage->sdmmc->id == SDMMC_1 &&
@@ -931,10 +896,6 @@ DPRINTF("[SD] cond: %08X, lv: %d\n", cond, bus_low_voltage_support);
 DPRINTF("-> switched to low voltage\n");
 				}
 			}
-			else
-			{
-DPRINTF("[SD] no low voltage support\n");
-			}
 
 			return 1;
 		}
@@ -1089,15 +1050,12 @@ void _sd_storage_set_current_limit(sdmmc_storage_t *storage, u16 current_limit,
 		case SD_SET_CURRENT_LIMIT_800:
 DPRINTF("[SD] power limit raised to 800mA\n");
 			break;
-
 		case SD_SET_CURRENT_LIMIT_600:
 DPRINTF("[SD] power limit raised to 600mA\n");
 			break;
-
 		case SD_SET_CURRENT_LIMIT_400:
 DPRINTF("[SD] power limit raised to 400mA\n");
 			break;
-
 		default:
 		case SD_SET_CURRENT_LIMIT_200:
 DPRINTF("[SD] power limit defaulted to 200mA\n");
@@ -1110,7 +1068,7 @@ int _sd_storage_enable_highspeed(sdmmc_storage_t *storage, u32 hs_type, u8 *buf)
 {
 	if (!_sd_storage_switch(storage, buf, SD_SWITCH_CHECK, 0, hs_type))
 		return 0;
-DPRINTF("[SD] supports (U)HS mode: %d\n", buf[16] & 0xF);
+DPRINTF("[SD] supports switch to (U)HS mode\n");
 
 	u32 type_out = buf[16] & 0xF;
 	if (type_out != hs_type)
@@ -1146,7 +1104,6 @@ int _sd_storage_enable_uhs_low_volt(sdmmc_storage_t *storage, u32 type, u8 *buf)
 
 	u8  access_mode = buf[13];
 	u16 current_limit = buf[7] | buf[6] << 8;
-DPRINTF("[SD] access: %02X, current: %02X\n", access_mode, current_limit);
 
 	// Try to raise the current limit to let the card perform better.
 	_sd_storage_set_current_limit(storage, current_limit, buf);
@@ -1185,7 +1142,7 @@ DPRINTF("[SD] bus speed set to SDR50\n");
 		if (access_mode & SD_MODE_UHS_SDR25)
 		{
 			type = SDHCI_TIMING_UHS_SDR25;
-			hs_type = UHS_SDR25_BUS_SPEED;
+			hs_type = UHS_SDR50_BUS_SPEED;
 DPRINTF("[SD] bus speed set to SDR25\n");
 			storage->csd.busspeed = 25;
 			break;
@@ -1198,7 +1155,6 @@ DPRINTF("[SD] bus speed set to SDR25\n");
 DPRINTF("[SD] bus speed set to SDR12\n");
 		storage->csd.busspeed = 12;
 		break;
-
 	default:
 		return 0;
 		break;
@@ -1209,10 +1165,10 @@ DPRINTF("[SD] bus speed set to SDR12\n");
 DPRINTF("[SD] card accepted UHS\n");
 	if (!sdmmc_setup_clock(storage->sdmmc, type))
 		return 0;
-DPRINTF("[SD] after setup clock\n");
+DPRINTF("[SD] setup clock\n");
 	if (!sdmmc_tuning_execute(storage->sdmmc, type, MMC_SEND_TUNING_BLOCK))
 		return 0;
-DPRINTF("[SD] after tuning\n");
+DPRINTF("[SD] config tuning\n");
 	return _sdmmc_storage_check_status(storage);
 }
 
@@ -1271,7 +1227,6 @@ static void _sd_storage_parse_csd(sdmmc_storage_t *storage)
 	case 0:
 		storage->csd.capacity = (1 + unstuff_bits(raw_csd, 62, 12)) << (unstuff_bits(raw_csd, 47, 3) + 2);
 		break;
-
 	case 1:
 		storage->csd.c_size = (1 + unstuff_bits(raw_csd, 48, 22));
 		storage->csd.capacity = storage->csd.c_size << 10;
@@ -1280,7 +1235,7 @@ static void _sd_storage_parse_csd(sdmmc_storage_t *storage)
 	}
 }
 
-static bool _sdmmc_storage_get_low_voltage_support(u32 bus_width, u32 type)
+static bool _sdmmc_storage_supports_low_voltage(u32 bus_width, u32 type)
 {
 	switch (type)
 	{
@@ -1306,7 +1261,7 @@ int sdmmc_storage_init_sd(sdmmc_storage_t *storage, sdmmc_t *sdmmc, u32 bus_widt
 	memset(storage, 0, sizeof(sdmmc_storage_t));
 	storage->sdmmc = sdmmc;
 
-	if (!sdmmc_init(sdmmc, SDMMC_1, SDMMC_POWER_3_3, SDMMC_BUS_WIDTH_1, SDHCI_TIMING_SD_ID, SDMMC_POWER_SAVE_DISABLE))
+	if (!sdmmc_init(sdmmc, SDMMC_1, SDMMC_POWER_3_3, SDMMC_BUS_WIDTH_1, SDHCI_TIMING_SD_ID, SDMMC_AUTO_CAL_DISABLE))
 		return 0;
 DPRINTF("[SD] after init\n");
 
@@ -1321,9 +1276,9 @@ DPRINTF("[SD] went to idle state\n");
 		return 0;
 DPRINTF("[SD] after send if cond\n");
 
-	bool bus_low_voltage_support = _sdmmc_storage_get_low_voltage_support(bus_width, type);
+	bool supports_low_voltage = _sdmmc_storage_supports_low_voltage(bus_width, type);
 
-	if (!_sd_storage_get_op_cond(storage, is_version_1, bus_low_voltage_support))
+	if (!_sd_storage_get_op_cond(storage, is_version_1, supports_low_voltage))
 		return 0;
 DPRINTF("[SD] got op cond\n");
 
@@ -1401,7 +1356,7 @@ DPRINTF("[SD] SD does not support wide bus width\n");
 			return 0;
 DPRINTF("[SD] enabled UHS\n");
 
-		sdmmc_card_clock_powersave(sdmmc, SDMMC_POWER_SAVE_ENABLE);
+		sdmmc_card_clock_ctrl(sdmmc, SDMMC_AUTO_CAL_ENABLE);
 	}
 	else if (type != SDHCI_TIMING_SD_DS12 && (storage->scr.sda_vsn & 0xF) != 0)
 	{
@@ -1414,15 +1369,12 @@ DPRINTF("[SD] enabled HS\n");
 		case SDMMC_BUS_WIDTH_4:
 			storage->csd.busspeed = 25;
 			break;
-
 		case SDMMC_BUS_WIDTH_1:
 			storage->csd.busspeed = 6;
 			break;
 		}
 	}
 
-	storage->initialized = 1;
-
 	return 1;
 }
 
@@ -1462,19 +1414,17 @@ int sdmmc_storage_init_gc(sdmmc_storage_t *storage, sdmmc_t *sdmmc)
 	memset(storage, 0, sizeof(sdmmc_storage_t));
 	storage->sdmmc = sdmmc;
 
-	if (!sdmmc_init(sdmmc, SDMMC_2, SDMMC_POWER_1_8, SDMMC_BUS_WIDTH_8, SDHCI_TIMING_MMC_HS102, SDMMC_POWER_SAVE_DISABLE))
+	if (!sdmmc_init(sdmmc, SDMMC_2, SDMMC_POWER_1_8, SDMMC_BUS_WIDTH_8, SDHCI_TIMING_MMC_DDR52, SDMMC_AUTO_CAL_DISABLE))
 		return 0;
 DPRINTF("[gc] after init\n");
 
 	usleep(1000 + (10000 + sdmmc->divisor - 1) / sdmmc->divisor);
 
-	if (!sdmmc_tuning_execute(storage->sdmmc, SDHCI_TIMING_MMC_HS102, MMC_SEND_TUNING_BLOCK_HS200))
+	if (!sdmmc_tuning_execute(storage->sdmmc, SDHCI_TIMING_MMC_DDR52, MMC_SEND_TUNING_BLOCK_HS200))
 		return 0;
 DPRINTF("[gc] after tuning\n");
 
-	sdmmc_card_clock_powersave(sdmmc, SDMMC_POWER_SAVE_ENABLE);
-
-	storage->initialized = 1;
+	sdmmc_card_clock_ctrl(sdmmc, SDMMC_AUTO_CAL_ENABLE);
 
 	return 1;
 }

emummc/source/emmc/sdmmc.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2018 naehrwert
- * Copyright (c) 2018-2020 CTCaer
+ * Copyright (c) 2018 CTCaer
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -54,19 +54,16 @@ typedef struct _mmc_csd
 
 typedef struct _mmc_ext_csd
 {
+	u8  rev;
 	u32 sectors;
 	int bkops;        /* background support bit */
 	int bkops_en;     /* manual bkops enable bit */
-	u8  rev;
 	u8  ext_struct;   /* 194 */
 	u8  card_type;    /* 196 */
 	u8  bkops_status; /* 246 */
-	u8  pre_eol_info;
-	u8  dev_life_est_a;
-	u8  dev_life_est_b;
+	u16 dev_version;
 	u8  boot_mult;
 	u8  rpmb_mult;
-	u16 dev_version;
 } mmc_ext_csd_t;
 
 typedef struct _sd_scr
@@ -84,7 +81,6 @@ typedef struct _sd_ssr
 	u8 uhs_grade;
 	u8 video_class;
 	u8 app_class;
-	u32 protected_size;
 } sd_ssr_t;
 
 /*! SDMMC storage context. */
@@ -103,7 +99,6 @@ typedef struct _sdmmc_storage_t
 	mmc_csd_t     csd;
 	mmc_ext_csd_t ext_csd;
 	sd_scr_t      scr;
-	int initialized;
 } sdmmc_storage_t;
 
 extern sdmmc_accessor_t *_current_accessor;

emummc/source/emmc/sdmmc_driver.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2018 naehrwert
- * Copyright (c) 2018-2020 CTCaer
+ * Copyright (c) 2018-2019 CTCaer
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -58,15 +58,12 @@ static int _sdmmc_set_io_power(sdmmc_t *sdmmc, u32 power)
 	case SDMMC_POWER_OFF:
 		sdmmc->regs->pwrcon &= ~SDHCI_POWER_ON;
 		break;
-
 	case SDMMC_POWER_1_8:
 		sdmmc->regs->pwrcon = SDHCI_POWER_180;
 		break;
-
 	case SDMMC_POWER_3_3:
 		sdmmc->regs->pwrcon = SDHCI_POWER_330;
 		break;
-
 	default:
 		return 0;
 	}
@@ -99,7 +96,7 @@ void sdmmc_set_bus_width(sdmmc_t *sdmmc, u32 bus_width)
 		sdmmc->regs->hostctl = host_control | SDHCI_CTRL_8BITBUS;
 }
 
-void sdmmc_save_tap_value(sdmmc_t *sdmmc)
+void sdmmc_set_tap_value(sdmmc_t *sdmmc)
 {
 	sdmmc->venclkctl_tap = sdmmc->regs->venclkctl >> 16;
 	sdmmc->venclkctl_set = 1;
@@ -108,7 +105,7 @@ void sdmmc_save_tap_value(sdmmc_t *sdmmc)
 static int _sdmmc_config_tap_val(sdmmc_t *sdmmc, u32 type)
 {
 	const u32 dqs_trim_val = 0x28;
-	const u32 tap_values_t210[] = { 4, 0, 3, 0 };
+	const u32 tap_values[] = { 4, 0, 3, 0 };
 
 	u32 tap_val = 0;
 
@@ -125,49 +122,36 @@ static int _sdmmc_config_tap_val(sdmmc_t *sdmmc, u32 type)
 		tap_val = sdmmc->venclkctl_tap;
 	}
 	else
-		tap_val = sdmmc->t210b01 ? 11 : tap_values_t210[sdmmc->id];
-
+	{
+		tap_val = tap_values[sdmmc->id];
+	}
 	sdmmc->regs->venclkctl = (sdmmc->regs->venclkctl & 0xFF00FFFF) | (tap_val << 16);
 
 	return 1;
 }
 
-static int _sdmmc_commit_changes(sdmmc_t *sdmmc)
+static int _sdmmc_get_clkcon(sdmmc_t *sdmmc)
 {
 	return sdmmc->regs->clkcon;
 }
 
 static void _sdmmc_pad_config_fallback(sdmmc_t *sdmmc, u32 power)
 {
-	_sdmmc_commit_changes(sdmmc);
+	_sdmmc_get_clkcon(sdmmc);
 	switch (sdmmc->id)
 	{
 	case SDMMC_1: // 33 Ohm 2X Driver.
 		if (power == SDMMC_POWER_OFF)
 			break;
 		u32 sdmmc1_pad_cfg = APB_MISC(APB_MISC_GP_SDMMC1_PAD_CFGPADCTRL) & 0xF8080FFF;
-		if (sdmmc->t210b01)
-			sdmmc1_pad_cfg |= (0x808 << 12); // Up:  8, Dn:  8. For 33 ohm.
-		else if (power == SDMMC_POWER_1_8)
-			sdmmc1_pad_cfg |= (0xB0F << 12); // Up: 11, Dn: 15. For 33 ohm.
+		if (power == SDMMC_POWER_1_8)
+			APB_MISC(APB_MISC_GP_SDMMC1_PAD_CFGPADCTRL) = sdmmc1_pad_cfg | (0xB0F << 12); // Up: 11, Dn: 15. For 33 ohm.
 		else if (power == SDMMC_POWER_3_3)
-			sdmmc1_pad_cfg |= (0xC0C << 12); // Up: 12, Dn: 12. For 33 ohm.
-		APB_MISC(APB_MISC_GP_SDMMC1_PAD_CFGPADCTRL) = sdmmc1_pad_cfg;
-		(void)APB_MISC(APB_MISC_GP_SDMMC1_PAD_CFGPADCTRL); // Commit write.
+			APB_MISC(APB_MISC_GP_SDMMC1_PAD_CFGPADCTRL) = sdmmc1_pad_cfg | (0xC0C << 12); // Up: 12, Dn: 12. For 33 ohm.
 		break;
-
 	case SDMMC_2:
-		if (sdmmc->t210b01)
-			APB_MISC(APB_MISC_GP_EMMC2_PAD_CFGPADCTRL) = (APB_MISC(APB_MISC_GP_EMMC2_PAD_CFGPADCTRL) & 0xF8080FFF) | 0xA0A000;
-		else
-			APB_MISC(APB_MISC_GP_EMMC2_PAD_CFGPADCTRL) = (APB_MISC(APB_MISC_GP_EMMC2_PAD_CFGPADCTRL) & 0xFFFFC003) | 0x1040; // PU:16, PD:16.
-		(void)APB_MISC(APB_MISC_GP_EMMC2_PAD_CFGPADCTRL);
-		break;
-
-	case SDMMC_4: // 50 Ohm 2X Driver. PU:16, PD:16, B01: PU:10, PD:10.
-		APB_MISC(APB_MISC_GP_EMMC4_PAD_CFGPADCTRL) =
-			(APB_MISC(APB_MISC_GP_EMMC4_PAD_CFGPADCTRL) & 0xFFFFC003) | (sdmmc->t210b01 ? 0xA28 : 0x1040);
-		(void)APB_MISC(APB_MISC_GP_EMMC4_PAD_CFGPADCTRL); // Commit write.
+	case SDMMC_4: // 50 Ohm 2X Driver. PU:16, PD:16.
+		APB_MISC(APB_MISC_GP_EMMC4_PAD_CFGPADCTRL) = (APB_MISC(APB_MISC_GP_EMMC4_PAD_CFGPADCTRL) & 0xFFFFC003) | 0x1040;
 		break;
 	}
 }
@@ -185,13 +169,13 @@ static void _sdmmc_autocal_execute(sdmmc_t *sdmmc, u32 power)
 	if (!(sdmmc->regs->sdmemcmppadctl & TEGRA_MMC_SDMEMCOMPPADCTRL_PAD_E_INPUT_PWRD))
 	{
 		sdmmc->regs->sdmemcmppadctl |= TEGRA_MMC_SDMEMCOMPPADCTRL_PAD_E_INPUT_PWRD;
-		_sdmmc_commit_changes(sdmmc);
+		_sdmmc_get_clkcon(sdmmc);
 		usleep(1);
 	}
 
 	// Enable auto calibration and start auto configuration.
 	sdmmc->regs->autocalcfg |= TEGRA_MMC_AUTOCALCFG_AUTO_CAL_ENABLE | TEGRA_MMC_AUTOCALCFG_AUTO_CAL_START;
-	_sdmmc_commit_changes(sdmmc);
+	_sdmmc_get_clkcon(sdmmc);
 	usleep(2);
 
 	u64 timeout = get_tmr_ms() + 10;
@@ -203,18 +187,24 @@ static void _sdmmc_autocal_execute(sdmmc_t *sdmmc, u32 power)
 			break;
 		}
 	}
-
-#if 0
-	// Check if Comp pad is open or short to ground.
-	// SDMMC1: CZ pads - T210/T210B01: 7-bit/5-bit. SDMMC2/4: LV_CZ pads - 5-bit.
-	u8 code_mask = (sdmmc->t210b01 || sdmmc->id != SDMMC_1) ? 0x1F : 0x7F;
-	u8 autocal_pu_status = sdmmc->regs->autocalsts & code_mask;
-	if (!autocal_pu_status)
-		EPRINTF("SDMMC: Comp Pad short to gnd!");
-	else if (autocal_pu_status == code_mask)
-		EPRINTF("SDMMC: Comp Pad open!");
-#endif
-
+/*
+	// Check if PU results are inside limits.
+	// SDMMC1: CZ pads - 7-bit PU. SDMMC2/4: LV_CZ pads - 5-bit PU.
+	u8 autocal_pu_status = sdmmc->regs->autocalsts & 0x7F;
+	switch (sdmmc->id)
+	{
+	case SDMMC_1:
+		if (!autocal_pu_status || autocal_pu_status == 0x7F)
+			timeout = 0;
+		break;
+	case SDMMC_2:
+	case SDMMC_4:
+		autocal_pu_status &= 0x1F;
+		if (!autocal_pu_status || autocal_pu_status == 0x1F)
+			timeout = 0;
+		break;
+	}
+*/
 	// In case auto calibration fails, we load suggested standard values.
 	if (!timeout)
 	{
@@ -240,7 +230,7 @@ static int _sdmmc_dll_cal_execute(sdmmc_t *sdmmc)
 	}
 
 	sdmmc->regs->vendllcalcfg |= TEGRA_MMC_DLLCAL_CFG_EN_CALIBRATE;
-	_sdmmc_commit_changes(sdmmc);
+	_sdmmc_get_clkcon(sdmmc);
 
 	u64 timeout = get_tmr_ms() + 5;
 	while (sdmmc->regs->vendllcalcfg & TEGRA_MMC_DLLCAL_CFG_EN_CALIBRATE)
@@ -271,21 +261,12 @@ out:;
 static void _sdmmc_reset(sdmmc_t *sdmmc)
 {
 	sdmmc->regs->swrst |= SDHCI_RESET_CMD | SDHCI_RESET_DATA;
-	_sdmmc_commit_changes(sdmmc);
+	_sdmmc_get_clkcon(sdmmc);
 	u64 timeout = get_tmr_ms() + 2000;
 	while ((sdmmc->regs->swrst & (SDHCI_RESET_CMD | SDHCI_RESET_DATA)) && get_tmr_ms() < timeout)
 		;
 }
 
-static void _sdmmc_reset_all(sdmmc_t *sdmmc)
-{
-	sdmmc->regs->swrst |= SDHCI_RESET_ALL;
-	_sdmmc_commit_changes(sdmmc);
-	u32 timeout = get_tmr_ms() + 2000;//100ms
-	while ((sdmmc->regs->swrst & SDHCI_RESET_ALL) && get_tmr_ms() < timeout)
-		;
-}
-
 int sdmmc_setup_clock(sdmmc_t *sdmmc, u32 type)
 {
 	// Disable the SD clock if it was enabled, and reenable it later.
@@ -309,41 +290,36 @@ int sdmmc_setup_clock(sdmmc_t *sdmmc, u32 type)
 		sdmmc->regs->hostctl  &= ~SDHCI_CTRL_HISPD;
 		sdmmc->regs->hostctl2 &= ~SDHCI_CTRL_VDD_180;
 		break;
-
 	case SDHCI_TIMING_MMC_HS52:
 	case SDHCI_TIMING_SD_HS25:
 		sdmmc->regs->hostctl  |= SDHCI_CTRL_HISPD;
 		sdmmc->regs->hostctl2 &= ~SDHCI_CTRL_VDD_180;
 		break;
-
 	case SDHCI_TIMING_MMC_HS200:
 	case SDHCI_TIMING_UHS_SDR50: // T210 Errata for SDR50, the host must be set to SDR104.
 	case SDHCI_TIMING_UHS_SDR104:
 	case SDHCI_TIMING_UHS_SDR82:
 	case SDHCI_TIMING_UHS_DDR50:
-	case SDHCI_TIMING_MMC_HS102:
+	case SDHCI_TIMING_MMC_DDR52:
 		sdmmc->regs->hostctl2  = (sdmmc->regs->hostctl2 & SDHCI_CTRL_UHS_MASK) | UHS_SDR104_BUS_SPEED;
 		sdmmc->regs->hostctl2 |= SDHCI_CTRL_VDD_180;
 		break;
-
 	case SDHCI_TIMING_MMC_HS400:
 		// Non standard.
 		sdmmc->regs->hostctl2  = (sdmmc->regs->hostctl2 & SDHCI_CTRL_UHS_MASK) | HS400_BUS_SPEED;
 		sdmmc->regs->hostctl2 |= SDHCI_CTRL_VDD_180;
 		break;
-
 	case SDHCI_TIMING_UHS_SDR25:
 		sdmmc->regs->hostctl2  = (sdmmc->regs->hostctl2 & SDHCI_CTRL_UHS_MASK) | UHS_SDR25_BUS_SPEED;
 		sdmmc->regs->hostctl2 |= SDHCI_CTRL_VDD_180;
 		break;
-
 	case SDHCI_TIMING_UHS_SDR12:
 		sdmmc->regs->hostctl2  = (sdmmc->regs->hostctl2 & SDHCI_CTRL_UHS_MASK) | UHS_SDR12_BUS_SPEED;
 		sdmmc->regs->hostctl2 |= SDHCI_CTRL_VDD_180;
 		break;
 	}
 
-	_sdmmc_commit_changes(sdmmc);
+	_sdmmc_get_clkcon(sdmmc);
 
 	u32 clock;
 	u16 divisor;
@@ -373,10 +349,10 @@ int sdmmc_setup_clock(sdmmc_t *sdmmc, u32 type)
 static void _sdmmc_card_clock_enable(sdmmc_t *sdmmc)
 {
 	// Recalibrate conditionally.
-	if (sdmmc->manual_cal && !sdmmc->powersave_enabled)
+	if ((sdmmc->id == SDMMC_1) && !sdmmc->auto_cal_enabled)
 		_sdmmc_autocal_execute(sdmmc, sdmmc_get_io_power(sdmmc));
 
-	if (!sdmmc->powersave_enabled)
+	if (!sdmmc->auto_cal_enabled)
 	{
 		if (!(sdmmc->regs->clkcon & SDHCI_CLOCK_CARD_EN))
 			sdmmc->regs->clkcon |= SDHCI_CLOCK_CARD_EN;
@@ -390,17 +366,18 @@ static void _sdmmc_sd_clock_disable(sdmmc_t *sdmmc)
 	sdmmc->regs->clkcon &= ~SDHCI_CLOCK_CARD_EN;
 }
 
-void sdmmc_card_clock_powersave(sdmmc_t *sdmmc, int powersave_enable)
+void sdmmc_card_clock_ctrl(sdmmc_t *sdmmc, int auto_cal_enable)
 {
 	// Recalibrate periodically for SDMMC1.
-	if (sdmmc->manual_cal && !powersave_enable && sdmmc->card_clock_enabled)
+	if ((sdmmc->id == SDMMC_1) && !auto_cal_enable && sdmmc->card_clock_enabled)
 		_sdmmc_autocal_execute(sdmmc, sdmmc_get_io_power(sdmmc));
 
-	sdmmc->powersave_enabled = powersave_enable;
-	if (powersave_enable)
+	sdmmc->auto_cal_enabled = auto_cal_enable;
+	if (auto_cal_enable)
 	{
-		if (sdmmc->regs->clkcon & SDHCI_CLOCK_CARD_EN)
-			sdmmc->regs->clkcon &= ~SDHCI_CLOCK_CARD_EN;
+		if (!(sdmmc->regs->clkcon & SDHCI_CLOCK_CARD_EN))
+			return;
+		sdmmc->regs->clkcon &= ~SDHCI_CLOCK_CARD_EN;
 		return;
 	}
 
@@ -421,7 +398,6 @@ static int _sdmmc_cache_rsp(sdmmc_t *sdmmc, u32 *rsp, u32 size, u32 type)
 			return 0;
 		rsp[0] = sdmmc->regs->rspreg0;
 		break;
-
 	case SDMMC_RSP_TYPE_2:
 		if (size < 0x10)
 			return 0;
@@ -450,9 +426,9 @@ static int _sdmmc_cache_rsp(sdmmc_t *sdmmc, u32 *rsp, u32 size, u32 type)
 				rsp[i - 1] |= (tempreg >> 24) & 0xFF;
 		}
 		break;
-
 	default:
 		return 0;
+		break;
 	}
 
 	return 1;
@@ -473,7 +449,6 @@ int sdmmc_get_rsp(sdmmc_t *sdmmc, u32 *rsp, u32 size, u32 type)
 			return 0;
 		rsp[0] = sdmmc->rsp[0];
 		break;
-
 	case SDMMC_RSP_TYPE_2:
 		if (size < 0x10)
 			return 0;
@@ -482,9 +457,9 @@ int sdmmc_get_rsp(sdmmc_t *sdmmc, u32 *rsp, u32 size, u32 type)
 		rsp[2] = sdmmc->rsp[2];
 		rsp[3] = sdmmc->rsp[3];
 		break;
-
 	default:
 		return 0;
+		break;
 	}
 
 	return 1;
@@ -492,7 +467,7 @@ int sdmmc_get_rsp(sdmmc_t *sdmmc, u32 *rsp, u32 size, u32 type)
 
 static int _sdmmc_wait_cmd_data_inhibit(sdmmc_t *sdmmc, bool wait_dat)
 {
-	_sdmmc_commit_changes(sdmmc);
+	_sdmmc_get_clkcon(sdmmc);
 
 	u64 timeout = get_tmr_ms() + 2000;
 	while(sdmmc->regs->prnsts & SDHCI_CMD_INHIBIT)
@@ -518,7 +493,7 @@ static int _sdmmc_wait_cmd_data_inhibit(sdmmc_t *sdmmc, bool wait_dat)
 
 static int _sdmmc_wait_card_busy(sdmmc_t *sdmmc)
 {
-	_sdmmc_commit_changes(sdmmc);
+	_sdmmc_get_clkcon(sdmmc);
 
 	u64 timeout = get_tmr_ms() + 2000;
 	while (!(sdmmc->regs->prnsts & SDHCI_DATA_0_LVL_MASK))
@@ -537,19 +512,16 @@ static int _sdmmc_setup_read_small_block(sdmmc_t *sdmmc)
 	{
 	case SDMMC_BUS_WIDTH_1:
 		return 0;
-
+		break;
 	case SDMMC_BUS_WIDTH_4:
 		sdmmc->regs->blksize = 64;
 		break;
-
 	case SDMMC_BUS_WIDTH_8:
 		sdmmc->regs->blksize = 128;
 		break;
 	}
-
 	sdmmc->regs->blkcnt = 1;
 	sdmmc->regs->trnmod = SDHCI_TRNS_READ;
-
 	return 1;
 }
 
@@ -561,7 +533,6 @@ static int _sdmmc_send_cmd(sdmmc_t *sdmmc, sdmmc_cmd_t *cmd, bool is_data_presen
 	{
 	case SDMMC_RSP_TYPE_0:
 		break;
-
 	case SDMMC_RSP_TYPE_1:
 	case SDMMC_RSP_TYPE_4:
 	case SDMMC_RSP_TYPE_5:
@@ -570,17 +541,15 @@ static int _sdmmc_send_cmd(sdmmc_t *sdmmc, sdmmc_cmd_t *cmd, bool is_data_presen
 		else
 			cmdflags = SDHCI_CMD_RESP_LEN48 | SDHCI_CMD_INDEX | SDHCI_CMD_CRC;
 		break;
-
 	case SDMMC_RSP_TYPE_2:
 		cmdflags = SDHCI_CMD_RESP_LEN136 | SDHCI_CMD_CRC;
 		break;
-
 	case SDMMC_RSP_TYPE_3:
 		cmdflags = SDHCI_CMD_RESP_LEN48;
 		break;
-
 	default:
 		return 0;
+		break;
 	}
 
 	if (is_data_present)
@@ -603,7 +572,7 @@ static void _sdmmc_send_tuning_cmd(sdmmc_t *sdmmc, u32 cmd)
 
 static int _sdmmc_tuning_execute_once(sdmmc_t *sdmmc, u32 cmd)
 {
-	if (sdmmc->powersave_enabled)
+	if (sdmmc->auto_cal_enabled)
 		return 0;
 	if (!_sdmmc_wait_cmd_data_inhibit(sdmmc, true))
 		return 0;
@@ -615,13 +584,13 @@ static int _sdmmc_tuning_execute_once(sdmmc_t *sdmmc, u32 cmd)
 	sdmmc->regs->clkcon &= ~SDHCI_CLOCK_CARD_EN;
 
 	_sdmmc_send_tuning_cmd(sdmmc, cmd);
-	_sdmmc_commit_changes(sdmmc);
+	_sdmmc_get_clkcon(sdmmc);
 	usleep(1);
 
 	_sdmmc_reset(sdmmc);
 
 	sdmmc->regs->clkcon |= SDHCI_CLOCK_CARD_EN;
-	_sdmmc_commit_changes(sdmmc);
+	_sdmmc_get_clkcon(sdmmc);
 
 	u64 timeout = get_tmr_us() + 5000;
 	while (get_tmr_us() < timeout)
@@ -630,7 +599,7 @@ static int _sdmmc_tuning_execute_once(sdmmc_t *sdmmc, u32 cmd)
 		{
 			sdmmc->regs->norintsts = SDHCI_INT_DATA_AVAIL;
 			sdmmc->regs->norintstsen &= ~SDHCI_INT_DATA_AVAIL;
-			_sdmmc_commit_changes(sdmmc);
+			_sdmmc_get_clkcon(sdmmc);
 			usleep((1000 * 8 + sdmmc->divisor - 1) / sdmmc->divisor);
 			return 1;
 		}
@@ -639,7 +608,7 @@ static int _sdmmc_tuning_execute_once(sdmmc_t *sdmmc, u32 cmd)
 	_sdmmc_reset(sdmmc);
 
 	sdmmc->regs->norintstsen &= ~SDHCI_INT_DATA_AVAIL;
-	_sdmmc_commit_changes(sdmmc);
+	_sdmmc_get_clkcon(sdmmc);
 	usleep((1000 * 8 + sdmmc->divisor - 1) / sdmmc->divisor);
 
 	return 0;
@@ -658,18 +627,15 @@ int sdmmc_tuning_execute(sdmmc_t *sdmmc, u32 type, u32 cmd)
 		max = 128;
 		flag = (2 << 13); // 128 iterations.
 		break;
-
 	case SDHCI_TIMING_UHS_SDR50:
 	case SDHCI_TIMING_UHS_DDR50:
-	case SDHCI_TIMING_MMC_HS102:
+	case SDHCI_TIMING_MMC_DDR52:
 		max = 256;
 		flag = (4 << 13); // 256 iterations.
 		break;
-
 	case SDHCI_TIMING_UHS_SDR12:
 	case SDHCI_TIMING_UHS_SDR25:
 		return 1;
-
 	default:
 		return 0;
 	}
@@ -698,7 +664,7 @@ static int _sdmmc_enable_internal_clock(sdmmc_t *sdmmc)
 {
 	//Enable internal clock and wait till it is stable.
 	sdmmc->regs->clkcon |= SDHCI_CLOCK_INT_EN;
-	_sdmmc_commit_changes(sdmmc);
+	_sdmmc_get_clkcon(sdmmc);
 	u64 timeout = get_tmr_ms() + 2000;
 	while (!(sdmmc->regs->clkcon & SDHCI_CLOCK_INT_STABLE))
 	{
@@ -734,28 +700,17 @@ static int _sdmmc_autocal_config_offset(sdmmc_t *sdmmc, u32 power)
 		off_pd = 5;
 		off_pu = 5;
 		break;
-
 	case SDMMC_1:
+	case SDMMC_3:
 		if (power == SDMMC_POWER_1_8)
 		{
-			if (!sdmmc->t210b01)
-			{
-				off_pd = 123;
-				off_pu = 123;
-			}
-			else
-			{
-				off_pd = 6;
-				off_pu = 6;
-			}
+			off_pd = 123;
+			off_pu = 123;
 		}
 		else if (power == SDMMC_POWER_3_3)
 		{
-			if (!sdmmc->t210b01)
-			{
-				off_pd = 125;
-				off_pu = 0;
-			}
+			off_pd = 125;
+			off_pu = 0;
 		}
 		else
 			return 0;
@@ -785,7 +740,7 @@ static int _sdmmc_check_mask_interrupt(sdmmc_t *sdmmc, u16 *pout, u16 mask)
 	u16 norintsts = sdmmc->regs->norintsts;
 	u16 errintsts = sdmmc->regs->errintsts;
 
-DPRINTF("norintsts %08X, errintsts %08X\n", norintsts, errintsts);
+DPRINTF("norintsts %08X; errintsts %08X\n", norintsts, errintsts);
 
 	if (pout)
 		*pout = norintsts;
@@ -807,7 +762,7 @@ DPRINTF("norintsts %08X, errintsts %08X\n", norintsts, errintsts);
 
 static int _sdmmc_wait_response(sdmmc_t *sdmmc)
 {
-	_sdmmc_commit_changes(sdmmc);
+	_sdmmc_get_clkcon(sdmmc);
 
 	u64 timeout = get_tmr_ms() + 2000;
 	while (true)
@@ -858,7 +813,7 @@ int sdmmc_stop_transmission(sdmmc_t *sdmmc, u32 *rsp)
 		return 0;
 
 	// Recalibrate periodically for SDMMC1.
-	if (sdmmc->manual_cal && sdmmc->powersave_enabled)
+	if ((sdmmc->id == SDMMC_1) && sdmmc->auto_cal_enabled)
 		_sdmmc_autocal_execute(sdmmc, sdmmc_get_io_power(sdmmc));
 
 	bool should_disable_sd_clock = false;
@@ -866,7 +821,7 @@ int sdmmc_stop_transmission(sdmmc_t *sdmmc, u32 *rsp)
 	{
 		should_disable_sd_clock = true;
 		sdmmc->regs->clkcon |= SDHCI_CLOCK_CARD_EN;
-		_sdmmc_commit_changes(sdmmc);
+		_sdmmc_get_clkcon(sdmmc);
 		usleep((8000 + sdmmc->divisor - 1) / sdmmc->divisor);
 	}
 
@@ -887,7 +842,7 @@ static int _sdmmc_config_dma(sdmmc_t *sdmmc, u32 *blkcnt_out, sdmmc_req_t *req)
 	u32 blkcnt = req->num_sectors;
 	if (blkcnt >= 0xFFFF)
 		blkcnt = 0xFFFF;
-
+		
 	u64 admaaddr = (u64)sdmmc_calculate_dma_addr(_current_accessor, req->buf, blkcnt);
 	if (!admaaddr)
 	{
@@ -906,7 +861,7 @@ static int _sdmmc_config_dma(sdmmc_t *sdmmc, u32 *blkcnt_out, sdmmc_req_t *req)
 
 	sdmmc->dma_addr_next = (admaaddr + 0x80000) & 0xFFFFFFFFFFF80000;
 
-	sdmmc->regs->blksize = req->blksize | 0x7000; // DMA 512KB (Detects A18 carry out).
+	sdmmc->regs->blksize = req->blksize | 0x7000;
 	sdmmc->regs->blkcnt = blkcnt;
 
 	if (blkcnt_out)
@@ -998,6 +953,8 @@ static int _sdmmc_execute_cmd_inner(sdmmc_t *sdmmc, sdmmc_cmd_t *cmd, sdmmc_req_
 
 		is_data_present = true;
 	}
+	else
+		is_data_present = false;
 
 	_sdmmc_enable_interrupts(sdmmc);
 
@@ -1005,7 +962,7 @@ static int _sdmmc_execute_cmd_inner(sdmmc_t *sdmmc, sdmmc_cmd_t *cmd, sdmmc_req_
 		return 0;
 
 	int result = _sdmmc_wait_response(sdmmc);
-DPRINTF("rsp(%d): %08X, %08X, %08X, %08X\n", result,
+	DPRINTF("rsp(%d): %08X, %08X, %08X, %08X\n", result,
 		sdmmc->regs->rspreg0, sdmmc->regs->rspreg1, sdmmc->regs->rspreg2, sdmmc->regs->rspreg3);
 	if (result)
 	{
@@ -1013,6 +970,12 @@ DPRINTF("rsp(%d): %08X, %08X, %08X, %08X\n", result,
 		{
 			sdmmc->expected_rsp_type = cmd->rsp_type;
 			result = _sdmmc_cache_rsp(sdmmc, sdmmc->rsp, 0x10, cmd->rsp_type);
+
+			/*if(sdmmc->rsp[0] & 0xFDF9A080)
+			{
+				res = 0;
+				sdmmc->rsp[0] = 0; // Reset error
+			}*/
 		}
 
 		if (req && result)
@@ -1066,56 +1029,7 @@ bool sdmmc_get_sd_inserted()
 	return (!gpio_read(GPIO_PORT_Z, GPIO_PIN_1));
 }
 
-static void _sdmmc_config_sdmmc1_schmitt()
-{
-	PINMUX_AUX(PINMUX_AUX_SDMMC1_CLK)  |= PINMUX_SCHMT;
-	PINMUX_AUX(PINMUX_AUX_SDMMC1_CMD)  |= PINMUX_SCHMT;
-	PINMUX_AUX(PINMUX_AUX_SDMMC1_DAT3) |= PINMUX_SCHMT;
-	PINMUX_AUX(PINMUX_AUX_SDMMC1_DAT2) |= PINMUX_SCHMT;
-	PINMUX_AUX(PINMUX_AUX_SDMMC1_DAT1) |= PINMUX_SCHMT;
-	PINMUX_AUX(PINMUX_AUX_SDMMC1_DAT0) |= PINMUX_SCHMT;
-}
-
-static void _sdmmc_config_sdmmc2_schmitt()
-{
-	PINMUX_AUX(PINMUX_AUX_SDMMC2_CLK)  |= PINMUX_SCHMT;
-	PINMUX_AUX(PINMUX_AUX_SDMMC2_CMD)  |= PINMUX_SCHMT;
-	PINMUX_AUX(PINMUX_AUX_SDMMC2_DAT7) |= PINMUX_SCHMT;
-	PINMUX_AUX(PINMUX_AUX_SDMMC2_DAT6) |= PINMUX_SCHMT;
-	PINMUX_AUX(PINMUX_AUX_SDMMC2_DAT5) |= PINMUX_SCHMT;
-	PINMUX_AUX(PINMUX_AUX_SDMMC2_DAT4) |= PINMUX_SCHMT;
-	PINMUX_AUX(PINMUX_AUX_SDMMC2_DAT3) |= PINMUX_SCHMT;
-	PINMUX_AUX(PINMUX_AUX_SDMMC2_DAT2) |= PINMUX_SCHMT;
-	PINMUX_AUX(PINMUX_AUX_SDMMC2_DAT1) |= PINMUX_SCHMT;
-	PINMUX_AUX(PINMUX_AUX_SDMMC2_DAT0) |= PINMUX_SCHMT;
-}
-
-static void _sdmmc_config_sdmmc1_pads(bool discharge)
-{
-	u32 sdmmc1_pin_mask = GPIO_PIN_0 | GPIO_PIN_1 | GPIO_PIN_2 | GPIO_PIN_3 | GPIO_PIN_4 | GPIO_PIN_5;
-
-	// Set values for Reset state.
-	u32 function = GPIO_MODE_SPIO;
-	u32 level    = GPIO_LOW;
-	u32 output   = GPIO_OUTPUT_DISABLE;
-
-	// Set values for dicharging.
-	if (discharge)
-	{
-		function = GPIO_MODE_GPIO;
-		level    = GPIO_HIGH;
-		output   = GPIO_OUTPUT_ENABLE;
-	}
-
-	// Set all pads function.
-	gpio_config(GPIO_PORT_M, sdmmc1_pin_mask, function);
-	// Set all pads output level.
-	gpio_write(GPIO_PORT_M, sdmmc1_pin_mask, level);
-	// Set all pads output.
-	gpio_output_enable(GPIO_PORT_M, sdmmc1_pin_mask, output);
-}
-
-static int _sdmmc_config_sdmmc1(bool t210b01)
+static int _sdmmc_config_sdmmc1()
 {
 	// Configure SD card detect.
 	PINMUX_AUX(PINMUX_AUX_GPIO_PZ1) = PINMUX_INPUT_ENABLE | PINMUX_PULL_UP | 2; // GPIO control, pull up.
@@ -1130,102 +1044,76 @@ static int _sdmmc_config_sdmmc1(bool t210b01)
 
 	/*
 	* Pinmux config:
-	*  DRV_TYPE = DRIVE_2X (for 33 Ohm driver)
+	*  DRV_TYPE = DRIVE_2X
 	*  E_SCHMT  = ENABLE (for 1.8V),  DISABLE (for 3.3V)
 	*  E_INPUT  = ENABLE
 	*  TRISTATE = PASSTHROUGH
 	*  APB_MISC_GP_SDMMCx_CLK_LPBK_CONTROL = SDMMCx_CLK_PAD_E_LPBK for CLK
 	*/
 
-	// Enable deep loopback for SDMMC1 CLK pad.
-	APB_MISC(APB_MISC_GP_SDMMC1_CLK_LPBK_CONTROL) = 1;
-
-	// Configure SDMMC1 CLK pinmux, based on state and SoC type.
-	if (PINMUX_AUX(PINMUX_AUX_SDMMC1_CLK) != (PINMUX_DRIVE_2X | PINMUX_INPUT_ENABLE | PINMUX_PULL_DOWN)) // Check if CLK pad is already configured.
-		PINMUX_AUX(PINMUX_AUX_SDMMC1_CLK) = PINMUX_DRIVE_2X | PINMUX_INPUT_ENABLE | (t210b01 ? PINMUX_PULL_NONE : PINMUX_PULL_DOWN);
-
-	// Configure the reset of SDMMC1 pins pinmux.
-	PINMUX_AUX(PINMUX_AUX_SDMMC1_CMD)  = PINMUX_DRIVE_2X | PINMUX_INPUT_ENABLE | PINMUX_PULL_UP;
-	PINMUX_AUX(PINMUX_AUX_SDMMC1_DAT3) = PINMUX_DRIVE_2X | PINMUX_INPUT_ENABLE | PINMUX_PULL_UP;
-	PINMUX_AUX(PINMUX_AUX_SDMMC1_DAT2) = PINMUX_DRIVE_2X | PINMUX_INPUT_ENABLE | PINMUX_PULL_UP;
-	PINMUX_AUX(PINMUX_AUX_SDMMC1_DAT1) = PINMUX_DRIVE_2X | PINMUX_INPUT_ENABLE | PINMUX_PULL_UP;
-	PINMUX_AUX(PINMUX_AUX_SDMMC1_DAT0) = PINMUX_DRIVE_2X | PINMUX_INPUT_ENABLE | PINMUX_PULL_UP;
-
-	// Force schmitt trigger for T210B01.
-	if (t210b01)
-		_sdmmc_config_sdmmc1_schmitt();
+	// Configure SDMMC1 pinmux.
+	APB_MISC(APB_MISC_GP_SDMMC1_CLK_LPBK_CONTROL) = 1; // Enable deep loopback for SDMMC1 CLK pad.
+	PINMUX_AUX(PINMUX_AUX_SDMMC1_CLK)  = PINMUX_DRIVE_2X | PINMUX_INPUT_ENABLE | PINMUX_PARKED;
+	PINMUX_AUX(PINMUX_AUX_SDMMC1_CMD)  = PINMUX_DRIVE_2X | PINMUX_INPUT_ENABLE | PINMUX_PARKED | PINMUX_PULL_UP;
+	PINMUX_AUX(PINMUX_AUX_SDMMC1_DAT3) = PINMUX_DRIVE_2X | PINMUX_INPUT_ENABLE | PINMUX_PARKED | PINMUX_PULL_UP;
+	PINMUX_AUX(PINMUX_AUX_SDMMC1_DAT2) = PINMUX_DRIVE_2X | PINMUX_INPUT_ENABLE | PINMUX_PARKED | PINMUX_PULL_UP;
+	PINMUX_AUX(PINMUX_AUX_SDMMC1_DAT1) = PINMUX_DRIVE_2X | PINMUX_INPUT_ENABLE | PINMUX_PARKED | PINMUX_PULL_UP;
+	PINMUX_AUX(PINMUX_AUX_SDMMC1_DAT0) = PINMUX_DRIVE_2X | PINMUX_INPUT_ENABLE | PINMUX_PARKED | PINMUX_PULL_UP;
 
 	// Make sure the SDMMC1 controller is powered.
+	smcReadWriteRegister(PMC_BASE + APBDEV_PMC_NO_IOPOWER, PMC_NO_IOPOWER_SDMMC1_IO_EN, PMC_NO_IOPOWER_SDMMC1_IO_EN);
+	usleep(1000);
 	smcReadWriteRegister(PMC_BASE + APBDEV_PMC_NO_IOPOWER, ~PMC_NO_IOPOWER_SDMMC1_IO_EN, PMC_NO_IOPOWER_SDMMC1_IO_EN);
-	smcReadWriteRegister(PMC_BASE + APBDEV_PMC_NO_IOPOWER, 0, 0); // Commit write.
 
 	// Inform IO pads that voltage is gonna be 3.3V.
 	smcReadWriteRegister(PMC_BASE + APBDEV_PMC_PWR_DET_VAL, PMC_PWR_DET_SDMMC1_IO_EN, PMC_PWR_DET_SDMMC1_IO_EN);
-	smcReadWriteRegister(PMC_BASE + APBDEV_PMC_PWR_DET_VAL, 0, 0); // Commit write.
 
 	// Set enable SD card power.
-	//PINMUX_AUX(PINMUX_AUX_DMIC3_CLK) = PINMUX_PULL_DOWN | 2; // Proper pinmuxing. Breaks on HOS, takes over 1 minute to recover.
-	PINMUX_AUX(PINMUX_AUX_DMIC3_CLK) = PINMUX_INPUT_ENABLE | PINMUX_PULL_DOWN | 1; // Wrong but working pinmuxing. Instant take over by FS.
+	//PINMUX_AUX(PINMUX_AUX_DMIC3_CLK) = PINMUX_PULL_DOWN | 2; // Pull down.
+	PINMUX_AUX(PINMUX_AUX_DMIC3_CLK) = PINMUX_INPUT_ENABLE | PINMUX_PULL_DOWN | 1; // GPIO control, pull down.
 	gpio_config(GPIO_PORT_E, GPIO_PIN_4, GPIO_MODE_GPIO);
 	gpio_write(GPIO_PORT_E, GPIO_PIN_4, GPIO_HIGH);
 	gpio_output_enable(GPIO_PORT_E, GPIO_PIN_4, GPIO_OUTPUT_ENABLE);
-	usleep(10000);
+	usleep(1000);
 
-	// Enable SD card IO power.
+	// Enable SD card power.
 	max77620_regulator_set_voltage(REGULATOR_LDO2, 3300000);
 	max77620_regulator_enable(REGULATOR_LDO2, 1);
 	usleep(1000);
 
 	// Set pad slew codes to get good quality clock.
-	if (!t210b01)
-	{
-		APB_MISC(APB_MISC_GP_SDMMC1_PAD_CFGPADCTRL) = (APB_MISC(APB_MISC_GP_SDMMC1_PAD_CFGPADCTRL) & 0xFFFFFFF) | 0x50000000;
-		(void)APB_MISC(APB_MISC_GP_SDMMC1_PAD_CFGPADCTRL); // Commit write.
-		usleep(1000);
-	}
+	APB_MISC(APB_MISC_GP_SDMMC1_PAD_CFGPADCTRL) = (APB_MISC(APB_MISC_GP_SDMMC1_PAD_CFGPADCTRL) & 0xFFFFFFF) | 0x50000000;
+	usleep(1000);
 
 	return 1;
 }
 
-static void _sdmmc_config_emmc(u32 id, bool t210b01)
+static void _sdmmc_config_emmc(u32 id)
 {
 	switch (id)
 	{
 	case SDMMC_2:
-		if (!t210b01)
-		{
-			// Unset park for pads.
-			APB_MISC(APB_MISC_GP_EMMC2_PAD_CFGPADCTRL) &= 0xF8003FFF;
-			(void)APB_MISC(APB_MISC_GP_EMMC2_PAD_CFGPADCTRL); // Commit write.
-		}
-		else // Enable schmitt trigger for T210B01.
-			_sdmmc_config_sdmmc2_schmitt();
+		// Unset park for pads.
+		APB_MISC(APB_MISC_GP_EMMC2_PAD_CFGPADCTRL) &= 0xF8003FFF;
 		break;
-
 	case SDMMC_4:
 		// Unset park for pads.
 		APB_MISC(APB_MISC_GP_EMMC4_PAD_CFGPADCTRL) &= 0xF8003FFF;
 		// Set default pad cfg.
-		if (t210b01)
-			APB_MISC(APB_MISC_GP_EMMC4_PAD_PUPD_CFGPADCTRL) &= 0xFFBFFFF9; // Unset CMD/CLK/DQS powedown.
-		// Enable schmitt trigger.
-		APB_MISC(APB_MISC_GP_EMMC4_PAD_CFGPADCTRL) |= 1;
-		(void)APB_MISC(APB_MISC_GP_EMMC4_PAD_CFGPADCTRL); // Commit write.
+		APB_MISC(APB_MISC_GP_EMMC4_PAD_CFGPADCTRL) = (APB_MISC(APB_MISC_GP_EMMC4_PAD_CFGPADCTRL) & 0xFFFFC003) | 0x1040;
+
+		// Enabled schmitt trigger.
+		APB_MISC(APB_MISC_GP_EMMC4_PAD_CFGPADCTRL) |= 1; // Enable Schmitt trigger.
 		break;
 	}
+	
 }
 
-int sdmmc_init(sdmmc_t *sdmmc, u32 id, u32 power, u32 bus_width, u32 type, int powersave_enable)
+int sdmmc_init(sdmmc_t *sdmmc, u32 id, u32 power, u32 bus_width, u32 type, int auto_cal_enable)
 {
-	u32 clock;
-	u16 divisor;
-	u8 vref_sel = 7;
+	const u32 trim_values[] = { 2, 8, 3, 8 };
 
-	const u32 trim_values_t210[] = { 2, 8, 3, 8 };
-	const u32 trim_values_t210b01[] = { 14, 13, 15, 13 };
-	const u32 *trim_values = sdmmc->t210b01 ? trim_values_t210b01 : trim_values_t210;
-
-	if (id > SDMMC_4 || id == SDMMC_3)
+	if (id > SDMMC_4)
 		return 0;
 
 	memset(sdmmc, 0, sizeof(sdmmc_t));
@@ -1233,57 +1121,45 @@ int sdmmc_init(sdmmc_t *sdmmc, u32 id, u32 power, u32 bus_width, u32 type, int p
 	sdmmc->regs = (t210_sdmmc_t *)QueryIoMapping(_sdmmc_bases[id], 0x200);
 	sdmmc->id = id;
 	sdmmc->clock_stopped = 1;
-	sdmmc->t210b01 = splGetSocType() == SplSocType_Mariko;
 
 	// Do specific SDMMC HW configuration.
 	switch (id)
 	{
 	case SDMMC_1:
-		if (!_sdmmc_config_sdmmc1(sdmmc->t210b01))
+		if (!_sdmmc_config_sdmmc1())
 			return 0;
-		if (sdmmc->t210b01)
-			vref_sel = 0;
-		else
-			sdmmc->manual_cal = 1;
 		break;
-
 	case SDMMC_2:
 	case SDMMC_4:
-		_sdmmc_config_emmc(id, sdmmc->t210b01);
+		_sdmmc_config_emmc(id);
 		break;
 	}
 
-	// Disable clock if enabled.
 	if (clock_sdmmc_is_not_reset_and_enabled(id))
 	{
 		_sdmmc_sd_clock_disable(sdmmc);
-		_sdmmc_commit_changes(sdmmc);
+		_sdmmc_get_clkcon(sdmmc);
 	}
 
-	// Configure and enable selected clock.
+	u32 clock;
+	u16 divisor;
 	clock_sdmmc_get_card_clock_div(&clock, &divisor, type);
 	clock_sdmmc_enable(id, clock);
 
-	// Make sure all sdmmc registers are reset.
-	_sdmmc_reset_all(sdmmc);
-
 	sdmmc->clock_stopped = 0;
 
-	// Set default pad IO trimming configuration.
+	//TODO: make this skip-able.
 	sdmmc->regs->iospare |= 0x80000; // Enable muxing.
 	sdmmc->regs->veniotrimctl &= 0xFFFFFFFB; // Set Band Gap VREG to supply DLL.
 	sdmmc->regs->venclkctl = (sdmmc->regs->venclkctl & 0xE0FFFFFB) | (trim_values[sdmmc->id] << 24);
 	sdmmc->regs->sdmemcmppadctl =
-		(sdmmc->regs->sdmemcmppadctl & TEGRA_MMC_SDMEMCOMPPADCTRL_COMP_VREF_SEL_MASK) | vref_sel;
+		(sdmmc->regs->sdmemcmppadctl & TEGRA_MMC_SDMEMCOMPPADCTRL_COMP_VREF_SEL_MASK) | 7;
 
-	// Configure auto calibration values.
 	if (!_sdmmc_autocal_config_offset(sdmmc, power))
 		return 0;
 
-	// Calibrate pads.
 	_sdmmc_autocal_execute(sdmmc, power);
 
-	// Enable internal clock and power.
 	if (_sdmmc_enable_internal_clock(sdmmc))
 	{
 		sdmmc_set_bus_width(sdmmc, bus_width);
@@ -1291,50 +1167,18 @@ int sdmmc_init(sdmmc_t *sdmmc, u32 id, u32 power, u32 bus_width, u32 type, int p
 
 		if (sdmmc_setup_clock(sdmmc, type))
 		{
-			sdmmc_card_clock_powersave(sdmmc, powersave_enable);
+			sdmmc_card_clock_ctrl(sdmmc, auto_cal_enable);
 			_sdmmc_card_clock_enable(sdmmc);
-			_sdmmc_commit_changes(sdmmc);
+			_sdmmc_get_clkcon(sdmmc);
 
 			return 1;
 		}
+
+		return 0;
 	}
-
 	return 0;
 }
 
-void sdmmc1_disable_power()
-{
-	// Clear pull down from CLK pad.
-	PINMUX_AUX(PINMUX_AUX_SDMMC1_CLK) &= ~PINMUX_PULL_MASK;
-
-	// Set pads to discharge state.
-	_sdmmc_config_sdmmc1_pads(true);
-
-	// Disable SD card IO power regulator.
-	max77620_regulator_enable(REGULATOR_LDO2, 0);
-	usleep(4000);
-
-	// Disable SD card IO power pin.
-	gpio_write(GPIO_PORT_E, GPIO_PIN_4, GPIO_LOW);
-
-	// T210/T210B01 WAR: Set start timer for IO and Controller power discharge.
-	msleep(239);
-
-	// Disable SDMMC1 controller power.
-	smcReadWriteRegister(PMC_BASE + APBDEV_PMC_NO_IOPOWER, PMC_NO_IOPOWER_SDMMC1_IO_EN, PMC_NO_IOPOWER_SDMMC1_IO_EN);
-	smcReadWriteRegister(PMC_BASE + APBDEV_PMC_NO_IOPOWER, 0, 0); // Commit write.
-
-	// Inform IO pads that next voltage might be 3.3V.
-	smcReadWriteRegister(PMC_BASE + APBDEV_PMC_PWR_DET_VAL, PMC_PWR_DET_SDMMC1_IO_EN, PMC_PWR_DET_SDMMC1_IO_EN);
-	smcReadWriteRegister(PMC_BASE + APBDEV_PMC_PWR_DET_VAL, 0, 0); // Commit write.
-
-	// Set pads to reset state.
-	_sdmmc_config_sdmmc1_pads(false);
-
-	// Set pull down to CLK pad.
-	PINMUX_AUX(PINMUX_AUX_SDMMC1_CLK) |= PINMUX_PULL_DOWN;
-}
-
 void sdmmc_end(sdmmc_t *sdmmc)
 {
 	if (!sdmmc->clock_stopped)
@@ -1345,9 +1189,17 @@ void sdmmc_end(sdmmc_t *sdmmc)
 
 		// Disable SD card power.
 		if (sdmmc->id == SDMMC_1)
-			sdmmc1_disable_power();
+		{
+			gpio_output_enable(GPIO_PORT_E, GPIO_PIN_4, GPIO_OUTPUT_DISABLE);
+			max77620_regulator_enable(REGULATOR_LDO2, 0);
 
-		_sdmmc_commit_changes(sdmmc);
+			// Inform IO pads that next voltage might be 3.3V.
+			smcReadWriteRegister(PMC_BASE + APBDEV_PMC_PWR_DET_VAL, PMC_PWR_DET_SDMMC1_IO_EN, PMC_PWR_DET_SDMMC1_IO_EN);
+
+			msleep(100); // To power cycle min 1ms without power is needed.
+		}
+
+		_sdmmc_get_clkcon(sdmmc);
 		clock_sdmmc_disable(sdmmc->id);
 		sdmmc->clock_stopped = 1;
 	}
@@ -1367,7 +1219,7 @@ int sdmmc_execute_cmd(sdmmc_t *sdmmc, sdmmc_cmd_t *cmd, sdmmc_req_t *req, u32 *b
 		return 0;
 
 	// Recalibrate periodically for SDMMC1.
-	if (sdmmc->manual_cal && sdmmc->powersave_enabled)
+	if (sdmmc->id == SDMMC_1 && sdmmc->auto_cal_enabled)
 		_sdmmc_autocal_execute(sdmmc, sdmmc_get_io_power(sdmmc));
 
 	int should_disable_sd_clock = 0;
@@ -1375,7 +1227,7 @@ int sdmmc_execute_cmd(sdmmc_t *sdmmc, sdmmc_cmd_t *cmd, sdmmc_req_t *req, u32 *b
 	{
 		should_disable_sd_clock = 1;
 		sdmmc->regs->clkcon |= SDHCI_CLOCK_CARD_EN;
-		_sdmmc_commit_changes(sdmmc);
+		_sdmmc_get_clkcon(sdmmc);
 		usleep((8000 + sdmmc->divisor - 1) / sdmmc->divisor);
 	}
 
@@ -1396,32 +1248,36 @@ int sdmmc_enable_low_voltage(sdmmc_t *sdmmc)
 	if (!sdmmc_setup_clock(sdmmc, SDHCI_TIMING_UHS_SDR12))
 		return 0;
 
-	_sdmmc_commit_changes(sdmmc);
+	_sdmmc_get_clkcon(sdmmc);
 
 	// Switch to 1.8V and wait for regulator to stabilize. Assume max possible wait needed.
 	max77620_regulator_set_voltage(REGULATOR_LDO2, 1800000);
-	usleep(150);
+	usleep(300);
 
 	// Inform IO pads that we switched to 1.8V.
 	smcReadWriteRegister(PMC_BASE + APBDEV_PMC_PWR_DET_VAL, ~PMC_PWR_DET_SDMMC1_IO_EN, PMC_PWR_DET_SDMMC1_IO_EN);
-	smcReadWriteRegister(PMC_BASE + APBDEV_PMC_PWR_DET_VAL, 0, 0); // Commit write.
 
 	// Enable schmitt trigger for better duty cycle and low jitter clock.
-	_sdmmc_config_sdmmc1_schmitt();
+	PINMUX_AUX(PINMUX_AUX_SDMMC1_CLK)  |= PINMUX_SCHMT;
+	PINMUX_AUX(PINMUX_AUX_SDMMC1_CMD)  |= PINMUX_SCHMT;
+	PINMUX_AUX(PINMUX_AUX_SDMMC1_DAT3) |= PINMUX_SCHMT;
+	PINMUX_AUX(PINMUX_AUX_SDMMC1_DAT2) |= PINMUX_SCHMT;
+	PINMUX_AUX(PINMUX_AUX_SDMMC1_DAT1) |= PINMUX_SCHMT;
+	PINMUX_AUX(PINMUX_AUX_SDMMC1_DAT0) |= PINMUX_SCHMT;
 
 	_sdmmc_autocal_config_offset(sdmmc, SDMMC_POWER_1_8);
 	_sdmmc_autocal_execute(sdmmc, SDMMC_POWER_1_8);
 	_sdmmc_set_io_power(sdmmc, SDMMC_POWER_1_8);
-	_sdmmc_commit_changes(sdmmc);
+	_sdmmc_get_clkcon(sdmmc);
 	msleep(5); // Wait minimum 5ms before turning on the card clock.
 
 	// Turn on SDCLK.
 	if (sdmmc->regs->hostctl2 & SDHCI_CTRL_VDD_180)
 	{
 		sdmmc->regs->clkcon |= SDHCI_CLOCK_CARD_EN;
-		_sdmmc_commit_changes(sdmmc);
+		_sdmmc_get_clkcon(sdmmc);
 		usleep(1000);
-		if ((sdmmc->regs->prnsts & SDHCI_DATA_LVL_MASK) == SDHCI_DATA_LVL_MASK)
+		if ((sdmmc->regs->prnsts & 0xF00000) == 0xF00000)
 			return 1;
 	}