refactor: adjust sio2man-using module variants

uyjulian · uyjulian · commit c3453d530e97 · 2025-06-17T17:41:17.000-05:00
Use 2000 as default variant
Label variants based on version
Add mcman 1400 variant
diff --git a/iop/input/Makefile b/iop/input/Makefile
@@ -8,11 +8,11 @@
 
 SUBDIRS = \
     padman \
-    padman-old \
+    padman-1300 \
+    padman-1400 \
     rmman \
     rmman2 \
-    rmmanx \
-    rpadman
+    rmmanx
 
 include $(PS2SDKSRC)/Defs.make
 include $(PS2SDKSRC)/Rules.make
diff --git a/iop/input/padman-1300/Makefile b/iop/input/padman-1300/Makefile
@@ -6,12 +6,12 @@
 # Licenced under Academic Free License version 2.0
 # Review ps2sdk README & LICENSE files for further details.
 
-IOP_BIN_ALTNAMES =
+IOP_BIN_ALTNAMES = padman-old.irx
 
 IOP_SRC_DIR = $(PS2SDKSRC)/iop/input/padman/src/
 
-IOP_BIN ?= rpadman.irx
+IOP_BIN ?= padman-1300.irx
 
-PADMAN_BUILDING_XPADMAN_V2 ?= 1
+PADMAN_BUILDING_XPADMAN ?= 0
 
 include $(PS2SDKSRC)/iop/input/padman/Makefile
diff --git a/iop/input/padman-1400/Makefile b/iop/input/padman-1400/Makefile
@@ -10,8 +10,8 @@ IOP_BIN_ALTNAMES =
 
 IOP_SRC_DIR = $(PS2SDKSRC)/iop/input/padman/src/
 
-IOP_BIN ?= padman-old.irx
+IOP_BIN ?= padman-1400.irx
 
-PADMAN_BUILDING_XPADMAN ?= 0
+PADMAN_BUILDING_XPADMAN_V2 ?= 0
 
 include $(PS2SDKSRC)/iop/input/padman/Makefile
diff --git a/iop/input/padman/Makefile b/iop/input/padman/Makefile
@@ -6,7 +6,7 @@
 # Licenced under Academic Free License version 2.0
 # Review ps2sdk README & LICENSE files for further details.
 
-IOP_BIN_ALTNAMES ?= freepad.irx
+IOP_BIN_ALTNAMES ?= freepad.irx rpadman.irx padman-2000.irx
 
 # IOP_CFLAGS += -DDEBUG
 
@@ -28,7 +28,7 @@ IOP_OBJS = freepad.o rpcserver.o exports.o imports.o padInit.o padPortOpen.o pad
 PADMAN_BUILDING_XPADMAN ?= 1
 
 # Build the newer version of the gamepad module that links against the remote-compatible SIO2MAN?
-PADMAN_BUILDING_XPADMAN_V2 ?= 0
+PADMAN_BUILDING_XPADMAN_V2 ?= 1
 
 ifneq (x$(PADMAN_BUILDING_XPADMAN),x0)
 IOP_CFLAGS += -DBUILDING_XPADMAN
diff --git a/iop/input/rmman/Makefile b/iop/input/rmman/Makefile
@@ -6,6 +6,8 @@
 # Licenced under Academic Free License version 2.0
 # Review ps2sdk README & LICENSE files for further details.
 
+IOP_BIN_ALTNAMES ?= rmman-2000.irx
+
 IOP_IMPORT_INCS += \
 	cdvd/cdvdman \
 	sio/sio2man \
diff --git a/iop/input/rpadman/README b/iop/input/rpadman/README
diff --git a/iop/memorycard/Makefile b/iop/memorycard/Makefile
@@ -9,9 +9,10 @@
 SUBDIRS = \
 	dongleman \
 	mcman \
-	mcman-old \
+	mcman-1300 \
+	mcman-1400 \
 	mcserv \
-	mcserv-old \
+	mcserv-1300 \
 	vmcman \
 	xfromman
 
diff --git a/iop/memorycard/dongleman/Makefile b/iop/memorycard/dongleman/Makefile
@@ -6,6 +6,8 @@
 # Licenced under Academic Free License version 2.0
 # Review ps2sdk README & LICENSE files for further details.
 
+IOP_BIN_ALTNAMES = 
+
 PARENT_DIR=$(PS2SDKSRC)/iop/memorycard/mcman
 
 IOP_SRC_DIR = $(PARENT_DIR)/src/
diff --git a/iop/memorycard/mcman-1300/Makefile b/iop/memorycard/mcman-1300/Makefile
@@ -6,10 +6,12 @@
 # Licenced under Academic Free License version 2.0
 # Review ps2sdk README & LICENSE files for further details.
 
+IOP_BIN_ALTNAMES = mcman-old.irx
+
 IOP_SRC_DIR = $(PS2SDKSRC)/iop/memorycard/mcman/src/
 IOP_INC_DIR = $(PS2SDKSRC)/iop/memorycard/mcman/include/
 
-IOP_BIN ?= mcman-old.irx
+IOP_BIN ?= mcman-1300.irx
 
 MCMAN_BUILDING_XMCMAN ?= 0
 
diff --git a/iop/memorycard/mcman-1400/Makefile b/iop/memorycard/mcman-1400/Makefile
@@ -0,0 +1,18 @@
+# _____     ___ ____     ___ ____
+#  ____|   |    ____|   |        | |____|
+# |     ___|   |____ ___|    ____| |    \    PS2DEV Open Source Project.
+#-----------------------------------------------------------------------
+# Copyright 2001-2004, ps2dev - http://www.ps2dev.org
+# Licenced under Academic Free License version 2.0
+# Review ps2sdk README & LICENSE files for further details.
+
+IOP_BIN_ALTNAMES = 
+
+IOP_SRC_DIR = $(PS2SDKSRC)/iop/memorycard/mcman/src/
+IOP_INC_DIR = $(PS2SDKSRC)/iop/memorycard/mcman/include/
+
+IOP_BIN ?= mcman-1400.irx
+
+MCMAN_BUILDING_XMCMAN_V2 ?= 0
+
+include $(PS2SDKSRC)/iop/memorycard/mcman/Makefile
diff --git a/iop/memorycard/mcman/Makefile b/iop/memorycard/mcman/Makefile
@@ -6,9 +6,14 @@
 # Licenced under Academic Free License version 2.0
 # Review ps2sdk README & LICENSE files for further details.
 
+IOP_BIN_ALTNAMES ?= mcman-2000.irx
+
 # Build the newer version of the memory card module?
 MCMAN_BUILDING_XMCMAN ?= 1
 
+# Build the newer version of the memory card module that links against the remote-compatible SIO2MAN?
+MCMAN_BUILDING_XMCMAN_V2 ?= 1
+
 # Read from the dev9 external flash ROM instead of the memory card?
 MCMAN_BUILDING_XFROMMAN ?= 0
 
@@ -49,6 +54,10 @@ ifneq (x$(MCMAN_BUILDING_XMCMAN),x0)
 IOP_CFLAGS += -DBUILDING_XMCMAN
 endif
 
+ifneq (x$(MCMAN_BUILDING_XMCMAN_V2),x0)
+IOP_CFLAGS += -DSIO2MAN_V2
+endif
+
 ifneq (x$(MCMAN_BUILDING_XFROMMAN),x0)
 IOP_CFLAGS += -DBUILDING_XFROMMAN
 IOP_IMPORT_INCS += dev9/extflash
diff --git a/iop/memorycard/mcserv-1300/Makefile b/iop/memorycard/mcserv-1300/Makefile
@@ -6,10 +6,12 @@
 # Licenced under Academic Free License version 2.0
 # Review ps2sdk README & LICENSE files for further details.
 
+IOP_BIN_ALTNAMES = mcserv-old.irx
+
 IOP_SRC_DIR = $(PS2SDKSRC)/iop/memorycard/mcserv/src/
 IOP_INC_DIR = $(PS2SDKSRC)/iop/memorycard/mcserv/include/
 
-IOP_BIN ?= mcserv-old.irx
+IOP_BIN ?= mcserv-1300.irx
 
 MCMAN_BUILDING_XMCSERV ?= 0
 
diff --git a/iop/memorycard/mcserv/Makefile b/iop/memorycard/mcserv/Makefile
@@ -6,6 +6,8 @@
 # Licenced under Academic Free License version 2.0
 # Review ps2sdk README & LICENSE files for further details.
 
+IOP_BIN_ALTNAMES ?= mcserv-1400.irx mcserv-2000.irx
+
 # Build the newer version of the memory card server module?
 MCMAN_BUILDING_XMCSERV ?= 1
 
diff --git a/iop/sio/Makefile b/iop/sio/Makefile
@@ -8,9 +8,9 @@
 
 SUBDIRS = \
     mtapman \
+    mtapman-1400 \
     mx4sio_bd \
     mx4sio_bd_mini \
-    rmtapman \
     sio2log \
     sio2man \
     sio2man-nano
diff --git a/iop/sio/mtapman-1400/Makefile b/iop/sio/mtapman-1400/Makefile
@@ -10,6 +10,8 @@ IOP_BIN_ALTNAMES =
 
 IOP_SRC_DIR = $(PS2SDKSRC)/iop/sio/mtapman/src/
 
-IOP_CFLAGS += -DSIO2MAN_V2
+IOP_BIN ?= mtapman-1400.irx
+
+MTAPMAN_BUILDING_XMTAPMAN_V2 ?= 0
 
 include $(PS2SDKSRC)/iop/sio/mtapman/Makefile
diff --git a/iop/sio/mtapman/Makefile b/iop/sio/mtapman/Makefile
@@ -6,7 +6,7 @@
 # Licenced under Academic Free License version 2.0
 # Review ps2sdk README & LICENSE files for further details.
 
-IOP_BIN_ALTNAMES ?= freemtap.irx
+IOP_BIN_ALTNAMES ?= freemtap.irx rmtapman.irx mtapman-2000.irx
 
 IOP_IMPORT_INCS += \
 	sio/sio2man \
@@ -18,6 +18,13 @@ IOP_IMPORT_INCS += \
 
 IOP_OBJS = freemtap.o rpcservers.o exports.o imports.o
 
+# Build the newer version of the multitap module that links against the remote-compatible SIO2MAN?
+MTAPMAN_BUILDING_XMTAPMAN_V2 ?= 1
+
+ifneq (x$(MTAPMAN_BUILDING_XMTAPMAN_V2),x0)
+IOP_CFLAGS += -DSIO2MAN_V2
+endif
+
 include $(PS2SDKSRC)/Defs.make
 include $(PS2SDKSRC)/iop/Rules.bin.make
 include $(PS2SDKSRC)/iop/Rules.make
diff --git a/iop/sio/rmtapman/README b/iop/sio/rmtapman/README
diff --git a/iop/sio/sio2man/Makefile b/iop/sio/sio2man/Makefile
@@ -12,7 +12,7 @@ SIO2MAN_ENABLE_LOGGING ?= 0
 # Build nano version?
 SIO2MAN_ENABLE_NANO ?= 0
 
-IOP_BIN_ALTNAMES ?= freesio2.irx rsio2man.irx sio2man-old.irx
+IOP_BIN_ALTNAMES ?= freesio2.irx rsio2man.irx sio2man-old.irx sio2man-1300.irx sio2man-1400.irx sio2man-2000.irx
 
 IOP_IMPORT_INCS += \
 	sio/sio2man \
