github.com/mist-devel.mist-firmware
1
0
Fork 0
mirror of https://github.com/mist-devel/mist-firmware.git synced 2026-04-24 19:50:31 +00:00
Code Releases Activity

FatFs: use the external sector buffer for directory browsing

Browse Source 
...utilizing multiple reads
This commit is contained in:
Gyorgy Szombathelyi
2021-09-01 19:10:28 +02:00
parent c55ff7e4a5
commit fc7121d202
3 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
FatFs/ff.c
View File

@@ -1699,7 +1699,10 @@ static FRESULT dir_sdi ( /* FR_OK(0):succeeded, !=0:error */
dp->clust = clst; /* Current cluster# */
if (dp->sect == 0) return FR_INT_ERR;
dp->sect += ofs / SS(fs); /* Sector# of the directory entry */
dp->dir = fs->win + (ofs % SS(fs)); /* Pointer to the entry in the win[] */
if (dp->buf_size)
dp->dir = dp->buf + (ofs % (dp->buf_size * SS(fs))); /* Pointer to the entry in the external buffer */
else
dp->dir = fs->win + (ofs % SS(fs)); /* Pointer to the entry in the win[] */
return FR_OK;
}
@@ -1759,7 +1762,10 @@ FAST static FRESULT dir_next ( /* FR_OK(0):succeeded, FR_NO_FILE:End of table, F
}
}
dp->dptr = ofs; /* Current entry */
dp->dir = fs->win + ofs % SS(fs); /* Pointer to the entry in the win[] */
if (dp->buf_size)
dp->dir = dp->buf + (ofs % (dp->buf_size * SS(fs)));
else
dp->dir = fs->win + (ofs % SS(fs)); /* Pointer to the entry in the win[] */
return FR_OK;
}
@@ -2265,6 +2271,24 @@ static void create_xdir (
#if FF_FS_MINIMIZE <= 1 || FF_FS_RPATH >= 2 || FF_USE_LABEL || FF_FS_EXFAT
FAST static FRESULT dir_read_buf(
FATFS *fs,
DIR *dp
)
{
FRESULT res = FR_OK;
if (dp->sect < dp->buf_sect || dp->sect >= dp->buf_sect + dp->buf_size) { /* Window offset changed? */
if (disk_read(fs->pdrv, dp->buf, dp->sect, dp->buf_size) != RES_OK) {
dp->sect = (LBA_t)0 - 1; /* Invalidate window if read data is not valid */
res = FR_DISK_ERR;
}
dp->buf_sect = dp->sect;
}
return res;
}
/*-----------------------------------------------------------------------*/
/* Read an object from the directory */
/*-----------------------------------------------------------------------*/
@@ -2285,7 +2309,10 @@ FAST static FRESULT dir_read (
#endif
while (dp->sect) {
res = move_window(fs, dp->sect);
if (dp->buf_size)
res = dir_read_buf(fs, dp);
else
res = move_window(fs, dp->sect);
if (res != FR_OK) break;
b = dp->dir[DIR_Name]; /* Test for the entry type */
if (b == 0) {
@@ -3012,6 +3039,9 @@ static FRESULT follow_path ( /* FR_OK(0): successful, !=0: error code */
FATFS *fs = dp->obj.fs;
dp->buf = 0;
dp->buf_size = 0;
dp->buf_sect = (LBA_t)0 - 1;
#if FF_FS_RPATH != 0
if (!IsSeparator(*path) && (FF_STR_VOLUME_ID != 2 || !IsTerminator(*path))) { /* Without heading separator */
dp->obj.sclust = fs->cdir; /* Start at the current directory */
@@ -4549,6 +4579,9 @@ FRESULT f_opendir (
/* Get logical drive */
res = mount_volume(&path, &fs, 0);
if (res == FR_OK) {
dp->buf = 0;
dp->buf_size = 0;
dp->buf_sect = (LBA_t)0 - 1;
dp->obj.fs = fs;
INIT_NAMBUF(fs);
res = follow_path(dp, path); /* Follow the path to the directory */

3
FatFs/ff.h
View File

@@ -232,6 +232,9 @@ typedef struct {
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]} */
BYTE *buf; /* Optional external buffer for the directory */
WORD buf_size; /* Size of the external buffer (in sectors)*/
LBA_t buf_sect; /* Start sector in the external buffer */
#if FF_USE_LFN
DWORD blk_ofs; /* Offset of current entry block being processed (0xFFFFFFFF:Invalid) */
#endif

2
fat_compat.c
View File

@@ -327,6 +327,8 @@ char ScanDirectory(unsigned long mode, char *extension, unsigned char options) {
for (i = 0; i < MAXDIRENTRIES; i++)
sort_table[i] = i;
if (f_opendir(&dir, ".") != FR_OK) return 0;
dir.buf = sector_buffer;
dir.buf_size = SECTOR_BUFFER_SIZE/512;
}
else
{