ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added proper SDHC initialization to protocol v2.

This commit is contained in:
Tom Boshoven 2017-08-05 19:55:08 +02:00
parent b29c8c1a63
commit 10c615d7db
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,8 +215,7 @@ s32 SDIOSlot0::ExecuteCommand(const Request& request, u32 _BufferIn, u32 _Buffer
// If the card can operate on the supplied voltage, the response echoes back the supply // If the card can operate on the supplied voltage, the response echoes back the supply
// voltage and the check pattern that were set in the command argument. // voltage and the check pattern that were set in the command argument.
// This command is used to differentiate between protocol v1 and v2. // This command is used to differentiate between protocol v1 and v2.
m_protocol = SDProtocol::V2; InitSDHC();
m_status |= CARD_INITIALIZED;
Memory::Write_U32(req.arg, _BufferOut); Memory::Write_U32(req.arg, _BufferOut);
break; break;
@ -449,7 +448,8 @@ IPCCommandResult SDIOSlot0::GetStatus(const IOCtlRequest& request)
// Others will work if they are manually initialized (SEND_IF_COND) // Others will work if they are manually initialized (SEND_IF_COND)
if (m_sdhc_supported) if (m_sdhc_supported)
{ {
m_status |= CARD_INITIALIZED; // All of the initialization is done internally by IOS, so we get to skip some steps.
InitSDHC();
} }
m_status |= CARD_SDHC; m_status |= CARD_SDHC;
} }
@ -645,6 +645,12 @@ u64 SDIOSlot0::GetAddressFromRequest(u32 arg) const
return address; return address;
} }
void SDIOSlot0::InitSDHC()
{
m_protocol = SDProtocol::V2;
m_status |= CARD_INITIALIZED;
}
} // namespace Device } // namespace Device
} // namespace HLE } // namespace HLE
} // namespace IOS } // namespace IOS

1
Source/Core/Core/IOS/SDIO/SDIOSlot0.h
View File

@ -147,6 +147,7 @@ private:
std::array<u32, 4> GetCSDv1(); std::array<u32, 4> GetCSDv1();
std::array<u32, 4> GetCSDv2(); std::array<u32, 4> GetCSDv2();
void InitSDHC();
u64 GetAddressFromRequest(u32 arg) const; u64 GetAddressFromRequest(u32 arg) const;