From d0e6fdb3dae49694d2b70525d06fd6b2986cbaa1 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Mon, 30 Nov 2020 21:28:12 -0800 Subject: [PATCH] emummc: untested 11.0.0 support --- emummc/source/FS/FS_offsets.c | 8 ++++ emummc/source/FS/FS_versions.h | 3 ++ emummc/source/FS/offsets/1100.h | 58 +++++++++++++++++++++++++++ emummc/source/FS/offsets/1100_exfat.h | 58 +++++++++++++++++++++++++++ 4 files changed, 127 insertions(+) create mode 100644 emummc/source/FS/offsets/1100.h create mode 100644 emummc/source/FS/offsets/1100_exfat.h diff --git a/emummc/source/FS/FS_offsets.c b/emummc/source/FS/FS_offsets.c index 821d31061..59f4e42fb 100644 --- a/emummc/source/FS/FS_offsets.c +++ b/emummc/source/FS/FS_offsets.c @@ -49,6 +49,8 @@ #include "offsets/1000_exfat.h" #include "offsets/1020.h" #include "offsets/1020_exfat.h" +#include "offsets/1100.h" +#include "offsets/1100_exfat.h" #include "../utils/fatal.h" #define GET_OFFSET_STRUCT_NAME(vers) g_offsets##vers @@ -108,6 +110,8 @@ 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); const fs_offsets_t *get_fs_offsets(enum FS_VER version) { switch (version) { @@ -177,6 +181,10 @@ 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)); default: fatal_abort(Fatal_UnknownVersion); } diff --git a/emummc/source/FS/FS_versions.h b/emummc/source/FS/FS_versions.h index 3d7826879..635210dcf 100644 --- a/emummc/source/FS/FS_versions.h +++ b/emummc/source/FS/FS_versions.h @@ -71,6 +71,9 @@ 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_MAX, }; diff --git a/emummc/source/FS/offsets/1100.h b/emummc/source/FS/offsets/1100.h new file mode 100644 index 000000000..a2a1bcf83 --- /dev/null +++ b/emummc/source/FS/offsets/1100.h @@ -0,0 +1,58 @@ +/* + * 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_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_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__ diff --git a/emummc/source/FS/offsets/1100_exfat.h b/emummc/source/FS/offsets/1100_exfat.h new file mode 100644 index 000000000..6f0c474bc --- /dev/null +++ b/emummc/source/FS/offsets/1100_exfat.h @@ -0,0 +1,58 @@ +/* + * 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_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_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__