From ae65b5df0c01bda45cecf0fa05a1e074e10982ba Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Wed, 28 May 2025 12:02:56 -0700 Subject: [PATCH] fusee/emummc: add support for FS 20.1.0 --- emummc/source/FS/FS_offsets.c | 8 +++ emummc/source/FS/FS_versions.h | 3 ++ emummc/source/FS/offsets/2010.h | 59 +++++++++++++++++++++ emummc/source/FS/offsets/2010_exfat.h | 59 +++++++++++++++++++++ fusee/program/source/fusee_stratosphere.cpp | 8 +++ 5 files changed, 137 insertions(+) create mode 100644 emummc/source/FS/offsets/2010.h create mode 100644 emummc/source/FS/offsets/2010_exfat.h diff --git a/emummc/source/FS/FS_offsets.c b/emummc/source/FS/FS_offsets.c index 3ceca0f8e..0db07fe8e 100644 --- a/emummc/source/FS/FS_offsets.c +++ b/emummc/source/FS/FS_offsets.c @@ -77,6 +77,8 @@ #include "offsets/1900_exfat.h" #include "offsets/2000.h" #include "offsets/2000_exfat.h" +#include "offsets/2010.h" +#include "offsets/2010_exfat.h" #include "../utils/fatal.h" #define GET_OFFSET_STRUCT_NAME(vers) g_offsets##vers @@ -165,6 +167,8 @@ DEFINE_OFFSET_STRUCT(_1900); DEFINE_OFFSET_STRUCT(_1900_EXFAT); DEFINE_OFFSET_STRUCT(_2000); DEFINE_OFFSET_STRUCT(_2000_EXFAT); +DEFINE_OFFSET_STRUCT(_2010); +DEFINE_OFFSET_STRUCT(_2010_EXFAT); const fs_offsets_t *get_fs_offsets(enum FS_VER version) { switch (version) { @@ -290,6 +294,10 @@ const fs_offsets_t *get_fs_offsets(enum FS_VER version) { return &(GET_OFFSET_STRUCT_NAME(_2000)); case FS_VER_20_0_0_EXFAT: return &(GET_OFFSET_STRUCT_NAME(_2000_EXFAT)); + case FS_VER_20_1_0: + return &(GET_OFFSET_STRUCT_NAME(_2010)); + case FS_VER_20_1_0_EXFAT: + return &(GET_OFFSET_STRUCT_NAME(_2010_EXFAT)); default: fatal_abort(Fatal_UnknownVersion); } diff --git a/emummc/source/FS/FS_versions.h b/emummc/source/FS/FS_versions.h index 5b2dfc508..312f63224 100644 --- a/emummc/source/FS/FS_versions.h +++ b/emummc/source/FS/FS_versions.h @@ -113,6 +113,9 @@ enum FS_VER FS_VER_20_0_0, FS_VER_20_0_0_EXFAT, + FS_VER_20_1_0, + FS_VER_20_1_0_EXFAT, + FS_VER_MAX, }; diff --git a/emummc/source/FS/offsets/2010.h b/emummc/source/FS/offsets/2010.h new file mode 100644 index 000000000..70691ece7 --- /dev/null +++ b/emummc/source/FS/offsets/2010.h @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2019 m4xw + * 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 . + */ +#ifndef __FS_2010_H__ +#define __FS_2010_H__ + +// Accessor vtable getters +#define FS_OFFSET_2010_SDMMC_ACCESSOR_GC 0x1A7DB0 +#define FS_OFFSET_2010_SDMMC_ACCESSOR_SD 0x1AA130 +#define FS_OFFSET_2010_SDMMC_ACCESSOR_NAND 0x1A8560 + +// Hooks +#define FS_OFFSET_2010_SDMMC_WRAPPER_READ 0x1A3C20 +#define FS_OFFSET_2010_SDMMC_WRAPPER_WRITE 0x1A3C80 +#define FS_OFFSET_2010_RTLD 0x2B594 +#define FS_OFFSET_2010_RTLD_DESTINATION ((uintptr_t)(INT64_C(-0x4C))) + +#define FS_OFFSET_2010_CLKRST_SET_MIN_V_CLK_RATE 0x1C6150 + +// Misc funcs +#define FS_OFFSET_2010_LOCK_MUTEX 0x19CD80 +#define FS_OFFSET_2010_UNLOCK_MUTEX 0x19CDD0 + +#define FS_OFFSET_2010_SDMMC_WRAPPER_CONTROLLER_OPEN 0x1A3BE0 +#define FS_OFFSET_2010_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1A3C00 + +// Misc Data +#define FS_OFFSET_2010_SD_MUTEX 0xFF5408 +#define FS_OFFSET_2010_NAND_MUTEX 0xFF0CF0 +#define FS_OFFSET_2010_ACTIVE_PARTITION 0xFF0D30 +#define FS_OFFSET_2010_SDMMC_DAS_HANDLE 0xFD2B08 + +// NOPs +#define FS_OFFSET_2010_SD_DAS_INIT 0x289F4 + +// Nintendo Paths +#define FS_OFFSET_2010_NINTENDO_PATHS \ +{ \ + {.opcode_reg = 3, .adrp_offset = 0x0006DB14, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 3, .adrp_offset = 0x0007CE1C, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x00084A08, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x0009AE48, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \ +} + +#endif // __FS_2010_H__ diff --git a/emummc/source/FS/offsets/2010_exfat.h b/emummc/source/FS/offsets/2010_exfat.h new file mode 100644 index 000000000..d07c9e6eb --- /dev/null +++ b/emummc/source/FS/offsets/2010_exfat.h @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2019 m4xw + * 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 . + */ +#ifndef __FS_2010_EXFAT_H__ +#define __FS_2010_EXFAT_H__ + +// Accessor vtable getters +#define FS_OFFSET_2010_EXFAT_SDMMC_ACCESSOR_GC 0x1B36D0 +#define FS_OFFSET_2010_EXFAT_SDMMC_ACCESSOR_SD 0x1B5A50 +#define FS_OFFSET_2010_EXFAT_SDMMC_ACCESSOR_NAND 0x1B3E80 + +// Hooks +#define FS_OFFSET_2010_EXFAT_SDMMC_WRAPPER_READ 0x1AF540 +#define FS_OFFSET_2010_EXFAT_SDMMC_WRAPPER_WRITE 0x1AF5A0 +#define FS_OFFSET_2010_EXFAT_RTLD 0x2B594 +#define FS_OFFSET_2010_EXFAT_RTLD_DESTINATION ((uintptr_t)(INT64_C(-0x4C))) + +#define FS_OFFSET_2010_EXFAT_CLKRST_SET_MIN_V_CLK_RATE 0x1D1A70 + +// Misc funcs +#define FS_OFFSET_2010_EXFAT_LOCK_MUTEX 0x1A86A0 +#define FS_OFFSET_2010_EXFAT_UNLOCK_MUTEX 0x1A86F0 + +#define FS_OFFSET_2010_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN 0x1AF500 +#define FS_OFFSET_2010_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1AF520 + +// Misc Data +#define FS_OFFSET_2010_EXFAT_SD_MUTEX 0x1006408 +#define FS_OFFSET_2010_EXFAT_NAND_MUTEX 0x1001CF0 +#define FS_OFFSET_2010_EXFAT_ACTIVE_PARTITION 0x1001D30 +#define FS_OFFSET_2010_EXFAT_SDMMC_DAS_HANDLE 0xFDFB08 + +// NOPs +#define FS_OFFSET_2010_EXFAT_SD_DAS_INIT 0x289F4 + +// Nintendo Paths +#define FS_OFFSET_2010_EXFAT_NINTENDO_PATHS \ +{ \ + {.opcode_reg = 3, .adrp_offset = 0x0006DB14, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 3, .adrp_offset = 0x0007CE1C, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x00084A08, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x0009AE48, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \ +} + +#endif // __FS_2010_EXFAT_H__ diff --git a/fusee/program/source/fusee_stratosphere.cpp b/fusee/program/source/fusee_stratosphere.cpp index 34134ff42..34e88dfb3 100644 --- a/fusee/program/source/fusee_stratosphere.cpp +++ b/fusee/program/source/fusee_stratosphere.cpp @@ -183,6 +183,9 @@ namespace ams::nxboot { FsVersion_20_0_0, FsVersion_20_0_0_Exfat, + FsVersion_20_1_0, + FsVersion_20_1_0_Exfat, + FsVersion_Count, }; @@ -278,6 +281,9 @@ namespace ams::nxboot { { 0x63, 0x54, 0x96, 0x9E, 0x60, 0xA7, 0x97, 0x7B }, /* FsVersion_20_0_0 */ { 0x47, 0x41, 0x07, 0x10, 0x65, 0x4F, 0xA4, 0x3F }, /* FsVersion_20_0_0_Exfat */ + + { 0xED, 0x34, 0xB4, 0x50, 0x58, 0x4A, 0x5B, 0x43 }, /* FsVersion_20_1_0 */ + { 0xA5, 0x1A, 0xA4, 0x92, 0x6C, 0x41, 0x87, 0x59 }, /* FsVersion_20_1_0_Exfat */ }; const InitialProcessBinaryHeader *FindInitialProcessBinary(const pkg2::Package2Header *header, const u8 *data, ams::TargetFirmware target_firmware) { @@ -668,11 +674,13 @@ namespace ams::nxboot { AddPatch(fs_meta, 0x17A9A0, NogcPatch1, sizeof(NogcPatch1)); break; case FsVersion_20_0_0: + case FsVersion_20_1_0: AddPatch(fs_meta, 0x1A7E25, NogcPatch0, sizeof(NogcPatch0)); AddPatch(fs_meta, 0x1A8025, NogcPatch0, sizeof(NogcPatch0)); AddPatch(fs_meta, 0x17C250, NogcPatch1, sizeof(NogcPatch1)); break; case FsVersion_20_0_0_Exfat: + case FsVersion_20_1_0_Exfat: AddPatch(fs_meta, 0x1B3745, NogcPatch0, sizeof(NogcPatch0)); AddPatch(fs_meta, 0x1B3945, NogcPatch0, sizeof(NogcPatch0)); AddPatch(fs_meta, 0x187B70, NogcPatch1, sizeof(NogcPatch1));