The-Homebrew-Cloud/Genesis-Plus-GX
2
0
Fork 0
mirror of https://github.com/ekeeke/Genesis-Plus-GX.git synced 2024-12-25 10:41:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile errors with latest libogc(2)

Browse Source 
Fix unmounting FAT devices on Wii
This commit is contained in:
Extrems 2024-11-14 21:03:38 -05:00
parent 378aa209c6
commit ccabd03683
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
builds/genplus_cube.dol
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 MiB

After

Width:  |  Height:  |  Size: 3.9 MiB

BIN
builds/genplus_wii.dol
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.0 MiB

After

Width:  |  Height:  |  Size: 4.1 MiB

12
gx/fileio/file_load.c
View File

@ -82,13 +82,13 @@ static u8 dvdInited = 0;
static u8 dvdMounted = 0; static u8 dvdMounted = 0;
#ifndef HW_RVL #ifndef HW_RVL
static bool dvdStartup() static bool dvdStartup(DISC_INTERFACE *disc)
{ {
DVD_Mount(); DVD_Mount();
return true; return true;
} }
static bool dvdIsInserted() static bool dvdIsInserted(DISC_INTERFACE *disc)
{ {
return true; return true;
} }
@ -112,8 +112,8 @@ static int MountDVD(void)
DVD_Init(); DVD_Init();
/* patch libogc DVD interface which appears to be broken on Gamecube */ /* patch libogc DVD interface which appears to be broken on Gamecube */
dvd->startup = (FN_MEDIUM_STARTUP)dvdStartup; *(FN_MEDIUM_STARTUP *)&dvd->startup = dvdStartup;
dvd->isInserted = (FN_MEDIUM_ISINSERTED)dvdIsInserted; *(FN_MEDIUM_ISINSERTED *)&dvd->isInserted = dvdIsInserted;
#endif #endif
dvdInited = 1; dvdInited = 1;
} }
@ -127,7 +127,11 @@ static int MountDVD(void)
} }
/* check if disc is found */ /* check if disc is found */
#ifdef HW_RVL
if(!dvd->isInserted()) if(!dvd->isInserted())
#else
if(!dvd->isInserted(dvd))
#endif
{ {
GUI_WaitPrompt("Error","No Disc inserted !"); GUI_WaitPrompt("Error","No Disc inserted !");
return 0; return 0;

3
gx/fileio/file_slot.c
View File

@ -47,6 +47,9 @@
/** /**
* libOGC CARD System Work Area * libOGC CARD System Work Area
*/ */
#ifndef CARD_WORKAREA
#define CARD_WORKAREA CARD_WORKAREA_SIZE
#endif
static u8 SysArea[CARD_WORKAREA] ATTRIBUTE_ALIGN (32); static u8 SysArea[CARD_WORKAREA] ATTRIBUTE_ALIGN (32);
/* Mega CD backup RAM stuff */ /* Mega CD backup RAM stuff */

4
gx/main.c
View File

@ -319,8 +319,8 @@ void shutdown(void)
#ifdef HW_RVL #ifdef HW_RVL
/* unmount all devices */ /* unmount all devices */
ISO9660_Unmount("dvd:"); ISO9660_Unmount("dvd:");
fatUnmount("sd"); fatUnmount("sd:");
fatUnmount("usb"); fatUnmount("usb:");
/* shutdown all devices */ /* shutdown all devices */
DI_Close(); DI_Close();