Slight adjustments to some defined CARD names

Author: Zephiles

ttyd-tools/rel/include/gc/card.h

@@ -6,11 +6,11 @@ namespace gc::card {
 
 extern "C" {
 
-#define CARD_SLOTA 					0		// Memory card slot A
-#define CARD_SLOTB 					1		// Memory card slot B
+#define CARD_SLOT_A 				0		// Memory card slot A
+#define CARD_SLOT_B 				1		// Memory card slot B
 
-#define CARD_FILENAMELEN 			32		// Maximum filename length
-#define CARD_MAXICONS 				8
+#define CARD_FILENAME_MAX 			32		// Maximum filename length, excluding null terminator
+#define CARD_MAX_ICONS 				8
 
 #define CARD_RESULT_UNLOCKED 		1		// Card is being unlocked or is already unlocked
 #define CARD_RESULT_READY			0		// Card is ready
@@ -40,7 +40,7 @@ typedef struct CARDFileInfo {
 } CARDFileInfo;
 
 typedef struct CARDStat {
-	char 		fileName[CARD_FILENAMELEN];
+	char 		fileName[CARD_FILENAME_MAX];
 	uint32_t	length;
 	uint32_t	time;
 	uint8_t 	gameName[4];
@@ -52,7 +52,7 @@ typedef struct CARDStat {
 	uint32_t 	commentAddress;
 	uint32_t 	offsetBanner;
 	uint32_t 	offsetBannerTlut;
-	uint32_t 	offsetIcon[CARD_MAXICONS];
+	uint32_t 	offsetIcon[CARD_MAX_ICONS];
 	uint32_t 	offsetIconTlut;
 	uint32_t 	offsetData;
 } CARDStat;

ttyd-tools/rel/source/memcard.cpp

@@ -15,7 +15,7 @@ int32_t finishAsyncFunction(int32_t returnCode)
 	{
 		do
 		{
-			returnCode = gc::card::CARDGetResultCode(CARD_SLOTA);
+			returnCode = gc::card::CARDGetResultCode(CARD_SLOT_A);
 		}
 		while (returnCode == CARD_RESULT_BUSY);
 	}
@@ -24,26 +24,26 @@ int32_t finishAsyncFunction(int32_t returnCode)
 
 int32_t checkForMemoryCard()
 {
-	return gc::card::CARDProbeEx(CARD_SLOTA, nullptr, nullptr);
+	return gc::card::CARDProbeEx(CARD_SLOT_A, nullptr, nullptr);
 }
 
 int32_t mountCard()
 {
 	void *WorkArea = *reinterpret_cast<uint32_t **>(
 		reinterpret_cast<uint32_t>(ttyd::cardmgr::cardMgrWorkPointer) + 0x4);
 
-	int32_t ReturnCode = gc::card::CARDMountAsync(CARD_SLOTA, WorkArea, nullptr, nullptr);
+	int32_t ReturnCode = gc::card::CARDMountAsync(CARD_SLOT_A, WorkArea, nullptr, nullptr);
 	return finishAsyncFunction(ReturnCode);
 }
 
 int32_t unmountCard()
 {
-	return gc::card::CARDUnmount(CARD_SLOTA);
+	return gc::card::CARDUnmount(CARD_SLOT_A);
 }
 
 int32_t openFileFromCard(const char *fileName, gc::card::CARDFileInfo *fileInfo)
 {
-	return gc::card::CARDOpen(CARD_SLOTA, fileName, fileInfo);
+	return gc::card::CARDOpen(CARD_SLOT_A, fileName, fileInfo);
 }
 
 int32_t closeFileFromCard(gc::card::CARDFileInfo *fileInfo)
@@ -54,7 +54,7 @@ int32_t closeFileFromCard(gc::card::CARDFileInfo *fileInfo)
 int32_t createFileOnCard(const char *fileName, 
 	uint32_t size, gc::card::CARDFileInfo *fileInfo)
 {
-	int32_t ReturnCode = gc::card::CARDCreateAsync(CARD_SLOTA, fileName, size, fileInfo, nullptr);
+	int32_t ReturnCode = gc::card::CARDCreateAsync(CARD_SLOT_A, fileName, size, fileInfo, nullptr);
 	return finishAsyncFunction(ReturnCode);
 }
 
@@ -74,17 +74,17 @@ int32_t writeToFileOnCard(gc::card::CARDFileInfo *fileInfo,
 
 int32_t deleteFileOnCard(const char *fileName)
 {
-	return gc::card::CARDDelete(CARD_SLOTA, fileName);
+	return gc::card::CARDDelete(CARD_SLOT_A, fileName);
 }
 
 int32_t getFileStatus(int32_t fileNum, gc::card::CARDStat *stat)
 {
-	return gc::card::CARDGetStatus(CARD_SLOTA, fileNum, stat);
+	return gc::card::CARDGetStatus(CARD_SLOT_A, fileNum, stat);
 }
 
 int32_t setFileStatus(int32_t fileNum, gc::card::CARDStat *stat)
 {
-	int32_t ReturnCode = gc::card::CARDSetStatusAsync(CARD_SLOTA, fileNum, stat, nullptr);
+	int32_t ReturnCode = gc::card::CARDSetStatusAsync(CARD_SLOT_A, fileNum, stat, nullptr);
 	return finishAsyncFunction(ReturnCode);
 }