From 90b54c03b33e2f09438cad148115f11d3572ce28 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Tue, 8 Jun 2021 07:50:35 -0700 Subject: [PATCH] git subrepo pull emummc subrepo: subdir: "emummc" merged: "219c723c" upstream: origin: "https://github.com/m4xw/emuMMC" branch: "develop" commit: "219c723c" git-subrepo: version: "0.4.1" origin: "???" commit: "???" --- emummc/.gitrepo | 4 +- emummc/source/FS/FS_offsets.c | 8 ++++ emummc/source/FS/FS_versions.h | 3 ++ emummc/source/FS/offsets/1203.h | 60 +++++++++++++++++++++++++++ emummc/source/FS/offsets/1203_exfat.h | 60 +++++++++++++++++++++++++++ 5 files changed, 133 insertions(+), 2 deletions(-) create mode 100644 emummc/source/FS/offsets/1203.h create mode 100644 emummc/source/FS/offsets/1203_exfat.h diff --git a/emummc/.gitrepo b/emummc/.gitrepo index b0c176ad2..9005f6b02 100644 --- a/emummc/.gitrepo +++ b/emummc/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/m4xw/emuMMC branch = develop - commit = c6717b9320247d3ec81b372adae5e5623be7d16b - parent = bf8de39e694dc64431180bc513ce110f07fc3531 + commit = 219c723c3001fbc33d47840ceceb83cf39a1d218 + parent = 7821241356c2f6b159945babf657ffd921957918 method = rebase cmdver = 0.4.1 diff --git a/emummc/source/FS/FS_offsets.c b/emummc/source/FS/FS_offsets.c index e36f6ea82..6165926aa 100644 --- a/emummc/source/FS/FS_offsets.c +++ b/emummc/source/FS/FS_offsets.c @@ -53,6 +53,8 @@ #include "offsets/1100_exfat.h" #include "offsets/1200.h" #include "offsets/1200_exfat.h" +#include "offsets/1203.h" +#include "offsets/1203_exfat.h" #include "../utils/fatal.h" #define GET_OFFSET_STRUCT_NAME(vers) g_offsets##vers @@ -117,6 +119,8 @@ DEFINE_OFFSET_STRUCT(_1100); DEFINE_OFFSET_STRUCT(_1100_EXFAT); DEFINE_OFFSET_STRUCT(_1200); DEFINE_OFFSET_STRUCT(_1200_EXFAT); +DEFINE_OFFSET_STRUCT(_1203); +DEFINE_OFFSET_STRUCT(_1203_EXFAT); const fs_offsets_t *get_fs_offsets(enum FS_VER version) { switch (version) { @@ -194,6 +198,10 @@ const fs_offsets_t *get_fs_offsets(enum FS_VER version) { return &(GET_OFFSET_STRUCT_NAME(_1200)); case FS_VER_12_0_0_EXFAT: return &(GET_OFFSET_STRUCT_NAME(_1200_EXFAT)); + case FS_VER_12_0_3: + return &(GET_OFFSET_STRUCT_NAME(_1203)); + case FS_VER_12_0_3_EXFAT: + return &(GET_OFFSET_STRUCT_NAME(_1203_EXFAT)); default: fatal_abort(Fatal_UnknownVersion); } diff --git a/emummc/source/FS/FS_versions.h b/emummc/source/FS/FS_versions.h index 401112530..825d1a636 100644 --- a/emummc/source/FS/FS_versions.h +++ b/emummc/source/FS/FS_versions.h @@ -77,6 +77,9 @@ enum FS_VER FS_VER_12_0_0, FS_VER_12_0_0_EXFAT, + FS_VER_12_0_3, + FS_VER_12_0_3_EXFAT, + FS_VER_MAX, }; diff --git a/emummc/source/FS/offsets/1203.h b/emummc/source/FS/offsets/1203.h new file mode 100644 index 000000000..13aafa642 --- /dev/null +++ b/emummc/source/FS/offsets/1203.h @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2019 m4xw + * Copyright (c) 2019 Atmosphere-NX + * Copyright (c) 2021 CTCaer + * + * 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_1203_H__ +#define __FS_1203_H__ + +// Accessor vtable getters +#define FS_OFFSET_1203_SDMMC_ACCESSOR_GC 0x1550E0 +#define FS_OFFSET_1203_SDMMC_ACCESSOR_SD 0x156EF0 +#define FS_OFFSET_1203_SDMMC_ACCESSOR_NAND 0x155610 + +// Hooks +#define FS_OFFSET_1203_SDMMC_WRAPPER_READ 0x150A80 +#define FS_OFFSET_1203_SDMMC_WRAPPER_WRITE 0x150B40 +#define FS_OFFSET_1203_RTLD 0x688 +#define FS_OFFSET_1203_RTLD_DESTINATION ((uintptr_t)(INT64_C(-0x3C))) + +#define FS_OFFSET_1203_CLKRST_SET_MIN_V_CLK_RATE 0x14FDD0 + +// Misc funcs +#define FS_OFFSET_1203_LOCK_MUTEX 0x29350 +#define FS_OFFSET_1203_UNLOCK_MUTEX 0x293A0 + +#define FS_OFFSET_1203_SDMMC_WRAPPER_CONTROLLER_OPEN 0x150960 +#define FS_OFFSET_1203_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1509F0 + +// Misc Data +#define FS_OFFSET_1203_SD_MUTEX 0xE3D3E8 +#define FS_OFFSET_1203_NAND_MUTEX 0xE38768 +#define FS_OFFSET_1203_ACTIVE_PARTITION 0xE387A8 +#define FS_OFFSET_1203_SDMMC_DAS_HANDLE 0xE20DB0 + +// NOPs +#define FS_OFFSET_1203_SD_DAS_INIT 0x27244 + +// Nintendo Paths +#define FS_OFFSET_1203_NINTENDO_PATHS \ +{ \ + {.opcode_reg = 3, .adrp_offset = 0x0006E920, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 3, .adrp_offset = 0x0007AFD0, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x00081364, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x00092960, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \ +} + +#endif // __FS_1203_H__ diff --git a/emummc/source/FS/offsets/1203_exfat.h b/emummc/source/FS/offsets/1203_exfat.h new file mode 100644 index 000000000..016a1c4e0 --- /dev/null +++ b/emummc/source/FS/offsets/1203_exfat.h @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2019 m4xw + * Copyright (c) 2019 Atmosphere-NX + * Copyright (c) 2021 CTCaer + * + * 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_1203_EXFAT_H__ +#define __FS_1203_EXFAT_H__ + +// Accessor vtable getters +#define FS_OFFSET_1203_EXFAT_SDMMC_ACCESSOR_GC 0x1550E0 +#define FS_OFFSET_1203_EXFAT_SDMMC_ACCESSOR_SD 0x156EF0 +#define FS_OFFSET_1203_EXFAT_SDMMC_ACCESSOR_NAND 0x155610 + +// Hooks +#define FS_OFFSET_1203_EXFAT_SDMMC_WRAPPER_READ 0x150A80 +#define FS_OFFSET_1203_EXFAT_SDMMC_WRAPPER_WRITE 0x150B40 +#define FS_OFFSET_1203_EXFAT_RTLD 0x688 +#define FS_OFFSET_1203_EXFAT_RTLD_DESTINATION ((uintptr_t)(INT64_C(-0x3C))) + +#define FS_OFFSET_1203_EXFAT_CLKRST_SET_MIN_V_CLK_RATE 0x14FDD0 + +// Misc funcs +#define FS_OFFSET_1203_EXFAT_LOCK_MUTEX 0x29350 +#define FS_OFFSET_1203_EXFAT_UNLOCK_MUTEX 0x293A0 + +#define FS_OFFSET_1203_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN 0x150960 +#define FS_OFFSET_1203_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1509F0 + +// Misc Data +#define FS_OFFSET_1203_EXFAT_SD_MUTEX 0xE4B3E8 +#define FS_OFFSET_1203_EXFAT_NAND_MUTEX 0xE46768 +#define FS_OFFSET_1203_EXFAT_ACTIVE_PARTITION 0xE467A8 +#define FS_OFFSET_1203_EXFAT_SDMMC_DAS_HANDLE 0xE2EDB0 + +// NOPs +#define FS_OFFSET_1203_EXFAT_SD_DAS_INIT 0x27244 + +// Nintendo Paths +#define FS_OFFSET_1203_EXFAT_NINTENDO_PATHS \ +{ \ + {.opcode_reg = 3, .adrp_offset = 0x0006E920, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 3, .adrp_offset = 0x0007AFD0, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x00081364, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x00092960, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \ +} + +#endif // __FS_1203_EXFAT_H__