X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fsio.c;h=480cf5e3074ec48307642b91a54a08b02acc1c1a;hb=0d43426119e23cde7ef7f76f430adf0c725c84c1;hp=ae3e634a9b00e4f6dc5de46ef6e4a4c93d4a43aa;hpb=270c6dd14f876b8a67929aa22abefc47f4588324;p=pcsx_rearmed.git

diff --git a/libpcsxcore/sio.c b/libpcsxcore/sio.c
index ae3e634a..480cf5e3 100644
--- a/libpcsxcore/sio.c
+++ b/libpcsxcore/sio.c
@@ -17,8 +17,6 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *
  ***************************************************************************/
 
-#include <compat/fopen_utf8.h>
-
 /*
 * SIO functions.
 */
@@ -26,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
@@ -70,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
@@ -438,11 +438,11 @@ void LoadMcd(int mcd, char *str) {
 	if (*str == 0)
 		return;
 
-	f = fopen_utf8(str, "rb");
+	f = fopen(str, "rb");
 	if (f == NULL) {
 		SysPrintf(_("The memory card %s doesn't exist - creating it\n"), str);
 		CreateMcd(str);
-		f = fopen_utf8(str, "rb");
+		f = fopen(str, "rb");
 		if (f != NULL) {
 			struct stat buf;
 
@@ -452,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
@@ -467,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);
 	}
 }
@@ -483,7 +493,7 @@ void SaveMcd(char *mcd, char *data, uint32_t adr, int size) {
 	if (mcd == NULL || *mcd == 0 || strcmp(mcd, "none") == 0)
 		return;
 
-	f = fopen_utf8(mcd, "r+b");
+	f = fopen(mcd, "r+b");
 	if (f != NULL) {
 		struct stat buf;
 
@@ -520,7 +530,7 @@ void CreateMcd(char *mcd) {
 	int s = MCD_SIZE;
 	int i = 0, j;
 
-	f = fopen_utf8(mcd, "wb");
+	f = fopen(mcd, "wb");
 	if (f == NULL)
 		return;