ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MemoryCard: Fix reading in games

This commit is contained in:
Connor McLaughlin 2019-09-30 14:22:57 +10:00
parent 1667da66dd
commit 68883168cd
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/pse/memory_card.cpp
View File

@ -24,7 +24,7 @@ bool MemoryCard::DoState(StateWrapper& sw)
sw.Do(&m_checksum); sw.Do(&m_checksum);
sw.Do(&m_last_byte); sw.Do(&m_last_byte);
sw.Do(&m_data); sw.Do(&m_data);
return !sw.HasError(); return !sw.HasError();
} }
@ -112,7 +112,7 @@ bool MemoryCard::Transfer(const u8 data_in, u8* data_out)
break; break;
FIXED_REPLY_STATE(State::ReadChecksum, m_checksum, true, State::ReadEnd); FIXED_REPLY_STATE(State::ReadChecksum, m_checksum, true, State::ReadEnd);
FIXED_REPLY_STATE(State::ReadEnd, 0x47, false, State::Idle); FIXED_REPLY_STATE(State::ReadEnd, 0x47, true, State::Idle);
// write state // write state
@ -127,6 +127,7 @@ bool MemoryCard::Transfer(const u8 data_in, u8* data_out)
{ {
Log_DevPrintf("Writing memory card sector %u", ZeroExtend32(m_address)); Log_DevPrintf("Writing memory card sector %u", ZeroExtend32(m_address));
m_checksum = Truncate8(m_address >> 8) ^ Truncate8(m_address) ^ data_in; m_checksum = Truncate8(m_address >> 8) ^ Truncate8(m_address) ^ data_in;
m_FLAG.no_write_yet = false;
} }
else else
{ {
@ -149,21 +150,25 @@ bool MemoryCard::Transfer(const u8 data_in, u8* data_out)
FIXED_REPLY_STATE(State::WriteChecksum, m_checksum, true, State::WriteACK1); FIXED_REPLY_STATE(State::WriteChecksum, m_checksum, true, State::WriteACK1);
FIXED_REPLY_STATE(State::WriteACK1, 0x5C, true, State::WriteACK2); FIXED_REPLY_STATE(State::WriteACK1, 0x5C, true, State::WriteACK2);
FIXED_REPLY_STATE(State::WriteACK2, 0x5D, true, State::WriteEnd); FIXED_REPLY_STATE(State::WriteACK2, 0x5D, true, State::WriteEnd);
FIXED_REPLY_STATE(State::WriteEnd, 0x47, false, State::Idle); FIXED_REPLY_STATE(State::WriteEnd, 0x47, true, State::Idle);
// new command // new command
case State::Idle: case State::Idle:
{
// select device
if (data_in == 0x81)
{
*data_out = 0xFF;
ack = true;
m_state = State::Command;
}
}
break;
case State::Command:
{ {
switch (data_in) switch (data_in)
{ {
case 0x81: // tests if the controller is present
{
// response is hi-z
*data_out = 0xFF;
ack = true;
}
break;
case 0x52: // read data case 0x52: // read data
{ {
*data_out = m_FLAG.bits; *data_out = m_FLAG.bits;
@ -188,8 +193,10 @@ bool MemoryCard::Transfer(const u8 data_in, u8* data_out)
default: default:
{ {
Log_ErrorPrintf("Invalid command 0x%02X", ZeroExtend32(data_in));
*data_out = m_FLAG.bits; *data_out = m_FLAG.bits;
ack = false; ack = false;
m_state = State::Idle;
} }
} }
} }

1
src/pse/memory_card.h
View File

@ -41,6 +41,7 @@ private:
enum class State : u8 enum class State : u8
{ {
Idle, Idle,
Command,
ReadCardID1, ReadCardID1,
ReadCardID2, ReadCardID2,