len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2026-04-11 16:37:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fat: fsinfo structure references _clusters_ not sectors

Browse source 
These fields are defined by FAT32 itself, and are specified as 32-bit
values.  So switch them from sector_t to simple uint32_t.

Change-Id: I98afecfbe1f8a1b83fbdd4ec3fea016b8e0b985d
This commit is contained in:
Solomon Peachy 2026-03-04 13:04:57 -05:00
parent 87f2024631
commit cef29a1986
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
firmware/common/fat.c
View file

@ -180,8 +180,8 @@ union raw_dirent
struct fsinfo
{
sector_t freecount; /* last known free cluster count */
sector_t nextfree; /* first cluster to start looking for free
uint32_t freecount; /* last known free cluster count */
uint32_t nextfree; /* first cluster to start looking for free
clusters, or 0xffffffff for no hint */
};
/* fsinfo offsets */
@ -462,7 +462,7 @@ static int bpb_is_sane(struct bpb *fat_bpb)
{
DEBUGF("%s() - Error: FSInfo.Freecount > disk size "
"(0x%04lx)\n", __func__,
(unsigned long)fat_bpb->fsinfo.freecount);
fat_bpb->fsinfo.freecount);
return -4;
}
@ -959,7 +959,7 @@ static int update_fat_entry16(struct bpb *fat_bpb, unsigned long entry,
fat_bpb->fsinfo.freecount++;
}
DEBUGF("%lu free clusters\n", (unsigned long)fat_bpb->fsinfo.freecount);
DEBUGF("%lu free clusters\n", fat_bpb->fsinfo.freecount);
sec[offset] = htole16(val);
dc_dirty_buf(sec);
@ -1116,7 +1116,7 @@ static int update_fat_entry32(struct bpb *fat_bpb, unsigned long entry,
fat_bpb->fsinfo.freecount++;
}
DEBUGF("%lu free clusters\n", (unsigned long)fat_bpb->fsinfo.freecount);
DEBUGF("%lu free clusters\n", fat_bpb->fsinfo.freecount);
/* don't change top 4 bits */
sec[offset] = htole32((curval & 0xf0000000) | (val & 0x0fffffff));
@ -2967,8 +2967,8 @@ int fat_mount(IF_MV(int volume,) IF_MD(int drive,) unsigned long startsector)
if (fat_bpb->fsinfo.freecount == 0xffffffff)
fat_recalc_free(IF_MV(fat_bpb->volume));
DEBUGF("Freecount: %ld\n", (unsigned long)fat_bpb->fsinfo.freecount);
DEBUGF("Nextfree: 0x%lx\n", (unsigned long)fat_bpb->fsinfo.nextfree);
DEBUGF("Freecount: %ld\n", fat_bpb->fsinfo.freecount);
DEBUGF("Nextfree: 0x%lx\n", fat_bpb->fsinfo.nextfree);
DEBUGF("Cluster count: 0x%lx\n", fat_bpb->dataclusters);
DEBUGF("Sectors per cluster: %lu\n", fat_bpb->bpb_secperclus);
DEBUGF("FAT sectors: 0x%lx\n", fat_bpb->fatsize);