Aren
/
rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fat32: Fix base calculation for cluster sizes of more than 1 sector

This commit is contained in:
mintsuki 2021-03-07 03:03:56 +01:00
parent 5d3f8b4eb0
commit d96bdf775b
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
stage23/fs/fat32.s2.c
View File

@ -94,13 +94,9 @@ static int fat32_init_context(struct fat32_context* context, struct volume *part
}
static int fat32_read_cluster_from_map(struct fat32_context* context, uint32_t cluster, uint32_t* out) {
const uint32_t sector = cluster / (FAT32_SECTOR_SIZE / 4);
const uint32_t offset = cluster % (FAT32_SECTOR_SIZE / 4);
volume_read(context->part, out, context->fat_start_lba * FAT32_SECTOR_SIZE + cluster * sizeof(uint32_t), sizeof(uint32_t));
uint32_t clusters[FAT32_SECTOR_SIZE / sizeof(uint32_t)];
volume_read(context->part, &clusters[0], (context->fat_start_lba + sector) * FAT32_SECTOR_SIZE, sizeof(clusters));
*out = clusters[offset] & 0x0FFFFFFF;
*out &= 0x0fffffff;
return 0;
}
@ -138,7 +134,7 @@ static bool read_cluster_chain(struct fat32_context *context,
if (chunk > block_size - offset)
chunk = block_size - offset;
uint64_t base = (context->data_start_lba + (cluster_chain[block] - 2)) * block_size;
uint64_t base = (context->data_start_lba + (cluster_chain[block] - 2) * context->sectors_per_cluster) * FAT32_SECTOR_SIZE;
volume_read(context->part, buf + progress, base + offset, chunk);
progress += chunk;