From 17e3264c3ccbd7ad091d848174add071446f89a5 Mon Sep 17 00:00:00 2001
From: angie <angheloalf95@gmail.com>
Date: Sun, 3 Sep 2023 18:47:05 -0300
Subject: [PATCH] another io chunk

---
 src/libultra/io/epirawdma.c        | 2 +-
 src/libultra/io/epirawread.c       | 2 +-
 src/libultra/io/epirawwrite.c      | 2 +-
 src/libultra/io/epiread.c          | 2 +-
 src/libultra/io/epiwrite.c         | 2 +-
 src/libultra/io/motor.c            | 3 +--
 src/libultra/io/pfsallocatefile.c  | 2 +-
 src/libultra/io/pfschecker.c       | 4 ++--
 src/libultra/io/pfsdeletefile.c    | 4 ++--
 src/libultra/io/pfsfilestate.c     | 5 +++--
 src/libultra/io/pfsfreeblocks.c    | 4 ++--
 src/libultra/io/pfsgetstatus.c     | 2 +-
 src/libultra/io/pfsinitpak.c       | 4 ++--
 src/libultra/io/pfsreadwritefile.c | 2 +-
 src/libultra/io/pfssearchfile.c    | 3 ++-
 src/libultra/io/pfsselectbank.c    | 4 ++--
 src/libultra/io/piacs.c            | 3 ++-
 src/libultra/io/pigetcmdq.c        | 2 +-
 src/libultra/io/pimgr.c            | 4 +++-
 src/libultra/io/pirawdma.c         | 2 +-
 src/libultra/io/si.c               | 3 ++-
 src/libultra/io/siacs.c            | 8 +++++---
 src/libultra/io/sirawdma.c         | 7 ++++---
 23 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/src/libultra/io/epirawdma.c b/src/libultra/io/epirawdma.c
index 790e3a77ad..2cd543c0e2 100644
--- a/src/libultra/io/epirawdma.c
+++ b/src/libultra/io/epirawdma.c
@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 
 s32 __osEPiRawStartDma(OSPiHandle* handle, s32 direction, uintptr_t cartAddr, void* dramAddr, size_t size) {
     s32 status;
diff --git a/src/libultra/io/epirawread.c b/src/libultra/io/epirawread.c
index 51d56f7485..26d85aa8a4 100644
--- a/src/libultra/io/epirawread.c
+++ b/src/libultra/io/epirawread.c
@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 
 s32 __osEPiRawReadIo(OSPiHandle* handle, uintptr_t devAddr, u32* data) {
     s32 status;
diff --git a/src/libultra/io/epirawwrite.c b/src/libultra/io/epirawwrite.c
index c3ee6f646b..65d110a66c 100644
--- a/src/libultra/io/epirawwrite.c
+++ b/src/libultra/io/epirawwrite.c
@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 
 s32 __osEPiRawWriteIo(OSPiHandle* handle, uintptr_t devAddr, u32 data) {
     s32 status;
diff --git a/src/libultra/io/epiread.c b/src/libultra/io/epiread.c
index 5a2205bdc5..f7f6ac1f95 100644
--- a/src/libultra/io/epiread.c
+++ b/src/libultra/io/epiread.c
@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 
 s32 osEPiReadIo(OSPiHandle* handle, uintptr_t devAddr, u32* data) {
     register s32 ret;
diff --git a/src/libultra/io/epiwrite.c b/src/libultra/io/epiwrite.c
index 2132507413..00b97e85ad 100644
--- a/src/libultra/io/epiwrite.c
+++ b/src/libultra/io/epiwrite.c
@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 
 s32 osEPiWriteIo(OSPiHandle* handle, uintptr_t devAddr, u32 data) {
     register s32 ret;
diff --git a/src/libultra/io/motor.c b/src/libultra/io/motor.c
index ba934d8004..343047e7b2 100644
--- a/src/libultra/io/motor.c
+++ b/src/libultra/io/motor.c
@@ -1,7 +1,6 @@
+#include "ultra64.h"
 #include "PR/os_motor.h"
-
 #include "PR/controller.h"
-#include "functions.h"
 
 #define BANK_ADDR 0x400
 #define MOTOR_ID 0x80
diff --git a/src/libultra/io/pfsallocatefile.c b/src/libultra/io/pfsallocatefile.c
index 821568b87d..aeced23ee4 100644
--- a/src/libultra/io/pfsallocatefile.c
+++ b/src/libultra/io/pfsallocatefile.c
@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "global.h"
+#include "PR/controller.h"
 
 s32 osPfsAllocateFile(OSPfs* pfs, u16 companyCode, u32 gameCode, u8* gameName, u8* extName, s32 fileSize, s32* fileNo) {
     s32 startPage;
diff --git a/src/libultra/io/pfschecker.c b/src/libultra/io/pfschecker.c
index 79045ce1b2..f9ffb7ebfe 100644
--- a/src/libultra/io/pfschecker.c
+++ b/src/libultra/io/pfschecker.c
@@ -1,5 +1,5 @@
-#include "PR/os_pfs.h"
-#include "global.h"
+#include "ultra64.h"
+#include "PR/controller.h"
 
 #define CHECK_IPAGE(p)                                                                                      \
     (((p).ipage >= pfs->inodeStartPage) && ((p).inode_t.bank < pfs->banks) && ((p).inode_t.page >= 0x01) && \
diff --git a/src/libultra/io/pfsdeletefile.c b/src/libultra/io/pfsdeletefile.c
index 3d6558a0db..7dd9abca0f 100644
--- a/src/libultra/io/pfsdeletefile.c
+++ b/src/libultra/io/pfsdeletefile.c
@@ -1,5 +1,5 @@
-#include "PR/os_pfs.h"
-#include "global.h"
+#include "ultra64.h"
+#include "PR/controller.h"
 
 s32 __osPfsReleasePages(OSPfs* pfs, __OSInode* inode, u8 initialPage, u8 bank, __OSInodeUnit* finalPage);
 
diff --git a/src/libultra/io/pfsfilestate.c b/src/libultra/io/pfsfilestate.c
index 887eac1f6c..a39d55c02c 100644
--- a/src/libultra/io/pfsfilestate.c
+++ b/src/libultra/io/pfsfilestate.c
@@ -1,5 +1,6 @@
-#include "PR/os_pfs.h"
-#include "global.h"
+#include "ultra64.h"
+#include "PR/controller.h"
+#include "libc/stdbool.h"
 
 s32 osPfsFileState(OSPfs* pfs, s32 fileNo, OSPfsState* state) {
     s32 ret;
diff --git a/src/libultra/io/pfsfreeblocks.c b/src/libultra/io/pfsfreeblocks.c
index 2f8c6493f7..9bf79cfe8a 100644
--- a/src/libultra/io/pfsfreeblocks.c
+++ b/src/libultra/io/pfsfreeblocks.c
@@ -1,5 +1,5 @@
-#include "global.h"
-#include "PR/os_pfs.h"
+#include "ultra64.h"
+#include "PR/controller.h"
 
 s32 osPfsFreeBlocks(OSPfs* pfs, s32* leftoverBytes) {
     s32 j;
diff --git a/src/libultra/io/pfsgetstatus.c b/src/libultra/io/pfsgetstatus.c
index 1d8e6dcf5f..116b340f7f 100644
--- a/src/libultra/io/pfsgetstatus.c
+++ b/src/libultra/io/pfsgetstatus.c
@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "global.h"
+#include "PR/controller.h"
 
 void __osPfsRequestOneChannel(s32 channel, u8 poll);
 void __osPfsGetOneChannelData(s32 channel, OSContStatus* contData);
diff --git a/src/libultra/io/pfsinitpak.c b/src/libultra/io/pfsinitpak.c
index f4d917b62d..2688bd5d86 100644
--- a/src/libultra/io/pfsinitpak.c
+++ b/src/libultra/io/pfsinitpak.c
@@ -1,5 +1,5 @@
-#include "PR/os_pfs.h"
-#include "global.h"
+#include "ultra64.h"
+#include "PR/controller.h"
 
 s32 __osPfsCheckRamArea(OSPfs* pfs);
 
diff --git a/src/libultra/io/pfsreadwritefile.c b/src/libultra/io/pfsreadwritefile.c
index b5ab6e4b4c..2d26e00133 100644
--- a/src/libultra/io/pfsreadwritefile.c
+++ b/src/libultra/io/pfsreadwritefile.c
@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "global.h"
+#include "PR/controller.h"
 
 #define CHECK_IPAGE(p, pfs)                                                                                   \
     (((p).ipage >= (pfs).inodeStartPage) && ((p).inode_t.bank < (pfs).banks) && ((p).inode_t.page >= 0x01) && \
diff --git a/src/libultra/io/pfssearchfile.c b/src/libultra/io/pfssearchfile.c
index c5f8bcce46..1a034b7f02 100644
--- a/src/libultra/io/pfssearchfile.c
+++ b/src/libultra/io/pfssearchfile.c
@@ -1,4 +1,5 @@
-#include "global.h"
+#include "ultra64.h"
+#include "PR/controller.h"
 
 s32 osPfsFindFile(OSPfs* pfs, u16 companyCode, u32 gameCode, u8* gameName, u8* extName, s32* fileNo) {
     s32 j;
diff --git a/src/libultra/io/pfsselectbank.c b/src/libultra/io/pfsselectbank.c
index 59a69fccb5..380cbf10ad 100644
--- a/src/libultra/io/pfsselectbank.c
+++ b/src/libultra/io/pfsselectbank.c
@@ -1,5 +1,5 @@
-#include "PR/os_pfs.h"
-#include "global.h"
+#include "ultra64.h"
+#include "PR/controller.h"
 
 s32 __osPfsSelectBank(OSPfs* pfs, u8 bank) {
     u8 buf[BLOCKSIZE];
diff --git a/src/libultra/io/piacs.c b/src/libultra/io/piacs.c
index 66a7a96787..08346578ed 100644
--- a/src/libultra/io/piacs.c
+++ b/src/libultra/io/piacs.c
@@ -1,4 +1,5 @@
-#include "global.h"
+#include "ultra64.h"
+#include "macros.h"
 
 u32 __osPiAccessQueueEnabled = 0;
 
diff --git a/src/libultra/io/pigetcmdq.c b/src/libultra/io/pigetcmdq.c
index 6d367200b0..917881f708 100644
--- a/src/libultra/io/pigetcmdq.c
+++ b/src/libultra/io/pigetcmdq.c
@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 
 OSMesgQueue* osPiGetCmdQueue(void) {
     if (!__osPiDevMgr.active) {
diff --git a/src/libultra/io/pimgr.c b/src/libultra/io/pimgr.c
index 2ba34d5205..dfde5007c9 100644
--- a/src/libultra/io/pimgr.c
+++ b/src/libultra/io/pimgr.c
@@ -1,5 +1,7 @@
-#include "global.h"
+#include "ultra64.h"
+#include "alignment.h"
 #include "stack.h"
+#include "macros.h"
 
 OSPiHandle __Dom1SpeedParam ALIGNED(8);
 OSPiHandle __Dom2SpeedParam ALIGNED(8);
diff --git a/src/libultra/io/pirawdma.c b/src/libultra/io/pirawdma.c
index da9cb7b794..ad2a334dc3 100644
--- a/src/libultra/io/pirawdma.c
+++ b/src/libultra/io/pirawdma.c
@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 
 s32 __osPiRawStartDma(s32 direction, uintptr_t devAddr, void* dramAddr, size_t size) {
     register int status = IO_READ(PI_STATUS_REG);
diff --git a/src/libultra/io/si.c b/src/libultra/io/si.c
index d1ba0fa7b2..f1511c0d6f 100644
--- a/src/libultra/io/si.c
+++ b/src/libultra/io/si.c
@@ -1,4 +1,5 @@
-#include "global.h"
+#include "ultra64.h"
+#include "libc/stdbool.h"
 
 s32 __osSiDeviceBusy() {
     register u32 status = IO_READ(SI_STATUS_REG);
diff --git a/src/libultra/io/siacs.c b/src/libultra/io/siacs.c
index 8c514b606a..6a99d8dd1e 100644
--- a/src/libultra/io/siacs.c
+++ b/src/libultra/io/siacs.c
@@ -1,9 +1,11 @@
-#include "global.h"
+#include "ultra64.h"
+#include "alignment.h"
+#include "macros.h"
 
 u32 __osSiAccessQueueEnabled = 0;
 
-OSMesg siAccessBuf[1];
-OSMesgQueue __osSiAccessQueue;
+OSMesg siAccessBuf[1] ALIGNED(8);
+OSMesgQueue __osSiAccessQueue ALIGNED(8);
 
 void __osSiCreateAccessQueue() {
     __osSiAccessQueueEnabled = 1;
diff --git a/src/libultra/io/sirawdma.c b/src/libultra/io/sirawdma.c
index c2c44ab8dc..4c5dc8cc93 100644
--- a/src/libultra/io/sirawdma.c
+++ b/src/libultra/io/sirawdma.c
@@ -1,4 +1,5 @@
-#include "global.h"
+#include "ultra64.h"
+#include "alignment.h"
 
 s32 __osSiRawStartDma(s32 direction, void* dramAddr) {
     if (IO_READ(SI_STATUS_REG) & (SI_STATUS_DMA_BUSY | SI_STATUS_IO_READ_BUSY)) {
@@ -6,7 +7,7 @@ s32 __osSiRawStartDma(s32 direction, void* dramAddr) {
     }
 
     if (direction == OS_WRITE) {
-        osWritebackDCache(dramAddr, PIF_RAM_SIZE);
+        osWritebackDCache(dramAddr, ALIGN16(PIF_RAM_END - PIF_RAM_START));
     }
 
     IO_WRITE(SI_DRAM_ADDR_REG, osVirtualToPhysical(dramAddr));
@@ -18,7 +19,7 @@ s32 __osSiRawStartDma(s32 direction, void* dramAddr) {
     }
 
     if (direction == OS_READ) {
-        osInvalDCache(dramAddr, PIF_RAM_SIZE);
+        osInvalDCache(dramAddr, ALIGN16(PIF_RAM_END - PIF_RAM_START));
     }
     return 0;
 }