AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 05:07:43 +00:00
Code Issues Projects Releases Wiki Activity

Some memory card fixes, CToken assign fix

Browse Source
This commit is contained in:
Jack Andersen
2017-02-02 20:23:09 -10:00
parent 75324e2ba6
commit e30ec98b6e
7 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Runtime/MP1/CMemoryCardDriver.cpp
View File

@@ -498,6 +498,7 @@ void CMemoryCardDriver::StartCardFormat()
void CMemoryCardDriver::UpdateMountCard(ECardResult result)
{
printf("MOUNTCARD\n");
switch (result)
{
case ECardResult::READY:
@@ -517,6 +518,7 @@ void CMemoryCardDriver::UpdateMountCard(ECardResult result)
void CMemoryCardDriver::UpdateCardProbe()
{
printf("PROBECARD\n");
auto result = CMemoryCardSys::CardProbe(x0_cardPort);
switch (result.x0_error)
{
@@ -544,6 +546,7 @@ void CMemoryCardDriver::UpdateCardProbe()
void CMemoryCardDriver::UpdateCardCheck(ECardResult result)
{
printf("CARDCHECK\n");
switch (result)
{
case ECardResult::READY:
@@ -565,6 +568,7 @@ void CMemoryCardDriver::UpdateCardCheck(ECardResult result)
void CMemoryCardDriver::UpdateFileDeleteBad(ECardResult result)
{
printf("DELETEBAD\n");
if (result == ECardResult::READY)
{
x100_mcFileInfos[x194_fileIdx].first = EFileState::NoFile;
@@ -587,6 +591,7 @@ void CMemoryCardDriver::UpdateFileDeleteBad(ECardResult result)
void CMemoryCardDriver::UpdateFileRead(ECardResult result)
{
printf("FILEREAD\n");
if (result == ECardResult::READY)
{
auto& fileInfo = x100_mcFileInfos[x194_fileIdx];
@@ -631,6 +636,7 @@ void CMemoryCardDriver::UpdateFileRead(ECardResult result)
void CMemoryCardDriver::UpdateFileDeleteAlt(ECardResult result)
{
printf("DELETEALT\n");
if (result == ECardResult::READY)
{
x10_state = EState::Ready;
@@ -643,6 +649,7 @@ void CMemoryCardDriver::UpdateFileDeleteAlt(ECardResult result)
void CMemoryCardDriver::UpdateFileCreate(ECardResult result)
{
printf("FILECREATE\n");
if (result == ECardResult::READY)
{
x10_state = EState::FileCreateDone;
@@ -654,6 +661,7 @@ void CMemoryCardDriver::UpdateFileCreate(ECardResult result)
void CMemoryCardDriver::UpdateFileWrite(ECardResult result)
{
printf("FILEWRITE\n");
if (result == ECardResult::READY)
{
ECardResult xferResult = x198_fileInfo->PumpCardTransfer();
@@ -681,6 +689,7 @@ void CMemoryCardDriver::UpdateFileWrite(ECardResult result)
void CMemoryCardDriver::UpdateFileCreateTransactional(ECardResult result)
{
printf("CREATETRANS\n");
if (result == ECardResult::READY)
{
x10_state = EState::FileCreateTransactionalDone;
@@ -692,6 +701,7 @@ void CMemoryCardDriver::UpdateFileCreateTransactional(ECardResult result)
void CMemoryCardDriver::UpdateFileWriteTransactional(ECardResult result)
{
printf("WRITETRANS\n");
if (result == ECardResult::READY)
{
ECardResult xferResult = x198_fileInfo->PumpCardTransfer();
@@ -722,6 +732,7 @@ void CMemoryCardDriver::UpdateFileWriteTransactional(ECardResult result)
void CMemoryCardDriver::UpdateFileDeleteAltTransactional(ECardResult result)
{
printf("DELETEALTTRANS\n");
if (result == ECardResult::READY)
{
x10_state = EState::FileDeleteAltTransactionalDone;
@@ -734,6 +745,7 @@ void CMemoryCardDriver::UpdateFileDeleteAltTransactional(ECardResult result)
void CMemoryCardDriver::UpdateFileRenameBtoA(ECardResult result)
{
printf("BTOA\n");
if (result == ECardResult::READY)
{
x10_state = EState::DriverClosed;
@@ -745,6 +757,7 @@ void CMemoryCardDriver::UpdateFileRenameBtoA(ECardResult result)
void CMemoryCardDriver::UpdateCardFormat(ECardResult result)
{
printf("FORMAT\n");
if (result == ECardResult::READY)
x10_state = EState::CardFormatted;
else if (result == ECardResult::BROKEN)