X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fsio.c;h=44957d392847dcf4ef936d94aac9c60174cb8778;hb=ab91a058dc60273f7d5ae1a6585bfc77ed5245d1;hp=d251fa74584c2374eeadd78034c44dd64a216238;hpb=b9c86313f1a99cd8193fbf36ccc08295a9639725;p=pcsx_rearmed.git

diff --git a/libpcsxcore/sio.c b/libpcsxcore/sio.c
index d251fa74..44957d39 100644
--- a/libpcsxcore/sio.c
+++ b/libpcsxcore/sio.c
@@ -24,6 +24,10 @@
 #include "sio.h"
 #include <sys/stat.h>
 
+#ifdef USE_LIBRETRO_VFS
+#include <streams/file_stream_transforms.h>
+#endif
+
 // Status Flags
 #define TX_RDY		0x0001
 #define RX_RDY		0x0002
@@ -68,12 +72,10 @@ char Mcd1Data[MCD_SIZE], Mcd2Data[MCD_SIZE];
 char McdDisable[2];
 
 #define SIO_INT(eCycle) { \
-	if (!Config.Sio) { \
-		psxRegs.interrupt |= (1 << PSXINT_SIO); \
-		psxRegs.intCycle[PSXINT_SIO].cycle = eCycle; \
-		psxRegs.intCycle[PSXINT_SIO].sCycle = psxRegs.cycle; \
-		new_dyna_set_event(PSXINT_SIO, eCycle); \
-	} \
+	psxRegs.interrupt |= (1 << PSXINT_SIO); \
+	psxRegs.intCycle[PSXINT_SIO].cycle = eCycle; \
+	psxRegs.intCycle[PSXINT_SIO].sCycle = psxRegs.cycle; \
+	new_dyna_set_event(PSXINT_SIO, eCycle); \
 }
 
 // clk cycle byte
@@ -423,6 +425,12 @@ void LoadMcd(int mcd, char *str) {
 	}
 
 	McdDisable[mcd - 1] = 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;
@@ -444,7 +452,12 @@ void LoadMcd(int mcd, char *str) {
 				else if(buf.st_size == MCD_SIZE + 3904)
 					fseek(f, 3904, SEEK_SET);
 			}
-			fread(data, 1, MCD_SIZE, f);
+			if (fread(data, 1, MCD_SIZE, f) != MCD_SIZE) {
+#ifndef NDEBUG
+				SysPrintf(_("File IO error in <%s:%s>.\n"), __FILE__, __func__);
+#endif
+				memset(data, 0x00, MCD_SIZE);
+			}
 			fclose(f);
 		}
 		else
@@ -459,7 +472,12 @@ void LoadMcd(int mcd, char *str) {
 			else if(buf.st_size == MCD_SIZE + 3904)
 				fseek(f, 3904, SEEK_SET);
 		}
-		fread(data, 1, MCD_SIZE, f);
+		if (fread(data, 1, MCD_SIZE, f) != MCD_SIZE) {
+#ifndef NDEBUG
+			SysPrintf(_("File IO error in <%s:%s>.\n"), __FILE__, __func__);
+#endif
+			memset(data, 0x00, MCD_SIZE);
+		}
 		fclose(f);
 	}
 }
@@ -674,6 +692,7 @@ void ConvertMcd(char *mcd, char *data) {
 			fclose(f);
 		}
 		f = fopen(mcd, "r+");
+		if (f == NULL) return;
 		s = s + 3904;
 		fputc('1', f); s--;
 		fputc('2', f); s--;
@@ -708,6 +727,7 @@ void ConvertMcd(char *mcd, char *data) {
 			fclose(f);
 		}
 		f = fopen(mcd, "r+");
+		if (f == NULL) return;
 		s = s + 64;
 		fputc('V', f); s--;
 		fputc('g', f); s--;