Fixed SD2SP2 / SD gecko issues

dborth · Feb 6, 2021 · 136cb23 · 136cb23
1 parent 64d4af1
commit 136cb23
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -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

diff --git a/hbc/meta.xml b/hbc/meta.xml
@@ -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 />

diff --git a/source/fceugx.h b/source/fceugx.h
@@ -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"
 

diff --git a/source/filebrowser.cpp b/source/filebrowser.cpp
@@ -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))
@@ -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)

diff --git a/source/fileop.cpp b/source/fileop.cpp
@@ -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
 }
 

diff --git a/source/preferences.cpp b/source/preferences.cpp
@@ -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++)
 	{
@@ -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