Github/littlefs
1
Fork 0
Code Actions Activity

Adopted ternary LFS3_IFYES_* macros

Browse Source 
This is hopefully a better alternative to LFS3_IFDEF_YES_* macros.

If we need special behavior for LFS3_IFDEF_YES_*, we almost always need
special behavior for LFS3_IFDEF_NO_* and LFS3_IFDEF_MAYBE_* as well.

So merging all three states into a single macro saves typing and
hopefully encourages correct handling of all cases.

No code changes.
This commit is contained in:
Christopher Haster
2025-12-29 15:16:31 -06:00
parent 7e00039fb4
commit 061d9531ab
8 changed files with 240 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lfs3_util.h
+55 -10
View File
@@ -215,10 +215,12 @@
#define LFS3_IFDEF_REVDBG(a, b) (b)
#endif
#ifdef LFS3_YES_REVDBG
#define LFS3_IFDEF_YES_REVDBG(a, b) (a)
#if defined(LFS3_REVDBG) && defined(LFS3_YES_REVDBG)
#define LFS3_IFYES_REVDBG(a, b, c) (a)
#elif defined(LFS3_REVDBG)
#define LFS3_IFYES_REVDBG(a, b, c) (b)
#else
#define LFS3_IFDEF_YES_REVDBG(a, b) (b)
#define LFS3_IFYES_REVDBG(a, b, c) (c)
#endif
#ifdef LFS3_REVNOISE
@@ -227,10 +229,12 @@
#define LFS3_IFDEF_REVNOISE(a, b) (b)
#endif
#ifdef LFS3_YES_REVNOISE
#define LFS3_IFDEF_YES_REVNOISE(a, b) (a)
#if defined(LFS3_REVNOISE) && defined(LFS3_YES_REVNOISE)
#define LFS3_IFYES_REVNOISE(a, b, c) (a)
#elif defined(LFS3_REVNOISE)
#define LFS3_IFYES_REVNOISE(a, b, c) (b)
#else
#define LFS3_IFDEF_YES_REVNOISE(a, b) (b)
#define LFS3_IFYES_REVNOISE(a, b, c) (c)
#endif
#ifdef LFS3_CKPROGS
@@ -239,24 +243,56 @@
#define LFS3_IFDEF_CKPROGS(a, b) (b)
#endif
#if defined(LFS3_CKPROGS) && defined(LFS3_YES_CKPROGS)
#define LFS3_IFYES_CKPROGS(a, b, c) (a)
#elif defined(LFS3_CKPROGS)
#define LFS3_IFYES_CKPROGS(a, b, c) (b)
#else
#define LFS3_IFYES_CKPROGS(a, b, c) (c)
#endif
#ifdef LFS3_CKFETCHES
#define LFS3_IFDEF_CKFETCHES(a, b) (a)
#else
#define LFS3_IFDEF_CKFETCHES(a, b) (b)
#endif
#if defined(LFS3_CKFETCHES) && defined(LFS3_YES_CKFETCHES)
#define LFS3_IFYES_CKFETCHES(a, b, c) (a)
#elif defined(LFS3_CKFETCHES)
#define LFS3_IFYES_CKFETCHES(a, b, c) (b)
#else
#define LFS3_IFYES_CKFETCHES(a, b, c) (c)
#endif
#ifdef LFS3_CKMETAPARITY
#define LFS3_IFDEF_CKMETAPARITY(a, b) (a)
#else
#define LFS3_IFDEF_CKMETAPARITY(a, b) (b)
#endif
#if defined(LFS3_CKMETAPARITY) && defined(LFS3_YES_CKMETAPARITY)
#define LFS3_IFYES_CKMETAPARITY(a, b, c) (a)
#elif defined(LFS3_CKMETAPARITY)
#define LFS3_IFYES_CKMETAPARITY(a, b, c) (b)
#else
#define LFS3_IFYES_CKMETAPARITY(a, b, c) (c)
#endif
#ifdef LFS3_CKDATACKSUMS
#define LFS3_IFDEF_CKDATACKSUMS(a, b) (a)
#else
#define LFS3_IFDEF_CKDATACKSUMS(a, b) (b)
#endif
#if defined(LFS3_CKDATACKSUMS) && defined(LFS3_YES_CKDATACKSUMS)
#define LFS3_IFYES_CKDATACKSUMS(a, b, c) (a)
#elif defined(LFS3_CKDATACKSUMS)
#define LFS3_IFYES_CKDATACKSUMS(a, b, c) (b)
#else
#define LFS3_IFYES_CKDATACKSUMS(a, b, c) (c)
#endif
#ifdef LFS3_GC
#define LFS3_IFDEF_GC(a, b) (a)
#else
@@ -269,11 +305,12 @@
#define LFS3_IFDEF_GBMAP(a, b) (b)
#endif
// TODO other LFS3_IFDEF_YES_* macros?
#ifdef LFS3_YES_GBMAP
#define LFS3_IFDEF_YES_GBMAP(a, b) (a)
#if defined(LFS3_GBMAP) && defined(LFS3_YES_GBMAP)
#define LFS3_IFYES_GBMAP(a, b, c) (a)
#elif defined(LFS3_GBMAP)
#define LFS3_IFYES_GBMAP(a, b, c) (b)
#else
#define LFS3_IFDEF_YES_GBMAP(a, b) (b)
#define LFS3_IFYES_GBMAP(a, b, c) (c)
#endif
#ifndef LFS3_NO_PREERASE
@@ -282,6 +319,14 @@
#define LFS3_IFDEF_PREERASE(a, b) (b)
#endif
#if !defined(LFS3_NO_PREERASE) && defined(LFS3_YES_PREERASE)
#define LFS3_IFYES_PREERASE(a, b, c) (a)
#elif !defined(LFS3_NO_PREERASE)
#define LFS3_IFYES_PREERASE(a, b, c) (b)
#else
#define LFS3_IFYES_PREERASE(a, b, c) (c)
#endif
#ifdef LFS3_BLEAFCACHE
#define LFS3_IFDEF_BLEAFCACHE(a, b) (a)
#else