Move some headers from src to include/PRinternal (#77)

* controller.h * siint.h * osint and viint * piint.h * rmonint.h * Remove ARRLEN from controller.h * PRinternal * controller_gbpak.h and controller_voice.h
decompals · Jun 7, 2024 · a1542b6 · a1542b6
1 parent 5e8f8f0
commit a1542b6
Show file tree

Hide file tree

Showing 216 changed files with 269 additions and 247 deletions.
diff --git a/src/io/controller.h → include/PRinternal/controller.h b/src/io/controller.h → include/PRinternal/controller.h
@@ -5,8 +5,6 @@
 #include "PR/os_version.h"
 #include "PR/rcp.h"
 
-//should go somewhere else but
-#define ARRLEN(x) ((s32)(sizeof(x) / sizeof(x[0])))
 #define CHNL_ERR(format) (((format).rxsize & CHNL_ERR_MASK) >> 4)
 
 typedef struct

diff --git a/src/io/controller_gbpak.h → include/PRinternal/controller_gbpak.h b/src/io/controller_gbpak.h → include/PRinternal/controller_gbpak.h
diff --git a/src/io/controller_voice.h → include/PRinternal/controller_voice.h b/src/io/controller_voice.h → include/PRinternal/controller_voice.h
diff --git a/src/os/osint.h → include/PRinternal/osint.h b/src/os/osint.h → include/PRinternal/osint.h
diff --git a/src/io/piint.h → include/PRinternal/piint.h b/src/io/piint.h → include/PRinternal/piint.h
diff --git a/src/rmon/rmonint.h → include/PRinternal/rmonint.h b/src/rmon/rmonint.h → include/PRinternal/rmonint.h
diff --git a/src/io/siint.h → include/PRinternal/siint.h b/src/io/siint.h → include/PRinternal/siint.h
diff --git a/src/io/viint.h → include/PRinternal/viint.h b/src/io/viint.h → include/PRinternal/viint.h
diff --git a/src/debug/assert.c b/src/debug/assert.c
@@ -1,5 +1,5 @@
 #include "os.h"
-#include "../os/osint.h"
+#include "PRinternal/osint.h"
 #include "osint_debug.h"
 
 void __assertBreak(void);

diff --git a/src/debug/profile.c b/src/debug/profile.c
@@ -4,7 +4,7 @@
 #include "PR/ultraerror.h"
 #include "PR/ultralog.h"
 #include "PR/sptask.h"
-#include "../os/osint.h"
+#include "PRinternal/osint.h"
 #include "macros.h"
 #include "osint_debug.h"
 

diff --git a/src/gio/giointerrupt.c b/src/gio/giointerrupt.c
@@ -1,5 +1,5 @@
 #include "PR/os_internal.h"
-#include "../io/piint.h"
+#include "PRinternal/piint.h"
 
 void __osGIOInterrupt(s32 value) {
     __osPiGetAccess();

diff --git a/src/gio/giorawinterrupt.c b/src/gio/giorawinterrupt.c
@@ -1,6 +1,6 @@
 #include "PR/os_internal.h"
 #include "PR/rcp.h"
-#include "../io/piint.h"
+#include "PRinternal/piint.h"
 
 void __osGIORawInterrupt(s32 value) {
     register u32 stat;

diff --git a/src/io/aisetfreq.c b/src/io/aisetfreq.c
@@ -1,6 +1,6 @@
 #include "PR/rcp.h"
 #include "PR/ultraerror.h"
-#include "../os/osint.h"
+#include "PRinternal/osint.h"
 // TODO: not sure if this should be here
 extern s32 osViClock;
 

diff --git a/src/io/aisetnextbuf.c b/src/io/aisetnextbuf.c
@@ -1,7 +1,7 @@
 #include "PR/os_internal.h"
 #include "PR/ultraerror.h"
 #include "PR/rcp.h"
-#include "../os/osint.h"
+#include "PRinternal/osint.h"
 
 // TODO: this comes from a header
 #ident "$Revision: 1.17 $"

diff --git a/src/io/cartrominit.c b/src/io/cartrominit.c
@@ -3,7 +3,7 @@
 #include "PR/os_internal.h"
 #include "PR/R4300.h"
 #include "PR/rcp.h"
-#include "piint.h"
+#include "PRinternal/piint.h"
 
 #if BUILD_VERSION >= VERSION_J
 OSPiHandle __CartRomHandle ALIGNED(8);

diff --git a/src/io/contchannelreset.c b/src/io/contchannelreset.c
@@ -1,6 +1,6 @@
 #include "PR/os_internal.h"
-#include "controller.h"
-#include "siint.h"
+#include "PRinternal/controller.h"
+#include "PRinternal/siint.h"
 
 s32 __osContChannelReset(OSMesgQueue* mq, int channel) {
     s32 i;

diff --git a/src/io/conteeplongread.c b/src/io/conteeplongread.c
@@ -1,5 +1,5 @@
 #include "PR/os_internal.h"
-#include "controller.h"
+#include "PRinternal/controller.h"
 
 s32 osEepromLongRead(OSMesgQueue* mq, u8 address, u8* buffer, int length) {
     s32 ret = 0;

diff --git a/src/io/conteeplongwrite.c b/src/io/conteeplongwrite.c
@@ -1,5 +1,5 @@
 #include "PR/os_internal.h"
-#include "controller.h"
+#include "PRinternal/controller.h"
 
 s32 osEepromLongWrite(OSMesgQueue* mq, u8 address, u8* buffer, int length) {
     s32 ret = 0;

diff --git a/src/io/conteepprobe.c b/src/io/conteepprobe.c
@@ -1,5 +1,5 @@
-#include "controller.h"
-#include "siint.h"
+#include "PRinternal/controller.h"
+#include "PRinternal/siint.h"
 
 s32 osEepromProbe(OSMesgQueue* mq) {
     s32 ret = 0;

diff --git a/src/io/conteepread.c b/src/io/conteepread.c
@@ -1,7 +1,7 @@
 #include "macros.h"
 #include "PR/rcp.h"
-#include "controller.h"
-#include "siint.h"
+#include "PRinternal/controller.h"
+#include "PRinternal/siint.h"
 
 OSPifRam __osEepPifRam ALIGNED(16);
 #if BUILD_VERSION >= VERSION_L

diff --git a/src/io/conteepwrite.c b/src/io/conteepwrite.c
@@ -1,7 +1,8 @@
+#include "macros.h"
 #include "PR/os_internal.h"
 #include "PR/rcp.h"
-#include "controller.h"
-#include "siint.h"
+#include "PRinternal/controller.h"
+#include "PRinternal/siint.h"
 
 static void __osPackEepWriteData(u8 address, u8* buffer);
 s32 osEepromWrite(OSMesgQueue* mq, u8 address, u8* buffer) {

diff --git a/src/io/contpfs.c b/src/io/contpfs.c
@@ -1,7 +1,7 @@
 #include "macros.h"
 #include "PR/os_internal.h"
 #include "PR/os_version.h"
-#include "controller.h"
+#include "PRinternal/controller.h"
 #include "PR/rmon.h"
 
 #if BUILD_VERSION >= VERSION_J

diff --git a/src/io/contquery.c b/src/io/contquery.c
@@ -1,6 +1,6 @@
 #include "PR/os_internal.h"
-#include "controller.h"
-#include "siint.h"
+#include "PRinternal/controller.h"
+#include "PRinternal/siint.h"
 
 s32 osContStartQuery(OSMesgQueue* mq) {
     s32 ret = 0;

diff --git a/src/io/contramread.c b/src/io/contramread.c
@@ -1,7 +1,8 @@
+#include "macros.h"
 #include "PR/os_internal.h"
 #include "PR/rcp.h"
-#include "controller.h"
-#include "siint.h"
+#include "PRinternal/controller.h"
+#include "PRinternal/siint.h"
 
 #define READFORMAT(ptr) ((__OSContRamReadFormat*)(ptr))
 

diff --git a/src/io/contramwrite.c b/src/io/contramwrite.c
@@ -1,7 +1,8 @@
+#include "macros.h"
 #include "PR/os_internal.h"
 #include "PR/rcp.h"
-#include "controller.h"
-#include "siint.h"
+#include "PRinternal/controller.h"
+#include "PRinternal/siint.h"
 
 extern s32 __osPfsLastChannel;
 

diff --git a/src/io/contreaddata.c b/src/io/contreaddata.c
@@ -1,6 +1,7 @@
+#include "macros.h"
 #include "PR/os_internal.h"
-#include "controller.h"
-#include "siint.h"
+#include "PRinternal/controller.h"
+#include "PRinternal/siint.h"
 
 static void __osPackReadData(void);
 

diff --git a/src/io/contreset.c b/src/io/contreset.c
@@ -1,6 +1,6 @@
 #include "PR/os_internal.h"
-#include "controller.h"
-#include "siint.h"
+#include "PRinternal/controller.h"
+#include "PRinternal/siint.h"
 
 void __osPackResetData(void);
 

diff --git a/src/io/controller.c b/src/io/controller.c
@@ -1,7 +1,7 @@
 #include "macros.h"
 #include "PR/os_internal.h"
-#include "controller.h"
-#include "siint.h"
+#include "PRinternal/controller.h"
+#include "PRinternal/siint.h"
 
 OSPifRam __osContPifRam ALIGNED(16);
 u8 __osContLastCmd;

diff --git a/src/io/contsetch.c b/src/io/contsetch.c
@@ -1,6 +1,6 @@
 #include "PR/os_internal.h"
-#include "controller.h"
-#include "siint.h"
+#include "PRinternal/controller.h"
+#include "PRinternal/siint.h"
 
 s32 osContSetCh(u8 ch) {
     s32 ret = 0;

diff --git a/src/io/devmgr.c b/src/io/devmgr.c
@@ -1,6 +1,6 @@
 #include "PR/os_internal.h"
 #include "PR/rcp.h"
-#include "piint.h"
+#include "PRinternal/piint.h"
 
 void __osDevMgrMain(void* args) {
     OSIoMesg* mb;

diff --git a/src/io/dpsetnextbuf.c b/src/io/dpsetnextbuf.c
@@ -1,7 +1,7 @@
 #include "PR/os_internal.h"
 #include "PR/ultraerror.h"
 #include "PR/rcp.h"
-#include "../os/osint.h"
+#include "PRinternal/osint.h"
 
 // TODO: this comes from a header
 #ident "$Revision: 1.17 $"

diff --git a/src/io/epidma.c b/src/io/epidma.c
@@ -1,4 +1,4 @@
-#include "piint.h"
+#include "PRinternal/piint.h"
 #include "PR/ultraerror.h"
 
 s32 osEPiStartDma(OSPiHandle* pihandle, OSIoMesg* mb, s32 direction) {

diff --git a/src/io/epigettype.c b/src/io/epigettype.c
@@ -1,4 +1,4 @@
-#include "piint.h"
+#include "PRinternal/piint.h"
 
 s32 osEPiGetDeviceType(OSPiHandle* pihandle, OSPiInfo* info) {
     info->type = pihandle->type;

diff --git a/src/io/epilinkhandle.c b/src/io/epilinkhandle.c
@@ -1,4 +1,4 @@
-#include "piint.h"
+#include "PRinternal/piint.h"
 
 s32 osEPiLinkHandle(OSPiHandle* EPiHandle) {
     u32 saveMask = __osDisableInt();

diff --git a/src/io/epirawdma.c b/src/io/epirawdma.c
@@ -1,4 +1,4 @@
-#include "piint.h"
+#include "PRinternal/piint.h"
 #include "PR/ultraerror.h"
 
 // TODO: this comes from a header

diff --git a/src/io/epirawread.c b/src/io/epirawread.c
@@ -1,4 +1,4 @@
-#include "piint.h"
+#include "PRinternal/piint.h"
 #include "PR/ultraerror.h"
 #include "assert.h"
 

diff --git a/src/io/epirawwrite.c b/src/io/epirawwrite.c
@@ -1,4 +1,4 @@
-#include "piint.h"
+#include "PRinternal/piint.h"
 #include "PR/ultraerror.h"
 
 // TODO: this comes from a header

diff --git a/src/io/epiread.c b/src/io/epiread.c
@@ -1,4 +1,4 @@
-#include "piint.h"
+#include "PRinternal/piint.h"
 #include "PR/ultraerror.h"
 
 s32 osEPiReadIo(OSPiHandle* pihandle, u32 devAddr, u32* data) {

diff --git a/src/io/epiwrite.c b/src/io/epiwrite.c
@@ -1,4 +1,4 @@
-#include "piint.h"
+#include "PRinternal/piint.h"
 #include "PR/ultraerror.h"
 
 s32 osEPiWriteIo(OSPiHandle* pihandle, u32 devAddr, u32 data) {

diff --git a/src/io/gbpakcheckconnector.c b/src/io/gbpakcheckconnector.c
@@ -1,6 +1,6 @@
 #include "macros.h"
 #include "PR/os_internal.h"
-#include "controller.h"
+#include "PRinternal/controller.h"
 
 s32 osGbpakCheckConnector(OSPfs* pfs, u8* status) {
     s32 ret;

diff --git a/src/io/gbpakgetbank.c b/src/io/gbpakgetbank.c
@@ -1,5 +1,5 @@
 #include "PR/os_internal.h"
-#include "controller.h"
+#include "PRinternal/controller.h"
 
 s32 __osGbpakGetBank(OSPfs* pfs, u8* bank) {
     s32 ret;

diff --git a/src/io/gbpakgetstatus.c b/src/io/gbpakgetstatus.c
@@ -1,5 +1,5 @@
 #include "PR/os_internal.h"
-#include "controller.h"
+#include "PRinternal/controller.h"
 
 s32 osGbpakGetStatus(OSPfs* pfs, u8* status) {
     s32 ret;

diff --git a/src/io/gbpakinit.c b/src/io/gbpakinit.c
@@ -1,7 +1,7 @@
 #include "macros.h"
 #include "PR/os_internal.h"
-#include "controller.h"
-#include "controller_gbpak.h"
+#include "PRinternal/controller.h"
+#include "PRinternal/controller_gbpak.h"
 
 OSTimer __osGbpakTimer;
 OSMesgQueue __osGbpakTimerQ ALIGNED(8);

diff --git a/src/io/gbpakpower.c b/src/io/gbpakpower.c
@@ -1,6 +1,6 @@
 #include "PR/os_internal.h"
-#include "controller.h"
-#include "controller_gbpak.h"
+#include "PRinternal/controller.h"
+#include "PRinternal/controller_gbpak.h"
 
 s32 osGbpakPower(OSPfs* pfs, s32 flag) {
     s32 i;

diff --git a/src/io/gbpakreadid.c b/src/io/gbpakreadid.c
@@ -1,6 +1,6 @@
 #include "macros.h"
 #include "PR/os_internal.h"
-#include "controller.h"
+#include "PRinternal/controller.h"
 #include "os_version.h"
 
 s32 osGbpakReadId(OSPfs* pfs, OSGbpakId* id, u8* status) {

diff --git a/src/io/gbpakreadwrite.c b/src/io/gbpakreadwrite.c
@@ -1,5 +1,5 @@
 #include "PR/os_internal.h"
-#include "controller.h"
+#include "PRinternal/controller.h"
 #include "os_version.h"
 
 s32 __osGbpakSetBank(OSPfs* pfs, u8 bank);

diff --git a/src/io/gbpaksetbank.c b/src/io/gbpaksetbank.c
@@ -1,5 +1,5 @@
 #include "PR/os_internal.h"
-#include "controller.h"
+#include "PRinternal/controller.h"
 
 s32 __osGbpakSetBank(OSPfs* pfs, u8 bank) {
     int i;

diff --git a/src/io/leointerrupt.c b/src/io/leointerrupt.c
@@ -1,7 +1,7 @@
 #include "PR/os_internal.h"
 #include "PR/rcp.h"
-#include "../os/osint.h"
-#include "piint.h"
+#include "PRinternal/osint.h"
+#include "PRinternal/piint.h"
 #include "macros.h"
 
 extern OSPiHandle *__osDiskHandle;

diff --git a/src/io/motor.c b/src/io/motor.c
@@ -1,8 +1,8 @@
 #include "macros.h"
 #include "PR/os_internal.h"
 #include "PR/os_version.h"
-#include "controller.h"
-#include "siint.h"
+#include "PRinternal/controller.h"
+#include "PRinternal/siint.h"
 
 #if BUILD_VERSION >= VERSION_J
 static OSPifRam __MotorDataBuf[MAXCONTROLLERS] ALIGNED(8);

diff --git a/src/io/pfsallocatefile.c b/src/io/pfsallocatefile.c
@@ -1,5 +1,6 @@
+#include "macros.h"
 #include "PR/os_internal.h"
-#include "controller.h"
+#include "PRinternal/controller.h"
 #include "PR/rmon.h"
 
 #define ROUND_UP_DIVIDE(numerator, denominator) (((numerator) + (denominator)-1) / (denominator))

diff --git a/src/io/pfschecker.c b/src/io/pfschecker.c
@@ -1,5 +1,6 @@
+#include "macros.h"
 #include "PR/os_internal.h"
-#include "controller.h"
+#include "PRinternal/controller.h"
 
 s32 corrupted_init(OSPfs* pfs, __OSInodeCache* cache);
 s32 corrupted(OSPfs* pfs, __OSInodeUnit fpage, __OSInodeCache* cache);

diff --git a/src/io/pfsdeletefile.c b/src/io/pfsdeletefile.c
@@ -1,5 +1,6 @@
+#include "macros.h"
 #include "PR/os_internal.h"
-#include "controller.h"
+#include "PRinternal/controller.h"
 
 s32 osPfsDeleteFile(OSPfs* pfs, u16 company_code, u32 game_code, u8* game_name, u8* ext_name) {
     s32 file_no;

diff --git a/src/io/pfsfilestate.c b/src/io/pfsfilestate.c
@@ -1,5 +1,6 @@
+#include "macros.h"
 #include "PR/os_internal.h"
-#include "controller.h"
+#include "PRinternal/controller.h"
 
 s32 osPfsFileState(OSPfs* pfs, s32 file_no, OSPfsState* state) {
     s32 ret;

diff --git a/src/io/pfsfreeblocks.c b/src/io/pfsfreeblocks.c
@@ -1,5 +1,6 @@
+#include "macros.h"
 #include "PR/os_internal.h"
-#include "controller.h"
+#include "PRinternal/controller.h"
 
 s32 osPfsFreeBlocks(OSPfs* pfs, s32* bytes_not_used) {
     int j;

diff --git a/src/io/pfsgetlabel.c b/src/io/pfsgetlabel.c
@@ -1,5 +1,6 @@
+#include "macros.h"
 #include "PR/os_internal.h"
-#include "controller.h"
+#include "PRinternal/controller.h"
 
 s32 osPfsGetLabel(OSPfs* pfs, u8* label, int* len) {
     int i;