Skip to content

Fix SD multiblock writes and FIFO32 writes #2387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shinyquagsire23 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix SD multiblock writes and FIFO32 writes #2387

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/DSi_SD.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ u32 DSi_SDHost::DataTX(u8* data, u32 len)
{
if (DataFIFO32.IsEmpty())
{
SetIRQ(25);
SetIRQ(25); // SD_STATUS_TX_REQ
DSi.CheckNDMAs(1, Num ? 0x29 : 0x28);
}
return 0;
Expand Down Expand Up @@ -722,6 +722,7 @@ void DSi_SDHost::Write(u32 addr, u16 val)
// dunno
case 0x106: return;
case 0x10A: return;
case 0x10C: WriteFIFO32(val); return;
}

Log(LogLevel::Warn, "unknown %s write %08X %04X\n", SD_DESC, addr, val);
Expand Down Expand Up @@ -987,8 +988,7 @@ void DSi_MMCStorage::SendCMD(u8 cmd, u32 param)
RWAddress <<= 9;
BlockSize = 512;
}
if (cmd == 25)
RWCommand = 25;
RWCommand = cmd;
Host->SendResponse(CSR, true);
RWAddress += WriteBlock(RWAddress);
SetState(0x04);
Expand Down Expand Up @@ -1054,6 +1054,7 @@ void DSi_MMCStorage::ContinueTransfer()
len = ReadBlock(RWAddress);
break;

case 24:
case 25:
len = WriteBlock(RWAddress);
break;
Expand Down
Loading