diff --git a/emummc/README.md b/emummc/README.md index a4dd40a55..de6085f77 100644 Binary files a/emummc/README.md and b/emummc/README.md differ diff --git a/emummc/source/FS/FS_offsets.c b/emummc/source/FS/FS_offsets.c index 599836d75..d7da45c4a 100644 --- a/emummc/source/FS/FS_offsets.c +++ b/emummc/source/FS/FS_offsets.c @@ -45,6 +45,8 @@ #include "offsets/900_exfat.h" #include "offsets/910.h" #include "offsets/910_exfat.h" +#include "offsets/1000.h" +#include "offsets/1000_exfat.h" #include "../utils/fatal.h" #define GET_OFFSET_STRUCT_NAME(vers) g_offsets##vers @@ -100,6 +102,8 @@ DEFINE_OFFSET_STRUCT(_900); DEFINE_OFFSET_STRUCT(_900_EXFAT); DEFINE_OFFSET_STRUCT(_910); DEFINE_OFFSET_STRUCT(_910_EXFAT); +DEFINE_OFFSET_STRUCT(_1000); +DEFINE_OFFSET_STRUCT(_1000_EXFAT); const fs_offsets_t *get_fs_offsets(enum FS_VER version) { switch (version) { @@ -161,6 +165,10 @@ const fs_offsets_t *get_fs_offsets(enum FS_VER version) { return &(GET_OFFSET_STRUCT_NAME(_910)); case FS_VER_9_1_0_EXFAT: return &(GET_OFFSET_STRUCT_NAME(_910_EXFAT)); + case FS_VER_10_0_0: + return &(GET_OFFSET_STRUCT_NAME(_1000)); + case FS_VER_10_0_0_EXFAT: + return &(GET_OFFSET_STRUCT_NAME(_1000_EXFAT)); default: fatal_abort(Fatal_UnknownVersion); } diff --git a/emummc/source/FS/FS_versions.h b/emummc/source/FS/FS_versions.h index ea0f93deb..2a12f7a00 100644 --- a/emummc/source/FS/FS_versions.h +++ b/emummc/source/FS/FS_versions.h @@ -65,6 +65,9 @@ enum FS_VER FS_VER_9_1_0, FS_VER_9_1_0_EXFAT, + FS_VER_10_0_0, + FS_VER_10_0_0_EXFAT, + FS_VER_MAX, }; diff --git a/emummc/source/FS/offsets/1000.h b/emummc/source/FS/offsets/1000.h new file mode 100644 index 000000000..3c2dc673c --- /dev/null +++ b/emummc/source/FS/offsets/1000.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_1000_H__ +#define __FS_1000_H__ + +// Accessor vtable getters +#define FS_OFFSET_1000_SDMMC_ACCESSOR_GC 0x14DC90 +#define FS_OFFSET_1000_SDMMC_ACCESSOR_SD 0x14BDA0 +#define FS_OFFSET_1000_SDMMC_ACCESSOR_NAND 0x146C20 + +// Hooks +#define FS_OFFSET_1000_SDMMC_WRAPPER_READ 0x142380 +#define FS_OFFSET_1000_SDMMC_WRAPPER_WRITE 0x142460 +#define FS_OFFSET_1000_RTLD 0x634 +#define FS_OFFSET_1000_RTLD_DESTINATION 0x9C + +#define FS_OFFSET_1000_CLKRST_SET_MIN_V_CLK_RATE 0x1415A0 + +// Misc funcs +#define FS_OFFSET_1000_LOCK_MUTEX 0x28910 +#define FS_OFFSET_1000_UNLOCK_MUTEX 0x28960 + +#define FS_OFFSET_1000_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1422E0 + +// Misc Data +#define FS_OFFSET_1000_SD_MUTEX 0xE273E8 +#define FS_OFFSET_1000_NAND_MUTEX 0xE22DA0 +#define FS_OFFSET_1000_ACTIVE_PARTITION 0xE22DE0 +#define FS_OFFSET_1000_SDMMC_DAS_HANDLE 0xE0AB90 + +// NOPs +#define FS_OFFSET_1000_SD_DAS_INIT 0x151CEC + +// Nintendo Paths +#define FS_OFFSET_1000_NINTENDO_PATHS \ +{ \ + {.opcode_reg = 3, .adrp_offset = 0x0006BBA4, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 3, .adrp_offset = 0x00078520, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 3, .adrp_offset = 0x0007ED0C, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x0009115C, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \ +} + +#endif // __FS_1000_H__ diff --git a/emummc/source/FS/offsets/1000_exfat.h b/emummc/source/FS/offsets/1000_exfat.h new file mode 100644 index 000000000..cc3c212e7 --- /dev/null +++ b/emummc/source/FS/offsets/1000_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_1000_EXFAT_H__ +#define __FS_1000_EXFAT_H__ + +// Accessor vtable getters +#define FS_OFFSET_1000_EXFAT_SDMMC_ACCESSOR_GC 0x14DC90 +#define FS_OFFSET_1000_EXFAT_SDMMC_ACCESSOR_SD 0x14BDA0 +#define FS_OFFSET_1000_EXFAT_SDMMC_ACCESSOR_NAND 0x146C20 + +// Hooks +#define FS_OFFSET_1000_EXFAT_SDMMC_WRAPPER_READ 0x142380 +#define FS_OFFSET_1000_EXFAT_SDMMC_WRAPPER_WRITE 0x142460 +#define FS_OFFSET_1000_EXFAT_RTLD 0x634 +#define FS_OFFSET_1000_EXFAT_RTLD_DESTINATION 0x9C + +#define FS_OFFSET_1000_EXFAT_CLKRST_SET_MIN_V_CLK_RATE 0x1415A0 + +// Misc funcs +#define FS_OFFSET_1000_EXFAT_LOCK_MUTEX 0x28910 +#define FS_OFFSET_1000_EXFAT_UNLOCK_MUTEX 0x28960 + +#define FS_OFFSET_1000_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1422E0 + +// Misc Data +#define FS_OFFSET_1000_EXFAT_SD_MUTEX 0xE353E8 +#define FS_OFFSET_1000_EXFAT_NAND_MUTEX 0xE30DA0 +#define FS_OFFSET_1000_EXFAT_ACTIVE_PARTITION 0xE30DE0 +#define FS_OFFSET_1000_EXFAT_SDMMC_DAS_HANDLE 0xE18B90 + +// NOPs +#define FS_OFFSET_1000_EXFAT_SD_DAS_INIT 0x151CEC + +// Nintendo Paths +#define FS_OFFSET_1000_EXFAT_NINTENDO_PATHS \ +{ \ + {.opcode_reg = 3, .adrp_offset = 0x0006BBA4, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 3, .adrp_offset = 0x00078520, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 3, .adrp_offset = 0x0007ED0C, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x0009115C, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \ +} + +#endif // __FS_1000_EXFAT_H__