dspico/pico-loader
0
0
Fork 0
mirror of https://github.com/LNH-team/pico-loader.git synced 2026-01-09 16:28:35 -08:00
Code Issues Packages Projects Releases Wiki Activity

Added extra check to see if Sdk5DsiSdCardRedirectPatch can be applied

Browse Source 
This ensures an error is given in roms such as wrfu
This commit is contained in:
Gericom
2025-12-05 19:19:58 +01:00
parent e9a8c09a35
commit d12036e6a7
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arm9/source/patches/arm7/sdk5/Sdk5DsiSdCardRedirectPatch.cpp
View File

@@ -6,6 +6,8 @@
static const u32 sAttachFunctionPattern[] = { 0xE92D4018u, 0xE24DDF5Du, 0xE24DDB01u, 0xE59FE050u }; static const u32 sAttachFunctionPattern[] = { 0xE92D4018u, 0xE24DDF5Du, 0xE24DDB01u, 0xE59FE050u };
static const u32 sAttachFunctionPatternThumb[] = { 0xB0FFB518u, 0xB0DFB0FFu, 0x4A0E490Du, 0x64CA4469u }; static const u32 sAttachFunctionPatternThumb[] = { 0xB0FFB518u, 0xB0DFB0FFu, 0x4A0E490Du, 0x64CA4469u };
#define BL_TO_GET_DRIVE_STRUCT_OFFSET (-0x20)
bool Sdk5DsiSdCardRedirectPatch::FindPatchTarget(PatchContext& patchContext) bool Sdk5DsiSdCardRedirectPatch::FindPatchTarget(PatchContext& patchContext)
{ {
_attachFunction = patchContext.FindPattern32Twl(sAttachFunctionPattern, sizeof(sAttachFunctionPattern)); _attachFunction = patchContext.FindPattern32Twl(sAttachFunctionPattern, sizeof(sAttachFunctionPattern));
@@ -20,6 +22,11 @@ bool Sdk5DsiSdCardRedirectPatch::FindPatchTarget(PatchContext& patchContext)
if (_attachFunction) if (_attachFunction)
{ {
LOG_DEBUG("Found FATFSi_sdmcRtfsAttach at %p\n", _attachFunction); LOG_DEBUG("Found FATFSi_sdmcRtfsAttach at %p\n", _attachFunction);
if (!_thumb && (*(u32*)((u8*)_attachFunction + BL_TO_GET_DRIVE_STRUCT_OFFSET) >> 24) != 0xEB)
{
LOG_WARNING("Unsupported arm7 version for SD redirection patches\n");
_attachFunction = nullptr;
}
} }
else else
{ {
@@ -50,11 +57,11 @@ void Sdk5DsiSdCardRedirectPatch::ApplyPatch(PatchContext& patchContext)
u32 getDriveStructAddress; u32 getDriveStructAddress;
if (_thumb) if (_thumb)
{ {
getDriveStructAddress = getThumbBlAddress((u32*)((u8*)_attachFunction - 0x20)); getDriveStructAddress = getThumbBlAddress((u32*)((u8*)_attachFunction + BL_TO_GET_DRIVE_STRUCT_OFFSET));
} }
else else
{ {
getDriveStructAddress = getArmBlAddress((u32*)((u8*)_attachFunction - 0x20)); getDriveStructAddress = getArmBlAddress((u32*)((u8*)_attachFunction + BL_TO_GET_DRIVE_STRUCT_OFFSET));
} }
auto sdRead = patchContext.GetLoaderPlatform()->CreateSdReadPatchCode( auto sdRead = patchContext.GetLoaderPlatform()->CreateSdReadPatchCode(