From 5dfdc6e8b0a52281082328b25870d2367432253b Mon Sep 17 00:00:00 2001 From: hexkyz Date: Fri, 20 Mar 2026 00:17:19 +0000 Subject: [PATCH] Merge emummc changes from pull request #2743 Remaining changes are duplicated in pull request #2744 --- emummc/source/FS/FS_offsets.c | 8 ++++ emummc/source/FS/FS_versions.h | 3 ++ emummc/source/FS/offsets/2200.h | 59 +++++++++++++++++++++++++++ emummc/source/FS/offsets/2200_exfat.h | 59 +++++++++++++++++++++++++++ 4 files changed, 129 insertions(+) create mode 100644 emummc/source/FS/offsets/2200.h create mode 100644 emummc/source/FS/offsets/2200_exfat.h diff --git a/emummc/source/FS/FS_offsets.c b/emummc/source/FS/FS_offsets.c index 3d1e8505b..9749aef3e 100644 --- a/emummc/source/FS/FS_offsets.c +++ b/emummc/source/FS/FS_offsets.c @@ -83,6 +83,8 @@ #include "offsets/2100_exfat.h" #include "offsets/2120.h" #include "offsets/2120_exfat.h" +#include "offsets/2200.h" +#include "offsets/2200_exfat.h" #include "../utils/fatal.h" #define GET_OFFSET_STRUCT_NAME(vers) g_offsets##vers @@ -177,6 +179,8 @@ DEFINE_OFFSET_STRUCT(_2100); DEFINE_OFFSET_STRUCT(_2100_EXFAT); DEFINE_OFFSET_STRUCT(_2120); DEFINE_OFFSET_STRUCT(_2120_EXFAT); +DEFINE_OFFSET_STRUCT(_2200); +DEFINE_OFFSET_STRUCT(_2200_EXFAT); const fs_offsets_t *get_fs_offsets(enum FS_VER version) { switch (version) { @@ -314,6 +318,10 @@ const fs_offsets_t *get_fs_offsets(enum FS_VER version) { return &(GET_OFFSET_STRUCT_NAME(_2120)); case FS_VER_21_2_0_EXFAT: return &(GET_OFFSET_STRUCT_NAME(_2120_EXFAT)); + case FS_VER_22_0_0: + return &(GET_OFFSET_STRUCT_NAME(_2200)); + case FS_VER_22_0_0_EXFAT: + return &(GET_OFFSET_STRUCT_NAME(_2200_EXFAT)); default: fatal_abort(Fatal_UnknownVersion); } diff --git a/emummc/source/FS/FS_versions.h b/emummc/source/FS/FS_versions.h index da27f7209..892bc4c7c 100644 --- a/emummc/source/FS/FS_versions.h +++ b/emummc/source/FS/FS_versions.h @@ -122,6 +122,9 @@ enum FS_VER FS_VER_21_2_0, FS_VER_21_2_0_EXFAT, + FS_VER_22_0_0, + FS_VER_22_0_0_EXFAT, + FS_VER_MAX, }; diff --git a/emummc/source/FS/offsets/2200.h b/emummc/source/FS/offsets/2200.h new file mode 100644 index 000000000..d3cbd1b9d --- /dev/null +++ b/emummc/source/FS/offsets/2200.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_2200_H__ +#define __FS_2200_H__ + +// Accessor vtable getters +#define FS_OFFSET_2200_SDMMC_ACCESSOR_GC 0x1B01C0 +#define FS_OFFSET_2200_SDMMC_ACCESSOR_SD 0x1B21C0 +#define FS_OFFSET_2200_SDMMC_ACCESSOR_NAND 0x1B07F0 + +// Hooks +#define FS_OFFSET_2200_SDMMC_WRAPPER_READ 0x1AC0F0 +#define FS_OFFSET_2200_SDMMC_WRAPPER_WRITE 0x1AC150 +#define FS_OFFSET_2200_RTLD 0x2DED0 +#define FS_OFFSET_2200_RTLD_DESTINATION ((uintptr_t)(INT64_C(-0x4C))) + +#define FS_OFFSET_2200_CLKRST_SET_MIN_V_CLK_RATE 0x1CF260 + +// Misc funcs +#define FS_OFFSET_2200_LOCK_MUTEX 0x1CF260 +#define FS_OFFSET_2200_UNLOCK_MUTEX 0x1A4F40 + +#define FS_OFFSET_2200_SDMMC_WRAPPER_CONTROLLER_OPEN 0x1AC0B0 +#define FS_OFFSET_2200_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1AC0D0 + +// Misc Data +#define FS_OFFSET_2200_SD_MUTEX 0xFF1408 +#define FS_OFFSET_2200_NAND_MUTEX 0xFECD00 +#define FS_OFFSET_2200_ACTIVE_PARTITION 0xFECD40 +#define FS_OFFSET_2200_SDMMC_DAS_HANDLE 0xFCEB98 + +// NOPs +#define FS_OFFSET_2200_SD_DAS_INIT 0x2B438 + +// Nintendo Paths +#define FS_OFFSET_2200_NINTENDO_PATHS \ +{ \ + {.opcode_reg = 3, .adrp_offset = 0x000715EC, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 3, .adrp_offset = 0x00082E64, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x0008B888, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x000A1B1C, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \ +} + +#endif // __FS_2200_H__ diff --git a/emummc/source/FS/offsets/2200_exfat.h b/emummc/source/FS/offsets/2200_exfat.h new file mode 100644 index 000000000..832902b9d --- /dev/null +++ b/emummc/source/FS/offsets/2200_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_2200_EXFAT_H__ +#define __FS_2200_EXFAT_H__ + +// Accessor vtable getters +#define FS_OFFSET_2200_EXFAT_SDMMC_ACCESSOR_GC 0x1BB3B0 +#define FS_OFFSET_2200_EXFAT_SDMMC_ACCESSOR_SD 0x1BD3B0 +#define FS_OFFSET_2200_EXFAT_SDMMC_ACCESSOR_NAND 0x1BB9E0 + +// Hooks +#define FS_OFFSET_2200_EXFAT_SDMMC_WRAPPER_READ 0x1B72E0 +#define FS_OFFSET_2200_EXFAT_SDMMC_WRAPPER_WRITE 0x1B7340 +#define FS_OFFSET_2200_EXFAT_RTLD 0x2DED0 +#define FS_OFFSET_2200_EXFAT_RTLD_DESTINATION ((uintptr_t)(INT64_C(-0x4C))) + +#define FS_OFFSET_2200_EXFAT_CLKRST_SET_MIN_V_CLK_RATE 0x1DA450 + +// Misc funcs +#define FS_OFFSET_2200_EXFAT_LOCK_MUTEX 0x1DA450 +#define FS_OFFSET_2200_EXFAT_UNLOCK_MUTEX 0x1B0130 + +#define FS_OFFSET_2200_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN 0x1B72A0 +#define FS_OFFSET_2200_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1B72C0 + +// Misc Data +#define FS_OFFSET_2200_EXFAT_SD_MUTEX 0x1002408 +#define FS_OFFSET_2200_EXFAT_NAND_MUTEX 0xFFDD00 +#define FS_OFFSET_2200_EXFAT_ACTIVE_PARTITION 0xFFDD40 +#define FS_OFFSET_2200_EXFAT_SDMMC_DAS_HANDLE 0xFDBB98 + +// NOPs +#define FS_OFFSET_2200_EXFAT_SD_DAS_INIT 0x2B438 + +// Nintendo Paths +#define FS_OFFSET_2200_EXFAT_NINTENDO_PATHS \ +{ \ + {.opcode_reg = 3, .adrp_offset = 0x000715EC, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 3, .adrp_offset = 0x00082E64, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x0008B888, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x000A1B1C, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \ +} + +#endif // __FS_2200_EXFAT_H__ \ No newline at end of file