From 5ac7ae7edb03c28f478b795f3c1a795b26d3075c Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Sat, 7 Dec 2019 14:36:31 -0800 Subject: [PATCH] Update emummc for 9.1.0 --- emummc/source/FS/FS_offsets.c | 8 ++++ emummc/source/FS/FS_versions.h | 3 ++ emummc/source/FS/offsets/910.h | 59 ++++++++++++++++++++++++++++ emummc/source/FS/offsets/910_exfat.h | 59 ++++++++++++++++++++++++++++ 4 files changed, 129 insertions(+) create mode 100644 emummc/source/FS/offsets/910.h create mode 100644 emummc/source/FS/offsets/910_exfat.h diff --git a/emummc/source/FS/FS_offsets.c b/emummc/source/FS/FS_offsets.c index e4bdcf4ac..599836d75 100644 --- a/emummc/source/FS/FS_offsets.c +++ b/emummc/source/FS/FS_offsets.c @@ -43,6 +43,8 @@ #include "offsets/810_exfat.h" #include "offsets/900.h" #include "offsets/900_exfat.h" +#include "offsets/910.h" +#include "offsets/910_exfat.h" #include "../utils/fatal.h" #define GET_OFFSET_STRUCT_NAME(vers) g_offsets##vers @@ -96,6 +98,8 @@ DEFINE_OFFSET_STRUCT(_810); DEFINE_OFFSET_STRUCT(_810_EXFAT); DEFINE_OFFSET_STRUCT(_900); DEFINE_OFFSET_STRUCT(_900_EXFAT); +DEFINE_OFFSET_STRUCT(_910); +DEFINE_OFFSET_STRUCT(_910_EXFAT); const fs_offsets_t *get_fs_offsets(enum FS_VER version) { switch (version) { @@ -153,6 +157,10 @@ const fs_offsets_t *get_fs_offsets(enum FS_VER version) { return &(GET_OFFSET_STRUCT_NAME(_900)); case FS_VER_9_0_0_EXFAT: return &(GET_OFFSET_STRUCT_NAME(_900_EXFAT)); + case FS_VER_9_1_0: + return &(GET_OFFSET_STRUCT_NAME(_910)); + case FS_VER_9_1_0_EXFAT: + return &(GET_OFFSET_STRUCT_NAME(_910_EXFAT)); default: fatal_abort(Fatal_UnknownVersion); } diff --git a/emummc/source/FS/FS_versions.h b/emummc/source/FS/FS_versions.h index 2acbac19a..ea0f93deb 100644 --- a/emummc/source/FS/FS_versions.h +++ b/emummc/source/FS/FS_versions.h @@ -62,6 +62,9 @@ enum FS_VER FS_VER_9_0_0, FS_VER_9_0_0_EXFAT, + FS_VER_9_1_0, + FS_VER_9_1_0_EXFAT, + FS_VER_MAX, }; diff --git a/emummc/source/FS/offsets/910.h b/emummc/source/FS/offsets/910.h new file mode 100644 index 000000000..f57a9aa15 --- /dev/null +++ b/emummc/source/FS/offsets/910.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_910_H__ +#define __FS_910_H__ + +// Accessor vtable getters +#define FS_OFFSET_910_SDMMC_ACCESSOR_GC 0x143100 +#define FS_OFFSET_910_SDMMC_ACCESSOR_SD 0x141210 +#define FS_OFFSET_910_SDMMC_ACCESSOR_NAND 0x13C090 + +// Hooks +#define FS_OFFSET_910_SDMMC_WRAPPER_READ 0x1377F0 +#define FS_OFFSET_910_SDMMC_WRAPPER_WRITE 0x1378D0 +#define FS_OFFSET_910_RTLD 0x454 +#define FS_OFFSET_910_RTLD_DESTINATION 0x9C + +#define FS_OFFSET_910_CLKRST_SET_MIN_V_CLK_RATE 0x136A10 + +// Misc funcs +#define FS_OFFSET_910_LOCK_MUTEX 0x25280 +#define FS_OFFSET_910_UNLOCK_MUTEX 0x252D0 + +#define FS_OFFSET_910_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x137750 + +// Misc Data +#define FS_OFFSET_910_SD_MUTEX 0xE1D3E8 +#define FS_OFFSET_910_NAND_MUTEX 0xE18258 +#define FS_OFFSET_910_ACTIVE_PARTITION 0xE18298 +#define FS_OFFSET_910_SDMMC_DAS_HANDLE 0xDFEFA0 + +// NOPs +#define FS_OFFSET_910_SD_DAS_INIT 0x1472CC + +// Nintendo Paths +#define FS_OFFSET_910_NINTENDO_PATHS \ +{ \ + {.opcode_reg = 3, .adrp_offset = 0x00068A70, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 3, .adrp_offset = 0x00070A50, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 3, .adrp_offset = 0x00081CC4, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 3, .adrp_offset = 0x00081F04, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x0008212C, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \ +} + +#endif // __FS_910_H__ diff --git a/emummc/source/FS/offsets/910_exfat.h b/emummc/source/FS/offsets/910_exfat.h new file mode 100644 index 000000000..9b31301bc --- /dev/null +++ b/emummc/source/FS/offsets/910_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_910_EXFAT_H__ +#define __FS_910_EXFAT_H__ + +// Accessor vtable getters +#define FS_OFFSET_910_EXFAT_SDMMC_ACCESSOR_GC 0x143100 +#define FS_OFFSET_910_EXFAT_SDMMC_ACCESSOR_SD 0x141210 +#define FS_OFFSET_910_EXFAT_SDMMC_ACCESSOR_NAND 0x13C090 + +// Hooks +#define FS_OFFSET_910_EXFAT_SDMMC_WRAPPER_READ 0x1377F0 +#define FS_OFFSET_910_EXFAT_SDMMC_WRAPPER_WRITE 0x1378D0 +#define FS_OFFSET_910_EXFAT_RTLD 0x454 +#define FS_OFFSET_910_EXFAT_RTLD_DESTINATION 0x9C + +#define FS_OFFSET_910_EXFAT_CLKRST_SET_MIN_V_CLK_RATE 0x136A10 + +// Misc funcs +#define FS_OFFSET_910_EXFAT_LOCK_MUTEX 0x25280 +#define FS_OFFSET_910_EXFAT_UNLOCK_MUTEX 0x252D0 + +#define FS_OFFSET_910_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x137750 + +// Misc Data +#define FS_OFFSET_910_EXFAT_SD_MUTEX 0xE2B3E8 +#define FS_OFFSET_910_EXFAT_NAND_MUTEX 0xE26258 +#define FS_OFFSET_910_EXFAT_ACTIVE_PARTITION 0xE26298 +#define FS_OFFSET_910_EXFAT_SDMMC_DAS_HANDLE 0xE0CFA0 + +// NOPs +#define FS_OFFSET_910_EXFAT_SD_DAS_INIT 0x1472CC + +// Nintendo Paths +#define FS_OFFSET_910_EXFAT_NINTENDO_PATHS \ +{ \ + {.opcode_reg = 3, .adrp_offset = 0x00068A70, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 3, .adrp_offset = 0x00070A50, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 3, .adrp_offset = 0x00081CC4, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 3, .adrp_offset = 0x00081F04, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x0008212C, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \ +} + +#endif // __FS_910_EXFAT_H__