diff --git a/src/os/__osLeoInterrupt.c b/src/os/__osLeoInterrupt.c index e77c5af6d..6d3b23071 100644 --- a/src/os/__osLeoInterrupt.c +++ b/src/os/__osLeoInterrupt.c @@ -1,4 +1,4 @@ -#include "ultra64.h" +#include #include "osint.h" #include "piint.h" #include "libultra_internal.h" diff --git a/src/os/contramread.c b/src/os/contramread.c index 5f3b6e68d..8a0486b37 100644 --- a/src/os/contramread.c +++ b/src/os/contramread.c @@ -1,5 +1,5 @@ #include "libultra_internal.h" -#include "PR/rcp.h" +#include #include "controller.h" extern s32 __osPfsGetStatus(OSMesgQueue *, s32); diff --git a/src/os/contramwrite.c b/src/os/contramwrite.c index ebb8d77c5..56f42bcef 100644 --- a/src/os/contramwrite.c +++ b/src/os/contramwrite.c @@ -1,5 +1,5 @@ #include "libultra_internal.h" -#include "PR/rcp.h" +#include #include "controller.h" extern s32 __osPfsGetStatus(OSMesgQueue *, s32); diff --git a/src/os/controller.h b/src/os/controller.h index 541fafdc6..d0f8a3b1c 100644 --- a/src/os/controller.h +++ b/src/os/controller.h @@ -1,8 +1,8 @@ #ifndef _CONTROLLER_H #define _CONTROLLER_H -#include "PR/os_internal.h" -#include "PR/os.h" -#include "PR/rcp.h" +#include +#include +#include //should go somewhere else but #define ARRLEN(x) ((s32)(sizeof(x) / sizeof(x[0]))) diff --git a/src/os/epidma.c b/src/os/epidma.c index 3aa76f17a..fb9e36393 100644 --- a/src/os/epidma.c +++ b/src/os/epidma.c @@ -1,6 +1,6 @@ #ifdef VERSION_SH -#include "PR/os_internal.h" +#include #include "piint.h" s32 osEPiStartDma(OSPiHandle *pihandle, OSIoMesg *mb, s32 direction) { diff --git a/src/os/leointerrupt.c b/src/os/leointerrupt.c index db221dba9..1bc26a1a9 100644 --- a/src/os/leointerrupt.c +++ b/src/os/leointerrupt.c @@ -1,5 +1,5 @@ #include "libultra_internal.h" -#include "PR/rcp.h" +#include #include "bstring.h" #include "piint.h" #include "osint.h" diff --git a/src/os/osCartRomInit.c b/src/os/osCartRomInit.c index b1b6599c7..b8242a97e 100644 --- a/src/os/osCartRomInit.c +++ b/src/os/osCartRomInit.c @@ -1,11 +1,11 @@ #include "libultra_internal.h" -#include "PR/os_vi.h" -#include "PR/os_internal.h" -#include "PR/R4300.h" -#include "PR/rcp.h" -#include "PR/os_pi.h" -#include "PR/os.h" +#include +#include +#include +#include +#include +#include OSPiHandle CartRomHandle; diff --git a/src/os/osEPiRawStartDma.c b/src/os/osEPiRawStartDma.c index 31d9fd37c..2c444d176 100644 --- a/src/os/osEPiRawStartDma.c +++ b/src/os/osEPiRawStartDma.c @@ -1,7 +1,7 @@ #include "libultra_internal.h" #include "hardware.h" #include "new_func.h" -#include "PR/R4300.h" +#include //! @todo This define is from piint.h, but including that causes problems... #define UPDATE_REG(reg, var) \ if (cHandle->var != pihandle->var) \ diff --git a/src/os/osPfsIsPlug.c b/src/os/osPfsIsPlug.c index 4df1bf328..434a097c5 100644 --- a/src/os/osPfsIsPlug.c +++ b/src/os/osPfsIsPlug.c @@ -1,6 +1,6 @@ #include "libultra_internal.h" -#include "PR/os_pi.h" +#include #include "controller.h" OSPifRam __osPfsPifRam; diff --git a/src/os/osPfsNumFiles.c b/src/os/osPfsNumFiles.c index 09d0eba6f..006329949 100755 --- a/src/os/osPfsNumFiles.c +++ b/src/os/osPfsNumFiles.c @@ -1,5 +1,5 @@ #include "libultra_internal.h" -#include "PR/os.h" +#include #include "controller.h" s32 osPfsNumFiles(OSPfs *pfs, s32 *max_files, s32 *files_used) diff --git a/src/os/piint.h b/src/os/piint.h index 39278eed9..86337b917 100644 --- a/src/os/piint.h +++ b/src/os/piint.h @@ -1,9 +1,9 @@ #ifndef _PIINT_H #define _PIINT_H -#include "PR/os_internal.h" -#include "PR/rcp.h" -#include "PR/os_pi.h" -#include "PR/os.h" +#include +#include +#include +#include //https://github.com/LuigiBlood/64dd/wiki/Memory-Map