Merge pull request #688 from uyjulian/iop_headers_move

Move IOP module headers to module directories
ps2dev · Dec 12, 2024 · 8c01ea0 · 8c01ea0
2 parents a81be1f + 202c6f3
commit 8c01ea0
Show file tree

Hide file tree

Showing 162 changed files with 1,094 additions and 137 deletions.
diff --git a/common/sbus/Makefile b/common/sbus/Makefile
@@ -13,6 +13,20 @@ EE_CFLAGS += -fno-builtin-printf
 
 EE_OBJS = ps2_sbus.o ee_sbus.o ps2_sif.o ee_sif2.o sif2cmd.o ee_low.o
 
+IOP_INCS += \
+	-I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \
+	-I$(PS2SDKSRC)/iop/system/excepman/include \
+	-I$(PS2SDKSRC)/iop/system/intrman/include \
+	-I$(PS2SDKSRC)/iop/system/ioman/include \
+	-I$(PS2SDKSRC)/iop/system/loadcore/include \
+	-I$(PS2SDKSRC)/iop/system/modload/include \
+	-I$(PS2SDKSRC)/iop/system/sifcmd/include \
+	-I$(PS2SDKSRC)/iop/system/sifman/include \
+	-I$(PS2SDKSRC)/iop/system/stdio/include \
+	-I$(PS2SDKSRC)/iop/system/sysclib/include \
+	-I$(PS2SDKSRC)/iop/system/sysmem/include \
+	-I$(PS2SDKSRC)/iop/system/threadman/include
+
 IOP_OBJS_DIR = iop_obj/
 
 IOP_OBJS = ps2_sbus.o iop_sbus.o ps2_sif.o iop_sif2.o sif2cmd.o imports.o exports.o

diff --git a/ee/iopreboot/src/imgdrv/Makefile b/ee/iopreboot/src/imgdrv/Makefile
@@ -7,6 +7,10 @@
 
 IOP_BIN ?= imgdrv.irx
 
+IOP_INCS += \
+	-I$(PS2SDKSRC)/iop/system/ioman/include \
+	-I$(PS2SDKSRC)/iop/system/loadcore/include
+
 IOP_OBJS = imgdrv.o imports.o
 
 include $(PS2SDKSRC)/Defs.make

diff --git a/iop/arcade/acata/Makefile b/iop/arcade/acata/Makefile
@@ -8,7 +8,13 @@
 
 IOP_INCS += \
 	-I$(PS2SDKSRC)/iop/arcade/accore/include \
-	-I$(PS2SDKSRC)/iop/arcade/actimer/include
+	-I$(PS2SDKSRC)/iop/arcade/actimer/include \
+	-I$(PS2SDKSRC)/iop/system/intrman/include \
+	-I$(PS2SDKSRC)/iop/system/loadcore/include \
+	-I$(PS2SDKSRC)/iop/system/stdio/include \
+	-I$(PS2SDKSRC)/iop/system/sysclib/include \
+	-I$(PS2SDKSRC)/iop/system/sysmem/include \
+	-I$(PS2SDKSRC)/iop/system/threadman/include
 
 IOP_OBJS = \
 	acata-entry.o \

diff --git a/iop/arcade/acatad/Makefile b/iop/arcade/acatad/Makefile
@@ -7,9 +7,13 @@
 # Review ps2sdk README & LICENSE files for further details.
 
 IOP_INCS += \
-	-I$(PS2SDKSRC)/iop/arcade/accore/include \
 	-I$(PS2SDKSRC)/iop/arcade/acata/include \
-	-I$(PS2SDKSRC)/iop/dev9/atad/include
+	-I$(PS2SDKSRC)/iop/arcade/accore/include \
+	-I$(PS2SDKSRC)/iop/dev9/atad/include \
+	-I$(PS2SDKSRC)/iop/system/loadcore/include \
+	-I$(PS2SDKSRC)/iop/system/stdio/include \
+	-I$(PS2SDKSRC)/iop/system/sysclib/include \
+	-I$(PS2SDKSRC)/iop/system/threadman/include
 
 IOP_OBJS = \
 	acatad.o \

diff --git a/iop/arcade/accdvd/Makefile b/iop/arcade/accdvd/Makefile
@@ -7,8 +7,16 @@
 # Review ps2sdk README & LICENSE files for further details.
 
 IOP_INCS += \
+	-I$(PS2SDKSRC)/iop/arcade/acata/include \
 	-I$(PS2SDKSRC)/iop/arcade/accore/include \
-	-I$(PS2SDKSRC)/iop/arcade/acata/include
+	-I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \
+	-I$(PS2SDKSRC)/iop/system/intrman/include \
+	-I$(PS2SDKSRC)/iop/system/ioman/include \
+	-I$(PS2SDKSRC)/iop/system/loadcore/include \
+	-I$(PS2SDKSRC)/iop/system/stdio/include \
+	-I$(PS2SDKSRC)/iop/system/sysclib/include \
+	-I$(PS2SDKSRC)/iop/system/sysmem/include \
+	-I$(PS2SDKSRC)/iop/system/threadman/include
 
 IOP_OBJS = \
 	accdvdi-entry.o \

diff --git a/iop/arcade/accdvde/Makefile b/iop/arcade/accdvde/Makefile
@@ -7,10 +7,17 @@
 # Review ps2sdk README & LICENSE files for further details.
 
 IOP_INCS += \
-	-I$(PS2SDKSRC)/iop/arcade/accore/include \
 	-I$(PS2SDKSRC)/iop/arcade/accdvd/include \
+	-I$(PS2SDKSRC)/iop/arcade/accore/include \
 	-I$(PS2SDKSRC)/iop/arcade/acmem/include \
-	-I$(PS2SDKSRC)/iop/arcade/acram/include
+	-I$(PS2SDKSRC)/iop/arcade/acram/include \
+	-I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \
+	-I$(PS2SDKSRC)/iop/system/intrman/include \
+	-I$(PS2SDKSRC)/iop/system/loadcore/include \
+	-I$(PS2SDKSRC)/iop/system/sifcmd/include \
+	-I$(PS2SDKSRC)/iop/system/stdio/include \
+	-I$(PS2SDKSRC)/iop/system/sysclib/include \
+	-I$(PS2SDKSRC)/iop/system/threadman/include
 
 IOP_OBJS = \
 	accdvde-entry.o \

diff --git a/iop/arcade/accore/Makefile b/iop/arcade/accore/Makefile
@@ -7,7 +7,11 @@
 # Review ps2sdk README & LICENSE files for further details.
 
 IOP_INCS += \
-	-I$(PS2SDKSRC)/iop/arcade/acdev/include
+	-I$(PS2SDKSRC)/iop/arcade/acdev/include \
+	-I$(PS2SDKSRC)/iop/system/dmacman/include \
+	-I$(PS2SDKSRC)/iop/system/intrman/include \
+	-I$(PS2SDKSRC)/iop/system/loadcore/include \
+	-I$(PS2SDKSRC)/iop/system/stdio/include
 
 IOP_OBJS = \
 	accore-entry.o \

diff --git a/iop/arcade/acdev/Makefile b/iop/arcade/acdev/Makefile
@@ -7,7 +7,11 @@
 # Review ps2sdk README & LICENSE files for further details.
 
 IOP_INCS += \
-	-I$(PS2SDKSRC)/iop/fs/romdrv/include
+	-I$(PS2SDKSRC)/iop/fs/romdrv/include \
+	-I$(PS2SDKSRC)/iop/system/intrman/include \
+	-I$(PS2SDKSRC)/iop/system/loadcore/include \
+	-I$(PS2SDKSRC)/iop/system/ssbusc/include \
+	-I$(PS2SDKSRC)/iop/system/sysmem/include
 
 IOP_OBJS = \
 	acdev.o \

diff --git a/iop/arcade/acdev9/Makefile b/iop/arcade/acdev9/Makefile
@@ -7,7 +7,9 @@
 # Review ps2sdk README & LICENSE files for further details.
 
 IOP_INCS += \
-	-I$(PS2SDKSRC)/iop/dev9/dev9/include
+	-I$(PS2SDKSRC)/iop/dev9/dev9/include \
+	-I$(PS2SDKSRC)/iop/system/loadcore/include \
+	-I$(PS2SDKSRC)/iop/system/stdio/include
 
 IOP_OBJS = \
 	acdev9.o \

diff --git a/iop/arcade/acflash/Makefile b/iop/arcade/acflash/Makefile
@@ -7,7 +7,10 @@
 # Review ps2sdk README & LICENSE files for further details.
 
 IOP_INCS += \
-	-I$(PS2SDKSRC)/iop/arcade/accore/include
+	-I$(PS2SDKSRC)/iop/arcade/accore/include \
+	-I$(PS2SDKSRC)/iop/system/loadcore/include \
+	-I$(PS2SDKSRC)/iop/system/stdio/include \
+	-I$(PS2SDKSRC)/iop/system/threadman/include
 
 IOP_OBJS = \
 	acflash-entry.o \

diff --git a/iop/arcade/acfpgald/Makefile b/iop/arcade/acfpgald/Makefile
@@ -7,7 +7,11 @@
 # Review ps2sdk README & LICENSE files for further details.
 
 IOP_INCS += \
-	-I$(PS2SDKSRC)/iop/arcade/accore/include
+	-I$(PS2SDKSRC)/iop/arcade/accore/include \
+	-I$(PS2SDKSRC)/iop/system/ioman/include \
+	-I$(PS2SDKSRC)/iop/system/stdio/include \
+	-I$(PS2SDKSRC)/iop/system/sysclib/include \
+	-I$(PS2SDKSRC)/iop/system/threadman/include
 
 IOP_OBJS = \
 	fpgald.o \

diff --git a/iop/arcade/acjv/Makefile b/iop/arcade/acjv/Makefile
@@ -7,7 +7,8 @@
 # Review ps2sdk README & LICENSE files for further details.
 
 IOP_INCS += \
-	-I$(PS2SDKSRC)/iop/arcade/accore/include
+	-I$(PS2SDKSRC)/iop/arcade/accore/include \
+	-I$(PS2SDKSRC)/iop/system/loadcore/include
 
 IOP_OBJS = \
 	acjv-entry.o \

diff --git a/iop/arcade/acjvld/Makefile b/iop/arcade/acjvld/Makefile
@@ -7,7 +7,10 @@
 # Review ps2sdk README & LICENSE files for further details.
 
 IOP_INCS += \
-	-I$(PS2SDKSRC)/iop/arcade/accore/include
+	-I$(PS2SDKSRC)/iop/arcade/accore/include \
+	-I$(PS2SDKSRC)/iop/system/ioman/include \
+	-I$(PS2SDKSRC)/iop/system/stdio/include \
+	-I$(PS2SDKSRC)/iop/system/sysclib/include
 
 IOP_OBJS = \
 	jvld.o \

diff --git a/iop/arcade/acmem/Makefile b/iop/arcade/acmem/Makefile
@@ -7,7 +7,12 @@
 # Review ps2sdk README & LICENSE files for further details.
 
 IOP_INCS += \
-	-I$(PS2SDKSRC)/iop/arcade/accore/include
+	-I$(PS2SDKSRC)/iop/arcade/accore/include \
+	-I$(PS2SDKSRC)/iop/system/intrman/include \
+	-I$(PS2SDKSRC)/iop/system/loadcore/include \
+	-I$(PS2SDKSRC)/iop/system/sifcmd/include \
+	-I$(PS2SDKSRC)/iop/system/sifman/include \
+	-I$(PS2SDKSRC)/iop/system/threadman/include
 
 IOP_OBJS = \
 	acmem-entry.o \

diff --git a/iop/arcade/acmeme/Makefile b/iop/arcade/acmeme/Makefile
@@ -11,7 +11,13 @@ IOP_INCS += \
 	-I$(PS2SDKSRC)/iop/arcade/acjv/include \
 	-I$(PS2SDKSRC)/iop/arcade/acmem/include \
 	-I$(PS2SDKSRC)/iop/arcade/acram/include \
-	-I$(PS2SDKSRC)/iop/arcade/acsram/include
+	-I$(PS2SDKSRC)/iop/arcade/acsram/include \
+	-I$(PS2SDKSRC)/iop/system/loadcore/include \
+	-I$(PS2SDKSRC)/iop/system/sifcmd/include \
+	-I$(PS2SDKSRC)/iop/system/stdio/include \
+	-I$(PS2SDKSRC)/iop/system/sysclib/include \
+	-I$(PS2SDKSRC)/iop/system/sysmem/include \
+	-I$(PS2SDKSRC)/iop/system/threadman/include
 
 IOP_OBJS = \
 	acmeme-entry.o \

diff --git a/iop/arcade/acram/Makefile b/iop/arcade/acram/Makefile
@@ -7,7 +7,13 @@
 # Review ps2sdk README & LICENSE files for further details.
 
 IOP_INCS += \
-	-I$(PS2SDKSRC)/iop/arcade/accore/include
+	-I$(PS2SDKSRC)/iop/arcade/accore/include \
+	-I$(PS2SDKSRC)/iop/system/intrman/include \
+	-I$(PS2SDKSRC)/iop/system/loadcore/include \
+	-I$(PS2SDKSRC)/iop/system/stdio/include \
+	-I$(PS2SDKSRC)/iop/system/sysclib/include \
+	-I$(PS2SDKSRC)/iop/system/sysmem/include \
+	-I$(PS2SDKSRC)/iop/system/threadman/include
 
 IOP_OBJS = \
 	acram-entry.o \

diff --git a/iop/arcade/acrtc/Makefile b/iop/arcade/acrtc/Makefile
@@ -6,6 +6,12 @@
 # Licenced under Academic Free License version 2.0
 # Review ps2sdk README & LICENSE files for further details.
 
+IOP_INCS += \
+	-I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \
+	-I$(PS2SDKSRC)/iop/system/sifcmd/include \
+	-I$(PS2SDKSRC)/iop/system/stdio/include \
+	-I$(PS2SDKSRC)/iop/system/threadman/include
+
 IOP_OBJS = \
 	iopmain.o \
 	imports.o

diff --git a/iop/arcade/acsram/Makefile b/iop/arcade/acsram/Makefile
@@ -7,7 +7,8 @@
 # Review ps2sdk README & LICENSE files for further details.
 
 IOP_INCS += \
-	-I$(PS2SDKSRC)/iop/arcade/accore/include
+	-I$(PS2SDKSRC)/iop/arcade/accore/include \
+	-I$(PS2SDKSRC)/iop/system/loadcore/include
 
 IOP_OBJS = \
 	acsram-entry.o \

diff --git a/iop/arcade/actimer/Makefile b/iop/arcade/actimer/Makefile
@@ -7,7 +7,11 @@
 # Review ps2sdk README & LICENSE files for further details.
 
 IOP_INCS += \
-	-I$(PS2SDKSRC)/iop/arcade/accore/include
+	-I$(PS2SDKSRC)/iop/arcade/accore/include \
+	-I$(PS2SDKSRC)/iop/system/intrman/include \
+	-I$(PS2SDKSRC)/iop/system/loadcore/include \
+	-I$(PS2SDKSRC)/iop/system/sysclib/include \
+	-I$(PS2SDKSRC)/iop/system/threadman/include
 
 IOP_OBJS = \
 	actimer-entry.o \

diff --git a/iop/arcade/acuart/Makefile b/iop/arcade/acuart/Makefile
@@ -7,7 +7,14 @@
 # Review ps2sdk README & LICENSE files for further details.
 
 IOP_INCS += \
-	-I$(PS2SDKSRC)/iop/arcade/accore/include
+	-I$(PS2SDKSRC)/iop/arcade/accore/include \
+	-I$(PS2SDKSRC)/iop/system/intrman/include \
+	-I$(PS2SDKSRC)/iop/system/ioman/include \
+	-I$(PS2SDKSRC)/iop/system/loadcore/include \
+	-I$(PS2SDKSRC)/iop/system/stdio/include \
+	-I$(PS2SDKSRC)/iop/system/sysclib/include \
+	-I$(PS2SDKSRC)/iop/system/sysmem/include \
+	-I$(PS2SDKSRC)/iop/system/threadman/include
 
 ADD_TTY ?= 0
 

diff --git a/iop/cdvd/cdfs/Makefile b/iop/cdvd/cdfs/Makefile
@@ -8,6 +8,19 @@
 
 # IOP_CFLAGS += -DSIO_DEBUG -DDEBUG
 
+IOP_INCS += \
+	-I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \
+	-I$(PS2SDKSRC)/iop/debug/sior/include \
+	-I$(PS2SDKSRC)/iop/system/intrman/include \
+	-I$(PS2SDKSRC)/iop/system/ioman/include \
+	-I$(PS2SDKSRC)/iop/system/loadcore/include \
+	-I$(PS2SDKSRC)/iop/system/sifcmd/include \
+	-I$(PS2SDKSRC)/iop/system/sifman/include \
+	-I$(PS2SDKSRC)/iop/system/stdio/include \
+	-I$(PS2SDKSRC)/iop/system/sysclib/include \
+	-I$(PS2SDKSRC)/iop/system/sysmem/include \
+	-I$(PS2SDKSRC)/iop/system/threadman/include
+
 IOP_OBJS = main.o cdfs_iop.o imports.o
 
 include $(PS2SDKSRC)/Defs.make

diff --git a/iop/cdvd/cdvdfsv/Makefile b/iop/cdvd/cdvdfsv/Makefile
@@ -7,6 +7,20 @@
 # Review ps2sdk README & LICENSE files for further details.
 
 IOP_CFLAGS += -DBUILDING_CDVD_MODULE
+
+IOP_INCS += \
+	-I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \
+	-I$(PS2SDKSRC)/iop/system/dmacman/include \
+	-I$(PS2SDKSRC)/iop/system/intrman/include \
+	-I$(PS2SDKSRC)/iop/system/iomanx/include \
+	-I$(PS2SDKSRC)/iop/system/loadcore/include \
+	-I$(PS2SDKSRC)/iop/system/sifcmd/include \
+	-I$(PS2SDKSRC)/iop/system/sifman/include \
+	-I$(PS2SDKSRC)/iop/system/stdio/include \
+	-I$(PS2SDKSRC)/iop/system/sysclib/include \
+	-I$(PS2SDKSRC)/iop/system/sysmem/include \
+	-I$(PS2SDKSRC)/iop/system/threadman/include
+
 IOP_OBJS = cdvdfsv.o imports.o exports.o
 
 include $(PS2SDKSRC)/Defs.make

diff --git a/iop/kernel/include/cdvdfsv.h → iop/cdvd/cdvdfsv/include/cdvdfsv.h b/iop/kernel/include/cdvdfsv.h → iop/cdvd/cdvdfsv/include/cdvdfsv.h
diff --git a/iop/cdvd/cdvdman/Makefile b/iop/cdvd/cdvdman/Makefile
@@ -7,6 +7,17 @@
 # Review ps2sdk README & LICENSE files for further details.
 
 IOP_CFLAGS += -DBUILDING_CDVD_MODULE
+
+IOP_INCS += \
+	-I$(PS2SDKSRC)/iop/system/dmacman/include \
+	-I$(PS2SDKSRC)/iop/system/intrman/include \
+	-I$(PS2SDKSRC)/iop/system/iomanx/include \
+	-I$(PS2SDKSRC)/iop/system/loadcore/include \
+	-I$(PS2SDKSRC)/iop/system/stdio/include \
+	-I$(PS2SDKSRC)/iop/system/sysclib/include \
+	-I$(PS2SDKSRC)/iop/system/sysmem/include \
+	-I$(PS2SDKSRC)/iop/system/threadman/include
+
 IOP_OBJS = cdvdman.o imports.o exports.o
 
 include $(PS2SDKSRC)/Defs.make

diff --git a/iop/kernel/include/cdvdman.h → iop/cdvd/cdvdman/include/cdvdman.h b/iop/kernel/include/cdvdman.h → iop/cdvd/cdvdman/include/cdvdman.h
diff --git a/iop/cdvd/cdvdstm/Makefile b/iop/cdvd/cdvdstm/Makefile
@@ -7,6 +7,18 @@
 # Review ps2sdk README & LICENSE files for further details.
 
 IOP_CFLAGS += -DBUILDING_CDVD_MODULE
+
+IOP_INCS += \
+	-I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \
+	-I$(PS2SDKSRC)/iop/system/intrman/include \
+	-I$(PS2SDKSRC)/iop/system/iomanx/include \
+	-I$(PS2SDKSRC)/iop/system/loadcore/include \
+	-I$(PS2SDKSRC)/iop/system/sifman/include \
+	-I$(PS2SDKSRC)/iop/system/stdio/include \
+	-I$(PS2SDKSRC)/iop/system/sysclib/include \
+	-I$(PS2SDKSRC)/iop/system/sysmem/include \
+	-I$(PS2SDKSRC)/iop/system/threadman/include
+
 IOP_OBJS = cdvdstm.o imports.o exports.o
 
 include $(PS2SDKSRC)/Defs.make

diff --git a/iop/cdvd/xesdrv/Makefile b/iop/cdvd/xesdrv/Makefile
@@ -7,6 +7,12 @@
 # Review ps2sdk README & LICENSE files for further details.
 
 IOP_CFLAGS += -DIOMANX_OLD_NAME_COMPATIBILITY=0 -DIOMANX_OLD_NAME_ADDDELDRV=0
+
+IOP_INCS += \
+	-I$(PS2SDKSRC)/iop/system/iomanx/include \
+	-I$(PS2SDKSRC)/iop/system/loadcore/include \
+	-I$(PS2SDKSRC)/iop/system/threadman/include
+
 IOP_OBJS = xesdrv.o imports.o
 
 include $(PS2SDKSRC)/Defs.make

diff --git a/iop/debug/iop_sbusdbg/Makefile b/iop/debug/iop_sbusdbg/Makefile
@@ -6,7 +6,21 @@
 # Licenced under Academic Free License version 2.0
 # Review ps2sdk README & LICENSE files for further details.
 
-IOP_INCS += -I$(PS2SDKSRC)/common/sbus/include -I$(PS2SDKSRC)/iop/debug/iopdebug/include
+IOP_INCS += \
+	-I$(PS2SDKSRC)/common/sbus/include \
+	-I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \
+	-I$(PS2SDKSRC)/iop/debug/iopdebug/include \
+	-I$(PS2SDKSRC)/iop/system/excepman/include \
+	-I$(PS2SDKSRC)/iop/system/intrman/include \
+	-I$(PS2SDKSRC)/iop/system/ioman/include \
+	-I$(PS2SDKSRC)/iop/system/loadcore/include \
+	-I$(PS2SDKSRC)/iop/system/modload/include \
+	-I$(PS2SDKSRC)/iop/system/sifcmd/include \
+	-I$(PS2SDKSRC)/iop/system/sifman/include \
+	-I$(PS2SDKSRC)/iop/system/stdio/include \
+	-I$(PS2SDKSRC)/iop/system/sysclib/include \
+	-I$(PS2SDKSRC)/iop/system/sysmem/include \
+	-I$(PS2SDKSRC)/iop/system/threadman/include
 
 IOP_OBJS = main.o sbus_dbg_low.o sbus_tty.o sbus_dbg.o imports.o