MX4SIO Support (#20)

* initial commit

* mx4sio: sync with master (#23)

* Update main.c

* implement config reading from MX4SIO

* avoid embedding fileXio when not needed

* make fatal error report togleable

* fix some warnings & some tweaks

* Update CI.yml

* allow quick IRX replacement

If an IRX of same name is pasted into `embed/iop/` compilation process will use it instead of PS2SDK stock one

Author: israpps

.github/workflows/CI.yml

@@ -50,6 +50,10 @@ jobs:
         run: |
           make release COMMIT_HASH=${GITHUB_SHA::7} BINDIR=PS2/ ${{ env.DEBUG }} PRINTF=${{ github.event.inputs.name }}
 
+      - name: Compile PS2 MX4SIO build
+        run: |
+          make release COMMIT_HASH=${GITHUB_SHA::7} BINDIR=PS2_MX4SIO/ MX4SIO=1 ${{ env.DEBUG }} PRINTF=${{ github.event.inputs.name }}
+
       - name: Compile PSX build
         run: |
           make release COMMIT_HASH=${GITHUB_SHA::7} BINDIR=PSX/ PSX=1 ${{ env.DEBUG }} PRINTF=${{ github.event.inputs.name }}
@@ -69,6 +73,7 @@ jobs:
           mv PS2/ release/PS2/
           mv PSX/ release/PSX/
           mv PS2_HDD/ release/PS2_HDD/
+          mv PS2_MX4SIO/ release/PS2_MX4SIO/
 
       - name: pack release
         run: |

.vscode/settings.json

@@ -13,6 +13,9 @@
         "osdhistory.h": "c",
         "ps2_sio2man_driver.h": "c",
         "fcntl.h": "c",
-        "siocookie.h": "c"
+        "siocookie.h": "c",
+        "compare": "c",
+        "limits": "c",
+        "new": "c"
     }
 }

Makefile

@@ -15,6 +15,7 @@ HAS_EMBED_IRX = 1 # whether to embed or not non vital IRX (wich will be loaded f
 DEBUG ?= 0
 PSX ?= 0 # PSX DESR support
 HDD ?= 0 #wether to add internal HDD support
+MX4SIO ?= 0
 PROHBIT_DVD_0100 ?= 0 # prohibit the DVD Players v1.00 and v1.01 from being booted.
 XCDVD_READKEY ?= 0 # Enable the newer sceCdReadKey checks, which are only supported by a newer CDVDMAN module.
 
@@ -61,7 +62,7 @@ EE_OBJS = main.o \
 EMBEDDED_STUFF = icon_sys_A.o icon_sys_J.o icon_sys_C.o
 
 EE_CFLAGS = -Wall
-EE_CFLAGS += -fdata-sections -ffunction-sections
+EE_CFLAGS += -fdata-sections -ffunction-sections -DREPORT_FATAL_ERRORS
 EE_LDFLAGS += -L$(PS2SDK)/ports/lib
 EE_LDFLAGS += -Wl,--gc-sections -Wno-sign-compare
 EE_LIBS += -ldebug -lmc -lpatches
@@ -74,6 +75,13 @@ ifneq ($(VERBOSE), 1)
    .SILENT:
 endif
 
+ifeq ($(MX4SIO), 1)
+  HOMEBREW_IRX = 1
+  FILEXIO_NEED = 1
+  EE_OBJS += mx4sio_bd.o
+  EE_CFLAGS += -DMX4SIO
+endif
+
 ifneq ($(HOMEBREW_IRX), 0)
    $(info --- enforcing usage of homebrew IRX modules)
    USE_ROM_PADMAN = 0
@@ -229,7 +237,7 @@ $(EE_BIN_STRIPPED): $(EE_BIN)
 $(EE_BIN_PACKED): $(EE_BIN_STRIPPED)
 	@echo " -- Compressing"
 ifneq ($(DEBUG),1)
-	ps2-packer $< $@ > /dev/null
+	ps2-packer $< $@
 else
 	ps2-packer -v $< $@
 endif

embed.make

@@ -1,55 +1,60 @@
 BIN2S = @bin2s
+vpath %.irx embed/iop/
+vpath %.irx $(PS2SDK)/iop/irx/
 # ---{ IOP BINARIES }--- #
 $(EE_ASM_DIR)ioprp.s: embed/ioprp.img | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ psx_ioprp
 
-$(EE_ASM_DIR)sio2man_irx.s: $(PS2SDK)/iop/irx/sio2man.irx | $(EE_ASM_DIR)
+$(EE_ASM_DIR)sio2man_irx.s: sio2man.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ sio2man_irx
 
-$(EE_ASM_DIR)mcman_irx.s: $(PS2SDK)/iop/irx/mcman.irx | $(EE_ASM_DIR)
+$(EE_ASM_DIR)mcman_irx.s: mcman.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ mcman_irx
 
-$(EE_ASM_DIR)mcserv_irx.s: $(PS2SDK)/iop/irx/mcserv.irx | $(EE_ASM_DIR)
+$(EE_ASM_DIR)mcserv_irx.s: mcserv.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ mcserv_irx
 
-$(EE_ASM_DIR)padman_irx.s: $(PS2SDK)/iop/irx/freepad.irx | $(EE_ASM_DIR)
+$(EE_ASM_DIR)padman_irx.s: freepad.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ padman_irx
 
-$(EE_ASM_DIR)usbd_irx.s: $(PS2SDK)/iop/irx/usbd.irx | $(EE_ASM_DIR)
+$(EE_ASM_DIR)usbd_irx.s: usbd.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ usbd_irx
 
-$(EE_ASM_DIR)usbhdfsd_irx.s: $(PS2SDK)/iop/irx/usbhdfsd.irx | $(EE_ASM_DIR)
+$(EE_ASM_DIR)usbhdfsd_irx.s: usbhdfsd.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ usb_mass_irx
 
-$(EE_ASM_DIR)bdm_irx.s: $(PS2SDK)/iop/irx/bdm.irx | $(EE_ASM_DIR)
+$(EE_ASM_DIR)bdm_irx.s: bdm.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ bdm_irx
 
-$(EE_ASM_DIR)bdmfs_fatfs_irx.s: $(PS2SDK)/iop/irx/bdmfs_fatfs.irx | $(EE_ASM_DIR)
+$(EE_ASM_DIR)bdmfs_fatfs_irx.s: bdmfs_fatfs.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ bdmfs_fatfs_irx
 
-$(EE_ASM_DIR)usbmass_bd_irx.s: $(PS2SDK)/iop/irx/usbmass_bd.irx | $(EE_ASM_DIR)
+$(EE_ASM_DIR)usbmass_bd_irx.s: usbmass_bd.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ usbmass_bd_irx
 
+$(EE_ASM_DIR)mx4sio_bd.s: mx4sio_bd.irx | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ mx4sio_bd_irx
+
 #HDD
-$(EE_ASM_DIR)poweroff_irx.s: $(PS2SDK)/iop/irx/poweroff.irx | $(EE_ASM_DIR)
+$(EE_ASM_DIR)poweroff_irx.s: poweroff.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ poweroff_irx
 
-$(EE_ASM_DIR)iomanx_irx.s: $(PS2SDK)/iop/irx/iomanX.irx | $(EE_ASM_DIR)
+$(EE_ASM_DIR)iomanx_irx.s: iomanX.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ iomanX_irx
 
-$(EE_ASM_DIR)filexio_irx.s: $(PS2SDK)/iop/irx/fileXio.irx | $(EE_ASM_DIR)
+$(EE_ASM_DIR)filexio_irx.s: fileXio.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ fileXio_irx
 
-$(EE_ASM_DIR)ps2dev9_irx.s: $(PS2SDK)/iop/irx/ps2dev9.irx | $(EE_ASM_DIR)
+$(EE_ASM_DIR)ps2dev9_irx.s: ps2dev9.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ ps2dev9_irx
 
-$(EE_ASM_DIR)ps2atad_irx.s: $(PS2SDK)/iop/irx/ps2atad.irx | $(EE_ASM_DIR)
+$(EE_ASM_DIR)ps2atad_irx.s: ps2atad.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ ps2atad_irx
 
-$(EE_ASM_DIR)ps2hdd_irx.s: $(PS2SDK)/iop/irx/ps2hdd-osd.irx | $(EE_ASM_DIR)
+$(EE_ASM_DIR)ps2hdd_irx.s: ps2hdd-osd.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ ps2hdd_irx
 
-$(EE_ASM_DIR)ps2fs_irx.s: $(PS2SDK)/iop/irx/ps2fs.irx | $(EE_ASM_DIR)
+$(EE_ASM_DIR)ps2fs_irx.s: ps2fs.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ ps2fs_irx
 #HDD
 

include/common.h

@@ -5,6 +5,9 @@ enum
     SOURCE_MC0 = 0,
     SOURCE_MC1,
     SOURCE_MASS,
+#ifdef MX4SIO
+    SOURCE_MX4SIO,
+#endif
 #ifdef HDD
     SOURCE_HDD,
 #endif
@@ -17,14 +20,17 @@ enum
 
 static const char* SOURCES[SOURCE_COUNT] =
 {
-    "mc0:",
-    "mc1:",
-    "mass:",
+    "mc0",
+    "mc1",
+    "usb",
+#ifdef MX4SIO
+    "mx4sio",
+#endif
 #ifdef HDD
-    "hdd0:",
+    "hdd",
 #endif
 #ifdef XFROM
-    "xfrom0:",
+    "xfrom",
 #endif
     "NOT FOUND",
 };