From bce987792d0b521d46af2d2acd01b0727905876e Mon Sep 17 00:00:00 2001 From: hexkyz Date: Thu, 10 Sep 2026 16:23:01 +0100 Subject: [PATCH] emummc: update for 23.0.0 --- emummc/README.md | 2 +- emummc/source/FS/FS_offsets.c | 8 ++++ emummc/source/FS/FS_versions.h | 3 ++ emummc/source/FS/offsets/2300.h | 59 +++++++++++++++++++++++++++ emummc/source/FS/offsets/2300_exfat.h | 59 +++++++++++++++++++++++++++ 5 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 emummc/source/FS/offsets/2300.h create mode 100644 emummc/source/FS/offsets/2300_exfat.h diff --git a/emummc/README.md b/emummc/README.md index f63004065..752223788 100644 --- a/emummc/README.md +++ b/emummc/README.md @@ -2,7 +2,7 @@ *A SDMMC driver replacement for Nintendo's Filesystem Services, by **m4xw*** ### Supported Horizon Versions -**1.0.0 - 22.5.0** +**1.0.0 - 23.0.0** ## Features * Arbitrary SDMMC backend selection diff --git a/emummc/source/FS/FS_offsets.c b/emummc/source/FS/FS_offsets.c index 133e0e816..f7a2bacf8 100644 --- a/emummc/source/FS/FS_offsets.c +++ b/emummc/source/FS/FS_offsets.c @@ -87,6 +87,8 @@ #include "offsets/2200_exfat.h" #include "offsets/2250.h" #include "offsets/2250_exfat.h" +#include "offsets/2300.h" +#include "offsets/2300_exfat.h" #include "../utils/fatal.h" #define GET_OFFSET_STRUCT_NAME(vers) g_offsets##vers @@ -185,6 +187,8 @@ DEFINE_OFFSET_STRUCT(_2200); DEFINE_OFFSET_STRUCT(_2200_EXFAT); DEFINE_OFFSET_STRUCT(_2250); DEFINE_OFFSET_STRUCT(_2250_EXFAT); +DEFINE_OFFSET_STRUCT(_2300); +DEFINE_OFFSET_STRUCT(_2300_EXFAT); const fs_offsets_t *get_fs_offsets(enum FS_VER version) { switch (version) { @@ -330,6 +334,10 @@ const fs_offsets_t *get_fs_offsets(enum FS_VER version) { return &(GET_OFFSET_STRUCT_NAME(_2250)); case FS_VER_22_5_0_EXFAT: return &(GET_OFFSET_STRUCT_NAME(_2250_EXFAT)); + case FS_VER_23_0_0: + return &(GET_OFFSET_STRUCT_NAME(_2300)); + case FS_VER_23_0_0_EXFAT: + return &(GET_OFFSET_STRUCT_NAME(_2300_EXFAT)); default: fatal_abort(Fatal_UnknownVersion); } diff --git a/emummc/source/FS/FS_versions.h b/emummc/source/FS/FS_versions.h index af2913d0f..d2c240b20 100644 --- a/emummc/source/FS/FS_versions.h +++ b/emummc/source/FS/FS_versions.h @@ -127,6 +127,9 @@ enum FS_VER FS_VER_22_5_0, FS_VER_22_5_0_EXFAT, + + FS_VER_23_0_0, + FS_VER_23_0_0_EXFAT, FS_VER_MAX, }; diff --git a/emummc/source/FS/offsets/2300.h b/emummc/source/FS/offsets/2300.h new file mode 100644 index 000000000..87bd5b130 --- /dev/null +++ b/emummc/source/FS/offsets/2300.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_2300_H__ +#define __FS_2300_H__ + +// Accessor vtable getters +#define FS_OFFSET_2300_SDMMC_ACCESSOR_GC 0x1B3640 +#define FS_OFFSET_2300_SDMMC_ACCESSOR_SD 0x1B5640 +#define FS_OFFSET_2300_SDMMC_ACCESSOR_NAND 0x1B3C70 + +// Hooks +#define FS_OFFSET_2300_SDMMC_WRAPPER_READ 0x1AF570 +#define FS_OFFSET_2300_SDMMC_WRAPPER_WRITE 0x1AF5D0 +#define FS_OFFSET_2300_RTLD 0x2F520 +#define FS_OFFSET_2300_RTLD_DESTINATION ((uintptr_t)(INT64_C(-0x4C))) + +#define FS_OFFSET_2300_CLKRST_SET_MIN_V_CLK_RATE 0x1D27E0 + +// Misc funcs +#define FS_OFFSET_2300_LOCK_MUTEX 0x1A8090 +#define FS_OFFSET_2300_UNLOCK_MUTEX 0x1A80E0 + +#define FS_OFFSET_2300_SDMMC_WRAPPER_CONTROLLER_OPEN 0x1AF530 +#define FS_OFFSET_2300_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1AF550 + +// Misc Data +#define FS_OFFSET_2300_SD_MUTEX 0xFF5408 +#define FS_OFFSET_2300_NAND_MUTEX 0xFF0D70 +#define FS_OFFSET_2300_ACTIVE_PARTITION 0xFF0DB0 +#define FS_OFFSET_2300_SDMMC_DAS_HANDLE 0xFD2BE8 + +// NOPs +#define FS_OFFSET_2300_SD_DAS_INIT 0x2CA98 + +// Nintendo Paths +#define FS_OFFSET_2300_NINTENDO_PATHS \ +{ \ + {.opcode_reg = 3, .adrp_offset = 0x00072D7C, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 3, .adrp_offset = 0x00081BA4, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x0008A668, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x0009F97C, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \ +} + +#endif // __FS_2300_H__ diff --git a/emummc/source/FS/offsets/2300_exfat.h b/emummc/source/FS/offsets/2300_exfat.h new file mode 100644 index 000000000..a0f49372f --- /dev/null +++ b/emummc/source/FS/offsets/2300_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_2300_EXFAT_H__ +#define __FS_2300_EXFAT_H__ + +// Accessor vtable getters +#define FS_OFFSET_2300_EXFAT_SDMMC_ACCESSOR_GC 0x1BE840 +#define FS_OFFSET_2300_EXFAT_SDMMC_ACCESSOR_SD 0x1C0840 +#define FS_OFFSET_2300_EXFAT_SDMMC_ACCESSOR_NAND 0x1BEE70 + +// Hooks +#define FS_OFFSET_2300_EXFAT_SDMMC_WRAPPER_READ 0x1BA770 +#define FS_OFFSET_2300_EXFAT_SDMMC_WRAPPER_WRITE 0x1BA7D0 +#define FS_OFFSET_2300_EXFAT_RTLD 0x2F530 +#define FS_OFFSET_2300_EXFAT_RTLD_DESTINATION ((uintptr_t)(INT64_C(-0x4C))) + +#define FS_OFFSET_2300_EXFAT_CLKRST_SET_MIN_V_CLK_RATE 0x1DD9E0 + +// Misc funcs +#define FS_OFFSET_2300_EXFAT_LOCK_MUTEX 0x1B3290 +#define FS_OFFSET_2300_EXFAT_UNLOCK_MUTEX 0x1B32E0 + +#define FS_OFFSET_2300_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN 0x1BA730 +#define FS_OFFSET_2300_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1BA750 + +// Misc Data +#define FS_OFFSET_2300_EXFAT_SD_MUTEX 0x1006408 +#define FS_OFFSET_2300_EXFAT_NAND_MUTEX 0x1001D70 +#define FS_OFFSET_2300_EXFAT_ACTIVE_PARTITION 0x1001DB0 +#define FS_OFFSET_2300_EXFAT_SDMMC_DAS_HANDLE 0xFDFBE8 + +// NOPs +#define FS_OFFSET_2300_EXFAT_SD_DAS_INIT 0x2CAA8 + +// Nintendo Paths +#define FS_OFFSET_2300_EXFAT_NINTENDO_PATHS \ +{ \ + {.opcode_reg = 3, .adrp_offset = 0x00072D8C, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 3, .adrp_offset = 0x00081BB4, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x0008A678, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x0009F98C, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \ +} + +#endif // __FS_2300_EXFAT_H__ \ No newline at end of file