michaelh/zephyr
1
0
Fork 0
Code Releases Activity

fs/fatfs: Move FF_USE_LFN logic to Kconfig

Browse source 
Commit add hidden Kconfig option CONFIG_FS_FATFS_FF_USE_LFN
that is passed to ELM FAT to define FF_USE_LFN configuration.
The FF_USE_LFN still depends, indirectly, on choice
CONFIG_FS_FATFS_LFN_MODE config options
CONFIG_FS_FATFS_LFN_MODE_BSS, FS_FATFS_LFN_MODE_STACK and
FS_FATFS_LFN_MODE_HEAP, but the logic has been moved out of
zephyr_fatfs_config.h into Kconfig file.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
This commit is contained in:
Dominik Ermel 2022-11-23 11:16:29 +00:00 • committed by Fabio Baltieri
commit 1e0f36e896
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/fatfs/zephyr_fatfs_config.h
View file

@ -33,14 +33,10 @@
#define FF_CODE_PAGE 437 #define FF_CODE_PAGE 437
#endif /* defined(CONFIG_FS_FATFS_CODEPAGE) */ #endif /* defined(CONFIG_FS_FATFS_CODEPAGE) */
#if defined(CONFIG_FS_FATFS_LFN) #if defined(CONFIG_FS_FATFS_FF_USE_LFN)
#if CONFIG_FS_FATFS_FF_USE_LFN <= 3
#undef FF_USE_LFN #undef FF_USE_LFN
#if CONFIG_FS_FATFS_LFN_MODE_BSS #define FF_USE_LFN CONFIG_FS_FATFS_FF_USE_LFN
#define FF_USE_LFN 1
#elif CONFIG_FS_FATFS_LFN_MODE_STACK
#define FF_USE_LFN 2
#elif CONFIG_FS_FATFS_LFN_MODE_HEAP
#define FF_USE_LFN 3
#else #else
#error Invalid LFN buffer location #error Invalid LFN buffer location
#endif #endif

9
subsys/fs/Kconfig.fatfs
View file

@ -122,6 +122,15 @@ config FS_FATFS_LFN_MODE_HEAP
endchoice endchoice
config FS_FATFS_FF_USE_LFN
int
default 1 if FS_FATFS_LFN_MODE_BSS
default 2 if FS_FATFS_LFN_MODE_STACK
default 3 if FS_FATFS_LFN_MODE_HEAP
help
Translates FS_FATFS_LFN_MODE selection to FF_USE_LFN, defined in ffconf.h,
inside ELM FAT module.
config FS_FATFS_MAX_LFN config FS_FATFS_MAX_LFN
int "Max filename length" int "Max filename length"
range 12 255 range 12 255