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 #8880 from AdmiralCurtiss/gcmemcard-sketchy-code-cleanup 

Sketchy code cleanup in GCMemcard and GCMemcardDirectory.
This commit is contained in:
Léo Lam 2020-10-21 23:13:22 +02:00 committed by GitHub
parent a8b7c3b577 b175c203e4
commit e553197c67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Core/Core/HW/GCMemcard/GCMemcard.cpp
View File

@ -1373,16 +1373,17 @@ bool GCMemcard::Format(u8* card_data, const CardFlashId& flash_id, u16 size_mbit
{ {
if (!card_data) if (!card_data)
return false; return false;
memset(card_data, 0xFF, BLOCK_SIZE * 3);
memset(card_data + BLOCK_SIZE * 3, 0, BLOCK_SIZE * 2);
*((Header*)card_data) = Header header(flash_id, size_mbits, shift_jis, rtc_bias, sram_language, format_time);
Header(flash_id, size_mbits, shift_jis, rtc_bias, sram_language, format_time); Directory dir;
BlockAlloc bat(size_mbits);
std::memcpy(&card_data[BLOCK_SIZE * 0], &header, BLOCK_SIZE);
std::memcpy(&card_data[BLOCK_SIZE * 1], &dir, BLOCK_SIZE);
std::memcpy(&card_data[BLOCK_SIZE * 2], &dir, BLOCK_SIZE);
std::memcpy(&card_data[BLOCK_SIZE * 3], &bat, BLOCK_SIZE);
std::memcpy(&card_data[BLOCK_SIZE * 4], &bat, BLOCK_SIZE);
*((Directory*)(card_data + BLOCK_SIZE)) = Directory();
*((Directory*)(card_data + BLOCK_SIZE * 2)) = Directory();
*((BlockAlloc*)(card_data + BLOCK_SIZE * 3)) = BlockAlloc(size_mbits);
*((BlockAlloc*)(card_data + BLOCK_SIZE * 4)) = BlockAlloc(size_mbits);
return true; return true;
} }

5
Source/Core/Core/HW/GCMemcard/GCMemcardDirectory.cpp
View File

@ -430,7 +430,7 @@ void GCMemcardDirectory::ClearBlock(u32 address)
if (m_last_block == -1) if (m_last_block == -1)
return; return;
} }
((Memcard::GCMBlock*)m_last_block_address)->Erase(); std::memset(m_last_block_address, 0xFF, Memcard::BLOCK_SIZE);
} }
inline void GCMemcardDirectory::SyncSaves() inline void GCMemcardDirectory::SyncSaves()
@ -629,7 +629,8 @@ void GCMemcardDirectory::FlushToFile()
if (gci) if (gci)
{ {
gci.WriteBytes(&save.m_gci_header, Memcard::DENTRY_SIZE); gci.WriteBytes(&save.m_gci_header, Memcard::DENTRY_SIZE);
gci.WriteBytes(save.m_save_data.data(), Memcard::BLOCK_SIZE * save.m_save_data.size()); for (const Memcard::GCMBlock& block : save.m_save_data)
gci.WriteBytes(block.m_block.data(), Memcard::BLOCK_SIZE);
if (gci.IsGood()) if (gci.IsGood())
{ {