diff --git a/include/m/status.h b/include/m/status.h index 9ba2583..7c13a69 100644 --- a/include/m/status.h +++ b/include/m/status.h @@ -10,5 +10,8 @@ #define ST_PERMISSION_ERROR 6 #define ST_BAD_RESOURCE 7 #define ST_BAD_DEVICE_OP 8 +#define ST_EXISTS 9 +#define ST_OOB_ERROR 10 +#define ST_BAD_PATH 11 #endif // _M_STATUS_H diff --git a/kernel/fs/ramdiskfs.c b/kernel/fs/ramdiskfs.c index 5a5ab2b..86dcc30 100644 --- a/kernel/fs/ramdiskfs.c +++ b/kernel/fs/ramdiskfs.c @@ -5,6 +5,7 @@ #include #include #include +#include struct ramdisk_tar_header { char filename[100]; @@ -102,17 +103,17 @@ int ramdiskfs_describe (struct vfs_mountpoint* mountpoint, const char* path, const char* filename = path_basename (path); if (filename == NULL) - return -VFS_BAD_PATH; + return -ST_BAD_PATH; struct ramdisk_tar_file* file = ramdisk_get_file (filename); if (file == NULL) - return -VFS_NOT_FOUND; + return -ST_NOT_FOUND; desc->size = file->size; desc->type = FS_FILE; - return VFS_OK; + return ST_OK; } int ramdiskfs_read (struct vfs_mountpoint* mountpoint, const char* path, uint8_t* buffer, @@ -122,17 +123,17 @@ int ramdiskfs_read (struct vfs_mountpoint* mountpoint, const char* path, uint8_t const char* filename = path_basename (path); if (filename == NULL) - return -VFS_BAD_PATH; + return -ST_BAD_PATH; struct ramdisk_tar_file* file = ramdisk_get_file (filename); if (file == NULL) - return -VFS_NOT_FOUND; + return -ST_NOT_FOUND; if (off + size > file->size) - return -VFS_OOB_ERROR; + return -ST_OOB_ERROR; memcpy (buffer, (void*)((uintptr_t)file->content + off), size); - return VFS_OK; + return ST_OK; } diff --git a/kernel/fs/vfs.c b/kernel/fs/vfs.c index fdd5552..138f040 100644 --- a/kernel/fs/vfs.c +++ b/kernel/fs/vfs.c @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -78,7 +79,7 @@ int vfs_describe (const char* mountpoint, const char* path, struct fs_desc_buffe struct vfs_mountpoint* vmp = vfs_find_mountpoint (mountpoint); if (vmp == NULL) - return -VFS_NOT_FOUND; + return -ST_NOT_FOUND; spin_lock (&vmp->lock); @@ -93,7 +94,7 @@ int vfs_read (const char* mountpoint, const char* path, uint8_t* buffer, size_t struct vfs_mountpoint* vmp = vfs_find_mountpoint (mountpoint); if (vmp == NULL) - return -VFS_NOT_FOUND; + return -ST_NOT_FOUND; spin_lock (&vmp->lock); diff --git a/kernel/fs/vfs.h b/kernel/fs/vfs.h index 960fc60..13f4812 100644 --- a/kernel/fs/vfs.h +++ b/kernel/fs/vfs.h @@ -7,12 +7,6 @@ #include #include -#define VFS_OK 0 -#define VFS_EXISTS 1 -#define VFS_NOT_FOUND 2 -#define VFS_BAD_PATH 3 -#define VFS_OOB_ERROR 4 - #define VFS_RAMDISKFS 0 struct vfs_mountpoint { diff --git a/kernel/proc/proc.c b/kernel/proc/proc.c index dfa6c81..53bf2df 100644 --- a/kernel/proc/proc.c +++ b/kernel/proc/proc.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -104,7 +105,7 @@ struct elf_aux proc_load_segments (struct proc* proc, uint8_t* elf) { struct proc* proc_from_file (const char* mountpoint, const char* path) { struct fs_desc_buffer desc; - if (vfs_describe (mountpoint, path, &desc) != VFS_OK) + if (vfs_describe (mountpoint, path, &desc) != ST_OK) return NULL; if (desc.type != FS_FILE) @@ -115,7 +116,7 @@ struct proc* proc_from_file (const char* mountpoint, const char* path) { if (temp_buffer == NULL) return NULL; - if (vfs_read (mountpoint, path, temp_buffer, 0, desc.size) != VFS_OK) { + if (vfs_read (mountpoint, path, temp_buffer, 0, desc.size) != ST_OK) { free (temp_buffer); return NULL; }