diff --git a/emummc/README.md b/emummc/README.md index 95a6a047a..3b36a5a57 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.3** +**1.0.0 - 17.0.0** ## Features * Arbitrary SDMMC backend selection diff --git a/emummc/source/FS/FS_offsets.c b/emummc/source/FS/FS_offsets.c index cf4c5dde5..a1031a8bc 100644 --- a/emummc/source/FS/FS_offsets.c +++ b/emummc/source/FS/FS_offsets.c @@ -67,6 +67,8 @@ #include "offsets/1600_exfat.h" #include "offsets/1603.h" #include "offsets/1603_exfat.h" +#include "offsets/1700.h" +#include "offsets/1700_exfat.h" #include "../utils/fatal.h" #define GET_OFFSET_STRUCT_NAME(vers) g_offsets##vers @@ -145,6 +147,8 @@ DEFINE_OFFSET_STRUCT(_1600); DEFINE_OFFSET_STRUCT(_1600_EXFAT); DEFINE_OFFSET_STRUCT(_1603); DEFINE_OFFSET_STRUCT(_1603_EXFAT); +DEFINE_OFFSET_STRUCT(_1700); +DEFINE_OFFSET_STRUCT(_1700_EXFAT); const fs_offsets_t *get_fs_offsets(enum FS_VER version) { switch (version) { @@ -250,6 +254,10 @@ const fs_offsets_t *get_fs_offsets(enum FS_VER version) { return &(GET_OFFSET_STRUCT_NAME(_1603)); case FS_VER_16_0_3_EXFAT: return &(GET_OFFSET_STRUCT_NAME(_1603_EXFAT)); + case FS_VER_17_0_0: + return &(GET_OFFSET_STRUCT_NAME(_1700)); + case FS_VER_17_0_0_EXFAT: + return &(GET_OFFSET_STRUCT_NAME(_1700_EXFAT)); default: fatal_abort(Fatal_UnknownVersion); } diff --git a/emummc/source/FS/FS_versions.h b/emummc/source/FS/FS_versions.h index a8459bf88..0459f9b9b 100644 --- a/emummc/source/FS/FS_versions.h +++ b/emummc/source/FS/FS_versions.h @@ -98,6 +98,9 @@ enum FS_VER FS_VER_16_0_3, FS_VER_16_0_3_EXFAT, + FS_VER_17_0_0, + FS_VER_17_0_0_EXFAT, + FS_VER_MAX, }; diff --git a/emummc/source/FS/offsets/1700.h b/emummc/source/FS/offsets/1700.h new file mode 100644 index 000000000..0c91f3d58 --- /dev/null +++ b/emummc/source/FS/offsets/1700.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_1700_H__ +#define __FS_1700_H__ + +// Accessor vtable getters +#define FS_OFFSET_1700_SDMMC_ACCESSOR_GC 0x18ACF0 +#define FS_OFFSET_1700_SDMMC_ACCESSOR_SD 0x18C9C0 +#define FS_OFFSET_1700_SDMMC_ACCESSOR_NAND 0x18B1C0 + +// Hooks +#define FS_OFFSET_1700_SDMMC_WRAPPER_READ 0x186BC0 +#define FS_OFFSET_1700_SDMMC_WRAPPER_WRITE 0x186C20 +#define FS_OFFSET_1700_RTLD 0x29D10 +#define FS_OFFSET_1700_RTLD_DESTINATION ((uintptr_t)(INT64_C(-0x3C))) + +#define FS_OFFSET_1700_CLKRST_SET_MIN_V_CLK_RATE 0x1A7B60 + +// Misc funcs +#define FS_OFFSET_1700_LOCK_MUTEX 0x17FEA0 +#define FS_OFFSET_1700_UNLOCK_MUTEX 0x17FEF0 + +#define FS_OFFSET_1700_SDMMC_WRAPPER_CONTROLLER_OPEN 0x186B80 +#define FS_OFFSET_1700_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x186BA0 + +// Misc Data +#define FS_OFFSET_1700_SD_MUTEX 0xFCE3F0 +#define FS_OFFSET_1700_NAND_MUTEX 0xFC9B78 +#define FS_OFFSET_1700_ACTIVE_PARTITION 0xFC9BB8 +#define FS_OFFSET_1700_SDMMC_DAS_HANDLE 0xFAF840 + +// NOPs +#define FS_OFFSET_1700_SD_DAS_INIT 0x28C64 + +// Nintendo Paths +#define FS_OFFSET_1700_NINTENDO_PATHS \ +{ \ + {.opcode_reg = 3, .adrp_offset = 0x00068068, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 3, .adrp_offset = 0x0007510C, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x0007BEAC, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x0008F674, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \ +} + +#endif // __FS_1700_H__ diff --git a/emummc/source/FS/offsets/1700_exfat.h b/emummc/source/FS/offsets/1700_exfat.h new file mode 100644 index 000000000..449e2ead7 --- /dev/null +++ b/emummc/source/FS/offsets/1700_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_1700_EXFAT_H__ +#define __FS_1700_EXFAT_H__ + +// Accessor vtable getters +#define FS_OFFSET_1700_EXFAT_SDMMC_ACCESSOR_GC 0x195B50 +#define FS_OFFSET_1700_EXFAT_SDMMC_ACCESSOR_SD 0x197820 +#define FS_OFFSET_1700_EXFAT_SDMMC_ACCESSOR_NAND 0x196020 + +// Hooks +#define FS_OFFSET_1700_EXFAT_SDMMC_WRAPPER_READ 0x191A20 +#define FS_OFFSET_1700_EXFAT_SDMMC_WRAPPER_WRITE 0x191A80 +#define FS_OFFSET_1700_EXFAT_RTLD 0x29D10 +#define FS_OFFSET_1700_EXFAT_RTLD_DESTINATION ((uintptr_t)(INT64_C(-0x3C))) + +#define FS_OFFSET_1700_EXFAT_CLKRST_SET_MIN_V_CLK_RATE 0x1B29C0 + +// Misc funcs +#define FS_OFFSET_1700_EXFAT_LOCK_MUTEX 0x18AD00 +#define FS_OFFSET_1700_EXFAT_UNLOCK_MUTEX 0x18AD50 + +#define FS_OFFSET_1700_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN 0x1919E0 +#define FS_OFFSET_1700_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x191A00 + +// Misc Data +#define FS_OFFSET_1700_EXFAT_SD_MUTEX 0xFE03F0 +#define FS_OFFSET_1700_EXFAT_NAND_MUTEX 0xFDBB78 +#define FS_OFFSET_1700_EXFAT_ACTIVE_PARTITION 0xFDBBB8 +#define FS_OFFSET_1700_EXFAT_SDMMC_DAS_HANDLE 0xFBC840 + +// NOPs +#define FS_OFFSET_1700_EXFAT_SD_DAS_INIT 0x28C64 + +// Nintendo Paths +#define FS_OFFSET_1700_EXFAT_NINTENDO_PATHS \ +{ \ + {.opcode_reg = 3, .adrp_offset = 0x00068068, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 3, .adrp_offset = 0x0007510C, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x0007BEAC, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x0008F674, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \ +} + +#endif // __FS_1700_EXFAT_H__