From 06b4738d54b00cb2485aaaa7f005e8af2ea6e0e5 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Wed, 22 Feb 2023 18:24:51 -0700 Subject: [PATCH] emummc: re-update for 16.0.0 --- emummc/README.md | 2 +- emummc/source/FS/FS_offsets.c | 8 ++++ emummc/source/FS/FS_versions.h | 3 ++ emummc/source/FS/offsets/1600.h | 59 +++++++++++++++++++++++++++ emummc/source/FS/offsets/1600_exfat.h | 59 +++++++++++++++++++++++++++ 5 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 emummc/source/FS/offsets/1600.h create mode 100644 emummc/source/FS/offsets/1600_exfat.h diff --git a/emummc/README.md b/emummc/README.md index 2270f4e36..4b98ee741 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 - 15.0.0** +**1.0.0 - 16.0.0** ## Features * Arbitrary SDMMC backend selection diff --git a/emummc/source/FS/FS_offsets.c b/emummc/source/FS/FS_offsets.c index 1158f284c..59000dece 100644 --- a/emummc/source/FS/FS_offsets.c +++ b/emummc/source/FS/FS_offsets.c @@ -63,6 +63,8 @@ #include "offsets/1400_exfat.h" #include "offsets/1500.h" #include "offsets/1500_exfat.h" +#include "offsets/1600.h" +#include "offsets/1600_exfat.h" #include "../utils/fatal.h" #define GET_OFFSET_STRUCT_NAME(vers) g_offsets##vers @@ -137,6 +139,8 @@ DEFINE_OFFSET_STRUCT(_1400); DEFINE_OFFSET_STRUCT(_1400_EXFAT); DEFINE_OFFSET_STRUCT(_1500); DEFINE_OFFSET_STRUCT(_1500_EXFAT); +DEFINE_OFFSET_STRUCT(_1600); +DEFINE_OFFSET_STRUCT(_1600_EXFAT); const fs_offsets_t *get_fs_offsets(enum FS_VER version) { switch (version) { @@ -234,6 +238,10 @@ const fs_offsets_t *get_fs_offsets(enum FS_VER version) { return &(GET_OFFSET_STRUCT_NAME(_1500)); case FS_VER_15_0_0_EXFAT: return &(GET_OFFSET_STRUCT_NAME(_1500_EXFAT)); + case FS_VER_16_0_0: + return &(GET_OFFSET_STRUCT_NAME(_1600)); + case FS_VER_16_0_0_EXFAT: + return &(GET_OFFSET_STRUCT_NAME(_1600_EXFAT)); default: fatal_abort(Fatal_UnknownVersion); } diff --git a/emummc/source/FS/FS_versions.h b/emummc/source/FS/FS_versions.h index c050141ff..23786d013 100644 --- a/emummc/source/FS/FS_versions.h +++ b/emummc/source/FS/FS_versions.h @@ -92,6 +92,9 @@ enum FS_VER FS_VER_15_0_0, FS_VER_15_0_0_EXFAT, + FS_VER_16_0_0, + FS_VER_16_0_0_EXFAT, + FS_VER_MAX, }; diff --git a/emummc/source/FS/offsets/1600.h b/emummc/source/FS/offsets/1600.h new file mode 100644 index 000000000..9491e8f02 --- /dev/null +++ b/emummc/source/FS/offsets/1600.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_1600_H__ +#define __FS_1600_H__ + +// Accessor vtable getters +#define FS_OFFSET_1600_SDMMC_ACCESSOR_GC 0x1862A0 +#define FS_OFFSET_1600_SDMMC_ACCESSOR_SD 0x187F20 +#define FS_OFFSET_1600_SDMMC_ACCESSOR_NAND 0x186760 + +// Hooks +#define FS_OFFSET_1600_SDMMC_WRAPPER_READ 0x1821F0 +#define FS_OFFSET_1600_SDMMC_WRAPPER_WRITE 0x182250 +#define FS_OFFSET_1600_RTLD 0x269B0 +#define FS_OFFSET_1600_RTLD_DESTINATION ((uintptr_t)(INT64_C(-0x3C))) + +#define FS_OFFSET_1600_CLKRST_SET_MIN_V_CLK_RATE 0x1A2D30 + +// Misc funcs +#define FS_OFFSET_1600_LOCK_MUTEX 0x17B730 +#define FS_OFFSET_1600_UNLOCK_MUTEX 0x17B780 + +#define FS_OFFSET_1600_SDMMC_WRAPPER_CONTROLLER_OPEN 0x1821B0 +#define FS_OFFSET_1600_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1821D0 + +// Misc Data +#define FS_OFFSET_1600_SD_MUTEX 0xFFB3F0 +#define FS_OFFSET_1600_NAND_MUTEX 0xFF6B58 +#define FS_OFFSET_1600_ACTIVE_PARTITION 0xFF6B98 +#define FS_OFFSET_1600_SDMMC_DAS_HANDLE 0xFDC8B0 + +// NOPs +#define FS_OFFSET_1600_SD_DAS_INIT 0x258D4 + +// Nintendo Paths +#define FS_OFFSET_1600_NINTENDO_PATHS \ +{ \ + {.opcode_reg = 3, .adrp_offset = 0x00063B48, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 3, .adrp_offset = 0x00070D6C, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x0007790C, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x0008A754, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \ +} + +#endif // __FS_1600_H__ diff --git a/emummc/source/FS/offsets/1600_exfat.h b/emummc/source/FS/offsets/1600_exfat.h new file mode 100644 index 000000000..6d5c59c6e --- /dev/null +++ b/emummc/source/FS/offsets/1600_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_1600_EXFAT_H__ +#define __FS_1600_EXFAT_H__ + +// Accessor vtable getters +#define FS_OFFSET_1600_EXFAT_SDMMC_ACCESSOR_GC 0x190F80 +#define FS_OFFSET_1600_EXFAT_SDMMC_ACCESSOR_SD 0x192C00 +#define FS_OFFSET_1600_EXFAT_SDMMC_ACCESSOR_NAND 0x191440 + +// Hooks +#define FS_OFFSET_1600_EXFAT_SDMMC_WRAPPER_READ 0x18CED0 +#define FS_OFFSET_1600_EXFAT_SDMMC_WRAPPER_WRITE 0x18CF30 +#define FS_OFFSET_1600_EXFAT_RTLD 0x269B0 +#define FS_OFFSET_1600_EXFAT_RTLD_DESTINATION ((uintptr_t)(INT64_C(-0x3C))) + +#define FS_OFFSET_1600_EXFAT_CLKRST_SET_MIN_V_CLK_RATE 0x1ADA10 + +// Misc funcs +#define FS_OFFSET_1600_EXFAT_LOCK_MUTEX 0x186410 +#define FS_OFFSET_1600_EXFAT_UNLOCK_MUTEX 0x186460 + +#define FS_OFFSET_1600_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN 0x18CE90 +#define FS_OFFSET_1600_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x18CEB0 + +// Misc Data +#define FS_OFFSET_1600_EXFAT_SD_MUTEX 0x100D3F0 +#define FS_OFFSET_1600_EXFAT_NAND_MUTEX 0x1008B58 +#define FS_OFFSET_1600_EXFAT_ACTIVE_PARTITION 0x1008B98 +#define FS_OFFSET_1600_EXFAT_SDMMC_DAS_HANDLE 0xFE98B0 + +// NOPs +#define FS_OFFSET_1600_EXFAT_SD_DAS_INIT 0x258D4 + +// Nintendo Paths +#define FS_OFFSET_1600_EXFAT_NINTENDO_PATHS \ +{ \ + {.opcode_reg = 3, .adrp_offset = 0x00063B48, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 3, .adrp_offset = 0x00070D6C, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x0007790C, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x0008A754, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \ +} + +#endif // __FS_1600_EXFAT_H__