Merge pull request #709 from uyjulian/sio2man_feature_update

sio2man feature update

Author: fjtrujy

common/include/iop_mmio_hwport.h

@@ -102,10 +102,12 @@ typedef struct sio0_1_mmio_hwport_
 
 typedef struct sio2_mmio_hwport_
 {
-	vu8 send3_buf[0x40];
-	vu8 send1_2_buf[0x20];
-	vu32 out_fifo; /* PCSX2 says in */
-	vu32 in_fifo;  /* PCSX2 says out */
+	vu32 send3_buf[16];
+	vu32 send1_2_buf[8];
+	vu8 out_fifo; /* PCSX2 says in */
+	u8 pad1[3];
+	vu8 in_fifo;  /* PCSX2 says out */
+	u8 pad2[3];
 	vu32 ctrl;
 	vu32 recv1;
 	vu32 recv2;

iop/system/Makefile

@@ -34,15 +34,14 @@ SUBDIRS = \
 	rmmanx \
 	rmtapman \
 	rpadman \
-	rsio2man \
 	sbusintr \
 	sifcmd \
 	sifinit \
 	sifman \
 	siftoo \
 	sio2log \
 	sio2man \
-	sio2man-old \
+	sio2man-nano \
 	ssbusc \
 	stdio \
 	sysclib \

iop/system/padman/Makefile

@@ -36,7 +36,6 @@ endif
 
 ifneq (x$(PADMAN_BUILDING_XPADMAN_V2),x0)
 IOP_CFLAGS += -DBUILDING_XPADMAN_V2
-IOP_INCS += -I$(PS2SDKSRC)/iop/system/rsio2man/include
 endif
 
 include $(PS2SDKSRC)/Defs.make

iop/system/rmman/Makefile

@@ -11,7 +11,6 @@ IOP_INCS += \
 	-I$(PS2SDKSRC)/iop/system/intrman/include \
 	-I$(PS2SDKSRC)/iop/system/iomanx/include \
 	-I$(PS2SDKSRC)/iop/system/loadcore/include \
-	-I$(PS2SDKSRC)/iop/system/rsio2man/include \
 	-I$(PS2SDKSRC)/iop/system/sifcmd/include \
 	-I$(PS2SDKSRC)/iop/system/sifman/include \
 	-I$(PS2SDKSRC)/iop/system/sio2man/include \

iop/system/rmtapman/Makefile

@@ -12,7 +12,4 @@ IOP_SRC_DIR = $(PS2SDKSRC)/iop/system/mtapman/src/
 
 IOP_CFLAGS += -DSIO2MAN_V2
 
-IOP_INCS += \
-	-I$(PS2SDKSRC)/iop/system/rsio2man/include/
-
 include $(PS2SDKSRC)/iop/system/mtapman/Makefile

iop/system/rsio2man/README

@@ -2,7 +2,7 @@
 #  ____|   |    ____|   |        | |____|
 # |     ___|   |____ ___|    ____| |    \    PS2DEV Open Source Project.
 #-----------------------------------------------------------------------
-# Copyright 2001-2004, ps2dev - http://www.ps2dev.org
+# Copyright ps2dev - http://www.ps2dev.org
 # Licenced under Academic Free License version 2.0
 # Review ps2sdk README & LICENSE files for further details.
 
@@ -11,8 +11,8 @@ IOP_BIN_ALTNAMES =
 IOP_SRC_DIR = $(PS2SDKSRC)/iop/system/sio2man/src/
 IOP_INC_DIR = $(PS2SDKSRC)/iop/system/sio2man/include/
 
-IOP_BIN ?= rsio2man.irx
+IOP_BIN ?= sio2man-nano.irx
 
-SIO2MAN_BUILDING_XSIO2MAN_V2 ?= 1
+SIO2MAN_ENABLE_NANO ?= 1
 
 include $(PS2SDKSRC)/iop/system/sio2man/Makefile

iop/system/rsio2man/Makefile iop/system/sio2man-nano/Makefileiop/system/rsio2man/Makefile renamed to iop/system/sio2man-nano/Makefile

@@ -2,20 +2,17 @@
 #  ____|   |    ____|   |        | |____|
 # |     ___|   |____ ___|    ____| |    \    PS2DEV Open Source Project.
 #-----------------------------------------------------------------------
-# Copyright 2001-2004, ps2dev - http://www.ps2dev.org
+# Copyright ps2dev - http://www.ps2dev.org
 # Licenced under Academic Free License version 2.0
 # Review ps2sdk README & LICENSE files for further details.
 
-# Build the newer version of the SIO2 module with support for multitap?
-SIO2MAN_BUILDING_XSIO2MAN ?= 1
-
-# Build the newer version of the SIO2 module with support for remote and PDA devices?
-SIO2MAN_BUILDING_XSIO2MAN_V2 ?= 0
-
 # Enable logging?
 SIO2MAN_ENABLE_LOGGING ?= 0
 
-IOP_BIN_ALTNAMES ?= freesio2.irx
+# Build nano version?
+SIO2MAN_ENABLE_NANO ?= 0
+
+IOP_BIN_ALTNAMES ?= freesio2.irx rsio2man.irx sio2man-old.irx
 
 IOP_INCS += \
 	-I$(PS2SDKSRC)/iop/system/dmacman/include \
@@ -28,18 +25,14 @@ IOP_INCS += \
 
 IOP_OBJS = sio2man.o log.o imports.o exports.o
 
-ifneq (x$(SIO2MAN_BUILDING_XSIO2MAN),x0)
-IOP_CFLAGS += -DBUILDING_XSIO2MAN
-endif
-
-ifneq (x$(SIO2MAN_BUILDING_XSIO2MAN_V2),x0)
-IOP_CFLAGS += -DBUILDING_XSIO2MAN_V2
-endif
-
 ifneq (x$(SIO2MAN_ENABLE_LOGGING),x0)
 IOP_CFLAGS += -DSIO2LOG
 endif
 
+ifneq (x$(SIO2MAN_ENABLE_NANO),x0)
+IOP_CFLAGS += -DSIO2MAN_NANO
+endif
+
 include $(PS2SDKSRC)/Defs.make
 include $(PS2SDKSRC)/iop/Rules.bin.make
 include $(PS2SDKSRC)/iop/Rules.make