Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

The dir code is now reentrant.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3184 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Björn Stenberg 2003-01-29 12:33:23 +00:00
parent ff4da18d1a
commit 38bc30b0d6
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
firmware/drivers/fat.c
View file

@ -253,10 +253,6 @@ struct fat_cache_entry
static char fat_cache_sectors[FAT_CACHE_SIZE][SECTOR_SIZE];
static struct fat_cache_entry fat_cache[FAT_CACHE_SIZE];
/* sectors cache for longname use */
static unsigned char lastsector[SECTOR_SIZE];
static unsigned char lastsector2[SECTOR_SIZE];
static int sec2cluster(unsigned int sec)
{
if ( sec < fat_bpb.firstdatasector )
@ -1695,7 +1691,7 @@ int fat_getnext(struct fat_dir *dir, struct fat_direntry *entry)
int longarray[20];
int longs=0;
int sectoridx=0;
static unsigned char cached_buf[SECTOR_SIZE];
unsigned char* cached_buf = dir->sectorcache[0];
dir->entrycount = 0;
@ -1766,13 +1762,13 @@ int fat_getnext(struct fat_dir *dir, struct fat_direntry *entry)
if ( sectoridx >= SECTOR_SIZE*2 ) {
if ( ( index >= SECTOR_SIZE ) &&
( index < SECTOR_SIZE*2 ))
ptr = lastsector;
ptr = dir->sectorcache[1];
else
ptr = lastsector2;
ptr = dir->sectorcache[2];
}
else {
if ( index < SECTOR_SIZE )
ptr = lastsector;
ptr = dir->sectorcache[1];
}
index &= SECTOR_SIZE-1;
@ -1799,9 +1795,9 @@ int fat_getnext(struct fat_dir *dir, struct fat_direntry *entry)
/* save this sector, for longname use */
if ( sectoridx )
memcpy( lastsector2, cached_buf, SECTOR_SIZE );
memcpy( dir->sectorcache[2], dir->sectorcache[0], SECTOR_SIZE );
else
memcpy( lastsector, cached_buf, SECTOR_SIZE );
memcpy( dir->sectorcache[1], dir->sectorcache[0], SECTOR_SIZE );
sectoridx += SECTOR_SIZE;
}

1
firmware/drivers/fat.h
View file

@ -64,6 +64,7 @@ struct fat_dir
unsigned int entrycount;
int sector;
struct fat_file file;
unsigned char sectorcache[3][SECTOR_SIZE];
};