X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fsio.c;h=ae3e634a9b00e4f6dc5de46ef6e4a4c93d4a43aa;hb=d526ed8c645d7e2147b7d454f29d123b4cfa311d;hp=ea96e95baae78d1d78c3af0b17dde8d744b922cb;hpb=496d88d4f697ab13e84bf8c40cdac98369bd6a04;p=pcsx_rearmed.git

diff --git a/libpcsxcore/sio.c b/libpcsxcore/sio.c
index ea96e95b..ae3e634a 100644
--- a/libpcsxcore/sio.c
+++ b/libpcsxcore/sio.c
@@ -17,6 +17,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *
  ***************************************************************************/
 
+#include <compat/fopen_utf8.h>
+
 /*
 * SIO functions.
 */
@@ -117,6 +119,20 @@ void sioWrite8(unsigned char value) {
 							break;
 					}
 				}
+				// NegCon - Wipeout 3
+				if( buf[parp] == 0x23 ) {
+					switch (value) {
+						// enter config mode
+						case 0x43:
+							buf[1] = 0x79;
+							break;
+
+						// get status
+						case 0x45:
+							buf[1] = 0xf3;
+							break;
+					}
+				}
 			}
 			else padst = 0;
 			return;
@@ -409,15 +425,24 @@ void LoadMcd(int mcd, char *str) {
 	}
 
 	McdDisable[mcd - 1] = 0;
-	if (str == NULL || *str == 0) {
+#ifdef HAVE_LIBRETRO
+	// memcard1 is handled by libretro
+	if (mcd == 1)
+		return;
+#endif
+
+	if (str == NULL || strcmp(str, "none") == 0) {
 		McdDisable[mcd - 1] = 1;
 		return;
 	}
-	f = fopen(str, "rb");
+	if (*str == 0)
+		return;
+
+	f = fopen_utf8(str, "rb");
 	if (f == NULL) {
 		SysPrintf(_("The memory card %s doesn't exist - creating it\n"), str);
 		CreateMcd(str);
-		f = fopen(str, "rb");
+		f = fopen_utf8(str, "rb");
 		if (f != NULL) {
 			struct stat buf;
 
@@ -455,7 +480,10 @@ void LoadMcds(char *mcd1, char *mcd2) {
 void SaveMcd(char *mcd, char *data, uint32_t adr, int size) {
 	FILE *f;
 
-	f = fopen(mcd, "r+b");
+	if (mcd == NULL || *mcd == 0 || strcmp(mcd, "none") == 0)
+		return;
+
+	f = fopen_utf8(mcd, "r+b");
 	if (f != NULL) {
 		struct stat buf;
 
@@ -492,7 +520,7 @@ void CreateMcd(char *mcd) {
 	int s = MCD_SIZE;
 	int i = 0, j;
 
-	f = fopen(mcd, "wb");
+	f = fopen_utf8(mcd, "wb");
 	if (f == NULL)
 		return;