From 7e715ec2f927afda9ead5f8227ff5a7d5aa74c29 Mon Sep 17 00:00:00 2001 From: sorgelig Date: Fri, 16 Jun 2017 17:27:22 +0800 Subject: [PATCH] Small tweaks for 32bit CPU. --- file_io.c | 26 +++++++++++++------------- file_io.h | 30 +++++++++++++++--------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/file_io.c b/file_io.c index dc361ea..b4b66e8 100644 --- a/file_io.c +++ b/file_io.c @@ -29,7 +29,7 @@ void FileClose(fileTYPE *file) static char full_path[1200]; -unsigned char FileOpenEx(fileTYPE *file, const char *name, int mode) +int FileOpenEx(fileTYPE *file, const char *name, int mode) { sprintf(full_path, "%s/%s", getRootDir(), name); @@ -63,12 +63,12 @@ unsigned char FileOpenEx(fileTYPE *file, const char *name, int mode) return 1; } -unsigned char FileOpen(fileTYPE *file, const char *name) +int FileOpen(fileTYPE *file, const char *name) { return FileOpenEx(file, name, O_RDONLY); } -unsigned char FileNextSector(fileTYPE *file) +int FileNextSector(fileTYPE *file) { __off64_t newoff = lseek64(file->fd, file->offset + 512, SEEK_SET); if (newoff != file->offset + 512) @@ -82,7 +82,7 @@ unsigned char FileNextSector(fileTYPE *file) return 1; } -unsigned char FileSeek(fileTYPE *file, __off64_t offset, unsigned long origin) +int FileSeek(fileTYPE *file, __off64_t offset, int origin) { __off64_t newoff = lseek64(file->fd, offset, origin); if(newoff<0) @@ -95,7 +95,7 @@ unsigned char FileSeek(fileTYPE *file, __off64_t offset, unsigned long origin) return 1; } -unsigned char FileSeekLBA(fileTYPE *file, uint32_t offset) +int FileSeekLBA(fileTYPE *file, uint32_t offset) { __off64_t off64 = offset; off64 <<= 9; @@ -103,12 +103,12 @@ unsigned char FileSeekLBA(fileTYPE *file, uint32_t offset) } // Read. MiST compatible. Avoid to use it. -unsigned char FileRead(fileTYPE *file, void *pBuffer) +int FileRead(fileTYPE *file, void *pBuffer) { return FileReadEx(file, pBuffer, 1); } -unsigned char FileReadEx(fileTYPE *file, void *pBuffer, unsigned long nSize) +int FileReadEx(fileTYPE *file, void *pBuffer, int nSize) { static uint8_t tmpbuff[512]; @@ -148,7 +148,7 @@ unsigned char FileReadEx(fileTYPE *file, void *pBuffer, unsigned long nSize) } // Write. MiST compatible. Avoid to use it. -unsigned char FileWrite(fileTYPE *file, void *pBuffer) +int FileWrite(fileTYPE *file, void *pBuffer) { if (!FileSeek(file, file->offset, SEEK_SET)) { @@ -167,7 +167,7 @@ unsigned char FileWrite(fileTYPE *file, void *pBuffer) } // Read with offset advancing -unsigned long FileReadAdv(fileTYPE *file, void *pBuffer, unsigned long length) +int FileReadAdv(fileTYPE *file, void *pBuffer, int length) { ssize_t ret = read(file->fd, pBuffer, length); if (ret < 0) @@ -180,13 +180,13 @@ unsigned long FileReadAdv(fileTYPE *file, void *pBuffer, unsigned long length) return ret; } -unsigned long FileReadSec(fileTYPE *file, void *pBuffer) +int FileReadSec(fileTYPE *file, void *pBuffer) { return FileReadAdv(file, pBuffer, 512); } // Write with offset advancing -unsigned long FileWriteAdv(fileTYPE *file, void *pBuffer, unsigned long length) +int FileWriteAdv(fileTYPE *file, void *pBuffer, int length) { int ret = write(file->fd, pBuffer, length); if (ret < 0) @@ -199,7 +199,7 @@ unsigned long FileWriteAdv(fileTYPE *file, void *pBuffer, unsigned long length) return ret; } -unsigned long FileWriteSec(fileTYPE *file, void *pBuffer) +int FileWriteSec(fileTYPE *file, void *pBuffer) { return FileWriteAdv(file, pBuffer, 512); } @@ -524,7 +524,7 @@ void AdjustDirectory(char *path) } } -int ScanDirectory(char* path, unsigned long mode, char *extension, unsigned char options) +int ScanDirectory(char* path, int mode, char *extension, int options) { int extlen = strlen(extension); //printf("scan dir\n"); diff --git a/file_io.h b/file_io.h index 16398a6..6020fd2 100644 --- a/file_io.h +++ b/file_io.h @@ -32,28 +32,28 @@ extern int iFirstEntry; #define SCAN_DIR 1 // include subdirectories void FindStorage(); -int getStorage(int from_setting); +int getStorage(int from_setting); void setStorage(int dev); -int isUSBMounted(); +int isUSBMounted(); -unsigned char FileOpenEx(fileTYPE *file, const char *name, int mode); -unsigned char FileOpen(fileTYPE *file, const char *name); +int FileOpenEx(fileTYPE *file, const char *name, int mode); +int FileOpen(fileTYPE *file, const char *name); void FileClose(fileTYPE *file); -unsigned char FileSeek(fileTYPE *file, __off64_t offset, unsigned long origin); -unsigned char FileSeekLBA(fileTYPE *file, uint32_t offset); +int FileSeek(fileTYPE *file, __off64_t offset, int origin); +int FileSeekLBA(fileTYPE *file, uint32_t offset); //MiST compatible functions. Avoid to use them. -unsigned char FileRead(fileTYPE *file, void *pBuffer); -unsigned char FileReadEx(fileTYPE *file, void *pBuffer, unsigned long nSize); -unsigned char FileWrite(fileTYPE *file, void *pBuffer); -unsigned char FileNextSector(fileTYPE *file); +int FileRead(fileTYPE *file, void *pBuffer); +int FileReadEx(fileTYPE *file, void *pBuffer, int nSize); +int FileWrite(fileTYPE *file, void *pBuffer); +int FileNextSector(fileTYPE *file); //New functions. -unsigned long FileReadAdv(fileTYPE *file, void *pBuffer, unsigned long length); -unsigned long FileReadSec(fileTYPE *file, void *pBuffer); -unsigned long FileWriteAdv(fileTYPE *file, void *pBuffer, unsigned long length); -unsigned long FileWriteSec(fileTYPE *file, void *pBuffer); +int FileReadAdv(fileTYPE *file, void *pBuffer, int length); +int FileReadSec(fileTYPE *file, void *pBuffer); +int FileWriteAdv(fileTYPE *file, void *pBuffer, int length); +int FileWriteSec(fileTYPE *file, void *pBuffer); int FileCanWrite(char *name); @@ -66,7 +66,7 @@ int FileSaveConfig(char *name, void *pBuffer, int size); int FileLoadConfig(char *name, void *pBuffer, int size); // supply pBuffer = 0 to get the file size without loading void AdjustDirectory(char *path); -int ScanDirectory(char* path, unsigned long mode, char *extension, unsigned char options); +int ScanDirectory(char* path, int mode, char *extension, int options); char *make_name(char *short_name); char *getRootDir();