Skip to content

Commit a0d6089

Browse files
ZephilesZephiles
committed
Remove unnecessary functions from memcard.cpp
1 parent 58a6f6e commit a0d6089

File tree

2 files changed

+48
-86
lines changed

2 files changed

+48
-86
lines changed

‎ttyd-tools/rel/include/memcard.h‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,11 @@
66

77
namespace mod {
88

9-
int32_t finishAsyncFunction(int32_t returnCode);
10-
119
int32_t checkForMemoryCard();
1210

13-
int32_t mountCard();
14-
15-
int32_t unmountCard();
16-
17-
int32_t openFileFromCard(const char *fileName, gc::card::CARDFileInfo *fileInfo);
11+
int32_t finishAsyncFunction(int32_t returnCode);
1812

19-
int32_t closeFileFromCard(gc::card::CARDFileInfo *fileInfo);
13+
int32_t mountCard();
2014

2115
int32_t createFileOnCard(const char *fileName,
2216
uint32_t size, gc::card::CARDFileInfo *fileInfo);
@@ -27,10 +21,6 @@ int32_t readFromFileOnCard(gc::card::CARDFileInfo *fileInfo,
2721
int32_t writeToFileOnCard(gc::card::CARDFileInfo *fileInfo,
2822
void *buffer, int32_t length, int32_t offset);
2923

30-
int32_t deleteFileOnCard(const char *fileName);
31-
32-
int32_t getFileStatus(int32_t fileNum, gc::card::CARDStat *stat);
33-
3424
int32_t setFileStatus(int32_t fileNum, gc::card::CARDStat *stat);
3525

3626
int32_t createSettingsFile(gc::card::CARDFileInfo *settingsFileInfo);

‎ttyd-tools/rel/source/memcard.cpp‎

Lines changed: 46 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,6 @@
99

1010
namespace mod {
1111

12-
int32_t finishAsyncFunction(int32_t returnCode)
13-
{
14-
if (returnCode == CARD_RESULT_READY)
15-
{
16-
do
17-
{
18-
returnCode = gc::card::CARDGetResultCode(CARD_SLOT_A);
19-
}
20-
while (returnCode == CARD_RESULT_BUSY);
21-
}
22-
return returnCode;
23-
}
24-
2512
int32_t checkForMemoryCard()
2613
{
2714
int32_t ReturnCode;
@@ -36,59 +23,44 @@ int32_t checkForMemoryCard()
3623
return ReturnCode;
3724
}
3825

26+
int32_t finishAsyncFunction(int32_t returnCode)
27+
{
28+
if (returnCode == CARD_RESULT_READY)
29+
{
30+
do
31+
{
32+
returnCode = gc::card::CARDGetResultCode(CARD_SLOT_A);
33+
}
34+
while (returnCode == CARD_RESULT_BUSY);
35+
}
36+
return returnCode;
37+
}
38+
3939
int32_t mountCard()
4040
{
4141
void *WorkArea = ttyd::cardmgr::cardMgrWorkPointer->workArea;
4242
int32_t ReturnCode = gc::card::CARDMountAsync(CARD_SLOT_A, WorkArea, nullptr, nullptr);
4343
return finishAsyncFunction(ReturnCode);
4444
}
4545

46-
int32_t unmountCard()
47-
{
48-
return gc::card::CARDUnmount(CARD_SLOT_A);
49-
}
50-
51-
int32_t openFileFromCard(const char *fileName, gc::card::CARDFileInfo *fileInfo)
52-
{
53-
return gc::card::CARDOpen(CARD_SLOT_A, fileName, fileInfo);
54-
}
55-
56-
int32_t closeFileFromCard(gc::card::CARDFileInfo *fileInfo)
57-
{
58-
return gc::card::CARDClose(fileInfo);
59-
}
60-
61-
int32_t createFileOnCard(const char *fileName,
62-
uint32_t size, gc::card::CARDFileInfo *fileInfo)
46+
int32_t createFileOnCard(const char *fileName, uint32_t size, gc::card::CARDFileInfo *fileInfo)
6347
{
6448
int32_t ReturnCode = gc::card::CARDCreateAsync(CARD_SLOT_A, fileName, size, fileInfo, nullptr);
6549
return finishAsyncFunction(ReturnCode);
6650
}
6751

68-
int32_t readFromFileOnCard(gc::card::CARDFileInfo *fileInfo,
69-
void *buffer, int32_t length, int32_t offset)
52+
int32_t readFromFileOnCard(gc::card::CARDFileInfo *fileInfo, void *buffer, int32_t length, int32_t offset)
7053
{
7154
int32_t ReturnCode = gc::card::CARDReadAsync(fileInfo, buffer, length, offset, nullptr);
7255
return finishAsyncFunction(ReturnCode);
7356
}
7457

75-
int32_t writeToFileOnCard(gc::card::CARDFileInfo *fileInfo,
76-
void *buffer, int32_t length, int32_t offset)
58+
int32_t writeToFileOnCard(gc::card::CARDFileInfo *fileInfo, void *buffer, int32_t length, int32_t offset)
7759
{
7860
int32_t ReturnCode = gc::card::CARDWriteAsync(fileInfo, buffer, length, offset, nullptr);
7961
return finishAsyncFunction(ReturnCode);
8062
}
8163

82-
int32_t deleteFileOnCard(const char *fileName)
83-
{
84-
return gc::card::CARDDelete(CARD_SLOT_A, fileName);
85-
}
86-
87-
int32_t getFileStatus(int32_t fileNum, gc::card::CARDStat *stat)
88-
{
89-
return gc::card::CARDGetStatus(CARD_SLOT_A, fileNum, stat);
90-
}
91-
9264
int32_t setFileStatus(int32_t fileNum, gc::card::CARDStat *stat)
9365
{
9466
int32_t ReturnCode = gc::card::CARDSetStatusAsync(CARD_SLOT_A, fileNum, stat, nullptr);
@@ -99,11 +71,11 @@ int32_t createSettingsFile(gc::card::CARDFileInfo *settingsFileInfo)
9971
{
10072
// Get the banner and icon data from the desired REL file
10173
gc::card::CARDFileInfo FileInfo;
102-
int32_t ReturnCode = openFileFromCard(MenuSettings.RelFileName, &FileInfo);
74+
int32_t ReturnCode = gc::card::CARDOpen(CARD_SLOT_A, MenuSettings.RelFileName, &FileInfo);
10375

10476
if (ReturnCode != CARD_RESULT_READY)
10577
{
106-
unmountCard();
78+
gc::card::CARDUnmount(CARD_SLOT_A);
10779
return ReturnCode;
10880
}
10981

@@ -115,17 +87,17 @@ int32_t createSettingsFile(gc::card::CARDFileInfo *settingsFileInfo)
11587
if (ReturnCode != CARD_RESULT_READY)
11688
{
11789
delete[] (BannerIconData);
118-
closeFileFromCard(&FileInfo);
119-
unmountCard();
90+
gc::card::CARDClose(&FileInfo);
91+
gc::card::CARDUnmount(CARD_SLOT_A);
12092
return ReturnCode;
12193
}
12294

12395
// Close the current REL file
124-
ReturnCode = closeFileFromCard(&FileInfo);
96+
ReturnCode = gc::card::CARDClose(&FileInfo);
12597
if (ReturnCode != CARD_RESULT_READY)
12698
{
12799
delete[] (BannerIconData);
128-
unmountCard();
100+
gc::card::CARDUnmount(CARD_SLOT_A);
129101
return ReturnCode;
130102
}
131103

@@ -143,19 +115,19 @@ int32_t createSettingsFile(gc::card::CARDFileInfo *settingsFileInfo)
143115
if (ReturnCode != CARD_RESULT_READY)
144116
{
145117
delete[] (BannerIconData);
146-
unmountCard();
118+
gc::card::CARDUnmount(CARD_SLOT_A);
147119
return ReturnCode;
148120
}
149121

150122
// Get the stats for the new file
151123
gc::card::CARDStat CardStat;
152124
int32_t FileNumber = FileInfo.fileNum;
153125

154-
ReturnCode = getFileStatus(FileNumber, &CardStat);
126+
ReturnCode = gc::card::CARDGetStatus(CARD_SLOT_A, FileNumber, &CardStat);
155127
if (ReturnCode != CARD_RESULT_READY)
156128
{
157129
delete[] (BannerIconData);
158-
unmountCard();
130+
gc::card::CARDUnmount(CARD_SLOT_A);
159131
return ReturnCode;
160132
}
161133

@@ -171,16 +143,16 @@ int32_t createSettingsFile(gc::card::CARDFileInfo *settingsFileInfo)
171143
if (ReturnCode != CARD_RESULT_READY)
172144
{
173145
delete[] (BannerIconData);
174-
unmountCard();
146+
gc::card::CARDUnmount(CARD_SLOT_A);
175147
return ReturnCode;
176148
}
177149

178150
// Open the new file
179-
ReturnCode = openFileFromCard(SettingsFileName, settingsFileInfo);
151+
ReturnCode = gc::card::CARDOpen(CARD_SLOT_A, SettingsFileName, settingsFileInfo);
180152
if (ReturnCode != CARD_RESULT_READY)
181153
{
182154
delete[] (BannerIconData);
183-
unmountCard();
155+
gc::card::CARDUnmount(CARD_SLOT_A);
184156
return ReturnCode;
185157
}
186158

@@ -192,8 +164,8 @@ int32_t createSettingsFile(gc::card::CARDFileInfo *settingsFileInfo)
192164

193165
if (ReturnCode != CARD_RESULT_READY)
194166
{
195-
closeFileFromCard(settingsFileInfo);
196-
unmountCard();
167+
gc::card::CARDClose(settingsFileInfo);
168+
gc::card::CARDUnmount(CARD_SLOT_A);
197169
}
198170

199171
return ReturnCode;
@@ -231,7 +203,7 @@ int32_t saveSettings()
231203
gc::card::CARDFileInfo FileInfo;
232204
const char *SettingsFileName = MenuSettings.SettingsFileName;
233205

234-
ReturnCode = openFileFromCard(SettingsFileName, &FileInfo);
206+
ReturnCode = gc::card::CARDOpen(CARD_SLOT_A, SettingsFileName, &FileInfo);
235207

236208
switch (ReturnCode)
237209
{
@@ -245,8 +217,8 @@ int32_t saveSettings()
245217
if (ReturnCode != CARD_RESULT_READY)
246218
{
247219
delete[] (FileData);
248-
closeFileFromCard(&FileInfo);
249-
unmountCard();
220+
gc::card::CARDClose(&FileInfo);
221+
gc::card::CARDUnmount(CARD_SLOT_A);
250222
return ReturnCode;
251223
}
252224

@@ -264,18 +236,18 @@ int32_t saveSettings()
264236
{
265237
// The new size exceeds the current size, so a new file must be created
266238
// Close the file
267-
ReturnCode = closeFileFromCard(&FileInfo);
239+
ReturnCode = gc::card::CARDClose(&FileInfo);
268240
if (ReturnCode != CARD_RESULT_READY)
269241
{
270-
unmountCard();
242+
gc::card::CARDUnmount(CARD_SLOT_A);
271243
return ReturnCode;
272244
}
273245

274246
// Delete the current file
275-
ReturnCode = deleteFileOnCard(SettingsFileName);
247+
ReturnCode = gc::card::CARDDelete(CARD_SLOT_A, SettingsFileName);
276248
if (ReturnCode != CARD_RESULT_READY)
277249
{
278-
unmountCard();
250+
gc::card::CARDUnmount(CARD_SLOT_A);
279251
return ReturnCode;
280252
}
281253

@@ -302,7 +274,7 @@ int32_t saveSettings()
302274
}
303275
default:
304276
{
305-
unmountCard();
277+
gc::card::CARDUnmount(CARD_SLOT_A);
306278
return ReturnCode;
307279
}
308280
}
@@ -368,8 +340,8 @@ int32_t saveSettings()
368340
ReturnCode = writeToFileOnCard(&FileInfo, MiscData, FileSizeAdjusted, 0x2000);
369341

370342
delete[] (MiscData);
371-
closeFileFromCard(&FileInfo);
372-
unmountCard();
343+
gc::card::CARDClose(&FileInfo);
344+
gc::card::CARDUnmount(CARD_SLOT_A);
373345
return ReturnCode;
374346
}
375347

@@ -397,11 +369,11 @@ int32_t loadSettings()
397369

398370
// Open the settings file
399371
gc::card::CARDFileInfo FileInfo;
400-
ReturnCode = openFileFromCard(MenuSettings.SettingsFileName, &FileInfo);
372+
ReturnCode = gc::card::CARDOpen(CARD_SLOT_A, MenuSettings.SettingsFileName, &FileInfo);
401373

402374
if (ReturnCode != CARD_RESULT_READY)
403375
{
404-
unmountCard();
376+
gc::card::CARDUnmount(CARD_SLOT_A);
405377
return ReturnCode;
406378
}
407379

@@ -413,8 +385,8 @@ int32_t loadSettings()
413385
if (ReturnCode != CARD_RESULT_READY)
414386
{
415387
delete[] (FileData);
416-
closeFileFromCard(&FileInfo);
417-
unmountCard();
388+
gc::card::CARDClose(&FileInfo);
389+
gc::card::CARDUnmount(CARD_SLOT_A);
418390
return ReturnCode;
419391
}
420392

@@ -448,8 +420,8 @@ int32_t loadSettings()
448420
ReturnCode = readFromFileOnCard(&FileInfo, MiscData, StoredFileSizeAdjusted, 0x2000);
449421

450422
// Close and unmount the card, as it's no longer needed
451-
closeFileFromCard(&FileInfo);
452-
unmountCard();
423+
gc::card::CARDClose(&FileInfo);
424+
gc::card::CARDUnmount(CARD_SLOT_A);
453425

454426
if (ReturnCode != CARD_RESULT_READY)
455427
{

0 commit comments

Comments
 (0)