X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fsio.c;h=329bc36ba1730989fa9b7107b1d36a15e13c5ef2;hb=d014a47167b28b19f87546bca0b0c53f08b1daff;hp=81fe0ea1ac695e494deb2d53fa8b42ec826d9e55;hpb=aa35134a834ff7e98b5a474c3db399a3d660da22;p=pcsx_rearmed.git

diff --git a/libpcsxcore/sio.c b/libpcsxcore/sio.c
index 81fe0ea1..329bc36b 100644
--- a/libpcsxcore/sio.c
+++ b/libpcsxcore/sio.c
@@ -68,12 +68,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
@@ -409,10 +407,13 @@ void LoadMcd(int mcd, char *str) {
 	}
 
 	McdDisable[mcd - 1] = 0;
-	if (str == NULL || *str == 0) {
+	if (str == NULL || strcmp(str, "none") == 0) {
 		McdDisable[mcd - 1] = 1;
 		return;
 	}
+	if (*str == 0)
+		return;
+
 	f = fopen(str, "rb");
 	if (f == NULL) {
 		SysPrintf(_("The memory card %s doesn't exist - creating it\n"), str);
@@ -455,6 +456,9 @@ void LoadMcds(char *mcd1, char *mcd2) {
 void SaveMcd(char *mcd, char *data, uint32_t adr, int size) {
 	FILE *f;
 
+	if (mcd == NULL || *mcd == 0 || strcmp(mcd, "none") == 0)
+		return;
+
 	f = fopen(mcd, "r+b");
 	if (f != NULL) {
 		struct stat buf;
@@ -806,7 +810,7 @@ void GetMcdBlockInfo(int mcd, int block, McdBlock *Info) {
 	strncpy(Info->Name, ptr, 16);
 }
 
-int sioFreeze(gzFile f, int Mode) {
+int sioFreeze(void *f, int Mode) {
 	gzfreeze(buf, sizeof(buf));
 	gzfreeze(&StatReg, sizeof(StatReg));
 	gzfreeze(&ModeReg, sizeof(ModeReg));