devkitARM r46 updates

Author: WinterMute

source/fatfile.c

@@ -382,7 +382,7 @@ int _FAT_syncToDisc (FILE_STRUCT* file) {
 }
 
 
-int _FAT_close_r (struct _reent *r, int fd) {
+int _FAT_close_r (struct _reent *r, void *fd) {
 	FILE_STRUCT* file = (FILE_STRUCT*)  fd;
 	int ret = 0;
 
@@ -419,7 +419,7 @@ int _FAT_close_r (struct _reent *r, int fd) {
 	return ret;
 }
 
-ssize_t _FAT_read_r (struct _reent *r, int fd, char *ptr, size_t len) {
+ssize_t _FAT_read_r (struct _reent *r, void *fd, char *ptr, size_t len) {
 	FILE_STRUCT* file = (FILE_STRUCT*)  fd;
 	PARTITION* partition;
 	CACHE* cache;
@@ -713,7 +713,7 @@ static bool _FAT_file_extend_r (struct _reent *r, FILE_STRUCT* file) {
 	return true;
 }
 
-ssize_t _FAT_write_r (struct _reent *r, int fd, const char *ptr, size_t len) {
+ssize_t _FAT_write_r (struct _reent *r, void *fd, const char *ptr, size_t len) {
 	FILE_STRUCT* file = (FILE_STRUCT*)  fd;
 	PARTITION* partition;
 	CACHE* cache;
@@ -941,7 +941,7 @@ ssize_t _FAT_write_r (struct _reent *r, int fd, const char *ptr, size_t len) {
 }
 
 
-off_t _FAT_seek_r (struct _reent *r, int fd, off_t pos, int dir) {
+off_t _FAT_seek_r (struct _reent *r, void *fd, off_t pos, int dir) {
 	FILE_STRUCT* file = (FILE_STRUCT*)  fd;
 	PARTITION* partition;
 	uint32_t cluster, nextCluster;
@@ -1043,7 +1043,7 @@ off_t _FAT_seek_r (struct _reent *r, int fd, off_t pos, int dir) {
 
 
 
-int _FAT_fstat_r (struct _reent *r, int fd, struct stat *st) {
+int _FAT_fstat_r (struct _reent *r, void *fd, struct stat *st) {
 	FILE_STRUCT* file = (FILE_STRUCT*)  fd;
 	PARTITION* partition;
 	DIR_ENTRY fileEntry;
@@ -1078,7 +1078,7 @@ int _FAT_fstat_r (struct _reent *r, int fd, struct stat *st) {
 	return 0;
 }
 
-int _FAT_ftruncate_r (struct _reent *r, int fd, off_t len) {
+int _FAT_ftruncate_r (struct _reent *r, void *fd, off_t len) {
 	FILE_STRUCT* file = (FILE_STRUCT*)  fd;
 	PARTITION* partition;
 	int ret=0;
@@ -1190,7 +1190,7 @@ int _FAT_ftruncate_r (struct _reent *r, int fd, off_t len) {
 	return ret;
 }
 
-int _FAT_fsync_r (struct _reent *r, int fd) {
+int _FAT_fsync_r (struct _reent *r, void *fd) {
 	FILE_STRUCT* file = (FILE_STRUCT*)  fd;
 	int ret = 0;
 

source/fatfile.h

@@ -71,15 +71,15 @@ typedef struct _FILE_STRUCT FILE_STRUCT;
 
 int _FAT_open_r (struct _reent *r, void *fileStruct, const char *path, int flags, int mode);
 
-int _FAT_close_r (struct _reent *r, int fd);
+int _FAT_close_r (struct _reent *r, void *fd);
 
-ssize_t _FAT_write_r (struct _reent *r,int fd, const char *ptr, size_t len);
+ssize_t _FAT_write_r (struct _reent *r,void *fd, const char *ptr, size_t len);
 
-ssize_t _FAT_read_r (struct _reent *r, int fd, char *ptr, size_t len);
+ssize_t _FAT_read_r (struct _reent *r, void *fd, char *ptr, size_t len);
 
-off_t _FAT_seek_r (struct _reent *r, int fd, off_t pos, int dir);
+off_t _FAT_seek_r (struct _reent *r, void *fd, off_t pos, int dir);
 
-int _FAT_fstat_r (struct _reent *r, int fd, struct stat *st);
+int _FAT_fstat_r (struct _reent *r, void *fd, struct stat *st);
 
 int _FAT_stat_r (struct _reent *r, const char *path, struct stat *st);
 
@@ -91,9 +91,9 @@ int _FAT_chdir_r (struct _reent *r, const char *name);
 
 int _FAT_rename_r (struct _reent *r, const char *oldName, const char *newName);
 
-int _FAT_ftruncate_r (struct _reent *r, int fd, off_t len);
+int _FAT_ftruncate_r (struct _reent *r, void *fd, off_t len);
 
-int _FAT_fsync_r (struct _reent *r, int fd);
+int _FAT_fsync_r (struct _reent *r, void *fd);
 
 /*
 Synchronizes the file data to disc.