feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'fix/fatfs_ssize_undefined' into 'master'

Browse Source 
fatfs: Fix undefined ssize member of FATFS struct

Closes IDFGH-7483

See merge request espressif/esp-idf!18667
This commit is contained in:
Martin Vychodil
2022-06-28 07:49:45 +08:00
parent d5fafe14c2 0fac7d1c02
commit 0b0befc2a6
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/fatfs/vfs/vfs_fat.c
View File

@@ -224,13 +224,17 @@ esp_err_t esp_vfs_fat_info(const char* base_path,
} }
uint64_t total_sectors = ((uint64_t)(fs->n_fatent - 2)) * fs->csize; uint64_t total_sectors = ((uint64_t)(fs->n_fatent - 2)) * fs->csize;
uint64_t free_sectors = ((uint64_t)free_clusters) * fs->csize; uint64_t free_sectors = ((uint64_t)free_clusters) * fs->csize;
WORD sector_size = FF_MIN_SS; // 512
#if FF_MAX_SS != FF_MIN_SS
sector_size = fs->ssize;
#endif
// Assuming the total size is < 4GiB, should be true for SPI Flash // Assuming the total size is < 4GiB, should be true for SPI Flash
if (out_total_bytes != NULL) { if (out_total_bytes != NULL) {
*out_total_bytes = total_sectors * fs->ssize; *out_total_bytes = total_sectors * sector_size;
} }
if (out_free_bytes != NULL) { if (out_free_bytes != NULL) {
*out_free_bytes = free_sectors * fs->ssize; *out_free_bytes = free_sectors * sector_size;
} }
return ESP_OK; return ESP_OK;
} }