libfs/fatfs: Update FatFS to R0.16

This updates the FatFS to R0.16 revision
of upstream and updates the cppflags.
This commit is contained in:
Sepehr Ganji
2025-11-26 15:23:51 -07:00
committed by Joel Sherrill
parent 637c351743
commit 330c70c565
9 changed files with 618 additions and 461 deletions

View File

@@ -381,3 +381,9 @@ R0.15b (June 21, 2025)
Added support for timestamp of created time. (FF_FS_CRTIME)
Fixed FatFs fails to load the FsInfo in FAT32 volumes and the f_getfree always be forced a full FAT scan which takes a long time. (appeared at R0.15a)
R0.16 (July 22, 2025)
Removed a long-pending limitation that f_getcwd and double-dot .. in the path name did not work on the exFAT volume.
Fixed f_readdir cannot detect end of directory and it leads the application process into infinite loop. (appeared at R0.15b)
Fixed dot names with terminating separator or duplicated separator are rejected when LFN is not enabled.

View File

@@ -1,4 +1,4 @@
FatFs Module Source Files R0.15
FatFs Module Source Files R0.16
FILES

View File

@@ -1,5 +1,5 @@
/*-----------------------------------------------------------------------*/
/* Low level disk I/O module SKELETON for FatFs (C)ChaN, 2019 */
/* Low level disk I/O module SKELETON for FatFs (C)ChaN, 2025 */
/*-----------------------------------------------------------------------*/
/* If a working storage control module is available, it should be */
/* attached to the FatFs via a glue function rather than modifying it. */
@@ -7,13 +7,17 @@
/* storage control modules to the FatFs module with a defined API. */
/*-----------------------------------------------------------------------*/
#include "ff.h" /* Obtains integer types */
#include "diskio.h" /* Declarations of disk functions */
#include "ff.h" /* Basic definitions of FatFs */
#include "diskio.h" /* Declarations FatFs MAI */
/* Definitions of physical drive number for each drive */
#define DEV_RAM 0 /* Example: Map Ramdisk to physical drive 0 */
#define DEV_MMC 1 /* Example: Map MMC/SD card to physical drive 1 */
#define DEV_USB 2 /* Example: Map USB MSD to physical drive 2 */
/* Example: Declarations of the platform and disk functions in the project */
#include "platform.h"
#include "storage.h"
/* Example: Mapping of physical drive number for each drive */
#define DEV_FLASH 0 /* Map FTL to physical drive 0 */
#define DEV_MMC 1 /* Map MMC/SD card to physical drive 1 */
#define DEV_USB 2 /* Map USB MSD to physical drive 2 */
/*-----------------------------------------------------------------------*/

View File

@@ -1,5 +1,5 @@
/*-----------------------------------------------------------------------/
/ Low level disk interface modlue include file (C)ChaN, 2019 /
/ Low level disk interface modlue include file (C)ChaN, 2025 /
/-----------------------------------------------------------------------*/
#ifndef _DISKIO_DEFINED
@@ -55,7 +55,7 @@ DRESULT disk_ioctl (BYTE pdrv, BYTE cmd, void* buff);
#define CTRL_EJECT 7 /* Eject media */
#define CTRL_FORMAT 8 /* Create physical format on the media */
/* MMC/SDC specific ioctl command */
/* MMC/SDC specific ioctl command (Not used by FatFs) */
#define MMC_GET_TYPE 10 /* Get card type */
#define MMC_GET_CSD 11 /* Get CSD */
#define MMC_GET_CID 12 /* Get CID */
@@ -65,7 +65,7 @@ DRESULT disk_ioctl (BYTE pdrv, BYTE cmd, void* buff);
#define ISDIO_WRITE 56 /* Write data to SD iSDIO register */
#define ISDIO_MRITE 57 /* Masked write data to SD iSDIO register */
/* ATA/CF specific ioctl command */
/* ATA/CF specific ioctl command (Not used by FatFs) */
#define ATA_GET_REV 20 /* Get F/W revision */
#define ATA_GET_MODEL 21 /* Get model name */
#define ATA_GET_SN 22 /* Get serial number */

File diff suppressed because it is too large Load Diff

View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------/
/ FatFs - Generic FAT Filesystem module R0.15b /
/ FatFs - Generic FAT Filesystem module R0.16 /
/-----------------------------------------------------------------------------/
/
/ Copyright (C) 2025, ChaN, all right reserved.
@@ -20,7 +20,7 @@
#ifndef FF_DEFINED
#define FF_DEFINED 5385 /* Revision ID */
#define FF_DEFINED 80386 /* Revision ID */
#ifdef __cplusplus
extern "C" {
@@ -127,47 +127,65 @@ extern const char* VolumeStr[FF_VOLUMES]; /* User defined volume ID table */
#endif
/* Current working directory structure (FFXCWDS) */
#if FF_FS_EXFAT && FF_FS_RPATH
#if FF_PATH_DEPTH < 1
#error FF_PATH_DEPTH must not be zero
#endif
typedef struct {
DWORD d_scl; /* Directory start cluster (0:root dir) */
DWORD d_size; /* Size of directory (b7-b0: cluster chain status) (invalid if d_scl == 0) */
DWORD nxt_ofs; /* Offset of entry of next dir in this directory (invalid if last link) */
} FFXCWDL;
typedef struct {
UINT depth; /* Current directory depth (0:root dir) */
FFXCWDL tbl[FF_PATH_DEPTH + 1]; /* Directory chain of current working directory path */
} FFXCWDS;
#endif
/* Filesystem object structure (FATFS) */
typedef struct {
BYTE fs_type; /* Filesystem type (0:not mounted) */
BYTE pdrv; /* Volume hosting physical drive */
BYTE ldrv; /* Logical drive number (used only when FF_FS_REENTRANT) */
BYTE n_fats; /* Number of FATs (1 or 2) */
BYTE wflag; /* win[] status (b0:dirty) */
BYTE fsi_flag; /* Allocation information control (b7:disabled, b0:dirty) */
WORD id; /* Volume mount ID */
WORD n_rootdir; /* Number of root directory entries (FAT12/16) */
WORD csize; /* Cluster size [sectors] */
BYTE fs_type; /* Filesystem type (0:not mounted) */
BYTE pdrv; /* Physical drive that holds this volume */
BYTE ldrv; /* Logical drive number (used only when FF_FS_REENTRANT) */
BYTE n_fats; /* Number of FATs (1 or 2) */
BYTE wflag; /* win[] status (b0:dirty) */
BYTE fsi_flag; /* Allocation information control (b7:disabled, b0:dirty) */
WORD id; /* Volume mount ID */
WORD n_rootdir; /* Number of root directory entries (FAT12/16) */
WORD csize; /* Cluster size [sectors] */
#if FF_MAX_SS != FF_MIN_SS
WORD ssize; /* Sector size (512, 1024, 2048 or 4096) */
WORD ssize; /* Sector size (512, 1024, 2048 or 4096) */
#endif
#if FF_USE_LFN
WCHAR *lfnbuf; /* LFN working buffer */
WCHAR* lfnbuf; /* Pointer to LFN working buffer */
#endif
#if !FF_FS_READONLY
DWORD last_clst; /* Last allocated cluster (Unknown if >=n_fatent) */
DWORD free_clst; /* Number of free clusters (Unknown if >=fs->n_fatent-2) */
DWORD last_clst; /* Last allocated cluster (invalid if >=n_fatent) */
DWORD free_clst; /* Number of free clusters (invalid if >=fs->n_fatent-2) */
#endif
#if FF_FS_RPATH
DWORD cdir; /* Current directory start cluster (0:root) */
DWORD cdir; /* Current directory start cluster (0:root) */
#endif
DWORD n_fatent; /* Number of FAT entries (number of clusters + 2) */
DWORD fsize; /* Number of sectors per FAT */
LBA_t winsect; /* Current sector appearing in the win[] */
LBA_t volbase; /* Volume base sector */
LBA_t fatbase; /* FAT base sector */
LBA_t dirbase; /* Root directory base sector (FAT12/16) or cluster (FAT32/exFAT) */
LBA_t database; /* Data base sector */
DWORD n_fatent; /* Number of FAT entries (number of clusters + 2) */
DWORD fsize; /* Number of sectors per FAT */
LBA_t winsect; /* Current sector appearing in the win[] */
LBA_t volbase; /* Volume base sector */
LBA_t fatbase; /* FAT base sector */
LBA_t dirbase; /* Root directory base sector (FAT12/16) or cluster (FAT32/exFAT) */
LBA_t database; /* Data base sector */
#if FF_FS_EXFAT
LBA_t bitbase; /* Allocation bitmap base sector */
BYTE *dirbuf; /* Directory entry block scratchpad buffer for exFAT */
DWORD cdc_scl; /* Containing directory start cluster (invalid when cdir is 0) */
DWORD cdc_size; /* b31-b8:Size of containing directory, b7-b0: Chain status */
DWORD cdc_ofs; /* Offset in the containing directory (invalid when cdir is 0) */
LBA_t bitbase; /* Allocation bitmap base sector */
BYTE* dirbuf; /* Pointer to directory entry block buffer */
#if FF_FS_RPATH
FFXCWDS xcwds; /* Crrent working directory structure */
FFXCWDS xcwds2; /* Working buffer to follow the path */
#endif
BYTE win[FF_MAX_SS]; /* Disk access window for Directory, FAT (and file data at tiny cfg) */
#endif
BYTE win[FF_MAX_SS]; /* Disk access window for directory, FAT (and file data in tiny cfg) */
} FATFS;
@@ -175,21 +193,21 @@ typedef struct {
/* Object ID and allocation information (FFOBJID) */
typedef struct {
FATFS* fs; /* Pointer to the hosting volume of this object */
WORD id; /* Hosting volume's mount ID */
BYTE attr; /* Object attribute */
BYTE stat; /* Object chain status (b1-0: =0:not contiguous, =2:contiguous, =3:fragmented in this session, b2:sub-directory stretched) */
DWORD sclust; /* Object data start cluster (0:no cluster or root directory) */
FSIZE_t objsize; /* Object size (valid when sclust != 0) */
FATFS* fs; /* Pointer to the volume holding this object */
WORD id; /* Volume mount ID when this object was opened */
BYTE attr; /* Object attribute */
BYTE stat; /* Object chain status (exFAT: b1-0: =0:not contiguous, =2:contiguous, =3:fragmented in this session, b2:sub-directory stretched) */
DWORD sclust; /* Object data cluster (0:no data or root directory) */
FSIZE_t objsize; /* Object size (valid when sclust != 0) */
#if FF_FS_EXFAT
DWORD n_cont; /* Size of first fragment - 1 (valid when stat == 3) */
DWORD n_frag; /* Size of last fragment needs to be written to FAT (valid when not zero) */
DWORD c_scl; /* Containing directory start cluster (valid when sclust != 0) */
DWORD c_size; /* b31-b8:Size of containing directory, b7-b0: Chain status (valid when c_scl != 0) */
DWORD c_ofs; /* Offset in the containing directory (valid when in file object and sclust != 0) */
DWORD n_cont; /* Size of first fragment - 1 (valid when stat == 3) */
DWORD n_frag; /* Size of last fragment needs to be written to FAT (valid when not zero) */
DWORD c_scl; /* Cluster of directory holding this object (valid when sclust != 0) */
DWORD c_size; /* Size of directory holding this object (b7-b0: allocation status, valid when c_scl != 0) */
DWORD c_ofs; /* Offset of entry in the holding directory */
#endif
#if FF_FS_LOCK
UINT lockid; /* File lock ID origin from 1 (index of file semaphore table Files[]) */
UINT lockid; /* File lock ID origin from 1 (index of file semaphore table Files[]) */
#endif
} FFOBJID;
@@ -198,18 +216,18 @@ typedef struct {
/* File object structure (FIL) */
typedef struct {
FFOBJID obj; /* Object identifier (must be the 1st member to detect invalid object pointer) */
BYTE flag; /* File status flags */
BYTE err; /* Abort flag (error code) */
FSIZE_t fptr; /* File read/write pointer (Zeroed on file open) */
DWORD clust; /* Current cluster of fpter (invalid when fptr is 0) */
LBA_t sect; /* Sector number appearing in buf[] (0:invalid) */
FFOBJID obj; /* Object identifier (must be the 1st member to detect invalid object pointer) */
BYTE flag; /* File status flags */
BYTE err; /* Abort flag (error code) */
FSIZE_t fptr; /* File read/write pointer (0 on open) */
DWORD clust; /* Current cluster of fptr (invalid when fptr is 0) */
LBA_t sect; /* Sector number appearing in buf[] (0:invalid) */
#if !FF_FS_READONLY
LBA_t dir_sect; /* Sector number containing the directory entry (not used at exFAT) */
BYTE* dir_ptr; /* Pointer to the directory entry in the win[] (not used at exFAT) */
LBA_t dir_sect; /* Sector number containing the directory entry (not used in exFAT) */
BYTE* dir_ptr; /* Pointer to the directory entry in the win[] (not used in exFAT) */
#endif
#if FF_USE_FASTSEEK
DWORD* cltbl; /* Pointer to the cluster link map table (nulled on open, set by application) */
DWORD* cltbl; /* Pointer to the cluster link map table (nulled on open; set by application) */
#endif
#if !FF_FS_TINY
BYTE buf[FF_MAX_SS]; /* File private data read/write window */
@@ -221,44 +239,44 @@ typedef struct {
/* Directory object structure (DIR) */
typedef struct {
FFOBJID obj; /* Object identifier */
DWORD dptr; /* Current read/write offset */
DWORD clust; /* Current cluster */
LBA_t sect; /* Current sector (0:Read operation has terminated) */
BYTE* dir; /* Pointer to the directory item in the win[] */
BYTE fn[12]; /* SFN (in/out) {body[8],ext[3],status[1]} */
FFOBJID obj; /* Object identifier (must be the 1st member to detect invalid object pointer) */
DWORD dptr; /* Current read/write offset */
DWORD clust; /* Current cluster */
LBA_t sect; /* Current sector (0:no more item to read) */
BYTE* dir; /* Pointer to the directory item in the win[] in filesystem object */
BYTE fn[12]; /* SFN (in/out) {body[0-7],ext[8-10],status[11]} */
#if FF_USE_LFN
DWORD blk_ofs; /* Offset of current entry block being processed (0xFFFFFFFF:Invalid) */
DWORD blk_ofs; /* Offset of current entry block being processed (0xFFFFFFFF:invalid) */
#endif
#if FF_USE_FIND
const TCHAR* pat; /* Pointer to the name matching pattern */
const TCHAR *pat; /* Pointer to the name matching pattern */
#endif
} DIR;
/* File information structure (FILINFO) */
/* File/directory information structure (FILINFO) */
typedef struct {
FSIZE_t fsize; /* File size */
WORD fdate; /* Modified date */
WORD ftime; /* Modified time */
FSIZE_t fsize; /* File size (invalid for directory) */
WORD fdate; /* Date of file modification or directory creation */
WORD ftime; /* Time of file modification or directory creation */
#if FF_FS_CRTIME
WORD crdate; /* Created date */
WORD crtime; /* Created time */
WORD crdate; /* Date of object createion */
WORD crtime; /* Time of object createion */
#endif
BYTE fattrib; /* File attribute */
BYTE fattrib; /* Object attribute */
#if FF_USE_LFN
TCHAR altname[FF_SFN_BUF + 1];/* Alternative file name */
TCHAR fname[FF_LFN_BUF + 1]; /* Primary file name */
TCHAR altname[FF_SFN_BUF + 1];/* Alternative object name */
TCHAR fname[FF_LFN_BUF + 1]; /* Primary object name */
#else
TCHAR fname[12 + 1]; /* File name */
TCHAR fname[12 + 1]; /* Object name */
#endif
} FILINFO;
/* Format parameter structure (MKFS_PARM) */
/* Format parameter structure (MKFS_PARM) used for f_mkfs() */
typedef struct {
BYTE fmt; /* Format option (FM_FAT, FM_FAT32, FM_EXFAT and FM_SFD) */
@@ -290,7 +308,7 @@ typedef enum {
FR_MKFS_ABORTED, /* (14) The f_mkfs function aborted due to some problem */
FR_TIMEOUT, /* (15) Could not take control of the volume within defined period */
FR_LOCKED, /* (16) The operation is rejected according to the file sharing policy */
FR_NOT_ENOUGH_CORE, /* (17) LFN working buffer could not be allocated or given buffer is insufficient in size */
FR_NOT_ENOUGH_CORE, /* (17) LFN working buffer could not be allocated, given buffer size is insufficient or too deep path */
FR_TOO_MANY_OPEN_FILES, /* (18) Number of open files > FF_FS_LOCK */
FR_INVALID_PARAMETER /* (19) Given parameter is invalid */
} FRESULT;

View File

@@ -2,7 +2,7 @@
/ Configurations of FatFs Module
/---------------------------------------------------------------------------*/
#define FFCONF_DEF 5385 /* Revision ID */
#define FFCONF_DEF 80386 /* Revision ID */
/*---------------------------------------------------------------------------/
/ Function Configurations
@@ -57,9 +57,9 @@
#define FF_USE_STRFUNC 0
#define FF_PRINT_LLI 1
#define FF_PRINT_FLOAT 1
#define FF_STRF_ENCODE 3
#define FF_PRINT_LLI 0
#define FF_PRINT_FLOAT 0
#define FF_STRF_ENCODE 0
/* FF_USE_STRFUNC switches string API functions, f_gets(), f_putc(), f_puts() and
/ f_printf().
/
@@ -154,14 +154,26 @@
#define FF_FS_RPATH 0
/* This option configures support for relative path.
/* This option configures support for relative path feature.
/
/ 0: Disable relative path and remove related API functions.
/ 1: Enable relative path. f_chdir() and f_chdrive() are available.
/ 1: Enable relative path and dot names. f_chdir() and f_chdrive() are available.
/ 2: f_getcwd() is available in addition to 1.
*/
#define FF_PATH_DEPTH 10
/* This option defines maximum depth of directory in the exFAT volume. It is NOT
/ relevant to FAT/FAT32 volume.
/ For example, FF_PATH_DEPTH = 3 will able to follow a path "/dir1/dir2/dir3/file"
/ but a sub-directory in the dir3 will not able to be followed and set current
/ directory.
/ The size of filesystem object (FATFS) increases FF_PATH_DEPTH * 24 bytes.
/ When FF_FS_EXFAT == 0 or FF_FS_RPATH == 0, this option has no effect.
*/
/*---------------------------------------------------------------------------/
/ Drive/Volume Configurations
/---------------------------------------------------------------------------*/
@@ -226,7 +238,7 @@
#define FF_FS_TINY 0
/* This option switches tiny buffer configuration. (0:Normal or 1:Tiny)
/ At the tiny configuration, size of file object (FIL) is shrinked FF_MAX_SS bytes.
/ At the tiny configuration, size of file object (FIL) is reduced FF_MAX_SS bytes.
/ Instead of private sector buffer eliminated from the file object, common sector
/ buffer in the filesystem object (FATFS) is used for the file data transfer. */
@@ -238,7 +250,7 @@
#define FF_FS_NORTC 0
#define FF_NORTC_MON 6
#define FF_NORTC_MON 1
#define FF_NORTC_MDAY 1
#define FF_NORTC_YEAR 2025
/* The option FF_FS_NORTC switches timestamp feature. If the system does not have

View File

@@ -12,6 +12,20 @@ Any new file added must have `rtems-` prefix, and any changes made to the import
______________________________________________________________________
## [R0.15] - 2025-07-22
### Hash
67cb748f312f1bc3c95558372576dddcb3ab90d5030ecdd40f8090b42a11f3cd
### Added
`FF_PATH_DEPTH` has been added to the `ffconf.h` and to cppflags.
### Changed
`FFCONF_DEF` (Revision ID) for the new version has been updated.
## [R0.15b] - 2025-06-21
### Hash

View File

@@ -11,7 +11,7 @@ cppflags:
- -Ddisk_write=rtems_fatfs_disk_write
- -Ddisk_ioctl=rtems_fatfs_disk_ioctl
- -Dget_fattime=rtems_fatfs_get_fattime
- -DFFCONF_DEF=5385
- -DFFCONF_DEF=80386
- -DFF_VOLUMES=1
- -DFF_USE_MKFS=1
- -DFF_USE_CHMOD=1
@@ -24,6 +24,7 @@ cppflags:
- -DFF_SFN_BUF=12
- -DFF_MAX_LFN=255
- -DFF_USE_LABEL=0
- -DFF_PATH_DEPTH=10
- -DFF_STR_VOLUME_ID=0
- -DFF_MULTI_PARTITION=0
- -DFF_FS_READONLY=0