Move EMemoryCardPort/CCardFileInfo back to CMemoryCardSys

Former-commit-id: cfcf615e23
This commit is contained in:
Henrique Gemignani Passos Lima
2022-10-12 01:11:22 +03:00
parent 85173e2bd8
commit 756f43e2d6
6 changed files with 96 additions and 89 deletions

View File

@@ -26,7 +26,6 @@ enum ECardResult {
kCR_BUSY = -1,
kCR_READY = 0
};
enum EMemoryCardPort { kCS_SlotA, kCS_SlotB };
struct FileHandle {
u8 x0_pad[0x10];
@@ -47,35 +46,37 @@ struct CardStat {
int GetCommentAddr() const;
};
class CCardFileInfo {
uchar pad[0xf4];
rstl::vector<u8> xf4_saveBuffer;
rstl::vector<u8> x104_cardBuffer;
public:
CCardFileInfo(EMemoryCardPort port, const rstl::string& name);
~CCardFileInfo();
void SetComment(const rstl::string& name);
void LockBannerToken(CAssetId bannerTxtr, CSimplePool& sp);
void LockIconToken(CAssetId iconTxtr, int speed, CSimplePool& sp);
ECardResult PumpCardTransfer();
ECardResult CreateFile();
ECardResult WriteFile();
ECardResult CloseFile();
rstl::vector<u8>& SaveBuffer() { return xf4_saveBuffer; }
inline CMemoryStreamOut BeginMemoryOut(uint sz) {
xf4_saveBuffer.resize(sz, '\x00');
return CMemoryStreamOut(xf4_saveBuffer.data(), sz);
}
};
CHECK_SIZEOF(CCardFileInfo, 0x114)
class CMemoryCardSys {
public:
enum EMemoryCardPort { kCS_SlotA, kCS_SlotB };
class CCardFileInfo {
uchar pad[0xf4];
rstl::vector<u8> xf4_saveBuffer;
rstl::vector<u8> x104_cardBuffer;
public:
CCardFileInfo(EMemoryCardPort port, const rstl::string& name);
~CCardFileInfo();
void SetComment(const rstl::string& name);
void LockBannerToken(CAssetId bannerTxtr, CSimplePool& sp);
void LockIconToken(CAssetId iconTxtr, int speed, CSimplePool& sp);
ECardResult PumpCardTransfer();
ECardResult CreateFile();
ECardResult WriteFile();
ECardResult CloseFile();
rstl::vector<u8>& SaveBuffer() { return xf4_saveBuffer; }
inline CMemoryStreamOut BeginMemoryOut(uint sz) {
xf4_saveBuffer.resize(sz, '\x00');
return CMemoryStreamOut(xf4_saveBuffer.data(), sz);
}
};
struct CardFileHandle {
EMemoryCardPort slot;
FileHandle handle;
@@ -106,4 +107,6 @@ private:
// TODO
};
NESTED_CHECK_SIZEOF(CMemoryCardSys, CCardFileInfo, 0x114)
#endif // _CMEMORYCARDSYS