Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 03:00:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(storage/fatfs): Fix rootdir entry count handling in fatfsgen.py script (FAT12/FAT16)

Browse Source 
FatFS generator script now uses de-facto limits for Root directory items count
when generating FAT12 or FAT16 image.
Also, Root directory is not required to occupy whole sector
(number of items can be anything from the range from 1 to given limit).
This commit is contained in:
Martin Vychodil
2025-06-11 12:14:15 +02:00
committed by Tomáš Rohlínek
parent 46909c5048
commit ef719bea1d
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/fatfs/fatfs_utils/utils.py
+2
View File
@@ -303,6 +303,8 @@ class FATDefaults:
VOLUME_LABEL: str = 'Espressif'
FILE_SYS_TYPE: str = 'FAT'
ROOT_ENTRIES_COUNT: int = 512 # number of entries in the root directory, recommended 512
FAT12_MAX_ROOT_ENTRIES: int = 224 # maximum number of entries in FAT12 root directory
FAT16_MAX_ROOT_ENTRIES: int = 512 # maximum number of entries in FAT16 root directory
MEDIA_TYPE: int = 0xf8
SIGNATURE_WORD: bytes = b'\x55\xAA'
components/fatfs/fatfsgen.py
+17 -4
View File
@@ -57,8 +57,7 @@ class FATFS:
root_entry_count: int = FATDefaults.ROOT_ENTRIES_COUNT,
explicit_fat_type: Optional[int] = None,
media_type: int = FATDefaults.MEDIA_TYPE) -> None:
# root directory bytes should be aligned by sector size
assert (int(root_entry_count) * BYTES_PER_DIRECTORY_ENTRY) % sector_size == 0
# number of bytes in the root dir must be even multiple of BPB_BytsPerSec
if (int(root_entry_count) > 128):
assert ((int(root_entry_count) * BYTES_PER_DIRECTORY_ENTRY) // sector_size) % 2 == 0
@@ -251,10 +250,24 @@ def calculate_min_space(path: List[str],
def main() -> None:
args = get_args_for_partition_generator('Create a FAT filesystem and populate it with directory content', wl=False)
# 0 == default (512 items)
root_dir_count = args.root_entry_count
if root_dir_count == 0:
root_dir_count = FATDefaults.ROOT_ENTRIES_COUNT
# apply de-facto limits based on FAT type
if args.fat_type == 12:
if root_dir_count > FATDefaults.FAT12_MAX_ROOT_ENTRIES:
root_dir_count = FATDefaults.FAT12_MAX_ROOT_ENTRIES
if args.fat_type == 16:
if root_dir_count > FATDefaults.FAT16_MAX_ROOT_ENTRIES:
root_dir_count = FATDefaults.FAT16_MAX_ROOT_ENTRIES
if args.partition_size == -1:
clusters = calculate_min_space([], args.input_directory, args.sector_size, long_file_names=True, is_root=True)
fats = get_fat_sectors_count(clusters, args.sector_size)
root_dir_sectors = (FATDefaults.ROOT_ENTRIES_COUNT * FATDefaults.ENTRY_SIZE) // args.sector_size
root_dir_sectors = max((root_dir_count * FATDefaults.ENTRY_SIZE // args.sector_size), 1)
args.partition_size = max(FATFS_MIN_ALLOC_UNIT * args.sector_size,
(clusters + fats + get_non_data_sectors_cnt(RESERVED_CLUSTERS_COUNT,
fats,
@@ -269,7 +282,7 @@ def main() -> None:
sector_size=args.sector_size,
long_names_enabled=args.long_name_support,
use_default_datetime=args.use_default_datetime,
root_entry_count=args.root_entry_count,
root_entry_count=root_dir_count,
explicit_fat_type=args.fat_type)
fatfs.generate(args.input_directory)