Skip to content

Commit

Permalink
Fixed SD2SP2 / SD gecko issues
Browse files Browse the repository at this point in the history
  • Loading branch information
dborth committed Feb 6, 2021
1 parent 64d4af1 commit 136cb23
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 17 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ Wii/GameCube.

## UPDATE HISTORY

[3.5.0 - February 6, 2021]

* Fixed SD2SP2 / SD gecko issues (again)

[3.4.9 - January 31, 2021]

* Fixed SD2SP2 issues
Expand Down
4 changes: 2 additions & 2 deletions hbc/meta.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<app version="1">
<name>FCE Ultra GX</name>
<coder>Tantric, Zopenko, Askot, others</coder>
<version>3.4.9</version>
<release_date>20210131</release_date>
<version>3.5.0</version>
<release_date>20210206</release_date>
<short_description>Nintendo Emulator</short_description>
<long_description>A port of FCE Ultra to the Wii.</long_description>
<ahb_access />
Expand Down
2 changes: 1 addition & 1 deletion source/fceugx.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "fceultra/driver.h"

#define APPNAME "FCE Ultra GX"
#define APPVERSION "3.4.9"
#define APPVERSION "3.5.0"
#define APPFOLDER "fceugx"
#define PREF_FILE_NAME "settings.xml"

Expand Down
8 changes: 4 additions & 4 deletions source/filebrowser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@ int autoLoadMethod()
device = DEVICE_SD;
else if(ChangeInterface(DEVICE_USB, SILENT))
device = DEVICE_USB;
else if(ChangeInterface(DEVICE_SD_PORT2, SILENT))
device = DEVICE_SD_PORT2;
else if(ChangeInterface(DEVICE_SD_SLOTA, SILENT))
device = DEVICE_SD_SLOTA;
else if(ChangeInterface(DEVICE_SD_SLOTB, SILENT))
device = DEVICE_SD_SLOTB;
else if(ChangeInterface(DEVICE_SD_PORT2, SILENT))
device = DEVICE_SD_PORT2;
else if(ChangeInterface(DEVICE_DVD, SILENT))
device = DEVICE_DVD;
else if(ChangeInterface(DEVICE_SMB, SILENT))
Expand Down Expand Up @@ -96,12 +96,12 @@ int autoSaveMethod(bool silent)
device = DEVICE_SD;
else if(ChangeInterface(DEVICE_USB, SILENT))
device = DEVICE_USB;
else if(ChangeInterface(DEVICE_SD_PORT2, SILENT))
device = DEVICE_SD_PORT2;
else if(ChangeInterface(DEVICE_SD_SLOTA, SILENT))
device = DEVICE_SD_SLOTA;
else if(ChangeInterface(DEVICE_SD_SLOTB, SILENT))
device = DEVICE_SD_SLOTB;
else if(ChangeInterface(DEVICE_SD_PORT2, SILENT))
device = DEVICE_SD_PORT2;
else if(ChangeInterface(DEVICE_SMB, SILENT))
device = DEVICE_SMB;
else if(!silent)
Expand Down
4 changes: 0 additions & 4 deletions source/fileop.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -298,10 +298,6 @@ void MountAllFAT()
#ifdef HW_RVL
MountFAT(DEVICE_SD, SILENT);
MountFAT(DEVICE_USB, SILENT);
#else
MountFAT(DEVICE_SD_PORT2, SILENT);
MountFAT(DEVICE_SD_SLOTA, SILENT);
MountFAT(DEVICE_SD_SLOTB, SILENT);
#endif
}

Expand Down
20 changes: 14 additions & 6 deletions source/preferences.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -589,12 +589,6 @@ bool LoadPrefs()
sprintf(filepath[2], "usb:/apps/%s", APPFOLDER);
sprintf(filepath[3], "sd:/%s", APPFOLDER);
sprintf(filepath[4], "usb:/%s", APPFOLDER);
#else
numDevices = 3;
sprintf(filepath[0], "port2:/%s", APPFOLDER);
sprintf(filepath[1], "carda:/%s", APPFOLDER);
sprintf(filepath[2], "cardb:/%s", APPFOLDER);
#endif

for(int i=0; i<numDevices; i++)
{
Expand All @@ -603,6 +597,20 @@ bool LoadPrefs()
if(prefFound)
break;
}
#else
if(ChangeInterface(DEVICE_SD_SLOTA, SILENT)) {
sprintf(filepath[0], "carda:/%s", APPFOLDER);
prefFound = LoadPrefsFromMethod(filepath[0]);
}
else if(ChangeInterface(DEVICE_SD_SLOTB, SILENT)) {
sprintf(filepath[0], "cardb:/%s", APPFOLDER);
prefFound = LoadPrefsFromMethod(filepath[0]);
}
else if(ChangeInterface(DEVICE_SD_PORT2, SILENT)) {
sprintf(filepath[0], "port2:/%s", APPFOLDER);
prefFound = LoadPrefsFromMethod(filepath[0]);
}
#endif

prefLoaded = true; // attempted to load preferences

Expand Down

0 comments on commit 136cb23

Please sign in to comment.