PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add CMemoryCardDriver::UpdateCardProbe 

Former-commit-id: 0a7858ac6b
This commit is contained in:
Henrique Gemignani Passos Lima 2022-10-11 12:41:19 +03:00
parent f641b5704c
commit 3218c6bd2f
2 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/Kyoto/CMemoryCardSys.hpp
View File

@ -26,8 +26,8 @@ struct FileHandle {
struct ProbeResults { struct ProbeResults {
ECardResult x0_error; ECardResult x0_error;
uint x4_cardSize; /* in megabits */ int x4_cardSize; /* in megabits */
uint x8_sectorSize; /* in bytes */ int x8_sectorSize; /* in bytes */
}; };
class CMemoryCardSys { class CMemoryCardSys {

41
src/MetroidPrime/CMemoryCardDriver.cpp
View File

@ -370,7 +370,46 @@ void CMemoryCardDriver::StartCardProbe() {
UpdateCardProbe(); UpdateCardProbe();
} }
void CMemoryCardDriver::UpdateCardProbe() {} void CMemoryCardDriver::UpdateCardProbe() {
ProbeResults result = CMemoryCardSys::IsMemoryCardInserted(x0_cardPort);
ECardResult error = result.x0_error;
if (error == kCR_READY && result.x8_sectorSize != 0x2000) {
x10_state = kS_CardProbeFailed;
x14_error = kE_CardNon8KSectors;
} else if (error != kCR_BUSY) {
if (error == kCR_WRONGDEVICE) {
x10_state = kS_CardProbeFailed;
x14_error = kE_CardWrongDevice;
} else if (error != kCR_READY) {
NoCardFound();
} else {
x10_state = kS_CardProbeDone;
StartMountCard();
}
}
// switch (result.x0_error) {
// case kCR_READY:
// if (result.x8_sectorSize != 0x2000) {
// x10_state = kS_CardProbeFailed;
// x14_error = kE_CardNon8KSectors;
// } else {
// x10_state = kS_CardProbeDone;
// StartMountCard();
// }
// break;
// case kCR_BUSY:
// break;
// case kCR_WRONGDEVICE:
// x10_state = kS_CardProbeFailed;
// x14_error = kE_CardWrongDevice;
// break;
// default:
// NoCardFound();
// break;
// }
}
void CMemoryCardDriver::StartMountCard() {} void CMemoryCardDriver::StartMountCard() {}