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

GCMemcard: Use BigEndianValue for Header.m_size_mb.

This commit is contained in:
Admiral H. Curtiss 2018-11-18 16:56:16 +01:00
parent bfbfcc72a2
commit 8eabcbf294
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,7 +93,7 @@ GCMemcard::GCMemcard(const std::string& filename, bool forceCreation, bool shift
PanicAlertT("Failed to read header correctly\n(0x0000-0x1FFF)"); PanicAlertT("Failed to read header correctly\n(0x0000-0x1FFF)");
return; return;
} }
if (m_sizeMb != BE16(hdr.m_size_mb)) if (m_sizeMb != hdr.m_size_mb)
{ {
PanicAlertT("Memory card file size does not match the header size"); PanicAlertT("Memory card file size does not match the header size");
return; return;

18
Source/Core/Core/HW/GCMemcard/GCMemcard.h
View File

@ -109,14 +109,14 @@ struct Header // Offset Size Description
u8 m_unknown_2[4]; // 0x001c 4 ? almost always 0 u8 m_unknown_2[4]; // 0x001c 4 ? almost always 0
// end Serial in libogc // end Serial in libogc
Common::BigEndianValue<u16> Common::BigEndianValue<u16>
m_device_id; // 0x0020 2 0 if formated in slot A 1 if formated in slot B m_device_id; // 0x0020 2 0 if formated in slot A 1 if formated in slot B
u8 m_size_mb[2]; // 0x0022 2 Size of memcard in Mbits Common::BigEndianValue<u16> m_size_mb; // 0x0022 2 Size of memcard in Mbits
u16 m_encoding; // 0x0024 2 Encoding (Windows-1252 or Shift JIS) u16 m_encoding; // 0x0024 2 Encoding (Windows-1252 or Shift JIS)
u8 m_unused_1[468]; // 0x0026 468 Unused (0xff) u8 m_unused_1[468]; // 0x0026 468 Unused (0xff)
u16 m_update_counter; // 0x01fa 2 Update Counter (?, probably unused) u16 m_update_counter; // 0x01fa 2 Update Counter (?, probably unused)
u16 m_checksum; // 0x01fc 2 Additive Checksum u16 m_checksum; // 0x01fc 2 Additive Checksum
u16 m_checksum_inv; // 0x01fe 2 Inverse Checksum u16 m_checksum_inv; // 0x01fe 2 Inverse Checksum
u8 m_unused_2[7680]; // 0x0200 0x1e00 Unused (0xff) u8 m_unused_2[7680]; // 0x0200 0x1e00 Unused (0xff)
void CARD_GetSerialNo(u32* serial1, u32* serial2) const void CARD_GetSerialNo(u32* serial1, u32* serial2) const
{ {
@ -137,7 +137,7 @@ struct Header // Offset Size Description
explicit Header(int slot = 0, u16 sizeMb = MemCard2043Mb, bool shift_jis = false) explicit Header(int slot = 0, u16 sizeMb = MemCard2043Mb, bool shift_jis = false)
{ {
memset(this, 0xFF, BLOCK_SIZE); memset(this, 0xFF, BLOCK_SIZE);
*(u16*)m_size_mb = BE16(sizeMb); m_size_mb = sizeMb;
m_encoding = BE16(shift_jis ? 1 : 0); m_encoding = BE16(shift_jis ? 1 : 0);
u64 rand = Common::Timer::GetLocalTimeSinceJan1970() - ExpansionInterface::CEXIIPL::GC_EPOCH; u64 rand = Common::Timer::GetLocalTimeSinceJan1970() - ExpansionInterface::CEXIIPL::GC_EPOCH;
m_format_time = rand; m_format_time = rand;

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

@ -89,7 +89,7 @@ int GCMemcardDirectory::LoadGCI(const std::string& file_name, bool current_game_
{ {
return NO_INDEX; return NO_INDEX;
} }
int total_blocks = BE16(m_hdr.m_size_mb) * MBIT_TO_BLOCKS - MC_FST_BLOCKS; int total_blocks = m_hdr.m_size_mb * MBIT_TO_BLOCKS - MC_FST_BLOCKS;
int free_blocks = BE16(m_bat1.m_free_blocks); int free_blocks = BE16(m_bat1.m_free_blocks);
if (total_blocks > free_blocks * 10) if (total_blocks > free_blocks * 10)
{ {