mirror/littlefs
3
0
Fork 0
mirror of https://github.com/littlefs-project/littlefs.git synced 2025-12-01 12:20:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

bmap: rdonly: Got LFS3_RDONLY + LFS3_BMAP compiling

Browse Source 
Counterintuitively, LFS3_RDONLY + LFS3_BMAP _does_ make sense for cases
where you want to include the bmap in things like ckmeta/ckdata scans.

Though this is another argument for a LFS3_RDONLY + LFS3_NO_TRV build.
Traversals add quite a bit of code to the rdonly build that is probably
not always needed.

---

This just required another bunch of ifdefs.

Current bmap rdonly code size:

                code          stack          ctx
  rdonly:      10616            896          532
  rdonly+bmap: 10892 (+2.6%)    896 (+0.0%)  636 (+19.5%)
This commit is contained in:
Christopher Haster
2025-08-05 12:02:06 -05:00
parent 60ef118dcd
commit a1b75497d6
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lfs3.c
View File

@ -7697,6 +7697,8 @@ static int lfs3_data_readgrm(lfs3_t *lfs3, lfs3_data_t *data,
#if !defined(LFS3_RDONLY) && !defined(LFS3_2BONLY) && defined(LFS3_BMAP) #if !defined(LFS3_RDONLY) && !defined(LFS3_2BONLY) && defined(LFS3_BMAP)
static lfs3_data_t lfs3_data_fromgbmap(const lfs3_gbmap_t *gbmap, static lfs3_data_t lfs3_data_fromgbmap(const lfs3_gbmap_t *gbmap,
uint8_t buffer[static LFS3_GBMAP_DSIZE]); uint8_t buffer[static LFS3_GBMAP_DSIZE]);
#endif
#if !defined(LFS3_2BONLY) && defined(LFS3_BMAP)
static int lfs3_data_readgbmap(lfs3_t *lfs3, lfs3_data_t *data, static int lfs3_data_readgbmap(lfs3_t *lfs3, lfs3_data_t *data,
lfs3_gbmap_t *gbmap); lfs3_gbmap_t *gbmap);
#endif #endif
@ -10691,7 +10693,7 @@ static lfs3_data_t lfs3_data_fromgbmap(const lfs3_gbmap_t *gbmap,
} }
#endif #endif
#if !defined(LFS3_RDONLY) && !defined(LFS3_2BONLY) && defined(LFS3_BMAP) #if !defined(LFS3_2BONLY) && defined(LFS3_BMAP)
static int lfs3_data_readgbmap(lfs3_t *lfs3, lfs3_data_t *data, static int lfs3_data_readgbmap(lfs3_t *lfs3, lfs3_data_t *data,
lfs3_gbmap_t *gbmap) { lfs3_gbmap_t *gbmap) {
int err = lfs3_data_readleb128(lfs3, data, &gbmap->window); int err = lfs3_data_readleb128(lfs3, data, &gbmap->window);
@ -10732,7 +10734,7 @@ static int lfs3_bmap_lookupnext(lfs3_t *lfs3, lfs3_btree_t *bmap,
// this is the same as lfs3_btree_commit, but we set the inbmap flag // this is the same as lfs3_btree_commit, but we set the inbmap flag
// for debugging reasons // for debugging reasons
#ifdef LFS3_BMAP #if !defined(LFS3_RDONLY) && defined(LFS3_BMAP)
static int lfs3_bmap_commit(lfs3_t *lfs3, lfs3_btree_t *bmap, static int lfs3_bmap_commit(lfs3_t *lfs3, lfs3_btree_t *bmap,
lfs3_bid_t bid, const lfs3_rattr_t *rattrs, lfs3_size_t rattr_count) { lfs3_bid_t bid, const lfs3_rattr_t *rattrs, lfs3_size_t rattr_count) {
#ifdef LFS3_REVDBG #ifdef LFS3_REVDBG
@ -10757,7 +10759,7 @@ failed:;
} }
#endif #endif
#ifdef LFS3_BMAP #if !defined(LFS3_RDONLY) && defined(LFS3_BMAP)
static int lfs3_bmap_set(lfs3_t *lfs3, lfs3_btree_t *bmap, static int lfs3_bmap_set(lfs3_t *lfs3, lfs3_btree_t *bmap,
lfs3_block_t block, lfs3_tag_t tag) { lfs3_block_t block, lfs3_tag_t tag) {
// lookup bmap range // lookup bmap range
@ -10868,7 +10870,7 @@ static int lfs3_bmap_set(lfs3_t *lfs3, lfs3_btree_t *bmap,
} }
#endif #endif
#ifdef LFS3_BMAP #if !defined(LFS3_RDONLY) && defined(LFS3_BMAP)
static int lfs3_bmap_setbptr(lfs3_t *lfs3, lfs3_btree_t *bmap, static int lfs3_bmap_setbptr(lfs3_t *lfs3, lfs3_btree_t *bmap,
lfs3_tag_t tag, const lfs3_bptr_t *bptr, lfs3_tag_t tag, const lfs3_bptr_t *bptr,
lfs3_tag_t tag_) { lfs3_tag_t tag_) {
@ -11385,7 +11387,7 @@ static lfs3_sblock_t lfs3_alloc(lfs3_t *lfs3, uint32_t flags) {
} }
#endif #endif
#ifdef LFS3_BMAP #if !defined(LFS3_RDONLY) && defined(LFS3_BMAP)
// the mdir argument does two things here: // the mdir argument does two things here:
// 1. offloads wear from the mroot a bit // 1. offloads wear from the mroot a bit
// 2. broadcasts erased-state updates correctly // 2. broadcasts erased-state updates correctly
@ -16393,7 +16395,7 @@ int lfs3_unmount(lfs3_t *lfs3) {
/// Format /// /// Format ///
#ifdef LFS3_BMAP #if !defined(LFS3_RDONLY) && defined(LFS3_BMAP)
static int lfs3_formatbmap(lfs3_t *lfs3) { static int lfs3_formatbmap(lfs3_t *lfs3) {
#ifdef LFS3_REVDBG #ifdef LFS3_REVDBG
lfs3->flags |= LFS3_i_INBMAP; lfs3->flags |= LFS3_i_INBMAP;

2
lfs3.h
View File

@ -963,7 +963,7 @@ typedef struct lfs3 {
// TODO can we actually get rid of grm_d when LFS3_RDONLY? // TODO can we actually get rid of grm_d when LFS3_RDONLY?
uint8_t grm_d[LFS3_GRM_DSIZE]; uint8_t grm_d[LFS3_GRM_DSIZE];
#if !defined(LFS3_RDONLY) && !defined(LFS3_2BONLY) && defined(LFS3_BMAP) #if !defined(LFS3_2BONLY) && defined(LFS3_BMAP)
lfs3_gbmap_t gbmap; lfs3_gbmap_t gbmap;
uint8_t gbmap_p[LFS3_GBMAP_DSIZE]; uint8_t gbmap_p[LFS3_GBMAP_DSIZE];
uint8_t gbmap_d[LFS3_GBMAP_DSIZE]; uint8_t gbmap_d[LFS3_GBMAP_DSIZE];