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
commit 496c33738f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions

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. // Since IOS does the SD initialization itself, we just say we're always initialized.
if (m_card) if (m_card)
{ {
if (m_card.GetSize() < SDHC_BYTES) if (m_card.GetSize() <= SDSC_MAX_SIZE)
{ {
// No further initialization required. // No further initialization required.
m_status |= CARD_INITIALIZED; m_status |= CARD_INITIALIZED;

View File

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