Skip to content

Fix isavegame function order #404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattbruv merged 1 commit into from
Feb 14, 2025
Merged

Fix isavegame function order #404

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions src/SB/Core/gc/isavegame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1562,6 +1562,28 @@ static S32 iSG_mc_mount(S32 slot)
return ret;
}

static S32 iSG_mc_unmount(S32 slot)
{
S32 rc = 0;
S32 result;

do
{
result = CARDUnmount(slot);
} while (result == CARD_RESULT_BUSY);

if (result == CARD_RESULT_READY)
{
rc = 1;
}
else if (result == CARD_RESULT_NOCARD)
{
rc = 1;
}

return rc;
}

static void iSG_cb_unmount(s32 chan, s32 result)
{
st_ISGSESSION* session = &g_isgdata_MAIN;
Expand Down Expand Up @@ -1803,6 +1825,10 @@ static S32 iSG_mc_fdel(st_ISG_MEMCARD_DATA* mcdata, const char* fname)
return ret;
}

static void iSG_cb_asyndone(s32, s32)
{
}

static S32 iSG_mcqa_fread(st_ISG_MEMCARD_DATA* mcdata, char* buf, S32 len, S32 offset);
static S32 iSG_mc_fread(st_ISG_MEMCARD_DATA* mcdata, char* buf, S32 len, S32 offset)
{
Expand Down Expand Up @@ -1980,32 +2006,6 @@ U8 iSGCheckMemoryCard(st_ISGSESSION* isgdata, S32 index)
return 0;
}

static S32 iSG_mc_unmount(S32 slot)
{
S32 rc = 0;
S32 result;

do
{
result = CARDUnmount(slot);
} while (result == CARD_RESULT_BUSY);

if (result == CARD_RESULT_READY)
{
rc = 1;
}
else if (result == CARD_RESULT_NOCARD)
{
rc = 1;
}

return rc;
}

static void iSG_cb_asyndone(s32, s32)
{
}

void iSGAutoSave_Startup()
{
}
Expand Down