Skip to content

Commit

Permalink
Add extended features
Browse files Browse the repository at this point in the history 
Some breaking/noteworthy changes for users that don't use the new functions:
 - IOSUHAX_FSA_SetFilePos is changed to IOSUHAX_FSA_SetPosFile to reflect the name of the Wii U's original function name.
 - IOSUHAX_FSA_GetDeviceInfo has been changed to IOSUHAX_FSA_GetInfo, but you can now also use various functions that'll get the various structs you would get previously. BUT, IOSUHAX_FSA_GetDeviceInfo is now the name of one of these functions since that's the DeviceInfo struct it'll get.

Based on original PR from dimok789#3.

Co-authored-by: koolkdev <[email protected]>
  • Loading branch information
@Crementif @koolkdev
Crementif and koolkdev committed Apr 29, 2022
1 parent c4f6fe8 commit 9c561bf
Show file tree
Hide file tree
Showing 4 changed files with 865 additions and 165 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ TOPDIR ?= $(CURDIR)
include $(DEVKITPRO)/wut/share/wut_rules

export VER_MAJOR := 1
export VER_MINOR := 1
export VER_MINOR := 2
export VER_PATCH := 0

VERSION := $(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)
Expand Down
88 changes: 58 additions & 30 deletions include/iosuhax.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,76 +35,104 @@ extern "C" {
#define DIR_ENTRY_IS_DIRECTORY FS_STAT_FILE
#endif

#define FSA_MOUNTFLAGS_BINDMOUNT (1 << 0)
#define FSA_MOUNTFLAGS_GLOBAL (1 << 1)
// Flags for IOSUHAX_FSA_Mount
#define FSA_MOUNTFLAGS_NONE (0 << 0)
#define FSA_MOUNTFLAGS_BINDMOUNT (1 << 0)
#define FSA_MOUNTFLAGS_GLOBAL (1 << 1)

// Flags for IOSUHAX_FSA_OpenFileEx
#define FSA_OPENFLAGS_NONE (0 << 0)
#define FSA_OPENFLAGS_OPEN_ENCRYPTED (1 << 0)
#define FSA_OPENFLAGS_PREALLOC_SPACE (1 << 1)

// Flags for devoptab's "open" function that'll be converted to the above flags
#define O_OPEN_ENCRYPTED 0x4000000

typedef struct {
uint8_t unknown[0x1E];
} FSFileSystemInfo;

typedef struct {
uint8_t unknown[0x28];
} FSDeviceInfo;

typedef struct {
uint64_t blocks_count;
uint64_t some_count;
uint32_t block_size;
} FSBlockInfo;

int IOSUHAX_Open(const char *dev); // if dev == NULL the default path /dev/iosuhax will be used
int IOSUHAX_Close(void);

int IOSUHAX_memwrite(uint32_t address, const uint8_t *buffer, uint32_t size); // IOSU external input
int IOSUHAX_memread(uint32_t address, uint8_t *out_buffer, uint32_t size); // IOSU external output
int IOSUHAX_memcpy(uint32_t dst, uint32_t src, uint32_t size); // IOSU internal memcpy only

int IOSUHAX_kern_write32(uint32_t address, uint32_t value);

int IOSUHAX_kern_read32(uint32_t address, uint32_t *out_buffer, uint32_t count);

int IOSUHAX_read_otp(uint8_t *out_buffer, uint32_t size);

int IOSUHAX_read_seeprom(uint8_t *out_buffer, uint32_t offset, uint32_t size);

int IOSUHAX_ODM_GetDiscKey(uint8_t *discKey);

int IOSUHAX_SVC(uint32_t svc_id, uint32_t *args, uint32_t arg_cnt);

int IOSUHAX_FSA_Open();

int IOSUHAX_FSA_Close(int fsaFd);

int IOSUHAX_FSA_Mount(int fsaFd, const char *device_path, const char *volume_path, uint32_t flags, const char *arg_string, int arg_string_len);

int IOSUHAX_FSA_Unmount(int fsaFd, const char *path, uint32_t flags);

int IOSUHAX_FSA_FlushVolume(int fsaFd, const char *volume_path);

int IOSUHAX_FSA_GetDeviceInfo(int fsaFd, const char *device_path, int type, uint32_t *out_data);
int IOSUHAX_FSA_RollbackVolume(int fsaFd, const char *volume_path);

// The FSA_GetDeviceInfo function was mislabeled and is now split into multiple functions
int IOSUHAX_FSA_GetDeviceInfo(int fsaFd, const char *device_path, FSDeviceInfo *out_data);
int IOSUHAX_FSA_GetFreeSpaceSize(int fsaFd, const char *path, uint64_t *out_data);
int IOSUHAX_FSA_GetDirSize(int fsaFd, const char *path, uint64_t *out_data);
int IOSUHAX_FSA_GetEntryNum(int fsaFd, const char *path, uint32_t *out_data);
int IOSUHAX_FSA_GetFileSystemInfo(int fsaFd, const char *path, FSFileSystemInfo *out_data);
int IOSUHAX_FSA_GetStat(int fsaFd, const char *path, FSStat *out_data);
int IOSUHAX_FSA_GetBadBlockInfo(int fsaFd, const char *path, FSBlockInfo *out_data);
int IOSUHAX_FSA_GetJournalFreeSpaceSize(int fsaFd, const char *path, uint64_t *out_data);
int IOSUHAX_FSA_GetFragmentBlockInfo(int fsaFd, const char *path, FSBlockInfo *out_data);

int IOSUHAX_FSA_MakeDir(int fsaFd, const char *path, uint32_t flags);

int IOSUHAX_FSA_OpenDir(int fsaFd, const char *path, int *outHandle);

int IOSUHAX_FSA_ReadDir(int fsaFd, int handle, FSDirectoryEntry *out_data);

int IOSUHAX_FSA_RewindDir(int fsaFd, int dirHandle);

int IOSUHAX_FSA_CloseDir(int fsaFd, int handle);

int IOSUHAX_FSA_ChangeDir(int fsaFd, const char *path);
int IOSUHAX_FSA_GetCwd(int fd, char *out_data, int output_size);

int IOSUHAX_FSA_OpenFile(int fsaFd, const char *path, const char *mode, int *outHandle);
int IOSUHAX_FSA_MakeQuota(int fsaFd, const char *quota_path, uint32_t flags, uint64_t size);
int IOSUHAX_FSA_FlushQuota(int fsaFd, const char *quota_path);
int IOSUHAX_FSA_RollbackQuota(int fsaFd, const char *quota_path);
int IOSUHAX_FSA_RollbackQuotaForce(int fsaFd, const char *quota_path);

int IOSUHAX_FSA_OpenFile(int fsaFd, const char *path, const char *mode, int *outHandle);
int IOSUHAX_FSA_OpenFileEx(int fsaFd, const char *path, const char *mode, int *outHandle, uint32_t flags, int create_mode, uint32_t create_alloc_size);
int IOSUHAX_FSA_ReadFile(int fsaFd, void *data, uint32_t size, uint32_t cnt, int fileHandle, uint32_t flags);

int IOSUHAX_FSA_WriteFile(int fsaFd, const void *data, uint32_t size, uint32_t cnt, int fileHandle, uint32_t flags);

int IOSUHAX_FSA_StatFile(int fsaFd, int fileHandle, FSStat *out_data);

int IOSUHAX_FSA_ReadFileWithPos(int fsaFd, void *data, uint32_t size, uint32_t cnt, uint32_t pos, int fileHandle, uint32_t flags);
int IOSUHAX_FSA_WriteFileWithPos(int fsaFd, const void *data, uint32_t size, uint32_t cnt, uint32_t pos, int fileHandle, uint32_t flags);
int IOSUHAX_FSA_AppendFile(int fsaFd, uint32_t size, uint32_t cnt, int fileHandle);
int IOSUHAX_FSA_AppendFileEx(int fsaFd, uint32_t size, uint32_t cnt, int fileHandle, uint32_t flags);
int IOSUHAX_FSA_CloseFile(int fsaFd, int fileHandle);

int IOSUHAX_FSA_SetFilePos(int fsaFd, int fileHandle, uint32_t position);

int IOSUHAX_FSA_GetStat(int fsaFd, const char *path, FSStat *out_data);
int IOSUHAX_FSA_GetStatFile(int fsaFd, int fileHandle, FSStat *out_data);
int IOSUHAX_FSA_FlushFile(int fsaFd, int fileHandle);
int IOSUHAX_FSA_TruncateFile(int fsaFd, int fileHandle);
int IOSUHAX_FSA_GetPosFile(int fsaFd, int fileHandle, uint32_t *position);
int IOSUHAX_FSA_SetPosFile(int fsaFd, int fileHandle, uint32_t position);
int IOSUHAX_FSA_IsEof(int fsaFd, int fileHandle);

int IOSUHAX_FSA_Remove(int fsaFd, const char *path);

int IOSUHAX_FSA_Rename(int fsaFd, const char *old_path, const char *new_path);
int IOSUHAX_FSA_ChangeMode(int fsaFd, const char *path, int mode);
int IOSUHAX_FSA_ChangeModeEx(int fsaFd, const char *path, int mode, int mask);
int IOSUHAX_FSA_ChangeOwner(int fsaFd, const char *path, uint32_t owner, uint32_t group);

int IOSUHAX_FSA_RawOpen(int fsaFd, const char *device_path, int *outHandle);

int IOSUHAX_FSA_RawRead(int fsaFd, void *data, uint32_t block_size, uint32_t block_cnt, uint64_t sector_offset, int device_handle);

int IOSUHAX_FSA_RawWrite(int fsaFd, const void *data, uint32_t block_size, uint32_t block_cnt, uint64_t sector_offset, int device_handle);

int IOSUHAX_FSA_RawClose(int fsaFd, int device_handle);

#ifdef __cplusplus
Expand Down
Loading

0 comments on commit 9c561bf

Please sign in to comment.