From 6e5b901a9b141f5128b13be6f216fab1c9ce0826 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Mon, 8 May 2023 18:03:35 -0700 Subject: [PATCH] emummc: support 16.0.3 --- emummc/README.md | 2 +- emummc/source/FS/FS_offsets.c | 8 ++++ emummc/source/FS/offsets/1603.h | 59 +++++++++++++++++++++++++++ emummc/source/FS/offsets/1603_exfat.h | 59 +++++++++++++++++++++++++++ 4 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 emummc/source/FS/offsets/1603.h create mode 100644 emummc/source/FS/offsets/1603_exfat.h diff --git a/emummc/README.md b/emummc/README.md index 4b98ee741..95a6a047a 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 - 16.0.0** +**1.0.0 - 16.0.3** ## Features * Arbitrary SDMMC backend selection diff --git a/emummc/source/FS/FS_offsets.c b/emummc/source/FS/FS_offsets.c index 59000dece..cf4c5dde5 100644 --- a/emummc/source/FS/FS_offsets.c +++ b/emummc/source/FS/FS_offsets.c @@ -65,6 +65,8 @@ #include "offsets/1500_exfat.h" #include "offsets/1600.h" #include "offsets/1600_exfat.h" +#include "offsets/1603.h" +#include "offsets/1603_exfat.h" #include "../utils/fatal.h" #define GET_OFFSET_STRUCT_NAME(vers) g_offsets##vers @@ -141,6 +143,8 @@ DEFINE_OFFSET_STRUCT(_1500); DEFINE_OFFSET_STRUCT(_1500_EXFAT); DEFINE_OFFSET_STRUCT(_1600); DEFINE_OFFSET_STRUCT(_1600_EXFAT); +DEFINE_OFFSET_STRUCT(_1603); +DEFINE_OFFSET_STRUCT(_1603_EXFAT); const fs_offsets_t *get_fs_offsets(enum FS_VER version) { switch (version) { @@ -242,6 +246,10 @@ const fs_offsets_t *get_fs_offsets(enum FS_VER version) { return &(GET_OFFSET_STRUCT_NAME(_1600)); case FS_VER_16_0_0_EXFAT: return &(GET_OFFSET_STRUCT_NAME(_1600_EXFAT)); + case FS_VER_16_0_3: + return &(GET_OFFSET_STRUCT_NAME(_1603)); + case FS_VER_16_0_3_EXFAT: + return &(GET_OFFSET_STRUCT_NAME(_1603_EXFAT)); default: fatal_abort(Fatal_UnknownVersion); } diff --git a/emummc/source/FS/offsets/1603.h b/emummc/source/FS/offsets/1603.h new file mode 100644 index 000000000..0bb2768fe --- /dev/null +++ b/emummc/source/FS/offsets/1603.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_1603_H__ +#define __FS_1603_H__ + +// Accessor vtable getters +#define FS_OFFSET_1603_SDMMC_ACCESSOR_GC 0x1862F0 +#define FS_OFFSET_1603_SDMMC_ACCESSOR_SD 0x187F70 +#define FS_OFFSET_1603_SDMMC_ACCESSOR_NAND 0x1867B0 + +// Hooks +#define FS_OFFSET_1603_SDMMC_WRAPPER_READ 0x182240 +#define FS_OFFSET_1603_SDMMC_WRAPPER_WRITE 0x1822A0 +#define FS_OFFSET_1603_RTLD 0x269B0 +#define FS_OFFSET_1603_RTLD_DESTINATION ((uintptr_t)(INT64_C(-0x3C))) + +#define FS_OFFSET_1603_CLKRST_SET_MIN_V_CLK_RATE 0x1A2D80 + +// Misc funcs +#define FS_OFFSET_1603_LOCK_MUTEX 0x17B780 +#define FS_OFFSET_1603_UNLOCK_MUTEX 0x17B7D0 + +#define FS_OFFSET_1603_SDMMC_WRAPPER_CONTROLLER_OPEN 0x182200 +#define FS_OFFSET_1603_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x182220 + +// Misc Data +#define FS_OFFSET_1603_SD_MUTEX 0xFFB3F0 +#define FS_OFFSET_1603_NAND_MUTEX 0xFF6B58 +#define FS_OFFSET_1603_ACTIVE_PARTITION 0xFF6B98 +#define FS_OFFSET_1603_SDMMC_DAS_HANDLE 0xFDC8B0 + +// NOPs +#define FS_OFFSET_1603_SD_DAS_INIT 0x258D4 + +// Nintendo Paths +#define FS_OFFSET_1603_NINTENDO_PATHS \ +{ \ + {.opcode_reg = 3, .adrp_offset = 0x00063B98, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 3, .adrp_offset = 0x00070DBC, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x0007795C, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x0008A7A4, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \ +} + +#endif // __FS_1603_H__ diff --git a/emummc/source/FS/offsets/1603_exfat.h b/emummc/source/FS/offsets/1603_exfat.h new file mode 100644 index 000000000..5e48cb48c --- /dev/null +++ b/emummc/source/FS/offsets/1603_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_1603_EXFAT_H__ +#define __FS_1603_EXFAT_H__ + +// Accessor vtable getters +#define FS_OFFSET_1603_EXFAT_SDMMC_ACCESSOR_GC 0x190FD0 +#define FS_OFFSET_1603_EXFAT_SDMMC_ACCESSOR_SD 0x192C50 +#define FS_OFFSET_1603_EXFAT_SDMMC_ACCESSOR_NAND 0x191490 + +// Hooks +#define FS_OFFSET_1603_EXFAT_SDMMC_WRAPPER_READ 0x18CF20 +#define FS_OFFSET_1603_EXFAT_SDMMC_WRAPPER_WRITE 0x18CF80 +#define FS_OFFSET_1603_EXFAT_RTLD 0x269B0 +#define FS_OFFSET_1603_EXFAT_RTLD_DESTINATION ((uintptr_t)(INT64_C(-0x3C))) + +#define FS_OFFSET_1603_EXFAT_CLKRST_SET_MIN_V_CLK_RATE 0x1ADA60 + +// Misc funcs +#define FS_OFFSET_1603_EXFAT_LOCK_MUTEX 0x186460 +#define FS_OFFSET_1603_EXFAT_UNLOCK_MUTEX 0x1864B0 + +#define FS_OFFSET_1603_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN 0x18CEE0 +#define FS_OFFSET_1603_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x18CF00 + +// Misc Data +#define FS_OFFSET_1603_EXFAT_SD_MUTEX 0x100D3F0 +#define FS_OFFSET_1603_EXFAT_NAND_MUTEX 0x1008B58 +#define FS_OFFSET_1603_EXFAT_ACTIVE_PARTITION 0x1008B98 +#define FS_OFFSET_1603_EXFAT_SDMMC_DAS_HANDLE 0xFE98B0 + +// NOPs +#define FS_OFFSET_1603_EXFAT_SD_DAS_INIT 0x258D4 + +// Nintendo Paths +#define FS_OFFSET_1603_EXFAT_NINTENDO_PATHS \ +{ \ + {.opcode_reg = 3, .adrp_offset = 0x00063B98, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 3, .adrp_offset = 0x00070DBC, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x0007795C, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x0008A7A4, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \ +} + +#endif // __FS_1603_EXFAT_H__