From 92bb1fb21006189ced43ab28753a12adc9aa21fc Mon Sep 17 00:00:00 2001 From: Tharo <17233964+Thar0@users.noreply.github.com> Date: Wed, 28 Oct 2020 19:59:18 +0000 Subject: Decompile the last of libultra_code_O2 (#464) * Decompile osPfsFileState, move guMtxL2F to asm/ * Remove asm * Add some prototypes to functions.h --- src/libultra_code_O2/code_80102FA0.c | 4 --- src/libultra_code_O2/code_80104D60.c | 4 --- src/libultra_code_O2/osPfsFileState.c | 57 +++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 8 deletions(-) delete mode 100644 src/libultra_code_O2/code_80102FA0.c delete mode 100644 src/libultra_code_O2/code_80104D60.c create mode 100644 src/libultra_code_O2/osPfsFileState.c (limited to 'src/libultra_code_O2') diff --git a/src/libultra_code_O2/code_80102FA0.c b/src/libultra_code_O2/code_80102FA0.c deleted file mode 100644 index fe6c1d3ee..000000000 --- a/src/libultra_code_O2/code_80102FA0.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "ultra64.h" -#include "global.h" - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_80102FA0/func_80102FA0.s") diff --git a/src/libultra_code_O2/code_80104D60.c b/src/libultra_code_O2/code_80104D60.c deleted file mode 100644 index 12cb746a5..000000000 --- a/src/libultra_code_O2/code_80104D60.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "ultra64.h" -#include "global.h" - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_80104D60/osPfsFileState.s") diff --git a/src/libultra_code_O2/osPfsFileState.c b/src/libultra_code_O2/osPfsFileState.c new file mode 100644 index 000000000..aa7cc4f4a --- /dev/null +++ b/src/libultra_code_O2/osPfsFileState.c @@ -0,0 +1,57 @@ +#include "ultra64.h" +#include "global.h" + +s32 osPfsFileState(OSPfs* pfs, s32 fileNo, OSPfsState* state) { + s32 ret; + s32 pages; + __OSInode inode; + __OSDir dir; + __OSInodeUnit page; + u8 bank; + + if (fileNo >= pfs->dir_size || fileNo < 0) { + return PFS_ERR_INVALID; + } + if (!(pfs->status & PFS_INITIALIZED)) { + return PFS_ERR_INVALID; + } + if ((ret = __osCheckId(pfs)) != 0) { + return ret; + } + if (pfs->activebank != 0 && (ret = __osPfsSelectBank(pfs, 0)) != 0) { + return ret; + } + if ((ret = __osContRamRead(pfs->queue, pfs->channel, pfs->dir_table + fileNo, &dir)) != 0) { + return ret; + } + if (dir.company_code == 0 || dir.game_code == 0) { + return PFS_ERR_INVALID; + } + + page = dir.start_page; + pages = 0; + bank = 0xFF; + while (true) { + if (page.ipage < pfs->inodeStartPage) { + break; + } + if (page.inode_t.bank != bank) { + bank = page.inode_t.bank; + if ((ret = __osPfsRWInode(pfs, &inode, PFS_READ, bank)) != 0) { + return ret; + } + } + pages++; + page = inode.inodePage[page.inode_t.page]; + } + if (page.ipage != PFS_EOF) { + return PFS_ERR_INCONSISTENT; + } + + state->file_size = pages * PFS_ONE_PAGE * BLOCKSIZE; + state->company_code = dir.company_code; + state->game_code = dir.game_code; + bcopy(&dir.game_name, state->game_name, PFS_FILE_NAME_LEN); + bcopy(&dir.ext_name, state->ext_name, PFS_FILE_EXT_LEN); + return __osPfsGetStatus(pfs->queue, pfs->channel); +} -- cgit v1.2.3