devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Bug fixes: fat_seek(0) would sometimes start at sector 1. find_free_cluster() didn't find all free clusters.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2806 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Björn Stenberg 2002-11-05 14:46:27 +00:00
parent ab0dce0264
commit 0e51fefda6
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
firmware/drivers/fat.c
View file

@ -331,6 +331,7 @@ int fat_mount(int startsector)
LDEBUGF("Freecount: %x\n",fat_bpb.fsinfo.freecount); LDEBUGF("Freecount: %x\n",fat_bpb.fsinfo.freecount);
LDEBUGF("Nextfree: %x\n",fat_bpb.fsinfo.nextfree); LDEBUGF("Nextfree: %x\n",fat_bpb.fsinfo.nextfree);
LDEBUGF("Cluster count: %x\n",fat_bpb.dataclusters); LDEBUGF("Cluster count: %x\n",fat_bpb.dataclusters);
LDEBUGF("Sectors per cluster: %d\n",fat_bpb.bpb_secperclus);
LDEBUGF("FAT sectors: %x\n",fat_bpb.fatsize); LDEBUGF("FAT sectors: %x\n",fat_bpb.fatsize);
return 0; return 0;
@ -442,11 +443,12 @@ static int find_free_cluster(int startcluster)
unsigned int* fat = cache_fat_sector(nr); unsigned int* fat = cache_fat_sector(nr);
if ( !fat ) if ( !fat )
break; break;
for (j = offset; j < CLUSTERS_PER_FAT_SECTOR; j++) { for (j = 0; j < CLUSTERS_PER_FAT_SECTOR; j++) {
if (!(SWAB32(fat[j]) & 0x0fffffff)) { int k = (j + offset) % CLUSTERS_PER_FAT_SECTOR;
int c = nr * CLUSTERS_PER_FAT_SECTOR + j; if (!(SWAB32(fat[k]) & 0x0fffffff)) {
int c = nr * CLUSTERS_PER_FAT_SECTOR + k;
if ( c > fat_bpb.dataclusters+1 ) /* nr 0 is unused */ if ( c > fat_bpb.dataclusters+1 ) /* nr 0 is unused */
break; continue;
LDEBUGF("find_free_cluster(%x) == %x\n",startcluster,c); LDEBUGF("find_free_cluster(%x) == %x\n",startcluster,c);
fat_bpb.fsinfo.nextfree = c; fat_bpb.fsinfo.nextfree = c;
return c; return c;
@ -1224,6 +1226,8 @@ int fat_seek(struct fat_file *file, int seeksector )
if ( sector > -1 ) if ( sector > -1 )
sector = cluster2sec(cluster) + sectornum; sector = cluster2sec(cluster) + sectornum;
} }
else
sectornum = -1;
LDEBUGF("fat_seek(%x) == %x, %x, %x\n", LDEBUGF("fat_seek(%x) == %x, %x, %x\n",
seeksector, cluster, sector, sectornum); seeksector, cluster, sector, sectornum);