Leahnaya/wut
1
0
Fork 0
mirror of https://github.com/devkitPro/wut.git synced 2026-08-28 13:55:04 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

wutdevoptab: Implement devoptab using FSA functions

Browse Source
This commit is contained in:
Maschell
2022-08-09 12:53:58 +02:00
committed by Dave Murphy
parent e492c31d06
commit 4083224b51
28 changed files with 928 additions and 541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libraries/wutdevoptab/devoptab_fsa_read.cpp
View File

@@ -1,15 +1,18 @@
#include "devoptab_fsa.h"
#include <mutex>
#include <sys/param.h>
ssize_t __wut_fs_read(struct _reent *r, void *fd, char *ptr, size_t len) {
ssize_t __wut_fsa_read(struct _reent *r, void *fd, char *ptr, size_t len) {
FSError status;
__wut_fsa_file_t *file;
__wut_fsa_device_t *deviceData;
if (!fd || !ptr) {
r->_errno = EINVAL;
return -1;
}
// Check that the file was opened with read access
__wut_fs_file_t *file = (__wut_fs_file_t *) fd;
file = (__wut_fsa_file_t *) fd;
if ((file->flags & O_ACCMODE) == O_WRONLY) {
r->_errno = EBADF;
return -1;
@@ -18,8 +21,9 @@ ssize_t __wut_fs_read(struct _reent *r, void *fd, char *ptr, size_t len) {
// cache-aligned, cache-line-sized
__attribute__((aligned(0x40))) uint8_t alignedBuffer[0x40];
FSCmdBlock cmd;
FSInitCmdBlock(&cmd);
deviceData = (__wut_fsa_device_t *) r->deviceData;
std::scoped_lock lock(file->mutex);
size_t bytesRead = 0;
while (bytesRead < len) {
@@ -40,15 +44,22 @@ ssize_t __wut_fs_read(struct _reent *r, void *fd, char *ptr, size_t len) {
size &= ~0x3F;
}
FSStatus status = FSReadFile(__wut_devoptab_fs_client, &cmd, tmp, 1, size,
file->fd, 0, FS_ERROR_FLAG_ALL);
// Limit each request to 1 MiB
if (size > 0x100000) {
size = 0x100000;
}
status = FSAReadFile(deviceData->clientHandle, tmp, 1, size, file->fd, 0);
if (status < 0) {
WUT_DEBUG_REPORT("FSAReadFile(0x%08X, 0x%08X, 1, 0x%08X, 0x%08X, 0) (%s) failed: %s\n",
deviceData->clientHandle, tmp, size, file->fd, file->fullPath, FSAGetStatusStr(status));
if (bytesRead != 0) {
return bytesRead; // error after partial read
}
r->_errno = __wut_fs_translate_error(status);
r->_errno = __wut_fsa_translate_error(status);
return -1;
}
@@ -60,7 +71,7 @@ ssize_t __wut_fs_read(struct _reent *r, void *fd, char *ptr, size_t len) {
bytesRead += status;
ptr += status;
if (status != size) {
if ((size_t) status != size) {
return bytesRead; // partial read
}
}