From a1542b6ae365dad0547e48b45157fe670cf23343 Mon Sep 17 00:00:00 2001 From: Derek Hensley Date: Thu, 6 Jun 2024 19:51:54 -0700 Subject: [PATCH] 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 --- {src/io => include/PRinternal}/controller.h | 2 -- {src/io => include/PRinternal}/controller_gbpak.h | 0 {src/io => include/PRinternal}/controller_voice.h | 0 {src/os => include/PRinternal}/osint.h | 0 {src/io => include/PRinternal}/piint.h | 0 {src/rmon => include/PRinternal}/rmonint.h | 0 {src/io => include/PRinternal}/siint.h | 0 {src/io => include/PRinternal}/viint.h | 0 src/debug/assert.c | 2 +- src/debug/profile.c | 2 +- src/gio/giointerrupt.c | 2 +- src/gio/giorawinterrupt.c | 2 +- src/io/aisetfreq.c | 2 +- src/io/aisetnextbuf.c | 2 +- src/io/cartrominit.c | 2 +- src/io/contchannelreset.c | 4 ++-- src/io/conteeplongread.c | 2 +- src/io/conteeplongwrite.c | 2 +- src/io/conteepprobe.c | 4 ++-- src/io/conteepread.c | 4 ++-- src/io/conteepwrite.c | 5 +++-- src/io/contpfs.c | 2 +- src/io/contquery.c | 4 ++-- src/io/contramread.c | 5 +++-- src/io/contramwrite.c | 5 +++-- src/io/contreaddata.c | 5 +++-- src/io/contreset.c | 4 ++-- src/io/controller.c | 4 ++-- src/io/contsetch.c | 4 ++-- src/io/devmgr.c | 2 +- src/io/dpsetnextbuf.c | 2 +- src/io/epidma.c | 2 +- src/io/epigettype.c | 2 +- src/io/epilinkhandle.c | 2 +- src/io/epirawdma.c | 2 +- src/io/epirawread.c | 2 +- src/io/epirawwrite.c | 2 +- src/io/epiread.c | 2 +- src/io/epiwrite.c | 2 +- src/io/gbpakcheckconnector.c | 2 +- src/io/gbpakgetbank.c | 2 +- src/io/gbpakgetstatus.c | 2 +- src/io/gbpakinit.c | 4 ++-- src/io/gbpakpower.c | 4 ++-- src/io/gbpakreadid.c | 2 +- src/io/gbpakreadwrite.c | 2 +- src/io/gbpaksetbank.c | 2 +- src/io/leointerrupt.c | 4 ++-- src/io/motor.c | 4 ++-- src/io/pfsallocatefile.c | 3 ++- src/io/pfschecker.c | 3 ++- src/io/pfsdeletefile.c | 3 ++- src/io/pfsfilestate.c | 3 ++- src/io/pfsfreeblocks.c | 3 ++- src/io/pfsgetlabel.c | 3 ++- src/io/pfsgetstatus.c | 4 ++-- src/io/pfsinit.c | 4 ++-- src/io/pfsinitpak.c | 5 +++-- src/io/pfsisplug.c | 4 ++-- src/io/pfsnumfiles.c | 2 +- src/io/pfsreadwritefile.c | 3 ++- src/io/pfsreformat.c | 5 +++-- src/io/pfsrepairid.c | 3 ++- src/io/pfssearchfile.c | 3 ++- src/io/pfsselectbank.c | 2 +- src/io/pfssetlabel.c | 3 ++- src/io/pi.c | 2 +- src/io/pidma.c | 2 +- src/io/pigetcmdq.c | 2 +- src/io/pigetstat.c | 2 +- src/io/pimgr.c | 2 +- src/io/pirawdma.c | 2 +- src/io/pirawread.c | 2 +- src/io/pirawwrite.c | 2 +- src/io/piread.c | 2 +- src/io/piwrite.c | 2 +- src/io/si.c | 2 +- src/io/sigetstat.c | 2 +- src/io/sirawdma.c | 2 +- src/io/sirawread.c | 2 +- src/io/sirawwrite.c | 2 +- src/io/sp.c | 2 +- src/io/sprawdma.c | 2 +- src/io/sprawread.c | 2 +- src/io/sprawwrite.c | 2 +- src/io/sptask.c | 2 +- src/io/vi.c | 2 +- src/io/viblack.c | 2 +- src/io/viextendvstart.c | 2 +- src/io/vifade.c | 2 +- src/io/vigetcurrcontext.c | 2 +- src/io/vigetcurrframebuf.c | 2 +- src/io/vigetmode.c | 2 +- src/io/vigetnextcontext.c | 2 +- src/io/vigetnextframebuf.c | 2 +- src/io/vimgr.c | 4 ++-- src/io/virepeatline.c | 2 +- src/io/visetevent.c | 2 +- src/io/visetmode.c | 2 +- src/io/visetspecial.c | 2 +- src/io/visetxscale.c | 2 +- src/io/visetyscale.c | 2 +- src/io/viswapbuf.c | 2 +- src/io/viswapcontext.c | 2 +- src/io/vitbl.c | 2 +- src/os/createmesgqueue.c | 2 +- src/os/createthread.c | 2 +- src/os/destroythread.c | 2 +- src/os/getactivequeue.c | 2 +- src/os/getcurrfaultthread.c | 2 +- src/os/getnextfaultthread.c | 2 +- src/os/getthreadid.c | 2 +- src/os/getthreadpri.c | 2 +- src/os/gettime.c | 4 ++-- src/os/initialize.c | 2 +- src/os/initialize_emu.c | 2 +- src/os/initialize_isv.c | 2 +- src/os/initialize_kmc.c | 2 +- src/os/initialize_msp.c | 2 +- src/os/jammesg.c | 2 +- src/os/recvmesg.c | 2 +- src/os/sendmesg.c | 2 +- src/os/seteventmesg.c | 2 +- src/os/setthreadpri.c | 2 +- src/os/settime.c | 4 ++-- src/os/settimer.c | 4 ++-- src/os/startthread.c | 2 +- src/os/stopthread.c | 2 +- src/os/stoptimer.c | 4 ++-- src/os/thread.c | 2 +- src/os/timerintr.c | 2 +- src/os/virtualtophysical.c | 2 +- src/os/yieldthread.c | 2 +- src/rg/printregion.c | 2 +- src/rmon/rmonbrk.c | 2 +- src/rmon/rmoncmds.c | 2 +- src/rmon/rmonmain.c | 4 ++-- src/rmon/rmonmem.c | 2 +- src/rmon/rmonmisc.c | 2 +- src/rmon/rmonregs.c | 2 +- src/rmon/rmonsio.c | 2 +- src/rmon/rmontask.c | 2 +- src/vimodes/vimodefpalhaf1.c | 2 +- src/vimodes/vimodefpalhan1.c | 2 +- src/vimodes/vimodefpalhpf1.c | 2 +- src/vimodes/vimodefpalhpf2.c | 2 +- src/vimodes/vimodefpalhpn1.c | 2 +- src/vimodes/vimodefpalhpn2.c | 2 +- src/vimodes/vimodefpallaf1.c | 2 +- src/vimodes/vimodefpallaf2.c | 2 +- src/vimodes/vimodefpallan1.c | 2 +- src/vimodes/vimodefpallan2.c | 2 +- src/vimodes/vimodefpallpf1.c | 2 +- src/vimodes/vimodefpallpf2.c | 2 +- src/vimodes/vimodefpallpn1.c | 2 +- src/vimodes/vimodefpallpn2.c | 2 +- src/vimodes/vimodempalhaf1.c | 2 +- src/vimodes/vimodempalhan1.c | 2 +- src/vimodes/vimodempalhpf1.c | 2 +- src/vimodes/vimodempalhpf2.c | 2 +- src/vimodes/vimodempalhpn1.c | 2 +- src/vimodes/vimodempalhpn2.c | 2 +- src/vimodes/vimodempallaf1.c | 2 +- src/vimodes/vimodempallaf2.c | 2 +- src/vimodes/vimodempallan1.c | 2 +- src/vimodes/vimodempallan2.c | 2 +- src/vimodes/vimodempallpf1.c | 2 +- src/vimodes/vimodempallpf2.c | 2 +- src/vimodes/vimodempallpn1.c | 2 +- src/vimodes/vimodempallpn2.c | 2 +- src/vimodes/vimodentschaf1.c | 2 +- src/vimodes/vimodentschan1.c | 2 +- src/vimodes/vimodentschpf1.c | 2 +- src/vimodes/vimodentschpf2.c | 2 +- src/vimodes/vimodentschpn1.c | 2 +- src/vimodes/vimodentschpn2.c | 2 +- src/vimodes/vimodentsclaf1.c | 2 +- src/vimodes/vimodentsclaf2.c | 2 +- src/vimodes/vimodentsclan1.c | 2 +- src/vimodes/vimodentsclan2.c | 2 +- src/vimodes/vimodentsclpf1.c | 2 +- src/vimodes/vimodentsclpf2.c | 2 +- src/vimodes/vimodentsclpn1.c | 2 +- src/vimodes/vimodentsclpn2.c | 2 +- src/vimodes/vimodepalhaf1.c | 2 +- src/vimodes/vimodepalhan1.c | 2 +- src/vimodes/vimodepalhpf1.c | 2 +- src/vimodes/vimodepalhpf2.c | 2 +- src/vimodes/vimodepalhpn1.c | 2 +- src/vimodes/vimodepalhpn2.c | 2 +- src/vimodes/vimodepallaf1.c | 2 +- src/vimodes/vimodepallaf2.c | 2 +- src/vimodes/vimodepallan1.c | 2 +- src/vimodes/vimodepallan2.c | 2 +- src/vimodes/vimodepallpf1.c | 2 +- src/vimodes/vimodepallpf2.c | 2 +- src/vimodes/vimodepallpn1.c | 2 +- src/vimodes/vimodepallpn2.c | 2 +- src/voice/voicecheckresult.c | 2 +- src/voice/voicecheckword.c | 2 +- src/voice/voicecleardictionary.c | 2 +- src/voice/voicecontread2.c | 7 ++++--- src/voice/voicecontread36.c | 7 ++++--- src/voice/voicecontrolgain.c | 3 ++- src/voice/voicecontwrite20.c | 7 ++++--- src/voice/voicecontwrite4.c | 7 ++++--- src/voice/voicecountsyllables.c | 2 +- src/voice/voicecrc.c | 2 +- src/voice/voicegetreaddata.c | 2 +- src/voice/voicegetstatus.c | 4 ++-- src/voice/voiceinit.c | 3 ++- src/voice/voicemaskdictionary.c | 3 ++- src/voice/voicesetadconverter.c | 6 +++--- src/voice/voicesetword.c | 3 ++- src/voice/voicestartreaddata.c | 2 +- src/voice/voicestopreaddata.c | 2 +- 216 files changed, 269 insertions(+), 247 deletions(-) rename {src/io => include/PRinternal}/controller.h (98%) rename {src/io => include/PRinternal}/controller_gbpak.h (100%) rename {src/io => include/PRinternal}/controller_voice.h (100%) rename {src/os => include/PRinternal}/osint.h (100%) rename {src/io => include/PRinternal}/piint.h (100%) rename {src/rmon => include/PRinternal}/rmonint.h (100%) rename {src/io => include/PRinternal}/siint.h (100%) rename {src/io => include/PRinternal}/viint.h (100%) diff --git a/src/io/controller.h b/include/PRinternal/controller.h similarity index 98% rename from src/io/controller.h rename to include/PRinternal/controller.h index 5dac7f5c..2a005735 100644 --- a/src/io/controller.h +++ b/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 b/include/PRinternal/controller_gbpak.h similarity index 100% rename from src/io/controller_gbpak.h rename to include/PRinternal/controller_gbpak.h diff --git a/src/io/controller_voice.h b/include/PRinternal/controller_voice.h similarity index 100% rename from src/io/controller_voice.h rename to include/PRinternal/controller_voice.h diff --git a/src/os/osint.h b/include/PRinternal/osint.h similarity index 100% rename from src/os/osint.h rename to include/PRinternal/osint.h diff --git a/src/io/piint.h b/include/PRinternal/piint.h similarity index 100% rename from src/io/piint.h rename to include/PRinternal/piint.h diff --git a/src/rmon/rmonint.h b/include/PRinternal/rmonint.h similarity index 100% rename from src/rmon/rmonint.h rename to include/PRinternal/rmonint.h diff --git a/src/io/siint.h b/include/PRinternal/siint.h similarity index 100% rename from src/io/siint.h rename to include/PRinternal/siint.h diff --git a/src/io/viint.h b/include/PRinternal/viint.h similarity index 100% rename from src/io/viint.h rename to include/PRinternal/viint.h diff --git a/src/debug/assert.c b/src/debug/assert.c index ab7e3136..ffdb5eee 100644 --- 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 index 47b19d80..e09ce92b 100644 --- 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 index 3abc04fd..121c5d8e 100644 --- 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 index 2fdc9096..e36f5ded 100644 --- 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 index e41d6faf..df324b04 100644 --- 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 index 041b61df..646d17c7 100644 --- 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 index 87aa8bb3..d8babee5 100644 --- 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 index f6ed8a22..108a594c 100644 --- 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 index d8d59f65..edebfc8d 100644 --- 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 index c5668e15..8ecce254 100644 --- 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 index b19dc495..ca097900 100644 --- 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 index 2d334fa9..85400db4 100644 --- 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 index 73524302..e82366fd 100644 --- 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 index c845a7d5..7b2955c3 100644 --- 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 index df038ce7..f2869f03 100644 --- 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 index 9c399ee0..afe5d406 100644 --- 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 index a213049d..cc42322b 100644 --- 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 index da0cac34..87919236 100644 --- 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 index 140088a6..c752f5b8 100644 --- 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 index 728c2076..6c95555e 100644 --- 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 index 0cababd5..f7841619 100644 --- 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 index 616dee58..70b26ccd 100644 --- 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 index 63144720..cbf3a6f2 100644 --- 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 index 06a9f698..77c6be6d 100644 --- 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 index c94012ca..8487e682 100644 --- 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 index 5f518544..2e9b1fac 100644 --- 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 index 69a404d8..b8623539 100644 --- 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 index 500a2cea..f6d446c1 100644 --- 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 index 79fba314..9ab98a8f 100644 --- 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 index 08cd0be7..b2f346bf 100644 --- 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 index 42a239ed..767caf5e 100644 --- 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 index 8eb32981..9c7650da 100644 --- 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 index a2e5f384..e4486882 100644 --- 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 index d17d15c6..76e78913 100644 --- 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 index 102d9623..dfd12ba7 100644 --- 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 index 3d4a8f45..e2aa6f78 100644 --- 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 index 3e2fa193..05c7c959 100644 --- 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 index a6d4b02c..fe16ee2b 100644 --- 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 index 7a08646a..efd2267a 100644 --- 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 index ad34e458..de8e59ef 100644 --- 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 index 8028d693..e6f2205d 100644 --- 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 index 24f6fe7c..2fc1c72e 100644 --- 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 index b7362000..599acec9 100644 --- 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 index e0132119..60a8b3e2 100644 --- 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 index 4f800208..5ed630ab 100644 --- 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 index 68a54c61..2ee92e41 100644 --- 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 index 0e4de49b..c7e2e388 100644 --- 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; diff --git a/src/io/pfsgetstatus.c b/src/io/pfsgetstatus.c index 955412ba..fa736e3f 100644 --- a/src/io/pfsgetstatus.c +++ b/src/io/pfsgetstatus.c @@ -1,6 +1,6 @@ #include "PR/os_internal.h" -#include "controller.h" -#include "siint.h" +#include "PRinternal/controller.h" +#include "PRinternal/siint.h" #if BUILD_VERSION >= VERSION_J void __osPfsRequestOneChannel(int channel, u8 cmd); diff --git a/src/io/pfsinit.c b/src/io/pfsinit.c index 5633c789..581cefcb 100644 --- a/src/io/pfsinit.c +++ b/src/io/pfsinit.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 osPfsInit(OSMesgQueue* queue, OSPfs* pfs, int channel) { s32 ret = 0; diff --git a/src/io/pfsinitpak.c b/src/io/pfsinitpak.c index d3fde1f6..18e65624 100644 --- a/src/io/pfsinitpak.c +++ b/src/io/pfsinitpak.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" #if BUILD_VERSION >= VERSION_J static s32 __osPfsCheckRamArea(OSPfs* pfs); diff --git a/src/io/pfsisplug.c b/src/io/pfsisplug.c index 9607907d..1fb53827 100644 --- a/src/io/pfsisplug.c +++ b/src/io/pfsisplug.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 __osPfsPifRam ALIGNED(16); diff --git a/src/io/pfsnumfiles.c b/src/io/pfsnumfiles.c index 7fa352e4..d0af53b3 100644 --- a/src/io/pfsnumfiles.c +++ b/src/io/pfsnumfiles.c @@ -1,5 +1,5 @@ #include "PR/os_internal.h" -#include "controller.h" +#include "PRinternal/controller.h" s32 osPfsNumFiles(OSPfs* pfs, s32* max_files, s32* files_used) { int j; diff --git a/src/io/pfsreadwritefile.c b/src/io/pfsreadwritefile.c index 17afe547..507b12c4 100644 --- a/src/io/pfsreadwritefile.c +++ b/src/io/pfsreadwritefile.c @@ -1,5 +1,6 @@ +#include "macros.h" #include "PR/os_internal.h" -#include "controller.h" +#include "PRinternal/controller.h" static s32 __osPfsGetNextPage(OSPfs* pfs, u8* bank, __OSInode* inode, __OSInodeUnit* page) { s32 ret; diff --git a/src/io/pfsreformat.c b/src/io/pfsreformat.c index 687b4564..5e6dc306 100644 --- a/src/io/pfsreformat.c +++ b/src/io/pfsreformat.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" s32 osPfsReFormat(OSPfs* pfs, OSMesgQueue* queue, int channel) { int j; diff --git a/src/io/pfsrepairid.c b/src/io/pfsrepairid.c index 348f8b20..75629272 100644 --- a/src/io/pfsrepairid.c +++ b/src/io/pfsrepairid.c @@ -1,5 +1,6 @@ +#include "macros.h" #include "PR/os_internal.h" -#include "controller.h" +#include "PRinternal/controller.h" #if BUILD_VERSION >= VERSION_J diff --git a/src/io/pfssearchfile.c b/src/io/pfssearchfile.c index 4fa3c57e..6e5f58a6 100644 --- a/src/io/pfssearchfile.c +++ b/src/io/pfssearchfile.c @@ -1,5 +1,6 @@ +#include "macros.h" #include "PR/os_internal.h" -#include "controller.h" +#include "PRinternal/controller.h" s32 osPfsFindFile(OSPfs* pfs, u16 company_code, u32 game_code, u8* game_name, u8* ext_name, s32* file_no) { s32 j; diff --git a/src/io/pfsselectbank.c b/src/io/pfsselectbank.c index 7e33b2d3..70a88861 100644 --- a/src/io/pfsselectbank.c +++ b/src/io/pfsselectbank.c @@ -1,5 +1,5 @@ #include "PR/os_internal.h" -#include "controller.h" +#include "PRinternal/controller.h" #if BUILD_VERSION >= VERSION_J s32 __osPfsSelectBank(OSPfs* pfs, u8 bank) { diff --git a/src/io/pfssetlabel.c b/src/io/pfssetlabel.c index 43308c7d..c5317734 100644 --- a/src/io/pfssetlabel.c +++ b/src/io/pfssetlabel.c @@ -1,5 +1,6 @@ +#include "macros.h" #include "PR/os_internal.h" -#include "controller.h" +#include "PRinternal/controller.h" s32 osPfsSetLabel(OSPfs* pfs, u8* label) { int i; diff --git a/src/io/pi.c b/src/io/pi.c index 3e67ddbe..3fd3a63c 100644 --- a/src/io/pi.c +++ b/src/io/pi.c @@ -1,6 +1,6 @@ #include "PR/os_internal.h" -#include "piint.h" +#include "PRinternal/piint.h" // TODO: this comes from a header #ident "$Revision: 1.17 $" diff --git a/src/io/pidma.c b/src/io/pidma.c index 0584e124..2464a6d3 100644 --- a/src/io/pidma.c +++ b/src/io/pidma.c @@ -1,6 +1,6 @@ #include "PR/os_internal.h" #include "PR/ultraerror.h" -#include "piint.h" +#include "PRinternal/piint.h" s32 osPiStartDma(OSIoMesg* mb, s32 priority, s32 direction, u32 devAddr, void* dramAddr, u32 size, OSMesgQueue* mq) { register s32 ret; diff --git a/src/io/pigetcmdq.c b/src/io/pigetcmdq.c index 4724301d..a4919d55 100644 --- a/src/io/pigetcmdq.c +++ b/src/io/pigetcmdq.c @@ -1,5 +1,5 @@ #include "PR/os_internal.h" -#include "piint.h" +#include "PRinternal/piint.h" OSMesgQueue* osPiGetCmdQueue(void) { if (!__osPiDevMgr.active) { diff --git a/src/io/pigetstat.c b/src/io/pigetstat.c index 43e9a271..eef1cc17 100644 --- a/src/io/pigetstat.c +++ b/src/io/pigetstat.c @@ -1,5 +1,5 @@ #include "PR/os_internal.h" -#include "piint.h" +#include "PRinternal/piint.h" // TODO: this comes from a header #ident "$Revision: 1.17 $" diff --git a/src/io/pimgr.c b/src/io/pimgr.c index d98c6adc..4f20ec05 100644 --- a/src/io/pimgr.c +++ b/src/io/pimgr.c @@ -1,7 +1,7 @@ #include "macros.h" #include "PR/os_internal.h" #include "PR/ultraerror.h" -#include "piint.h" +#include "PRinternal/piint.h" #include "PR/rdb.h" static OSThread piThread ALIGNED(8); diff --git a/src/io/pirawdma.c b/src/io/pirawdma.c index d5ea8c38..db77829b 100644 --- a/src/io/pirawdma.c +++ b/src/io/pirawdma.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/pirawread.c b/src/io/pirawread.c index 95d70820..0040bb3b 100644 --- a/src/io/pirawread.c +++ b/src/io/pirawread.c @@ -1,4 +1,4 @@ -#include "piint.h" +#include "PRinternal/piint.h" #include "assert.h" #include "PR/ultraerror.h" diff --git a/src/io/pirawwrite.c b/src/io/pirawwrite.c index 92eba841..190f6824 100644 --- a/src/io/pirawwrite.c +++ b/src/io/pirawwrite.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/piread.c b/src/io/piread.c index 42bcf3e5..75503076 100644 --- a/src/io/piread.c +++ b/src/io/piread.c @@ -1,4 +1,4 @@ -#include "piint.h" +#include "PRinternal/piint.h" #include "PR/ultraerror.h" s32 osPiReadIo(u32 devAddr, u32* data) { diff --git a/src/io/piwrite.c b/src/io/piwrite.c index 75c00d13..7fe514f0 100644 --- a/src/io/piwrite.c +++ b/src/io/piwrite.c @@ -1,4 +1,4 @@ -#include "piint.h" +#include "PRinternal/piint.h" #include "PR/ultraerror.h" s32 osPiWriteIo(u32 devAddr, u32 data) { diff --git a/src/io/si.c b/src/io/si.c index 0188927e..128858f4 100644 --- a/src/io/si.c +++ b/src/io/si.c @@ -1,5 +1,5 @@ #include "PR/os_internal.h" -#include "siint.h" +#include "PRinternal/siint.h" // TODO: this comes from a header #ident "$Revision: 1.17 $" diff --git a/src/io/sigetstat.c b/src/io/sigetstat.c index 02254454..8dad4c7c 100644 --- a/src/io/sigetstat.c +++ b/src/io/sigetstat.c @@ -1,5 +1,5 @@ #include "PR/os_internal.h" -#include "siint.h" +#include "PRinternal/siint.h" // TODO: this comes from a header #ident "$Revision: 1.17 $" diff --git a/src/io/sirawdma.c b/src/io/sirawdma.c index 5fb5f8a8..57c5a450 100644 --- a/src/io/sirawdma.c +++ b/src/io/sirawdma.c @@ -1,6 +1,6 @@ #include "PR/os_internal.h" #include "assert.h" -#include "siint.h" +#include "PRinternal/siint.h" diff --git a/src/io/sirawread.c b/src/io/sirawread.c index 4ce83300..c182ff01 100644 --- a/src/io/sirawread.c +++ b/src/io/sirawread.c @@ -1,6 +1,6 @@ #include "PR/os_internal.h" #include "assert.h" -#include "siint.h" +#include "PRinternal/siint.h" diff --git a/src/io/sirawwrite.c b/src/io/sirawwrite.c index 795d38a7..ece13a56 100644 --- a/src/io/sirawwrite.c +++ b/src/io/sirawwrite.c @@ -1,5 +1,5 @@ #include "PR/os_internal.h" -#include "siint.h" +#include "PRinternal/siint.h" #include "assert.h" diff --git a/src/io/sp.c b/src/io/sp.c index 3ad9076e..c6b40811 100644 --- a/src/io/sp.c +++ b/src/io/sp.c @@ -1,7 +1,7 @@ #include "PR/os_internal.h" #include "PR/rcp.h" #include "PR/sptask.h" -#include "../os/osint.h" +#include "PRinternal/osint.h" // TODO: this comes from a header #ident "$Revision: 1.17 $" diff --git a/src/io/sprawdma.c b/src/io/sprawdma.c index 6d95a49c..05d9b7a2 100644 --- a/src/io/sprawdma.c +++ b/src/io/sprawdma.c @@ -1,6 +1,6 @@ #include "PR/os_internal.h" #include "PR/rcp.h" -#include "../os/osint.h" +#include "PRinternal/osint.h" #include "assert.h" diff --git a/src/io/sprawread.c b/src/io/sprawread.c index 5910a9e0..180b4402 100644 --- a/src/io/sprawread.c +++ b/src/io/sprawread.c @@ -1,6 +1,6 @@ #include "PR/os_internal.h" #include "PR/rcp.h" -#include "../os/osint.h" +#include "PRinternal/osint.h" #include "assert.h" diff --git a/src/io/sprawwrite.c b/src/io/sprawwrite.c index 9ce3ebf4..c0f83cfd 100644 --- a/src/io/sprawwrite.c +++ b/src/io/sprawwrite.c @@ -1,6 +1,6 @@ #include "PR/os_internal.h" #include "PR/rcp.h" -#include "../os/osint.h" +#include "PRinternal/osint.h" #include "assert.h" diff --git a/src/io/sptask.c b/src/io/sptask.c index 8fbfeb21..487d7b8f 100644 --- a/src/io/sptask.c +++ b/src/io/sptask.c @@ -2,7 +2,7 @@ #include "PR/ultraerror.h" #include "PR/sptask.h" #include "PR/rcp.h" -#include "../os/osint.h" +#include "PRinternal/osint.h" #if BUILD_VERSION < VERSION_J #ident "$Revision: 1.4 $" diff --git a/src/io/vi.c b/src/io/vi.c index 246f01f4..5ef742d4 100644 --- a/src/io/vi.c +++ b/src/io/vi.c @@ -2,7 +2,7 @@ #include "PR/os_internal.h" #include "PR/R4300.h" #include "PR/rcp.h" -#include "viint.h" +#include "PRinternal/viint.h" // TODO: this comes from a header #ident "$Revision: 1.17 $" diff --git a/src/io/viblack.c b/src/io/viblack.c index 30dd85cd..f5fbf24f 100644 --- a/src/io/viblack.c +++ b/src/io/viblack.c @@ -1,5 +1,5 @@ #include "PR/os_internal.h" -#include "viint.h" +#include "PRinternal/viint.h" // TODO: this comes from a header #ident "$Revision: 1.17 $" diff --git a/src/io/viextendvstart.c b/src/io/viextendvstart.c index 7ee06d3f..16248485 100644 --- a/src/io/viextendvstart.c +++ b/src/io/viextendvstart.c @@ -1,6 +1,6 @@ #include "PR/os_internal.h" #include "PR/ultraerror.h" -#include "viint.h" +#include "PRinternal/viint.h" void osViExtendVStart(u32 value) { #ifdef _DEBUG diff --git a/src/io/vifade.c b/src/io/vifade.c index 6766871e..22be390d 100644 --- a/src/io/vifade.c +++ b/src/io/vifade.c @@ -1,5 +1,5 @@ #include "PR/os_internal.h" -#include "viint.h" +#include "PRinternal/viint.h" // TODO: this comes from a header #ident "$Revision: 1.17 $" diff --git a/src/io/vigetcurrcontext.c b/src/io/vigetcurrcontext.c index 7b1df9b7..f33dc966 100644 --- a/src/io/vigetcurrcontext.c +++ b/src/io/vigetcurrcontext.c @@ -1,5 +1,5 @@ #include "PR/os_internal.h" -#include "viint.h" +#include "PRinternal/viint.h" // TODO: this comes from a header #ident "$Revision: 1.17 $" diff --git a/src/io/vigetcurrframebuf.c b/src/io/vigetcurrframebuf.c index de367126..6c21e408 100644 --- a/src/io/vigetcurrframebuf.c +++ b/src/io/vigetcurrframebuf.c @@ -1,6 +1,6 @@ #include "PR/os_internal.h" #include "PR/ultraerror.h" -#include "viint.h" +#include "PRinternal/viint.h" void* osViGetCurrentFramebuffer(void) { register u32 saveMask; diff --git a/src/io/vigetmode.c b/src/io/vigetmode.c index 25073728..3bb492bc 100644 --- a/src/io/vigetmode.c +++ b/src/io/vigetmode.c @@ -1,6 +1,6 @@ #include "PR/os_internal.h" #include "PR/ultraerror.h" -#include "viint.h" +#include "PRinternal/viint.h" u32 osViGetCurrentMode(void) { register u32 saveMask; diff --git a/src/io/vigetnextcontext.c b/src/io/vigetnextcontext.c index bb6012a4..5f1c2e2e 100644 --- a/src/io/vigetnextcontext.c +++ b/src/io/vigetnextcontext.c @@ -1,5 +1,5 @@ #include "PR/os_internal.h" -#include "viint.h" +#include "PRinternal/viint.h" __OSViContext* __osViGetNextContext(void) { return __osViNext; diff --git a/src/io/vigetnextframebuf.c b/src/io/vigetnextframebuf.c index 2985358f..8d14809d 100644 --- a/src/io/vigetnextframebuf.c +++ b/src/io/vigetnextframebuf.c @@ -1,6 +1,6 @@ #include "PR/os_internal.h" #include "PR/ultraerror.h" -#include "viint.h" +#include "PRinternal/viint.h" void* osViGetNextFramebuffer(void) { register u32 saveMask; diff --git a/src/io/vimgr.c b/src/io/vimgr.c index 0fe51d5d..f80281a1 100644 --- a/src/io/vimgr.c +++ b/src/io/vimgr.c @@ -2,8 +2,8 @@ #include "PR/os_internal.h" #include "PR/ultraerror.h" #include "PR/rcp.h" -#include "viint.h" -#include "../os/osint.h" +#include "PRinternal/viint.h" +#include "PRinternal/osint.h" OSDevMgr __osViDevMgr = { 0 }; #if BUILD_VERSION >= VERSION_J diff --git a/src/io/virepeatline.c b/src/io/virepeatline.c index 1bc49848..bc967733 100644 --- a/src/io/virepeatline.c +++ b/src/io/virepeatline.c @@ -1,5 +1,5 @@ #include "PR/os_internal.h" -#include "viint.h" +#include "PRinternal/viint.h" // TODO: this comes from a header #ident "$Revision: 1.17 $" diff --git a/src/io/visetevent.c b/src/io/visetevent.c index f741a0e5..b7714039 100644 --- a/src/io/visetevent.c +++ b/src/io/visetevent.c @@ -1,7 +1,7 @@ #include "PR/os_internal.h" #include "PR/ultraerror.h" #include "assert.h" -#include "viint.h" +#include "PRinternal/viint.h" diff --git a/src/io/visetmode.c b/src/io/visetmode.c index 5ab2094a..114403e5 100644 --- a/src/io/visetmode.c +++ b/src/io/visetmode.c @@ -1,7 +1,7 @@ #include "PR/os_internal.h" #include "PR/ultraerror.h" #include "assert.h" -#include "viint.h" +#include "PRinternal/viint.h" diff --git a/src/io/visetspecial.c b/src/io/visetspecial.c index 0a288e54..99c0686c 100644 --- a/src/io/visetspecial.c +++ b/src/io/visetspecial.c @@ -1,7 +1,7 @@ #include "PR/os_internal.h" #include "PR/ultraerror.h" #include "PR/rcp.h" -#include "viint.h" +#include "PRinternal/viint.h" // TODO: this comes from a header #ident "$Revision: 1.17 $" diff --git a/src/io/visetxscale.c b/src/io/visetxscale.c index 6af65356..1baab295 100644 --- a/src/io/visetxscale.c +++ b/src/io/visetxscale.c @@ -1,7 +1,7 @@ #include "PR/os_internal.h" #include "PR/ultraerror.h" #include "PR/ultralog.h" -#include "viint.h" +#include "PRinternal/viint.h" // TODO: this comes from a header #ident "$Revision: 1.17 $" diff --git a/src/io/visetyscale.c b/src/io/visetyscale.c index c1c96f47..12024789 100644 --- a/src/io/visetyscale.c +++ b/src/io/visetyscale.c @@ -1,7 +1,7 @@ #include "PR/os_internal.h" #include "PR/ultraerror.h" #include "PR/ultralog.h" -#include "viint.h" +#include "PRinternal/viint.h" // TODO: this comes from a header #ident "$Revision: 1.17 $" diff --git a/src/io/viswapbuf.c b/src/io/viswapbuf.c index aa077cd8..ec5016d2 100644 --- a/src/io/viswapbuf.c +++ b/src/io/viswapbuf.c @@ -1,7 +1,7 @@ #include "PR/os_internal.h" #include "PR/ultraerror.h" #include "assert.h" -#include "viint.h" +#include "PRinternal/viint.h" diff --git a/src/io/viswapcontext.c b/src/io/viswapcontext.c index 2f6d2c6c..77618c61 100644 --- a/src/io/viswapcontext.c +++ b/src/io/viswapcontext.c @@ -1,6 +1,6 @@ #include "PR/os_internal.h" #include "PR/rcp.h" -#include "viint.h" +#include "PRinternal/viint.h" // TODO: this comes from a header #ident "$Revision: 1.17 $" diff --git a/src/io/vitbl.c b/src/io/vitbl.c index 476036ea..24eed4c5 100644 --- a/src/io/vitbl.c +++ b/src/io/vitbl.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeTable[] = { { OS_VI_NTSC_LPN1, // type diff --git a/src/os/createmesgqueue.c b/src/os/createmesgqueue.c index 5c92f042..72209b9c 100644 --- a/src/os/createmesgqueue.c +++ b/src/os/createmesgqueue.c @@ -1,6 +1,6 @@ #include "PR/os_internal.h" #include "PR/ultraerror.h" -#include "osint.h" +#include "PRinternal/osint.h" void osCreateMesgQueue(OSMesgQueue* mq, OSMesg* msg, s32 msgCount) { diff --git a/src/os/createthread.c b/src/os/createthread.c index 7c17834c..4101eda1 100644 --- a/src/os/createthread.c +++ b/src/os/createthread.c @@ -1,7 +1,7 @@ #include "PR/os_internal.h" #include "PR/R4300.h" #include "PR/ultraerror.h" -#include "osint.h" +#include "PRinternal/osint.h" extern __OSThreadprofile_s thprof[]; diff --git a/src/os/destroythread.c b/src/os/destroythread.c index c6688695..5442e861 100644 --- a/src/os/destroythread.c +++ b/src/os/destroythread.c @@ -1,5 +1,5 @@ #include "PR/os_internal.h" -#include "osint.h" +#include "PRinternal/osint.h" void osDestroyThread(OSThread* t) { register u32 saveMask; diff --git a/src/os/getactivequeue.c b/src/os/getactivequeue.c index 1fefc884..f2fdf5fb 100644 --- a/src/os/getactivequeue.c +++ b/src/os/getactivequeue.c @@ -1,5 +1,5 @@ #include "PR/os_internal.h" -#include "osint.h" +#include "PRinternal/osint.h" OSThread* __osGetActiveQueue(void) { return __osActiveQueue; diff --git a/src/os/getcurrfaultthread.c b/src/os/getcurrfaultthread.c index d7668c2f..800d414e 100644 --- a/src/os/getcurrfaultthread.c +++ b/src/os/getcurrfaultthread.c @@ -1,5 +1,5 @@ #include "PR/os_internal.h" -#include "osint.h" +#include "PRinternal/osint.h" OSThread* __osGetCurrFaultedThread() { return __osFaultedThread; diff --git a/src/os/getnextfaultthread.c b/src/os/getnextfaultthread.c index 44d723a0..74c7bdca 100644 --- a/src/os/getnextfaultthread.c +++ b/src/os/getnextfaultthread.c @@ -1,5 +1,5 @@ #include "PR/os_internal.h" -#include "osint.h" +#include "PRinternal/osint.h" OSThread* __osGetNextFaultedThread(OSThread* lastFault) { register int saveMask = __osDisableInt(); diff --git a/src/os/getthreadid.c b/src/os/getthreadid.c index 8bbc9f67..c2f39c9d 100644 --- a/src/os/getthreadid.c +++ b/src/os/getthreadid.c @@ -1,5 +1,5 @@ #include "PR/os_internal.h" -#include "osint.h" +#include "PRinternal/osint.h" OSId osGetThreadId(OSThread* thread) { if (thread == NULL) { diff --git a/src/os/getthreadpri.c b/src/os/getthreadpri.c index 149f3f71..4e842a19 100644 --- a/src/os/getthreadpri.c +++ b/src/os/getthreadpri.c @@ -1,5 +1,5 @@ #include "PR/os_internal.h" -#include "osint.h" +#include "PRinternal/osint.h" OSPri osGetThreadPri(OSThread* thread) { if (thread == NULL) { diff --git a/src/os/gettime.c b/src/os/gettime.c index aab41336..8b59ebdc 100644 --- a/src/os/gettime.c +++ b/src/os/gettime.c @@ -1,7 +1,7 @@ #include "PR/os_internal.h" #include "PR/ultraerror.h" -#include "osint.h" -#include "../io/viint.h" +#include "PRinternal/osint.h" +#include "PRinternal/viint.h" OSTime osGetTime() { u32 tmptime; diff --git a/src/os/initialize.c b/src/os/initialize.c index 89f4b022..799096a0 100644 --- a/src/os/initialize.c +++ b/src/os/initialize.c @@ -1,7 +1,7 @@ #include "PR/os_internal.h" #include "PR/rcp.h" #include "PR/os_version.h" -#include "../io/piint.h" +#include "PRinternal/piint.h" typedef struct { /* 0x0 */ unsigned int inst1; diff --git a/src/os/initialize_emu.c b/src/os/initialize_emu.c index 7f7dd853..cac68d38 100644 --- a/src/os/initialize_emu.c +++ b/src/os/initialize_emu.c @@ -2,7 +2,7 @@ #include "PR/os_internal.h" #include "PR/rdb.h" -#include "osint.h" +#include "PRinternal/osint.h" typedef struct { /* 0x0 */ unsigned int inst1; diff --git a/src/os/initialize_isv.c b/src/os/initialize_isv.c index 50f63794..586020f1 100644 --- a/src/os/initialize_isv.c +++ b/src/os/initialize_isv.c @@ -2,7 +2,7 @@ #include "PR/os_internal.h" #include "PR/rcp.h" -#include "osint.h" +#include "PRinternal/osint.h" #include "macros.h" diff --git a/src/os/initialize_kmc.c b/src/os/initialize_kmc.c index 4952a0d7..4328da9d 100644 --- a/src/os/initialize_kmc.c +++ b/src/os/initialize_kmc.c @@ -2,7 +2,7 @@ #include "PR/os_internal.h" #include "PR/rcp.h" -#include "osint.h" +#include "PRinternal/osint.h" typedef struct { /* 0x0 */ unsigned int inst1; diff --git a/src/os/initialize_msp.c b/src/os/initialize_msp.c index 1f120e1d..c86d7e8f 100644 --- a/src/os/initialize_msp.c +++ b/src/os/initialize_msp.c @@ -2,7 +2,7 @@ #include "PR/os_internal.h" #include "PR/rcp.h" -#include "osint.h" +#include "PRinternal/osint.h" typedef struct { /* 0x0 */ unsigned int inst1; diff --git a/src/os/jammesg.c b/src/os/jammesg.c index cef68dab..4c509e3c 100644 --- a/src/os/jammesg.c +++ b/src/os/jammesg.c @@ -1,6 +1,6 @@ #include "PR/os_internal.h" #include "PR/ultraerror.h" -#include "osint.h" +#include "PRinternal/osint.h" s32 osJamMesg(OSMesgQueue* mq, OSMesg msg, s32 flag) { register u32 saveMask; diff --git a/src/os/recvmesg.c b/src/os/recvmesg.c index 043ed215..e8a03f7b 100644 --- a/src/os/recvmesg.c +++ b/src/os/recvmesg.c @@ -1,6 +1,6 @@ #include "PR/os_internal.h" #include "PR/ultraerror.h" -#include "osint.h" +#include "PRinternal/osint.h" s32 osRecvMesg(OSMesgQueue* mq, OSMesg* msg, s32 flags) { register u32 saveMask; diff --git a/src/os/sendmesg.c b/src/os/sendmesg.c index 19cf3de7..8b1a4686 100644 --- a/src/os/sendmesg.c +++ b/src/os/sendmesg.c @@ -1,6 +1,6 @@ #include "PR/os_internal.h" #include "PR/ultraerror.h" -#include "osint.h" +#include "PRinternal/osint.h" s32 osSendMesg(OSMesgQueue* mq, OSMesg msg, s32 flags) { register u32 saveMask; diff --git a/src/os/seteventmesg.c b/src/os/seteventmesg.c index f59308c0..b1217591 100644 --- a/src/os/seteventmesg.c +++ b/src/os/seteventmesg.c @@ -1,7 +1,7 @@ #include "macros.h" #include "PR/os_internal.h" #include "PR/ultraerror.h" -#include "osint.h" +#include "PRinternal/osint.h" __OSEventState __osEventStateTab[OS_NUM_EVENTS] ALIGNED(8); #if BUILD_VERSION >= VERSION_J diff --git a/src/os/setthreadpri.c b/src/os/setthreadpri.c index d836323c..66c6039e 100644 --- a/src/os/setthreadpri.c +++ b/src/os/setthreadpri.c @@ -1,6 +1,6 @@ #include "PR/os_internal.h" #include "PR/ultraerror.h" -#include "osint.h" +#include "PRinternal/osint.h" void osSetThreadPri(OSThread* t, OSPri pri) { register u32 saveMask; diff --git a/src/os/settime.c b/src/os/settime.c index b7d14e32..5a974d39 100644 --- a/src/os/settime.c +++ b/src/os/settime.c @@ -1,7 +1,7 @@ #include "PR/os_internal.h" #include "PR/ultraerror.h" -#include "osint.h" -#include "../io/viint.h" +#include "PRinternal/osint.h" +#include "PRinternal/viint.h" void osSetTime(OSTime time) { diff --git a/src/os/settimer.c b/src/os/settimer.c index 252f63c3..4d2a651a 100644 --- a/src/os/settimer.c +++ b/src/os/settimer.c @@ -1,7 +1,7 @@ #include "PR/os_internal.h" #include "PR/ultraerror.h" -#include "osint.h" -#include "../io/viint.h" +#include "PRinternal/osint.h" +#include "PRinternal/viint.h" int osSetTimer(OSTimer* t, OSTime countdown, OSTime interval, OSMesgQueue* mq, OSMesg msg) { OSTime time; diff --git a/src/os/startthread.c b/src/os/startthread.c index 2ce15465..f4ecaaac 100644 --- a/src/os/startthread.c +++ b/src/os/startthread.c @@ -1,6 +1,6 @@ #include "PR/os_internal.h" #include "PR/ultraerror.h" -#include "osint.h" +#include "PRinternal/osint.h" void osStartThread(OSThread* t) { register u32 saveMask = __osDisableInt(); diff --git a/src/os/stopthread.c b/src/os/stopthread.c index 9a516529..4047308e 100644 --- a/src/os/stopthread.c +++ b/src/os/stopthread.c @@ -1,5 +1,5 @@ #include "PR/os_internal.h" -#include "osint.h" +#include "PRinternal/osint.h" void osStopThread(OSThread* t) { register u32 saveMask = __osDisableInt(); diff --git a/src/os/stoptimer.c b/src/os/stoptimer.c index b6db1c11..8688d6f3 100644 --- a/src/os/stoptimer.c +++ b/src/os/stoptimer.c @@ -1,7 +1,7 @@ #include "PR/os_internal.h" #include "PR/ultraerror.h" -#include "osint.h" -#include "../io/viint.h" +#include "PRinternal/osint.h" +#include "PRinternal/viint.h" int osStopTimer(OSTimer* t) { register u32 savedMask; diff --git a/src/os/thread.c b/src/os/thread.c index 9a4a1416..89f10f20 100644 --- a/src/os/thread.c +++ b/src/os/thread.c @@ -1,5 +1,5 @@ #include "PR/os_internal.h" -#include "osint.h" +#include "PRinternal/osint.h" struct __osThreadTail __osThreadTail = { NULL, -1 }; OSThread* __osRunQueue = (OSThread*)&__osThreadTail; diff --git a/src/os/timerintr.c b/src/os/timerintr.c index 10dae509..d608c1ae 100644 --- a/src/os/timerintr.c +++ b/src/os/timerintr.c @@ -1,6 +1,6 @@ #include "macros.h" #include "PR/os_internal.h" -#include "osint.h" +#include "PRinternal/osint.h" OSTime __osCurrentTime; u32 __osBaseCounter; diff --git a/src/os/virtualtophysical.c b/src/os/virtualtophysical.c index 553fe685..a275c547 100644 --- a/src/os/virtualtophysical.c +++ b/src/os/virtualtophysical.c @@ -1,6 +1,6 @@ #include "PR/os_internal.h" #include "PR/R4300.h" -#include "osint.h" +#include "PRinternal/osint.h" u32 osVirtualToPhysical(void* addr) { if (IS_KSEG0(addr)) { diff --git a/src/os/yieldthread.c b/src/os/yieldthread.c index 9a4dafb8..976662b1 100644 --- a/src/os/yieldthread.c +++ b/src/os/yieldthread.c @@ -1,5 +1,5 @@ #include "PR/os_internal.h" -#include "osint.h" +#include "PRinternal/osint.h" void osYieldThread(void) { register u32 saveMask = __osDisableInt(); diff --git a/src/rg/printregion.c b/src/rg/printregion.c index 6db8f18c..947e61c5 100644 --- a/src/rg/printregion.c +++ b/src/rg/printregion.c @@ -1,7 +1,7 @@ #include "os_version.h" #if !defined(_FINALROM) || BUILD_VERSION < VERSION_J -#include "../os/osint.h" +#include "PRinternal/osint.h" #include "PR/rmon.h" #include "PR/region.h" diff --git a/src/rmon/rmonbrk.c b/src/rmon/rmonbrk.c index 0eb32424..7136481b 100644 --- a/src/rmon/rmonbrk.c +++ b/src/rmon/rmonbrk.c @@ -4,7 +4,7 @@ #include "dbgproto.h" #include "PR/rcp.h" #include "PR/sptask.h" -#include "rmonint.h" +#include "PRinternal/rmonint.h" #include "macros.h" diff --git a/src/rmon/rmoncmds.c b/src/rmon/rmoncmds.c index 88600a6e..6f6c1d4f 100644 --- a/src/rmon/rmoncmds.c +++ b/src/rmon/rmoncmds.c @@ -1,7 +1,7 @@ #ifndef _FINALROM #include "dbgproto.h" -#include "rmonint.h" +#include "PRinternal/rmonint.h" #include "macros.h" diff --git a/src/rmon/rmonmain.c b/src/rmon/rmonmain.c index 564ac443..b896bc29 100644 --- a/src/rmon/rmonmain.c +++ b/src/rmon/rmonmain.c @@ -12,9 +12,9 @@ #include "dbgproto.h" #include "PR/os_internal.h" -#include "rmonint.h" +#include "PRinternal/rmonint.h" #include "PR/rcp.h" -#include "sptask.h" +#include "PR/sptask.h" #include "PR/rdb.h" #include "macros.h" diff --git a/src/rmon/rmonmem.c b/src/rmon/rmonmem.c index a11051b1..0120b085 100644 --- a/src/rmon/rmonmem.c +++ b/src/rmon/rmonmem.c @@ -14,7 +14,7 @@ #include "PR/os_internal.h" #include "PR/rcp.h" #include "PR/sptask.h" -#include "rmonint.h" +#include "PRinternal/rmonint.h" #include "PR/rdb.h" #include "macros.h" diff --git a/src/rmon/rmonmisc.c b/src/rmon/rmonmisc.c index a1aa96c4..0b91f8c0 100644 --- a/src/rmon/rmonmisc.c +++ b/src/rmon/rmonmisc.c @@ -3,7 +3,7 @@ #include "dbgproto.h" #include "PR/os_internal.h" #include "PR/sptask.h" -#include "rmonint.h" +#include "PRinternal/rmonint.h" #include "macros.h" diff --git a/src/rmon/rmonregs.c b/src/rmon/rmonregs.c index 39cf5b29..e43c44d3 100644 --- a/src/rmon/rmonregs.c +++ b/src/rmon/rmonregs.c @@ -4,7 +4,7 @@ #include "PR/os_internal.h" #include "PR/rcp.h" #include "PR/sptask.h" -#include "rmonint.h" +#include "PRinternal/rmonint.h" #include "PR/rdb.h" #include "PR/os_version.h" diff --git a/src/rmon/rmonsio.c b/src/rmon/rmonsio.c index 3e459957..8e3b8408 100644 --- a/src/rmon/rmonsio.c +++ b/src/rmon/rmonsio.c @@ -15,7 +15,7 @@ #include "PR/ultralog.h" #include "PR/sptask.h" #include "dbgproto.h" -#include "rmonint.h" +#include "PRinternal/rmonint.h" #include "PR/ramrom.h" #include "PR/rdb.h" #include "PR/rmon.h" diff --git a/src/rmon/rmontask.c b/src/rmon/rmontask.c index 25757a7a..0a13be3d 100644 --- a/src/rmon/rmontask.c +++ b/src/rmon/rmontask.c @@ -2,7 +2,7 @@ #include "dbgproto.h" #include "PR/os_internal.h" -#include "rmonint.h" +#include "PRinternal/rmonint.h" #include "PR/rcp.h" #include "PR/sptask.h" diff --git a/src/vimodes/vimodefpalhaf1.c b/src/vimodes/vimodefpalhaf1.c index 5ad95fa7..7b50c8d9 100644 --- a/src/vimodes/vimodefpalhaf1.c +++ b/src/vimodes/vimodefpalhaf1.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeFpalHaf1 = { OS_VI_FPAL_HAF1, // type diff --git a/src/vimodes/vimodefpalhan1.c b/src/vimodes/vimodefpalhan1.c index f29ff4b9..b7e9fe73 100644 --- a/src/vimodes/vimodefpalhan1.c +++ b/src/vimodes/vimodefpalhan1.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeFpalHan1 = { OS_VI_FPAL_HAN1, // type diff --git a/src/vimodes/vimodefpalhpf1.c b/src/vimodes/vimodefpalhpf1.c index db0eb9d6..f3e550d0 100644 --- a/src/vimodes/vimodefpalhpf1.c +++ b/src/vimodes/vimodefpalhpf1.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeFpalHpf1 = { OS_VI_FPAL_HPF1, // type diff --git a/src/vimodes/vimodefpalhpf2.c b/src/vimodes/vimodefpalhpf2.c index dfd3d929..367e8647 100644 --- a/src/vimodes/vimodefpalhpf2.c +++ b/src/vimodes/vimodefpalhpf2.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeFpalHpf2 = { OS_VI_FPAL_HPF2, // type diff --git a/src/vimodes/vimodefpalhpn1.c b/src/vimodes/vimodefpalhpn1.c index 8b665a8e..36599dce 100644 --- a/src/vimodes/vimodefpalhpn1.c +++ b/src/vimodes/vimodefpalhpn1.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeFpalHpn1 = { OS_VI_FPAL_HPN1, // type diff --git a/src/vimodes/vimodefpalhpn2.c b/src/vimodes/vimodefpalhpn2.c index c046e972..b9500c7a 100644 --- a/src/vimodes/vimodefpalhpn2.c +++ b/src/vimodes/vimodefpalhpn2.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeFpalHpn2 = { OS_VI_FPAL_HPN2, // type diff --git a/src/vimodes/vimodefpallaf1.c b/src/vimodes/vimodefpallaf1.c index e4a8a9e0..c04309f3 100644 --- a/src/vimodes/vimodefpallaf1.c +++ b/src/vimodes/vimodefpallaf1.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeFpalLaf1 = { OS_VI_FPAL_LAF1, // type diff --git a/src/vimodes/vimodefpallaf2.c b/src/vimodes/vimodefpallaf2.c index 8b3b6082..7473b12a 100644 --- a/src/vimodes/vimodefpallaf2.c +++ b/src/vimodes/vimodefpallaf2.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeFpalLaf2 = { OS_VI_FPAL_LAF2, // type diff --git a/src/vimodes/vimodefpallan1.c b/src/vimodes/vimodefpallan1.c index f190f55a..33d82f2f 100644 --- a/src/vimodes/vimodefpallan1.c +++ b/src/vimodes/vimodefpallan1.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeFpalLan1 = { OS_VI_FPAL_LAN1, // type diff --git a/src/vimodes/vimodefpallan2.c b/src/vimodes/vimodefpallan2.c index 13c71e56..92bd3fb9 100644 --- a/src/vimodes/vimodefpallan2.c +++ b/src/vimodes/vimodefpallan2.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeFpalLan2 = { OS_VI_FPAL_LAN2, // type diff --git a/src/vimodes/vimodefpallpf1.c b/src/vimodes/vimodefpallpf1.c index d1c307c0..dae14592 100644 --- a/src/vimodes/vimodefpallpf1.c +++ b/src/vimodes/vimodefpallpf1.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeFpalLpf1 = { OS_VI_FPAL_LPF1, // type diff --git a/src/vimodes/vimodefpallpf2.c b/src/vimodes/vimodefpallpf2.c index 385b1dfe..89301367 100644 --- a/src/vimodes/vimodefpallpf2.c +++ b/src/vimodes/vimodefpallpf2.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeFpalLpf2 = { OS_VI_FPAL_LPF2, // type diff --git a/src/vimodes/vimodefpallpn1.c b/src/vimodes/vimodefpallpn1.c index 6fbcfe90..9c88755f 100644 --- a/src/vimodes/vimodefpallpn1.c +++ b/src/vimodes/vimodefpallpn1.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeFpalLpn1 = { OS_VI_FPAL_LPN1, // type diff --git a/src/vimodes/vimodefpallpn2.c b/src/vimodes/vimodefpallpn2.c index c852cf92..d8792aa6 100644 --- a/src/vimodes/vimodefpallpn2.c +++ b/src/vimodes/vimodefpallpn2.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeFpalLpn2 = { OS_VI_FPAL_LPN2, // type diff --git a/src/vimodes/vimodempalhaf1.c b/src/vimodes/vimodempalhaf1.c index c9a74dcc..31500820 100644 --- a/src/vimodes/vimodempalhaf1.c +++ b/src/vimodes/vimodempalhaf1.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeMpalHaf1 = { OS_VI_MPAL_HAF1, // type diff --git a/src/vimodes/vimodempalhan1.c b/src/vimodes/vimodempalhan1.c index 038163b1..060fa9d4 100644 --- a/src/vimodes/vimodempalhan1.c +++ b/src/vimodes/vimodempalhan1.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeMpalHan1 = { OS_VI_MPAL_HAN1, // type diff --git a/src/vimodes/vimodempalhpf1.c b/src/vimodes/vimodempalhpf1.c index 4bbb0e53..fcf34298 100644 --- a/src/vimodes/vimodempalhpf1.c +++ b/src/vimodes/vimodempalhpf1.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeMpalHpf1 = { OS_VI_MPAL_HPF1, // type diff --git a/src/vimodes/vimodempalhpf2.c b/src/vimodes/vimodempalhpf2.c index b2fad3df..8f669745 100644 --- a/src/vimodes/vimodempalhpf2.c +++ b/src/vimodes/vimodempalhpf2.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeMpalHpf2 = { OS_VI_MPAL_HPF2, // type diff --git a/src/vimodes/vimodempalhpn1.c b/src/vimodes/vimodempalhpn1.c index 3955a4ff..c8659e57 100644 --- a/src/vimodes/vimodempalhpn1.c +++ b/src/vimodes/vimodempalhpn1.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeMpalHpn1 = { OS_VI_MPAL_HPN1, // type diff --git a/src/vimodes/vimodempalhpn2.c b/src/vimodes/vimodempalhpn2.c index b4c7a6d1..90fba1d3 100644 --- a/src/vimodes/vimodempalhpn2.c +++ b/src/vimodes/vimodempalhpn2.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeMpalHpn2 = { OS_VI_MPAL_HPN2, // type diff --git a/src/vimodes/vimodempallaf1.c b/src/vimodes/vimodempallaf1.c index 1369d390..4a19a342 100644 --- a/src/vimodes/vimodempallaf1.c +++ b/src/vimodes/vimodempallaf1.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeMpalLaf1 = { OS_VI_MPAL_LAF1, // type diff --git a/src/vimodes/vimodempallaf2.c b/src/vimodes/vimodempallaf2.c index 0502362a..512ec0f5 100644 --- a/src/vimodes/vimodempallaf2.c +++ b/src/vimodes/vimodempallaf2.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeMpalLaf2 = { OS_VI_MPAL_LAF2, // type diff --git a/src/vimodes/vimodempallan1.c b/src/vimodes/vimodempallan1.c index a3f4e698..bc75cbcf 100644 --- a/src/vimodes/vimodempallan1.c +++ b/src/vimodes/vimodempallan1.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeMpalLan1 = { OS_VI_MPAL_LAN1, // type diff --git a/src/vimodes/vimodempallan2.c b/src/vimodes/vimodempallan2.c index 65817e7a..7eb3b428 100644 --- a/src/vimodes/vimodempallan2.c +++ b/src/vimodes/vimodempallan2.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeMpalLan2 = { OS_VI_MPAL_LAN2, // type diff --git a/src/vimodes/vimodempallpf1.c b/src/vimodes/vimodempallpf1.c index 7df1655b..a2288d31 100644 --- a/src/vimodes/vimodempallpf1.c +++ b/src/vimodes/vimodempallpf1.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeMpalLpf1 = { OS_VI_MPAL_LPF1, // type diff --git a/src/vimodes/vimodempallpf2.c b/src/vimodes/vimodempallpf2.c index 285832ea..51df6054 100644 --- a/src/vimodes/vimodempallpf2.c +++ b/src/vimodes/vimodempallpf2.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeMpalLpf2 = { OS_VI_MPAL_LPF2, // type diff --git a/src/vimodes/vimodempallpn1.c b/src/vimodes/vimodempallpn1.c index 89147942..86c6ad98 100644 --- a/src/vimodes/vimodempallpn1.c +++ b/src/vimodes/vimodempallpn1.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeMpalLpn1 = { OS_VI_MPAL_LPN1, // type diff --git a/src/vimodes/vimodempallpn2.c b/src/vimodes/vimodempallpn2.c index 40f381cc..a44ef4c2 100644 --- a/src/vimodes/vimodempallpn2.c +++ b/src/vimodes/vimodempallpn2.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeMpalLpn2 = { OS_VI_MPAL_LPN2, // type diff --git a/src/vimodes/vimodentschaf1.c b/src/vimodes/vimodentschaf1.c index e6ad8bc4..8f8fece7 100644 --- a/src/vimodes/vimodentschaf1.c +++ b/src/vimodes/vimodentschaf1.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeNtscHaf1 = { OS_VI_NTSC_HAF1, // type diff --git a/src/vimodes/vimodentschan1.c b/src/vimodes/vimodentschan1.c index 14711e7f..a230fe88 100644 --- a/src/vimodes/vimodentschan1.c +++ b/src/vimodes/vimodentschan1.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeNtscHan1 = { OS_VI_NTSC_HAN1, // type diff --git a/src/vimodes/vimodentschpf1.c b/src/vimodes/vimodentschpf1.c index 8f703110..8b0fbcd5 100644 --- a/src/vimodes/vimodentschpf1.c +++ b/src/vimodes/vimodentschpf1.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeNtscHpf1 = { OS_VI_NTSC_HPF1, // type diff --git a/src/vimodes/vimodentschpf2.c b/src/vimodes/vimodentschpf2.c index 8533e23c..451a27c4 100644 --- a/src/vimodes/vimodentschpf2.c +++ b/src/vimodes/vimodentschpf2.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeNtscHpf2 = { OS_VI_NTSC_HPF2, // type diff --git a/src/vimodes/vimodentschpn1.c b/src/vimodes/vimodentschpn1.c index f82e2772..05aaed85 100644 --- a/src/vimodes/vimodentschpn1.c +++ b/src/vimodes/vimodentschpn1.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeNtscHpn1 = { OS_VI_NTSC_HPN1, // type diff --git a/src/vimodes/vimodentschpn2.c b/src/vimodes/vimodentschpn2.c index d1b59742..82b96d7c 100644 --- a/src/vimodes/vimodentschpn2.c +++ b/src/vimodes/vimodentschpn2.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeNtscHpn2 = { OS_VI_NTSC_HPN2, // type diff --git a/src/vimodes/vimodentsclaf1.c b/src/vimodes/vimodentsclaf1.c index fe127925..167dd961 100644 --- a/src/vimodes/vimodentsclaf1.c +++ b/src/vimodes/vimodentsclaf1.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeNtscLaf1 = { OS_VI_NTSC_LAF1, // type diff --git a/src/vimodes/vimodentsclaf2.c b/src/vimodes/vimodentsclaf2.c index acf2c3c6..7b5e858d 100644 --- a/src/vimodes/vimodentsclaf2.c +++ b/src/vimodes/vimodentsclaf2.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeNtscLaf2 = { OS_VI_NTSC_LAF2, // type diff --git a/src/vimodes/vimodentsclan1.c b/src/vimodes/vimodentsclan1.c index 0092a00a..91233689 100644 --- a/src/vimodes/vimodentsclan1.c +++ b/src/vimodes/vimodentsclan1.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeNtscLan1 = { OS_VI_NTSC_LAN1, // type diff --git a/src/vimodes/vimodentsclan2.c b/src/vimodes/vimodentsclan2.c index da2747b5..31fcaa81 100644 --- a/src/vimodes/vimodentsclan2.c +++ b/src/vimodes/vimodentsclan2.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeNtscLan2 = { OS_VI_NTSC_LAN2, // type diff --git a/src/vimodes/vimodentsclpf1.c b/src/vimodes/vimodentsclpf1.c index b6bb5e70..fc6b0993 100644 --- a/src/vimodes/vimodentsclpf1.c +++ b/src/vimodes/vimodentsclpf1.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeNtscLpf1 = { OS_VI_NTSC_LPF1, // type diff --git a/src/vimodes/vimodentsclpf2.c b/src/vimodes/vimodentsclpf2.c index f3f82c7d..ef49764a 100644 --- a/src/vimodes/vimodentsclpf2.c +++ b/src/vimodes/vimodentsclpf2.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeNtscLpf2 = { OS_VI_NTSC_LPF2, // type diff --git a/src/vimodes/vimodentsclpn1.c b/src/vimodes/vimodentsclpn1.c index ecc68cb3..6628325b 100644 --- a/src/vimodes/vimodentsclpn1.c +++ b/src/vimodes/vimodentsclpn1.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeNtscLpn1 = { OS_VI_NTSC_LPN1, // type diff --git a/src/vimodes/vimodentsclpn2.c b/src/vimodes/vimodentsclpn2.c index bce83b8a..51ed3516 100644 --- a/src/vimodes/vimodentsclpn2.c +++ b/src/vimodes/vimodentsclpn2.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModeNtscLpn2 = { OS_VI_NTSC_LPN2, // type diff --git a/src/vimodes/vimodepalhaf1.c b/src/vimodes/vimodepalhaf1.c index 3ff1394d..80c0a2e4 100644 --- a/src/vimodes/vimodepalhaf1.c +++ b/src/vimodes/vimodepalhaf1.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModePalHaf1 = { OS_VI_PAL_HAF1, // type diff --git a/src/vimodes/vimodepalhan1.c b/src/vimodes/vimodepalhan1.c index 3d32ba68..fbb1bcb0 100644 --- a/src/vimodes/vimodepalhan1.c +++ b/src/vimodes/vimodepalhan1.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModePalHan1 = { OS_VI_PAL_HAN1, // type diff --git a/src/vimodes/vimodepalhpf1.c b/src/vimodes/vimodepalhpf1.c index bdd0871c..3829023f 100644 --- a/src/vimodes/vimodepalhpf1.c +++ b/src/vimodes/vimodepalhpf1.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModePalHpf1 = { OS_VI_PAL_HPF1, // type diff --git a/src/vimodes/vimodepalhpf2.c b/src/vimodes/vimodepalhpf2.c index 565ac4fb..c23bd8fa 100644 --- a/src/vimodes/vimodepalhpf2.c +++ b/src/vimodes/vimodepalhpf2.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModePalHpf2 = { OS_VI_PAL_HPF2, // type diff --git a/src/vimodes/vimodepalhpn1.c b/src/vimodes/vimodepalhpn1.c index a0c1ecc4..04edde6c 100644 --- a/src/vimodes/vimodepalhpn1.c +++ b/src/vimodes/vimodepalhpn1.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModePalHpn1 = { OS_VI_PAL_HPN1, // type diff --git a/src/vimodes/vimodepalhpn2.c b/src/vimodes/vimodepalhpn2.c index d6e05b84..66359b69 100644 --- a/src/vimodes/vimodepalhpn2.c +++ b/src/vimodes/vimodepalhpn2.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModePalHpn2 = { OS_VI_PAL_HPN2, // type diff --git a/src/vimodes/vimodepallaf1.c b/src/vimodes/vimodepallaf1.c index 3d03857a..aa92face 100644 --- a/src/vimodes/vimodepallaf1.c +++ b/src/vimodes/vimodepallaf1.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModePalLaf1 = { OS_VI_PAL_LAF1, // type diff --git a/src/vimodes/vimodepallaf2.c b/src/vimodes/vimodepallaf2.c index 4fc496c5..162731b9 100644 --- a/src/vimodes/vimodepallaf2.c +++ b/src/vimodes/vimodepallaf2.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModePalLaf2 = { OS_VI_PAL_LAF2, // type diff --git a/src/vimodes/vimodepallan1.c b/src/vimodes/vimodepallan1.c index 22a893c3..f3d90928 100644 --- a/src/vimodes/vimodepallan1.c +++ b/src/vimodes/vimodepallan1.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModePalLan1 = { OS_VI_PAL_LAN1, // type diff --git a/src/vimodes/vimodepallan2.c b/src/vimodes/vimodepallan2.c index d32360b8..d98a5da7 100644 --- a/src/vimodes/vimodepallan2.c +++ b/src/vimodes/vimodepallan2.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModePalLan2 = { OS_VI_PAL_LAN2, // type diff --git a/src/vimodes/vimodepallpf1.c b/src/vimodes/vimodepallpf1.c index 37d68e44..0410db23 100644 --- a/src/vimodes/vimodepallpf1.c +++ b/src/vimodes/vimodepallpf1.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModePalLpf1 = { OS_VI_PAL_LPF1, // type diff --git a/src/vimodes/vimodepallpf2.c b/src/vimodes/vimodepallpf2.c index c37ebe17..e4583ad5 100644 --- a/src/vimodes/vimodepallpf2.c +++ b/src/vimodes/vimodepallpf2.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModePalLpf2 = { OS_VI_PAL_LPF2, // type diff --git a/src/vimodes/vimodepallpn1.c b/src/vimodes/vimodepallpn1.c index eafbe6b0..86cae100 100644 --- a/src/vimodes/vimodepallpn1.c +++ b/src/vimodes/vimodepallpn1.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModePalLpn1 = { OS_VI_PAL_LPN1, // type diff --git a/src/vimodes/vimodepallpn2.c b/src/vimodes/vimodepallpn2.c index 49a26fd6..722d9d0a 100644 --- a/src/vimodes/vimodepallpn2.c +++ b/src/vimodes/vimodepallpn2.c @@ -1,6 +1,6 @@ #include "PR/os.h" #include "PR/rcp.h" -#include "../io/viint.h" +#include "PRinternal/viint.h" OSViMode osViModePalLpn2 = { OS_VI_PAL_LPN2, // type diff --git a/src/voice/voicecheckresult.c b/src/voice/voicecheckresult.c index 5318652c..12ab5b60 100644 --- a/src/voice/voicecheckresult.c +++ b/src/voice/voicecheckresult.c @@ -1,5 +1,5 @@ #include "PR/os_internal.h" -#include "io/controller.h" +#include "PRinternal/controller.h" #include "PR/os_voice.h" #include "voiceinternal.h" diff --git a/src/voice/voicecheckword.c b/src/voice/voicecheckword.c index 05c2a59e..4c0f8207 100644 --- a/src/voice/voicecheckword.c +++ b/src/voice/voicecheckword.c @@ -1,5 +1,5 @@ #include "PR/os_internal.h" -#include "io/controller.h" +#include "PRinternal/controller.h" #include "PR/os_voice.h" s32 osVoiceCheckWord(u8* word) { diff --git a/src/voice/voicecleardictionary.c b/src/voice/voicecleardictionary.c index 6ed14646..eda733b4 100644 --- a/src/voice/voicecleardictionary.c +++ b/src/voice/voicecleardictionary.c @@ -1,5 +1,5 @@ #include "PR/os_internal.h" -#include "io/controller.h" +#include "PRinternal/controller.h" #include "PR/os_voice.h" #include "voiceinternal.h" diff --git a/src/voice/voicecontread2.c b/src/voice/voicecontread2.c index a204ffcc..f905641f 100644 --- a/src/voice/voicecontread2.c +++ b/src/voice/voicecontread2.c @@ -1,9 +1,10 @@ +#include "macros.h" #include "PR/os_internal.h" -#include "io/controller.h" +#include "PRinternal/controller.h" #include "PR/os_voice.h" #include "voiceinternal.h" -#include "io/controller_voice.h" -#include "io/siint.h" +#include "PRinternal/controller_voice.h" +#include "PRinternal/siint.h" #define READ2FORMAT(ptr) ((__OSVoiceRead2Format*)(ptr)) diff --git a/src/voice/voicecontread36.c b/src/voice/voicecontread36.c index c537aff0..c7a00337 100644 --- a/src/voice/voicecontread36.c +++ b/src/voice/voicecontread36.c @@ -1,9 +1,10 @@ +#include "macros.h" #include "PR/os_internal.h" -#include "io/controller.h" +#include "PRinternal/controller.h" #include "PR/os_voice.h" #include "voiceinternal.h" -#include "io/controller_voice.h" -#include "io/siint.h" +#include "PRinternal/controller_voice.h" +#include "PRinternal/siint.h" #define READ36FORMAT(ptr) ((__OSVoiceRead36Format*)(ptr)) diff --git a/src/voice/voicecontrolgain.c b/src/voice/voicecontrolgain.c index 95e9bb21..f03c8148 100644 --- a/src/voice/voicecontrolgain.c +++ b/src/voice/voicecontrolgain.c @@ -1,5 +1,6 @@ +#include "macros.h" #include "PR/os_internal.h" -#include "io/controller.h" +#include "PRinternal/controller.h" #include "PR/os_voice.h" #include "voiceinternal.h" diff --git a/src/voice/voicecontwrite20.c b/src/voice/voicecontwrite20.c index d1a7446f..b8bb86d4 100644 --- a/src/voice/voicecontwrite20.c +++ b/src/voice/voicecontwrite20.c @@ -1,9 +1,10 @@ +#include "macros.h" #include "PR/os_internal.h" -#include "io/controller.h" +#include "PRinternal/controller.h" #include "PR/os_voice.h" #include "voiceinternal.h" -#include "io/controller_voice.h" -#include "io/siint.h" +#include "PRinternal/controller_voice.h" +#include "PRinternal/siint.h" #define WRITE20FORMAT(ptr) ((__OSVoiceWrite20Format*)(ptr)) diff --git a/src/voice/voicecontwrite4.c b/src/voice/voicecontwrite4.c index 6f005863..b4ca0435 100644 --- a/src/voice/voicecontwrite4.c +++ b/src/voice/voicecontwrite4.c @@ -1,9 +1,10 @@ +#include "macros.h" #include "PR/os_internal.h" -#include "io/controller.h" +#include "PRinternal/controller.h" #include "PR/os_voice.h" #include "voiceinternal.h" -#include "io/controller_voice.h" -#include "io/siint.h" +#include "PRinternal/controller_voice.h" +#include "PRinternal/siint.h" #define WRITE4FORMAT(ptr) ((__OSVoiceWrite4Format*)(ptr)) diff --git a/src/voice/voicecountsyllables.c b/src/voice/voicecountsyllables.c index b0112ef3..3324248f 100644 --- a/src/voice/voicecountsyllables.c +++ b/src/voice/voicecountsyllables.c @@ -1,5 +1,5 @@ #include "PR/os_internal.h" -#include "io/controller.h" +#include "PRinternal/controller.h" #include "PR/os_voice.h" // The VRU can store only 880 semisyllables of words in its dictionary. diff --git a/src/voice/voicecrc.c b/src/voice/voicecrc.c index 56b48381..ba2dab01 100644 --- a/src/voice/voicecrc.c +++ b/src/voice/voicecrc.c @@ -1,5 +1,5 @@ #include "PR/os_internal.h" -#include "io/controller.h" +#include "PRinternal/controller.h" #include "PR/os_voice.h" #define VOICE_CRC_LENGTH 8 diff --git a/src/voice/voicegetreaddata.c b/src/voice/voicegetreaddata.c index d2f50635..ccd099a3 100644 --- a/src/voice/voicegetreaddata.c +++ b/src/voice/voicegetreaddata.c @@ -1,5 +1,5 @@ #include "PR/os_internal.h" -#include "io/controller.h" +#include "PRinternal/controller.h" #include "PR/os_voice.h" #include "voiceinternal.h" diff --git a/src/voice/voicegetstatus.c b/src/voice/voicegetstatus.c index e7328c10..85e64551 100644 --- a/src/voice/voicegetstatus.c +++ b/src/voice/voicegetstatus.c @@ -1,8 +1,8 @@ #include "PR/os_internal.h" -#include "io/controller.h" +#include "PRinternal/controller.h" #include "PR/os_voice.h" #include "voiceinternal.h" -#include "io/siint.h" +#include "PRinternal/siint.h" s32 __osVoiceGetStatus(OSMesgQueue* mq, s32 port, u8* status) { __OSContRequesFormatShort header; diff --git a/src/voice/voiceinit.c b/src/voice/voiceinit.c index 5074a84c..0ba8b63d 100644 --- a/src/voice/voiceinit.c +++ b/src/voice/voiceinit.c @@ -1,5 +1,6 @@ +#include "macros.h" #include "PR/os_internal.h" -#include "io/controller.h" +#include "PRinternal/controller.h" #include "PR/os_voice.h" #include "voiceinternal.h" diff --git a/src/voice/voicemaskdictionary.c b/src/voice/voicemaskdictionary.c index 39db7acc..166ba2e5 100644 --- a/src/voice/voicemaskdictionary.c +++ b/src/voice/voicemaskdictionary.c @@ -1,5 +1,6 @@ +#include "macros.h" #include "PR/os_internal.h" -#include "io/controller.h" +#include "PRinternal/controller.h" #include "PR/os_voice.h" #include "voiceinternal.h" diff --git a/src/voice/voicesetadconverter.c b/src/voice/voicesetadconverter.c index d1c5eb20..c44ecc6c 100644 --- a/src/voice/voicesetadconverter.c +++ b/src/voice/voicesetadconverter.c @@ -1,9 +1,9 @@ #include "PR/os_internal.h" -#include "io/controller.h" +#include "PRinternal/controller.h" #include "PR/os_voice.h" #include "voiceinternal.h" -#include "io/controller_voice.h" -#include "io/siint.h" +#include "PRinternal/controller_voice.h" +#include "PRinternal/siint.h" #define SWRITEFORMAT(ptr) ((__OSVoiceSWriteFormat*)(ptr)) diff --git a/src/voice/voicesetword.c b/src/voice/voicesetword.c index 7969fae5..6426ddbc 100644 --- a/src/voice/voicesetword.c +++ b/src/voice/voicesetword.c @@ -1,5 +1,6 @@ +#include "macros.h" #include "PR/os_internal.h" -#include "io/controller.h" +#include "PRinternal/controller.h" #include "PR/os_voice.h" #include "voiceinternal.h" diff --git a/src/voice/voicestartreaddata.c b/src/voice/voicestartreaddata.c index ea83da04..629b9561 100644 --- a/src/voice/voicestartreaddata.c +++ b/src/voice/voicestartreaddata.c @@ -1,5 +1,5 @@ #include "PR/os_internal.h" -#include "io/controller.h" +#include "PRinternal/controller.h" #include "PR/os_voice.h" #include "voiceinternal.h" diff --git a/src/voice/voicestopreaddata.c b/src/voice/voicestopreaddata.c index b43eb81b..fb96895d 100644 --- a/src/voice/voicestopreaddata.c +++ b/src/voice/voicestopreaddata.c @@ -1,5 +1,5 @@ #include "PR/os_internal.h" -#include "io/controller.h" +#include "PRinternal/controller.h" #include "PR/os_voice.h" #include "voiceinternal.h" #include "os_version.h"