Skip to content

Commit bb859e7

Browse files
authored
Merge pull request #5223 from cndabai/fatfs
update fatfs to the latest version
2 parents 4107d7b + 3c96451 commit bb859e7

File tree

7 files changed

+833
-674
lines changed

7 files changed

+833
-674
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# files format check exclude path, please follow the instructions below to modify;
2+
# If you need to exclude an entire folder, add the folder path in dir_path;
3+
# If you need to exclude a file, add the path to the file in file_path.
4+
5+
file_path:
6+
- diskio.h
7+
- ff.c
8+
- ff.h
9+
- ffconf.h
10+
- ffunicode.c

components/dfs/filesystems/elmfat/00history.txt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,3 +338,22 @@ R0.14 (October 14, 2019)
338338
Fixed f_readdir() function returns file names with wrong case conversion. (appeared at R0.12)
339339
Fixed f_mkfs() function can fail to create exFAT volume in the second partition. (appeared at R0.12)
340340

341+
342+
R0.14a (December 5, 2020)
343+
Limited number of recursive calls in f_findnext().
344+
Fixed old floppy disks formatted with MS-DOS 2.x and 3.x cannot be mounted.
345+
Fixed some compiler warnings.
346+
347+
348+
349+
R0.14b (April 17, 2021)
350+
Made FatFs uses standard library <string.h> for copy, compare and search instead of built-in string functions.
351+
Added support for long long integer and floating point to f_printf(). (FF_STRF_LLI and FF_STRF_FP)
352+
Made path name parser ignore the terminating separator to allow "dir/".
353+
Improved the compatibility in Unix style path name feature.
354+
Fixed the file gets dead-locked when f_open() failed with some conditions. (appeared at R0.12a)
355+
Fixed f_mkfs() can create wrong exFAT volume due to a timing dependent error. (appeared at R0.12)
356+
Fixed code page 855 cannot be set by f_setcp().
357+
Fixed some compiler warnings.
358+
359+

components/dfs/filesystems/elmfat/00readme.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FatFs Module Source Files R0.14
1+
FatFs Module Source Files R0.14b
22

33

44
FILES

components/dfs/filesystems/elmfat/diskio.h

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ extern "C" {
1010
#endif
1111

1212
/* Status of Disk Functions */
13-
typedef BYTE DSTATUS;
13+
typedef BYTE DSTATUS;
1414

1515
/* Results of Disk Functions */
1616
typedef enum {
17-
RES_OK = 0, /* 0: Successful */
18-
RES_ERROR, /* 1: R/W Error */
19-
RES_WRPRT, /* 2: Write Protected */
20-
RES_NOTRDY, /* 3: Not Ready */
21-
RES_PARERR /* 4: Invalid Parameter */
17+
RES_OK = 0, /* 0: Successful */
18+
RES_ERROR, /* 1: R/W Error */
19+
RES_WRPRT, /* 2: Write Protected */
20+
RES_NOTRDY, /* 3: Not Ready */
21+
RES_PARERR /* 4: Invalid Parameter */
2222
} DRESULT;
2323

2424

@@ -35,40 +35,40 @@ DRESULT disk_ioctl (BYTE pdrv, BYTE cmd, void* buff);
3535

3636
/* Disk Status Bits (DSTATUS) */
3737

38-
#define STA_NOINIT 0x01 /* Drive not initialized */
39-
#define STA_NODISK 0x02 /* No medium in the drive */
40-
#define STA_PROTECT 0x04 /* Write protected */
38+
#define STA_NOINIT 0x01 /* Drive not initialized */
39+
#define STA_NODISK 0x02 /* No medium in the drive */
40+
#define STA_PROTECT 0x04 /* Write protected */
4141

4242

4343
/* Command code for disk_ioctrl fucntion */
4444

4545
/* Generic command (Used by FatFs) */
46-
#define CTRL_SYNC 0 /* Complete pending write process (needed at FF_FS_READONLY == 0) */
47-
#define GET_SECTOR_COUNT 1 /* Get media size (needed at FF_USE_MKFS == 1) */
48-
#define GET_SECTOR_SIZE 2 /* Get sector size (needed at FF_MAX_SS != FF_MIN_SS) */
49-
#define GET_BLOCK_SIZE 3 /* Get erase block size (needed at FF_USE_MKFS == 1) */
50-
#define CTRL_TRIM 4 /* Inform device that the data on the block of sectors is no longer used (needed at FF_USE_TRIM == 1) */
46+
#define CTRL_SYNC 0 /* Complete pending write process (needed at FF_FS_READONLY == 0) */
47+
#define GET_SECTOR_COUNT 1 /* Get media size (needed at FF_USE_MKFS == 1) */
48+
#define GET_SECTOR_SIZE 2 /* Get sector size (needed at FF_MAX_SS != FF_MIN_SS) */
49+
#define GET_BLOCK_SIZE 3 /* Get erase block size (needed at FF_USE_MKFS == 1) */
50+
#define CTRL_TRIM 4 /* Inform device that the data on the block of sectors is no longer used (needed at FF_USE_TRIM == 1) */
5151

5252
/* Generic command (Not used by FatFs) */
53-
#define CTRL_POWER 5 /* Get/Set power status */
54-
#define CTRL_LOCK 6 /* Lock/Unlock media removal */
55-
#define CTRL_EJECT 7 /* Eject media */
56-
#define CTRL_FORMAT 8 /* Create physical format on the media */
53+
#define CTRL_POWER 5 /* Get/Set power status */
54+
#define CTRL_LOCK 6 /* Lock/Unlock media removal */
55+
#define CTRL_EJECT 7 /* Eject media */
56+
#define CTRL_FORMAT 8 /* Create physical format on the media */
5757

5858
/* MMC/SDC specific ioctl command */
59-
#define MMC_GET_TYPE 10 /* Get card type */
60-
#define MMC_GET_CSD 11 /* Get CSD */
61-
#define MMC_GET_CID 12 /* Get CID */
62-
#define MMC_GET_OCR 13 /* Get OCR */
63-
#define MMC_GET_SDSTAT 14 /* Get SD status */
64-
#define ISDIO_READ 55 /* Read data form SD iSDIO register */
65-
#define ISDIO_WRITE 56 /* Write data to SD iSDIO register */
66-
#define ISDIO_MRITE 57 /* Masked write data to SD iSDIO register */
59+
#define MMC_GET_TYPE 10 /* Get card type */
60+
#define MMC_GET_CSD 11 /* Get CSD */
61+
#define MMC_GET_CID 12 /* Get CID */
62+
#define MMC_GET_OCR 13 /* Get OCR */
63+
#define MMC_GET_SDSTAT 14 /* Get SD status */
64+
#define ISDIO_READ 55 /* Read data form SD iSDIO register */
65+
#define ISDIO_WRITE 56 /* Write data to SD iSDIO register */
66+
#define ISDIO_MRITE 57 /* Masked write data to SD iSDIO register */
6767

6868
/* ATA/CF specific ioctl command */
69-
#define ATA_GET_REV 20 /* Get F/W revision */
70-
#define ATA_GET_MODEL 21 /* Get model name */
71-
#define ATA_GET_SN 22 /* Get serial number */
69+
#define ATA_GET_REV 20 /* Get F/W revision */
70+
#define ATA_GET_MODEL 21 /* Get model name */
71+
#define ATA_GET_SN 22 /* Get serial number */
7272

7373
#ifdef __cplusplus
7474
}

0 commit comments

Comments
 (0)