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

Merge pull request #6194 from TBoshoven/sdhc-off-by-one 

Off-by-one in SDHC detection
This commit is contained in:
Pierre Bourdon 2017-11-14 19:10:36 +01:00 committed by GitHub
parent 8c6465c66f 1fc7cf3cb4
commit 496c33738f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -439,7 +439,7 @@ IPCCommandResult SDIOSlot0::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() < SDHC_BYTES)
if (m_card.GetSize() <= SDSC_MAX_SIZE)
{
// No further initialization required.
m_status |= CARD_INITIALIZED;

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

@ -118,8 +118,9 @@ private:
V2,
};
// Number of bytes to trigger using SDHC instead of SDSC
static constexpr u32 SDHC_BYTES = 0x80000000;
// Maximum number of bytes in an SDSC card
// Used to trigger using SDHC instead of SDSC
static constexpr u64 SDSC_MAX_SIZE = 0x80000000;
struct Event
{