PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-21 11:39:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add CMemoryCardDriver::HandleCardError

Browse Source 
Former-commit-id: 209a12ea88
This commit is contained in:
Henrique Gemignani Passos Lima
2022-10-11 02:02:10 +03:00
parent 958a36bbb8
commit 3abff9b9c6
4 changed files with 51 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/MetroidPrime/CMemoryCardDriver.cpp
View File

@@ -46,7 +46,7 @@ CMemoryCardDriver::~CMemoryCardDriver() {}
void CMemoryCardDriver::Update() {
ProbeResults result = CMemoryCardSys::IsMemoryCardInserted(x0_cardPort);
if (result.x0_error == k_NOCARD) {
if (result.x0_error == kCR_NOCARD) {
if (x10_state != kS_NoCard)
NoCardFound();
gpMain->SetCardBusy(false);
@@ -110,7 +110,25 @@ void CMemoryCardDriver::Update() {
gpMain->SetCardBusy(cardBusy);
}
void CMemoryCardDriver::HandleCardError(int) {}
void CMemoryCardDriver::HandleCardError(ECardResult result, EState state) {
switch (result) {
case kCR_WRONGDEVICE:
x10_state = state;
x14_error = kE_CardWrongDevice;
break;
case kCR_NOCARD:
NoCardFound();
break;
case kCR_IOERROR:
x10_state = state;
x14_error = kE_CardIOError;
break;
case kCR_ENCODING:
x10_state = state;
x14_error = kE_CardWrongCharacterSet;
break;
}
}
void CMemoryCardDriver::UpdateMountCard(ECardResult) {}