MMCE Support

Author: israpps

.github/workflows/CI.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        opts: ["", "HDD=1", "EXFAT=1"]
+        opts: ["", "HDD=1", "EXFAT=1", "MMCE=1"]
     runs-on: ubuntu-latest
     container: ps2dev/ps2dev:v1.0
     steps:
@@ -20,7 +20,7 @@ jobs:
       run: |
         apk add build-base git zip
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - run: |
         git config --global --add safe.directory "$GITHUB_WORKSPACE"
         git fetch --prune --unshallow --tags
@@ -34,9 +34,9 @@ jobs:
         ls -R
 
     - name: Upload artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.event.repository.name }}
+        name: "${{ github.event.repository.name }}-${{ matrix.opts }}"
         path: release/*.zip
 
 ####################################################### 
@@ -47,15 +47,19 @@ jobs:
     steps:
 
     - name: Download all artifacts
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
+      with:
+        path: ${{ github.event.repository.name }}/
+        pattern: "${{ github.event.repository.name }}-*"
+        merge-multiple: true
 
     - name: list
       run: |
         ls -R
 
     - name: Create release
       if: github.ref == 'refs/heads/master'
-      uses: marvinpinto/action-automatic-releases@latest
+      uses: mathieucarbou/marvinpinto-action-automatic-releases@latest
       with:
         repo_token: "${{ secrets.GITHUB_TOKEN }}"
         automatic_release_tag: "latest"

Makefile

@@ -8,7 +8,7 @@ EXFAT ?= 0
 HOMEBREW_IRX ?= 1 #wether to use or not homebrew IRX for pad, memcard and SIO2. if disabled. rom0: drivers will be used. wich is not a safe option. as it makes using the program on protokernel PS2 dangerous (at least for memcard I/O)
 PRINTF = NONE
 RELDIR = release
-EE_BIN = CheatDevice$(HAS_EXFAT)$(HAS_HDD).ELF
+EE_BIN = CheatDevice$(HAS_EXFAT)$(HAS_HDD)$(HAS_MMCE).ELF
 # For minizip
 EE_CFLAGS += -DUSE_FILE32API
 
@@ -28,6 +28,15 @@ OBJS += src/saveformats/util.o src/saveformats/cbs.o src/saveformats/psu.o src/s
 # IRX Modules
 IRX_OBJS += resources/usbd_irx.o
 IRX_OBJS += resources/iomanX_irx.o
+
+
+ifeq ($(MMCE),1)
+  EE_CFLAGS += -DMMCE
+  IRX_OBJS += resources/mmceman_irx.o
+  HOMEBREW_IRX=1
+  FILEXIO_NEED=1
+endif
+
 ifeq ($(HOMEBREW_IRX),1)
   IRX_OBJS += resources/sio2man_irx.o resources/mcman_irx.o resources/mcserv_irx.o resources/padman_irx.o
 endif
@@ -102,6 +111,9 @@ all: modules version main
 	$(info Build finished)
 
 modules:
+ifeq ($(MMCE),1)
+	bin2o iop/mmceman.irx resources/mmceman_irx.o _mmceman_irx
+endif
 	bin2o $(PS2SDK)/iop/irx/iomanX.irx resources/iomanX_irx.o _iomanX_irx
 	bin2o $(PS2SDK)/iop/irx/usbd.irx resources/usbd_irx.o _usbd_irx
 ifeq ($(EXFAT),1)

iop/mmceman.irx

@@ -33,6 +33,10 @@ EXTERN_BIN2O(_padman_irx);
 EXTERN_BIN2O(_usbd_irx);
 EXTERN_BIN2O(_iomanX_irx);
 
+#ifdef MMCE
+EXTERN_BIN2O(_mmceman_irx);
+#endif
+
 #ifdef EXFAT
 EXTERN_BIN2O(_bdm_irx);
 EXTERN_BIN2O(_bdmfs_fatfs_irx);
@@ -103,7 +107,7 @@ void poweroffCallback(void *arg)
 
 int loadModules(int booting_from_hdd)
 {
-    int ID, RET, HDDSTAT, filexio_loaded=0, dev9_loaded=0;
+    int ID, RET, HDDSTAT, filexio_loaded=0, dev9_loaded=0, mmceman_loaded=0;
     DPRINTF("\n ** Loading main modules **\n");
 
     /* IOP reset routine taken from ps2rd */
@@ -139,11 +143,9 @@ int loadModules(int booting_from_hdd)
     sbv_patch_disable_prefix_check();
     LOAD_IRX_BUF_SILENT(_iomanX_irx);
 #ifdef FILEXIO
-    if (booting_from_hdd) {
         ID = LOAD_IRX_BUF_NARG(_filexio_irx, &RET);
         filexio_loaded = IRX_LOAD_SUCCESS();
-        if (filexio_loaded) fileXioInit(); else sprintf(error, "HDD Init error\n%s: ID:%d, RET_%d!", "FILEXIO.IRX", ID, RET);
-    }
+        if (filexio_loaded) fileXioInit(); else sprintf(error, "Error loading driver\n%s: ID:%d, RET:%d!", "FILEXIO.IRX", ID, RET);
 #endif
 #ifdef DEV9
     if (booting_from_hdd) {
@@ -163,6 +165,14 @@ int loadModules(int booting_from_hdd)
     SifLoadModule("rom0:MCMAN", 0, NULL);
     SifLoadModule("rom0:MCSERV", 0, NULL);
 #endif
+
+
+#ifdef MMCE
+    ID = LOAD_IRX_BUF_NARG(_mmceman_irx, &RET); //needs fileXio and sio2man to run
+    mmceman_loaded = IRX_LOAD_SUCCESS();
+    if (!mmceman_loaded) sprintf(error, "Error loading driver\n%s: ID:%d, RET:%d!", "MMCEMAN.IRX", ID, RET);
+#endif
+
 #ifdef EXFAT
     LOAD_IRX_BUF_SILENT(_bdm_irx);
     LOAD_IRX_BUF_SILENT(_bdmfs_fatfs_irx);