diff options
-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, | |||
1940 | return 0; | 1940 | return 0; |
1941 | } | 1941 | } |
1942 | 1942 | ||
1943 | static int next_write_cluster(struct fat_file* file, | 1943 | static long next_write_cluster(struct fat_file* file, |
1944 | long oldcluster, | 1944 | long oldcluster, |
1945 | long* newsector) | 1945 | long* newsector) |
1946 | { | 1946 | { |
@@ -2032,7 +2032,7 @@ static int transfer(IF_MV2(struct bpb* fat_bpb,) | |||
2032 | } | 2032 | } |
2033 | 2033 | ||
2034 | 2034 | ||
2035 | int fat_readwrite( struct fat_file *file, long sectorcount, | 2035 | long fat_readwrite( struct fat_file *file, long sectorcount, |
2036 | void* buf, bool write ) | 2036 | void* buf, bool write ) |
2037 | { | 2037 | { |
2038 | #ifdef HAVE_MULTIVOLUME | 2038 | #ifdef HAVE_MULTIVOLUME |
@@ -2406,7 +2406,7 @@ int fat_getnext(struct fat_dir *dir, struct fat_direntry *entry) | |||
2406 | return 0; | 2406 | return 0; |
2407 | } | 2407 | } |
2408 | 2408 | ||
2409 | int fat_get_cluster_size(IF_MV_NONVOID(int volume)) | 2409 | unsigned int fat_get_cluster_size(IF_MV_NONVOID(int volume)) |
2410 | { | 2410 | { |
2411 | #ifndef HAVE_MULTIVOLUME | 2411 | #ifndef HAVE_MULTIVOLUME |
2412 | const int volume = 0; | 2412 | 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,) | |||
90 | extern int fat_create_file(const char* name, | 90 | extern int fat_create_file(const char* name, |
91 | struct fat_file* ent, | 91 | struct fat_file* ent, |
92 | struct fat_dir* dir); | 92 | struct fat_dir* dir); |
93 | extern int fat_readwrite(struct fat_file *ent, long sectorcount, | 93 | extern long fat_readwrite(struct fat_file *ent, long sectorcount, |
94 | void* buf, bool write ); | 94 | void* buf, bool write ); |
95 | extern int fat_closewrite(struct fat_file *ent, long size, int attr); | 95 | extern int fat_closewrite(struct fat_file *ent, long size, int attr); |
96 | extern int fat_seek(struct fat_file *ent, unsigned long sector ); | 96 | extern int fat_seek(struct fat_file *ent, unsigned long sector ); |
@@ -105,7 +105,7 @@ extern int fat_opendir(IF_MV2(int volume,) | |||
105 | struct fat_dir *ent, unsigned long currdir, | 105 | struct fat_dir *ent, unsigned long currdir, |
106 | const struct fat_dir *parent_dir); | 106 | const struct fat_dir *parent_dir); |
107 | extern int fat_getnext(struct fat_dir *ent, struct fat_direntry *entry); | 107 | extern int fat_getnext(struct fat_dir *ent, struct fat_direntry *entry); |
108 | extern int fat_get_cluster_size(IF_MV_NONVOID(int volume)); | 108 | extern unsigned int fat_get_cluster_size(IF_MV_NONVOID(int volume)); |
109 | extern bool fat_ismounted(int volume); | 109 | extern bool fat_ismounted(int volume); |
110 | 110 | ||
111 | #endif | 111 | #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 @@ | |||
45 | struct dirent { | 45 | struct dirent { |
46 | unsigned char d_name[MAX_PATH]; | 46 | unsigned char d_name[MAX_PATH]; |
47 | int attribute; | 47 | int attribute; |
48 | int size; | 48 | long size; |
49 | int startcluster; | 49 | long startcluster; |
50 | unsigned short wrtdate; /* Last write date */ | 50 | unsigned short wrtdate; /* Last write date */ |
51 | unsigned short wrttime; /* Last write time */ | 51 | unsigned short wrttime; /* Last write time */ |
52 | }; | 52 | }; |
@@ -57,7 +57,7 @@ struct dirent { | |||
57 | typedef struct { | 57 | typedef struct { |
58 | #ifndef SIMULATOR | 58 | #ifndef SIMULATOR |
59 | bool busy; | 59 | bool busy; |
60 | int startcluster; | 60 | long startcluster; |
61 | struct fat_dir fatdir; | 61 | struct fat_dir fatdir; |
62 | struct fat_dir parent_dir; | 62 | struct fat_dir parent_dir; |
63 | struct dirent theent; | 63 | struct dirent theent; |