dahjah/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-12-16 04:09:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SDIO: Remove file "good" checks so errors are properly produced.

Browse Source
This commit is contained in:
Jordan Woyak 2025-11-19 20:13:33 -06:00
parent f1f8b0a825
commit 1a71f0fa2e
1 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp
View File

@ -284,8 +284,6 @@ s32 SDIOSlot0Device::ExecuteCommand(const Request& request, u32 buffer_in, u32 b
INFO_LOG_FMT(IOS_SD, "{}Read {} Block(s) from {:#010x} bsize {} into {:#010x}!",
req.isDMA ? "DMA " : "", req.blocks, req.arg, req.bsize, req.addr);
if (m_card)
{
const u32 size = req.bsize * req.blocks;
const u64 address = GetAddressFromRequest(req.arg);
@ -303,7 +301,6 @@ s32 SDIOSlot0Device::ExecuteCommand(const Request& request, u32 buffer_in, u32 b
ret = RET_FAIL;
}
}
}
memory.Write_U32(0x900, buffer_out);
break;
@ -319,7 +316,7 @@ s32 SDIOSlot0Device::ExecuteCommand(const Request& request, u32 buffer_in, u32 b
ERROR_LOG_FMT(IOS_SD, "Write attempted while locked.");
ret = RET_LOCKED;
}
else if (m_card)
else
{
const u32 size = req.bsize * req.blocks;
const u64 address = GetAddressFromRequest(req.arg);
@ -475,8 +472,6 @@ std::optional<IPCReply> SDIOSlot0Device::SendCommand(const IOCtlRequest& request
IPCReply SDIOSlot0Device::GetStatus(const IOCtlRequest& request)
{
// Since IOS does the SD initialization itself, we just say we're always initialized.
if (m_card)
{
if (m_card.GetSize() <= SDSC_MAX_SIZE)
{
// No further initialization required.
@ -493,7 +488,6 @@ IPCReply SDIOSlot0Device::GetStatus(const IOCtlRequest& request)
}
m_status |= CARD_SDHC;
}
}
// Evaluate whether a card is currently inserted (config value).
// Make sure we don't modify m_status so we don't lose track of whether the card is SDHC.