summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>2005-02-26 21:18:05 +0000
committerJean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>2005-02-26 21:18:05 +0000
commit5da99ed57079cb9100a0ae790ba2abc1496d0559 (patch)
tree2a86c92c68a7a2e5adeb795efc76a538ea902bdb
parent74a1fb8d835da39cb169cbc00588e96ababf25b5 (diff)
downloadrockbox-5da99ed57079cb9100a0ae790ba2abc1496d0559.tar.gz
rockbox-5da99ed57079cb9100a0ae790ba2abc1496d0559.zip
long policy
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6071 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/drivers/fat.c6
-rw-r--r--firmware/export/fat.h4
-rw-r--r--firmware/include/dir.h6
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
1943static int next_write_cluster(struct fat_file* file, 1943static 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
2035int fat_readwrite( struct fat_file *file, long sectorcount, 2035long 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
2409int fat_get_cluster_size(IF_MV_NONVOID(int volume)) 2409unsigned 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,)
90extern int fat_create_file(const char* name, 90extern 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);
93extern int fat_readwrite(struct fat_file *ent, long sectorcount, 93extern long fat_readwrite(struct fat_file *ent, long sectorcount,
94 void* buf, bool write ); 94 void* buf, bool write );
95extern int fat_closewrite(struct fat_file *ent, long size, int attr); 95extern int fat_closewrite(struct fat_file *ent, long size, int attr);
96extern int fat_seek(struct fat_file *ent, unsigned long sector ); 96extern 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);
107extern int fat_getnext(struct fat_dir *ent, struct fat_direntry *entry); 107extern int fat_getnext(struct fat_dir *ent, struct fat_direntry *entry);
108extern int fat_get_cluster_size(IF_MV_NONVOID(int volume)); 108extern unsigned int fat_get_cluster_size(IF_MV_NONVOID(int volume));
109extern bool fat_ismounted(int volume); 109extern 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 @@
45struct dirent { 45struct 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 {
57typedef struct { 57typedef 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;