Merge pull request #721 from rickgaiser/mx4sio

Try to make MCEMU/VMC compatible with MX4SIO
ps2homebrew · Aug 9, 2022 · 7d786b3 · 7d786b3
2 parents 96eb7eb + e3d5bed
commit 7d786b3
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/modules/mcemu/mcemu.c b/modules/mcemu/mcemu.c
@@ -122,6 +122,9 @@ void InstallSecrmanHook(void *exp)
 /* Installs handlers for SIO2MAN's routine for enabled virtual memory cards */
 void InstallSio2manHook(void *exp, int ver)
 {
+    psio2_mc_transfer_init = GetExportEntry(exp, 24);
+    psio2_transfer_reset = GetExportEntry(exp, 26);
+
     /* hooking SIO2MAN entry #25 (used by MCMAN and old PADMAN) */
     pSio2man25 = HookExportEntry(exp, 25, hookSio2man25);
     /* hooking SIO2MAN entry #51 (used by MC2_* modules and PADMAN) */
@@ -459,6 +462,12 @@ u32 *hookSio2man67()
 /* SIO2 Command handler */
 void Sio2McEmu(Sio2Packet *sd)
 {
+    /*
+     * Unlock SIO2 access for MX4SIO
+     * NOTE: we are assuming MC's are only accessed when LOCKED
+     */
+    psio2_transfer_reset();
+
     if ((sd->ctrl[0] & 0xF0) == 0x70) {
         register u32 ddi, *pctl, result, length;
         register u8 *wdma, *rdma;
@@ -591,6 +600,12 @@ void Sio2McEmu(Sio2Packet *sd)
     }
 
     /* DPRINTF("SIO2 status 0x%X\n", sd->iostatus); */
+
+    /*
+     * Lock SIO2 access again as the user expects it
+     * NOTE: we are assuming MC's are only accessed when LOCKED
+     */
+    psio2_mc_transfer_init();
 }
 //------------------------------
 // endfunc

diff --git a/modules/mcemu/mcemu.h b/modules/mcemu/mcemu.h
@@ -141,6 +141,7 @@ typedef struct _MemoryCard
 
 /* type for a pointer to SIO2MAN's entries */
 typedef void (*Sio2McProc)(Sio2Packet *arg);
+typedef void (*Sio2McProc2)();
 
 int DummySecrAuthCard(int port, int slot, int cnum);
 void Sio2McEmu(Sio2Packet *sd);
@@ -208,6 +209,7 @@ extern void *pFastBuf;
 
 extern PtrRegisterLibraryEntires pRegisterLibraryEntires;
 extern Sio2McProc pSio2man25, pSio2man51;
+extern Sio2McProc2 psio2_mc_transfer_init, psio2_transfer_reset;
 extern void (*pSio2man67)();
 
 extern u8 mceccbuf[MCEMU_PORTS][0x20];

diff --git a/modules/mcemu/mcemu_var.c b/modules/mcemu/mcemu_var.c
@@ -55,6 +55,7 @@ void *pFastBuf = NULL;
 
 PtrRegisterLibraryEntires pRegisterLibraryEntires; /* Pointer to RegisterLibraryEntires routine */
 Sio2McProc pSio2man25, pSio2man51;                 /* Pointers to SIO2MAN routines */
+Sio2McProc2 psio2_mc_transfer_init, psio2_transfer_reset;
 void (*pSio2man67)();
 
 u8 mceccbuf[MCEMU_PORTS][0x20]; /* ECC buffers */