djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8567 from eightycc/tinyfs2 

Shrink root dir size for tiny (<=128K) FAT12 fs
This commit is contained in:
Dan Halbert 2023-11-09 19:38:01 -05:00 committed by GitHub
parent 25525f048a a4c4c16dd5
commit ce6a5e33fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/oofatfs/ff.c
View File

@ -5422,7 +5422,8 @@ FRESULT f_mkfs (
) )
{ {
const UINT n_fats = 1; /* Number of FATs for FAT/FAT32 volume (1 or 2) */ const UINT n_fats = 1; /* Number of FATs for FAT/FAT32 volume (1 or 2) */
const UINT n_rootdir = 512; /* Number of root directory entries for FAT volume */ // CIRCUITPY-CHANGE: Make number of root directory entries changeable. See below.
UINT n_rootdir = 512; /* Default number of root directory entries for FAT volume */
static const WORD cst[] = {1, 4, 16, 64, 256, 512, 0}; /* Cluster size boundary for FAT volume (4Ks unit) */ static const WORD cst[] = {1, 4, 16, 64, 256, 512, 0}; /* Cluster size boundary for FAT volume (4Ks unit) */
#if FF_MKFS_FAT32 #if FF_MKFS_FAT32
static const WORD cst32[] = {1, 2, 4, 8, 16, 32, 0}; /* Cluster size boundary for FAT32 volume (128Ks unit) */ static const WORD cst32[] = {1, 2, 4, 8, 16, 32, 0}; /* Cluster size boundary for FAT32 volume (128Ks unit) */
@ -5703,6 +5704,11 @@ FRESULT f_mkfs (
} }
sz_fat = (n + ss - 1) / ss; /* FAT size [sector] */ sz_fat = (n + ss - 1) / ss; /* FAT size [sector] */
sz_rsv = 1; /* Number of reserved sectors */ sz_rsv = 1; /* Number of reserved sectors */
// CIRCUITPY-CHANGE: For fewer than 256 clusters (128kB filesystem),
// shrink the root directory size from 512 entries to 128 entries. Note that
// long filenames will use two entries. This change affects only the root directory,
// not subdirectories
n_rootdir = (sz_vol <= 256) ? 128 : n_rootdir;
sz_dir = (DWORD)n_rootdir * SZDIRE / ss; /* Rootdir size [sector] */ sz_dir = (DWORD)n_rootdir * SZDIRE / ss; /* Rootdir size [sector] */
} }
b_fat = b_vol + sz_rsv; /* FAT base */ b_fat = b_vol + sz_rsv; /* FAT base */

2
tests/extmod/vfs_blockdev.py.exp
View File

@ -1,5 +1,5 @@
test <class 'VfsFat'> test <class 'VfsFat'>
(512, 512, 16, 16, 16, 0, 0, 0, 0, 255) (512, 512, 40, 40, 40, 0, 0, 0, 0, 255)
[('test', 32768, 0, 90)] [('test', 32768, 0, 90)]
some datasome datasome datasome datasome datasome datasome datasome datasome datasome data some datasome datasome datasome datasome datasome datasome datasome datasome datasome data
test <class 'VfsLfs2'> test <class 'VfsLfs2'>

2
tests/extmod/vfs_fat_ramdisk.py.exp
View File

@ -1,7 +1,7 @@
True True
True True
label: LABEL TEST label: LABEL TEST
statvfs: (512, 512, 16, 16, 16, 0, 0, 0, 0, 255) statvfs: (512, 512, 40, 40, 40, 0, 0, 0, 0, 255)
getcwd: / getcwd: /
True True
[('foo_file.txt', 32768, 0, 6)] [('foo_file.txt', 32768, 0, 6)]