diff --git a/include/fs.h b/include/fs.h index bc74621..1dfab2a 100644 --- a/include/fs.h +++ b/include/fs.h @@ -53,3 +53,6 @@ s32 fClose(s32 handle); s32 fRead(s32 handle, void *const buf, u32 size); s32 fWrite(s32 handle, const void *const buf, u32 size); +s32 fSync(s32 handle); +s32 fLseek(s32 handle, u32 offset); +s32 fUnlink(const char *const path); diff --git a/include/ipc_handler.h b/include/ipc_handler.h index 078b91d..bf294cc 100644 --- a/include/ipc_handler.h +++ b/include/ipc_handler.h @@ -41,27 +41,29 @@ IPC_CMD9_FCLOSE = CMD_ID(3) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(1), IPC_CMD9_FREAD = CMD_ID(4) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(1) | CMD_PARAMS(1), IPC_CMD9_FWRITE = CMD_ID(5) | CMD_IN_BUFS(1) | CMD_OUT_BUFS(0) | CMD_PARAMS(1), - IPC_CMD9_FOPEN_DIR = CMD_ID(6) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(2), - IPC_CMD9_FREAD_DIR = CMD_ID(7) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(1) | CMD_PARAMS(2), - IPC_CMD9_FCLOSE_DIR = CMD_ID(8) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(1), - IPC_CMD9_FUNLINK = CMD_ID(9) | CMD_IN_BUFS(1) | CMD_OUT_BUFS(0) | CMD_PARAMS(1), - IPC_CMD9_FGETFREE = CMD_ID(10) | CMD_IN_BUFS(1) | CMD_OUT_BUFS(0) | CMD_PARAMS(3), - IPC_CMD9_READ_SECTORS = CMD_ID(11) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(17), // Invalid on purpose. Will be decided later. - IPC_CMD9_WRITE_SECTORS = CMD_ID(12) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(17), // Invalid on purpose. Will be decided later. - IPC_CMD9_MALLOC = CMD_ID(13) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(1), - IPC_CMD9_FREE = CMD_ID(14) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(1), - IPC_CMD9_LOAD_VERIFY_FIRM = CMD_ID(15) | CMD_IN_BUFS(1) | CMD_OUT_BUFS(0) | CMD_PARAMS(17), // Invalid on purpose. Will be decided later. - IPC_CMD9_FIRM_LAUNCH = CMD_ID(16) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(17), // Invalid on purpose. Will be decided later. - IPC_CMD9_PREPA_POWER = CMD_ID(17) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(0), - IPC_CMD9_PANIC = CMD_ID(18) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(0), - IPC_CMD9_EXCEPTION = CMD_ID(19) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(0) + IPC_CMD9_FSYNC = CMD_ID(6) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(1), + IPC_CMD9_FLSEEK = CMD_ID(7) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(2), + IPC_CMD9_FOPEN_DIR = CMD_ID(8) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15), // Invalid on purpose. Will be decided later. + IPC_CMD9_FREAD_DIR = CMD_ID(9) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15), + IPC_CMD9_FCLOSE_DIR = CMD_ID(10) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15), + IPC_CMD9_FUNLINK = CMD_ID(11) | CMD_IN_BUFS(1) | CMD_OUT_BUFS(0) | CMD_PARAMS(0), + IPC_CMD9_FGETFREE = CMD_ID(12) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15), + IPC_CMD9_READ_SECTORS = CMD_ID(13) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15), + IPC_CMD9_WRITE_SECTORS = CMD_ID(14) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15), + IPC_CMD9_MALLOC = CMD_ID(15) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15), + IPC_CMD9_FREE = CMD_ID(16) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15), + IPC_CMD9_LOAD_VERIFY_FIRM = CMD_ID(17) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15), + IPC_CMD9_FIRM_LAUNCH = CMD_ID(18) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15), + IPC_CMD9_PREPA_POWER = CMD_ID(19) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15), + IPC_CMD9_PANIC = CMD_ID(20) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15), + IPC_CMD9_EXCEPTION = CMD_ID(21) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15) } IpcCmd9; typedef enum { - IPC_CMD11_PRINT_MSG = CMD_ID(0) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(17), // Invalid on purpose. Will be decided later. - IPC_CMD11_PANIC = CMD_ID(1) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(17), // Invalid on purpose. Will be decided later. - IPC_CMD11_EXCEPTION = CMD_ID(2) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(17) // Invalid on purpose. Will be decided later. + IPC_CMD11_PRINT_MSG = CMD_ID(0) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15), // Invalid on purpose. Will be decided later. + IPC_CMD11_PANIC = CMD_ID(1) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15), + IPC_CMD11_EXCEPTION = CMD_ID(2) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15) } IpcCmd11; #undef CMD_ID diff --git a/source/arm11/fs.c b/source/arm11/fs.c index 0acd805..5df977a 100644 --- a/source/arm11/fs.c +++ b/source/arm11/fs.c @@ -71,3 +71,27 @@ return PXI_sendCmd(IPC_CMD9_FWRITE, cmdBuf, 3); } + +s32 fSync(s32 handle) +{ + const u32 cmdBuf = handle; + return PXI_sendCmd(IPC_CMD9_FSYNC, &cmdBuf, 1); +} + +s32 fLseek(s32 handle, u32 offset) +{ + u32 cmdBuf[2]; + cmdBuf[0] = handle; + cmdBuf[1] = offset; + + return PXI_sendCmd(IPC_CMD9_FLSEEK, cmdBuf, 2); +} + +s32 fUnlink(const char *const path) +{ + u32 cmdBuf[2]; + cmdBuf[0] = (u32)path; + cmdBuf[1] = strlen(path) + 1; + + return PXI_sendCmd(IPC_CMD9_FUNLINK, cmdBuf, 2); +} diff --git a/source/arm9/fs.c b/source/arm9/fs.c index 44642ea..e6f4756 100644 --- a/source/arm9/fs.c +++ b/source/arm9/fs.c @@ -132,3 +132,28 @@ if(res == FR_OK) return FR_OK; else return -res; } + +s32 fSync(s32 handle) +{ + if(!isHandleValid(handle)) return -30; + + FRESULT res = f_sync(&fTable[handle]); + if(res == FR_OK) return res; + else return -res; +} + +s32 fLseek(s32 handle, u32 offset) +{ + if(!isHandleValid(handle)) return -30; + + FRESULT res = f_lseek(&fTable[handle], offset); + if(res == FR_OK) return res; + else return -res; +} + +s32 fUnlink(const char *const path) +{ + FRESULT res = f_unlink(path); + if(res == FR_OK) return res; + else return -res; +} diff --git a/source/arm9/ipc_handler.c b/source/arm9/ipc_handler.c index 3e6c506..afc86a0 100644 --- a/source/arm9/ipc_handler.c +++ b/source/arm9/ipc_handler.c @@ -54,6 +54,12 @@ case IPC_CMD_ID_MASK(IPC_CMD9_FWRITE): result = fWrite(buf[2], (const void *const)buf[0], buf[1]); break; + case IPC_CMD_ID_MASK(IPC_CMD9_FSYNC): + result = fSync(buf[0]); + break; + case IPC_CMD_ID_MASK(IPC_CMD9_FLSEEK): + result = fLseek(buf[0], buf[1]); + break; case IPC_CMD_ID_MASK(IPC_CMD9_FOPEN_DIR): break; case IPC_CMD_ID_MASK(IPC_CMD9_FREAD_DIR): @@ -61,6 +67,7 @@ case IPC_CMD_ID_MASK(IPC_CMD9_FCLOSE_DIR): break; case IPC_CMD_ID_MASK(IPC_CMD9_FUNLINK): + result = fUnlink((const char *const)buf[0]); break; case IPC_CMD_ID_MASK(IPC_CMD9_FGETFREE): break;