From f1d183d6feac23275306bfa2dee939d123702765 Mon Sep 17 00:00:00 2001 From: Tharo <17233964+Thar0@users.noreply.github.com> Date: Wed, 1 Dec 2021 00:08:57 +0000 Subject: libultra files and directories restructure (#1038) * Restructure files, begin header restructure * Format * us2dex * Fix parallel spelling Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> * Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer * Uppercase hex, exception vector address defines * Interrupt flags 1 Co-authored-by: Dragorn421 * Interrupt flags 2 Co-authored-by: Dragorn421 Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Co-authored-by: Dragorn421 --- src/libultra_code_O2/osPfsDeleteFile.c | 71 ---------------------------------- 1 file changed, 71 deletions(-) delete mode 100644 src/libultra_code_O2/osPfsDeleteFile.c (limited to 'src/libultra_code_O2/osPfsDeleteFile.c') diff --git a/src/libultra_code_O2/osPfsDeleteFile.c b/src/libultra_code_O2/osPfsDeleteFile.c deleted file mode 100644 index 573af6a72..000000000 --- a/src/libultra_code_O2/osPfsDeleteFile.c +++ /dev/null @@ -1,71 +0,0 @@ -#include "ultra64/pfs.h" -#include "global.h" - -s32 osPfsDeleteFile(OSPfs* pfs, u16 companyCode, u32 gameCode, u8* gameName, u8* extName) { - s32 file_no; - s32 ret; - __OSInode inode; - __OSDir dir; - __OSInodeUnit last_page; - u8 startpage; - u8 bank; - - if ((companyCode == 0) || (gameCode == 0)) { - return PFS_ERR_INVALID; - } - if ((ret = osPfsFindFile(pfs, companyCode, gameCode, gameName, extName, &file_no)) != 0) { - return ret; - } - if ((pfs->activebank != 0) && (ret = __osPfsSelectBank(pfs, 0)) != 0) { - return ret; - } - - if ((ret = __osContRamRead(pfs->queue, pfs->channel, pfs->dir_table + file_no, (u8*)&dir)) != 0) { - return ret; - } - - startpage = dir.start_page.inode_t.page; - for (bank = dir.start_page.inode_t.bank; bank < pfs->banks;) { - if ((ret = __osPfsRWInode(pfs, &inode, PFS_READ, bank)) != 0) { - return ret; - } - if ((ret = __osPfsReleasePages(pfs, &inode, startpage, bank, &last_page)) != 0) { - return ret; - } - if ((ret = __osPfsRWInode(pfs, &inode, PFS_WRITE, bank)) != 0) { - return ret; - } - if (last_page.ipage == PFS_EOF) { - break; - } - bank = last_page.inode_t.bank; - startpage = last_page.inode_t.page; - } - - if (bank >= pfs->banks) { - return PFS_ERR_INCONSISTENT; - } - bzero(&dir, sizeof(__OSDir)); - - ret = __osContRamWrite(pfs->queue, pfs->channel, pfs->dir_table + file_no, (u8*)&dir, 0); - - return ret; -} - -s32 __osPfsReleasePages(OSPfs* pfs, __OSInode* inode, u8 initialPage, u8 bank, __OSInodeUnit* finalPage) { - __OSInodeUnit next; - __OSInodeUnit prev; - s32 ret = 0; - - next.ipage = (u16)((bank << 8) + initialPage); - - do { - prev = next; - next = inode->inodePage[next.inode_t.page]; - inode->inodePage[prev.inode_t.page].ipage = PFS_PAGE_NOT_USED; - } while (next.ipage >= pfs->inodeStartPage && next.inode_t.bank == bank); - - *finalPage = next; - - return ret; -} -- cgit v1.2.3