Skip to content

Commit 0181cd7

Browse files
uyjulianuyjulian
committed
refactor: adjust sio2man-using module variants
Use 2000 as default variant Label variants based on version Add mcman 1400 variant
1 parent a2f6598 commit 0181cd7

File tree

18 files changed

+65
-20
lines changed

18 files changed

+65
-20
lines changed

‎iop/input/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88

99
SUBDIRS = \
1010
padman \
11-
padman-old \
11+
padman-1300 \
12+
padman-1400 \
1213
rmman \
1314
rmman2 \
14-
rmmanx \
15-
rpadman
15+
rmmanx
1616

1717
include $(PS2SDKSRC)/Defs.make
1818
include $(PS2SDKSRC)/Rules.make

‎iop/input/rpadman/Makefile renamed to ‎iop/input/padman-1300/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
# Licenced under Academic Free License version 2.0
77
# Review ps2sdk README & LICENSE files for further details.
88

9-
IOP_BIN_ALTNAMES =
9+
IOP_BIN_ALTNAMES = padman-old.irx
1010

1111
IOP_SRC_DIR = $(PS2SDKSRC)/iop/input/padman/src/
1212

13-
IOP_BIN ?= rpadman.irx
13+
IOP_BIN ?= padman-1300.irx
1414

15-
PADMAN_BUILDING_XPADMAN_V2 ?= 1
15+
PADMAN_BUILDING_XPADMAN ?= 0
1616

1717
include $(PS2SDKSRC)/iop/input/padman/Makefile

‎iop/input/padman-old/Makefile renamed to ‎iop/input/padman-1400/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ IOP_BIN_ALTNAMES =
1010

1111
IOP_SRC_DIR = $(PS2SDKSRC)/iop/input/padman/src/
1212

13-
IOP_BIN ?= padman-old.irx
13+
IOP_BIN ?= padman-1400.irx
1414

15-
PADMAN_BUILDING_XPADMAN ?= 0
15+
PADMAN_BUILDING_XPADMAN_V2 ?= 0
1616

1717
include $(PS2SDKSRC)/iop/input/padman/Makefile

‎iop/input/padman/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Licenced under Academic Free License version 2.0
77
# Review ps2sdk README & LICENSE files for further details.
88

9-
IOP_BIN_ALTNAMES ?= freepad.irx
9+
IOP_BIN_ALTNAMES ?= freepad.irx rpadman.irx padman-2000.irx
1010

1111
# IOP_CFLAGS += -DDEBUG
1212

@@ -28,7 +28,7 @@ IOP_OBJS = freepad.o rpcserver.o exports.o imports.o padInit.o padPortOpen.o pad
2828
PADMAN_BUILDING_XPADMAN ?= 1
2929

3030
# Build the newer version of the gamepad module that links against the remote-compatible SIO2MAN?
31-
PADMAN_BUILDING_XPADMAN_V2 ?= 0
31+
PADMAN_BUILDING_XPADMAN_V2 ?= 1
3232

3333
ifneq (x$(PADMAN_BUILDING_XPADMAN),x0)
3434
IOP_CFLAGS += -DBUILDING_XPADMAN

‎iop/input/rmman/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
# Licenced under Academic Free License version 2.0
77
# Review ps2sdk README & LICENSE files for further details.
88

9+
IOP_BIN_ALTNAMES ?= rmman-2000.irx
10+
911
IOP_IMPORT_INCS += \
1012
cdvd/cdvdman \
1113
sio/sio2man \

‎iop/input/rpadman/README

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎iop/memorycard/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
SUBDIRS = \
1010
dongleman \
1111
mcman \
12-
mcman-old \
12+
mcman-1300 \
13+
mcman-1400 \
1314
mcserv \
14-
mcserv-old \
15+
mcserv-1300 \
1516
vmcman \
1617
xfromman
1718

‎iop/memorycard/dongleman/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
# Licenced under Academic Free License version 2.0
77
# Review ps2sdk README & LICENSE files for further details.
88

9+
IOP_BIN_ALTNAMES =
10+
911
PARENT_DIR=$(PS2SDKSRC)/iop/memorycard/mcman
1012

1113
IOP_SRC_DIR = $(PARENT_DIR)/src/

‎iop/memorycard/mcman-old/Makefile renamed to ‎iop/memorycard/mcman-1300/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@
66
# Licenced under Academic Free License version 2.0
77
# Review ps2sdk README & LICENSE files for further details.
88

9+
IOP_BIN_ALTNAMES = mcman-old.irx
10+
911
IOP_SRC_DIR = $(PS2SDKSRC)/iop/memorycard/mcman/src/
1012
IOP_INC_DIR = $(PS2SDKSRC)/iop/memorycard/mcman/include/
1113

12-
IOP_BIN ?= mcman-old.irx
14+
IOP_BIN ?= mcman-1300.irx
1315

1416
MCMAN_BUILDING_XMCMAN ?= 0
1517

‎iop/memorycard/mcman-1400/Makefile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# _____ ___ ____ ___ ____
2+
# ____| | ____| | | |____|
3+
# | ___| |____ ___| ____| | \ PS2DEV Open Source Project.
4+
#-----------------------------------------------------------------------
5+
# Copyright 2001-2004, ps2dev - http://www.ps2dev.org
6+
# Licenced under Academic Free License version 2.0
7+
# Review ps2sdk README & LICENSE files for further details.
8+
9+
IOP_BIN_ALTNAMES =
10+
11+
IOP_SRC_DIR = $(PS2SDKSRC)/iop/memorycard/mcman/src/
12+
IOP_INC_DIR = $(PS2SDKSRC)/iop/memorycard/mcman/include/
13+
14+
IOP_BIN ?= mcman-1400.irx
15+
16+
MCMAN_BUILDING_XMCMAN_V2 ?= 0
17+
18+
include $(PS2SDKSRC)/iop/memorycard/mcman/Makefile

‎iop/memorycard/mcman/Makefile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,14 @@
66
# Licenced under Academic Free License version 2.0
77
# Review ps2sdk README & LICENSE files for further details.
88

9+
IOP_BIN_ALTNAMES ?= mcman-2000.irx
10+
911
# Build the newer version of the memory card module?
1012
MCMAN_BUILDING_XMCMAN ?= 1
1113

14+
# Build the newer version of the memory card module that links against the remote-compatible SIO2MAN?
15+
MCMAN_BUILDING_XMCMAN_V2 ?= 1
16+
1217
# Read from the dev9 external flash ROM instead of the memory card?
1318
MCMAN_BUILDING_XFROMMAN ?= 0
1419

@@ -49,6 +54,10 @@ ifneq (x$(MCMAN_BUILDING_XMCMAN),x0)
4954
IOP_CFLAGS += -DBUILDING_XMCMAN
5055
endif
5156

57+
ifneq (x$(MCMAN_BUILDING_XMCMAN_V2),x0)
58+
IOP_CFLAGS += -DSIO2MAN_V2
59+
endif
60+
5261
ifneq (x$(MCMAN_BUILDING_XFROMMAN),x0)
5362
IOP_CFLAGS += -DBUILDING_XFROMMAN
5463
IOP_IMPORT_INCS += dev9/extflash

‎iop/memorycard/mcserv-old/Makefile renamed to ‎iop/memorycard/mcserv-1300/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@
66
# Licenced under Academic Free License version 2.0
77
# Review ps2sdk README & LICENSE files for further details.
88

9+
IOP_BIN_ALTNAMES = mcserv-old.irx
10+
911
IOP_SRC_DIR = $(PS2SDKSRC)/iop/memorycard/mcserv/src/
1012
IOP_INC_DIR = $(PS2SDKSRC)/iop/memorycard/mcserv/include/
1113

12-
IOP_BIN ?= mcserv-old.irx
14+
IOP_BIN ?= mcserv-1300.irx
1315

1416
MCMAN_BUILDING_XMCSERV ?= 0
1517

‎iop/memorycard/mcserv/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
# Licenced under Academic Free License version 2.0
77
# Review ps2sdk README & LICENSE files for further details.
88

9+
IOP_BIN_ALTNAMES ?= mcserv-1400.irx mcserv-2000.irx
10+
911
# Build the newer version of the memory card server module?
1012
MCMAN_BUILDING_XMCSERV ?= 1
1113

‎iop/sio/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
SUBDIRS = \
1010
mtapman \
11+
mtapman-1400 \
1112
mx4sio_bd \
1213
mx4sio_bd_mini \
13-
rmtapman \
1414
sio2log \
1515
sio2man \
1616
sio2man-nano

‎iop/sio/rmtapman/Makefile renamed to ‎iop/sio/mtapman-1400/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ IOP_BIN_ALTNAMES =
1010

1111
IOP_SRC_DIR = $(PS2SDKSRC)/iop/sio/mtapman/src/
1212

13-
IOP_CFLAGS += -DSIO2MAN_V2
13+
IOP_BIN ?= mtapman-1400.irx
14+
15+
MTAPMAN_BUILDING_XMTAPMAN_V2 ?= 0
1416

1517
include $(PS2SDKSRC)/iop/sio/mtapman/Makefile

‎iop/sio/mtapman/Makefile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Licenced under Academic Free License version 2.0
77
# Review ps2sdk README & LICENSE files for further details.
88

9-
IOP_BIN_ALTNAMES ?= freemtap.irx
9+
IOP_BIN_ALTNAMES ?= freemtap.irx rmtapman.irx mtapman-2000.irx
1010

1111
IOP_IMPORT_INCS += \
1212
sio/sio2man \
@@ -18,6 +18,13 @@ IOP_IMPORT_INCS += \
1818

1919
IOP_OBJS = freemtap.o rpcservers.o exports.o imports.o
2020

21+
# Build the newer version of the multitap module that links against the remote-compatible SIO2MAN?
22+
MTAPMAN_BUILDING_XMTAPMAN_V2 ?= 1
23+
24+
ifneq (x$(MTAPMAN_BUILDING_XMTAPMAN_V2),x0)
25+
IOP_CFLAGS += -DSIO2MAN_V2
26+
endif
27+
2128
include $(PS2SDKSRC)/Defs.make
2229
include $(PS2SDKSRC)/iop/Rules.bin.make
2330
include $(PS2SDKSRC)/iop/Rules.make

‎iop/sio/rmtapman/README

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎iop/sio/sio2man/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SIO2MAN_ENABLE_LOGGING ?= 0
1212
# Build nano version?
1313
SIO2MAN_ENABLE_NANO ?= 0
1414

15-
IOP_BIN_ALTNAMES ?= freesio2.irx rsio2man.irx sio2man-old.irx
15+
IOP_BIN_ALTNAMES ?= freesio2.irx rsio2man.irx sio2man-old.irx sio2man-1300.irx sio2man-1400.irx sio2man-2000.irx
1616

1717
IOP_IMPORT_INCS += \
1818
sio/sio2man \

0 commit comments

Comments
 (0)