bslathi19/super6502
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get read working a little bit more. Need to handle edge cases!

Browse Source
This commit is contained in:
Byron Lathi
2023-12-05 23:29:00 -08:00
parent 4c3c3fd731
commit 066bb0ee8c
5 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sw/kernel/filesystems/fat32.h
View File

@@ -45,8 +45,8 @@ int8_t fat32_read_cluster(uint32_t cluster, void* buf);
uint32_t fat32_next_cluster(uint32_t cluster);
int8_t fat32_file_open(const char* filename);
int8_t fat32_file_read(int8_t fd, void* buf, size_t nbytes);
int8_t fat32_file_write(int8_t fd, const void* buf, size_t nbytes);
size_t fat32_file_read(int8_t fd, void* buf, size_t nbytes);
size_t fat32_file_write(int8_t fd, const void* buf, size_t nbytes);
int8_t fat32_file_close(int8_t fd);
#endif

14
sw/kernel/filesystems/fat32_c.c
View File

@@ -13,7 +13,7 @@ int8_t fd_val;
//TODO
int8_t fat32_file_write(int8_t fd, const void* buf, size_t nbytes) {
size_t fat32_file_write(int8_t fd, const void* buf, size_t nbytes) {
(void)fd;
(void)buf;
(void)nbytes;
@@ -62,7 +62,7 @@ int8_t fat32_file_open(const char* filename) {
return fd;
}
int8_t fat32_file_read(int8_t fd, void* buf, size_t nbytes) {
size_t fat32_file_read(int8_t fd, void* buf, size_t nbytes) {
uint16_t i;
uint8_t error;
size_t offset;
@@ -84,11 +84,17 @@ int8_t fat32_file_read(int8_t fd, void* buf, size_t nbytes) {
for (i = 0; i < cluster_seq; i++) {
cluster = fat32_next_cluster(cluster);
}
offset = fdesc->file_pos % 512;
if (offset + nbytes > 512) {
cprintf("Need to do something about this!\n");
}
fat32_read_cluster(cluster, sd_buf);
memcpy(buf, sd_buf, nbytes);
memcpy(buf, sd_buf + offset, nbytes);
fdesc->file_pos += nbytes;
return error;
return nbytes;
}
int8_t fat32_read_cluster(uint32_t cluster, void* buf) {

8
sw/kernel/filesystems/fs.h
View File

@@ -7,14 +7,14 @@
#include <process/process.h>
/* syscalls for files */
int8_t file_read(int8_t fd, void* buf, size_t nbytes);
int8_t file_write(int8_t fd, const void* buf, size_t nbytes);
size_t file_read(int8_t fd, void* buf, size_t nbytes);
size_t file_write(int8_t fd, const void* buf, size_t nbytes);
int8_t file_open(const char* filename);
int8_t file_close(int8_t fd);
/* syscalls for directories */
int8_t directory_read(int8_t fd, void* buf, size_t nbytes);
int8_t directory_write(int8_t fd, const void* buf, size_t nbytes);
size_t directory_read(int8_t fd, void* buf, size_t nbytes);
size_t directory_write(int8_t fd, const void* buf, size_t nbytes);
int8_t directory_open(const char* filename);
int8_t directory_close(int8_t fd);

4
sw/kernel/process/process.h
View File

@@ -15,8 +15,8 @@
struct fops {
int8_t (*open)(const char* filename);
int8_t (*close)(int8_t fd);
int8_t (*read)(int8_t fd, void* buf, size_t nbytes);
int8_t (*write)(int8_t fd, const void* buf, size_t nbytes);
size_t (*read)(int8_t fd, void* buf, size_t nbytes);
size_t (*write)(int8_t fd, const void* buf, size_t nbytes);
};
struct file_desc {

5
sw/test_code/fs_test/main.c
View File

@@ -9,14 +9,15 @@ char data [256];
int main(void) {
int8_t fd;
size_t i;
size_t nbytes;
fat32_init();
/* This is what is going to be part of open */
fd = fat32_file_open("VERYLA~1TXT");
cprintf("fd: %x\n", fd);
while (fat32_file_read(fd, data, 256)){
for (i = 0; i < 256; i++) {
while ((nbytes = fat32_file_read(fd, data, 256))){
for (i = 0; i < nbytes; i++) {
cprintf("%c", data[i]);
}
}