diff --git a/include/fs.h b/include/fs.h index 1a02568..5ca3206 100644 --- a/include/fs.h +++ b/include/fs.h @@ -68,6 +68,8 @@ s32 fFinalizeRawAccess(DevHandle handle); s32 fCreateDeviceBuffer(u32 size); s32 fFreeDeviceBuffer(DevBufHandle handle); +s32 fReadToDeviceBuffer(s32 sourceHandle, u32 sourceOffset, u32 sourceSize, DevBufHandle devBufHandle); +s32 fsWriteFromDeviceBuffer(s32 destHandle, u32 destOffset, u32 destSize, DevBufHandle devBufHandle); s32 fOpen(const char *const path, FsOpenMode mode); s32 fRead(s32 handle, void *const buf, u32 size); s32 fWrite(s32 handle, const void *const buf, u32 size); @@ -84,5 +86,3 @@ s32 fMkdir(const char *const path); s32 fRename(const char *const old, const char *const new); s32 fUnlink(const char *const path); -s32 fReadToDeviceBuffer(s32 sourceHandle, u32 sourceOffset, u32 sourceSize, DevBufHandle devBufHandle); -s32 fsWriteFromCache(s32 destHandle, u32 destOffset, u32 destSize, DevBufHandle devBufHandle); diff --git a/include/ipc_handler.h b/include/ipc_handler.h index 46d2c97..081a132 100644 --- a/include/ipc_handler.h +++ b/include/ipc_handler.h @@ -35,34 +35,40 @@ typedef enum { - IPC_CMD9_FMOUNT = CMD_ID(0) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(1), - IPC_CMD9_FUNMOUNT = CMD_ID(1) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(1), - IPC_CMD9_FGETFREE = CMD_ID(2) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(1) | CMD_PARAMS(1), - IPC_CMD9_FOPEN = CMD_ID(3) | CMD_IN_BUFS(1) | 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_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_FTELL = CMD_ID(8) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(1), - IPC_CMD9_FSIZE = CMD_ID(9) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(1), - IPC_CMD9_FCLOSE = CMD_ID(10) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(1), - IPC_CMD9_FEXPAND = CMD_ID(11) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(2), - IPC_CMD9_FSTAT = CMD_ID(12) | CMD_IN_BUFS(1) | CMD_OUT_BUFS(1) | CMD_PARAMS(0), - IPC_CMD9_FOPEN_DIR = CMD_ID(13) | CMD_IN_BUFS(1) | CMD_OUT_BUFS(0) | CMD_PARAMS(0), // Invalid on purpose. Will be decided later. - IPC_CMD9_FREAD_DIR = CMD_ID(14) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(1) | CMD_PARAMS(2), - IPC_CMD9_FCLOSE_DIR = CMD_ID(15) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(1), - IPC_CMD9_FMKDIR = CMD_ID(16) | CMD_IN_BUFS(1) | CMD_OUT_BUFS(0) | CMD_PARAMS(0), - IPC_CMD9_FRENAME = CMD_ID(17) | CMD_IN_BUFS(2) | CMD_OUT_BUFS(0) | CMD_PARAMS(0), - IPC_CMD9_FUNLINK = CMD_ID(18) | CMD_IN_BUFS(1) | CMD_OUT_BUFS(0) | CMD_PARAMS(0), - IPC_CMD9_READ_SECTORS = CMD_ID(19) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15), - IPC_CMD9_WRITE_SECTORS = CMD_ID(20) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15), - IPC_CMD9_MALLOC = CMD_ID(21) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15), - IPC_CMD9_FREE = CMD_ID(22) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15), - IPC_CMD9_LOAD_VERIFY_FIRM = CMD_ID(23) | CMD_IN_BUFS(1) | CMD_OUT_BUFS(0) | CMD_PARAMS(1), - IPC_CMD9_FIRM_LAUNCH = CMD_ID(24) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(0), - IPC_CMD9_PREPA_POWER = CMD_ID(25) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15), - IPC_CMD9_PANIC = CMD_ID(26) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15), - IPC_CMD9_EXCEPTION = CMD_ID(27) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15) + IPC_CMD9_FMOUNT = CMD_ID(0) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(1), + IPC_CMD9_FUNMOUNT = CMD_ID(1) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(1), + IPC_CMD9_FGETFREE = CMD_ID(2) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(1) | CMD_PARAMS(1), + IPC_CMD9_FPREP_RAW_ACCESS = CMD_ID(3) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(1), + IPC_CMD9_FFINAL_RAW_ACCESS = CMD_ID(4) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(1), + IPC_CMD9_FCREATE_DEV_BUF = CMD_ID(5) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(1), + IPC_CMD9_FFREE_DEV_BUF = CMD_ID(6) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(1), + IPC_CMD9_FREAD_TO_DEV_BUF = CMD_ID(7) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(4), + IPC_CMD9_FWRITE_FROM_DEV_BUF = CMD_ID(8) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(4), + IPC_CMD9_FOPEN = CMD_ID(9) | CMD_IN_BUFS(1) | CMD_OUT_BUFS(0) | CMD_PARAMS(1), + IPC_CMD9_FREAD = CMD_ID(10) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(1) | CMD_PARAMS(1), + IPC_CMD9_FWRITE = CMD_ID(11) | CMD_IN_BUFS(1) | CMD_OUT_BUFS(0) | CMD_PARAMS(1), + IPC_CMD9_FSYNC = CMD_ID(12) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(1), + IPC_CMD9_FLSEEK = CMD_ID(13) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(2), + IPC_CMD9_FTELL = CMD_ID(14) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(1), + IPC_CMD9_FSIZE = CMD_ID(15) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(1), + IPC_CMD9_FCLOSE = CMD_ID(16) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(1), + IPC_CMD9_FEXPAND = CMD_ID(17) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(2), + IPC_CMD9_FSTAT = CMD_ID(18) | CMD_IN_BUFS(1) | CMD_OUT_BUFS(1) | CMD_PARAMS(0), + IPC_CMD9_FOPEN_DIR = CMD_ID(19) | CMD_IN_BUFS(1) | CMD_OUT_BUFS(0) | CMD_PARAMS(0), // Invalid on purpose. Will be decided later. + IPC_CMD9_FREAD_DIR = CMD_ID(20) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(1) | CMD_PARAMS(2), + IPC_CMD9_FCLOSE_DIR = CMD_ID(21) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(1), + IPC_CMD9_FMKDIR = CMD_ID(22) | CMD_IN_BUFS(1) | CMD_OUT_BUFS(0) | CMD_PARAMS(0), + IPC_CMD9_FRENAME = CMD_ID(23) | CMD_IN_BUFS(2) | CMD_OUT_BUFS(0) | CMD_PARAMS(0), + IPC_CMD9_FUNLINK = CMD_ID(24) | CMD_IN_BUFS(1) | CMD_OUT_BUFS(0) | CMD_PARAMS(0), + IPC_CMD9_READ_SECTORS = CMD_ID(25) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15), + IPC_CMD9_WRITE_SECTORS = CMD_ID(26) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15), + IPC_CMD9_MALLOC = CMD_ID(27) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15), + IPC_CMD9_FREE = CMD_ID(28) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15), + IPC_CMD9_LOAD_VERIFY_FIRM = CMD_ID(29) | CMD_IN_BUFS(1) | CMD_OUT_BUFS(0) | CMD_PARAMS(1), + IPC_CMD9_FIRM_LAUNCH = CMD_ID(30) | CMD_IN_BUFS(0) | CMD_OUT_BUFS(0) | CMD_PARAMS(0), + IPC_CMD9_PREPA_POWER = CMD_ID(31) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15), + IPC_CMD9_PANIC = CMD_ID(32) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15), + IPC_CMD9_EXCEPTION = CMD_ID(33) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15) } IpcCmd9; typedef enum diff --git a/source/arm11/fs.c b/source/arm11/fs.c index 2e27832..d8d1d6e 100644 --- a/source/arm11/fs.c +++ b/source/arm11/fs.c @@ -46,6 +46,52 @@ return PXI_sendCmd(IPC_CMD9_FGETFREE, cmdBuf, 3); } +s32 fPrepareRawAccess(FsDevice dev) +{ + const u32 cmdBuf = dev; + return PXI_sendCmd(IPC_CMD9_FPREP_RAW_ACCESS, &cmdBuf, 1); +} + +s32 fFinalizeRawAccess(DevHandle handle) +{ + const u32 cmdBuf = handle; + return PXI_sendCmd(IPC_CMD9_FFINAL_RAW_ACCESS, &cmdBuf, 1); +} + +s32 fCreateDeviceBuffer(u32 size) +{ + const u32 cmdBuf = size; + return PXI_sendCmd(IPC_CMD9_FCREATE_DEV_BUF, &cmdBuf, 1); +} + +s32 fFreeDeviceBuffer(DevBufHandle handle) +{ + const u32 cmdBuf = handle; + return PXI_sendCmd(IPC_CMD9_FFREE_DEV_BUF, &cmdBuf, 1); +} + +s32 fReadToDeviceBuffer(s32 sourceHandle, u32 sourceOffset, u32 sourceSize, DevBufHandle devBufHandle) +{ + u32 cmdBuf[4]; + cmdBuf[0] = sourceHandle; + cmdBuf[1] = sourceOffset; + cmdBuf[2] = sourceSize; + cmdBuf[3] = devBufHandle; + + return PXI_sendCmd(IPC_CMD9_FREAD_TO_DEV_BUF, cmdBuf, 4); +} + +s32 fsWriteFromDeviceBuffer(s32 destHandle, u32 destOffset, u32 destSize, DevBufHandle devBufHandle) +{ + u32 cmdBuf[4]; + cmdBuf[0] = destHandle; + cmdBuf[1] = destOffset; + cmdBuf[2] = destSize; + cmdBuf[3] = devBufHandle; + + return PXI_sendCmd(IPC_CMD9_FWRITE_FROM_DEV_BUF, cmdBuf, 4); +} + s32 fOpen(const char *const path, FsOpenMode mode) { u32 cmdBuf[3]; diff --git a/source/arm9/fs.c b/source/arm9/fs.c index 40db9c7..57d31fa 100644 --- a/source/arm9/fs.c +++ b/source/arm9/fs.c @@ -24,6 +24,7 @@ #include "arm9/dev.h" #include "fatfs/ff.h" + typedef struct { u8 *mem; @@ -31,6 +32,7 @@ size_t dataSize; } DevBuf; + static const DevHandle devHandleMagic = 0x42424296; static FATFS fsTable[FS_MAX_DRIVES] = {0}; @@ -51,6 +53,9 @@ static DevBuf devBuf; + +static bool isFileHandleValid(s32 handle); + s32 fMount(FsDrive drive) { if((u32)drive >= FS_MAX_DRIVES) return -30; @@ -217,6 +222,153 @@ return FR_OK; } +// Reads from a device or file to a device buffer +// Note: size must be <= cache size, else: error +s32 fReadToDeviceBuffer(s32 sourceHandle, u32 sourceOffset, u32 sourceSize, DevBufHandle devBufHandle) +{ + FsDevice dev; + u32 sector, count; + bool fromFile; + + // source is a device? + if(isValidDevHandle(sourceHandle)) + { + if(!isValidDevHandle(sourceHandle)) + return -30; + + dev = getDeviceFromHanlde(sourceHandle); + + if(!usesRawAccess(dev)) + return -30; + + if(sourceOffset % 0x200 || sourceSize % 0x200) + return -30; + + fromFile = false; + } + else + { + // source must be file, but is it valid? + if(!isFileHandleValid(sourceHandle)) + return -30; + + fromFile = true; + } + + /* validate device buffer */ + + if(!isValidDevBufHandle(devBufHandle)) + return -30; + + if(devBuf.memSize < sourceSize) + return -30; + + /* getting interesting here */ + + if(fromFile) + { + if(fLseek(sourceHandle, sourceOffset) < 0) + return -31; + + if(fRead(sourceHandle, devBuf.mem, sourceSize) < 0) + return -31; + } + else + { + // for now... + if(dev != FS_DEVICE_NAND) + return -30; + + if(!dev_rawnand->is_active()) + return -31; + + sector = sourceOffset >> 9; + count = sourceSize >> 9; + + if(!dev_rawnand->read_sector(sector, count, devBuf.mem)) + return -31; + } + + devBuf.dataSize = sourceSize; + + return FR_OK; +} + +// Writes from a device buffer to a device or file. +// Note: size must be <= cache size, else: error +s32 fsWriteFromDeviceBuffer(s32 destHandle, u32 destOffset, u32 destSize, DevBufHandle devBufHandle) +{ + FsDevice dev; + u32 sector, count; + bool toFile; + + // destination is a device? + if(isValidDevHandle(destHandle)) + { + if(!isValidDevHandle(destHandle)) + return -30; + + dev = getDeviceFromHanlde(destHandle); + + if(!usesRawAccess(dev)) + return -30; + + if(destOffset % 0x200 || destSize % 0x200) + return -30; + + toFile = false; + } + else + { + // dest must be file, but is it valid? + if(!isFileHandleValid(destHandle)) + return -30; + + toFile = true; + } + + /* validate device buffer */ + + if(!isValidDevBufHandle(devBufHandle)) + return -30; + + if(devBuf.dataSize < destSize) + return -30; + + count = min(devBuf.dataSize, destSize); + + if(toFile) + { + if(fLseek(destHandle, destOffset) < 0) + return -31; + + if(fWrite(destHandle, devBuf.mem, count) < 0) + return -31; + } + else + { + // for now... + if(dev != FS_DEVICE_NAND) + return -30; + + if(!dev_rawnand->is_active()) + return -31; + + if(count % 0x200) + return -30; + + sector = destOffset >> 9; + count = count >> 9; + + if(!dev_rawnand->write_sector(sector, count, devBuf.mem)) + return -31; + } + + devBuf.dataSize = 0; + + return FR_OK; +} + static s32 findUnusedFileSlot(void) { if(fHandles >= FS_MAX_FILES) return -1; @@ -423,151 +575,3 @@ if(res == FR_OK) return res; else return -res; } - -// Reads from a device or file to a device buffer -// Note: size must be <= cache size, else: error -s32 fReadToDeviceBuffer(s32 sourceHandle, u32 sourceOffset, u32 sourceSize, DevBufHandle devBufHandle) -{ - FsDevice dev; - u32 sector, count; - bool fromFile; - - // source is a device? - if(isValidDevHandle(sourceHandle)) - { - if(!isValidDevHandle(sourceHandle)) - return -30; - - dev = getDeviceFromHanlde(sourceHandle); - - if(!usesRawAccess(dev)) - return -30; - - if(sourceOffset % 0x200 || sourceSize % 0x200) - return -30; - - fromFile = false; - } - else - { - // source must be file, but is it valid? - if(!isFileHandleValid(sourceHandle)) - return -30; - - fromFile = true; - } - - /* validate device buffer */ - - if(!isValidDevBufHandle(devBufHandle)) - return -30; - - if(devBuf.memSize < sourceSize) - return -30; - - /* getting interesting here */ - - if(fromFile) - { - if(fLseek(sourceHandle, sourceOffset) < 0) - return -31; - - if(fRead(sourceHandle, devBuf.mem, sourceSize) < 0) - return -31; - } - else - { - // for now... - if(dev != FS_DEVICE_NAND) - return -30; - - if(!dev_rawnand->is_active()) - return -31; - - sector = sourceOffset >> 9; - count = sourceSize >> 9; - - if(!dev_rawnand->read_sector(sector, count, devBuf.mem)) - return -31; - } - - devBuf.dataSize = sourceSize; - - return FR_OK; -} - -// Writes from a device buffer to a device or file. -// Note: size must be <= cache size, else: error -s32 fsWriteFromCache(s32 destHandle, u32 destOffset, u32 destSize, DevBufHandle devBufHandle) -{ - FsDevice dev; - u32 sector, count; - bool toFile; - - // destination is a device? - if(isValidDevHandle(destHandle)) - { - if(!isValidDevHandle(destHandle)) - return -30; - - dev = getDeviceFromHanlde(destHandle); - - if(!usesRawAccess(dev)) - return -30; - - if(destOffset % 0x200 || destSize % 0x200) - return -30; - - toFile = false; - } - else - { - // dest must be file, but is it valid? - if(!isFileHandleValid(destHandle)) - return -30; - - toFile = true; - } - - /* validate device buffer */ - - if(!isValidDevBufHandle(devBufHandle)) - return -30; - - if(devBuf.dataSize < destSize) - return -30; - - count = min(devBuf.dataSize, destSize); - - if(toFile) - { - if(fLseek(destHandle, destOffset) < 0) - return -31; - - if(fWrite(destHandle, devBuf.mem, count) < 0) - return -31; - } - else - { - // for now... - if(dev != FS_DEVICE_NAND) - return -30; - - if(!dev_rawnand->is_active()) - return -31; - - if(count % 0x200) - return -30; - - sector = destOffset >> 9; - count = count >> 9; - - if(!dev_rawnand->write_sector(sector, count, devBuf.mem)) - return -31; - } - - devBuf.dataSize = 0; - - return FR_OK; -} - diff --git a/source/arm9/ipc_handler.c b/source/arm9/ipc_handler.c index 308fd09..8867ed2 100644 --- a/source/arm9/ipc_handler.c +++ b/source/arm9/ipc_handler.c @@ -46,6 +46,24 @@ case IPC_CMD_ID_MASK(IPC_CMD9_FGETFREE): result = fGetFree(buf[2], (u64*)buf[0]); break; + case IPC_CMD_ID_MASK(IPC_CMD9_FPREP_RAW_ACCESS): + result = fPrepareRawAccess(buf[0]); + break; + case IPC_CMD_ID_MASK(IPC_CMD9_FFINAL_RAW_ACCESS): + result = fFinalizeRawAccess(buf[0]); + break; + case IPC_CMD_ID_MASK(IPC_CMD9_FCREATE_DEV_BUF): + result = fCreateDeviceBuffer(buf[0]); + break; + case IPC_CMD_ID_MASK(IPC_CMD9_FFREE_DEV_BUF): + result = fFreeDeviceBuffer(buf[0]); + break; + case IPC_CMD_ID_MASK(IPC_CMD9_FREAD_TO_DEV_BUF): + result = fReadToDeviceBuffer(buf[0], buf[1], buf[2], buf[3]); + break; + case IPC_CMD_ID_MASK(IPC_CMD9_FWRITE_FROM_DEV_BUF): + result = fsWriteFromDeviceBuffer(buf[0], buf[1], buf[2], buf[3]); + break; case IPC_CMD_ID_MASK(IPC_CMD9_FOPEN): result = fOpen((const char *const)buf[0], buf[2]); break;