diff --git a/emummc/README.md b/emummc/README.md index cada2cdb5..ea9a91d7c 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 - 19.0.0** +**1.0.0 - 20.0.0** ## Features * Arbitrary SDMMC backend selection diff --git a/emummc/source/FS/FS_offsets.c b/emummc/source/FS/FS_offsets.c index 64ac34562..3ceca0f8e 100644 --- a/emummc/source/FS/FS_offsets.c +++ b/emummc/source/FS/FS_offsets.c @@ -75,6 +75,8 @@ #include "offsets/1810_exfat.h" #include "offsets/1900.h" #include "offsets/1900_exfat.h" +#include "offsets/2000.h" +#include "offsets/2000_exfat.h" #include "../utils/fatal.h" #define GET_OFFSET_STRUCT_NAME(vers) g_offsets##vers @@ -161,6 +163,8 @@ DEFINE_OFFSET_STRUCT(_1810); DEFINE_OFFSET_STRUCT(_1810_EXFAT); DEFINE_OFFSET_STRUCT(_1900); DEFINE_OFFSET_STRUCT(_1900_EXFAT); +DEFINE_OFFSET_STRUCT(_2000); +DEFINE_OFFSET_STRUCT(_2000_EXFAT); const fs_offsets_t *get_fs_offsets(enum FS_VER version) { switch (version) { @@ -282,6 +286,10 @@ const fs_offsets_t *get_fs_offsets(enum FS_VER version) { return &(GET_OFFSET_STRUCT_NAME(_1900)); case FS_VER_19_0_0_EXFAT: return &(GET_OFFSET_STRUCT_NAME(_1900_EXFAT)); + case FS_VER_20_0_0: + return &(GET_OFFSET_STRUCT_NAME(_2000)); + case FS_VER_20_0_0_EXFAT: + return &(GET_OFFSET_STRUCT_NAME(_2000_EXFAT)); default: fatal_abort(Fatal_UnknownVersion); } diff --git a/emummc/source/FS/FS_versions.h b/emummc/source/FS/FS_versions.h index 6eebac186..5b2dfc508 100644 --- a/emummc/source/FS/FS_versions.h +++ b/emummc/source/FS/FS_versions.h @@ -110,6 +110,9 @@ enum FS_VER FS_VER_19_0_0, FS_VER_19_0_0_EXFAT, + FS_VER_20_0_0, + FS_VER_20_0_0_EXFAT, + FS_VER_MAX, }; diff --git a/emummc/source/FS/offsets/2000.h b/emummc/source/FS/offsets/2000.h new file mode 100644 index 000000000..b4fe302d7 --- /dev/null +++ b/emummc/source/FS/offsets/2000.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_2000_H__ +#define __FS_2000_H__ + +// Accessor vtable getters +#define FS_OFFSET_2000_SDMMC_ACCESSOR_GC 0x1A7DB0 +#define FS_OFFSET_2000_SDMMC_ACCESSOR_SD 0x1AA130 +#define FS_OFFSET_2000_SDMMC_ACCESSOR_NAND 0x1A8560 + +// Hooks +#define FS_OFFSET_2000_SDMMC_WRAPPER_READ 0x1A3C20 +#define FS_OFFSET_2000_SDMMC_WRAPPER_WRITE 0x1A3C80 +#define FS_OFFSET_2000_RTLD 0x2B594 +#define FS_OFFSET_2000_RTLD_DESTINATION ((uintptr_t)(INT64_C(-0x4C))) + +#define FS_OFFSET_2000_CLKRST_SET_MIN_V_CLK_RATE 0x1C6150 + +// Misc funcs +#define FS_OFFSET_2000_LOCK_MUTEX 0x19CD80 +#define FS_OFFSET_2000_UNLOCK_MUTEX 0x19CDD0 + +#define FS_OFFSET_2000_SDMMC_WRAPPER_CONTROLLER_OPEN 0x1A3BE0 +#define FS_OFFSET_2000_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1A3C00 + +// Misc Data +#define FS_OFFSET_2000_SD_MUTEX 0xFF5408 +#define FS_OFFSET_2000_NAND_MUTEX 0xFF0CF0 +#define FS_OFFSET_2000_ACTIVE_PARTITION 0xFF0D30 +#define FS_OFFSET_2000_SDMMC_DAS_HANDLE 0xFD2B08 + +// NOPs +#define FS_OFFSET_2000_SD_DAS_INIT 0x289F4 + +// Nintendo Paths +#define FS_OFFSET_2000_NINTENDO_PATHS \ +{ \ + {.opcode_reg = 3, .adrp_offset = 0x0006DB14, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 3, .adrp_offset = 0x0007CE1C, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x00084A08, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x0009AE48, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \ +} + +#endif // __FS_2000_H__ diff --git a/emummc/source/FS/offsets/2000_exfat.h b/emummc/source/FS/offsets/2000_exfat.h new file mode 100644 index 000000000..97b04c67b --- /dev/null +++ b/emummc/source/FS/offsets/2000_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_2000_EXFAT_H__ +#define __FS_2000_EXFAT_H__ + +// Accessor vtable getters +#define FS_OFFSET_2000_EXFAT_SDMMC_ACCESSOR_GC 0x1B36D0 +#define FS_OFFSET_2000_EXFAT_SDMMC_ACCESSOR_SD 0x1B5A50 +#define FS_OFFSET_2000_EXFAT_SDMMC_ACCESSOR_NAND 0x1B3E80 + +// Hooks +#define FS_OFFSET_2000_EXFAT_SDMMC_WRAPPER_READ 0x1AF540 +#define FS_OFFSET_2000_EXFAT_SDMMC_WRAPPER_WRITE 0x1AF5A0 +#define FS_OFFSET_2000_EXFAT_RTLD 0x2B594 +#define FS_OFFSET_2000_EXFAT_RTLD_DESTINATION ((uintptr_t)(INT64_C(-0x4C))) + +#define FS_OFFSET_2000_EXFAT_CLKRST_SET_MIN_V_CLK_RATE 0x1D1A70 + +// Misc funcs +#define FS_OFFSET_2000_EXFAT_LOCK_MUTEX 0x1A86A0 +#define FS_OFFSET_2000_EXFAT_UNLOCK_MUTEX 0x1A86F0 + +#define FS_OFFSET_2000_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN 0x1AF500 +#define FS_OFFSET_2000_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1AF880 + +// Misc Data +#define FS_OFFSET_2000_EXFAT_SD_MUTEX 0x1006408 +#define FS_OFFSET_2000_EXFAT_NAND_MUTEX 0x1001CF0 +#define FS_OFFSET_2000_EXFAT_ACTIVE_PARTITION 0x1001D30 +#define FS_OFFSET_2000_EXFAT_SDMMC_DAS_HANDLE 0xFDFB08 + +// NOPs +#define FS_OFFSET_2000_EXFAT_SD_DAS_INIT 0x289F4 + +// Nintendo Paths +#define FS_OFFSET_2000_EXFAT_NINTENDO_PATHS \ +{ \ + {.opcode_reg = 3, .adrp_offset = 0x0006DB14, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 3, .adrp_offset = 0x0007CE1C, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x00084A08, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x0009AE48, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \ +} + +#endif // __FS_2000_EXFAT_H__