Leahnaya/gcmm
1
0
Fork 0
mirror of https://github.com/suloku/gcmm.git synced 2026-09-07 02:45:30 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed usb and memory card mounting

Browse Source 
Was failing because I fixed sramex structure in libogc without updating card.c (tueidj's patches)
All seems to work now.

TODO:
Check and fix time and date in savegame information
Backup and restore full GCI (directory entry) instead of only some data
This commit is contained in:
sulokutdcmago
2012-08-28 21:01:54 +00:00
parent 4aa3f421d4
commit 6489ba014e
2 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/main.c
View File

@@ -60,7 +60,7 @@ static int initFAT(int device)
{
ShowAction("Mounting device...");
#ifdef HW_RVL
if (device){
if (device){//try SD card first
__io_wiisd.startup();
if (!__io_wiisd.isInserted())
{
@@ -77,9 +77,8 @@ static int initFAT(int device)
ShowAction("Error Mounting USB fat!");
sleep(1);
return 0;
}
return 0;
}
return 1;//usb mounted
}
if (!fatMountSimple ("fat", &__io_wiisd))
{
@@ -87,7 +86,7 @@ static int initFAT(int device)
sleep(1);
return 0;
}
}else if (!device)
}else if (!device)//try USB first
{
__io_usbstorage.startup();
if (!__io_usbstorage.isInserted())
@@ -105,9 +104,8 @@ static int initFAT(int device)
ShowAction("Error Mounting SD fat!");
sleep(1);
return 0;
}
return 0;
}
return 1;//SD mounted
}
if (!fatMountSimple ("fat", &__io_usbstorage))
{
@@ -120,6 +118,8 @@ static int initFAT(int device)
__io_gcsda.startup();
if (!__io_gcsda.isInserted())
{
ShowAction ("No SD Gecko inserted! Insert it in slot A please");
sleep(1);
return 0;
}
if (!fatMountSimple ("fat", &__io_gcsda))
@@ -469,7 +469,7 @@ void SD_RestoreMode ()
int main ()
{
int have_sd;
int have_sd = 0;
#ifdef HW_DOL
@@ -496,8 +496,12 @@ int main ()
mode = SelectMode ();
#ifdef HW_RVL
if (mode != 100 && mode != 500){
if (WaitPromptChoice ("Please select a memory card slot", "Slot B", "Slot A")){
if (WaitPromptChoice ("Please select a memory card slot", "Slot B", "Slot A") == 1)
{
MEM_CARD = CARD_SLOTA;
}else
{
MEM_CARD = CARD_SLOTB;
}
}
#endif
@@ -521,10 +525,7 @@ int main ()
else WaitPrompt("Reboot aplication with an SD card");
break;
case 500 ://exit
ShowAction ("exiting");
ShowAction ("exiting.");
ShowAction ("exiting..");
ShowAction ("exiting...");
ShowAction ("Exiting...");
deinitFAT();
#ifdef HW_RVL
//if there's a loader stub load it, if not return to wii menu.

10
source/mcard.c
View File

@@ -64,9 +64,9 @@ GCI gci;
void card_removed(s32 chn,s32 result)
{
if (chn == CARD_SLOTA)
writeStatusBar("Card was removed from slot A", "");
printf("Card was removed from slot A");
else
writeStatusBar("Card was removed from slot B", "");
printf("Card was removed from slot B");
CARD_Unmount(chn);
}
@@ -103,14 +103,10 @@ int MountCard(int cslot)
isMounted = CARD_ProbeEx(cslot, &memsize, &sectsize);
if (memsize > 0 && sectsize > 0)//then we really mounted de card
{
sprintf(msg, "%d blocks (%d sectorsize)", memsize, sectsize);
writeStatusBar("Card mounted",msg);
ShowScreen();
sleep(1);
writeStatusBar("","");
return isMounted;
}
/*** If this point is reached, something went wrong ***/
return ret;
}