AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 21:47:42 +00:00
Code Issues Projects Releases Wiki Activity

Kabufuda updates and dolphin memory card path resolution

Browse Source
This commit is contained in:
Jack Andersen
2016-12-28 11:39:38 -10:00
parent 563ff28848
commit fe3d375120
7 changed files with 216 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Runtime/MP1/CMemoryCardDriver.cpp
View File

@@ -29,7 +29,7 @@ ECardResult CMemoryCardDriver::SFileInfo::Close()
ECardResult CMemoryCardDriver::SFileInfo::StartRead()
{
CMemoryCardSys::CardStat stat = {};
ECardResult result = CMemoryCardSys::GetStatus(GetFileCardPort(), GetFileNo(), stat);
ECardResult result = CMemoryCardSys::GetStatus(x0_fileInfo, stat);
if (result != ECardResult::READY)
return result;
@@ -78,7 +78,7 @@ ECardResult CMemoryCardDriver::SFileInfo::FileRead()
ECardResult CMemoryCardDriver::SFileInfo::GetSaveDataOffset(u32& offOut)
{
CMemoryCardSys::CardStat stat = {};
ECardResult result = CMemoryCardSys::GetStatus(GetFileCardPort(), GetFileNo(), stat);
ECardResult result = CMemoryCardSys::GetStatus(x0_fileInfo, stat);
if (result != ECardResult::READY)
{
offOut = -1;
@@ -183,7 +183,7 @@ void CMemoryCardDriver::ReadFinished()
{
CMemoryCardSys::CardStat stat = {};
SFileInfo& fileInfo = x100_mcFileInfos[x194_fileIdx].second;
if (CMemoryCardSys::GetStatus(x0_cardPort, fileInfo.GetFileNo(), stat) != ECardResult::READY)
if (CMemoryCardSys::GetStatus(fileInfo.x0_fileInfo, stat) != ECardResult::READY)
{
NoCardFound();
return;
@@ -239,7 +239,7 @@ void CMemoryCardDriver::IndexFiles()
else if (result == ECardResult::READY)
{
CMemoryCardSys::CardStat stat = {};
if (CMemoryCardSys::GetStatus(x0_cardPort, info.second.GetFileNo(), stat) ==
if (CMemoryCardSys::GetStatus(info.second.x0_fileInfo, stat) ==
ECardResult::READY)
{
u32 comment = stat.GetCommentAddr();
@@ -272,11 +272,11 @@ void CMemoryCardDriver::IndexFiles()
if (x100_mcFileInfos[1].first == EFileState::File)
{
CMemoryCardSys::CardStat stat = {};
if (CMemoryCardSys::GetStatus(x0_cardPort, x100_mcFileInfos[0].second.GetFileNo(), stat) ==
if (CMemoryCardSys::GetStatus(x100_mcFileInfos[0].second.x0_fileInfo, stat) ==
ECardResult::READY)
{
u32 timeA = stat.GetTime();
if (CMemoryCardSys::GetStatus(x0_cardPort, x100_mcFileInfos[1].second.GetFileNo(), stat) ==
if (CMemoryCardSys::GetStatus(x100_mcFileInfos[1].second.x0_fileInfo, stat) ==
ECardResult::READY)
{
u32 timeB = stat.GetTime();