diff --git a/bd/lfs_emubd.c b/bd/lfs_emubd.c index 1f7b1d06..97bcf035 100644 --- a/bd/lfs_emubd.c +++ b/bd/lfs_emubd.c @@ -522,24 +522,24 @@ int lfs_emubd_bdcrc(const struct lfs_config *cfg, uint32_t *crc) { return 0; } -lfs_emubd_sio_t lfs_emubd_getreaded(const struct lfs_config *cfg) { - LFS_EMUBD_TRACE("lfs_emubd_getreaded(%p)", (void*)cfg); +lfs_emubd_sio_t lfs_emubd_readed(const struct lfs_config *cfg) { + LFS_EMUBD_TRACE("lfs_emubd_readed(%p)", (void*)cfg); lfs_emubd_t *bd = cfg->context; - LFS_EMUBD_TRACE("lfs_emubd_getreaded -> %"PRIu64, bd->readed); + LFS_EMUBD_TRACE("lfs_emubd_readed -> %"PRIu64, bd->readed); return bd->readed; } -lfs_emubd_sio_t lfs_emubd_getproged(const struct lfs_config *cfg) { - LFS_EMUBD_TRACE("lfs_emubd_getproged(%p)", (void*)cfg); +lfs_emubd_sio_t lfs_emubd_proged(const struct lfs_config *cfg) { + LFS_EMUBD_TRACE("lfs_emubd_proged(%p)", (void*)cfg); lfs_emubd_t *bd = cfg->context; - LFS_EMUBD_TRACE("lfs_emubd_getproged -> %"PRIu64, bd->proged); + LFS_EMUBD_TRACE("lfs_emubd_proged -> %"PRIu64, bd->proged); return bd->proged; } -lfs_emubd_sio_t lfs_emubd_geterased(const struct lfs_config *cfg) { - LFS_EMUBD_TRACE("lfs_emubd_geterased(%p)", (void*)cfg); +lfs_emubd_sio_t lfs_emubd_erased(const struct lfs_config *cfg) { + LFS_EMUBD_TRACE("lfs_emubd_erased(%p)", (void*)cfg); lfs_emubd_t *bd = cfg->context; - LFS_EMUBD_TRACE("lfs_emubd_geterased -> %"PRIu64, bd->erased); + LFS_EMUBD_TRACE("lfs_emubd_erased -> %"PRIu64, bd->erased); return bd->erased; } @@ -567,9 +567,9 @@ int lfs_emubd_seterased(const struct lfs_config *cfg, lfs_emubd_io_t erased) { return 0; } -lfs_emubd_swear_t lfs_emubd_getwear(const struct lfs_config *cfg, +lfs_emubd_swear_t lfs_emubd_wear(const struct lfs_config *cfg, lfs_block_t block) { - LFS_EMUBD_TRACE("lfs_emubd_getwear(%p, %"PRIu32")", (void*)cfg, block); + LFS_EMUBD_TRACE("lfs_emubd_wear(%p, %"PRIu32")", (void*)cfg, block); lfs_emubd_t *bd = cfg->context; // check if block is valid @@ -584,7 +584,7 @@ lfs_emubd_swear_t lfs_emubd_getwear(const struct lfs_config *cfg, wear = 0; } - LFS_EMUBD_TRACE("lfs_emubd_getwear -> %"PRIu32, wear); + LFS_EMUBD_TRACE("lfs_emubd_wear -> %"PRIu32, wear); return wear; } @@ -608,12 +608,12 @@ int lfs_emubd_setwear(const struct lfs_config *cfg, return 0; } -lfs_emubd_spowercycles_t lfs_emubd_getpowercycles( +lfs_emubd_spowercycles_t lfs_emubd_powercycles( const struct lfs_config *cfg) { - LFS_EMUBD_TRACE("lfs_emubd_getpowercycles(%p)", (void*)cfg); + LFS_EMUBD_TRACE("lfs_emubd_powercycles(%p)", (void*)cfg); lfs_emubd_t *bd = cfg->context; - LFS_EMUBD_TRACE("lfs_emubd_getpowercycles -> %"PRIi32, bd->power_cycles); + LFS_EMUBD_TRACE("lfs_emubd_powercycles -> %"PRIi32, bd->power_cycles); return bd->power_cycles; } @@ -625,7 +625,7 @@ int lfs_emubd_setpowercycles(const struct lfs_config *cfg, bd->power_cycles = power_cycles; - LFS_EMUBD_TRACE("lfs_emubd_getpowercycles -> %d", 0); + LFS_EMUBD_TRACE("lfs_emubd_powercycles -> %d", 0); return 0; } diff --git a/bd/lfs_emubd.h b/bd/lfs_emubd.h index c4074758..35a411fe 100644 --- a/bd/lfs_emubd.h +++ b/bd/lfs_emubd.h @@ -189,13 +189,13 @@ int lfs_emubd_crc(const struct lfs_config *cfg, int lfs_emubd_bdcrc(const struct lfs_config *cfg, uint32_t *crc); // Get total amount of bytes read -lfs_emubd_sio_t lfs_emubd_getreaded(const struct lfs_config *cfg); +lfs_emubd_sio_t lfs_emubd_readed(const struct lfs_config *cfg); // Get total amount of bytes programmed -lfs_emubd_sio_t lfs_emubd_getproged(const struct lfs_config *cfg); +lfs_emubd_sio_t lfs_emubd_proged(const struct lfs_config *cfg); // Get total amount of bytes erased -lfs_emubd_sio_t lfs_emubd_geterased(const struct lfs_config *cfg); +lfs_emubd_sio_t lfs_emubd_erased(const struct lfs_config *cfg); // Manually set amount of bytes read int lfs_emubd_setreaded(const struct lfs_config *cfg, lfs_emubd_io_t readed); @@ -207,7 +207,7 @@ int lfs_emubd_setproged(const struct lfs_config *cfg, lfs_emubd_io_t proged); int lfs_emubd_seterased(const struct lfs_config *cfg, lfs_emubd_io_t erased); // Get simulated wear on a given block -lfs_emubd_swear_t lfs_emubd_getwear(const struct lfs_config *cfg, +lfs_emubd_swear_t lfs_emubd_wear(const struct lfs_config *cfg, lfs_block_t block); // Manually set simulated wear on a given block @@ -215,7 +215,7 @@ int lfs_emubd_setwear(const struct lfs_config *cfg, lfs_block_t block, lfs_emubd_wear_t wear); // Get the remaining power-cycles -lfs_emubd_spowercycles_t lfs_emubd_getpowercycles( +lfs_emubd_spowercycles_t lfs_emubd_powercycles( const struct lfs_config *cfg); // Manually set the remaining power-cycles diff --git a/runners/bench_runner.c b/runners/bench_runner.c index b1532984..355fe69c 100644 --- a/runners/bench_runner.c +++ b/runners/bench_runner.c @@ -549,11 +549,11 @@ void bench_reset(void) { void bench_start(void) { assert(bench_cfg); - lfs_emubd_sio_t readed = lfs_emubd_getreaded(bench_cfg); + lfs_emubd_sio_t readed = lfs_emubd_readed(bench_cfg); assert(readed >= 0); - lfs_emubd_sio_t proged = lfs_emubd_getproged(bench_cfg); + lfs_emubd_sio_t proged = lfs_emubd_proged(bench_cfg); assert(proged >= 0); - lfs_emubd_sio_t erased = lfs_emubd_geterased(bench_cfg); + lfs_emubd_sio_t erased = lfs_emubd_erased(bench_cfg); assert(erased >= 0); bench_last_readed = readed; @@ -563,11 +563,11 @@ void bench_start(void) { void bench_stop(void) { assert(bench_cfg); - lfs_emubd_sio_t readed = lfs_emubd_getreaded(bench_cfg); + lfs_emubd_sio_t readed = lfs_emubd_readed(bench_cfg); assert(readed >= 0); - lfs_emubd_sio_t proged = lfs_emubd_getproged(bench_cfg); + lfs_emubd_sio_t proged = lfs_emubd_proged(bench_cfg); assert(proged >= 0); - lfs_emubd_sio_t erased = lfs_emubd_geterased(bench_cfg); + lfs_emubd_sio_t erased = lfs_emubd_erased(bench_cfg); assert(erased >= 0); bench_readed += readed - bench_last_readed; diff --git a/tests/test_exhaustion.toml b/tests/test_exhaustion.toml index 6003af47..c83dd6a0 100644 --- a/tests/test_exhaustion.toml +++ b/tests/test_exhaustion.toml @@ -474,7 +474,7 @@ exhausted: lfs_emubd_wear_t maxwear = 0; // skip 0 and 1 as superblock movement is intentionally avoided for (lfs_block_t b = 2; b < BLOCK_COUNT; b++) { - lfs_emubd_wear_t wear = lfs_emubd_getwear(cfg, b); + lfs_emubd_wear_t wear = lfs_emubd_wear(cfg, b); printf("%08x: wear %d\n", b, wear); assert(wear >= 0); if (wear < minwear) { @@ -493,7 +493,7 @@ exhausted: // find standard deviation^2 lfs_emubd_wear_t dev2 = 0; for (lfs_block_t b = 2; b < BLOCK_COUNT; b++) { - lfs_emubd_wear_t wear = lfs_emubd_getwear(cfg, b); + lfs_emubd_wear_t wear = lfs_emubd_wear(cfg, b); assert(wear >= 0); lfs_emubd_swear_t diff = wear - avgwear; dev2 += diff*diff;