diff options
| author | cadmic <cadmic24@gmail.com> | 2024-01-29 04:30:29 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-29 07:30:29 -0500 |
| commit | be731f8a35acc93b46457f352bfa92be1929dd2c (patch) | |
| tree | 79f45e543f476dcf88df6f4eb69c3926be7f84c0 | |
| parent | 6e0d67f9ec1f0c2279fa29781b57e273161f60b5 (diff) | |
Move __osPfsInodeCache and __osPfsPifRam (#1654)
* Move __osPfsInodeCache to pfsgetstatus.c
* Move __osPfsInodeCache to contfps.c and __osPfsPifRam to pfsisplug.c
| -rw-r--r-- | src/libultra/io/contpfs.c | 2 | ||||
| -rw-r--r-- | src/libultra/io/pfsgetstatus.c | 2 | ||||
| -rw-r--r-- | src/libultra/io/pfsisplug.c | 2 | ||||
| -rw-r--r-- | src/libultra/io/pfsreadwritefile.c | 2 | ||||
| -rw-r--r-- | 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 026237a80..20b2ea63f 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 c0b05e45e..0ec3bd7b4 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 dd5193375..d5630fccc 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 9b99c08d2..b2c78a746 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 7a31a50ed..c08df45f8 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 |