From 4779dea85a2abdc85f79e4ed19a26f68f3550ba9 Mon Sep 17 00:00:00 2001 From: James Benton Date: Sun, 10 Jan 2016 17:10:38 -0800 Subject: [PATCH] Fix filesystem.h --- include/coreinit/filesystem.h | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/include/coreinit/filesystem.h b/include/coreinit/filesystem.h index cd790fe..2088c25 100644 --- a/include/coreinit/filesystem.h +++ b/include/coreinit/filesystem.h @@ -30,8 +30,6 @@ typedef struct FSDirectoryEntry FSDirectoryEntry; typedef struct FSStat FSStat; typedef struct FSStateChangeInfo FSStateChangeInfo; -typedef void(*FSAsyncCallback)(FSClient *, FSCmdBlock *, FSStatus, uint32_t); - typedef enum FSStatus { FS_STATUS_OK = 0, @@ -55,6 +53,23 @@ typedef enum FSStatus FS_STATUS_FATAL_ERROR = -0x400, } FSStatus; +typedef enum FSError +{ + FS_ERROR_NOT_INIT = -0x30001, +} FSError; + +typedef enum FSStatFlags +{ + FS_STAT_DIRECTORY = 0x80000000, +} FSStatFlags; + +typedef enum FSVolumeState +{ + FS_VOLUME_STATE_INIT = 0, +} FSVolumeState; + +typedef void(*FSAsyncCallback)(FSClient *, FSCmdBlock *, FSStatus, uint32_t); + struct FSClient { UNKNOWN(0x1700); @@ -69,12 +84,7 @@ CHECK_SIZE(FSCmdBlock, 0xA80); struct FSStat { - enum Flags - { - Directory = 0x80000000, - }; - - uint32_t flags; + FSStatFlags flags; UNKNOWN(0xC); uint32_t size; UNKNOWN(0x50); @@ -107,8 +117,6 @@ struct FSDirectoryEntry CHECK_OFFSET(FSDirectoryEntry, 0x64, name); CHECK_SIZE(FSDirectoryEntry, 0x164); -#pragma pack(pop) - void FSInit();