diff options
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/drivers/fat.c | 6 | ||||
| -rw-r--r-- | firmware/export/fat.h | 4 | ||||
| -rw-r--r-- | firmware/include/dir.h | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/firmware/drivers/fat.c b/firmware/drivers/fat.c index 9056870bc5..465adec479 100644 --- a/firmware/drivers/fat.c +++ b/firmware/drivers/fat.c @@ -1940,7 +1940,7 @@ int fat_rename(struct fat_file* file, return 0; } -static int next_write_cluster(struct fat_file* file, +static long next_write_cluster(struct fat_file* file, long oldcluster, long* newsector) { @@ -2032,7 +2032,7 @@ static int transfer(IF_MV2(struct bpb* fat_bpb,) } -int fat_readwrite( struct fat_file *file, long sectorcount, +long fat_readwrite( struct fat_file *file, long sectorcount, void* buf, bool write ) { #ifdef HAVE_MULTIVOLUME @@ -2406,7 +2406,7 @@ int fat_getnext(struct fat_dir *dir, struct fat_direntry *entry) return 0; } -int fat_get_cluster_size(IF_MV_NONVOID(int volume)) +unsigned int fat_get_cluster_size(IF_MV_NONVOID(int volume)) { #ifndef HAVE_MULTIVOLUME const int volume = 0; diff --git a/firmware/export/fat.h b/firmware/export/fat.h index 3bb895cdc8..c56d8f85f6 100644 --- a/firmware/export/fat.h +++ b/firmware/export/fat.h @@ -90,7 +90,7 @@ extern int fat_open(IF_MV2(int volume,) extern int fat_create_file(const char* name, struct fat_file* ent, struct fat_dir* dir); -extern int fat_readwrite(struct fat_file *ent, long sectorcount, +extern long fat_readwrite(struct fat_file *ent, long sectorcount, void* buf, bool write ); extern int fat_closewrite(struct fat_file *ent, long size, int attr); extern int fat_seek(struct fat_file *ent, unsigned long sector ); @@ -105,7 +105,7 @@ extern int fat_opendir(IF_MV2(int volume,) struct fat_dir *ent, unsigned long currdir, const struct fat_dir *parent_dir); extern int fat_getnext(struct fat_dir *ent, struct fat_direntry *entry); -extern int fat_get_cluster_size(IF_MV_NONVOID(int volume)); +extern unsigned int fat_get_cluster_size(IF_MV_NONVOID(int volume)); extern bool fat_ismounted(int volume); #endif diff --git a/firmware/include/dir.h b/firmware/include/dir.h index 26ccd03ed3..948b30ffe2 100644 --- a/firmware/include/dir.h +++ b/firmware/include/dir.h @@ -45,8 +45,8 @@ struct dirent { unsigned char d_name[MAX_PATH]; int attribute; - int size; - int startcluster; + long size; + long startcluster; unsigned short wrtdate; /* Last write date */ unsigned short wrttime; /* Last write time */ }; @@ -57,7 +57,7 @@ struct dirent { typedef struct { #ifndef SIMULATOR bool busy; - int startcluster; + long startcluster; struct fat_dir fatdir; struct fat_dir parent_dir; struct dirent theent; |