From be731f8a35acc93b46457f352bfa92be1929dd2c Mon Sep 17 00:00:00 2001
From: cadmic <cadmic24@gmail.com>
Date: Mon, 29 Jan 2024 04:30:29 -0800
Subject: [PATCH] Move __osPfsInodeCache and __osPfsPifRam (#1654)

* Move __osPfsInodeCache to pfsgetstatus.c

* Move __osPfsInodeCache to contfps.c and __osPfsPifRam to pfsisplug.c
---
 src/libultra/io/contpfs.c            | 2 ++
 src/libultra/io/pfsgetstatus.c       | 2 --
 src/libultra/io/pfsisplug.c          | 2 ++
 src/libultra/io/pfsreadwritefile.c   | 2 --
 tools/disasm/gc-eu-mq/files_code.csv | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/libultra/io/contpfs.c b/src/libultra/io/contpfs.c
index 026237a802..20b2ea63ff 100644
--- a/src/libultra/io/contpfs.c
+++ b/src/libultra/io/contpfs.c
@@ -4,6 +4,8 @@
 s32 __osPfsInodeCacheChannel = -1;
 u8 __osPfsInodeCacheBank = 250;
 
+__OSInode __osPfsInodeCache;
+
 u16 __osSumcalc(u8* ptr, s32 length) {
     s32 i;
     u32 sum = 0;
diff --git a/src/libultra/io/pfsgetstatus.c b/src/libultra/io/pfsgetstatus.c
index c0b05e45e4..0ec3bd7b4d 100644
--- a/src/libultra/io/pfsgetstatus.c
+++ b/src/libultra/io/pfsgetstatus.c
@@ -1,8 +1,6 @@
 #include "ultra64.h"
 #include "global.h"
 
-OSPifRam __osPfsPifRam;
-
 s32 __osPfsGetStatus(OSMesgQueue* queue, s32 channel) {
     s32 ret = 0;
     OSMesg msg;
diff --git a/src/libultra/io/pfsisplug.c b/src/libultra/io/pfsisplug.c
index dd51933752..d5630fccc5 100644
--- a/src/libultra/io/pfsisplug.c
+++ b/src/libultra/io/pfsisplug.c
@@ -1,6 +1,8 @@
 #include "ultra64.h"
 #include "global.h"
 
+OSPifRam __osPfsPifRam;
+
 s32 osPfsIsPlug(OSMesgQueue* mq, u8* pattern) {
     s32 ret = 0;
     OSMesg msg;
diff --git a/src/libultra/io/pfsreadwritefile.c b/src/libultra/io/pfsreadwritefile.c
index 9b99c08d2c..b2c78a7464 100644
--- a/src/libultra/io/pfsreadwritefile.c
+++ b/src/libultra/io/pfsreadwritefile.c
@@ -5,8 +5,6 @@
     (((p).ipage >= (pfs).inodeStartPage) && ((p).inode_t.bank < (pfs).banks) && ((p).inode_t.page >= 0x01) && \
      ((p).inode_t.page < 0x80))
 
-__OSInode __osPfsInodeCache;
-
 s32 __osPfsGetNextPage(OSPfs* pfs, u8* bank, __OSInode* inode, __OSInodeUnit* page) {
     s32 ret;
 
diff --git a/tools/disasm/gc-eu-mq/files_code.csv b/tools/disasm/gc-eu-mq/files_code.csv
index 7a31a50eda..c08df45f8b 100644
--- a/tools/disasm/gc-eu-mq/files_code.csv
+++ b/tools/disasm/gc-eu-mq/files_code.csv
@@ -457,7 +457,7 @@ offset,vram,.bss
 1195F0,8012A4F0,src/libultra/io/motor.s
 1196F0,8012A5F0,src/libultra/io/siacs.s
 119710,8012A610,src/libultra/io/controller.s
-1197A0,8012A6A0,src/libultra/io/pfsreadwritefile.s
-1198A0,8012A7A0,src/libultra/io/pfsgetstatus.s
+1197A0,8012A6A0,src/libultra/io/contpfs.s
+1198A0,8012A7A0,src/libultra/io/pfsisplug.s
 1198E0,8012A7E0,src/code/z_message_PAL.s
 119900,8012A800,.end