Skip to content

Set sio2 module default variant to newest revision by default #771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions iop/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ SUBDIRS = \
fs \
hdd \
iLink \
input \
kernel \
memorycard \
network \
Expand Down
18 changes: 18 additions & 0 deletions iop/input/Makefile
Original file line number Diff line number Diff line change
@@ -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.

SUBDIRS = \
padman \
padman-1300 \
padman-1400 \
rmman \
rmman2 \
rmmanx

include $(PS2SDKSRC)/Defs.make
include $(PS2SDKSRC)/Rules.make
Original file line number Diff line number Diff line change
Expand Up @@ -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/system/padman/src/
IOP_SRC_DIR = $(PS2SDKSRC)/iop/input/padman/src/

IOP_BIN ?= padman-old.irx
IOP_BIN ?= padman-1300.irx

PADMAN_BUILDING_XPADMAN ?= 0

include $(PS2SDKSRC)/iop/system/padman/Makefile
include $(PS2SDKSRC)/iop/input/padman/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

IOP_BIN_ALTNAMES =

IOP_SRC_DIR = $(PS2SDKSRC)/iop/system/padman/src/
IOP_SRC_DIR = $(PS2SDKSRC)/iop/input/padman/src/

IOP_BIN ?= rpadman.irx
IOP_BIN ?= padman-1400.irx

PADMAN_BUILDING_XPADMAN_V2 ?= 1
PADMAN_BUILDING_XPADMAN_V2 ?= 0

include $(PS2SDKSRC)/iop/system/padman/Makefile
include $(PS2SDKSRC)/iop/input/padman/Makefile
6 changes: 3 additions & 3 deletions iop/system/padman/Makefile → iop/input/padman/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
# 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

IOP_IMPORT_INCS += \
sio/sio2man \
system/intrman \
system/loadcore \
system/sifcmd \
system/sifman \
system/sio2man \
system/stdio \
system/sysclib \
system/sysmem \
Expand All @@ -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
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 3 additions & 1 deletion iop/system/rmman/Makefile → iop/input/rmman/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@
# 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 \
system/intrman \
system/iomanx \
system/loadcore \
system/sifcmd \
system/sifman \
system/sio2man \
system/stdio \
system/threadman \
system/vblank
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions iop/system/rmman2/Makefile → iop/input/rmman2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

IOP_BIN_ALTNAMES =

IOP_SRC_DIR = $(PS2SDKSRC)/iop/system/rmman/src/
IOP_INC_DIR = $(PS2SDKSRC)/iop/system/rmman/include/
IOP_SRC_DIR = $(PS2SDKSRC)/iop/input/rmman/src/
IOP_INC_DIR = $(PS2SDKSRC)/iop/input/rmman/include/

IOP_BIN ?= rmman2.irx

RMMAN_BUILDING_RMMAN2 ?= 1

include $(PS2SDKSRC)/iop/system/rmman/Makefile
include $(PS2SDKSRC)/iop/input/rmman/Makefile
6 changes: 3 additions & 3 deletions iop/system/rmmanx/Makefile → iop/input/rmmanx/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@

IOP_BIN_ALTNAMES =

IOP_SRC_DIR = $(PS2SDKSRC)/iop/system/rmman/src/
IOP_INC_DIR = $(PS2SDKSRC)/iop/system/rmman/include/
IOP_SRC_DIR = $(PS2SDKSRC)/iop/input/rmman/src/
IOP_INC_DIR = $(PS2SDKSRC)/iop/input/rmman/include/

IOP_BIN ?= rmmanx.irx

RMMAN_BUILDING_RMMAN2 ?= 1
RMMAN_BUILDING_RMMANX ?= 1

include $(PS2SDKSRC)/iop/system/rmman/Makefile
include $(PS2SDKSRC)/iop/input/rmman/Makefile
5 changes: 3 additions & 2 deletions iop/memorycard/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
SUBDIRS = \
dongleman \
mcman \
mcman-old \
mcman-1300 \
mcman-1400 \
mcserv \
mcserv-old \
mcserv-1300 \
vmcman \
xfromman

Expand Down
2 changes: 2 additions & 0 deletions iop/memorycard/dongleman/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
18 changes: 18 additions & 0 deletions iop/memorycard/mcman-1400/Makefile
Original file line number Diff line number Diff line change
@@ -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
11 changes: 10 additions & 1 deletion iop/memorycard/mcman/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -24,12 +29,12 @@ IOP_IMPORT_INCS += \
cdvd/cdvdman \
debug/sior \
security/secrman \
sio/sio2man \
system/intrman \
system/ioman \
system/iomanx \
system/loadcore \
system/modload \
system/sio2man \
system/stdio \
system/sysclib \
system/threadman \
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions iop/memorycard/mcserv/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion iop/security/secrman/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ DEX_SUPPORT ?= 1

IOP_IMPORT_INCS += \
cdvd/cdvdman \
sio/sio2man \
system/ioman \
system/loadcore \
system/modload \
system/sio2man \
system/stdio \
system/sysclib

Expand Down
2 changes: 1 addition & 1 deletion iop/security/secrsif/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

IOP_IMPORT_INCS += \
security/secrman \
sio/sio2man \
system/loadcore \
system/sifcmd \
system/sifman \
system/sio2man \
system/stdio \
system/sysclib \
system/threadman
Expand Down
9 changes: 8 additions & 1 deletion iop/sio/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,14 @@
# Licenced under Academic Free License version 2.0
# Review ps2sdk README & LICENSE files for further details.

SUBDIRS = mx4sio_bd mx4sio_bd_mini
SUBDIRS = \
mtapman \
mtapman-1400 \
mx4sio_bd \
mx4sio_bd_mini \
sio2log \
sio2man \
sio2man-nano

include $(PS2SDKSRC)/Defs.make
include $(PS2SDKSRC)/Rules.make
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@

IOP_BIN_ALTNAMES =

IOP_SRC_DIR = $(PS2SDKSRC)/iop/system/mtapman/src/
IOP_SRC_DIR = $(PS2SDKSRC)/iop/sio/mtapman/src/

IOP_CFLAGS += -DSIO2MAN_V2
IOP_BIN ?= mtapman-1400.irx

include $(PS2SDKSRC)/iop/system/mtapman/Makefile
MTAPMAN_BUILDING_XMTAPMAN_V2 ?= 0

include $(PS2SDKSRC)/iop/sio/mtapman/Makefile
11 changes: 9 additions & 2 deletions iop/system/mtapman/Makefile → iop/sio/mtapman/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,25 @@
# 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 \
system/loadcore \
system/sifcmd \
system/sifman \
system/sio2man \
system/stdio \
system/threadman

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
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion iop/sio/mx4sio_bd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

IOP_IMPORT_INCS += \
fs/bdm \
sio/sio2man \
system/dmacman \
system/intrman \
system/loadcore \
system/sio2man \
system/stdio \
system/sysclib \
system/threadman
Expand Down
6 changes: 3 additions & 3 deletions iop/system/sio2log/Makefile → iop/sio/sio2log/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

IOP_BIN_ALTNAMES =

IOP_SRC_DIR = $(PS2SDKSRC)/iop/system/sio2man/src/
IOP_INC_DIR = $(PS2SDKSRC)/iop/system/sio2man/include/
IOP_SRC_DIR = $(PS2SDKSRC)/iop/sio/sio2man/src/
IOP_INC_DIR = $(PS2SDKSRC)/iop/sio/sio2man/include/

IOP_BIN ?= sio2log.irx

SIO2MAN_ENABLE_LOGGING ?= 1

include $(PS2SDKSRC)/iop/system/sio2man/Makefile
include $(PS2SDKSRC)/iop/sio/sio2man/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

IOP_BIN_ALTNAMES =

IOP_SRC_DIR = $(PS2SDKSRC)/iop/system/sio2man/src/
IOP_INC_DIR = $(PS2SDKSRC)/iop/system/sio2man/include/
IOP_SRC_DIR = $(PS2SDKSRC)/iop/sio/sio2man/src/
IOP_INC_DIR = $(PS2SDKSRC)/iop/sio/sio2man/include/

IOP_BIN ?= sio2man-nano.irx

SIO2MAN_ENABLE_NANO ?= 1

include $(PS2SDKSRC)/iop/system/sio2man/Makefile
include $(PS2SDKSRC)/iop/sio/sio2man/Makefile
4 changes: 2 additions & 2 deletions iop/system/sio2man/Makefile → iop/sio/sio2man/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ 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 \
system/dmacman \
system/intrman \
system/ioman \
system/loadcore \
system/sio2man \
system/stdio \
system/threadman

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading