WIP making good progress, found a solution for the cycle issue

Found solution for cycle issue for tail+branch solution, though it does
require creating an extra metadata-pair on relocate.

Need to get passing the advanced relocation tests, this is currently
failing. Also need to figure out why I added the assert on tail end, it
may be related.

.gitignore

@@ -8,5 +8,3 @@ blocks/
 lfs
 test.c
 tests/*.toml.*
-scripts/__pycache__
-.gdb_history

.travis.yml

@@ -50,7 +50,7 @@ _: &test-no-intrinsics
 _: &test-no-inline
   - make test TFLAGS+="-nrk -DLFS_INLINE_MAX=0"
 _: &test-byte-writes
-  - make test TFLAGS+="-nrk -DLFS_READ_SIZE=1 -DLFS_BUFFER_SIZE=1"
+  - make test TFLAGS+="-nrk -DLFS_READ_SIZE=1 -DLFS_CACHE_SIZE=1"
 _: &test-block-cycles
   - make test TFLAGS+="-nrk -DLFS_BLOCK_CYCLES=1"
 _: &test-odd-block-count
@@ -208,37 +208,6 @@ jobs:
     script:
       - make test TFLAGS+="-k --valgrind"
 
-  # test minimal compilation using static configs
-  - stage: test
-    env:
-      - NAME=littlefs-minimal
-      - CC="arm-linux-gnueabi-gcc --static -mthumb"
-      - CFLAGS="-Werror
-            -DLFS_BD_READ
-            -DLFS_BD_PROG
-            -DLFS_BD_ERASE
-            -DLFS_BD_SYNC
-            -DLFS_READ_SIZE=16
-            -DLFS_PROG_SIZE=16
-            -DLFS_BLOCK_SIZE=512
-            -DLFS_BLOCK_COUNT=1024
-            -DLFS_BLOCK_CYCLES=1024
-            -DLFS_BUFFER_SIZE=64
-            -DLFS_LOOKAHEAD_SIZE=16
-            -DLFS_NAME_LIMIT=0
-            -DLFS_FILE_LIMIT=0
-            -DLFS_ATTR_LIMIT=0
-            -DLFS_NO_ASSERT -DLFS_NO_DEBUG -DLFS_NO_WARN -DLFS_NO_ERROR"
-    if: branch !~ -prefix$
-    install:
-      - *install-common
-      - sudo apt-get install
-            gcc-arm-linux-gnueabi
-            libc6-dev-armel-cross
-      - arm-linux-gnueabi-gcc --version
-    # report-size will compile littlefs and report the size
-    script: [*report-size]
-
   # self-host with littlefs-fuse for fuzz test
   - stage: test
     env:

Makefile

@@ -26,13 +26,15 @@ endif
 override CFLAGS += -I.
 override CFLAGS += -std=c99 -Wall -pedantic
 override CFLAGS += -Wextra -Wshadow -Wjump-misses-init -Wundef
+# Remove missing-field-initializers because of GCC bug
+override CFLAGS += -Wno-missing-field-initializers
 
 ifdef VERBOSE
 override TFLAGS += -v
 endif
 
 
-all build: $(TARGET)
+all: $(TARGET)
 
 asm: $(ASM)
 

README.md

@@ -39,7 +39,7 @@ lfs_t lfs;
 lfs_file_t file;
 
 // configuration of the filesystem is provided by this struct
-const struct lfs_cfg cfg = {
+const struct lfs_config cfg = {
     // block device operations
     .read  = user_provided_block_device_read,
     .prog  = user_provided_block_device_prog,
@@ -115,9 +115,6 @@ the filesystem until sync or close is called on the file.
 
 ## Other notes
 
-Littlefs is written in C, and specifically should compile with any compiler
-that conforms to the `C99` standard.
-
 All littlefs calls have the potential to return a negative error code. The
 errors can be either one of those found in the `enum lfs_error` in
 [lfs.h](lfs.h), or an error returned by the user's block device operations.

SPEC.md

@@ -289,8 +289,8 @@ Layout of the name tag:
 ```
         tag                          data
 [--      32      --][---        variable length        ---]
-[1| 3| 8 | 10 | 10 ][---          (size * 8)           ---]
- ^  ^  ^    ^    ^- size                   ^- file name
+[1| 3| 8 | 10 | 10 ][---            (size)             ---]
+ ^  ^  ^    ^    ^- size               ^- file name
  |  |  |    '------ id
  |  |  '----------- file type
  |  '-------------- type1 (0x0)
@@ -470,8 +470,8 @@ Layout of the inline-struct tag:
 ```
         tag                          data
 [--      32      --][---        variable length        ---]
-[1|- 11 -| 10 | 10 ][---           (size * 8)          ---]
- ^    ^     ^    ^- size                    ^- inline data
+[1|- 11 -| 10 | 10 ][---            (size)             ---]
+ ^    ^     ^    ^- size               ^- inline data
  |    |     '------ id
  |    '------------ type (0x201)
  '----------------- valid bit
@@ -556,8 +556,8 @@ Layout of the user-attr tag:
 ```
         tag                          data
 [--      32      --][---        variable length        ---]
-[1| 3| 8 | 10 | 10 ][---           (size * 8)          ---]
- ^  ^  ^    ^    ^- size                    ^- attr data
+[1| 3| 8 | 10 | 10 ][---            (size)             ---]
+ ^  ^  ^    ^    ^- size               ^- attr data
  |  |  |    '------ id
  |  |  '----------- attr type
  |  '-------------- type1 (0x3)
@@ -764,9 +764,9 @@ Layout of the CRC tag:
 ```
         tag                                    data
 [--      32      --][--      32      --|---        variable length        ---]
-[1| 3| 8 | 10 | 10 ][--      32      --|---        (size * 8 - 32)        ---]
- ^  ^  ^    ^    ^            ^- crc                             ^- padding
- |  |  |    |    '- size
+[1| 3| 8 | 10 | 10 ][--      32      --|---            (size)             ---]
+ ^  ^  ^    ^    ^            ^- crc                      ^- padding
+ |  |  |    |    '- size (12)
  |  |  |    '------ id (0x3ff)
  |  |  '----------- valid state
  |  '-------------- type1 (0x5)

bd/lfs_filebd.c

@@ -10,51 +10,74 @@
 #include <unistd.h>
 #include <errno.h>
 
-int lfs_filebd_createcfg(lfs_filebd_t *bd, const char *path,
-        const struct lfs_filebd_cfg *cfg) {
-    LFS_FILEBD_TRACE("lfs_filebd_createcfg(%p, \"%s\", %p {"
+int lfs_filebd_createcfg(const struct lfs_config *cfg, const char *path,
+        const struct lfs_filebd_config *bdcfg) {
+    LFS_TRACE("lfs_filebd_createcfg(%p {.context=%p, "
+                ".read=%p, .prog=%p, .erase=%p, .sync=%p, "
                 ".read_size=%"PRIu32", .prog_size=%"PRIu32", "
-                ".erase_size=%"PRIu32", .erase_count=%"PRIu32", "
-                ".erase_value=%"PRId32"})",
-            (void*)bd, path, (void*)cfg,
-            cfg->read_size, cfg->prog_size, cfg->erase_size, cfg->erase_count,
-            cfg->erase_value);
-    bd->cfg = cfg;
+                ".block_size=%"PRIu32", .block_count=%"PRIu32"}, "
+                "\"%s\", "
+                "%p {.erase_value=%"PRId32"})",
+            (void*)cfg, cfg->context,
+            (void*)(uintptr_t)cfg->read, (void*)(uintptr_t)cfg->prog,
+            (void*)(uintptr_t)cfg->erase, (void*)(uintptr_t)cfg->sync,
+            cfg->read_size, cfg->prog_size, cfg->block_size, cfg->block_count,
+            path, (void*)bdcfg, bdcfg->erase_value);
+    lfs_filebd_t *bd = cfg->context;
+    bd->cfg = bdcfg;
 
     // open file
     bd->fd = open(path, O_RDWR | O_CREAT, 0666);
     if (bd->fd < 0) {
         int err = -errno;
-        LFS_FILEBD_TRACE("lfs_filebd_createcfg -> %d", err);
+        LFS_TRACE("lfs_filebd_createcfg -> %d", err);
         return err;
     }
 
-    LFS_FILEBD_TRACE("lfs_filebd_createcfg -> %d", 0);
+    LFS_TRACE("lfs_filebd_createcfg -> %d", 0);
     return 0;
 }
 
-int lfs_filebd_destroy(lfs_filebd_t *bd) {
-    LFS_FILEBD_TRACE("lfs_filebd_destroy(%p)", (void*)bd);
+int lfs_filebd_create(const struct lfs_config *cfg, const char *path) {
+    LFS_TRACE("lfs_filebd_create(%p {.context=%p, "
+                ".read=%p, .prog=%p, .erase=%p, .sync=%p, "
+                ".read_size=%"PRIu32", .prog_size=%"PRIu32", "
+                ".block_size=%"PRIu32", .block_count=%"PRIu32"}, "
+                "\"%s\")",
+            (void*)cfg, cfg->context,
+            (void*)(uintptr_t)cfg->read, (void*)(uintptr_t)cfg->prog,
+            (void*)(uintptr_t)cfg->erase, (void*)(uintptr_t)cfg->sync,
+            cfg->read_size, cfg->prog_size, cfg->block_size, cfg->block_count,
+            path);
+    static const struct lfs_filebd_config defaults = {.erase_value=-1};
+    int err = lfs_filebd_createcfg(cfg, path, &defaults);
+    LFS_TRACE("lfs_filebd_create -> %d", err);
+    return err;
+}
+
+int lfs_filebd_destroy(const struct lfs_config *cfg) {
+    LFS_TRACE("lfs_filebd_destroy(%p)", (void*)cfg);
+    lfs_filebd_t *bd = cfg->context;
     int err = close(bd->fd);
     if (err < 0) {
         err = -errno;
-        LFS_FILEBD_TRACE("lfs_filebd_destroy -> %d", err);
+        LFS_TRACE("lfs_filebd_destroy -> %d", err);
         return err;
     }
-    LFS_FILEBD_TRACE("lfs_filebd_destroy -> %d", 0);
+    LFS_TRACE("lfs_filebd_destroy -> %d", 0);
     return 0;
 }
 
-int lfs_filebd_read(lfs_filebd_t *bd, lfs_block_t block,
+int lfs_filebd_read(const struct lfs_config *cfg, lfs_block_t block,
         lfs_off_t off, void *buffer, lfs_size_t size) {
-    LFS_FILEBD_TRACE("lfs_filebd_read(%p, "
-                "0x%"PRIx32", %"PRIu32", %p, %"PRIu32")",
-            (void*)bd, block, off, buffer, size);
+    LFS_TRACE("lfs_filebd_read(%p, 0x%"PRIx32", %"PRIu32", %p, %"PRIu32")",
+            (void*)cfg, block, off, buffer, size);
+    lfs_filebd_t *bd = cfg->context;
 
     // check if read is valid
-    LFS_ASSERT(off  % bd->cfg->read_size == 0);
-    LFS_ASSERT(size % bd->cfg->read_size == 0);
-    LFS_ASSERT(block < bd->cfg->erase_count);
+    LFS_ASSERT(off  % cfg->read_size == 0);
+    LFS_ASSERT(size % cfg->read_size == 0);
+    LFS_ASSERT(block < cfg->block_count);
 
     // zero for reproducability (in case file is truncated)
     if (bd->cfg->erase_value != -1) {
@@ -63,42 +86,42 @@ int lfs_filebd_read(lfs_filebd_t *bd, lfs_block_t block,
 
     // read
     off_t res1 = lseek(bd->fd,
-            (off_t)block*bd->cfg->erase_size + (off_t)off, SEEK_SET);
+            (off_t)block*cfg->block_size + (off_t)off, SEEK_SET);
     if (res1 < 0) {
         int err = -errno;
-        LFS_FILEBD_TRACE("lfs_filebd_read -> %d", err);
+        LFS_TRACE("lfs_filebd_read -> %d", err);
         return err;
     }
 
     ssize_t res2 = read(bd->fd, buffer, size);
     if (res2 < 0) {
         int err = -errno;
-        LFS_FILEBD_TRACE("lfs_filebd_read -> %d", err);
+        LFS_TRACE("lfs_filebd_read -> %d", err);
         return err;
     }
 
-    LFS_FILEBD_TRACE("lfs_filebd_read -> %d", 0);
+    LFS_TRACE("lfs_filebd_read -> %d", 0);
     return 0;
 }
 
-int lfs_filebd_prog(lfs_filebd_t *bd, lfs_block_t block,
+int lfs_filebd_prog(const struct lfs_config *cfg, lfs_block_t block,
         lfs_off_t off, const void *buffer, lfs_size_t size) {
-    LFS_FILEBD_TRACE("lfs_filebd_prog(%p, "
-                "0x%"PRIx32", %"PRIu32", %p, %"PRIu32")",
-            (void*)bd, block, off, buffer, size);
+    LFS_TRACE("lfs_filebd_prog(%p, 0x%"PRIx32", %"PRIu32", %p, %"PRIu32")",
+            (void*)cfg, block, off, buffer, size);
+    lfs_filebd_t *bd = cfg->context;
 
     // check if write is valid
-    LFS_ASSERT(off  % bd->cfg->prog_size == 0);
-    LFS_ASSERT(size % bd->cfg->prog_size == 0);
-    LFS_ASSERT(block < bd->cfg->erase_count);
+    LFS_ASSERT(off  % cfg->prog_size == 0);
+    LFS_ASSERT(size % cfg->prog_size == 0);
+    LFS_ASSERT(block < cfg->block_count);
 
     // check that data was erased? only needed for testing
     if (bd->cfg->erase_value != -1) {
         off_t res1 = lseek(bd->fd,
-                (off_t)block*bd->cfg->erase_size + (off_t)off, SEEK_SET);
+                (off_t)block*cfg->block_size + (off_t)off, SEEK_SET);
         if (res1 < 0) {
             int err = -errno;
-            LFS_FILEBD_TRACE("lfs_filebd_prog -> %d", err);
+            LFS_TRACE("lfs_filebd_prog -> %d", err);
             return err;
         }
 
@@ -107,7 +130,7 @@ int lfs_filebd_prog(lfs_filebd_t *bd, lfs_block_t block,
             ssize_t res2 = read(bd->fd, &c, 1);
             if (res2 < 0) {
                 int err = -errno;
-                LFS_FILEBD_TRACE("lfs_filebd_prog -> %d", err);
+                LFS_TRACE("lfs_filebd_prog -> %d", err);
                 return err;
             }
 
@@ -117,64 +140,65 @@ int lfs_filebd_prog(lfs_filebd_t *bd, lfs_block_t block,
 
     // program data
     off_t res1 = lseek(bd->fd,
-            (off_t)block*bd->cfg->erase_size + (off_t)off, SEEK_SET);
+            (off_t)block*cfg->block_size + (off_t)off, SEEK_SET);
     if (res1 < 0) {
         int err = -errno;
-        LFS_FILEBD_TRACE("lfs_filebd_prog -> %d", err);
+        LFS_TRACE("lfs_filebd_prog -> %d", err);
         return err;
     }
 
     ssize_t res2 = write(bd->fd, buffer, size);
     if (res2 < 0) {
         int err = -errno;
-        LFS_FILEBD_TRACE("lfs_filebd_prog -> %d", err);
+        LFS_TRACE("lfs_filebd_prog -> %d", err);
         return err;
     }
 
-    LFS_FILEBD_TRACE("lfs_filebd_prog -> %d", 0);
+    LFS_TRACE("lfs_filebd_prog -> %d", 0);
     return 0;
 }
 
-int lfs_filebd_erase(lfs_filebd_t *bd, lfs_block_t block) {
-    LFS_FILEBD_TRACE("lfs_filebd_erase(%p, 0x%"PRIx32")", (void*)bd, block);
+int lfs_filebd_erase(const struct lfs_config *cfg, lfs_block_t block) {
+    LFS_TRACE("lfs_filebd_erase(%p, 0x%"PRIx32")", (void*)cfg, block);
+    lfs_filebd_t *bd = cfg->context;
 
     // check if erase is valid
-    LFS_ASSERT(block < bd->cfg->erase_count);
+    LFS_ASSERT(block < cfg->block_count);
 
     // erase, only needed for testing
     if (bd->cfg->erase_value != -1) {
-        off_t res1 = lseek(bd->fd, (off_t)block*bd->cfg->erase_size, SEEK_SET);
+        off_t res1 = lseek(bd->fd, (off_t)block*cfg->block_size, SEEK_SET);
         if (res1 < 0) {
             int err = -errno;
-            LFS_FILEBD_TRACE("lfs_filebd_erase -> %d", err);
+            LFS_TRACE("lfs_filebd_erase -> %d", err);
             return err;
         }
 
-        for (lfs_off_t i = 0; i < bd->cfg->erase_size; i++) {
+        for (lfs_off_t i = 0; i < cfg->block_size; i++) {
             ssize_t res2 = write(bd->fd, &(uint8_t){bd->cfg->erase_value}, 1);
             if (res2 < 0) {
                 int err = -errno;
-                LFS_FILEBD_TRACE("lfs_filebd_erase -> %d", err);
+                LFS_TRACE("lfs_filebd_erase -> %d", err);
                 return err;
             }
         }
     }
 
-    LFS_FILEBD_TRACE("lfs_filebd_erase -> %d", 0);
+    LFS_TRACE("lfs_filebd_erase -> %d", 0);
     return 0;
 }
 
-int lfs_filebd_sync(lfs_filebd_t *bd) {
-    LFS_FILEBD_TRACE("lfs_filebd_sync(%p)", (void*)bd);
-
+int lfs_filebd_sync(const struct lfs_config *cfg) {
+    LFS_TRACE("lfs_filebd_sync(%p)", (void*)cfg);
     // file sync
+    lfs_filebd_t *bd = cfg->context;
     int err = fsync(bd->fd);
     if (err) {
         err = -errno;
-        LFS_FILEBD_TRACE("lfs_filebd_sync -> %d", 0);
+        LFS_TRACE("lfs_filebd_sync -> %d", 0);
         return err;
     }
 
-    LFS_FILEBD_TRACE("lfs_filebd_sync -> %d", 0);
+    LFS_TRACE("lfs_filebd_sync -> %d", 0);
     return 0;
 }

bd/lfs_filebd.h

@@ -8,35 +8,15 @@
 #define LFS_FILEBD_H
 
 #include "lfs.h"
+#include "lfs_util.h"
 
 #ifdef __cplusplus
-extern "C" {
-#endif
-
-
-// Block device specific tracing
-#ifdef LFS_FILEBD_YES_TRACE
-#define LFS_FILEBD_TRACE(...) LFS_TRACE(__VA_ARGS__)
-#else
-#define LFS_FILEBD_TRACE(...)
+extern "C"
+{
 #endif
 
 // filebd config (optional)
-struct lfs_filebd_cfg {
-    // Minimum size of block read. All read operations must be a
-    // multiple of this value.
-    lfs_size_t read_size;
-
-    // Minimum size of block program. All program operations must be a
-    // multiple of this value.
-    lfs_size_t prog_size;
-
-    // Size of an erasable block.
-    lfs_size_t erase_size;
-
-    // Number of erasable blocks on the device.
-    lfs_size_t erase_count;
-
+struct lfs_filebd_config {
     // 8-bit erase value to use for simulating erases. -1 does not simulate
     // erases, which can speed up testing by avoiding all the extra block-device
     // operations to store the erase value.
@@ -46,39 +26,40 @@ struct lfs_filebd_cfg {
 // filebd state
 typedef struct lfs_filebd {
     int fd;
-    const struct lfs_filebd_cfg *cfg;
+    const struct lfs_filebd_config *cfg;
 } lfs_filebd_t;
 
 
-// Create a file block device using the geometry in lfs_filebd_cfg
-int lfs_filebd_createcfg(lfs_filebd_t *bd, const char *path,
-        const struct lfs_filebd_cfg *cfg);
+// Create a file block device using the geometry in lfs_config
+int lfs_filebd_create(const struct lfs_config *cfg, const char *path);
+int lfs_filebd_createcfg(const struct lfs_config *cfg, const char *path,
+        const struct lfs_filebd_config *bdcfg);
 
 // Clean up memory associated with block device
-int lfs_filebd_destroy(lfs_filebd_t *bd);
+int lfs_filebd_destroy(const struct lfs_config *cfg);
 
 // Read a block
-int lfs_filebd_read(lfs_filebd_t *bd, lfs_block_t block,
+int lfs_filebd_read(const struct lfs_config *cfg, lfs_block_t block,
         lfs_off_t off, void *buffer, lfs_size_t size);
 
 // Program a block
 //
 // The block must have previously been erased.
-int lfs_filebd_prog(lfs_filebd_t *bd, lfs_block_t block,
+int lfs_filebd_prog(const struct lfs_config *cfg, lfs_block_t block,
         lfs_off_t off, const void *buffer, lfs_size_t size);
 
 // Erase a block
 //
 // A block must be erased before being programmed. The
 // state of an erased block is undefined.
-int lfs_filebd_erase(lfs_filebd_t *bd, lfs_block_t block);
+int lfs_filebd_erase(const struct lfs_config *cfg, lfs_block_t block);
 
 // Sync the block device
-int lfs_filebd_sync(lfs_filebd_t *bd);
+int lfs_filebd_sync(const struct lfs_config *cfg);
 
 
 #ifdef __cplusplus
-}
+} /* extern "C" */
 #endif
 
 #endif

bd/lfs_rambd.c

@@ -6,24 +6,28 @@
  */
 #include "bd/lfs_rambd.h"
 
-int lfs_rambd_createcfg(lfs_rambd_t *bd,
-        const struct lfs_rambd_cfg *cfg) {
-    LFS_RAMBD_TRACE("lfs_filebd_createcfg(%p, %p {"
+int lfs_rambd_createcfg(const struct lfs_config *cfg,
+        const struct lfs_rambd_config *bdcfg) {
+    LFS_TRACE("lfs_rambd_createcfg(%p {.context=%p, "
+                ".read=%p, .prog=%p, .erase=%p, .sync=%p, "
                 ".read_size=%"PRIu32", .prog_size=%"PRIu32", "
-                ".erase_size=%"PRIu32", .erase_count=%"PRIu32", "
-                ".erase_value=%"PRId32", .buffer=%p})",
-            (void*)bd, (void*)cfg,
-            cfg->read_size, cfg->prog_size, cfg->erase_size, cfg->erase_count,
-            cfg->erase_value, cfg->buffer);
-    bd->cfg = cfg;
+                ".block_size=%"PRIu32", .block_count=%"PRIu32"}, "
+                "%p {.erase_value=%"PRId32", .buffer=%p})",
+            (void*)cfg, cfg->context,
+            (void*)(uintptr_t)cfg->read, (void*)(uintptr_t)cfg->prog,
+            (void*)(uintptr_t)cfg->erase, (void*)(uintptr_t)cfg->sync,
+            cfg->read_size, cfg->prog_size, cfg->block_size, cfg->block_count,
+            (void*)bdcfg, bdcfg->erase_value, bdcfg->buffer);
+    lfs_rambd_t *bd = cfg->context;
+    bd->cfg = bdcfg;
 
     // allocate buffer?
     if (bd->cfg->buffer) {
         bd->buffer = bd->cfg->buffer;
     } else {
-        bd->buffer = lfs_malloc(bd->cfg->erase_size * bd->cfg->erase_count);
+        bd->buffer = lfs_malloc(cfg->block_size * cfg->block_count);
         if (!bd->buffer) {
-            LFS_RAMBD_TRACE("lfs_rambd_createcfg -> %d", LFS_ERR_NOMEM);
+            LFS_TRACE("lfs_rambd_createcfg -> %d", LFS_ERR_NOMEM);
             return LFS_ERR_NOMEM;
         }
     }
@@ -31,87 +35,104 @@ int lfs_rambd_createcfg(lfs_rambd_t *bd,
     // zero for reproducability?
     if (bd->cfg->erase_value != -1) {
         memset(bd->buffer, bd->cfg->erase_value,
-                bd->cfg->erase_size * bd->cfg->erase_count);
+                cfg->block_size * cfg->block_count);
     }
 
-    LFS_RAMBD_TRACE("lfs_rambd_createcfg -> %d", 0);
+    LFS_TRACE("lfs_rambd_createcfg -> %d", 0);
     return 0;
 }
 
-int lfs_rambd_destroy(lfs_rambd_t *bd) {
-    LFS_RAMBD_TRACE("lfs_rambd_destroy(%p)", (void*)bd);
+int lfs_rambd_create(const struct lfs_config *cfg) {
+    LFS_TRACE("lfs_rambd_create(%p {.context=%p, "
+                ".read=%p, .prog=%p, .erase=%p, .sync=%p, "
+                ".read_size=%"PRIu32", .prog_size=%"PRIu32", "
+                ".block_size=%"PRIu32", .block_count=%"PRIu32"})",
+            (void*)cfg, cfg->context,
+            (void*)(uintptr_t)cfg->read, (void*)(uintptr_t)cfg->prog,
+            (void*)(uintptr_t)cfg->erase, (void*)(uintptr_t)cfg->sync,
+            cfg->read_size, cfg->prog_size, cfg->block_size, cfg->block_count);
+    static const struct lfs_rambd_config defaults = {.erase_value=-1};
+    int err = lfs_rambd_createcfg(cfg, &defaults);
+    LFS_TRACE("lfs_rambd_create -> %d", err);
+    return err;
+}
+
+int lfs_rambd_destroy(const struct lfs_config *cfg) {
+    LFS_TRACE("lfs_rambd_destroy(%p)", (void*)cfg);
     // clean up memory
+    lfs_rambd_t *bd = cfg->context;
     if (!bd->cfg->buffer) {
         lfs_free(bd->buffer);
     }
-    LFS_RAMBD_TRACE("lfs_rambd_destroy -> %d", 0);
+    LFS_TRACE("lfs_rambd_destroy -> %d", 0);
     return 0;
 }
 
-int lfs_rambd_read(lfs_rambd_t *bd, lfs_block_t block,
+int lfs_rambd_read(const struct lfs_config *cfg, lfs_block_t block,
         lfs_off_t off, void *buffer, lfs_size_t size) {
-    LFS_RAMBD_TRACE("lfs_rambd_read(%p, "
-                "0x%"PRIx32", %"PRIu32", %p, %"PRIu32")",
-            (void*)bd, block, off, buffer, size);
+    LFS_TRACE("lfs_rambd_read(%p, 0x%"PRIx32", %"PRIu32", %p, %"PRIu32")",
+            (void*)cfg, block, off, buffer, size);
+    lfs_rambd_t *bd = cfg->context;
 
     // check if read is valid
-    LFS_ASSERT(off  % bd->cfg->read_size == 0);
-    LFS_ASSERT(size % bd->cfg->read_size == 0);
-    LFS_ASSERT(block < bd->cfg->erase_count);
+    LFS_ASSERT(off  % cfg->read_size == 0);
+    LFS_ASSERT(size % cfg->read_size == 0);
+    LFS_ASSERT(block < cfg->block_count);
 
     // read data
-    memcpy(buffer, &bd->buffer[block*bd->cfg->erase_size + off], size);
+    memcpy(buffer, &bd->buffer[block*cfg->block_size + off], size);
 
-    LFS_RAMBD_TRACE("lfs_rambd_read -> %d", 0);
+    LFS_TRACE("lfs_rambd_read -> %d", 0);
     return 0;
 }
 
-int lfs_rambd_prog(lfs_rambd_t *bd, lfs_block_t block,
+int lfs_rambd_prog(const struct lfs_config *cfg, lfs_block_t block,
         lfs_off_t off, const void *buffer, lfs_size_t size) {
-    LFS_RAMBD_TRACE("lfs_rambd_prog(%p, "
-                "0x%"PRIx32", %"PRIu32", %p, %"PRIu32")",
-            (void*)bd, block, off, buffer, size);
+    LFS_TRACE("lfs_rambd_prog(%p, 0x%"PRIx32", %"PRIu32", %p, %"PRIu32")",
+            (void*)cfg, block, off, buffer, size);
+    lfs_rambd_t *bd = cfg->context;
 
     // check if write is valid
-    LFS_ASSERT(off  % bd->cfg->prog_size == 0);
-    LFS_ASSERT(size % bd->cfg->prog_size == 0);
-    LFS_ASSERT(block < bd->cfg->erase_count);
+    LFS_ASSERT(off  % cfg->prog_size == 0);
+    LFS_ASSERT(size % cfg->prog_size == 0);
+    LFS_ASSERT(block < cfg->block_count);
 
     // check that data was erased? only needed for testing
     if (bd->cfg->erase_value != -1) {
         for (lfs_off_t i = 0; i < size; i++) {
-            LFS_ASSERT(bd->buffer[block*bd->cfg->erase_size + off + i] ==
+            LFS_ASSERT(bd->buffer[block*cfg->block_size + off + i] ==
                     bd->cfg->erase_value);
         }
     }
 
     // program data
-    memcpy(&bd->buffer[block*bd->cfg->erase_size + off], buffer, size);
+    memcpy(&bd->buffer[block*cfg->block_size + off], buffer, size);
 
-    LFS_RAMBD_TRACE("lfs_rambd_prog -> %d", 0);
+    LFS_TRACE("lfs_rambd_prog -> %d", 0);
     return 0;
 }
 
-int lfs_rambd_erase(lfs_rambd_t *bd, lfs_block_t block) {
-    LFS_RAMBD_TRACE("lfs_rambd_erase(%p, 0x%"PRIx32")", (void*)bd, block);
+int lfs_rambd_erase(const struct lfs_config *cfg, lfs_block_t block) {
+    LFS_TRACE("lfs_rambd_erase(%p, 0x%"PRIx32")", (void*)cfg, block);
+    lfs_rambd_t *bd = cfg->context;
 
     // check if erase is valid
-    LFS_ASSERT(block < bd->cfg->erase_count);
+    LFS_ASSERT(block < cfg->block_count);
 
     // erase, only needed for testing
     if (bd->cfg->erase_value != -1) {
-        memset(&bd->buffer[block*bd->cfg->erase_size],
-                bd->cfg->erase_value, bd->cfg->erase_size);
+        memset(&bd->buffer[block*cfg->block_size],
+                bd->cfg->erase_value, cfg->block_size);
     }
 
-    LFS_RAMBD_TRACE("lfs_rambd_erase -> %d", 0);
+    LFS_TRACE("lfs_rambd_erase -> %d", 0);
     return 0;
 }
 
-int lfs_rambd_sync(lfs_rambd_t *bd) {
-    LFS_RAMBD_TRACE("lfs_rambd_sync(%p)", (void*)bd);
+int lfs_rambd_sync(const struct lfs_config *cfg) {
+    LFS_TRACE("lfs_rambd_sync(%p)", (void*)cfg);
     // sync does nothing because we aren't backed by anything real
-    (void)bd;
-    LFS_RAMBD_TRACE("lfs_rambd_sync -> %d", 0);
+    (void)cfg;
+    LFS_TRACE("lfs_rambd_sync -> %d", 0);
     return 0;
 }

bd/lfs_rambd.h

@@ -8,38 +8,17 @@
 #define LFS_RAMBD_H
 
 #include "lfs.h"
+#include "lfs_util.h"
 
 #ifdef __cplusplus
-extern "C" {
-#endif
-
-
-// Block device specific tracing
-#ifdef LFS_RAMBD_YES_TRACE
-#define LFS_RAMBD_TRACE(...) LFS_TRACE(__VA_ARGS__)
-#else
-#define LFS_RAMBD_TRACE(...)
+extern "C"
+{
 #endif
 
 // rambd config (optional)
-struct lfs_rambd_cfg {
-    // Minimum size of block read. All read operations must be a
-    // multiple of this value.
-    lfs_size_t read_size;
-
-    // Minimum size of block program. All program operations must be a
-    // multiple of this value.
-    lfs_size_t prog_size;
-
-    // Size of an erasable block.
-    lfs_size_t erase_size;
-
-    // Number of erasable blocks on the device.
-    lfs_size_t erase_count;
-
-    // 8-bit erase value to use for simulating erases. -1 does not simulate
-    // erases, which can speed up testing by avoiding all the extra block-device
-    // operations to store the erase value.
+struct lfs_rambd_config {
+    // 8-bit erase value to simulate erasing with. -1 indicates no erase
+    // occurs, which is still a valid block device
     int32_t erase_value;
 
     // Optional statically allocated buffer for the block device.
@@ -49,39 +28,40 @@ struct lfs_rambd_cfg {
 // rambd state
 typedef struct lfs_rambd {
     uint8_t *buffer;
-    const struct lfs_rambd_cfg *cfg;
+    const struct lfs_rambd_config *cfg;
 } lfs_rambd_t;
 
 
-// Create a RAM block device using the geometry in lfs_cfg
-int lfs_rambd_createcfg(lfs_rambd_t *bd,
-        const struct lfs_rambd_cfg *cfg);
+// Create a RAM block device using the geometry in lfs_config
+int lfs_rambd_create(const struct lfs_config *cfg);
+int lfs_rambd_createcfg(const struct lfs_config *cfg,
+        const struct lfs_rambd_config *bdcfg);
 
 // Clean up memory associated with block device
-int lfs_rambd_destroy(lfs_rambd_t *bd);
+int lfs_rambd_destroy(const struct lfs_config *cfg);
 
 // Read a block
-int lfs_rambd_read(lfs_rambd_t *bd, lfs_block_t block,
+int lfs_rambd_read(const struct lfs_config *cfg, lfs_block_t block,
         lfs_off_t off, void *buffer, lfs_size_t size);
 
 // Program a block
 //
 // The block must have previously been erased.
-int lfs_rambd_prog(lfs_rambd_t *bd, lfs_block_t block,
+int lfs_rambd_prog(const struct lfs_config *cfg, lfs_block_t block,
         lfs_off_t off, const void *buffer, lfs_size_t size);
 
 // Erase a block
 //
 // A block must be erased before being programmed. The
 // state of an erased block is undefined.
-int lfs_rambd_erase(lfs_rambd_t *bd, lfs_block_t block);
+int lfs_rambd_erase(const struct lfs_config *cfg, lfs_block_t block);
 
 // Sync the block device
-int lfs_rambd_sync(lfs_rambd_t *bd);
+int lfs_rambd_sync(const struct lfs_config *cfg);
 
 
 #ifdef __cplusplus
-}
+} /* extern "C" */
 #endif
 
 #endif

bd/lfs_testbd.c

@@ -10,20 +10,25 @@
 #include <stdlib.h>
 
 
-int lfs_testbd_createcfg(lfs_testbd_t *bd, const char *path,
-        const struct lfs_testbd_cfg *cfg) {
-    LFS_TESTBD_TRACE("lfs_testbd_createcfg(%p, \"%s\", %p {"
+int lfs_testbd_createcfg(const struct lfs_config *cfg, const char *path,
+        const struct lfs_testbd_config *bdcfg) {
+    LFS_TRACE("lfs_testbd_createcfg(%p {.context=%p, "
+                ".read=%p, .prog=%p, .erase=%p, .sync=%p, "
                 ".read_size=%"PRIu32", .prog_size=%"PRIu32", "
-                ".erase_size=%"PRIu32", .erase_count=%"PRIu32", "
-                ".erase_value=%"PRId32", .erase_cycles=%"PRIu32", "
+                ".block_size=%"PRIu32", .block_count=%"PRIu32"}, "
+                "\"%s\", "
+                "%p {.erase_value=%"PRId32", .erase_cycles=%"PRIu32", "
                 ".badblock_behavior=%"PRIu8", .power_cycles=%"PRIu32", "
                 ".buffer=%p, .wear_buffer=%p})",
-            (void*)bd, path, (void*)cfg,
-            cfg->read_size, cfg->prog_size, cfg->erase_size, cfg->erase_count,
-            cfg->erase_value, cfg->erase_cycles,
-            cfg->badblock_behavior, cfg->power_cycles,
-            cfg->buffer, cfg->wear_buffer);
-    bd->cfg = cfg;
+            (void*)cfg, cfg->context,
+            (void*)(uintptr_t)cfg->read, (void*)(uintptr_t)cfg->prog,
+            (void*)(uintptr_t)cfg->erase, (void*)(uintptr_t)cfg->sync,
+            cfg->read_size, cfg->prog_size, cfg->block_size, cfg->block_count,
+            path, (void*)bdcfg, bdcfg->erase_value, bdcfg->erase_cycles,
+            bdcfg->badblock_behavior, bdcfg->power_cycles,
+            bdcfg->buffer, bdcfg->wear_buffer);
+    lfs_testbd_t *bd = cfg->context;
+    bd->cfg = bdcfg;
 
     // setup testing things
     bd->persist = path;
@@ -33,138 +38,165 @@ int lfs_testbd_createcfg(lfs_testbd_t *bd, const char *path,
         if (bd->cfg->wear_buffer) {
             bd->wear = bd->cfg->wear_buffer;
         } else {
-            bd->wear = lfs_malloc(sizeof(lfs_testbd_wear_t)*cfg->erase_count);
+            bd->wear = lfs_malloc(sizeof(lfs_testbd_wear_t) * cfg->block_count);
             if (!bd->wear) {
-                LFS_TESTBD_TRACE("lfs_testbd_createcfg -> %d", LFS_ERR_NOMEM);
+                LFS_TRACE("lfs_testbd_createcfg -> %d", LFS_ERR_NOMEM);
                 return LFS_ERR_NOMEM;
             }
         }
 
-        memset(bd->wear, 0, sizeof(lfs_testbd_wear_t) * bd->cfg->erase_count);
+        memset(bd->wear, 0, sizeof(lfs_testbd_wear_t) * cfg->block_count);
     }
 
     // create underlying block device
     if (bd->persist) {
-        int err = lfs_filebd_createcfg(&bd->impl.filebd, path,
-                bd->cfg->filebd_cfg);
-        LFS_TESTBD_TRACE("lfs_testbd_createcfg -> %d", err);
+        bd->u.file.cfg = (struct lfs_filebd_config){
+            .erase_value = bd->cfg->erase_value,
+        };
+        int err = lfs_filebd_createcfg(cfg, path, &bd->u.file.cfg);
+        LFS_TRACE("lfs_testbd_createcfg -> %d", err);
         return err;
     } else {
-        int err = lfs_rambd_createcfg(&bd->impl.rambd,
-                bd->cfg->rambd_cfg);
-        LFS_TESTBD_TRACE("lfs_testbd_createcfg -> %d", err);
+        bd->u.ram.cfg = (struct lfs_rambd_config){
+            .erase_value = bd->cfg->erase_value,
+            .buffer = bd->cfg->buffer,
+        };
+        int err = lfs_rambd_createcfg(cfg, &bd->u.ram.cfg);
+        LFS_TRACE("lfs_testbd_createcfg -> %d", err);
         return err;
     }
 }
 
-int lfs_testbd_destroy(lfs_testbd_t *bd) {
-    LFS_TESTBD_TRACE("lfs_testbd_destroy(%p)", (void*)bd);
+int lfs_testbd_create(const struct lfs_config *cfg, const char *path) {
+    LFS_TRACE("lfs_testbd_create(%p {.context=%p, "
+                ".read=%p, .prog=%p, .erase=%p, .sync=%p, "
+                ".read_size=%"PRIu32", .prog_size=%"PRIu32", "
+                ".block_size=%"PRIu32", .block_count=%"PRIu32"}, "
+                "\"%s\")",
+            (void*)cfg, cfg->context,
+            (void*)(uintptr_t)cfg->read, (void*)(uintptr_t)cfg->prog,
+            (void*)(uintptr_t)cfg->erase, (void*)(uintptr_t)cfg->sync,
+            cfg->read_size, cfg->prog_size, cfg->block_size, cfg->block_count,
+            path);
+    static const struct lfs_testbd_config defaults = {.erase_value=-1};
+    int err = lfs_testbd_createcfg(cfg, path, &defaults);
+    LFS_TRACE("lfs_testbd_create -> %d", err);
+    return err;
+}
+
+int lfs_testbd_destroy(const struct lfs_config *cfg) {
+    LFS_TRACE("lfs_testbd_destroy(%p)", (void*)cfg);
+    lfs_testbd_t *bd = cfg->context;
     if (bd->cfg->erase_cycles && !bd->cfg->wear_buffer) {
         lfs_free(bd->wear);
     }
 
     if (bd->persist) {
-        int err = lfs_filebd_destroy(&bd->impl.filebd);
-        LFS_TESTBD_TRACE("lfs_testbd_destroy -> %d", err);
+        int err = lfs_filebd_destroy(cfg);
+        LFS_TRACE("lfs_testbd_destroy -> %d", err);
         return err;
     } else {
-        int err = lfs_rambd_destroy(&bd->impl.rambd);
-        LFS_TESTBD_TRACE("lfs_testbd_destroy -> %d", err);
+        int err = lfs_rambd_destroy(cfg);
+        LFS_TRACE("lfs_testbd_destroy -> %d", err);
         return err;
     }
 }
 
 /// Internal mapping to block devices ///
-static int lfs_testbd_rawread(lfs_testbd_t *bd, lfs_block_t block,
+static int lfs_testbd_rawread(const struct lfs_config *cfg, lfs_block_t block,
         lfs_off_t off, void *buffer, lfs_size_t size) {
+    lfs_testbd_t *bd = cfg->context;
     if (bd->persist) {
-        return lfs_filebd_read(&bd->impl.filebd, block, off, buffer, size);
+        return lfs_filebd_read(cfg, block, off, buffer, size);
     } else {
-        return lfs_rambd_read(&bd->impl.rambd, block, off, buffer, size);
+        return lfs_rambd_read(cfg, block, off, buffer, size);
     }
 }
 
-static int lfs_testbd_rawprog(lfs_testbd_t *bd, lfs_block_t block,
+static int lfs_testbd_rawprog(const struct lfs_config *cfg, lfs_block_t block,
         lfs_off_t off, const void *buffer, lfs_size_t size) {
+    lfs_testbd_t *bd = cfg->context;
     if (bd->persist) {
-        return lfs_filebd_prog(&bd->impl.filebd, block, off, buffer, size);
+        return lfs_filebd_prog(cfg, block, off, buffer, size);
     } else {
-        return lfs_rambd_prog(&bd->impl.rambd, block, off, buffer, size);
+        return lfs_rambd_prog(cfg, block, off, buffer, size);
     }
 }
 
-static int lfs_testbd_rawerase(lfs_testbd_t *bd,
+static int lfs_testbd_rawerase(const struct lfs_config *cfg,
         lfs_block_t block) {
+    lfs_testbd_t *bd = cfg->context;
     if (bd->persist) {
-        return lfs_filebd_erase(&bd->impl.filebd, block);
+        return lfs_filebd_erase(cfg, block);
     } else {
-        return lfs_rambd_erase(&bd->impl.rambd, block);
+        return lfs_rambd_erase(cfg, block);
     }
 }
 
-static int lfs_testbd_rawsync(lfs_testbd_t *bd) {
+static int lfs_testbd_rawsync(const struct lfs_config *cfg) {
+    lfs_testbd_t *bd = cfg->context;
     if (bd->persist) {
-        return lfs_filebd_sync(&bd->impl.filebd);
+        return lfs_filebd_sync(cfg);
     } else {
-        return lfs_rambd_sync(&bd->impl.rambd);
+        return lfs_rambd_sync(cfg);
     }
 }
 
 /// block device API ///
-int lfs_testbd_read(lfs_testbd_t *bd, lfs_block_t block,
+int lfs_testbd_read(const struct lfs_config *cfg, lfs_block_t block,
         lfs_off_t off, void *buffer, lfs_size_t size) {
-    LFS_TESTBD_TRACE("lfs_testbd_read(%p, "
-                "0x%"PRIx32", %"PRIu32", %p, %"PRIu32")",
-            (void*)bd, block, off, buffer, size);
+    LFS_TRACE("lfs_testbd_read(%p, 0x%"PRIx32", %"PRIu32", %p, %"PRIu32")",
+            (void*)cfg, block, off, buffer, size);
+    lfs_testbd_t *bd = cfg->context;
 
     // check if read is valid
-    LFS_ASSERT(off  % bd->cfg->read_size == 0);
-    LFS_ASSERT(size % bd->cfg->read_size == 0);
-    LFS_ASSERT(block < bd->cfg->erase_count);
+    LFS_ASSERT(off  % cfg->read_size == 0);
+    LFS_ASSERT(size % cfg->read_size == 0);
+    LFS_ASSERT(block < cfg->block_count);
 
     // block bad?
     if (bd->cfg->erase_cycles && bd->wear[block] >= bd->cfg->erase_cycles &&
             bd->cfg->badblock_behavior == LFS_TESTBD_BADBLOCK_READERROR) {
-        LFS_TESTBD_TRACE("lfs_testbd_read -> %d", LFS_ERR_CORRUPT);
+        LFS_TRACE("lfs_testbd_read -> %d", LFS_ERR_CORRUPT);
         return LFS_ERR_CORRUPT;
     }
 
     // read
-    int err = lfs_testbd_rawread(bd, block, off, buffer, size);
-    LFS_TESTBD_TRACE("lfs_testbd_read -> %d", err);
+    int err = lfs_testbd_rawread(cfg, block, off, buffer, size);
+    LFS_TRACE("lfs_testbd_read -> %d", err);
     return err;
 }
 
-int lfs_testbd_prog(lfs_testbd_t *bd, lfs_block_t block,
+int lfs_testbd_prog(const struct lfs_config *cfg, lfs_block_t block,
         lfs_off_t off, const void *buffer, lfs_size_t size) {
-    LFS_TESTBD_TRACE("lfs_testbd_prog(%p, "
-                "0x%"PRIx32", %"PRIu32", %p, %"PRIu32")",
-            (void*)bd, block, off, buffer, size);
+    LFS_TRACE("lfs_testbd_prog(%p, 0x%"PRIx32", %"PRIu32", %p, %"PRIu32")",
+            (void*)cfg, block, off, buffer, size);
+    lfs_testbd_t *bd = cfg->context;
 
     // check if write is valid
-    LFS_ASSERT(off  % bd->cfg->prog_size == 0);
-    LFS_ASSERT(size % bd->cfg->prog_size == 0);
-    LFS_ASSERT(block < bd->cfg->erase_count);
+    LFS_ASSERT(off  % cfg->prog_size == 0);
+    LFS_ASSERT(size % cfg->prog_size == 0);
+    LFS_ASSERT(block < cfg->block_count);
 
     // block bad?
     if (bd->cfg->erase_cycles && bd->wear[block] >= bd->cfg->erase_cycles) {
         if (bd->cfg->badblock_behavior ==
                 LFS_TESTBD_BADBLOCK_PROGERROR) {
-            LFS_TESTBD_TRACE("lfs_testbd_prog -> %d", LFS_ERR_CORRUPT);
+            LFS_TRACE("lfs_testbd_prog -> %d", LFS_ERR_CORRUPT);
             return LFS_ERR_CORRUPT;
         } else if (bd->cfg->badblock_behavior ==
                 LFS_TESTBD_BADBLOCK_PROGNOOP ||
                 bd->cfg->badblock_behavior ==
                 LFS_TESTBD_BADBLOCK_ERASENOOP) {
-            LFS_TESTBD_TRACE("lfs_testbd_prog -> %d", 0);
+            LFS_TRACE("lfs_testbd_prog -> %d", 0);
             return 0;
         }
     }
 
     // prog
-    int err = lfs_testbd_rawprog(bd, block, off, buffer, size);
+    int err = lfs_testbd_rawprog(cfg, block, off, buffer, size);
     if (err) {
-        LFS_TESTBD_TRACE("lfs_testbd_prog -> %d", err);
+        LFS_TRACE("lfs_testbd_prog -> %d", err);
         return err;
     }
 
@@ -173,32 +205,33 @@ int lfs_testbd_prog(lfs_testbd_t *bd, lfs_block_t block,
         bd->power_cycles -= 1;
         if (bd->power_cycles == 0) {
             // sync to make sure we persist the last changes
-            assert(lfs_testbd_rawsync(bd) == 0);
+            assert(lfs_testbd_rawsync(cfg) == 0);
             // simulate power loss
             exit(33);
         }
     }
 
-    LFS_TESTBD_TRACE("lfs_testbd_prog -> %d", 0);
+    LFS_TRACE("lfs_testbd_prog -> %d", 0);
     return 0;
 }
 
-int lfs_testbd_erase(lfs_testbd_t *bd, lfs_block_t block) {
-    LFS_TESTBD_TRACE("lfs_testbd_erase(%p, 0x%"PRIx32")", (void*)bd, block);
+int lfs_testbd_erase(const struct lfs_config *cfg, lfs_block_t block) {
+    LFS_TRACE("lfs_testbd_erase(%p, 0x%"PRIx32")", (void*)cfg, block);
+    lfs_testbd_t *bd = cfg->context;
 
     // check if erase is valid
-    LFS_ASSERT(block < bd->cfg->erase_count);
+    LFS_ASSERT(block < cfg->block_count);
 
     // block bad?
     if (bd->cfg->erase_cycles) {
         if (bd->wear[block] >= bd->cfg->erase_cycles) {
             if (bd->cfg->badblock_behavior ==
                     LFS_TESTBD_BADBLOCK_ERASEERROR) {
-                LFS_TESTBD_TRACE("lfs_testbd_erase -> %d", LFS_ERR_CORRUPT);
+                LFS_TRACE("lfs_testbd_erase -> %d", LFS_ERR_CORRUPT);
                 return LFS_ERR_CORRUPT;
             } else if (bd->cfg->badblock_behavior ==
                     LFS_TESTBD_BADBLOCK_ERASENOOP) {
-                LFS_TESTBD_TRACE("lfs_testbd_erase -> %d", 0);
+                LFS_TRACE("lfs_testbd_erase -> %d", 0);
                 return 0;
             }
         } else {
@@ -208,9 +241,9 @@ int lfs_testbd_erase(lfs_testbd_t *bd, lfs_block_t block) {
     }
 
     // erase
-    int err = lfs_testbd_rawerase(bd, block);
+    int err = lfs_testbd_rawerase(cfg, block);
     if (err) {
-        LFS_TESTBD_TRACE("lfs_testbd_erase -> %d", err);
+        LFS_TRACE("lfs_testbd_erase -> %d", err);
         return err;
     }
 
@@ -219,47 +252,49 @@ int lfs_testbd_erase(lfs_testbd_t *bd, lfs_block_t block) {
         bd->power_cycles -= 1;
         if (bd->power_cycles == 0) {
             // sync to make sure we persist the last changes
-            assert(lfs_testbd_rawsync(bd) == 0);
+            assert(lfs_testbd_rawsync(cfg) == 0);
             // simulate power loss
             exit(33);
         }
     }
 
-    LFS_TESTBD_TRACE("lfs_testbd_prog -> %d", 0);
+    LFS_TRACE("lfs_testbd_prog -> %d", 0);
     return 0;
 }
 
-int lfs_testbd_sync(lfs_testbd_t *bd) {
-    LFS_TESTBD_TRACE("lfs_testbd_sync(%p)", (void*)bd);
-    int err = lfs_testbd_rawsync(bd);
-    LFS_TESTBD_TRACE("lfs_testbd_sync -> %d", err);
+int lfs_testbd_sync(const struct lfs_config *cfg) {
+    LFS_TRACE("lfs_testbd_sync(%p)", (void*)cfg);
+    int err = lfs_testbd_rawsync(cfg);
+    LFS_TRACE("lfs_testbd_sync -> %d", err);
     return err;
 }
 
 
 /// simulated wear operations ///
-lfs_testbd_swear_t lfs_testbd_getwear(lfs_testbd_t *bd,
+lfs_testbd_swear_t lfs_testbd_getwear(const struct lfs_config *cfg,
         lfs_block_t block) {
-    LFS_TESTBD_TRACE("lfs_testbd_getwear(%p, %"PRIu32")", (void*)bd, block);
+    LFS_TRACE("lfs_testbd_getwear(%p, %"PRIu32")", (void*)cfg, block);
+    lfs_testbd_t *bd = cfg->context;
 
     // check if block is valid
     LFS_ASSERT(bd->cfg->erase_cycles);
-    LFS_ASSERT(block < bd->cfg->erase_count);
+    LFS_ASSERT(block < cfg->block_count);
 
-    LFS_TESTBD_TRACE("lfs_testbd_getwear -> %"PRIu32, bd->wear[block]);
+    LFS_TRACE("lfs_testbd_getwear -> %"PRIu32, bd->wear[block]);
     return bd->wear[block];
 }
 
-int lfs_testbd_setwear(lfs_testbd_t *bd,
+int lfs_testbd_setwear(const struct lfs_config *cfg,
         lfs_block_t block, lfs_testbd_wear_t wear) {
-    LFS_TESTBD_TRACE("lfs_testbd_setwear(%p, %"PRIu32")", (void*)bd, block);
+    LFS_TRACE("lfs_testbd_setwear(%p, %"PRIu32")", (void*)cfg, block);
+    lfs_testbd_t *bd = cfg->context;
 
     // check if block is valid
     LFS_ASSERT(bd->cfg->erase_cycles);
-    LFS_ASSERT(block < bd->cfg->erase_count);
+    LFS_ASSERT(block < cfg->block_count);
 
     bd->wear[block] = wear;
 
-    LFS_TESTBD_TRACE("lfs_testbd_setwear -> %d", 0);
+    LFS_TRACE("lfs_testbd_setwear -> %d", 0);
     return 0;
 }

bd/lfs_testbd.h

@@ -9,21 +9,16 @@
 #define LFS_TESTBD_H
 
 #include "lfs.h"
+#include "lfs_util.h"
 #include "bd/lfs_rambd.h"
 #include "bd/lfs_filebd.h"
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 
-// Block device specific tracing
-#ifdef LFS_TESTBD_YES_TRACE
-#define LFS_TESTBD_TRACE(...) LFS_TRACE(__VA_ARGS__)
-#else
-#define LFS_TESTBD_TRACE(...)
-#endif
-
 // Mode determining how "bad blocks" behave during testing. This simulates
 // some real-world circumstances such as progs not sticking (prog-noop),
 // a readonly disk (erase-noop), and ECC failures (read-error).
@@ -43,26 +38,7 @@ typedef uint32_t lfs_testbd_wear_t;
 typedef int32_t  lfs_testbd_swear_t;
 
 // testbd config, this is required for testing
-struct lfs_testbd_cfg {
-    // Block device specific configuration, see the related config structs.
-    // May be NULL if the underlying implementation goes unused.
-    const struct lfs_rambd_cfg *rambd_cfg;
-    const struct lfs_filebd_cfg *filebd_cfg;
-
-    // Minimum size of block read. All read operations must be a
-    // multiple of this value.
-    lfs_size_t read_size;
-
-    // Minimum size of block program. All program operations must be a
-    // multiple of this value.
-    lfs_size_t prog_size;
-
-    // Size of an erasable block.
-    lfs_size_t erase_size;
-
-    // Number of erasable blocks on the device.
-    lfs_size_t erase_count;
-
+struct lfs_testbd_config {
     // 8-bit erase value to use for simulating erases. -1 does not simulate
     // erases, which can speed up testing by avoiding all the extra block-device
     // operations to store the erase value.
@@ -79,6 +55,9 @@ struct lfs_testbd_cfg {
     // the program with exit. Simulates power-loss. 0 disables.
     uint32_t power_cycles;
 
+    // Optional buffer for RAM block device.
+    void *buffer;
+
     // Optional buffer for wear
     void *wear_buffer;
 };
@@ -86,63 +65,70 @@ struct lfs_testbd_cfg {
 // testbd state
 typedef struct lfs_testbd {
     union {
-        lfs_filebd_t filebd;
-        lfs_rambd_t rambd;
-    } impl;
+        struct {
+            lfs_filebd_t bd;
+            struct lfs_filebd_config cfg;
+        } file;
+        struct {
+            lfs_rambd_t bd;
+            struct lfs_rambd_config cfg;
+        } ram;
+    } u;
 
     bool persist;
     uint32_t power_cycles;
     lfs_testbd_wear_t *wear;
 
-    const struct lfs_testbd_cfg *cfg;
+    const struct lfs_testbd_config *cfg;
 } lfs_testbd_t;
 
 
 /// Block device API ///
 
-// Create a test block device using the geometry in lfs_cfg
+// Create a test block device using the geometry in lfs_config
 //
 // Note that filebd is used if a path is provided, if path is NULL
 // testbd will use rambd which can be much faster.
-int lfs_testbd_createcfg(lfs_testbd_t *bd, const char *path,
-        const struct lfs_testbd_cfg *cfg);
+int lfs_testbd_create(const struct lfs_config *cfg, const char *path);
+int lfs_testbd_createcfg(const struct lfs_config *cfg, const char *path,
+        const struct lfs_testbd_config *bdcfg);
 
 // Clean up memory associated with block device
-int lfs_testbd_destroy(lfs_testbd_t *bd);
+int lfs_testbd_destroy(const struct lfs_config *cfg);
 
 // Read a block
-int lfs_testbd_read(lfs_testbd_t *bd, lfs_block_t block,
+int lfs_testbd_read(const struct lfs_config *cfg, lfs_block_t block,
         lfs_off_t off, void *buffer, lfs_size_t size);
 
 // Program a block
 //
 // The block must have previously been erased.
-int lfs_testbd_prog(lfs_testbd_t *bd, lfs_block_t block,
+int lfs_testbd_prog(const struct lfs_config *cfg, lfs_block_t block,
         lfs_off_t off, const void *buffer, lfs_size_t size);
 
 // Erase a block
 //
 // A block must be erased before being programmed. The
 // state of an erased block is undefined.
-int lfs_testbd_erase(lfs_testbd_t *bd, lfs_block_t block);
+int lfs_testbd_erase(const struct lfs_config *cfg, lfs_block_t block);
 
 // Sync the block device
-int lfs_testbd_sync(lfs_testbd_t *bd);
+int lfs_testbd_sync(const struct lfs_config *cfg);
 
 
 /// Additional extended API for driving test features ///
 
 // Get simulated wear on a given block
-lfs_testbd_swear_t lfs_testbd_getwear(lfs_testbd_t *bd,
+lfs_testbd_swear_t lfs_testbd_getwear(const struct lfs_config *cfg,
         lfs_block_t block);
 
 // Manually set simulated wear on a given block
-int lfs_testbd_setwear(lfs_testbd_t *bd,
+int lfs_testbd_setwear(const struct lfs_config *cfg,
         lfs_block_t block, lfs_testbd_wear_t wear);
 
 
 #ifdef __cplusplus
-}
+} /* extern "C" */
 #endif
 
 #endif

lfs.h

@@ -7,10 +7,12 @@
 #ifndef LFS_H
 #define LFS_H
 
-#include "lfs_util.h"
+#include <stdint.h>
+#include <stdbool.h>
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 
@@ -19,7 +21,7 @@ extern "C" {
 // Software library version
 // Major (top-nibble), incremented on backwards incompatible changes
 // Minor (bottom-nibble), incremented on feature additions
-#define LFS_VERSION 0x00020002
+#define LFS_VERSION 0x00020001
 #define LFS_VERSION_MAJOR (0xffff & (LFS_VERSION >> 16))
 #define LFS_VERSION_MINOR (0xffff & (LFS_VERSION >>  0))
 
@@ -46,13 +48,8 @@ typedef uint32_t lfs_block_t;
 // info struct. Limited to <= 1022. Stored in superblock and must be
 // respected by other littlefs drivers.
 #ifndef LFS_NAME_MAX
-#if defined(LFS_NAME_LIMIT) && \
-        LFS_NAME_LIMIT > 0 && LFS_NAME_MAX <= 1022
-#define LFS_NAME_MAX LFS_NAME_LIMIT
-#else
 #define LFS_NAME_MAX 255
 #endif
-#endif
 
 // Maximum size of a file in bytes, may be redefined to limit to support other
 // drivers. Limited on disk to <= 4294967296. However, above 2147483647 the
@@ -60,24 +57,34 @@ typedef uint32_t lfs_block_t;
 // incorrect values due to using signed integers. Stored in superblock and
 // must be respected by other littlefs drivers.
 #ifndef LFS_FILE_MAX
-#if defined(LFS_FILE_LIMIT) && \
-        LFS_FILE_LIMIT > 0 && LFS_FILE_LIMIT <= 4294967296
-#define LFS_FILE_MAX LFS_FILE_LIMIT
-#else
 #define LFS_FILE_MAX 2147483647
 #endif
-#endif
 
 // Maximum size of custom attributes in bytes, may be redefined, but there is
 // no real benefit to using a smaller LFS_ATTR_MAX. Limited to <= 1022.
 #ifndef LFS_ATTR_MAX
-#if defined(LFS_ATTR_LIMIT) && \
-        LFS_ATTR_LIMIT > 0 && LFS_ATTR_LIMIT <= 1022
-#define LFS_ATTR_MAX LFS_FILE_LIMIT
-#else
 #define LFS_ATTR_MAX 1022
 #endif
-#endif
+
+// Possible error codes, these are negative to allow
+// valid positive return values
+enum lfs_error {
+    LFS_ERR_OK          = 0,    // No error
+    LFS_ERR_IO          = -5,   // Error during device operation
+    LFS_ERR_CORRUPT     = -84,  // Corrupted
+    LFS_ERR_NOENT       = -2,   // No directory entry
+    LFS_ERR_EXIST       = -17,  // Entry already exists
+    LFS_ERR_NOTDIR      = -20,  // Entry is not a dir
+    LFS_ERR_ISDIR       = -21,  // Entry is a dir
+    LFS_ERR_NOTEMPTY    = -39,  // Dir is not empty
+    LFS_ERR_BADF        = -9,   // Bad file number
+    LFS_ERR_FBIG        = -27,  // File too large
+    LFS_ERR_INVAL       = -22,  // Invalid parameter
+    LFS_ERR_NOSPC       = -28,  // No space left on device
+    LFS_ERR_NOMEM       = -12,  // No more memory available
+    LFS_ERR_NOATTR      = -61,  // No data/attr available
+    LFS_ERR_NAMETOOLONG = -36,  // File name too long
+};
 
 // File types
 enum lfs_type {
@@ -104,12 +111,14 @@ enum lfs_type {
     LFS_TYPE_INLINESTRUCT   = 0x201,
     LFS_TYPE_SOFTTAIL       = 0x600,
     LFS_TYPE_HARDTAIL       = 0x601,
+    LFS_TYPE_BRANCH         = 0x681,
     LFS_TYPE_MOVESTATE      = 0x7ff,
 
     // internal chip sources
     LFS_FROM_NOOP           = 0x000,
     LFS_FROM_MOVE           = 0x101,
-    LFS_FROM_USERATTRS      = 0x102,
+    LFS_FROM_DROP           = 0x102,
+    LFS_FROM_USERATTRS      = 0x103,
 };
 
 // File open flags
@@ -141,128 +150,48 @@ enum lfs_whence_flags {
 
 
 // Configuration provided during initialization of the littlefs
-
-// If every config option is provided at compile time, littlefs switches
-// to "LFS_STATICCFG" mode. The dynamic lfs_cfg struct is not included in
-// the lfs_t struct, and *cfg functions are no longer available.
-#if defined(LFS_BD_READ) && \
-        defined(LFS_BD_PROG) && \
-        defined(LFS_BD_ERASE) && \
-        defined(LFS_BD_SYNC) && \
-        defined(LFS_READ_SIZE) && \
-        defined(LFS_PROG_SIZE) && \
-        defined(LFS_BLOCK_SIZE) && \
-        defined(LFS_BLOCK_COUNT) && \
-        defined(LFS_BLOCK_CYCLES) && \
-        defined(LFS_BUFFER_SIZE) && \
-        defined(LFS_LOOKAHEAD_SIZE) && \
-        defined(LFS_READ_BUFFER) && \
-        defined(LFS_PROG_BUFFER) && \
-        defined(LFS_LOOKAHEAD_BUFFER) && \
-        defined(LFS_NAME_LIMIT) && \
-        defined(LFS_FILE_LIMIT) && \
-        defined(LFS_ATTR_LIMIT)
-#define LFS_STATICCFG
-#endif
-
-// Dynamic config struct
-#ifndef LFS_STATICCFG
-struct lfs_cfg {
-#endif
+struct lfs_config {
     // Opaque user provided context that can be used to pass
     // information to the block device operations
-    #if !(defined(LFS_BD_READ) && \
-            defined(LFS_BD_PROG) && \
-            defined(LFS_BD_ERASE) && \
-            defined(LFS_BD_SYNC))
-    void *bd_ctx;
-    #endif
+    void *context;
 
     // Read a region in a block. Negative error codes are propogated
     // to the user.
-    #ifndef LFS_BD_READ
-    int (*bd_read)(void *ctx, lfs_block_t block,
+    int (*read)(const struct lfs_config *c, lfs_block_t block,
             lfs_off_t off, void *buffer, lfs_size_t size);
-    #define LFS_CFG_BD_READ(cfg, block, off, buffer, size) \
-            (cfg)->bd_read((cfg)->bd_ctx, block, off, buffer, size)
-    #else
-    #define LFS_CFG_BD_READ(cfg, block, off, buffer, size) \
-            lfs_bd_read(block, off, buffer, size)
-    #endif
 
     // Program a region in a block. The block must have previously
     // been erased. Negative error codes are propogated to the user.
     // May return LFS_ERR_CORRUPT if the block should be considered bad.
-    #ifndef LFS_BD_PROG
-    int (*bd_prog)(void *ctx, lfs_block_t block,
+    int (*prog)(const struct lfs_config *c, lfs_block_t block,
             lfs_off_t off, const void *buffer, lfs_size_t size);
-    #define LFS_CFG_BD_PROG(cfg, block, off, buffer, size) \
-            (cfg)->bd_prog((cfg)->bd_ctx, block, off, buffer, size)
-    #else
-    #define LFS_CFG_BD_PROG(cfg, block, off, buffer, size) \
-            lfs_bd_prog(block, off, buffer, size)
-    #endif
 
     // Erase a block. A block must be erased before being programmed.
     // The state of an erased block is undefined. Negative error codes
     // are propogated to the user.
     // May return LFS_ERR_CORRUPT if the block should be considered bad.
-    #ifndef LFS_BD_ERASE
-    int (*bd_erase)(void *ctx, lfs_block_t block);
-    #define LFS_CFG_BD_ERASE(cfg, block) \
-            (cfg)->bd_erase((cfg)->bd_ctx, block)
-    #else
-    #define LFS_CFG_BD_ERASE(cfg, block) \
-            lfs_bd_erase(block)
-    #endif
+    int (*erase)(const struct lfs_config *c, lfs_block_t block);
 
     // Sync the state of the underlying block device. Negative error codes
     // are propogated to the user.
-    #ifndef LFS_BD_SYNC
-    int (*bd_sync)(void *ctx);
-    #define LFS_CFG_BD_SYNC(cfg) \
-            (cfg)->bd_sync((cfg)->bd_ctx)
-    #else
-    #define LFS_CFG_BD_SYNC(cfg) \
-            lfs_bd_sync()
-    #endif
+    int (*sync)(const struct lfs_config *c);
 
     // Minimum size of a block read. All read operations will be a
     // multiple of this value.
-    #ifndef LFS_READ_SIZE
     lfs_size_t read_size;
-    #define LFS_CFG_READ_SIZE(cfg) (cfg)->read_size
-    #else
-    #define LFS_CFG_READ_SIZE(cfg) LFS_READ_SIZE
-    #endif
 
     // Minimum size of a block program. All program operations will be a
     // multiple of this value.
-    #ifndef LFS_PROG_SIZE
     lfs_size_t prog_size;
-    #define LFS_CFG_PROG_SIZE(cfg) (cfg)->prog_size
-    #else
-    #define LFS_CFG_PROG_SIZE(cfg) LFS_PROG_SIZE
-    #endif
 
     // Size of an erasable block. This does not impact ram consumption and
     // may be larger than the physical erase size. However, non-inlined files
     // take up at minimum one block. Must be a multiple of the read
     // and program sizes.
-    #ifndef LFS_BLOCK_SIZE
     lfs_size_t block_size;
-    #define LFS_CFG_BLOCK_SIZE(cfg) (cfg)->block_size
-    #else
-    #define LFS_CFG_BLOCK_SIZE(cfg) LFS_BLOCK_SIZE
-    #endif
 
     // Number of erasable blocks on the device.
-    #ifndef LFS_BLOCK_COUNT
     lfs_size_t block_count;
-    #define LFS_CFG_BLOCK_COUNT(cfg) (cfg)->block_count
-    #else
-    #define LFS_CFG_BLOCK_COUNT(cfg) LFS_BLOCK_COUNT
-    #endif
 
     // Number of erase cycles before littlefs evicts metadata logs and moves 
     // the metadata to another block. Suggested values are in the
@@ -270,168 +199,50 @@ struct lfs_cfg {
     // of less consistent wear distribution.
     //
     // Set to -1 to disable block-level wear-leveling.
-    #ifndef LFS_BLOCK_CYCLES
     int32_t block_cycles;
-    #define LFS_CFG_BLOCK_CYCLES(cfg) (cfg)->block_cycles
-    #else
-    #define LFS_CFG_BLOCK_CYCLES(cfg) LFS_BLOCK_CYCLES
-    #endif
 
-    // Size of internal buffers used to cache slices of blocks in RAM.
-    // The littlefs needs a read buffer, a program buffer, and one additional
-    // buffer per file. Larger buffers can improve performance by storing more
+    // Size of block caches. Each cache buffers a portion of a block in RAM.
+    // The littlefs needs a read cache, a program cache, and one additional
+    // cache per file. Larger caches can improve performance by storing more
     // data and reducing the number of disk accesses. Must be a multiple of
     // the read and program sizes, and a factor of the block size.
-    #ifndef LFS_BUFFER_SIZE
-    lfs_size_t buffer_size;
-    #define LFS_CFG_BUFFER_SIZE(cfg) (cfg)->buffer_size
-    #else
-    #define LFS_CFG_BUFFER_SIZE(cfg) LFS_BUFFER_SIZE
-    #endif
+    lfs_size_t cache_size;
 
     // Size of the lookahead buffer in bytes. A larger lookahead buffer
     // increases the number of blocks found during an allocation pass. The
     // lookahead buffer is stored as a compact bitmap, so each byte of RAM
     // can track 8 blocks. Must be a multiple of 8.
-    #ifndef LFS_LOOKAHEAD_SIZE
     lfs_size_t lookahead_size;
-    #define LFS_CFG_LOOKAHEAD_SIZE(cfg) (cfg)->lookahead_size
-    #else
-    #define LFS_CFG_LOOKAHEAD_SIZE(cfg) LFS_LOOKAHEAD_SIZE
-    #endif
 
     // Optional statically allocated read buffer. Must be cache_size.
     // By default lfs_malloc is used to allocate this buffer.
-    #ifndef LFS_READ_BUFFER
     void *read_buffer;
-    #define LFS_CFG_READ_BUFFER(cfg) (cfg)->read_buffer
-    #else
-    #define LFS_CFG_READ_BUFFER(cfg) LFS_READ_BUFFER
-    #endif
 
     // Optional statically allocated program buffer. Must be cache_size.
     // By default lfs_malloc is used to allocate this buffer.
-    #ifndef LFS_PROG_BUFFER
     void *prog_buffer;
-    #define LFS_CFG_PROG_BUFFER(cfg) (cfg)->prog_buffer
-    #else
-    #define LFS_CFG_PROG_BUFFER(cfg) LFS_PROG_BUFFER
-    #endif
 
     // Optional statically allocated lookahead buffer. Must be lookahead_size
     // and aligned to a 32-bit boundary. By default lfs_malloc is used to
     // allocate this buffer.
-    #ifndef LFS_LOOKAHEAD_BUFFER
     void *lookahead_buffer;
-    #define LFS_CFG_LOOKAHEAD_BUFFER(cfg) (cfg)->lookahead_buffer
-    #else
-    #define LFS_CFG_LOOKAHEAD_BUFFER(cfg) LFS_LOOKAHEAD_BUFFER
-    #endif
 
     // Optional upper limit on length of file names in bytes. No downside for
     // larger names except the size of the info struct which is controlled by
     // the LFS_NAME_MAX define. Defaults to LFS_NAME_MAX when zero. Stored in
     // superblock and must be respected by other littlefs drivers.
-    #ifndef LFS_NAME_LIMIT
-    lfs_size_t name_limit;
-    #define LFS_CFG_NAME_LIMIT(cfg) (cfg)->name_limit
-    #else
-    #define LFS_CFG_NAME_LIMIT(cfg) LFS_NAME_LIMIT
-    #endif
+    lfs_size_t name_max;
 
     // Optional upper limit on files in bytes. No downside for larger files
     // but must be <= LFS_FILE_MAX. Defaults to LFS_FILE_MAX when zero. Stored
     // in superblock and must be respected by other littlefs drivers.
-    #ifndef LFS_FILE_LIMIT
-    lfs_size_t file_limit;
-    #define LFS_CFG_FILE_LIMIT(cfg) (cfg)->file_limit
-    #else
-    #define LFS_CFG_FILE_LIMIT(cfg) LFS_FILE_LIMIT
-    #endif
+    lfs_size_t file_max;
 
     // Optional upper limit on custom attributes in bytes. No downside for
     // larger attributes size but must be <= LFS_ATTR_MAX. Defaults to
     // LFS_ATTR_MAX when zero.
-    #ifndef LFS_ATTR_LIMIT
-    lfs_size_t attr_limit;
-    #define LFS_CFG_ATTR_LIMIT(cfg) (cfg)->attr_limit
-    #else
-    #define LFS_CFG_ATTR_LIMIT(cfg) LFS_ATTR_LIMIT
-    #endif
-#ifndef LFS_STATICCFG
+    lfs_size_t attr_max;
 };
-#endif
-
-// Configurable callbacks are a bit special, when LFS_BD_* is defined,
-// LFS_CFG_* instead expands into a call to an extern lfs_bd_*, which
-// must be defined by the user. This preserves type-safety of the
-// callbacks.
-#ifdef LFS_BD_READ
-extern int lfs_bd_read(lfs_block_t block,
-        lfs_off_t off, void *buffer, lfs_size_t size);
-#endif
-#ifdef LFS_BD_PROG
-extern int lfs_bd_prog(lfs_block_t block,
-        lfs_off_t off, const void *buffer, lfs_size_t size);
-#endif
-#ifdef LFS_BD_ERASE
-extern int lfs_bd_erase(lfs_block_t block);
-#endif
-#ifdef LFS_BD_SYNC
-extern int lfs_bd_sync(void);
-#endif
-
-// If every config option is provided at compile time, littlefs switches
-// to "LFS_FILE_STATICCFG" mode. The dynamic lfs_file_cfg struct is not
-// included in the lfs_file_t struct, and *cfg functions are no longer
-// available.
-#if defined(LFS_FILE_BUFFER) && \
-        defined(LFS_FILE_ATTRS) && \
-        defined(LFS_FILE_ATTR_COUNT)
-#define LFS_STATICCFG
-#endif
-
-#ifndef LFS_FILE_STATICCFG
-// Optional configuration provided during lfs_file_opencfg
-struct lfs_file_cfg {
-#endif
-    // Optional statically allocated file buffer. Must be cache_size.
-    // By default lfs_malloc is used to allocate this buffer.
-    #ifndef LFS_FILE_BUFFER
-    void *buffer;
-    #define LFS_FILE_CFG_BUFFER(cfg) (cfg)->buffer
-    #else
-    #define LFS_FILE_CFG_BUFFER(cfg) LFS_FILE_BUFFER
-    #endif
-
-    // Optional list of custom attributes related to the file. If the file
-    // is opened with read access, these attributes will be read from disk
-    // during the open call. If the file is opened with write access, the
-    // attributes will be written to disk every file sync or close. This
-    // write occurs atomically with update to the file's contents.
-    //
-    // Custom attributes are uniquely identified by an 8-bit type and limited
-    // to LFS_ATTR_MAX bytes. When read, if the stored attribute is smaller
-    // than the buffer, it will be padded with zeros. If the stored attribute
-    // is larger, then it will be silently truncated. If the attribute is not
-    // found, it will be created implicitly.
-    #ifndef LFS_FILE_ATTRS
-    struct lfs_attr *attrs;
-    #define LFS_FILE_CFG_ATTRS(cfg) (cfg)->attrs
-    #else
-    #define LFS_FILE_CFG_ATTRS(cfg) LFS_FILE_ATTRS
-    #endif
-
-    // Number of custom attributes in the list
-    #ifndef LFS_FILE_ATTR_COUNT
-    lfs_size_t attr_count;
-    #define LFS_FILE_CFG_ATTR_COUNT(cfg) (cfg)->attr_count
-    #else
-    #define LFS_FILE_CFG_ATTR_COUNT(cfg) LFS_FILE_ATTR_COUNT
-    #endif
-#ifndef LFS_FILE_STATICCFG
-};
-#endif
 
 // File info structure
 struct lfs_info {
@@ -462,6 +273,29 @@ struct lfs_attr {
     lfs_size_t size;
 };
 
+// Optional configuration provided during lfs_file_opencfg
+struct lfs_file_config {
+    // Optional statically allocated file buffer. Must be cache_size.
+    // By default lfs_malloc is used to allocate this buffer.
+    void *buffer;
+
+    // Optional list of custom attributes related to the file. If the file
+    // is opened with read access, these attributes will be read from disk
+    // during the open call. If the file is opened with write access, the
+    // attributes will be written to disk every file sync or close. This
+    // write occurs atomically with update to the file's contents.
+    //
+    // Custom attributes are uniquely identified by an 8-bit type and limited
+    // to LFS_ATTR_MAX bytes. When read, if the stored attribute is smaller
+    // than the buffer, it will be padded with zeros. If the stored attribute
+    // is larger, then it will be silently truncated. If the attribute is not
+    // found, it will be created implicitly.
+    struct lfs_attr *attrs;
+
+    // Number of custom attributes in the list
+    lfs_size_t attr_count;
+};
+
 
 /// internal littlefs data structures ///
 typedef struct lfs_cache {
@@ -478,8 +312,11 @@ typedef struct lfs_mdir {
     uint32_t etag;
     uint16_t count;
     bool erased;
+    bool first; // TODO come on
     bool split;
+    bool mustrelocate; // TODO not great either
     lfs_block_t tail[2];
+    lfs_block_t branch[2];
 } lfs_mdir_t;
 
 // littlefs directory type
@@ -511,18 +348,16 @@ typedef struct lfs_file {
     lfs_off_t off;
     lfs_cache_t cache;
 
-#ifndef LFS_FILE_STATICCFG
-    const struct lfs_file_cfg *cfg;
-#endif
+    const struct lfs_file_config *cfg;
 } lfs_file_t;
 
 typedef struct lfs_superblock {
     uint32_t version;
     lfs_size_t block_size;
     lfs_size_t block_count;
-    lfs_size_t name_limit;
-    lfs_size_t file_limit;
-    lfs_size_t attr_limit;
+    lfs_size_t name_max;
+    lfs_size_t file_max;
+    lfs_size_t attr_max;
 } lfs_superblock_t;
 
 typedef struct lfs_gstate {
@@ -536,6 +371,9 @@ typedef struct lfs {
     lfs_cache_t pcache;
 
     lfs_block_t root[2];
+    lfs_block_t relocate_tail[2];
+    lfs_block_t relocate_end[2];
+    bool relocate_do_hack; // TODO fixme
     struct lfs_mlist {
         struct lfs_mlist *next;
         uint16_t id;
@@ -556,12 +394,10 @@ typedef struct lfs {
         uint32_t *buffer;
     } free;
 
-#ifndef LFS_STATICCFG
-    const struct lfs_cfg *cfg;
-#endif
-    lfs_size_t name_limit;
-    lfs_size_t file_limit;
-    lfs_size_t attr_limit;
+    const struct lfs_config *cfg;
+    lfs_size_t name_max;
+    lfs_size_t file_max;
+    lfs_size_t attr_max;
 
 #ifdef LFS_MIGRATE
     struct lfs1 *lfs1;
@@ -571,38 +407,16 @@ typedef struct lfs {
 
 /// Filesystem functions ///
 
-#if defined(LFS_STATICCFG)
-// Format a block device with littlefs
-//
-// Requires a littlefs object. This clobbers the littlefs object, and does
-// not leave the filesystem mounted.
-//
-// Returns a negative error code on failure.
-int lfs_format(lfs_t *lfs);
-#endif
-
-#if !defined(LFS_STATICCFG)
-// Format a block device with littlefs with per-filesystem configuration
+// Format a block device with the littlefs
 //
 // Requires a littlefs object and config struct. This clobbers the littlefs
 // object, and does not leave the filesystem mounted. The config struct must
 // be zeroed for defaults and backwards compatibility.
 //
 // Returns a negative error code on failure.
-int lfs_formatcfg(lfs_t *lfs, const struct lfs_cfg *config);
-#endif
+int lfs_format(lfs_t *lfs, const struct lfs_config *config);
 
-#if defined(LFS_STATICCFG)
-// Mounts littlefs
-//
-// Requires a littlefs object and static configuration.
-//
-// Returns a negative error code on failure.
-int lfs_mount(lfs_t *lfs);
-#endif
-
-#if !defined(LFS_STATICCFG)
-// Mounts a littlefs with per-filesystem configuration
+// Mounts a littlefs
 //
 // Requires a littlefs object and config struct. Multiple filesystems
 // may be mounted simultaneously with multiple littlefs objects. Both
@@ -610,8 +424,7 @@ int lfs_mount(lfs_t *lfs);
 // be zeroed for defaults and backwards compatibility.
 //
 // Returns a negative error code on failure.
-int lfs_mountcfg(lfs_t *lfs, const struct lfs_cfg *config);
-#endif
+int lfs_mount(lfs_t *lfs, const struct lfs_config *config);
 
 // Unmounts a littlefs
 //
@@ -685,8 +498,7 @@ int lfs_removeattr(lfs_t *lfs, const char *path, uint8_t type);
 int lfs_file_open(lfs_t *lfs, lfs_file_t *file,
         const char *path, int flags);
 
-#if !defined(LFS_FILE_STATICCFG)
-// Open a file with per-file configuration
+// Open a file with extra configuration
 //
 // The mode that the file is opened in is determined by the flags, which
 // are values from the enum lfs_open_flags that are bitwise-ored together.
@@ -698,8 +510,7 @@ int lfs_file_open(lfs_t *lfs, lfs_file_t *file,
 // Returns a negative error code on failure.
 int lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file,
         const char *path, int flags,
-        const struct lfs_file_cfg *config);
-#endif
+        const struct lfs_file_config *config);
 
 // Close a file
 //
@@ -829,39 +640,24 @@ lfs_ssize_t lfs_fs_size(lfs_t *lfs);
 // Returns a negative error code on failure.
 int lfs_fs_traverse(lfs_t *lfs, int (*cb)(void*, lfs_block_t), void *data);
 
-#if defined(LFS_MIGRATE) && defined(LFS_STATICCFG)
+#ifdef LFS_MIGRATE
 // Attempts to migrate a previous version of littlefs
 //
 // Behaves similarly to the lfs_format function. Attempts to mount
 // the previous version of littlefs and update the filesystem so it can be
 // mounted with the current version of littlefs.
 //
-// Requires a littlefs object. This clobbers the littlefs object, and does
-// not leave the filesystem mounted.
-//
-// Returns a negative error code on failure.
-int lfs_migrate(lfs_t *lfs, const struct lfs_cfg *cfg);
-#endif
-
-#if defined(LFS_MIGRATE) && !defined(LFS_STATICCFG)
-// Attempts to migrate a previous version of littlefs with per-filesystem
-// configuration
-//
-// Behaves similarly to the lfs_format function. Attempts to mount
-// the previous version of littlefs and update the filesystem so it can be
-// mounted with the current version of littlefs.
-//
 // Requires a littlefs object and config struct. This clobbers the littlefs
 // object, and does not leave the filesystem mounted. The config struct must
 // be zeroed for defaults and backwards compatibility.
 //
 // Returns a negative error code on failure.
-int lfs_migratecfg(lfs_t *lfs, const struct lfs_cfg *cfg);
+int lfs_migrate(lfs_t *lfs, const struct lfs_config *cfg);
 #endif
 
 
 #ifdef __cplusplus
-}
+} /* extern "C" */
 #endif
 
 #endif

lfs_util.c

@@ -7,7 +7,7 @@
 #include "lfs_util.h"
 
 // Only compile if user does not provide custom config
-#ifndef LFS_UTIL
+#ifndef LFS_CONFIG
 
 
 // Software CRC implementation with small lookup table

lfs_util.h

@@ -3,21 +3,20 @@
  *
  * Copyright (c) 2017, Arm Limited. All rights reserved.
  * SPDX-License-Identifier: BSD-3-Clause
- *
- * Can be overridden by users with their own configuration by defining
- * LFS_UTIL as a header file (-DLFS_UTIL=my_lfs_util.h)
- *
- * If LFS_UTIL is defined, none of the default definitions will be
- * emitted and must be provided by the user's header file. To start, I would
- * suggest copying lfs_util.h and modifying as needed.
  */
 #ifndef LFS_UTIL_H
 #define LFS_UTIL_H
 
-#ifdef LFS_UTIL
+// Users can override lfs_util.h with their own configuration by defining
+// LFS_CONFIG as a header file to include (-DLFS_CONFIG=lfs_config.h).
+//
+// If LFS_CONFIG is used, none of the default utils will be emitted and must be
+// provided by the config file. To start, I would suggest copying lfs_util.h
+// and modifying as needed.
+#ifdef LFS_CONFIG
 #define LFS_STRINGIZE(x) LFS_STRINGIZE2(x)
 #define LFS_STRINGIZE2(x) #x
-#include LFS_STRINGIZE(LFS_UTIL)
+#include LFS_STRINGIZE(LFS_CONFIG)
 #else
 
 // System includes
@@ -40,67 +39,42 @@
 #endif
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 
-// Possible error codes, these are negative to allow valid positive
-// return values. May be redefined to system-specific error codes as long
-// as they fit in a negative integer.
-enum lfs_error {
-    LFS_ERR_OK          = 0,    // No error
-    LFS_ERR_IO          = -5,   // Error during device operation
-    LFS_ERR_CORRUPT     = -84,  // Corrupted
-    LFS_ERR_NOENT       = -2,   // No directory entry
-    LFS_ERR_EXIST       = -17,  // Entry already exists
-    LFS_ERR_NOTDIR      = -20,  // Entry is not a dir
-    LFS_ERR_ISDIR       = -21,  // Entry is a dir
-    LFS_ERR_NOTEMPTY    = -39,  // Dir is not empty
-    LFS_ERR_BADF        = -9,   // Bad file number
-    LFS_ERR_FBIG        = -27,  // File too large
-    LFS_ERR_INVAL       = -22,  // Invalid parameter
-    LFS_ERR_NOSPC       = -28,  // No space left on device
-    LFS_ERR_NOMEM       = -12,  // No more memory available
-    LFS_ERR_NOATTR      = -61,  // No data/attr available
-    LFS_ERR_NAMETOOLONG = -36,  // File name too long
-};
-
-
 // Macros, may be replaced by system specific wrappers. Arguments to these
 // macros must not have side-effects as the macros can be removed for a smaller
 // code footprint
 
 // Logging functions
 #ifdef LFS_YES_TRACE
-#define LFS_TRACE_(fmt, ...) \
-    printf("%s:%d:trace: " fmt "%s\n", __FILE__, __LINE__, __VA_ARGS__)
-#define LFS_TRACE(...) LFS_TRACE_(__VA_ARGS__, "")
+#define LFS_TRACE(fmt, ...) \
+    printf("%s:%d:trace: " fmt "\n", __FILE__, __LINE__, __VA_ARGS__)
 #else
-#define LFS_TRACE(...)
+#define LFS_TRACE(fmt, ...)
 #endif
 
 #ifndef LFS_NO_DEBUG
-#define LFS_DEBUG_(fmt, ...) \
-    printf("%s:%d:debug: " fmt "%s\n", __FILE__, __LINE__, __VA_ARGS__)
-#define LFS_DEBUG(...) LFS_DEBUG_(__VA_ARGS__, "")
+#define LFS_DEBUG(fmt, ...) \
+    printf("%s:%d:debug: " fmt "\n", __FILE__, __LINE__, __VA_ARGS__)
 #else
-#define LFS_DEBUG(...)
+#define LFS_DEBUG(fmt, ...)
 #endif
 
 #ifndef LFS_NO_WARN
-#define LFS_WARN_(fmt, ...) \
-    printf("%s:%d:warn: " fmt "%s\n", __FILE__, __LINE__, __VA_ARGS__)
-#define LFS_WARN(...) LFS_WARN_(__VA_ARGS__, "")
+#define LFS_WARN(fmt, ...) \
+    printf("%s:%d:warn: " fmt "\n", __FILE__, __LINE__, __VA_ARGS__)
 #else
-#define LFS_WARN(...)
+#define LFS_WARN(fmt, ...)
 #endif
 
 #ifndef LFS_NO_ERROR
-#define LFS_ERROR_(fmt, ...) \
-    printf("%s:%d:error: " fmt "%s\n", __FILE__, __LINE__, __VA_ARGS__)
-#define LFS_ERROR(...) LFS_ERROR_(__VA_ARGS__, "")
+#define LFS_ERROR(fmt, ...) \
+    printf("%s:%d:error: " fmt "\n", __FILE__, __LINE__, __VA_ARGS__)
 #else
-#define LFS_ERROR(...)
+#define LFS_ERROR(fmt, ...)
 #endif
 
 // Runtime assertions
@@ -133,7 +107,7 @@ static inline uint32_t lfs_alignup(uint32_t a, uint32_t alignment) {
     return lfs_aligndown(a + alignment-1, alignment);
 }
 
-// Find the smallest power of 2 greater than or equal to a
+// Find the next smallest power of 2 less than or equal to a
 static inline uint32_t lfs_npw2(uint32_t a) {
 #if !defined(LFS_NO_INTRINSICS) && (defined(__GNUC__) || defined(__CC_ARM))
     return 32 - __builtin_clz(a-1);
@@ -172,8 +146,8 @@ static inline uint32_t lfs_popc(uint32_t a) {
 
 // Find the sequence comparison of a and b, this is the distance
 // between a and b ignoring overflow
-static inline int32_t lfs_scmp(uint32_t a, uint32_t b) {
-    return (int32_t)(uint32_t)(a - b);
+static inline int lfs_scmp(uint32_t a, uint32_t b) {
+    return (int)(unsigned)(a - b);
 }
 
 // Convert between 32-bit little-endian and native order
@@ -249,7 +223,7 @@ static inline void lfs_free(void *p) {
 
 
 #ifdef __cplusplus
-}
+} /* extern "C" */
 #endif
 
 #endif

scripts/readmdir.py

@@ -18,9 +18,10 @@ TAG_TYPES = {
     'ctzstruct':    (0x7ff, 0x202),
     'inlinestruct': (0x7ff, 0x201),
     'userattr':     (0x700, 0x300),
-    'tail':         (0x700, 0x600),
+    'tail':         (0x700, 0x600), # TODO rename these?
     'softtail':     (0x7ff, 0x600),
     'hardtail':     (0x7ff, 0x601),
+    'branch':       (0x7ff, 0x681),
     'gstate':       (0x700, 0x700),
     'movestate':    (0x7ff, 0x7ff),
     'crc':          (0x700, 0x500),
@@ -103,7 +104,7 @@ class Tag:
 
     def mkmask(self):
         return Tag(
-            0x700 if self.isunique else 0x7ff,
+            0x780 if self.is_('tail') else 0x700 if self.isunique else 0x7ff, # TODO best way?
             0x3ff if self.isattr else 0,
             0)
 
@@ -318,24 +319,14 @@ def main(args):
 
     # find most recent pair
     mdir = MetadataPair(blocks)
-
-    try:
-        mdir.tail = mdir[Tag('tail', 0, 0)]
-        if mdir.tail.size != 8 or mdir.tail.data == 8*b'\xff':
-            mdir.tail = None
-    except KeyError:
-        mdir.tail = None
-
-    print("mdir {%s} rev %d%s%s%s" % (
+    print("mdir {%s} rev %d%s%s" % (
         ', '.join('%#x' % b
             for b in [args.block1, args.block2]
             if b is not None),
         mdir.rev,
         ' (was %s)' % ', '.join('%d' % m.rev for m in mdir.pair[1:])
         if len(mdir.pair) > 1 else '',
-        ' (corrupted!)' if not mdir else '',
-        ' -> {%#x, %#x}' % struct.unpack('<II', mdir.tail.data)
-        if mdir.tail else ''))
+        ' (corrupted!)' if not mdir else ''))
     if args.all:
         mdir.dump_all(truncate=not args.no_truncate)
     elif args.log:

scripts/readtree.py

@@ -5,24 +5,107 @@ import sys
 import json
 import io
 import itertools as it
+import collections as c
 from readmdir import Tag, MetadataPair
 
+def popc(x):
+    return bin(x).count('1')
+
+def ctz(x):
+    return len(bin(x)) - len(bin(x).rstrip('0'))
+
+def dumpentries(args, mdir, mdirs, f):
+    for k, id_ in enumerate(mdir.ids):
+        name = mdir[Tag('name', id_, 0)]
+        struct_ = mdir[Tag('struct', id_, 0)]
+
+        desc = "id %d %s %s" % (
+            id_, name.typerepr(),
+            json.dumps(name.data.decode('utf8')))
+        if struct_.is_('dirstruct'):
+            pair = struct.unpack('<II', struct_.data[:8].ljust(8, b'\xff'))
+            desc += " dir {%#x, %#x}%s" % (
+                pair[0], pair[1],
+                '?' if frozenset(pair) not in mdirs else '')
+        if struct_.is_('ctzstruct'):
+            desc += " ctz {%#x} size %d" % struct.unpack(
+                '<II', struct_.data[:8].ljust(8, b'\xff'))
+        if struct_.is_('inlinestruct'):
+            desc += " inline size %d" % struct_.size
+
+        data = None
+        if struct_.is_('inlinestruct'):
+            data = struct_.data
+        elif struct_.is_('ctzstruct'):
+            block, size = struct.unpack(
+                '<II', struct_.data[:8].ljust(8, b'\xff'))
+            data = []
+            i = 0 if size == 0 else (size-1) // (args.block_size - 8)
+            if i != 0:
+                i = ((size-1) - 4*popc(i-1)+2) // (args.block_size - 8)
+            with open(args.disk, 'rb') as f2:
+                while i >= 0:
+                    f2.seek(block * args.block_size)
+                    dat = f2.read(args.block_size)
+                    data.append(dat[4*(ctz(i)+1) if i != 0 else 0:])
+                    block, = struct.unpack('<I', dat[:4].ljust(4, b'\xff'))
+                    i -= 1
+            data = bytes(it.islice(
+                it.chain.from_iterable(reversed(data)), size))
+
+        f.write("%-45s%s\n" % (desc,
+            "%-23s  %-8s" % (
+                ' '.join('%02x' % c for c in data[:8]),
+                ''.join(c if c >= ' ' and c <= '~' else '.'
+                    for c in map(chr, data[:8])))
+            if not args.no_truncate and len(desc) < 45
+                and data is not None else ""))
+
+        if name.is_('superblock') and struct_.is_('inlinestruct'):
+            f.write(
+                "  block_size %d\n"
+                "  block_count %d\n"
+                "  name_max %d\n"
+                "  file_max %d\n"
+                "  attr_max %d\n" % struct.unpack(
+                    '<IIIII', struct_.data[4:4+20].ljust(20, b'\xff')))
+
+        for tag in mdir.tags:
+            if tag.id==id_ and tag.is_('userattr'):
+                desc = "%s size %d" % (tag.typerepr(), tag.size)
+                f.write("  %-43s%s\n" % (desc,
+                    "%-23s  %-8s" % (
+                        ' '.join('%02x' % c for c in tag.data[:8]),
+                        ''.join(c if c >= ' ' and c <= '~' else '.'
+                            for c in map(chr, tag.data[:8])))
+                    if not args.no_truncate and len(desc) < 43 else ""))
+
+                if args.no_truncate:
+                    for i in range(0, len(tag.data), 16):
+                        f.write("    %08x: %-47s  %-16s\n" % (
+                            i, ' '.join('%02x' % c for c in tag.data[i:i+16]),
+                            ''.join(c if c >= ' ' and c <= '~' else '.'
+                                for c in map(chr, tag.data[i:i+16]))))
+
+        if args.no_truncate and data is not None:
+            for i in range(0, len(data), 16):
+                f.write("  %08x: %-47s  %-16s\n" % (
+                    i, ' '.join('%02x' % c for c in data[i:i+16]),
+                    ''.join(c if c >= ' ' and c <= '~' else '.'
+                        for c in map(chr, data[i:i+16]))))
+
 def main(args):
     superblock = None
     gstate = b'\0\0\0\0\0\0\0\0\0\0\0\0'
-    dirs = []
-    mdirs = []
+    mdirs = c.OrderedDict()
     corrupted = []
     cycle = False
     with open(args.disk, 'rb') as f:
         tail = (args.block1, args.block2)
-        hard = False
-        while True:
-            for m in it.chain((m for d in dirs for m in d), mdirs):
-                if set(m.blocks) == set(tail):
-                    # cycle detected
-                    cycle = m.blocks
-            if cycle:
+        while tail:
+            if frozenset(tail) in mdirs:
+                # cycle detected
+                cycle = tail
                 break
 
             # load mdir
@@ -45,6 +128,13 @@ def main(args):
             except KeyError:
                 mdir.tail = None
 
+            try:
+                mdir.branch = mdir[Tag('branch', 0, 0)]
+                if mdir.branch.size != 8 or mdir.branch.data == 8*b'\xff':
+                    mdir.branch = None
+            except KeyError:
+                mdir.branch = None
+
             # have superblock?
             try:
                 nsuperblock = mdir[
@@ -65,39 +155,53 @@ def main(args):
             if not mdir:
                 corrupted.append(mdir)
 
-            # add to directories
-            mdirs.append(mdir)
-            if mdir.tail is None or not mdir.tail.is_('hardtail'):
-                dirs.append(mdirs)
-                mdirs = []
+            # add to metadata-pairs
+            mdirs[frozenset(mdir.blocks)] = mdir
+            tail = (struct.unpack('<II', mdir.tail.data)
+                if mdir.tail else None)
 
-            if mdir.tail is None:
-                break
-
-            tail = struct.unpack('<II', mdir.tail.data)
-            hard = mdir.tail.is_('hardtail')
-
-    # find paths
-    dirtable = {}
-    for dir in dirs:
-        dirtable[frozenset(dir[0].blocks)] = dir
-
-    pending = [("/", dirs[0])]
+    # derive paths and build directories
+    dirs = {}
+    rogue = {}
+    pending = [('/', (args.block1, args.block2))]
     while pending:
-        path, dir = pending.pop(0)
-        for mdir in dir:
+        path, branch = pending.pop(0)
+        dir = []
+        while branch and frozenset(branch) in mdirs:
+            mdir = mdirs[frozenset(branch)]
+            dir.append(mdir)
+
             for tag in mdir.tags:
                 if tag.is_('dir'):
                     try:
-                        npath = tag.data.decode('utf8')
+                        npath = path + '/' + tag.data.decode('utf8')
+                        npath = npath.replace('//', '/')
                         dirstruct = mdir[Tag('dirstruct', tag.id, 0)]
-                        nblocks = struct.unpack('<II', dirstruct.data)
-                        nmdir = dirtable[frozenset(nblocks)]
-                        pending.append(((path + '/' + npath), nmdir))
+                        npair = struct.unpack('<II', dirstruct.data)
+                        pending.append((npath, npair))
                     except KeyError:
                         pass
 
-        dir[0].path = path.replace('//', '/')
+            branch = (struct.unpack('<II', mdir.branch.data)
+                if mdir.branch else None)
+
+        if not dir:
+            rogue[path] = branch
+        else:
+            dirs[path] = dir
+
+    # also find orphans
+    not_orphans = {frozenset(mdir.blocks)
+        for dir in dirs.values()
+        for mdir in dir}
+    orphans = []
+    for pair, mdir in mdirs.items():
+        if pair not in not_orphans:
+            if len(orphans) > 0 and (pair == frozenset(
+                    struct.unpack('<II', orphans[-1][-1].tail.data))):
+                orphans[-1].append(mdir)
+            else:
+                orphans.append([mdir])
 
     # print littlefs + version info
     version = ('?', '?')
@@ -109,19 +213,25 @@ def main(args):
         if not any([args.no_truncate, args.tags, args.log, args.all]) else ""))
 
     # print gstate
+    badgstate = None
     print("gstate 0x%s" % ''.join('%02x' % c for c in gstate))
     tag = Tag(struct.unpack('<I', gstate[0:4].ljust(4, b'\xff'))[0])
     blocks = struct.unpack('<II', gstate[4:4+8].ljust(8, b'\xff'))
     if tag.size or not tag.isvalid:
         print("  orphans >=%d" % max(tag.size, 1))
     if tag.type:
-        print("  move dir {%#x, %#x} id %d" % (
-            blocks[0], blocks[1], tag.id))
+        if frozenset(blocks) not in mdirs:
+            badgstate = gstate
+        print("  move dir {%#x, %#x}%s id %d" % (
+            blocks[0], blocks[1],
+            '?' if frozenset(blocks) not in mdirs else '',
+            tag.id))
 
-    # print mdir info
-    for i, dir in enumerate(dirs):
-        print("dir %s" % (json.dumps(dir[0].path)
-            if hasattr(dir[0], 'path') else '(orphan)'))
+    # print dir info
+    for path, dir in it.chain(
+            sorted(dirs.items()),
+            zip(it.repeat(None), orphans)):
+        print("dir %s" % json.dumps(path) if path else "orphaned")
 
         for j, mdir in enumerate(dir):
             print("mdir {%#x, %#x} rev %d (was %d)%s%s" % (
@@ -131,19 +241,21 @@ def main(args):
                 if mdir.tail else ''))
 
             f = io.StringIO()
-            if args.log:
+            if args.tags:
+                mdir.dump_tags(f, truncate=not args.no_truncate)
+            elif args.log:
                 mdir.dump_log(f, truncate=not args.no_truncate)
             elif args.all:
                 mdir.dump_all(f, truncate=not args.no_truncate)
             else:
-                mdir.dump_tags(f, truncate=not args.no_truncate)
+                dumpentries(args, mdir, mdirs, f)
 
             lines = list(filter(None, f.getvalue().split('\n')))
             for k, line in enumerate(lines):
                 print("%s %s" % (
                     ' ' if j == len(dir)-1 else
                     'v' if k == len(lines)-1 else
-                    '|',
+                    '|' if path else '.',
                     line))
 
     errcode = 0
@@ -152,8 +264,18 @@ def main(args):
         print("*** corrupted mdir {%#x, %#x}! ***" % (
             mdir.blocks[0], mdir.blocks[1]))
 
-    if cycle:
+    for path, pair in rogue.items():
         errcode = errcode or 2
+        print("*** couldn't find dir %s {%#x, %#x}! ***" % (
+            json.dumps(path), pair[0], pair[1]))
+
+    if badgstate:
+        errcode = errcode or 3
+        print("*** bad gstate 0x%s! ***" %
+            ''.join('%02x' % c for c in gstate))
+
+    if cycle:
+        errcode = errcode or 4
         print("*** cycle detected {%#x, %#x}! ***" % (
             cycle[0], cycle[1]))
 
@@ -170,10 +292,12 @@ if __name__ == "__main__":
         help="Size of a block in bytes.")
     parser.add_argument('block1', nargs='?', default=0,
         type=lambda x: int(x, 0),
-        help="Optional first block address for finding the superblock.")
+        help="Optional first block address for finding the root.")
     parser.add_argument('block2', nargs='?', default=1,
         type=lambda x: int(x, 0),
-        help="Optional second block address for finding the superblock.")
+        help="Optional second block address for finding the root.")
+    parser.add_argument('-t', '--tags', action='store_true',
+        help="Show metadata tags instead of reconstructing entries.")
     parser.add_argument('-l', '--log', action='store_true',
         help="Show tags in log.")
     parser.add_argument('-a', '--all', action='store_true',

scripts/test.py

@@ -34,43 +34,13 @@ $(foreach target,$(SRC),$(eval $(FLATTEN)))
 %.test: %.test.o $(foreach f,$(subst /,.,$(SRC:.c=.o)),%.$f)
     $(CC) $(CFLAGS) $^ $(LFLAGS) -o $@
 """
-BEFORE_MAIN = """
-const char *lfs_testbd_path;
-uint32_t lfs_testbd_cycles;
-
-int lfs_testbd_readctx(void *ctx, lfs_block_t block,
-        lfs_off_t off, void *buffer, lfs_size_t size) {
-    return lfs_testbd_read((lfs_testbd_t*)ctx, block, off, buffer, size);
-}
-
-int lfs_testbd_progctx(void *ctx, lfs_block_t block,
-        lfs_off_t off, const void *buffer, lfs_size_t size) {
-    return lfs_testbd_prog((lfs_testbd_t*)ctx, block, off, buffer, size);
-}
-
-int lfs_testbd_erasectx(void *ctx, lfs_block_t block) {
-    return lfs_testbd_erase((lfs_testbd_t*)ctx, block);
-}
-
-int lfs_testbd_syncctx(void *ctx) {
-    return lfs_testbd_sync((lfs_testbd_t*)ctx);
-}
-"""
-BEFORE_TESTS = """
+GLOBALS = """
 //////////////// AUTOGENERATED TEST ////////////////
 #include "lfs.h"
 #include "bd/lfs_testbd.h"
 #include <stdio.h>
-
 extern const char *lfs_testbd_path;
 extern uint32_t lfs_testbd_cycles;
-
-extern int lfs_testbd_readctx(void *ctx, lfs_block_t block,
-        lfs_off_t off, void *buffer, lfs_size_t size);
-extern int lfs_testbd_progctx(void *ctx, lfs_block_t block,
-        lfs_off_t off, const void *buffer, lfs_size_t size);
-extern int lfs_testbd_erasectx(void *ctx, lfs_block_t block);
-extern int lfs_testbd_syncctx(void *ctx);
 """
 DEFINES = {
     'LFS_READ_SIZE': 16,
@@ -78,23 +48,12 @@ DEFINES = {
     'LFS_BLOCK_SIZE': 512,
     'LFS_BLOCK_COUNT': 1024,
     'LFS_BLOCK_CYCLES': -1,
-    'LFS_BUFFER_SIZE': '(64 % LFS_PROG_SIZE == 0 ? 64 : LFS_PROG_SIZE)',
+    'LFS_CACHE_SIZE': '(64 % LFS_PROG_SIZE == 0 ? 64 : LFS_PROG_SIZE)',
     'LFS_LOOKAHEAD_SIZE': 16,
     'LFS_ERASE_VALUE': 0xff,
     'LFS_ERASE_CYCLES': 0,
     'LFS_BADBLOCK_BEHAVIOR': 'LFS_TESTBD_BADBLOCK_PROGERROR',
 }
-CFG = {
-    'read_size':        'LFS_READ_SIZE',
-    'prog_size':        'LFS_PROG_SIZE',
-    'read_size':        'LFS_READ_SIZE',
-    'prog_size':        'LFS_PROG_SIZE',
-    'block_size':       'LFS_BLOCK_SIZE',
-    'block_count':      'LFS_BLOCK_COUNT',
-    'block_cycles':     'LFS_BLOCK_CYCLES',
-    'buffer_size':      'LFS_BUFFER_SIZE',
-    'lookahead_size':   'LFS_LOOKAHEAD_SIZE',
-}
 PROLOGUE = """
     // prologue
     __attribute__((unused)) lfs_t lfs;
@@ -107,45 +66,33 @@ PROLOGUE = """
     __attribute__((unused)) lfs_size_t size;
     __attribute__((unused)) int err;
     
-    __attribute__((unused)) const struct lfs_cfg cfg = {
-        .bd_ctx     = &bd,
-        .bd_read    = lfs_testbd_readctx,
-        .bd_prog    = lfs_testbd_progctx,
-        .bd_erase   = lfs_testbd_erasectx,
-        .bd_sync    = lfs_testbd_syncctx,
-%(cfg)s
+    __attribute__((unused)) const struct lfs_config cfg = {
+        .context        = &bd,
+        .read           = lfs_testbd_read,
+        .prog           = lfs_testbd_prog,
+        .erase          = lfs_testbd_erase,
+        .sync           = lfs_testbd_sync,
+        .read_size      = LFS_READ_SIZE,
+        .prog_size      = LFS_PROG_SIZE,
+        .block_size     = LFS_BLOCK_SIZE,
+        .block_count    = LFS_BLOCK_COUNT,
+        .block_cycles   = LFS_BLOCK_CYCLES,
+        .cache_size     = LFS_CACHE_SIZE,
+        .lookahead_size = LFS_LOOKAHEAD_SIZE,
     };
 
-    __attribute__((unused)) const struct lfs_testbd_cfg bdcfg = {
-        .rambd_cfg = &(const struct lfs_rambd_cfg){
-            .read_size      = LFS_READ_SIZE,
-            .prog_size      = LFS_PROG_SIZE,
-            .erase_size     = LFS_BLOCK_SIZE,
-            .erase_count    = LFS_BLOCK_COUNT,
-            .erase_value    = LFS_ERASE_VALUE,
-        },
-        .filebd_cfg = &(const struct lfs_filebd_cfg){
-            .read_size      = LFS_READ_SIZE,
-            .prog_size      = LFS_PROG_SIZE,
-            .erase_size     = LFS_BLOCK_SIZE,
-            .erase_count    = LFS_BLOCK_COUNT,
-            .erase_value    = LFS_ERASE_VALUE,
-        },
-        .read_size          = LFS_READ_SIZE,
-        .prog_size          = LFS_PROG_SIZE,
-        .erase_size         = LFS_BLOCK_SIZE,
-        .erase_count        = LFS_BLOCK_COUNT,
+    __attribute__((unused)) const struct lfs_testbd_config bdcfg = {
         .erase_value        = LFS_ERASE_VALUE,
         .erase_cycles       = LFS_ERASE_CYCLES,
         .badblock_behavior  = LFS_BADBLOCK_BEHAVIOR,
         .power_cycles       = lfs_testbd_cycles,
     };
 
-    lfs_testbd_createcfg(&bd, lfs_testbd_path, &bdcfg) => 0;
+    lfs_testbd_createcfg(&cfg, lfs_testbd_path, &bdcfg) => 0;
 """
 EPILOGUE = """
     // epilogue
-    lfs_testbd_destroy(&bd) => 0;
+    lfs_testbd_destroy(&cfg) => 0;
 """
 PASS = '\033[32m✓\033[0m'
 FAIL = '\033[31m✗\033[0m'
@@ -207,11 +154,7 @@ class TestCase:
             for k in sorted(self.perms[0].defines)
             if k not in self.defines)))
 
-        f.write(PROLOGUE % dict(
-            cfg='\n'.join(
-                8*' '+'.%s = %s,\n' % (k, d)
-                for k, d in sorted(CFG.items())
-                if d not in self.suite.defines)))
+        f.write(PROLOGUE)
         f.write('\n')
         f.write(4*' '+'// test case %d\n' % self.caseno)
         f.write(4*' '+'#line %d "%s"\n' % (self.code_lineno, self.suite.path))
@@ -220,7 +163,6 @@ class TestCase:
         f.write(self.code)
 
         # epilogue
-        f.write(4*' '+'#line %d "%s"\n' % (f.lineno+1, f.path))
         f.write(EPILOGUE)
         f.write('}\n')
 
@@ -289,7 +231,7 @@ class TestCase:
                 ncmd.extend(['-ex', 'r'])
                 if failure.assert_:
                     ncmd.extend(['-ex', 'up 2'])
-            elif gdb == 'main':
+            elif gdb == 'start' or isinstance(gdb, int):
                 ncmd.extend([
                     '-ex', 'b %s:%d' % (self.suite.path, self.code_lineno),
                     '-ex', 'r'])
@@ -387,7 +329,9 @@ class ReentrantTestCase(TestCase):
                 persist = 'noerase'
 
             # exact cycle we should drop into debugger?
-            if gdb and failure and failure.cycleno == cycles:
+            if gdb and failure and (
+                    failure.cycleno == cycles or
+                    (isinstance(gdb, int) and gdb == cycles)):
                 return super().test(gdb=gdb, persist=persist, cycles=cycles,
                     failure=failure, **args)
 
@@ -524,44 +468,31 @@ class TestSuite:
         return self.perms
 
     def build(self, **args):
-        # intercept writes to keep track of linenos
-        def lineno_open(path, flags):
-            f = open(path, flags)
-            f.path = path
-            f.lineno = 1
-            write = f.write
-
-            def lineno_write(s):
-                f.lineno += s.count('\n')
-                write(s)
-            f.write = lineno_write
-            return f
-
         # build test files
-        tf = lineno_open(self.path + '.test.tc', 'w')
-        tf.write(BEFORE_TESTS)
+        tf = open(self.path + '.test.c.t', 'w')
+        tf.write(GLOBALS)
         if self.code is not None:
             tf.write('#line %d "%s"\n' % (self.code_lineno, self.path))
             tf.write(self.code)
-            tf.write('#line %d "%s"\n' % (tf.lineno+1, tf.path))
 
         tfs = {None: tf}
         for case in self.cases:
             if case.in_ not in tfs:
-                tfs[case.in_] = lineno_open(self.path+'.'+
-                    case.in_.replace('/', '.')[:-2]+'.tc', 'w')
+                tfs[case.in_] = open(self.path+'.'+
+                    case.in_.replace('/', '.')+'.t', 'w')
                 tfs[case.in_].write('#line 1 "%s"\n' % case.in_)
                 with open(case.in_) as f:
                     for line in f:
                         tfs[case.in_].write(line)
                 tfs[case.in_].write('\n')
-                tfs[case.in_].write(BEFORE_TESTS)
+                tfs[case.in_].write(GLOBALS)
 
             tfs[case.in_].write('\n')
             case.build(tfs[case.in_], **args)
 
-        tf.write(BEFORE_MAIN)
         tf.write('\n')
+        tf.write('const char *lfs_testbd_path;\n')
+        tf.write('uint32_t lfs_testbd_cycles;\n')
         tf.write('int main(int argc, char **argv) {\n')
         tf.write(4*' '+'int case_         = (argc > 1) ? atoi(argv[1]) : 0;\n')
         tf.write(4*' '+'int perm          = (argc > 2) ? atoi(argv[2]) : 0;\n')
@@ -600,12 +531,12 @@ class TestSuite:
                     mk.write('%s: %s | %s\n' % (
                         self.path+'.test.c',
                         self.path,
-                        self.path+'.test.tc'))
+                        self.path+'.test.c.t'))
                 else:
                     mk.write('%s: %s %s | %s\n' % (
                         self.path+'.'+path.replace('/', '.'),
                         self.path, path,
-                        self.path+'.'+path.replace('/', '.')[:-2]+'.tc'))
+                        self.path+'.'+path.replace('/', '.')+'.t'))
                 mk.write('\t./scripts/explode_asserts.py $| -o $@\n')
 
         self.makefile = self.path + '.mk'
@@ -831,7 +762,8 @@ if __name__ == "__main__":
         help="Store disk image in a file.")
     parser.add_argument('-b', '--build', action='store_true',
         help="Only build the tests, do not execute.")
-    parser.add_argument('-g', '--gdb', choices=['init', 'main', 'assert'],
+    parser.add_argument('-g', '--gdb', metavar='{init,start,assert},CYCLE',
+        type=lambda n: n if n in {'init', 'start', 'assert'} else int(n, 0),
         nargs='?', const='assert',
         help="Drop into gdb on test failure.")
     parser.add_argument('--no-internal', action='store_true',

tests/test_alloc.toml

@@ -9,12 +9,12 @@ code = '''
     const char *names[FILES] = {"bacon", "eggs", "pancakes"};
     lfs_file_t files[FILES];
 
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "breakfast") => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     for (int n = 0; n < FILES; n++) {
         sprintf(path, "breakfast/%s", names[n]);
         lfs_file_open(&lfs, &files[n], path,
@@ -31,7 +31,7 @@ code = '''
     }
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     for (int n = 0; n < FILES; n++) {
         sprintf(path, "breakfast/%s", names[n]);
         lfs_file_open(&lfs, &file, path, LFS_O_RDONLY) => 0;
@@ -51,13 +51,13 @@ define.SIZE = '(((LFS_BLOCK_SIZE-8)*(LFS_BLOCK_COUNT-6)) / FILES)'
 code = '''
     const char *names[FILES] = {"bacon", "eggs", "pancakes"};
 
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "breakfast") => 0;
     lfs_unmount(&lfs) => 0;
 
     for (int n = 0; n < FILES; n++) {
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
         sprintf(path, "breakfast/%s", names[n]);
         lfs_file_open(&lfs, &file, path,
                 LFS_O_WRONLY | LFS_O_CREAT | LFS_O_APPEND) => 0;
@@ -70,7 +70,7 @@ code = '''
         lfs_unmount(&lfs) => 0;
     }
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     for (int n = 0; n < FILES; n++) {
         sprintf(path, "breakfast/%s", names[n]);
         lfs_file_open(&lfs, &file, path, LFS_O_RDONLY) => 0;
@@ -92,14 +92,14 @@ code = '''
     const char *names[FILES] = {"bacon", "eggs", "pancakes"};
     lfs_file_t files[FILES];
 
-    lfs_formatcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
 
     for (int c = 0; c < CYCLES; c++) {
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
         lfs_mkdir(&lfs, "breakfast") => 0;
         lfs_unmount(&lfs) => 0;
 
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
         for (int n = 0; n < FILES; n++) {
             sprintf(path, "breakfast/%s", names[n]);
             lfs_file_open(&lfs, &files[n], path,
@@ -116,7 +116,7 @@ code = '''
         }
         lfs_unmount(&lfs) => 0;
 
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
         for (int n = 0; n < FILES; n++) {
             sprintf(path, "breakfast/%s", names[n]);
             lfs_file_open(&lfs, &file, path, LFS_O_RDONLY) => 0;
@@ -129,7 +129,7 @@ code = '''
         }
         lfs_unmount(&lfs) => 0;
 
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
         for (int n = 0; n < FILES; n++) {
             sprintf(path, "breakfast/%s", names[n]);
             lfs_remove(&lfs, path) => 0;
@@ -146,15 +146,15 @@ define.CYCLES = [1, 10]
 code = '''
     const char *names[FILES] = {"bacon", "eggs", "pancakes"};
 
-    lfs_formatcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
 
     for (int c = 0; c < CYCLES; c++) {
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
         lfs_mkdir(&lfs, "breakfast") => 0;
         lfs_unmount(&lfs) => 0;
 
         for (int n = 0; n < FILES; n++) {
-            lfs_mountcfg(&lfs, &cfg) => 0;
+            lfs_mount(&lfs, &cfg) => 0;
             sprintf(path, "breakfast/%s", names[n]);
             lfs_file_open(&lfs, &file, path,
                     LFS_O_WRONLY | LFS_O_CREAT | LFS_O_APPEND) => 0;
@@ -167,7 +167,7 @@ code = '''
             lfs_unmount(&lfs) => 0;
         }
 
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
         for (int n = 0; n < FILES; n++) {
             sprintf(path, "breakfast/%s", names[n]);
             lfs_file_open(&lfs, &file, path, LFS_O_RDONLY) => 0;
@@ -180,7 +180,7 @@ code = '''
         }
         lfs_unmount(&lfs) => 0;
 
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
         for (int n = 0; n < FILES; n++) {
             sprintf(path, "breakfast/%s", names[n]);
             lfs_remove(&lfs, path) => 0;
@@ -192,8 +192,8 @@ code = '''
 
 [[case]] # exhaustion test
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "exhaustion", LFS_O_WRONLY | LFS_O_CREAT);
     size = strlen("exhaustion");
     memcpy(buffer, "exhaustion", size);
@@ -216,7 +216,7 @@ code = '''
     lfs_file_close(&lfs, &file) => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "exhaustion", LFS_O_RDONLY);
     size = strlen("exhaustion");
     lfs_file_size(&lfs, &file) => size;
@@ -229,8 +229,8 @@ code = '''
 [[case]] # exhaustion wraparound test
 define.SIZE = '(((LFS_BLOCK_SIZE-8)*(LFS_BLOCK_COUNT-4)) / 3)'
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
     lfs_file_open(&lfs, &file, "padding", LFS_O_WRONLY | LFS_O_CREAT);
     size = strlen("buffering");
@@ -263,7 +263,7 @@ code = '''
     lfs_file_close(&lfs, &file) => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "exhaustion", LFS_O_RDONLY);
     size = strlen("exhaustion");
     lfs_file_size(&lfs, &file) => size;
@@ -276,8 +276,8 @@ code = '''
 
 [[case]] # dir exhaustion test
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
     // find out max file size
     lfs_mkdir(&lfs, "exhaustiondir") => 0;
@@ -323,90 +323,6 @@ code = '''
     lfs_unmount(&lfs) => 0;
 '''
 
-[[case]] # what if we have a bad block during an allocation scan?
-in = "lfs.c"
-define.LFS_ERASE_CYCLES = 0xffffffff
-define.LFS_BADBLOCK_BEHAVIOR = 'LFS_TESTBD_BADBLOCK_READERROR'
-code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
-    // first fill to exhaustion to find available space
-    lfs_file_open(&lfs, &file, "pacman", LFS_O_WRONLY | LFS_O_CREAT) => 0;
-    strcpy((char*)buffer, "waka");
-    size = strlen("waka");
-    lfs_size_t filesize = 0;
-    while (true) {
-        lfs_ssize_t res = lfs_file_write(&lfs, &file, buffer, size);
-        assert(res == (lfs_ssize_t)size || res == LFS_ERR_NOSPC);
-        if (res == LFS_ERR_NOSPC) {
-            break;
-        }
-        filesize += size;
-    }
-    lfs_file_close(&lfs, &file) => 0;
-    // now fill all but a couple of blocks of the filesystem with data
-    filesize -= 3*LFS_BLOCK_SIZE;
-    lfs_file_open(&lfs, &file, "pacman", LFS_O_WRONLY | LFS_O_CREAT) => 0;
-    strcpy((char*)buffer, "waka");
-    size = strlen("waka");
-    for (lfs_size_t i = 0; i < filesize/size; i++) {
-        lfs_file_write(&lfs, &file, buffer, size) => size;
-    }
-    lfs_file_close(&lfs, &file) => 0;
-    // also save head of file so we can error during lookahead scan
-    lfs_block_t fileblock = file.ctz.head;
-    lfs_unmount(&lfs) => 0;
-
-    // remount to force an alloc scan
-    lfs_mountcfg(&lfs, &cfg) => 0;
-
-    // but mark the head of our file as a "bad block", this is force our
-    // scan to bail early
-    lfs_testbd_setwear(&bd, fileblock, 0xffffffff) => 0;
-    lfs_file_open(&lfs, &file, "ghost", LFS_O_WRONLY | LFS_O_CREAT) => 0;
-    strcpy((char*)buffer, "chomp");
-    size = strlen("chomp");
-    while (true) {
-        lfs_ssize_t res = lfs_file_write(&lfs, &file, buffer, size);
-        assert(res == (lfs_ssize_t)size || res == LFS_ERR_CORRUPT);
-        if (res == LFS_ERR_CORRUPT) {
-            break;
-        }
-    }
-    lfs_file_close(&lfs, &file) => 0;
-
-    // now reverse the "bad block" and try to write the file again until we
-    // run out of space
-    lfs_testbd_setwear(&bd, fileblock, 0) => 0;
-    lfs_file_open(&lfs, &file, "ghost", LFS_O_WRONLY | LFS_O_CREAT) => 0;
-    strcpy((char*)buffer, "chomp");
-    size = strlen("chomp");
-    while (true) {
-        lfs_ssize_t res = lfs_file_write(&lfs, &file, buffer, size);
-        assert(res == (lfs_ssize_t)size || res == LFS_ERR_NOSPC);
-        if (res == LFS_ERR_NOSPC) {
-            break;
-        }
-    }
-    lfs_file_close(&lfs, &file) => 0;
-
-    lfs_unmount(&lfs) => 0;
-
-    // check that the disk isn't hurt
-    lfs_mountcfg(&lfs, &cfg) => 0;
-    lfs_file_open(&lfs, &file, "pacman", LFS_O_RDONLY) => 0;
-    strcpy((char*)buffer, "waka");
-    size = strlen("waka");
-    for (lfs_size_t i = 0; i < filesize/size; i++) {
-        uint8_t rbuffer[4];
-        lfs_file_read(&lfs, &file, rbuffer, size) => size;
-        assert(memcmp(rbuffer, buffer, size) == 0);
-    }
-    lfs_file_close(&lfs, &file) => 0;
-    lfs_unmount(&lfs) => 0;
-'''
-
-
 # Below, I don't like these tests. They're fragile and depend _heavily_
 # on the geometry of the block device. But they are valuable. Eventually they
 # should be removed and replaced with generalized tests.
@@ -416,8 +332,8 @@ define.LFS_BLOCK_SIZE = 512
 define.LFS_BLOCK_COUNT = 1024
 if = 'LFS_BLOCK_SIZE == 512 && LFS_BLOCK_COUNT == 1024'
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
     // find out max file size
     lfs_mkdir(&lfs, "exhaustiondir") => 0;
@@ -487,22 +403,22 @@ define.LFS_BLOCK_SIZE = 512
 define.LFS_BLOCK_COUNT = 1024
 if = 'LFS_BLOCK_SIZE == 512 && LFS_BLOCK_COUNT == 1024'
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
     // create one block hole for half a directory
     lfs_file_open(&lfs, &file, "bump", LFS_O_WRONLY | LFS_O_CREAT) => 0;
-    for (lfs_size_t i = 0; i < LFS_BLOCK_SIZE; i += 2) {
+    for (lfs_size_t i = 0; i < cfg.block_size; i += 2) {
         memcpy(&buffer[i], "hi", 2);
     }
-    lfs_file_write(&lfs, &file, buffer, LFS_BLOCK_SIZE) => LFS_BLOCK_SIZE;
+    lfs_file_write(&lfs, &file, buffer, cfg.block_size) => cfg.block_size;
     lfs_file_close(&lfs, &file) => 0;
 
     lfs_file_open(&lfs, &file, "exhaustion", LFS_O_WRONLY | LFS_O_CREAT);
     size = strlen("blahblahblahblah");
     memcpy(buffer, "blahblahblahblah", size);
     for (lfs_size_t i = 0;
-            i < (LFS_BLOCK_COUNT-4)*(LFS_BLOCK_SIZE-8);
+            i < (cfg.block_count-4)*(cfg.block_size-8);
             i += size) {
         lfs_file_write(&lfs, &file, buffer, size) => size;
     }
@@ -510,7 +426,7 @@ code = '''
 
     // remount to force reset of lookahead
     lfs_unmount(&lfs) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
     // open hole
     lfs_remove(&lfs, "bump") => 0;
@@ -518,10 +434,10 @@ code = '''
     lfs_mkdir(&lfs, "splitdir") => 0;
     lfs_file_open(&lfs, &file, "splitdir/bump",
             LFS_O_WRONLY | LFS_O_CREAT) => 0;
-    for (lfs_size_t i = 0; i < LFS_BLOCK_SIZE; i += 2) {
+    for (lfs_size_t i = 0; i < cfg.block_size; i += 2) {
         memcpy(&buffer[i], "hi", 2);
     }
-    lfs_file_write(&lfs, &file, buffer, 2*LFS_BLOCK_SIZE) => LFS_ERR_NOSPC;
+    lfs_file_write(&lfs, &file, buffer, 2*cfg.block_size) => LFS_ERR_NOSPC;
     lfs_file_close(&lfs, &file) => 0;
 
     lfs_unmount(&lfs) => 0;
@@ -532,8 +448,8 @@ define.LFS_BLOCK_SIZE = 512
 define.LFS_BLOCK_COUNT = 1024
 if = 'LFS_BLOCK_SIZE == 512 && LFS_BLOCK_COUNT == 1024'
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
     // fill completely with two files
     lfs_file_open(&lfs, &file, "exhaustion1",
@@ -541,7 +457,7 @@ code = '''
     size = strlen("blahblahblahblah");
     memcpy(buffer, "blahblahblahblah", size);
     for (lfs_size_t i = 0;
-            i < ((LFS_BLOCK_COUNT-2)/2)*(LFS_BLOCK_SIZE-8);
+            i < ((cfg.block_count-2)/2)*(cfg.block_size-8);
             i += size) {
         lfs_file_write(&lfs, &file, buffer, size) => size;
     }
@@ -552,7 +468,7 @@ code = '''
     size = strlen("blahblahblahblah");
     memcpy(buffer, "blahblahblahblah", size);
     for (lfs_size_t i = 0;
-            i < ((LFS_BLOCK_COUNT-2+1)/2)*(LFS_BLOCK_SIZE-8);
+            i < ((cfg.block_count-2+1)/2)*(cfg.block_size-8);
             i += size) {
         lfs_file_write(&lfs, &file, buffer, size) => size;
     }
@@ -560,7 +476,7 @@ code = '''
 
     // remount to force reset of lookahead
     lfs_unmount(&lfs) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
     // rewrite one file
     lfs_file_open(&lfs, &file, "exhaustion1",
@@ -569,7 +485,7 @@ code = '''
     size = strlen("blahblahblahblah");
     memcpy(buffer, "blahblahblahblah", size);
     for (lfs_size_t i = 0;
-            i < ((LFS_BLOCK_COUNT-2)/2)*(LFS_BLOCK_SIZE-8);
+            i < ((cfg.block_count-2)/2)*(cfg.block_size-8);
             i += size) {
         lfs_file_write(&lfs, &file, buffer, size) => size;
     }
@@ -583,7 +499,7 @@ code = '''
     size = strlen("blahblahblahblah");
     memcpy(buffer, "blahblahblahblah", size);
     for (lfs_size_t i = 0;
-            i < ((LFS_BLOCK_COUNT-2+1)/2)*(LFS_BLOCK_SIZE-8);
+            i < ((cfg.block_count-2+1)/2)*(cfg.block_size-8);
             i += size) {
         lfs_file_write(&lfs, &file, buffer, size) => size;
     }
@@ -597,8 +513,8 @@ define.LFS_BLOCK_SIZE = 512
 define.LFS_BLOCK_COUNT = 1024
 if = 'LFS_BLOCK_SIZE == 512 && LFS_BLOCK_COUNT == 1024'
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
     // fill completely with two files
     lfs_file_open(&lfs, &file, "exhaustion1",
@@ -606,7 +522,7 @@ code = '''
     size = strlen("blahblahblahblah");
     memcpy(buffer, "blahblahblahblah", size);
     for (lfs_size_t i = 0;
-            i < ((LFS_BLOCK_COUNT-2)/2)*(LFS_BLOCK_SIZE-8);
+            i < ((cfg.block_count-2)/2)*(cfg.block_size-8);
             i += size) {
         lfs_file_write(&lfs, &file, buffer, size) => size;
     }
@@ -617,7 +533,7 @@ code = '''
     size = strlen("blahblahblahblah");
     memcpy(buffer, "blahblahblahblah", size);
     for (lfs_size_t i = 0;
-            i < ((LFS_BLOCK_COUNT-2+1)/2)*(LFS_BLOCK_SIZE-8);
+            i < ((cfg.block_count-2+1)/2)*(cfg.block_size-8);
             i += size) {
         lfs_file_write(&lfs, &file, buffer, size) => size;
     }
@@ -625,7 +541,7 @@ code = '''
 
     // remount to force reset of lookahead
     lfs_unmount(&lfs) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
     // rewrite one file with a hole of one block
     lfs_file_open(&lfs, &file, "exhaustion1",
@@ -634,7 +550,7 @@ code = '''
     size = strlen("blahblahblahblah");
     memcpy(buffer, "blahblahblahblah", size);
     for (lfs_size_t i = 0;
-            i < ((LFS_BLOCK_COUNT-2)/2 - 1)*(LFS_BLOCK_SIZE-8);
+            i < ((cfg.block_count-2)/2 - 1)*(cfg.block_size-8);
             i += size) {
         lfs_file_write(&lfs, &file, buffer, size) => size;
     }

tests/test_attrs.toml

@@ -1,14 +1,14 @@
 [[case]] # set/get attribute
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "hello") => 0;
     lfs_file_open(&lfs, &file, "hello/hello", LFS_O_WRONLY | LFS_O_CREAT) => 0;
     lfs_file_write(&lfs, &file, "hello", strlen("hello")) => strlen("hello");
     lfs_file_close(&lfs, &file);
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     memset(buffer, 0, sizeof(buffer));
     lfs_setattr(&lfs, "hello", 'A', "aaaa",   4) => 0;
     lfs_setattr(&lfs, "hello", 'B', "bbbbbb", 6) => 0;
@@ -60,7 +60,7 @@ code = '''
 
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     memset(buffer, 0, sizeof(buffer));
     lfs_getattr(&lfs, "hello", 'A', buffer,    4) => 4;
     lfs_getattr(&lfs, "hello", 'B', buffer+4,  9) => 9;
@@ -78,15 +78,15 @@ code = '''
 
 [[case]] # set/get root attribute
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "hello") => 0;
     lfs_file_open(&lfs, &file, "hello/hello", LFS_O_WRONLY | LFS_O_CREAT) => 0;
     lfs_file_write(&lfs, &file, "hello", strlen("hello")) => strlen("hello");
     lfs_file_close(&lfs, &file);
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     memset(buffer, 0, sizeof(buffer));
     lfs_setattr(&lfs, "/", 'A', "aaaa",   4) => 0;
     lfs_setattr(&lfs, "/", 'B', "bbbbbb", 6) => 0;
@@ -137,7 +137,7 @@ code = '''
     lfs_getattr(&lfs, "/", 'C', buffer+10, 5) => 5;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     memset(buffer, 0, sizeof(buffer));
     lfs_getattr(&lfs, "/", 'A', buffer,    4) => 4;
     lfs_getattr(&lfs, "/", 'B', buffer+4,  9) => 9;
@@ -155,22 +155,22 @@ code = '''
 
 [[case]] # set/get file attribute
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "hello") => 0;
     lfs_file_open(&lfs, &file, "hello/hello", LFS_O_WRONLY | LFS_O_CREAT) => 0;
     lfs_file_write(&lfs, &file, "hello", strlen("hello")) => strlen("hello");
     lfs_file_close(&lfs, &file);
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     memset(buffer, 0, sizeof(buffer));
     struct lfs_attr attrs1[] = {
         {'A', buffer,    4},
         {'B', buffer+4,  6},
         {'C', buffer+10, 5},
     };
-    struct lfs_file_cfg cfg1 = {.attrs=attrs1, .attr_count=3};
+    struct lfs_file_config cfg1 = {.attrs=attrs1, .attr_count=3};
 
     lfs_file_opencfg(&lfs, &file, "hello/hello", LFS_O_WRONLY, &cfg1) => 0;
     memcpy(buffer,    "aaaa",   4);
@@ -228,7 +228,7 @@ code = '''
         {'B', buffer+4,  9},
         {'C', buffer+13, 5},
     };
-    struct lfs_file_cfg cfg2 = {.attrs=attrs2, .attr_count=3};
+    struct lfs_file_config cfg2 = {.attrs=attrs2, .attr_count=3};
     lfs_file_opencfg(&lfs, &file, "hello/hello", LFS_O_RDWR, &cfg2) => 0;
     memcpy(buffer+4,  "fffffffff", 9);
     lfs_file_close(&lfs, &file) => 0;
@@ -238,14 +238,14 @@ code = '''
 
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     memset(buffer, 0, sizeof(buffer));
     struct lfs_attr attrs3[] = {
         {'A', buffer,    4},
         {'B', buffer+4,  9},
         {'C', buffer+13, 5},
     };
-    struct lfs_file_cfg cfg3 = {.attrs=attrs3, .attr_count=3};
+    struct lfs_file_config cfg3 = {.attrs=attrs3, .attr_count=3};
 
     lfs_file_opencfg(&lfs, &file, "hello/hello", LFS_O_RDONLY, &cfg3) => 0;
     lfs_file_close(&lfs, &file) => 0;
@@ -262,15 +262,15 @@ code = '''
 
 [[case]] # deferred file attributes
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "hello") => 0;
     lfs_file_open(&lfs, &file, "hello/hello", LFS_O_WRONLY | LFS_O_CREAT) => 0;
     lfs_file_write(&lfs, &file, "hello", strlen("hello")) => strlen("hello");
     lfs_file_close(&lfs, &file);
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_setattr(&lfs, "hello/hello", 'B', "fffffffff",  9) => 0;
     lfs_setattr(&lfs, "hello/hello", 'C', "ccccc",      5) => 0;
 
@@ -280,7 +280,7 @@ code = '''
         {'C', "",     0},
         {'D', "hhhh", 4},
     };
-    struct lfs_file_cfg cfg1 = {.attrs=attrs1, .attr_count=3};
+    struct lfs_file_config cfg1 = {.attrs=attrs1, .attr_count=3};
 
     lfs_file_opencfg(&lfs, &file, "hello/hello", LFS_O_WRONLY, &cfg1) => 0;
 

tests/test_badblocks.toml

@@ -16,12 +16,12 @@ define.NAMEMULT = 64
 define.FILEMULT = 1
 code = '''
     for (lfs_block_t badblock = 2; badblock < LFS_BLOCK_COUNT; badblock++) {
-        lfs_testbd_setwear(&bd, badblock-1, 0) => 0;
-        lfs_testbd_setwear(&bd, badblock, 0xffffffff) => 0;
+        lfs_testbd_setwear(&cfg, badblock-1, 0) => 0;
+        lfs_testbd_setwear(&cfg, badblock, 0xffffffff) => 0;
         
-        lfs_formatcfg(&lfs, &cfg) => 0;
+        lfs_format(&lfs, &cfg) => 0;
 
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
         for (int i = 1; i < 10; i++) {
             for (int j = 0; j < NAMEMULT; j++) {
                 buffer[j] = '0'+i;
@@ -46,7 +46,7 @@ code = '''
         }
         lfs_unmount(&lfs) => 0;
 
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
         for (int i = 1; i < 10; i++) {
             for (int j = 0; j < NAMEMULT; j++) {
                 buffer[j] = '0'+i;
@@ -90,12 +90,12 @@ define.NAMEMULT = 64
 define.FILEMULT = 1
 code = '''
     for (lfs_block_t i = 0; i < (LFS_BLOCK_COUNT-2)/2; i++) {
-        lfs_testbd_setwear(&bd, i+2, 0xffffffff) => 0;
+        lfs_testbd_setwear(&cfg, i+2, 0xffffffff) => 0;
     }
     
-    lfs_formatcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     for (int i = 1; i < 10; i++) {
         for (int j = 0; j < NAMEMULT; j++) {
             buffer[j] = '0'+i;
@@ -120,7 +120,7 @@ code = '''
     }
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     for (int i = 1; i < 10; i++) {
         for (int j = 0; j < NAMEMULT; j++) {
             buffer[j] = '0'+i;
@@ -163,12 +163,12 @@ define.NAMEMULT = 64
 define.FILEMULT = 1
 code = '''
     for (lfs_block_t i = 0; i < (LFS_BLOCK_COUNT-2)/2; i++) {
-        lfs_testbd_setwear(&bd, (2*i) + 2, 0xffffffff) => 0;
+        lfs_testbd_setwear(&cfg, (2*i) + 2, 0xffffffff) => 0;
     }
     
-    lfs_formatcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     for (int i = 1; i < 10; i++) {
         for (int j = 0; j < NAMEMULT; j++) {
             buffer[j] = '0'+i;
@@ -193,7 +193,7 @@ code = '''
     }
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     for (int i = 1; i < 10; i++) {
         for (int j = 0; j < NAMEMULT; j++) {
             buffer[j] = '0'+i;
@@ -233,9 +233,9 @@ define.LFS_BADBLOCK_BEHAVIOR = [
     'LFS_TESTBD_BADBLOCK_ERASENOOP',
 ]
 code = '''
-    lfs_testbd_setwear(&bd, 0, 0xffffffff) => 0;
-    lfs_testbd_setwear(&bd, 1, 0xffffffff) => 0;
+    lfs_testbd_setwear(&cfg, 0, 0xffffffff) => 0;
+    lfs_testbd_setwear(&cfg, 1, 0xffffffff) => 0;
 
-    lfs_formatcfg(&lfs, &cfg) => LFS_ERR_NOSPC;
-    lfs_mountcfg(&lfs, &cfg) => LFS_ERR_CORRUPT;
+    lfs_format(&lfs, &cfg) => LFS_ERR_NOSPC;
+    lfs_mount(&lfs, &cfg) => LFS_ERR_CORRUPT;
 '''

tests/test_dirs.toml

@@ -1,7 +1,7 @@
 [[case]] # root
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "/") => 0;
     lfs_dir_read(&lfs, &dir, &info) => 1;
     assert(info.type == LFS_TYPE_DIR);
@@ -17,16 +17,16 @@ code = '''
 [[case]] # many directory creation
 define.N = 'range(0, 100, 3)'
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     for (int i = 0; i < N; i++) {
         sprintf(path, "dir%03d", i);
         lfs_mkdir(&lfs, path) => 0;
     }
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "/") => 0;
     lfs_dir_read(&lfs, &dir, &info) => 1;
     assert(info.type == LFS_TYPE_DIR);
@@ -48,16 +48,16 @@ code = '''
 [[case]] # many directory removal
 define.N = 'range(3, 100, 11)'
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     for (int i = 0; i < N; i++) {
         sprintf(path, "removeme%03d", i);
         lfs_mkdir(&lfs, path) => 0;
     }
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "/") => 0;
     lfs_dir_read(&lfs, &dir, &info) => 1;
     assert(info.type == LFS_TYPE_DIR);
@@ -75,14 +75,14 @@ code = '''
     lfs_dir_close(&lfs, &dir) => 0;
     lfs_unmount(&lfs);
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     for (int i = 0; i < N; i++) {
         sprintf(path, "removeme%03d", i);
         lfs_remove(&lfs, path) => 0;
     }
     lfs_unmount(&lfs);
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "/") => 0;
     lfs_dir_read(&lfs, &dir, &info) => 1;
     assert(info.type == LFS_TYPE_DIR);
@@ -98,16 +98,16 @@ code = '''
 [[case]] # many directory rename
 define.N = 'range(3, 100, 11)'
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     for (int i = 0; i < N; i++) {
         sprintf(path, "test%03d", i);
         lfs_mkdir(&lfs, path) => 0;
     }
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "/") => 0;
     lfs_dir_read(&lfs, &dir, &info) => 1;
     assert(info.type == LFS_TYPE_DIR);
@@ -125,7 +125,7 @@ code = '''
     lfs_dir_close(&lfs, &dir) => 0;
     lfs_unmount(&lfs);
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     for (int i = 0; i < N; i++) {
         char oldpath[128];
         char newpath[128];
@@ -135,7 +135,7 @@ code = '''
     }
     lfs_unmount(&lfs);
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "/") => 0;
     lfs_dir_read(&lfs, &dir, &info) => 1;
     assert(info.type == LFS_TYPE_DIR);
@@ -158,10 +158,10 @@ code = '''
 define.N = [5, 11]
 reentrant = true
 code = '''
-    err = lfs_mountcfg(&lfs, &cfg);
+    err = lfs_mount(&lfs, &cfg);
     if (err) {
-        lfs_formatcfg(&lfs, &cfg) => 0;
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_format(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
     }
 
     for (int i = 0; i < N; i++) {
@@ -237,18 +237,20 @@ code = '''
 [[case]] # file creation
 define.N = 'range(3, 100, 11)'
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     for (int i = 0; i < N; i++) {
         sprintf(path, "file%03d", i);
         lfs_file_open(&lfs, &file, path,
                 LFS_O_WRONLY | LFS_O_CREAT | LFS_O_EXCL) => 0;
         lfs_file_close(&lfs, &file) => 0;
     }
+    // TODO rm me
+    lfs_mkdir(&lfs, "a") => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "/") => 0;
     lfs_dir_read(&lfs, &dir, &info) => 1;
     assert(info.type == LFS_TYPE_DIR);
@@ -256,6 +258,9 @@ code = '''
     lfs_dir_read(&lfs, &dir, &info) => 1;
     assert(info.type == LFS_TYPE_DIR);
     assert(strcmp(info.name, "..") == 0);
+    lfs_dir_read(&lfs, &dir, &info) => 1;
+    assert(info.type == LFS_TYPE_DIR);
+    assert(strcmp(info.name, "a") == 0);
     for (int i = 0; i < N; i++) {
         sprintf(path, "file%03d", i);
         lfs_dir_read(&lfs, &dir, &info) => 1;
@@ -270,9 +275,9 @@ code = '''
 [[case]] # file removal
 define.N = 'range(0, 100, 3)'
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     for (int i = 0; i < N; i++) {
         sprintf(path, "removeme%03d", i);
         lfs_file_open(&lfs, &file, path,
@@ -281,7 +286,7 @@ code = '''
     }
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "/") => 0;
     lfs_dir_read(&lfs, &dir, &info) => 1;
     assert(info.type == LFS_TYPE_DIR);
@@ -299,14 +304,14 @@ code = '''
     lfs_dir_close(&lfs, &dir) => 0;
     lfs_unmount(&lfs);
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     for (int i = 0; i < N; i++) {
         sprintf(path, "removeme%03d", i);
         lfs_remove(&lfs, path) => 0;
     }
     lfs_unmount(&lfs);
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "/") => 0;
     lfs_dir_read(&lfs, &dir, &info) => 1;
     assert(info.type == LFS_TYPE_DIR);
@@ -322,9 +327,9 @@ code = '''
 [[case]] # file rename
 define.N = 'range(0, 100, 3)'
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     for (int i = 0; i < N; i++) {
         sprintf(path, "test%03d", i);
         lfs_file_open(&lfs, &file, path,
@@ -333,7 +338,7 @@ code = '''
     }
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "/") => 0;
     lfs_dir_read(&lfs, &dir, &info) => 1;
     assert(info.type == LFS_TYPE_DIR);
@@ -351,7 +356,7 @@ code = '''
     lfs_dir_close(&lfs, &dir) => 0;
     lfs_unmount(&lfs);
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     for (int i = 0; i < N; i++) {
         char oldpath[128];
         char newpath[128];
@@ -361,7 +366,7 @@ code = '''
     }
     lfs_unmount(&lfs);
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "/") => 0;
     lfs_dir_read(&lfs, &dir, &info) => 1;
     assert(info.type == LFS_TYPE_DIR);
@@ -384,10 +389,10 @@ code = '''
 define.N = [5, 25]
 reentrant = true
 code = '''
-    err = lfs_mountcfg(&lfs, &cfg);
+    err = lfs_mount(&lfs, &cfg);
     if (err) {
-        lfs_formatcfg(&lfs, &cfg) => 0;
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_format(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
     }
 
     for (int i = 0; i < N; i++) {
@@ -462,21 +467,21 @@ code = '''
 
 [[case]] # nested directories
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "potato") => 0;
     lfs_file_open(&lfs, &file, "burito",
             LFS_O_WRONLY | LFS_O_CREAT | LFS_O_EXCL) => 0;
     lfs_file_close(&lfs, &file) => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "potato/baked") => 0;
     lfs_mkdir(&lfs, "potato/sweet") => 0;
     lfs_mkdir(&lfs, "potato/fried") => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "potato") => 0;
     lfs_dir_read(&lfs, &dir, &info) => 1;
     assert(strcmp(info.name, ".") == 0);
@@ -498,21 +503,21 @@ code = '''
     lfs_unmount(&lfs) => 0;
 
     // try removing?
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_remove(&lfs, "potato") => LFS_ERR_NOTEMPTY;
     lfs_unmount(&lfs) => 0;
 
     // try renaming?
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_rename(&lfs, "potato", "coldpotato") => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_rename(&lfs, "coldpotato", "warmpotato") => 0;
     lfs_rename(&lfs, "warmpotato", "hotpotato") => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_remove(&lfs, "potato") => LFS_ERR_NOENT;
     lfs_remove(&lfs, "coldpotato") => LFS_ERR_NOENT;
     lfs_remove(&lfs, "warmpotato") => LFS_ERR_NOENT;
@@ -520,7 +525,7 @@ code = '''
     lfs_unmount(&lfs) => 0;
 
     // try cross-directory renaming
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "coldpotato") => 0;
     lfs_rename(&lfs, "hotpotato/baked", "coldpotato/baked") => 0;
     lfs_rename(&lfs, "coldpotato", "hotpotato") => LFS_ERR_NOTEMPTY;
@@ -536,7 +541,7 @@ code = '''
     lfs_remove(&lfs, "hotpotato") => LFS_ERR_NOTEMPTY;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "hotpotato") => 0;
     lfs_dir_read(&lfs, &dir, &info) => 1;
     assert(strcmp(info.name, ".") == 0);
@@ -558,7 +563,7 @@ code = '''
     lfs_unmount(&lfs) => 0;
     
     // final remove
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_remove(&lfs, "hotpotato") => LFS_ERR_NOTEMPTY;
     lfs_remove(&lfs, "hotpotato/baked") => 0;
     lfs_remove(&lfs, "hotpotato") => LFS_ERR_NOTEMPTY;
@@ -568,7 +573,7 @@ code = '''
     lfs_remove(&lfs, "hotpotato") => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "/") => 0;
     lfs_dir_read(&lfs, &dir, &info) => 1;
     assert(strcmp(info.name, ".") == 0);
@@ -587,8 +592,8 @@ code = '''
 [[case]] # recursive remove
 define.N = [10, 100]
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "prickly-pear") => 0;
     for (int i = 0; i < N; i++) {
         sprintf(path, "prickly-pear/cactus%03d", i);
@@ -611,7 +616,7 @@ code = '''
     lfs_dir_close(&lfs, &dir) => 0;
     lfs_unmount(&lfs);
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_remove(&lfs, "prickly-pear") => LFS_ERR_NOTEMPTY;
 
     lfs_dir_open(&lfs, &dir, "prickly-pear") => 0;
@@ -636,22 +641,22 @@ code = '''
     lfs_remove(&lfs, "prickly-pear") => LFS_ERR_NOENT;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_remove(&lfs, "prickly-pear") => LFS_ERR_NOENT;
     lfs_unmount(&lfs) => 0;
 '''
 
 [[case]] # other error cases
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "potato") => 0;
     lfs_file_open(&lfs, &file, "burito",
             LFS_O_WRONLY | LFS_O_CREAT | LFS_O_EXCL) => 0;
     lfs_file_close(&lfs, &file) => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
     lfs_mkdir(&lfs, "potato") => LFS_ERR_EXIST;
     lfs_mkdir(&lfs, "burito") => LFS_ERR_EXIST;
@@ -696,7 +701,7 @@ code = '''
     lfs_unmount(&lfs) => 0;
 
     // or on disk
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "/") => 0;
     lfs_dir_read(&lfs, &dir, &info) => 1;
     assert(info.type == LFS_TYPE_DIR);
@@ -718,8 +723,8 @@ code = '''
 [[case]] # directory seek
 define.COUNT = [4, 128, 132]
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "hello") => 0;
     for (int i = 0; i < COUNT; i++) {
         sprintf(path, "hello/kitty%03d", i);
@@ -728,7 +733,7 @@ code = '''
     lfs_unmount(&lfs) => 0;
 
     for (int j = 2; j < COUNT; j++) {
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
         lfs_dir_open(&lfs, &dir, "hello") => 0;
         lfs_dir_read(&lfs, &dir, &info) => 1;
         assert(strcmp(info.name, ".") == 0);
@@ -779,8 +784,8 @@ code = '''
 [[case]] # root seek
 define.COUNT = [4, 128, 132]
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     for (int i = 0; i < COUNT; i++) {
         sprintf(path, "hi%03d", i);
         lfs_mkdir(&lfs, path) => 0;
@@ -788,7 +793,7 @@ code = '''
     lfs_unmount(&lfs) => 0;
 
     for (int j = 2; j < COUNT; j++) {
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
         lfs_dir_open(&lfs, &dir, "/") => 0;
         lfs_dir_read(&lfs, &dir, &info) => 1;
         assert(strcmp(info.name, ".") == 0);

tests/test_entries.toml

@@ -10,8 +10,8 @@ code = '''
     uint8_t wbuffer[1024];
     uint8_t rbuffer[1024];
 
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
     // write hi0 20
     sprintf(path, "hi0"); size = 20;
@@ -99,8 +99,8 @@ code = '''
     uint8_t wbuffer[1024];
     uint8_t rbuffer[1024];
 
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
     // write hi0 20
     sprintf(path, "hi0"); size = 20;
@@ -188,8 +188,8 @@ code = '''
     uint8_t wbuffer[1024];
     uint8_t rbuffer[1024];
 
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
     // write hi0 200
     sprintf(path, "hi0"); size = 200;
@@ -261,8 +261,8 @@ code = '''
     uint8_t wbuffer[1024];
     uint8_t rbuffer[1024];
 
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
     // write hi0 200
     sprintf(path, "hi0"); size = 200;
@@ -350,8 +350,8 @@ code = '''
     uint8_t wbuffer[1024];
     uint8_t rbuffer[1024];
 
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
     // write hi0 200
     sprintf(path, "hi0"); size = 200;
@@ -454,8 +454,8 @@ code = '''
     uint8_t wbuffer[1024];
     uint8_t rbuffer[1024];
 
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
     // write hi0 200
     sprintf(path, "hi0"); size = 200;
@@ -549,9 +549,9 @@ code = '''
 
 [[case]] # create too big
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     memset(path, 'm', 200);
     path[200] = '\0';
 
@@ -574,9 +574,9 @@ code = '''
 
 [[case]] # resize too big
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     memset(path, 'm', 200);
     path[200] = '\0';
 

tests/test_evil.toml

@@ -9,11 +9,10 @@ define.INVALSET = [0x3, 0x1, 0x2]
 in = "lfs.c"
 code = '''
     // create littlefs
-    lfs_formatcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
 
     // change tail-pointer to invalid pointers
-    lfs.cfg = &cfg;
-    lfs_initcommon(&lfs) => 0;
+    lfs_init(&lfs, &cfg) => 0;
     lfs_mdir_t mdir;
     lfs_dir_fetch(&lfs, &mdir, (lfs_block_t[2]){0, 1}) => 0;
     lfs_dir_commit(&lfs, &mdir, LFS_MKATTRS(
@@ -24,7 +23,7 @@ code = '''
     lfs_deinit(&lfs) => 0;
 
     // test that mount fails gracefully
-    lfs_mountcfg(&lfs, &cfg) => LFS_ERR_CORRUPT;
+    lfs_mount(&lfs, &cfg) => LFS_ERR_CORRUPT;
 '''
 
 [[case]] # invalid dir pointer test
@@ -32,15 +31,14 @@ define.INVALSET = [0x3, 0x1, 0x2]
 in = "lfs.c"
 code = '''
     // create littlefs
-    lfs_formatcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
     // make a dir
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "dir_here") => 0;
     lfs_unmount(&lfs) => 0;
 
     // change the dir pointer to be invalid
-    lfs.cfg = &cfg;
-    lfs_initcommon(&lfs) => 0;
+    lfs_init(&lfs, &cfg) => 0;
     lfs_mdir_t mdir;
     lfs_dir_fetch(&lfs, &mdir, (lfs_block_t[2]){0, 1}) => 0;
     // make sure id 1 == our directory
@@ -59,7 +57,7 @@ code = '''
 
     // test that accessing our bad dir fails, note there's a number
     // of ways to access the dir, some can fail, but some don't
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_stat(&lfs, "dir_here", &info) => 0;
     assert(strcmp(info.name, "dir_here") == 0);
     assert(info.type == LFS_TYPE_DIR);
@@ -79,17 +77,16 @@ in = "lfs.c"
 define.SIZE = [10, 1000, 100000] # faked file size
 code = '''
     // create littlefs
-    lfs_formatcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
     // make a file
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "file_here",
             LFS_O_WRONLY | LFS_O_CREAT) => 0;
     lfs_file_close(&lfs, &file) => 0;
     lfs_unmount(&lfs) => 0;
 
     // change the file pointer to be invalid
-    lfs.cfg = &cfg;
-    lfs_initcommon(&lfs) => 0;
+    lfs_init(&lfs, &cfg) => 0;
     lfs_mdir_t mdir;
     lfs_dir_fetch(&lfs, &mdir, (lfs_block_t[2]){0, 1}) => 0;
     // make sure id 1 == our file
@@ -106,7 +103,7 @@ code = '''
 
     // test that accessing our bad file fails, note there's a number
     // of ways to access the dir, some can fail, but some don't
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_stat(&lfs, "file_here", &info) => 0;
     assert(strcmp(info.name, "file_here") == 0);
     assert(info.type == LFS_TYPE_REG);
@@ -128,9 +125,9 @@ define.SIZE = ['2*LFS_BLOCK_SIZE', '3*LFS_BLOCK_SIZE', '4*LFS_BLOCK_SIZE']
 in = "lfs.c"
 code = '''
     // create littlefs
-    lfs_formatcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
     // make a file
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "file_here",
             LFS_O_WRONLY | LFS_O_CREAT) => 0;
     for (int i = 0; i < SIZE; i++) {
@@ -140,8 +137,7 @@ code = '''
     lfs_file_close(&lfs, &file) => 0;
     lfs_unmount(&lfs) => 0;
     // change pointer in CTZ skip-list to be invalid
-    lfs.cfg = &cfg;
-    lfs_initcommon(&lfs) => 0;
+    lfs_init(&lfs, &cfg) => 0;
     lfs_mdir_t mdir;
     lfs_dir_fetch(&lfs, &mdir, (lfs_block_t[2]){0, 1}) => 0;
     // make sure id 1 == our file and get our CTZ structure
@@ -155,20 +151,19 @@ code = '''
             LFS_MKTAG(0x700, 0x3ff, 0),
             LFS_MKTAG(LFS_TYPE_STRUCT, 1, sizeof(struct lfs_ctz)), &ctz)
                 => LFS_MKTAG(LFS_TYPE_CTZSTRUCT, 1, sizeof(struct lfs_ctz));
-    lfs_ctz_fromle32(&ctz);
     // rewrite block to contain bad pointer
     uint8_t bbuffer[LFS_BLOCK_SIZE];
-    lfs_testbd_read(&bd, ctz.head, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
+    cfg.read(&cfg, ctz.head, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
     uint32_t bad = lfs_tole32(0xcccccccc);
     memcpy(&bbuffer[0], &bad, sizeof(bad));
     memcpy(&bbuffer[4], &bad, sizeof(bad));
-    lfs_testbd_erase(&bd, ctz.head) => 0;
-    lfs_testbd_prog(&bd, ctz.head, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
+    cfg.erase(&cfg, ctz.head) => 0;
+    cfg.prog(&cfg, ctz.head, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
     lfs_deinit(&lfs) => 0;
 
     // test that accessing our bad file fails, note there's a number
     // of ways to access the dir, some can fail, but some don't
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_stat(&lfs, "file_here", &info) => 0;
     assert(strcmp(info.name, "file_here") == 0);
     assert(info.type == LFS_TYPE_REG);
@@ -191,11 +186,10 @@ define.INVALSET = [0x3, 0x1, 0x2]
 in = "lfs.c"
 code = '''
     // create littlefs
-    lfs_formatcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
 
     // create an invalid gstate
-    lfs.cfg = &cfg;
-    lfs_initcommon(&lfs) => 0;
+    lfs_init(&lfs, &cfg) => 0;
     lfs_mdir_t mdir;
     lfs_dir_fetch(&lfs, &mdir, (lfs_block_t[2]){0, 1}) => 0;
     lfs_fs_prepmove(&lfs, 1, (lfs_block_t [2]){
@@ -207,7 +201,7 @@ code = '''
     // test that mount fails gracefully
     // mount may not fail, but our first alloc should fail when
     // we try to fix the gstate
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "should_fail") => LFS_ERR_CORRUPT;
     lfs_unmount(&lfs) => 0;
 '''
@@ -218,11 +212,10 @@ code = '''
 in = "lfs.c"
 code = '''
     // create littlefs
-    lfs_formatcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
 
     // change tail-pointer to point to ourself
-    lfs.cfg = &cfg;
-    lfs_initcommon(&lfs) => 0;
+    lfs_init(&lfs, &cfg) => 0;
     lfs_mdir_t mdir;
     lfs_dir_fetch(&lfs, &mdir, (lfs_block_t[2]){0, 1}) => 0;
     lfs_dir_commit(&lfs, &mdir, LFS_MKATTRS(
@@ -231,21 +224,20 @@ code = '''
     lfs_deinit(&lfs) => 0;
 
     // test that mount fails gracefully
-    lfs_mountcfg(&lfs, &cfg) => LFS_ERR_CORRUPT;
+    lfs_mount(&lfs, &cfg) => LFS_ERR_CORRUPT;
 '''
 
 [[case]] # metadata-pair threaded-list 2-length loop test
 in = "lfs.c"
 code = '''
     // create littlefs with child dir
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "child") => 0;
     lfs_unmount(&lfs) => 0;
 
     // find child
-    lfs.cfg = &cfg;
-    lfs_initcommon(&lfs) => 0;
+    lfs_init(&lfs, &cfg) => 0;
     lfs_mdir_t mdir;
     lfs_block_t pair[2];
     lfs_dir_fetch(&lfs, &mdir, (lfs_block_t[2]){0, 1}) => 0;
@@ -253,7 +245,6 @@ code = '''
             LFS_MKTAG(0x7ff, 0x3ff, 0),
             LFS_MKTAG(LFS_TYPE_DIRSTRUCT, 1, sizeof(pair)), pair)
                 => LFS_MKTAG(LFS_TYPE_DIRSTRUCT, 1, sizeof(pair));
-    lfs_pair_fromle32(pair);
     // change tail-pointer to point to root
     lfs_dir_fetch(&lfs, &mdir, pair) => 0;
     lfs_dir_commit(&lfs, &mdir, LFS_MKATTRS(
@@ -262,21 +253,20 @@ code = '''
     lfs_deinit(&lfs) => 0;
 
     // test that mount fails gracefully
-    lfs_mountcfg(&lfs, &cfg) => LFS_ERR_CORRUPT;
+    lfs_mount(&lfs, &cfg) => LFS_ERR_CORRUPT;
 '''
 
 [[case]] # metadata-pair threaded-list 1-length child loop test
 in = "lfs.c"
 code = '''
     // create littlefs with child dir
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "child") => 0;
     lfs_unmount(&lfs) => 0;
 
     // find child
-    lfs.cfg = &cfg;
-    lfs_initcommon(&lfs) => 0;
+    lfs_init(&lfs, &cfg) => 0;
     lfs_mdir_t mdir;
     lfs_block_t pair[2];
     lfs_dir_fetch(&lfs, &mdir, (lfs_block_t[2]){0, 1}) => 0;
@@ -284,7 +274,6 @@ code = '''
             LFS_MKTAG(0x7ff, 0x3ff, 0),
             LFS_MKTAG(LFS_TYPE_DIRSTRUCT, 1, sizeof(pair)), pair)
                 => LFS_MKTAG(LFS_TYPE_DIRSTRUCT, 1, sizeof(pair));
-    lfs_pair_fromle32(pair);
     // change tail-pointer to point to ourself
     lfs_dir_fetch(&lfs, &mdir, pair) => 0;
     lfs_dir_commit(&lfs, &mdir, LFS_MKATTRS(
@@ -292,5 +281,5 @@ code = '''
     lfs_deinit(&lfs) => 0;
 
     // test that mount fails gracefully
-    lfs_mountcfg(&lfs, &cfg) => LFS_ERR_CORRUPT;
+    lfs_mount(&lfs, &cfg) => LFS_ERR_CORRUPT;
 '''

tests/test_exhaustion.toml

@@ -11,14 +11,14 @@ define.LFS_BADBLOCK_BEHAVIOR = [
 ]
 define.FILES = 10
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "roadrunner") => 0;
     lfs_unmount(&lfs) => 0;
 
     uint32_t cycle = 0;
     while (true) {
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
         for (uint32_t i = 0; i < FILES; i++) {
             // chose name, roughly random seed, and random 2^n size
             sprintf(path, "roadrunner/test%d", i);
@@ -71,7 +71,7 @@ code = '''
 
 exhausted:
     // should still be readable
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     for (uint32_t i = 0; i < FILES; i++) {
         // check for errors
         sprintf(path, "roadrunner/test%d", i);
@@ -96,11 +96,11 @@ define.LFS_BADBLOCK_BEHAVIOR = [
 ]
 define.FILES = 10
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
 
     uint32_t cycle = 0;
     while (true) {
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
         for (uint32_t i = 0; i < FILES; i++) {
             // chose name, roughly random seed, and random 2^n size
             sprintf(path, "test%d", i);
@@ -153,7 +153,7 @@ code = '''
 
 exhausted:
     // should still be readable
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     for (uint32_t i = 0; i < FILES; i++) {
         // check for errors
         sprintf(path, "test%d", i);
@@ -180,18 +180,18 @@ code = '''
 
     for (int run = 0; run < 2; run++) {
         for (lfs_block_t b = 0; b < LFS_BLOCK_COUNT; b++) {
-            lfs_testbd_setwear(&bd, b,
+            lfs_testbd_setwear(&cfg, b,
                     (b < run_block_count[run]) ? 0 : LFS_ERASE_CYCLES) => 0;
         }
 
-        lfs_formatcfg(&lfs, &cfg) => 0;
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_format(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
         lfs_mkdir(&lfs, "roadrunner") => 0;
         lfs_unmount(&lfs) => 0;
 
         uint32_t cycle = 0;
         while (true) {
-            lfs_mountcfg(&lfs, &cfg) => 0;
+            lfs_mount(&lfs, &cfg) => 0;
             for (uint32_t i = 0; i < FILES; i++) {
                 // chose name, roughly random seed, and random 2^n size
                 sprintf(path, "roadrunner/test%d", i);
@@ -244,7 +244,7 @@ code = '''
 
 exhausted:
         // should still be readable
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
         for (uint32_t i = 0; i < FILES; i++) {
             // check for errors
             sprintf(path, "roadrunner/test%d", i);
@@ -272,15 +272,15 @@ code = '''
 
     for (int run = 0; run < 2; run++) {
         for (lfs_block_t b = 0; b < LFS_BLOCK_COUNT; b++) {
-            lfs_testbd_setwear(&bd, b,
+            lfs_testbd_setwear(&cfg, b,
                     (b < run_block_count[run]) ? 0 : LFS_ERASE_CYCLES) => 0;
         }
 
-        lfs_formatcfg(&lfs, &cfg) => 0;
+        lfs_format(&lfs, &cfg) => 0;
 
         uint32_t cycle = 0;
         while (true) {
-            lfs_mountcfg(&lfs, &cfg) => 0;
+            lfs_mount(&lfs, &cfg) => 0;
             for (uint32_t i = 0; i < FILES; i++) {
                 // chose name, roughly random seed, and random 2^n size
                 sprintf(path, "test%d", i);
@@ -333,7 +333,7 @@ code = '''
 
 exhausted:
         // should still be readable
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
         for (uint32_t i = 0; i < FILES; i++) {
             // check for errors
             sprintf(path, "test%d", i);
@@ -358,14 +358,14 @@ define.CYCLES = 100
 define.FILES = 10
 if = 'LFS_BLOCK_CYCLES < CYCLES/10'
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "roadrunner") => 0;
     lfs_unmount(&lfs) => 0;
 
     uint32_t cycle = 0;
     while (cycle < CYCLES) {
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
         for (uint32_t i = 0; i < FILES; i++) {
             // chose name, roughly random seed, and random 2^n size
             sprintf(path, "roadrunner/test%d", i);
@@ -418,7 +418,7 @@ code = '''
 
 exhausted:
     // should still be readable
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     for (uint32_t i = 0; i < FILES; i++) {
         // check for errors
         sprintf(path, "roadrunner/test%d", i);
@@ -434,7 +434,7 @@ exhausted:
     lfs_testbd_wear_t maxwear = 0;
     // skip 0 and 1 as superblock movement is intentionally avoided
     for (lfs_block_t b = 2; b < LFS_BLOCK_COUNT; b++) {
-        lfs_testbd_wear_t wear = lfs_testbd_getwear(&bd, b);
+        lfs_testbd_wear_t wear = lfs_testbd_getwear(&cfg, b);
         printf("%08x: wear %d\n", b, wear);
         assert(wear >= 0);
         if (wear < minwear) {
@@ -453,7 +453,7 @@ exhausted:
     // find standard deviation^2
     lfs_testbd_wear_t dev2 = 0;
     for (lfs_block_t b = 2; b < LFS_BLOCK_COUNT; b++) {
-        lfs_testbd_wear_t wear = lfs_testbd_getwear(&bd, b);
+        lfs_testbd_wear_t wear = lfs_testbd_getwear(&cfg, b);
         assert(wear >= 0);
         lfs_testbd_swear_t diff = wear - avgwear;
         dev2 += diff*diff;

tests/test_files.toml

@@ -1,8 +1,8 @@
 
 [[case]] # simple file test
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "hello",
             LFS_O_WRONLY | LFS_O_CREAT | LFS_O_EXCL) => 0;
     size = strlen("Hello World!")+1;
@@ -11,7 +11,7 @@ code = '''
     lfs_file_close(&lfs, &file) => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "hello", LFS_O_RDONLY) => 0;
     lfs_file_read(&lfs, &file, buffer, size) => size;
     assert(strcmp((char*)buffer, "Hello World!") == 0);
@@ -23,10 +23,10 @@ code = '''
 define.SIZE = [32, 8192, 262144, 0, 7, 8193]
 define.CHUNKSIZE = [31, 16, 33, 1, 1023]
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
 
     // write
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "avacado",
             LFS_O_WRONLY | LFS_O_CREAT | LFS_O_EXCL) => 0;
     srand(1);
@@ -41,7 +41,7 @@ code = '''
     lfs_unmount(&lfs) => 0;
 
     // read
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "avacado", LFS_O_RDONLY) => 0;
     lfs_file_size(&lfs, &file) => SIZE;
     srand(1);
@@ -62,10 +62,10 @@ define.SIZE1 = [32, 8192, 131072, 0, 7, 8193]
 define.SIZE2 = [32, 8192, 131072, 0, 7, 8193]
 define.CHUNKSIZE = [31, 16, 1]
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
 
     // write
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "avacado",
             LFS_O_WRONLY | LFS_O_CREAT | LFS_O_EXCL) => 0;
     srand(1);
@@ -80,7 +80,7 @@ code = '''
     lfs_unmount(&lfs) => 0;
 
     // read
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "avacado", LFS_O_RDONLY) => 0;
     lfs_file_size(&lfs, &file) => SIZE1;
     srand(1);
@@ -96,7 +96,7 @@ code = '''
     lfs_unmount(&lfs) => 0;
 
     // rewrite
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "avacado", LFS_O_WRONLY) => 0;
     srand(2);
     for (lfs_size_t i = 0; i < SIZE2; i += CHUNKSIZE) {
@@ -110,7 +110,7 @@ code = '''
     lfs_unmount(&lfs) => 0;
 
     // read
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "avacado", LFS_O_RDONLY) => 0;
     lfs_file_size(&lfs, &file) => lfs_max(SIZE1, SIZE2);
     srand(2);
@@ -144,10 +144,10 @@ define.SIZE1 = [32, 8192, 131072, 0, 7, 8193]
 define.SIZE2 = [32, 8192, 131072, 0, 7, 8193]
 define.CHUNKSIZE = [31, 16, 1]
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
 
     // write
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "avacado",
             LFS_O_WRONLY | LFS_O_CREAT | LFS_O_EXCL) => 0;
     srand(1);
@@ -162,7 +162,7 @@ code = '''
     lfs_unmount(&lfs) => 0;
 
     // read
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "avacado", LFS_O_RDONLY) => 0;
     lfs_file_size(&lfs, &file) => SIZE1;
     srand(1);
@@ -178,7 +178,7 @@ code = '''
     lfs_unmount(&lfs) => 0;
 
     // append
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "avacado", LFS_O_WRONLY | LFS_O_APPEND) => 0;
     srand(2);
     for (lfs_size_t i = 0; i < SIZE2; i += CHUNKSIZE) {
@@ -192,7 +192,7 @@ code = '''
     lfs_unmount(&lfs) => 0;
 
     // read
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "avacado", LFS_O_RDONLY) => 0;
     lfs_file_size(&lfs, &file) => SIZE1 + SIZE2;
     srand(1);
@@ -221,10 +221,10 @@ define.SIZE1 = [32, 8192, 131072, 0, 7, 8193]
 define.SIZE2 = [32, 8192, 131072, 0, 7, 8193]
 define.CHUNKSIZE = [31, 16, 1]
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
 
     // write
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "avacado",
             LFS_O_WRONLY | LFS_O_CREAT | LFS_O_EXCL) => 0;
     srand(1);
@@ -239,7 +239,7 @@ code = '''
     lfs_unmount(&lfs) => 0;
 
     // read
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "avacado", LFS_O_RDONLY) => 0;
     lfs_file_size(&lfs, &file) => SIZE1;
     srand(1);
@@ -255,7 +255,7 @@ code = '''
     lfs_unmount(&lfs) => 0;
 
     // truncate
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "avacado", LFS_O_WRONLY | LFS_O_TRUNC) => 0;
     srand(2);
     for (lfs_size_t i = 0; i < SIZE2; i += CHUNKSIZE) {
@@ -269,7 +269,7 @@ code = '''
     lfs_unmount(&lfs) => 0;
 
     // read
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "avacado", LFS_O_RDONLY) => 0;
     lfs_file_size(&lfs, &file) => SIZE2;
     srand(2);
@@ -290,10 +290,10 @@ define.SIZE = [32, 0, 7, 2049]
 define.CHUNKSIZE = [31, 16, 65]
 reentrant = true
 code = '''
-    err = lfs_mountcfg(&lfs, &cfg);
+    err = lfs_mount(&lfs, &cfg);
     if (err) {
-        lfs_formatcfg(&lfs, &cfg) => 0;
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_format(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
     }
 
     err = lfs_file_open(&lfs, &file, "avacado", LFS_O_RDONLY);
@@ -344,10 +344,10 @@ define = [
 ]
 reentrant = true
 code = '''
-    err = lfs_mountcfg(&lfs, &cfg);
+    err = lfs_mount(&lfs, &cfg);
     if (err) {
-        lfs_formatcfg(&lfs, &cfg) => 0;
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_format(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
     }
 
     err = lfs_file_open(&lfs, &file, "avacado", LFS_O_RDONLY);
@@ -406,9 +406,9 @@ code = '''
 [[case]] # many files
 define.N = 300
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
     // create N files of 7 bytes
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     for (int i = 0; i < N; i++) {
         sprintf(path, "file_%03d", i);
         lfs_file_open(&lfs, &file, path,
@@ -431,9 +431,9 @@ code = '''
 [[case]] # many files with power cycle
 define.N = 300
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
     // create N files of 7 bytes
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     for (int i = 0; i < N; i++) {
         sprintf(path, "file_%03d", i);
         lfs_file_open(&lfs, &file, path,
@@ -446,7 +446,7 @@ code = '''
         lfs_unmount(&lfs) => 0;
 
         char rbuffer[1024];
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
         lfs_file_open(&lfs, &file, path, LFS_O_RDONLY) => 0;
         lfs_file_read(&lfs, &file, rbuffer, size) => size;
         assert(strcmp(rbuffer, wbuffer) == 0);
@@ -459,10 +459,10 @@ code = '''
 define.N = 300
 reentrant = true
 code = '''
-    err = lfs_mountcfg(&lfs, &cfg);
+    err = lfs_mount(&lfs, &cfg);
     if (err) {
-        lfs_formatcfg(&lfs, &cfg) => 0;
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_format(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
     }
     // create N files of 7 bytes
     for (int i = 0; i < N; i++) {

tests/test_interspersed.toml

@@ -5,8 +5,8 @@ define.FILES = [4, 10, 26]
 code = '''
     lfs_file_t files[FILES];
     const char alphas[] = "abcdefghijklmnopqrstuvwxyz";
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     for (int j = 0; j < FILES; j++) {
         sprintf(path, "%c", alphas[j]);
         lfs_file_open(&lfs, &files[j], path,
@@ -64,8 +64,8 @@ define.SIZE = [10, 100]
 define.FILES = [4, 10, 26]
 code = '''
     const char alphas[] = "abcdefghijklmnopqrstuvwxyz";
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     for (int j = 0; j < FILES; j++) {
         sprintf(path, "%c", alphas[j]);
         lfs_file_open(&lfs, &file, path,
@@ -77,7 +77,7 @@ code = '''
     }
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "zzz", LFS_O_WRONLY | LFS_O_CREAT) => 0;
     for (int j = 0; j < FILES; j++) {
         lfs_file_write(&lfs, &file, (const void*)"~", 1) => 1;
@@ -115,8 +115,8 @@ code = '''
 [[case]] # remove inconveniently test
 define.SIZE = [10, 100]
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_t files[3];
     lfs_file_open(&lfs, &files[0], "e", LFS_O_WRONLY | LFS_O_CREAT) => 0;
     lfs_file_open(&lfs, &files[1], "f", LFS_O_WRONLY | LFS_O_CREAT) => 0;
@@ -180,10 +180,10 @@ code = '''
     lfs_file_t files[FILES];
     const char alphas[] = "abcdefghijklmnopqrstuvwxyz";
 
-    err = lfs_mountcfg(&lfs, &cfg);
+    err = lfs_mount(&lfs, &cfg);
     if (err) {
-        lfs_formatcfg(&lfs, &cfg) => 0;
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_format(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
     }
 
     for (int j = 0; j < FILES; j++) {

tests/test_move.toml

@@ -1,7 +1,7 @@
 [[case]] # move file
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "a") => 0;
     lfs_mkdir(&lfs, "b") => 0;
     lfs_mkdir(&lfs, "c") => 0;
@@ -13,11 +13,11 @@ code = '''
     lfs_file_close(&lfs, &file) => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_rename(&lfs, "a/hello", "c/hello") => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "a") => 0;
     lfs_dir_read(&lfs, &dir, &info) => 1;
     assert(strcmp(info.name, ".") == 0);
@@ -57,8 +57,8 @@ code = '''
 
 [[case]] # noop move, yes this is legal
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "hi") => 0;
     lfs_rename(&lfs, "hi", "hi") => 0;
     lfs_mkdir(&lfs, "hi/hi") => 0;
@@ -74,8 +74,8 @@ code = '''
 [[case]] # move file corrupt source
 in = "lfs.c"
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "a") => 0;
     lfs_mkdir(&lfs, "b") => 0;
     lfs_mkdir(&lfs, "c") => 0;
@@ -87,28 +87,28 @@ code = '''
     lfs_file_close(&lfs, &file) => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_rename(&lfs, "a/hello", "c/hello") => 0;
     lfs_unmount(&lfs) => 0;
 
     // corrupt the source
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "a") => 0;
     lfs_block_t block = dir.m.pair[0];
     lfs_dir_close(&lfs, &dir) => 0;
     lfs_unmount(&lfs) => 0;
     uint8_t bbuffer[LFS_BLOCK_SIZE];
-    lfs_testbd_read(&bd, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
+    cfg.read(&cfg, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
     int off = LFS_BLOCK_SIZE-1;
     while (off >= 0 && bbuffer[off] == LFS_ERASE_VALUE) {
         off -= 1;
     }
     memset(&bbuffer[off-3], LFS_BLOCK_SIZE, 3);
-    lfs_testbd_erase(&bd, block) => 0;
-    lfs_testbd_prog(&bd, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
-    lfs_testbd_sync(&bd) => 0;
+    cfg.erase(&cfg, block) => 0;
+    cfg.prog(&cfg, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
+    cfg.sync(&cfg) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "a") => 0;
     lfs_dir_read(&lfs, &dir, &info) => 1;
     assert(strcmp(info.name, ".") == 0);
@@ -150,8 +150,8 @@ code = '''
 in = "lfs.c"
 if = 'LFS_PROG_SIZE <= 0x3fe' # only works with one crc per commit
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "a") => 0;
     lfs_mkdir(&lfs, "b") => 0;
     lfs_mkdir(&lfs, "c") => 0;
@@ -163,44 +163,44 @@ code = '''
     lfs_file_close(&lfs, &file) => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_rename(&lfs, "a/hello", "c/hello") => 0;
     lfs_unmount(&lfs) => 0;
 
     // corrupt the source
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "a") => 0;
     lfs_block_t block = dir.m.pair[0];
     lfs_dir_close(&lfs, &dir) => 0;
     lfs_unmount(&lfs) => 0;
     uint8_t bbuffer[LFS_BLOCK_SIZE];
-    lfs_testbd_read(&bd, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
+    cfg.read(&cfg, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
     int off = LFS_BLOCK_SIZE-1;
     while (off >= 0 && bbuffer[off] == LFS_ERASE_VALUE) {
         off -= 1;
     }
     memset(&bbuffer[off-3], LFS_BLOCK_SIZE, 3);
-    lfs_testbd_erase(&bd, block) => 0;
-    lfs_testbd_prog(&bd, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
-    lfs_testbd_sync(&bd) => 0;
+    cfg.erase(&cfg, block) => 0;
+    cfg.prog(&cfg, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
+    cfg.sync(&cfg) => 0;
 
     // corrupt the destination
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "c") => 0;
     block = dir.m.pair[0];
     lfs_dir_close(&lfs, &dir) => 0;
     lfs_unmount(&lfs) => 0;
-    lfs_testbd_read(&bd, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
+    cfg.read(&cfg, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
     off = LFS_BLOCK_SIZE-1;
     while (off >= 0 && bbuffer[off] == LFS_ERASE_VALUE) {
         off -= 1;
     }
     memset(&bbuffer[off-3], LFS_BLOCK_SIZE, 3);
-    lfs_testbd_erase(&bd, block) => 0;
-    lfs_testbd_prog(&bd, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
-    lfs_testbd_sync(&bd) => 0;
+    cfg.erase(&cfg, block) => 0;
+    cfg.prog(&cfg, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
+    cfg.sync(&cfg) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "a") => 0;
     lfs_dir_read(&lfs, &dir, &info) => 1;
     assert(strcmp(info.name, ".") == 0);
@@ -242,8 +242,8 @@ code = '''
 in = "lfs.c"
 if = 'LFS_PROG_SIZE <= 0x3fe' # only works with one crc per commit
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "a") => 0;
     lfs_mkdir(&lfs, "b") => 0;
     lfs_mkdir(&lfs, "c") => 0;
@@ -255,49 +255,49 @@ code = '''
     lfs_file_close(&lfs, &file) => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_rename(&lfs, "a/hello", "c/hello") => 0;
     lfs_unmount(&lfs) => 0;
 
     // corrupt the source
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "a") => 0;
     lfs_block_t block = dir.m.pair[0];
     lfs_dir_close(&lfs, &dir) => 0;
     lfs_unmount(&lfs) => 0;
     uint8_t bbuffer[LFS_BLOCK_SIZE];
-    lfs_testbd_read(&bd, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
+    cfg.read(&cfg, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
     int off = LFS_BLOCK_SIZE-1;
     while (off >= 0 && bbuffer[off] == LFS_ERASE_VALUE) {
         off -= 1;
     }
     memset(&bbuffer[off-3], LFS_BLOCK_SIZE, 3);
-    lfs_testbd_erase(&bd, block) => 0;
-    lfs_testbd_prog(&bd, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
-    lfs_testbd_sync(&bd) => 0;
+    cfg.erase(&cfg, block) => 0;
+    cfg.prog(&cfg, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
+    cfg.sync(&cfg) => 0;
 
     // corrupt the destination
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "c") => 0;
     block = dir.m.pair[0];
     lfs_dir_close(&lfs, &dir) => 0;
     lfs_unmount(&lfs) => 0;
-    lfs_testbd_read(&bd, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
+    cfg.read(&cfg, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
     off = LFS_BLOCK_SIZE-1;
     while (off >= 0 && bbuffer[off] == LFS_ERASE_VALUE) {
         off -= 1;
     }
     memset(&bbuffer[off-3], LFS_BLOCK_SIZE, 3);
-    lfs_testbd_erase(&bd, block) => 0;
-    lfs_testbd_prog(&bd, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
-    lfs_testbd_sync(&bd) => 0;
+    cfg.erase(&cfg, block) => 0;
+    cfg.prog(&cfg, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
+    cfg.sync(&cfg) => 0;
 
     // continue move
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_rename(&lfs, "a/hello", "c/hello") => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "a") => 0;
     lfs_dir_read(&lfs, &dir, &info) => 1;
     assert(strcmp(info.name, ".") == 0);
@@ -338,10 +338,10 @@ code = '''
 [[case]] # simple reentrant move file
 reentrant = true
 code = '''
-    err = lfs_mountcfg(&lfs, &cfg);
+    err = lfs_mount(&lfs, &cfg);
     if (err) {
-        lfs_formatcfg(&lfs, &cfg) => 0;
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_format(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
     }
     err = lfs_mkdir(&lfs, "a");
     assert(!err || err == LFS_ERR_EXIST);
@@ -354,7 +354,7 @@ code = '''
     lfs_unmount(&lfs) => 0;
 
     while (true) {
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
         // there should never exist _2_ hello files
         int count = 0;
         if (lfs_stat(&lfs, "a/hello", &info) == 0) {
@@ -384,7 +384,7 @@ code = '''
         assert(count <= 1);
         lfs_unmount(&lfs) => 0;
 
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
         if (lfs_stat(&lfs, "a/hello", &info) == 0 && info.size > 0) {
             lfs_rename(&lfs, "a/hello", "b/hello") => 0;
         } else if (lfs_stat(&lfs, "b/hello", &info) == 0) {
@@ -407,7 +407,7 @@ code = '''
         lfs_unmount(&lfs) => 0;
     }
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "a") => 0;
     lfs_dir_read(&lfs, &dir, &info) => 1;
     assert(strcmp(info.name, ".") == 0);
@@ -447,8 +447,8 @@ code = '''
 
 [[case]] # move dir
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "a") => 0;
     lfs_mkdir(&lfs, "b") => 0;
     lfs_mkdir(&lfs, "c") => 0;
@@ -459,11 +459,11 @@ code = '''
     lfs_mkdir(&lfs, "a/hi/ohayo") => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_rename(&lfs, "a/hi", "c/hi") => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "a") => 0;
     lfs_dir_read(&lfs, &dir, &info) => 1;
     assert(strcmp(info.name, ".") == 0);
@@ -513,8 +513,8 @@ code = '''
 [[case]] # move dir corrupt source
 in = "lfs.c"
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "a") => 0;
     lfs_mkdir(&lfs, "b") => 0;
     lfs_mkdir(&lfs, "c") => 0;
@@ -525,28 +525,28 @@ code = '''
     lfs_mkdir(&lfs, "a/hi/ohayo") => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_rename(&lfs, "a/hi", "c/hi") => 0;
     lfs_unmount(&lfs) => 0;
 
     // corrupt the source
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "a") => 0;
     lfs_block_t block = dir.m.pair[0];
     lfs_dir_close(&lfs, &dir) => 0;
     lfs_unmount(&lfs) => 0;
     uint8_t bbuffer[LFS_BLOCK_SIZE];
-    lfs_testbd_read(&bd, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
+    cfg.read(&cfg, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
     int off = LFS_BLOCK_SIZE-1;
     while (off >= 0 && bbuffer[off] == LFS_ERASE_VALUE) {
         off -= 1;
     }
     memset(&bbuffer[off-3], LFS_BLOCK_SIZE, 3);
-    lfs_testbd_erase(&bd, block) => 0;
-    lfs_testbd_prog(&bd, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
-    lfs_testbd_sync(&bd) => 0;
+    cfg.erase(&cfg, block) => 0;
+    cfg.prog(&cfg, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
+    cfg.sync(&cfg) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "a") => 0;
     lfs_dir_read(&lfs, &dir, &info) => 1;
     assert(strcmp(info.name, ".") == 0);
@@ -597,8 +597,8 @@ code = '''
 in = "lfs.c"
 if = 'LFS_PROG_SIZE <= 0x3fe' # only works with one crc per commit
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "a") => 0;
     lfs_mkdir(&lfs, "b") => 0;
     lfs_mkdir(&lfs, "c") => 0;
@@ -609,44 +609,44 @@ code = '''
     lfs_mkdir(&lfs, "a/hi/ohayo") => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_rename(&lfs, "a/hi", "c/hi") => 0;
     lfs_unmount(&lfs) => 0;
 
     // corrupt the source
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "a") => 0;
     lfs_block_t block = dir.m.pair[0];
     lfs_dir_close(&lfs, &dir) => 0;
     lfs_unmount(&lfs) => 0;
     uint8_t bbuffer[LFS_BLOCK_SIZE];
-    lfs_testbd_read(&bd, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
+    cfg.read(&cfg, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
     int off = LFS_BLOCK_SIZE-1;
     while (off >= 0 && bbuffer[off] == LFS_ERASE_VALUE) {
         off -= 1;
     }
     memset(&bbuffer[off-3], LFS_BLOCK_SIZE, 3);
-    lfs_testbd_erase(&bd, block) => 0;
-    lfs_testbd_prog(&bd, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
-    lfs_testbd_sync(&bd) => 0;
+    cfg.erase(&cfg, block) => 0;
+    cfg.prog(&cfg, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
+    cfg.sync(&cfg) => 0;
 
     // corrupt the destination
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "c") => 0;
     block = dir.m.pair[0];
     lfs_dir_close(&lfs, &dir) => 0;
     lfs_unmount(&lfs) => 0;
-    lfs_testbd_read(&bd, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
+    cfg.read(&cfg, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
     off = LFS_BLOCK_SIZE-1;
     while (off >= 0 && bbuffer[off] == LFS_ERASE_VALUE) {
         off -= 1;
     }
     memset(&bbuffer[off-3], LFS_BLOCK_SIZE, 3);
-    lfs_testbd_erase(&bd, block) => 0;
-    lfs_testbd_prog(&bd, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
-    lfs_testbd_sync(&bd) => 0;
+    cfg.erase(&cfg, block) => 0;
+    cfg.prog(&cfg, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
+    cfg.sync(&cfg) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "a") => 0;
     lfs_dir_read(&lfs, &dir, &info) => 1;
     assert(strcmp(info.name, ".") == 0);
@@ -697,8 +697,8 @@ code = '''
 in = "lfs.c"
 if = 'LFS_PROG_SIZE <= 0x3fe' # only works with one crc per commit
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "a") => 0;
     lfs_mkdir(&lfs, "b") => 0;
     lfs_mkdir(&lfs, "c") => 0;
@@ -709,49 +709,49 @@ code = '''
     lfs_mkdir(&lfs, "a/hi/ohayo") => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_rename(&lfs, "a/hi", "c/hi") => 0;
     lfs_unmount(&lfs) => 0;
 
     // corrupt the source
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "a") => 0;
     lfs_block_t block = dir.m.pair[0];
     lfs_dir_close(&lfs, &dir) => 0;
     lfs_unmount(&lfs) => 0;
     uint8_t bbuffer[LFS_BLOCK_SIZE];
-    lfs_testbd_read(&bd, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
+    cfg.read(&cfg, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
     int off = LFS_BLOCK_SIZE-1;
     while (off >= 0 && bbuffer[off] == LFS_ERASE_VALUE) {
         off -= 1;
     }
     memset(&bbuffer[off-3], LFS_BLOCK_SIZE, 3);
-    lfs_testbd_erase(&bd, block) => 0;
-    lfs_testbd_prog(&bd, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
-    lfs_testbd_sync(&bd) => 0;
+    cfg.erase(&cfg, block) => 0;
+    cfg.prog(&cfg, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
+    cfg.sync(&cfg) => 0;
 
     // corrupt the destination
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "c") => 0;
     block = dir.m.pair[0];
     lfs_dir_close(&lfs, &dir) => 0;
     lfs_unmount(&lfs) => 0;
-    lfs_testbd_read(&bd, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
+    cfg.read(&cfg, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
     off = LFS_BLOCK_SIZE-1;
     while (off >= 0 && bbuffer[off] == LFS_ERASE_VALUE) {
         off -= 1;
     }
     memset(&bbuffer[off-3], LFS_BLOCK_SIZE, 3);
-    lfs_testbd_erase(&bd, block) => 0;
-    lfs_testbd_prog(&bd, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
-    lfs_testbd_sync(&bd) => 0;
+    cfg.erase(&cfg, block) => 0;
+    cfg.prog(&cfg, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
+    cfg.sync(&cfg) => 0;
 
     // continue move
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_rename(&lfs, "a/hi", "c/hi") => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "a") => 0;
     lfs_dir_read(&lfs, &dir, &info) => 1;
     assert(strcmp(info.name, ".") == 0);
@@ -801,10 +801,10 @@ code = '''
 [[case]] # simple reentrant move dir
 reentrant = true
 code = '''
-    err = lfs_mountcfg(&lfs, &cfg);
+    err = lfs_mount(&lfs, &cfg);
     if (err) {
-        lfs_formatcfg(&lfs, &cfg) => 0;
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_format(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
     }
     err = lfs_mkdir(&lfs, "a");
     assert(!err || err == LFS_ERR_EXIST);
@@ -817,7 +817,7 @@ code = '''
     lfs_unmount(&lfs) => 0;
 
     while (true) {
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
         // there should never exist _2_ hi directories
         int count = 0;
         if (lfs_stat(&lfs, "a/hi", &info) == 0) {
@@ -843,7 +843,7 @@ code = '''
         assert(count <= 1);
         lfs_unmount(&lfs) => 0;
 
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
         if (lfs_stat(&lfs, "a/hi", &info) == 0) {
             lfs_rename(&lfs, "a/hi", "b/hi") => 0;
         } else if (lfs_stat(&lfs, "b/hi", &info) == 0) {
@@ -868,7 +868,7 @@ code = '''
         lfs_unmount(&lfs) => 0;
     }
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "a") => 0;
     lfs_dir_read(&lfs, &dir, &info) => 1;
     assert(strcmp(info.name, ".") == 0);
@@ -917,8 +917,8 @@ code = '''
 
 [[case]] # move state stealing
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "a") => 0;
     lfs_mkdir(&lfs, "b") => 0;
     lfs_mkdir(&lfs, "c") => 0;
@@ -930,17 +930,17 @@ code = '''
     lfs_file_close(&lfs, &file) => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_rename(&lfs, "a/hello", "b/hello") => 0;
     lfs_unmount(&lfs) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_rename(&lfs, "b/hello", "c/hello") => 0;
     lfs_unmount(&lfs) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_rename(&lfs, "c/hello", "d/hello") => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "a/hello", LFS_O_RDONLY) => LFS_ERR_NOENT;
     lfs_file_open(&lfs, &file, "b/hello", LFS_O_RDONLY) => LFS_ERR_NOENT;
     lfs_file_open(&lfs, &file, "c/hello", LFS_O_RDONLY) => LFS_ERR_NOENT;
@@ -954,12 +954,12 @@ code = '''
     lfs_file_close(&lfs, &file) => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_remove(&lfs, "b") => 0;
     lfs_remove(&lfs, "c") => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_stat(&lfs, "a", &info) => 0;
     lfs_stat(&lfs, "b", &info) => LFS_ERR_NOENT;
     lfs_stat(&lfs, "c", &info) => LFS_ERR_NOENT;
@@ -981,8 +981,8 @@ code = '''
 # Other specific corner cases
 [[case]] # create + delete in same commit with neighbors
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
     // littlefs keeps files sorted, so we know the order these will be in
     lfs_file_open(&lfs, &file, "/1.move_me",
@@ -1127,8 +1127,8 @@ code = '''
 # Other specific corner cases
 [[case]] # create + delete + delete in same commit with neighbors
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
     // littlefs keeps files sorted, so we know the order these will be in
     lfs_file_open(&lfs, &file, "/1.move_me",
@@ -1283,8 +1283,8 @@ code = '''
 
 [[case]] # create + delete in different dirs with neighbors
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
     // littlefs keeps files sorted, so we know the order these will be in
     lfs_mkdir(&lfs, "/dir.1") => 0;
@@ -1523,8 +1523,8 @@ in = "lfs.c"
 define.RELOCATIONS = 'range(0x3+1)'
 define.LFS_ERASE_CYCLES = 0xffffffff
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
     lfs_mkdir(&lfs, "/parent") => 0;
     lfs_mkdir(&lfs, "/parent/child") => 0;
@@ -1569,14 +1569,14 @@ code = '''
     // force specific directories to relocate
     if (RELOCATIONS & 0x1) {
         lfs_dir_open(&lfs, &dir, "/parent");
-        lfs_testbd_setwear(&bd, dir.m.pair[0], 0xffffffff) => 0;
-        lfs_testbd_setwear(&bd, dir.m.pair[1], 0xffffffff) => 0;
+        lfs_testbd_setwear(&cfg, dir.m.pair[0], 0xffffffff) => 0;
+        lfs_testbd_setwear(&cfg, dir.m.pair[1], 0xffffffff) => 0;
         lfs_dir_close(&lfs, &dir) => 0;
     }
     if (RELOCATIONS & 0x2) {
         lfs_dir_open(&lfs, &dir, "/parent/child");
-        lfs_testbd_setwear(&bd, dir.m.pair[0], 0xffffffff) => 0;
-        lfs_testbd_setwear(&bd, dir.m.pair[1], 0xffffffff) => 0;
+        lfs_testbd_setwear(&cfg, dir.m.pair[0], 0xffffffff) => 0;
+        lfs_testbd_setwear(&cfg, dir.m.pair[1], 0xffffffff) => 0;
         lfs_dir_close(&lfs, &dir) => 0;
     }
 
@@ -1660,8 +1660,8 @@ in = "lfs.c"
 define.RELOCATIONS = 'range(0x7+1)'
 define.LFS_ERASE_CYCLES = 0xffffffff
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
     lfs_mkdir(&lfs, "/parent") => 0;
     lfs_mkdir(&lfs, "/parent/child") => 0;
@@ -1707,20 +1707,20 @@ code = '''
     // force specific directories to relocate
     if (RELOCATIONS & 0x1) {
         lfs_dir_open(&lfs, &dir, "/parent");
-        lfs_testbd_setwear(&bd, dir.m.pair[0], 0xffffffff) => 0;
-        lfs_testbd_setwear(&bd, dir.m.pair[1], 0xffffffff) => 0;
+        lfs_testbd_setwear(&cfg, dir.m.pair[0], 0xffffffff) => 0;
+        lfs_testbd_setwear(&cfg, dir.m.pair[1], 0xffffffff) => 0;
         lfs_dir_close(&lfs, &dir) => 0;
     }
     if (RELOCATIONS & 0x2) {
         lfs_dir_open(&lfs, &dir, "/parent/sibling");
-        lfs_testbd_setwear(&bd, dir.m.pair[0], 0xffffffff) => 0;
-        lfs_testbd_setwear(&bd, dir.m.pair[1], 0xffffffff) => 0;
+        lfs_testbd_setwear(&cfg, dir.m.pair[0], 0xffffffff) => 0;
+        lfs_testbd_setwear(&cfg, dir.m.pair[1], 0xffffffff) => 0;
         lfs_dir_close(&lfs, &dir) => 0;
     }
     if (RELOCATIONS & 0x4) {
         lfs_dir_open(&lfs, &dir, "/parent/child");
-        lfs_testbd_setwear(&bd, dir.m.pair[0], 0xffffffff) => 0;
-        lfs_testbd_setwear(&bd, dir.m.pair[1], 0xffffffff) => 0;
+        lfs_testbd_setwear(&cfg, dir.m.pair[0], 0xffffffff) => 0;
+        lfs_testbd_setwear(&cfg, dir.m.pair[1], 0xffffffff) => 0;
         lfs_dir_close(&lfs, &dir) => 0;
     }
 

tests/test_orphans.toml

@@ -2,8 +2,8 @@
 in = "lfs.c"
 if = 'LFS_PROG_SIZE <= 0x3fe' # only works with one crc per commit
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "parent") => 0;
     lfs_mkdir(&lfs, "parent/orphan") => 0;
     lfs_mkdir(&lfs, "parent/child") => 0;
@@ -13,29 +13,29 @@ code = '''
     // corrupt the child's most recent commit, this should be the update
     // to the linked-list entry, which should orphan the orphan. Note this
     // makes a lot of assumptions about the remove operation.
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "parent/child") => 0;
     lfs_block_t block = dir.m.pair[0];
     lfs_dir_close(&lfs, &dir) => 0;
     lfs_unmount(&lfs) => 0;
     uint8_t bbuffer[LFS_BLOCK_SIZE];
-    lfs_testbd_read(&bd, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
+    cfg.read(&cfg, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
     int off = LFS_BLOCK_SIZE-1;
     while (off >= 0 && bbuffer[off] == LFS_ERASE_VALUE) {
         off -= 1;
     }
     memset(&bbuffer[off-3], LFS_BLOCK_SIZE, 3);
-    lfs_testbd_erase(&bd, block) => 0;
-    lfs_testbd_prog(&bd, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
-    lfs_testbd_sync(&bd) => 0;
+    cfg.erase(&cfg, block) => 0;
+    cfg.prog(&cfg, block, 0, bbuffer, LFS_BLOCK_SIZE) => 0;
+    cfg.sync(&cfg) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_stat(&lfs, "parent/orphan", &info) => LFS_ERR_NOENT;
     lfs_stat(&lfs, "parent/child", &info) => 0;
     lfs_fs_size(&lfs) => 8;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_stat(&lfs, "parent/orphan", &info) => LFS_ERR_NOENT;
     lfs_stat(&lfs, "parent/child", &info) => 0;
     lfs_fs_size(&lfs) => 8;
@@ -48,7 +48,7 @@ code = '''
     lfs_fs_size(&lfs) => 8;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_stat(&lfs, "parent/orphan", &info) => LFS_ERR_NOENT;
     lfs_stat(&lfs, "parent/child", &info) => 0;
     lfs_stat(&lfs, "parent/otherchild", &info) => 0;
@@ -59,17 +59,17 @@ code = '''
 [[case]] # reentrant testing for orphans, basically just spam mkdir/remove
 reentrant = true
 # TODO fix this case, caused by non-DAG trees
-if = '!(DEPTH == 3 && LFS_BUFFER_SIZE != 64)'
+if = '!(DEPTH == 3 && LFS_CACHE_SIZE != 64)'
 define = [
     {FILES=6,  DEPTH=1, CYCLES=20},
     {FILES=26, DEPTH=1, CYCLES=20},
     {FILES=3,  DEPTH=3, CYCLES=20},
 ]
 code = '''
-    err = lfs_mountcfg(&lfs, &cfg);
+    err = lfs_mount(&lfs, &cfg);
     if (err) {
-        lfs_formatcfg(&lfs, &cfg) => 0;
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_format(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
     }
 
     srand(1);

tests/test_paths.toml

@@ -1,8 +1,8 @@
 
 [[case]] # simple path test
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "tea") => 0;
     lfs_mkdir(&lfs, "tea/hottea") => 0;
     lfs_mkdir(&lfs, "tea/warmtea") => 0;
@@ -23,8 +23,8 @@ code = '''
 
 [[case]] # redundant slashes
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "tea") => 0;
     lfs_mkdir(&lfs, "tea/hottea") => 0;
     lfs_mkdir(&lfs, "tea/warmtea") => 0;
@@ -47,8 +47,8 @@ code = '''
 
 [[case]] # dot path test
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "tea") => 0;
     lfs_mkdir(&lfs, "tea/hottea") => 0;
     lfs_mkdir(&lfs, "tea/warmtea") => 0;
@@ -73,8 +73,8 @@ code = '''
 
 [[case]] # dot dot path test
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "tea") => 0;
     lfs_mkdir(&lfs, "tea/hottea") => 0;
     lfs_mkdir(&lfs, "tea/warmtea") => 0;
@@ -103,8 +103,8 @@ code = '''
 
 [[case]] # trailing dot path test
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "tea") => 0;
     lfs_mkdir(&lfs, "tea/hottea") => 0;
     lfs_mkdir(&lfs, "tea/warmtea") => 0;
@@ -125,8 +125,8 @@ code = '''
 
 [[case]] # leading dot path test
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, ".milk") => 0;
     lfs_stat(&lfs, ".milk", &info) => 0;
     strcmp(info.name, ".milk") => 0;
@@ -137,8 +137,8 @@ code = '''
 
 [[case]] # root dot dot path test
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "tea") => 0;
     lfs_mkdir(&lfs, "tea/hottea") => 0;
     lfs_mkdir(&lfs, "tea/warmtea") => 0;
@@ -161,8 +161,8 @@ code = '''
 
 [[case]] # invalid path tests
 code = '''
-    lfs_formatcfg(&lfs, &cfg);
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg);
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_stat(&lfs, "dirt", &info) => LFS_ERR_NOENT;
     lfs_stat(&lfs, "dirt/ground", &info) => LFS_ERR_NOENT;
     lfs_stat(&lfs, "dirt/ground/earth", &info) => LFS_ERR_NOENT;
@@ -182,8 +182,8 @@ code = '''
 
 [[case]] # root operations
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_stat(&lfs, "/", &info) => 0;
     assert(strcmp(info.name, "/") == 0);
     assert(info.type == LFS_TYPE_DIR);
@@ -198,8 +198,8 @@ code = '''
 
 [[case]] # root representations
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_stat(&lfs, "/", &info) => 0;
     assert(strcmp(info.name, "/") == 0);
     assert(info.type == LFS_TYPE_DIR);
@@ -223,8 +223,8 @@ code = '''
 
 [[case]] # superblock conflict test
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_stat(&lfs, "littlefs", &info) => LFS_ERR_NOENT;
     lfs_remove(&lfs, "littlefs") => LFS_ERR_NOENT;
 
@@ -239,8 +239,8 @@ code = '''
 
 [[case]] # max path test
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "coffee") => 0;
     lfs_mkdir(&lfs, "coffee/hotcoffee") => 0;
     lfs_mkdir(&lfs, "coffee/warmcoffee") => 0;
@@ -263,8 +263,8 @@ code = '''
 
 [[case]] # really big path test
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_mkdir(&lfs, "coffee") => 0;
     lfs_mkdir(&lfs, "coffee/hotcoffee") => 0;
     lfs_mkdir(&lfs, "coffee/warmcoffee") => 0;

tests/test_relocations.toml

@@ -4,9 +4,9 @@ define.ITERATIONS = 20
 define.COUNT = 10
 define.LFS_BLOCK_CYCLES = [8, 1]
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
     // fill up filesystem so only ~16 blocks are left
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "padding", LFS_O_CREAT | LFS_O_WRONLY) => 0;
     memset(buffer, 0, 512);
     while (LFS_BLOCK_COUNT - lfs_fs_size(&lfs) > 16) {
@@ -17,7 +17,7 @@ code = '''
     lfs_mkdir(&lfs, "child") => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     for (int j = 0; j < ITERATIONS; j++) {
         for (int i = 0; i < COUNT; i++) {
             sprintf(path, "child/test%03d_loooooooooooooooooong_name", i);
@@ -47,7 +47,7 @@ code = '''
     }
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_dir_open(&lfs, &dir, "child") => 0;
     lfs_dir_read(&lfs, &dir, &info) => 1;
     lfs_dir_read(&lfs, &dir, &info) => 1;
@@ -70,9 +70,9 @@ define.ITERATIONS = 20
 define.COUNT = 10
 define.LFS_BLOCK_CYCLES = [8, 1]
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
     // fill up filesystem so only ~16 blocks are left
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "padding", LFS_O_CREAT | LFS_O_WRONLY) => 0;
     memset(buffer, 0, 512);
     while (LFS_BLOCK_COUNT - lfs_fs_size(&lfs) > 16) {
@@ -83,7 +83,7 @@ code = '''
     lfs_mkdir(&lfs, "child") => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     for (int j = 0; j < ITERATIONS; j++) {
         for (int i = 0; i < COUNT; i++) {
             sprintf(path, "child/test%03d_loooooooooooooooooong_name", i);
@@ -148,17 +148,17 @@ code = '''
          # almost every tree operation needs a relocation
 reentrant = true
 # TODO fix this case, caused by non-DAG trees
-if = '!(DEPTH == 3 && LFS_BUFFER_SIZE != 64)'
+#if = '!(DEPTH == 3 && LFS_CACHE_SIZE != 64)'
 define = [
     {FILES=6,  DEPTH=1, CYCLES=20, LFS_BLOCK_CYCLES=1},
     {FILES=26, DEPTH=1, CYCLES=20, LFS_BLOCK_CYCLES=1},
     {FILES=3,  DEPTH=3, CYCLES=20, LFS_BLOCK_CYCLES=1},
 ]
 code = '''
-    err = lfs_mountcfg(&lfs, &cfg);
+    err = lfs_mount(&lfs, &cfg);
     if (err) {
-        lfs_formatcfg(&lfs, &cfg) => 0;
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_format(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
     }
 
     srand(1);
@@ -210,17 +210,17 @@ code = '''
 [[case]] # reentrant testing for relocations, but now with random renames!
 reentrant = true
 # TODO fix this case, caused by non-DAG trees
-if = '!(DEPTH == 3 && LFS_BUFFER_SIZE != 64)'
+#if = '!(DEPTH == 3 && LFS_CACHE_SIZE != 64)'
 define = [
     {FILES=6,  DEPTH=1, CYCLES=20, LFS_BLOCK_CYCLES=1},
     {FILES=26, DEPTH=1, CYCLES=20, LFS_BLOCK_CYCLES=1},
     {FILES=3,  DEPTH=3, CYCLES=20, LFS_BLOCK_CYCLES=1},
 ]
 code = '''
-    err = lfs_mountcfg(&lfs, &cfg);
+    err = lfs_mount(&lfs, &cfg);
     if (err) {
-        lfs_formatcfg(&lfs, &cfg) => 0;
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_format(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
     }
 
     srand(1);

tests/test_seek.toml

@@ -9,8 +9,8 @@ define = [
     {COUNT=4,   SKIP=2},
 ]
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "kitty",
             LFS_O_WRONLY | LFS_O_CREAT | LFS_O_APPEND) => 0;
     size = strlen("kittycatcat");
@@ -21,7 +21,7 @@ code = '''
     lfs_file_close(&lfs, &file) => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "kitty", LFS_O_RDONLY) => 0;
 
     lfs_soff_t pos = -1;
@@ -78,8 +78,8 @@ define = [
     {COUNT=4,   SKIP=2},
 ]
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "kitty",
             LFS_O_WRONLY | LFS_O_CREAT | LFS_O_APPEND) => 0;
     size = strlen("kittycatcat");
@@ -90,7 +90,7 @@ code = '''
     lfs_file_close(&lfs, &file) => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "kitty", LFS_O_RDWR) => 0;
 
     lfs_soff_t pos = -1;
@@ -133,8 +133,8 @@ code = '''
 define.COUNT = 132
 define.OFFSETS = '"{512, 1020, 513, 1021, 511, 1019, 1441}"'
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "kitty",
             LFS_O_WRONLY | LFS_O_CREAT | LFS_O_APPEND) => 0;
     size = strlen("kittycatcat");
@@ -145,7 +145,7 @@ code = '''
     lfs_file_close(&lfs, &file) => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "kitty", LFS_O_RDWR) => 0;
 
     size = strlen("hedgehoghog");
@@ -193,8 +193,8 @@ define = [
     {COUNT=4,   SKIP=3},
 ]
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "kitty",
             LFS_O_WRONLY | LFS_O_CREAT | LFS_O_APPEND) => 0;
     size = strlen("kittycatcat");
@@ -204,7 +204,7 @@ code = '''
     }
     lfs_file_close(&lfs, &file) => 0;
     lfs_unmount(&lfs) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "kitty", LFS_O_RDWR) => 0;
 
     size = strlen("kittycatcat");
@@ -241,8 +241,8 @@ code = '''
 [[case]] # inline write and seek
 define.SIZE = [2, 4, 128, 132]
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "tinykitty",
             LFS_O_RDWR | LFS_O_CREAT) => 0;
     int j = 0;
@@ -310,10 +310,10 @@ code = '''
 define.COUNT = [4, 64, 128]
 reentrant = true
 code = '''
-    err = lfs_mountcfg(&lfs, &cfg);
+    err = lfs_mount(&lfs, &cfg);
     if (err) {
-        lfs_formatcfg(&lfs, &cfg) => 0;
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_format(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
     }
     err = lfs_file_open(&lfs, &file, "kitty", LFS_O_RDONLY);
     assert(!err || err == LFS_ERR_NOENT);

tests/test_superblocks.toml

@@ -1,37 +1,37 @@
 [[case]] # simple formatting test
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
 '''
 
 [[case]] # mount/unmount
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_unmount(&lfs) => 0;
 '''
 
 [[case]] # reentrant format
 reentrant = true
 code = '''
-    err = lfs_mountcfg(&lfs, &cfg);
+    err = lfs_mount(&lfs, &cfg);
     if (err) {
-        lfs_formatcfg(&lfs, &cfg) => 0;
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_format(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
     }
     lfs_unmount(&lfs) => 0;
 '''
 
 [[case]] # invalid mount
 code = '''
-    lfs_mountcfg(&lfs, &cfg) => LFS_ERR_CORRUPT;
+    lfs_mount(&lfs, &cfg) => LFS_ERR_CORRUPT;
 '''
 
 [[case]] # expanding superblock
 define.LFS_BLOCK_CYCLES = [32, 33, 1]
 define.N = [10, 100, 1000]
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     for (int i = 0; i < N; i++) {
         lfs_file_open(&lfs, &file, "dummy",
                 LFS_O_WRONLY | LFS_O_CREAT | LFS_O_EXCL) => 0;
@@ -44,7 +44,7 @@ code = '''
     lfs_unmount(&lfs) => 0;
 
     // one last check after power-cycle
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "dummy",
             LFS_O_WRONLY | LFS_O_CREAT | LFS_O_EXCL) => 0;
     lfs_file_close(&lfs, &file) => 0;
@@ -58,9 +58,9 @@ code = '''
 define.LFS_BLOCK_CYCLES = [32, 33, 1]
 define.N = [10, 100, 1000]
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
     for (int i = 0; i < N; i++) {
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
         // remove lingering dummy?
         err = lfs_stat(&lfs, "dummy", &info);
         assert(err == 0 || (err == LFS_ERR_NOENT && i == 0));
@@ -80,7 +80,7 @@ code = '''
     }
 
     // one last check after power-cycle
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_stat(&lfs, "dummy", &info) => 0;
     assert(strcmp(info.name, "dummy") == 0);
     assert(info.type == LFS_TYPE_REG);
@@ -92,10 +92,10 @@ define.LFS_BLOCK_CYCLES = [2, 1]
 define.N = 24
 reentrant = true
 code = '''
-    err = lfs_mountcfg(&lfs, &cfg);
+    err = lfs_mount(&lfs, &cfg);
     if (err) {
-        lfs_formatcfg(&lfs, &cfg) => 0;
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_format(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
     }
 
     for (int i = 0; i < N; i++) {
@@ -119,7 +119,7 @@ code = '''
     lfs_unmount(&lfs) => 0;
 
     // one last check after power-cycle
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_stat(&lfs, "dummy", &info) => 0;
     assert(strcmp(info.name, "dummy") == 0);
     assert(info.type == LFS_TYPE_REG);

tests/test_truncate.toml

@@ -2,8 +2,8 @@
 define.MEDIUMSIZE = [32, 2048]
 define.LARGESIZE = 8192
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "baldynoop",
             LFS_O_WRONLY | LFS_O_CREAT) => 0;
 
@@ -17,7 +17,7 @@ code = '''
     lfs_file_close(&lfs, &file) => 0;
     lfs_unmount(&lfs) => 0;
     
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "baldynoop", LFS_O_RDWR) => 0;
     lfs_file_size(&lfs, &file) => LARGESIZE;
 
@@ -27,7 +27,7 @@ code = '''
     lfs_file_close(&lfs, &file) => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "baldynoop", LFS_O_RDONLY) => 0;
     lfs_file_size(&lfs, &file) => MEDIUMSIZE;
 
@@ -46,8 +46,8 @@ code = '''
 define.MEDIUMSIZE = [32, 2048]
 define.LARGESIZE = 8192
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "baldyread",
             LFS_O_WRONLY | LFS_O_CREAT) => 0;
 
@@ -61,7 +61,7 @@ code = '''
     lfs_file_close(&lfs, &file) => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "baldyread", LFS_O_RDWR) => 0;
     lfs_file_size(&lfs, &file) => LARGESIZE;
 
@@ -78,7 +78,7 @@ code = '''
     lfs_file_close(&lfs, &file) => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "baldyread", LFS_O_RDONLY) => 0;
     lfs_file_size(&lfs, &file) => MEDIUMSIZE;
 
@@ -95,12 +95,12 @@ code = '''
 
 [[case]] # write, truncate, and read
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "sequence",
             LFS_O_RDWR | LFS_O_CREAT | LFS_O_TRUNC) => 0;
 
-    size = lfs_min(LFS_BUFFER_SIZE, sizeof(buffer)/2);
+    size = lfs_min(lfs.cfg->cache_size, sizeof(buffer)/2);
     lfs_size_t qsize = size / 4;
     uint8_t *wb = buffer;
     uint8_t *rb = buffer + size;
@@ -149,8 +149,8 @@ code = '''
 define.MEDIUMSIZE = [32, 2048]
 define.LARGESIZE = 8192
 code = '''
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "baldywrite",
             LFS_O_WRONLY | LFS_O_CREAT) => 0;
 
@@ -164,7 +164,7 @@ code = '''
     lfs_file_close(&lfs, &file) => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "baldywrite", LFS_O_RDWR) => 0;
     lfs_file_size(&lfs, &file) => LARGESIZE;
 
@@ -181,7 +181,7 @@ code = '''
     lfs_file_close(&lfs, &file) => 0;
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     lfs_file_open(&lfs, &file, "baldywrite", LFS_O_RDONLY) => 0;
     lfs_file_size(&lfs, &file) => MEDIUMSIZE;
 
@@ -202,10 +202,10 @@ define.MEDIUMSIZE = [32, 1024]
 define.LARGESIZE = 2048
 reentrant = true
 code = '''
-    err = lfs_mountcfg(&lfs, &cfg);
+    err = lfs_mount(&lfs, &cfg);
     if (err) {
-        lfs_formatcfg(&lfs, &cfg) => 0;
-        lfs_mountcfg(&lfs, &cfg) => 0;
+        lfs_format(&lfs, &cfg) => 0;
+        lfs_mount(&lfs, &cfg) => 0;
     }
     err = lfs_file_open(&lfs, &file, "baldy", LFS_O_RDONLY);
     assert(!err || err == LFS_ERR_NOENT);
@@ -312,8 +312,8 @@ code = '''
     const lfs_off_t *hotsizes   = configs[CONFIG].hotsizes;
     const lfs_off_t *coldsizes  = configs[CONFIG].coldsizes;
 
-    lfs_formatcfg(&lfs, &cfg) => 0;
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
     for (unsigned i = 0; i < COUNT; i++) {
         sprintf(path, "hairyhead%d", i);
@@ -340,7 +340,7 @@ code = '''
 
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
     for (unsigned i = 0; i < COUNT; i++) {
         sprintf(path, "hairyhead%d", i);
@@ -367,7 +367,7 @@ code = '''
 
     lfs_unmount(&lfs) => 0;
 
-    lfs_mountcfg(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
     for (unsigned i = 0; i < COUNT; i++) {
         sprintf(path, "hairyhead%d", i);