github-mirrors/thirdparty-littlefs
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-littlefs.git synced 2025-10-31 08:42:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

rename functions

Browse Source
This commit is contained in:
Bill Gesner
2020-10-28 00:42:10 +00:00
parent b4ab86ee3a
commit 16e48ca21b
2 changed files with 229 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

208
lfs.c
View File

@@ -1525,7 +1525,7 @@ static int lfs_dir_compact(lfs_t *lfs,
if (lfs_pair_cmp(dir->pair, (const lfs_block_t[2]){0, 1}) == 0) { if (lfs_pair_cmp(dir->pair, (const lfs_block_t[2]){0, 1}) == 0) {
// oh no! we're writing too much to the superblock, // oh no! we're writing too much to the superblock,
// should we expand? // should we expand?
lfs_ssize_t res = _lfs_fs_size(lfs); lfs_ssize_t res = lfs_fs_size_raw(lfs);
if (res < 0) { if (res < 0) {
return res; return res;
} }
@@ -1906,7 +1906,7 @@ compact:
/// Top level directory operations /// /// Top level directory operations ///
int _lfs_mkdir(lfs_t *lfs, const char *path) { int lfs_mkdir_raw(lfs_t *lfs, const char *path) {
LFS_TRACE("lfs_mkdir(%p, \"%s\")", (void*)lfs, path); LFS_TRACE("lfs_mkdir(%p, \"%s\")", (void*)lfs, path);
// deorphan if we haven't yet, needed at most once after poweron // deorphan if we haven't yet, needed at most once after poweron
int err = lfs_fs_forceconsistency(lfs); int err = lfs_fs_forceconsistency(lfs);
@@ -2005,7 +2005,7 @@ int _lfs_mkdir(lfs_t *lfs, const char *path) {
return 0; return 0;
} }
int _lfs_dir_open(lfs_t *lfs, lfs_dir_t *dir, const char *path) { int lfs_dir_open_raw(lfs_t *lfs, lfs_dir_t *dir, const char *path) {
LFS_TRACE("lfs_dir_open(%p, %p, \"%s\")", (void*)lfs, (void*)dir, path); LFS_TRACE("lfs_dir_open(%p, %p, \"%s\")", (void*)lfs, (void*)dir, path);
lfs_stag_t tag = lfs_dir_find(lfs, &dir->m, &path, NULL); lfs_stag_t tag = lfs_dir_find(lfs, &dir->m, &path, NULL);
if (tag < 0) { if (tag < 0) {
@@ -2056,7 +2056,7 @@ int _lfs_dir_open(lfs_t *lfs, lfs_dir_t *dir, const char *path) {
return 0; return 0;
} }
int _lfs_dir_close(lfs_t *lfs, lfs_dir_t *dir) { int lfs_dir_close_raw(lfs_t *lfs, lfs_dir_t *dir) {
LFS_TRACE("lfs_dir_close(%p, %p)", (void*)lfs, (void*)dir); LFS_TRACE("lfs_dir_close(%p, %p)", (void*)lfs, (void*)dir);
// remove from list of mdirs // remove from list of mdirs
for (struct lfs_mlist **p = &lfs->mlist; *p; p = &(*p)->next) { for (struct lfs_mlist **p = &lfs->mlist; *p; p = &(*p)->next) {
@@ -2070,7 +2070,7 @@ int _lfs_dir_close(lfs_t *lfs, lfs_dir_t *dir) {
return 0; return 0;
} }
int _lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info) { int lfs_dir_read_raw(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info) {
LFS_TRACE("lfs_dir_read(%p, %p, %p)", LFS_TRACE("lfs_dir_read(%p, %p, %p)",
(void*)lfs, (void*)dir, (void*)info); (void*)lfs, (void*)dir, (void*)info);
memset(info, 0, sizeof(*info)); memset(info, 0, sizeof(*info));
@@ -2123,11 +2123,11 @@ int _lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info) {
return true; return true;
} }
int _lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off) { int lfs_dir_seek_raw(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off) {
LFS_TRACE("lfs_dir_seek(%p, %p, %"PRIu32")", LFS_TRACE("lfs_dir_seek(%p, %p, %"PRIu32")",
(void*)lfs, (void*)dir, off); (void*)lfs, (void*)dir, off);
// simply walk from head dir // simply walk from head dir
int err = _lfs_dir_rewind(lfs, dir); int err = lfs_dir_rewind_raw(lfs, dir);
if (err) { if (err) {
LFS_TRACE("lfs_dir_seek -> %d", err); LFS_TRACE("lfs_dir_seek -> %d", err);
return err; return err;
@@ -2166,14 +2166,14 @@ int _lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off) {
return 0; return 0;
} }
lfs_soff_t _lfs_dir_tell(lfs_t *lfs, lfs_dir_t *dir) { lfs_soff_t lfs_dir_tell_raw(lfs_t *lfs, lfs_dir_t *dir) {
LFS_TRACE("lfs_dir_tell(%p, %p)", (void*)lfs, (void*)dir); LFS_TRACE("lfs_dir_tell(%p, %p)", (void*)lfs, (void*)dir);
(void)lfs; (void)lfs;
LFS_TRACE("lfs_dir_tell -> %"PRId32, dir->pos); LFS_TRACE("lfs_dir_tell -> %"PRId32, dir->pos);
return dir->pos; return dir->pos;
} }
int _lfs_dir_rewind(lfs_t *lfs, lfs_dir_t *dir) { int lfs_dir_rewind_raw(lfs_t *lfs, lfs_dir_t *dir) {
LFS_TRACE("lfs_dir_rewind(%p, %p)", (void*)lfs, (void*)dir); LFS_TRACE("lfs_dir_rewind(%p, %p)", (void*)lfs, (void*)dir);
// reload the head dir // reload the head dir
int err = lfs_dir_fetch(lfs, &dir->m, dir->head); int err = lfs_dir_fetch(lfs, &dir->m, dir->head);
@@ -2380,7 +2380,7 @@ static int lfs_ctz_traverse(lfs_t *lfs,
/// Top level file operations /// /// Top level file operations ///
int _lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file, int lfs_file_opencfg_raw(lfs_t *lfs, lfs_file_t *file,
const char *path, int flags, const char *path, int flags,
const struct lfs_file_config *cfg) { const struct lfs_file_config *cfg) {
LFS_TRACE("lfs_file_opencfg(%p, %p, \"%s\", %x, %p {" LFS_TRACE("lfs_file_opencfg(%p, %p, \"%s\", %x, %p {"
@@ -2529,26 +2529,26 @@ int _lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file,
cleanup: cleanup:
// clean up lingering resources // clean up lingering resources
file->flags |= LFS_F_ERRED; file->flags |= LFS_F_ERRED;
_lfs_file_close(lfs, file); lfs_file_close_raw(lfs, file);
LFS_TRACE("lfs_file_opencfg -> %d", err); LFS_TRACE("lfs_file_opencfg -> %d", err);
return err; return err;
} }
int _lfs_file_open(lfs_t *lfs, lfs_file_t *file, int lfs_file_open_raw(lfs_t *lfs, lfs_file_t *file,
const char *path, int flags) { const char *path, int flags) {
LFS_TRACE("lfs_file_open(%p, %p, \"%s\", %x)", LFS_TRACE("lfs_file_open(%p, %p, \"%s\", %x)",
(void*)lfs, (void*)file, path, flags); (void*)lfs, (void*)file, path, flags);
static const struct lfs_file_config defaults = {0}; static const struct lfs_file_config defaults = {0};
int err = _lfs_file_opencfg(lfs, file, path, flags, &defaults); int err = lfs_file_opencfg_raw(lfs, file, path, flags, &defaults);
LFS_TRACE("lfs_file_open -> %d", err); LFS_TRACE("lfs_file_open -> %d", err);
return err; return err;
} }
int _lfs_file_close(lfs_t *lfs, lfs_file_t *file) { int lfs_file_close_raw(lfs_t *lfs, lfs_file_t *file) {
LFS_TRACE("lfs_file_close(%p, %p)", (void*)lfs, (void*)file); LFS_TRACE("lfs_file_close(%p, %p)", (void*)lfs, (void*)file);
LFS_ASSERT(file->flags & LFS_F_OPENED); LFS_ASSERT(file->flags & LFS_F_OPENED);
int err = _lfs_file_sync(lfs, file); int err = lfs_file_sync_raw(lfs, file);
// remove from list of mdirs // remove from list of mdirs
for (struct lfs_mlist **p = &lfs->mlist; *p; p = &(*p)->next) { for (struct lfs_mlist **p = &lfs->mlist; *p; p = &(*p)->next) {
@@ -2679,12 +2679,12 @@ static int lfs_file_flush(lfs_t *lfs, lfs_file_t *file) {
// copy over a byte at a time, leave it up to caching // copy over a byte at a time, leave it up to caching
// to make this efficient // to make this efficient
uint8_t data; uint8_t data;
lfs_ssize_t res = _lfs_file_read(lfs, &orig, &data, 1); lfs_ssize_t res = lfs_file_read_raw(lfs, &orig, &data, 1);
if (res < 0) { if (res < 0) {
return res; return res;
} }
res = _lfs_file_write(lfs, file, &data, 1); res = lfs_file_write_raw(lfs, file, &data, 1);
if (res < 0) { if (res < 0) {
return res; return res;
} }
@@ -2731,7 +2731,7 @@ relocate:
return 0; return 0;
} }
int _lfs_file_sync(lfs_t *lfs, lfs_file_t *file) { int lfs_file_sync_raw(lfs_t *lfs, lfs_file_t *file) {
LFS_TRACE("lfs_file_sync(%p, %p)", (void*)lfs, (void*)file); LFS_TRACE("lfs_file_sync(%p, %p)", (void*)lfs, (void*)file);
LFS_ASSERT(file->flags & LFS_F_OPENED); LFS_ASSERT(file->flags & LFS_F_OPENED);
@@ -2788,7 +2788,7 @@ int _lfs_file_sync(lfs_t *lfs, lfs_file_t *file) {
return 0; return 0;
} }
lfs_ssize_t _lfs_file_read(lfs_t *lfs, lfs_file_t *file, lfs_ssize_t lfs_file_read_raw(lfs_t *lfs, lfs_file_t *file,
void *buffer, lfs_size_t size) { void *buffer, lfs_size_t size) {
LFS_TRACE("lfs_file_read(%p, %p, %p, %"PRIu32")", LFS_TRACE("lfs_file_read(%p, %p, %p, %"PRIu32")",
(void*)lfs, (void*)file, buffer, size); (void*)lfs, (void*)file, buffer, size);
@@ -2868,7 +2868,7 @@ lfs_ssize_t _lfs_file_read(lfs_t *lfs, lfs_file_t *file,
return size; return size;
} }
lfs_ssize_t _lfs_file_write(lfs_t *lfs, lfs_file_t *file, lfs_ssize_t lfs_file_write_raw(lfs_t *lfs, lfs_file_t *file,
const void *buffer, lfs_size_t size) { const void *buffer, lfs_size_t size) {
LFS_TRACE("lfs_file_write(%p, %p, %p, %"PRIu32")", LFS_TRACE("lfs_file_write(%p, %p, %p, %"PRIu32")",
(void*)lfs, (void*)file, buffer, size); (void*)lfs, (void*)file, buffer, size);
@@ -2903,7 +2903,7 @@ lfs_ssize_t _lfs_file_write(lfs_t *lfs, lfs_file_t *file,
file->pos = file->ctz.size; file->pos = file->ctz.size;
while (file->pos < pos) { while (file->pos < pos) {
lfs_ssize_t res = _lfs_file_write(lfs, file, &(uint8_t){0}, 1); lfs_ssize_t res = lfs_file_write_raw(lfs, file, &(uint8_t){0}, 1);
if (res < 0) { if (res < 0) {
LFS_TRACE("lfs_file_write -> %"PRId32, res); LFS_TRACE("lfs_file_write -> %"PRId32, res);
return res; return res;
@@ -2999,7 +2999,7 @@ relocate:
return size; return size;
} }
lfs_soff_t _lfs_file_seek(lfs_t *lfs, lfs_file_t *file, lfs_soff_t lfs_file_seek_raw(lfs_t *lfs, lfs_file_t *file,
lfs_soff_t off, int whence) { lfs_soff_t off, int whence) {
LFS_TRACE("lfs_file_seek(%p, %p, %"PRId32", %d)", LFS_TRACE("lfs_file_seek(%p, %p, %"PRId32", %d)",
(void*)lfs, (void*)file, off, whence); (void*)lfs, (void*)file, off, whence);
@@ -3034,7 +3034,7 @@ lfs_soff_t _lfs_file_seek(lfs_t *lfs, lfs_file_t *file,
return npos; return npos;
} }
int _lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { int lfs_file_truncate_raw(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) {
LFS_TRACE("lfs_file_truncate(%p, %p, %"PRIu32")", LFS_TRACE("lfs_file_truncate(%p, %p, %"PRIu32")",
(void*)lfs, (void*)file, size); (void*)lfs, (void*)file, size);
LFS_ASSERT(file->flags & LFS_F_OPENED); LFS_ASSERT(file->flags & LFS_F_OPENED);
@@ -3046,7 +3046,7 @@ int _lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) {
} }
lfs_off_t pos = file->pos; lfs_off_t pos = file->pos;
lfs_off_t oldsize = _lfs_file_size(lfs, file); lfs_off_t oldsize = lfs_file_size_raw(lfs, file);
if (size < oldsize) { if (size < oldsize) {
// need to flush since directly changing metadata // need to flush since directly changing metadata
int err = lfs_file_flush(lfs, file); int err = lfs_file_flush(lfs, file);
@@ -3070,7 +3070,7 @@ int _lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) {
} else if (size > oldsize) { } else if (size > oldsize) {
// flush+seek if not already at end // flush+seek if not already at end
if (file->pos != oldsize) { if (file->pos != oldsize) {
lfs_soff_t res = _lfs_file_seek(lfs, file, 0, LFS_SEEK_END); lfs_soff_t res = lfs_file_seek_raw(lfs, file, 0, LFS_SEEK_END);
if (res < 0) { if (res < 0) {
LFS_TRACE("lfs_file_truncate -> %"PRId32, res); LFS_TRACE("lfs_file_truncate -> %"PRId32, res);
return (int)res; return (int)res;
@@ -3079,7 +3079,7 @@ int _lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) {
// fill with zeros // fill with zeros
while (file->pos < size) { while (file->pos < size) {
lfs_ssize_t res = _lfs_file_write(lfs, file, &(uint8_t){0}, 1); lfs_ssize_t res = lfs_file_write_raw(lfs, file, &(uint8_t){0}, 1);
if (res < 0) { if (res < 0) {
LFS_TRACE("lfs_file_truncate -> %"PRId32, res); LFS_TRACE("lfs_file_truncate -> %"PRId32, res);
return (int)res; return (int)res;
@@ -3088,7 +3088,7 @@ int _lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) {
} }
// restore pos // restore pos
lfs_soff_t res = _lfs_file_seek(lfs, file, pos, LFS_SEEK_SET); lfs_soff_t res = lfs_file_seek_raw(lfs, file, pos, LFS_SEEK_SET);
if (res < 0) { if (res < 0) {
LFS_TRACE("lfs_file_truncate -> %"PRId32, res); LFS_TRACE("lfs_file_truncate -> %"PRId32, res);
return (int)res; return (int)res;
@@ -3098,7 +3098,7 @@ int _lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) {
return 0; return 0;
} }
lfs_soff_t _lfs_file_tell(lfs_t *lfs, lfs_file_t *file) { lfs_soff_t lfs_file_tell_raw(lfs_t *lfs, lfs_file_t *file) {
LFS_TRACE("lfs_file_tell(%p, %p)", (void*)lfs, (void*)file); LFS_TRACE("lfs_file_tell(%p, %p)", (void*)lfs, (void*)file);
LFS_ASSERT(file->flags & LFS_F_OPENED); LFS_ASSERT(file->flags & LFS_F_OPENED);
(void)lfs; (void)lfs;
@@ -3106,9 +3106,9 @@ lfs_soff_t _lfs_file_tell(lfs_t *lfs, lfs_file_t *file) {
return file->pos; return file->pos;
} }
int _lfs_file_rewind(lfs_t *lfs, lfs_file_t *file) { int lfs_file_rewind_raw(lfs_t *lfs, lfs_file_t *file) {
LFS_TRACE("lfs_file_rewind(%p, %p)", (void*)lfs, (void*)file); LFS_TRACE("lfs_file_rewind(%p, %p)", (void*)lfs, (void*)file);
lfs_soff_t res = _lfs_file_seek(lfs, file, 0, LFS_SEEK_SET); lfs_soff_t res = lfs_file_seek_raw(lfs, file, 0, LFS_SEEK_SET);
if (res < 0) { if (res < 0) {
LFS_TRACE("lfs_file_rewind -> %"PRId32, res); LFS_TRACE("lfs_file_rewind -> %"PRId32, res);
return (int)res; return (int)res;
@@ -3118,7 +3118,7 @@ int _lfs_file_rewind(lfs_t *lfs, lfs_file_t *file) {
return 0; return 0;
} }
lfs_soff_t _lfs_file_size(lfs_t *lfs, lfs_file_t *file) { lfs_soff_t lfs_file_size_raw(lfs_t *lfs, lfs_file_t *file) {
LFS_TRACE("lfs_file_size(%p, %p)", (void*)lfs, (void*)file); LFS_TRACE("lfs_file_size(%p, %p)", (void*)lfs, (void*)file);
LFS_ASSERT(file->flags & LFS_F_OPENED); LFS_ASSERT(file->flags & LFS_F_OPENED);
(void)lfs; (void)lfs;
@@ -3134,7 +3134,7 @@ lfs_soff_t _lfs_file_size(lfs_t *lfs, lfs_file_t *file) {
/// General fs operations /// /// General fs operations ///
int _lfs_stat(lfs_t *lfs, const char *path, struct lfs_info *info) { int lfs_stat_raw(lfs_t *lfs, const char *path, struct lfs_info *info) {
LFS_TRACE("lfs_stat(%p, \"%s\", %p)", (void*)lfs, path, (void*)info); LFS_TRACE("lfs_stat(%p, \"%s\", %p)", (void*)lfs, path, (void*)info);
lfs_mdir_t cwd; lfs_mdir_t cwd;
lfs_stag_t tag = lfs_dir_find(lfs, &cwd, &path, NULL); lfs_stag_t tag = lfs_dir_find(lfs, &cwd, &path, NULL);
@@ -3148,7 +3148,7 @@ int _lfs_stat(lfs_t *lfs, const char *path, struct lfs_info *info) {
return err; return err;
} }
int _lfs_remove(lfs_t *lfs, const char *path) { int lfs_remove_raw(lfs_t *lfs, const char *path) {
LFS_TRACE("lfs_remove(%p, \"%s\")", (void*)lfs, path); LFS_TRACE("lfs_remove(%p, \"%s\")", (void*)lfs, path);
// deorphan if we haven't yet, needed at most once after poweron // deorphan if we haven't yet, needed at most once after poweron
int err = lfs_fs_forceconsistency(lfs); int err = lfs_fs_forceconsistency(lfs);
@@ -3229,7 +3229,7 @@ int _lfs_remove(lfs_t *lfs, const char *path) {
return 0; return 0;
} }
int _lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath) { int lfs_rename_raw(lfs_t *lfs, const char *oldpath, const char *newpath) {
LFS_TRACE("lfs_rename(%p, \"%s\", \"%s\")", (void*)lfs, oldpath, newpath); LFS_TRACE("lfs_rename(%p, \"%s\", \"%s\")", (void*)lfs, oldpath, newpath);
// deorphan if we haven't yet, needed at most once after poweron // deorphan if we haven't yet, needed at most once after poweron
@@ -3374,7 +3374,7 @@ int _lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath) {
return 0; return 0;
} }
lfs_ssize_t _lfs_getattr(lfs_t *lfs, const char *path, lfs_ssize_t lfs_getattr_raw(lfs_t *lfs, const char *path,
uint8_t type, void *buffer, lfs_size_t size) { uint8_t type, void *buffer, lfs_size_t size) {
LFS_TRACE("lfs_getattr(%p, \"%s\", %"PRIu8", %p, %"PRIu32")", LFS_TRACE("lfs_getattr(%p, \"%s\", %"PRIu8", %p, %"PRIu32")",
(void*)lfs, path, type, buffer, size); (void*)lfs, path, type, buffer, size);
@@ -3437,7 +3437,7 @@ static int lfs_commitattr(lfs_t *lfs, const char *path,
{LFS_MKTAG(LFS_TYPE_USERATTR + type, id, size), buffer})); {LFS_MKTAG(LFS_TYPE_USERATTR + type, id, size), buffer}));
} }
int _lfs_setattr(lfs_t *lfs, const char *path, int lfs_setattr_raw(lfs_t *lfs, const char *path,
uint8_t type, const void *buffer, lfs_size_t size) { uint8_t type, const void *buffer, lfs_size_t size) {
LFS_TRACE("lfs_setattr(%p, \"%s\", %"PRIu8", %p, %"PRIu32")", LFS_TRACE("lfs_setattr(%p, \"%s\", %"PRIu8", %p, %"PRIu32")",
(void*)lfs, path, type, buffer, size); (void*)lfs, path, type, buffer, size);
@@ -3451,7 +3451,7 @@ int _lfs_setattr(lfs_t *lfs, const char *path,
return err; return err;
} }
int _lfs_removeattr(lfs_t *lfs, const char *path, uint8_t type) { int lfs_removeattr_raw(lfs_t *lfs, const char *path, uint8_t type) {
LFS_TRACE("lfs_removeattr(%p, \"%s\", %"PRIu8")", (void*)lfs, path, type); LFS_TRACE("lfs_removeattr(%p, \"%s\", %"PRIu8")", (void*)lfs, path, type);
int err = lfs_commitattr(lfs, path, type, NULL, 0x3ff); int err = lfs_commitattr(lfs, path, type, NULL, 0x3ff);
LFS_TRACE("lfs_removeattr -> %d", err); LFS_TRACE("lfs_removeattr -> %d", err);
@@ -3584,7 +3584,7 @@ static int lfs_deinit(lfs_t *lfs) {
return 0; return 0;
} }
int _lfs_format(lfs_t *lfs, const struct lfs_config *cfg) { int lfs_format_raw(lfs_t *lfs, const struct lfs_config *cfg) {
LFS_TRACE("lfs_format(%p, %p {.context=%p, " LFS_TRACE("lfs_format(%p, %p {.context=%p, "
".read=%p, .prog=%p, .erase=%p, .sync=%p, " ".read=%p, .prog=%p, .erase=%p, .sync=%p, "
".read_size=%"PRIu32", .prog_size=%"PRIu32", " ".read_size=%"PRIu32", .prog_size=%"PRIu32", "
@@ -3665,7 +3665,7 @@ cleanup:
return err; return err;
} }
int _lfs_mount(lfs_t *lfs, const struct lfs_config *cfg) { int lfs_mount_raw(lfs_t *lfs, const struct lfs_config *cfg) {
LFS_TRACE("lfs_mount(%p, %p {.context=%p, " LFS_TRACE("lfs_mount(%p, %p {.context=%p, "
".read=%p, .prog=%p, .erase=%p, .sync=%p, " ".read=%p, .prog=%p, .erase=%p, .sync=%p, "
".read_size=%"PRIu32", .prog_size=%"PRIu32", " ".read_size=%"PRIu32", .prog_size=%"PRIu32", "
@@ -3804,12 +3804,12 @@ int _lfs_mount(lfs_t *lfs, const struct lfs_config *cfg) {
return 0; return 0;
cleanup: cleanup:
_lfs_unmount(lfs); lfs_unmount_raw(lfs);
LFS_TRACE("lfs_mount -> %d", err); LFS_TRACE("lfs_mount -> %d", err);
return err; return err;
} }
int _lfs_unmount(lfs_t *lfs) { int lfs_unmount_raw(lfs_t *lfs) {
LFS_TRACE("lfs_unmount(%p)", (void*)lfs); LFS_TRACE("lfs_unmount(%p)", (void*)lfs);
int err = lfs_deinit(lfs); int err = lfs_deinit(lfs);
LFS_TRACE("lfs_unmount -> %d", err); LFS_TRACE("lfs_unmount -> %d", err);
@@ -3914,7 +3914,7 @@ int lfs_fs_traverseraw(lfs_t *lfs,
return 0; return 0;
} }
int _lfs_fs_traverse(lfs_t *lfs, int lfs_fs_traverse_raw(lfs_t *lfs,
int (*cb)(void *data, lfs_block_t block), void *data) { int (*cb)(void *data, lfs_block_t block), void *data) {
LFS_TRACE("lfs_fs_traverse(%p, %p, %p)", LFS_TRACE("lfs_fs_traverse(%p, %p, %p)",
(void*)lfs, (void*)(uintptr_t)cb, data); (void*)lfs, (void*)(uintptr_t)cb, data);
@@ -4235,7 +4235,7 @@ static int lfs_fs_size_count(void *p, lfs_block_t block) {
return 0; return 0;
} }
lfs_ssize_t _lfs_fs_size(lfs_t *lfs) { lfs_ssize_t lfs_fs_size_raw(lfs_t *lfs) {
LFS_TRACE("lfs_fs_size(%p)", (void*)lfs); LFS_TRACE("lfs_fs_size(%p)", (void*)lfs);
lfs_size_t size = 0; lfs_size_t size = 0;
int err = lfs_fs_traverseraw(lfs, lfs_fs_size_count, &size, false); int err = lfs_fs_traverseraw(lfs, lfs_fs_size_count, &size, false);
@@ -4669,7 +4669,7 @@ static int lfs1_unmount(lfs_t *lfs) {
} }
/// v1 migration /// /// v1 migration ///
int _lfs_migrate(lfs_t *lfs, const struct lfs_config *cfg) { int lfs_migrate_raw(lfs_t *lfs, const struct lfs_config *cfg) {
LFS_TRACE("lfs_migrate(%p, %p {.context=%p, " LFS_TRACE("lfs_migrate(%p, %p {.context=%p, "
".read=%p, .prog=%p, .erase=%p, .sync=%p, " ".read=%p, .prog=%p, .erase=%p, .sync=%p, "
".read_size=%"PRIu32", .prog_size=%"PRIu32", " ".read_size=%"PRIu32", .prog_size=%"PRIu32", "
@@ -4914,387 +4914,387 @@ cleanup:
#if LFS_THREAD_SAFE #if LFS_THREAD_SAFE
int _ts_lfs_format(lfs_t *lfs, const struct lfs_config *config) int lfs_format_ts(lfs_t *lfs, const struct lfs_config *config)
{ {
int err = config->lock(lfs->cfg); int err = config->lock(lfs->cfg);
if(err) if(err)
{ {
return err; return err;
} }
err = lfs_format(lfs, config); err = lfs_format_raw(lfs, config);
config->unlock(lfs->cfg); config->unlock(lfs->cfg);
return err; return err;
} }
int _ts_lfs_mount(lfs_t *lfs, const struct lfs_config *config) int lfs_mount_ts(lfs_t *lfs, const struct lfs_config *config)
{ {
int err = config->lock(lfs->cfg); int err = config->lock(lfs->cfg);
if(err) if(err)
{ {
return err; return err;
} }
err = lfs_mount(lfs, config); err = lfs_mount_raw(lfs, config);
config->unlock(lfs->cfg); config->unlock(lfs->cfg);
return err; return err;
} }
int _ts_lfs_unmount(lfs_t *lfs) int lfs_unmount_ts(lfs_t *lfs)
{ {
int err = lfs->cfg->lock(lfs->cfg); int err = lfs->cfg->lock(lfs->cfg);
if(err) if(err)
{ {
return err; return err;
} }
err = lfs_unmount(lfs); err = lfs_unmount_raw(lfs);
lfs->cfg->unlock(lfs->cfg); lfs->cfg->unlock(lfs->cfg);
return err; return err;
} }
int _ts_lfs_remove(lfs_t *lfs, const char *path) int lfs_remove_ts(lfs_t *lfs, const char *path)
{ {
int err = lfs->cfg->lock(lfs->cfg); int err = lfs->cfg->lock(lfs->cfg);
if(err) if(err)
{ {
return err; return err;
} }
err = lfs_remove(lfs, path); err = lfs_remove_raw(lfs, path);
lfs->cfg->unlock(lfs->cfg); lfs->cfg->unlock(lfs->cfg);
return err; return err;
} }
int _ts_lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath) int lfs_rename_ts(lfs_t *lfs, const char *oldpath, const char *newpath)
{ {
int err = lfs->cfg->lock(lfs->cfg); int err = lfs->cfg->lock(lfs->cfg);
if(err) if(err)
{ {
return err; return err;
} }
err = lfs_rename(lfs, oldpath, newpath); err = lfs_rename_raw(lfs, oldpath, newpath);
lfs->cfg->unlock(lfs->cfg); lfs->cfg->unlock(lfs->cfg);
return err; return err;
} }
int _ts_lfs_stat(lfs_t *lfs, const char *path, struct lfs_info *info) int lfs_stat_ts(lfs_t *lfs, const char *path, struct lfs_info *info)
{ {
int err = lfs->cfg->lock(lfs->cfg); int err = lfs->cfg->lock(lfs->cfg);
if(err) if(err)
{ {
return err; return err;
} }
err = lfs_stat(lfs, path, info); err = lfs_stat_raw(lfs, path, info);
lfs->cfg->unlock(lfs->cfg); lfs->cfg->unlock(lfs->cfg);
return err; return err;
} }
lfs_ssize_t _ts_lfs_getattr(lfs_t *lfs, const char *path, uint8_t type, void *buffer, lfs_size_t size) lfs_ssize_t lfs_getattr_ts(lfs_t *lfs, const char *path, uint8_t type, void *buffer, lfs_size_t size)
{ {
int err = lfs->cfg->lock(lfs->cfg); int err = lfs->cfg->lock(lfs->cfg);
if(err) if(err)
{ {
return err; return err;
} }
err = lfs_getattr(lfs, path, type, buffer, size); err = lfs_getattr_raw(lfs, path, type, buffer, size);
lfs->cfg->unlock(lfs->cfg); lfs->cfg->unlock(lfs->cfg);
return err; return err;
} }
int _ts_lfs_setattr(lfs_t *lfs, const char *path, uint8_t type, const void *buffer, lfs_size_t size) int lfs_setattr_ts(lfs_t *lfs, const char *path, uint8_t type, const void *buffer, lfs_size_t size)
{ {
int err = lfs->cfg->lock(lfs->cfg); int err = lfs->cfg->lock(lfs->cfg);
if(err) if(err)
{ {
return err; return err;
} }
err = lfs_setattr(lfs, path, type, buffer, size); err = lfs_setattr_raw(lfs, path, type, buffer, size);
lfs->cfg->unlock(lfs->cfg); lfs->cfg->unlock(lfs->cfg);
return err; return err;
} }
int _ts_lfs_removeattr(lfs_t *lfs, const char *path, uint8_t type) int lfs_removeattr_ts(lfs_t *lfs, const char *path, uint8_t type)
{ {
int err = lfs->cfg->lock(lfs->cfg); int err = lfs->cfg->lock(lfs->cfg);
if(err) if(err)
{ {
return err; return err;
} }
err = lfs_removeattr(lfs, path, type); err = lfs_removeattr_raw(lfs, path, type);
lfs->cfg->unlock(lfs->cfg); lfs->cfg->unlock(lfs->cfg);
return err; return err;
} }
int _ts_lfs_file_open(lfs_t *lfs, lfs_file_t *file, const char *path, int flags) int lfs_file_open_ts(lfs_t *lfs, lfs_file_t *file, const char *path, int flags)
{ {
int err = lfs->cfg->lock(lfs->cfg); int err = lfs->cfg->lock(lfs->cfg);
if(err) if(err)
{ {
return err; return err;
} }
err = lfs_file_open(lfs, file, path, flags); err = lfs_file_open_raw(lfs, file, path, flags);
lfs->cfg->unlock(lfs->cfg); lfs->cfg->unlock(lfs->cfg);
return err; return err;
} }
int _ts_lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file, const char *path, int flags, const struct lfs_file_config *config) int lfs_file_opencfg_ts(lfs_t *lfs, lfs_file_t *file, const char *path, int flags, const struct lfs_file_config *config)
{ {
int err = lfs->cfg->lock(lfs->cfg); int err = lfs->cfg->lock(lfs->cfg);
if(err) if(err)
{ {
return err; return err;
} }
err = lfs_file_opencfg(lfs, file, path, flags, config); err = lfs_file_opencfg_raw(lfs, file, path, flags, config);
lfs->cfg->unlock(lfs->cfg); lfs->cfg->unlock(lfs->cfg);
return err; return err;
} }
int _ts_lfs_file_close(lfs_t *lfs, lfs_file_t *file) int lfs_file_close_ts(lfs_t *lfs, lfs_file_t *file)
{ {
int err = lfs->cfg->lock(lfs->cfg); int err = lfs->cfg->lock(lfs->cfg);
if(err) if(err)
{ {
return err; return err;
} }
err = lfs_file_close(lfs, file); err = lfs_file_close_raw(lfs, file);
lfs->cfg->unlock(lfs->cfg); lfs->cfg->unlock(lfs->cfg);
return err; return err;
} }
int _ts_lfs_file_sync(lfs_t *lfs, lfs_file_t *file) int lfs_file_sync_ts(lfs_t *lfs, lfs_file_t *file)
{ {
int err = lfs->cfg->lock(lfs->cfg); int err = lfs->cfg->lock(lfs->cfg);
if(err) if(err)
{ {
return err; return err;
} }
err = lfs_file_sync(lfs, file); err = lfs_file_sync_raw(lfs, file);
lfs->cfg->unlock(lfs->cfg); lfs->cfg->unlock(lfs->cfg);
return err; return err;
} }
lfs_ssize_t _ts_lfs_file_read(lfs_t *lfs, lfs_file_t *file, void *buffer, lfs_size_t size) lfs_ssize_t lfs_file_read_ts(lfs_t *lfs, lfs_file_t *file, void *buffer, lfs_size_t size)
{ {
int err = lfs->cfg->lock(lfs->cfg); int err = lfs->cfg->lock(lfs->cfg);
if(err) if(err)
{ {
return err; return err;
} }
err = lfs_file_read(lfs, file, buffer, size); err = lfs_file_read_raw(lfs, file, buffer, size);
lfs->cfg->unlock(lfs->cfg); lfs->cfg->unlock(lfs->cfg);
return err; return err;
} }
lfs_ssize_t _ts_lfs_file_write(lfs_t *lfs, lfs_file_t *file, const void *buffer, lfs_size_t size) lfs_ssize_t lfs_file_write_ts(lfs_t *lfs, lfs_file_t *file, const void *buffer, lfs_size_t size)
{ {
int err = lfs->cfg->lock(lfs->cfg); int err = lfs->cfg->lock(lfs->cfg);
if(err) if(err)
{ {
return err; return err;
} }
err = lfs_file_write(lfs, file, buffer, size); err = lfs_file_write_raw(lfs, file, buffer, size);
lfs->cfg->unlock(lfs->cfg); lfs->cfg->unlock(lfs->cfg);
return err; return err;
} }
lfs_soff_t _ts_lfs_file_seek(lfs_t *lfs, lfs_file_t *file, lfs_soff_t off, int whence) lfs_soff_t lfs_file_seek_ts(lfs_t *lfs, lfs_file_t *file, lfs_soff_t off, int whence)
{ {
int err = lfs->cfg->lock(lfs->cfg); int err = lfs->cfg->lock(lfs->cfg);
if(err) if(err)
{ {
return err; return err;
} }
err = lfs_file_seek(lfs, file, off, whence); err = lfs_file_seek_raw(lfs, file, off, whence);
lfs->cfg->unlock(lfs->cfg); lfs->cfg->unlock(lfs->cfg);
return err; return err;
} }
int _ts_lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) int lfs_file_truncate_ts(lfs_t *lfs, lfs_file_t *file, lfs_off_t size)
{ {
int err = lfs->cfg->lock(lfs->cfg); int err = lfs->cfg->lock(lfs->cfg);
if(err) if(err)
{ {
return err; return err;
} }
err = lfs_file_truncate(lfs, file, size); err = lfs_file_truncate_raw(lfs, file, size);
lfs->cfg->unlock(lfs->cfg); lfs->cfg->unlock(lfs->cfg);
return err; return err;
} }
lfs_soff_t _ts_lfs_file_tell(lfs_t *lfs, lfs_file_t *file) lfs_soff_t lfs_file_tell_ts(lfs_t *lfs, lfs_file_t *file)
{ {
int err = lfs->cfg->lock(lfs->cfg); int err = lfs->cfg->lock(lfs->cfg);
if(err) if(err)
{ {
return err; return err;
} }
err = lfs_file_tell(lfs, file); err = lfs_file_tell_raw(lfs, file);
lfs->cfg->unlock(lfs->cfg); lfs->cfg->unlock(lfs->cfg);
return err; return err;
} }
int _ts_lfs_file_rewind(lfs_t *lfs, lfs_file_t *file) int lfs_file_rewind_ts(lfs_t *lfs, lfs_file_t *file)
{ {
int err = lfs->cfg->lock(lfs->cfg); int err = lfs->cfg->lock(lfs->cfg);
if(err) if(err)
{ {
return err; return err;
} }
err = lfs_file_rewind(lfs, file); err = lfs_file_rewind_raw(lfs, file);
lfs->cfg->unlock(lfs->cfg); lfs->cfg->unlock(lfs->cfg);
return err; return err;
} }
lfs_soff_t _ts_lfs_file_size(lfs_t *lfs, lfs_file_t *file) lfs_soff_t lfs_file_size_ts(lfs_t *lfs, lfs_file_t *file)
{ {
int err = lfs->cfg->lock(lfs->cfg); int err = lfs->cfg->lock(lfs->cfg);
if(err) if(err)
{ {
return err; return err;
} }
err = lfs_file_size(lfs, file); err = lfs_file_size_raw(lfs, file);
lfs->cfg->unlock(lfs->cfg); lfs->cfg->unlock(lfs->cfg);
return err; return err;
} }
int _ts_lfs_mkdir(lfs_t *lfs, const char *path) int lfs_mkdir_ts(lfs_t *lfs, const char *path)
{ {
int err = lfs->cfg->lock(lfs->cfg); int err = lfs->cfg->lock(lfs->cfg);
if(err) if(err)
{ {
return err; return err;
} }
err = lfs_mkdir(lfs, path); err = lfs_mkdir_raw(lfs, path);
lfs->cfg->unlock(lfs->cfg); lfs->cfg->unlock(lfs->cfg);
return err; return err;
} }
int _ts_lfs_dir_open(lfs_t *lfs, lfs_dir_t *dir, const char *path) int lfs_dir_open_ts(lfs_t *lfs, lfs_dir_t *dir, const char *path)
{ {
int err = lfs->cfg->lock(lfs->cfg); int err = lfs->cfg->lock(lfs->cfg);
if(err) if(err)
{ {
return err; return err;
} }
err = lfs_dir_open(lfs, dir, path); err = lfs_dir_open_raw(lfs, dir, path);
lfs->cfg->unlock(lfs->cfg); lfs->cfg->unlock(lfs->cfg);
return err; return err;
} }
int _ts_lfs_dir_close(lfs_t *lfs, lfs_dir_t *dir) int lfs_dir_close_ts(lfs_t *lfs, lfs_dir_t *dir)
{ {
int err = lfs->cfg->lock(lfs->cfg); int err = lfs->cfg->lock(lfs->cfg);
if(err) if(err)
{ {
return err; return err;
} }
err = lfs_dir_close(lfs, dir); err = lfs_dir_close_raw(lfs, dir);
lfs->cfg->unlock(lfs->cfg); lfs->cfg->unlock(lfs->cfg);
return err; return err;
} }
int _ts_lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info) int lfs_dir_read_ts(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info)
{ {
int err = lfs->cfg->lock(lfs->cfg); int err = lfs->cfg->lock(lfs->cfg);
if(err) if(err)
{ {
return err; return err;
} }
err = lfs_dir_read(lfs, dir, info); err = lfs_dir_read_raw(lfs, dir, info);
lfs->cfg->unlock(lfs->cfg); lfs->cfg->unlock(lfs->cfg);
return err; return err;
} }
int _ts_lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off) int lfs_dir_seek_ts(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off)
{ {
int err = lfs->cfg->lock(lfs->cfg); int err = lfs->cfg->lock(lfs->cfg);
if(err) if(err)
{ {
return err; return err;
} }
err = lfs_dir_seek(lfs, dir, off); err = lfs_dir_seek_raw(lfs, dir, off);
lfs->cfg->unlock(lfs->cfg); lfs->cfg->unlock(lfs->cfg);
return err; return err;
} }
lfs_soff_t _ts_lfs_dir_tell(lfs_t *lfs, lfs_dir_t *dir) lfs_soff_t lfs_dir_tell_ts(lfs_t *lfs, lfs_dir_t *dir)
{ {
int err = lfs->cfg->lock(lfs->cfg); int err = lfs->cfg->lock(lfs->cfg);
if(err) if(err)
{ {
return err; return err;
} }
err = lfs_dir_tell(lfs, dir); err = lfs_dir_tell_raw(lfs, dir);
lfs->cfg->unlock(lfs->cfg); lfs->cfg->unlock(lfs->cfg);
return err; return err;
} }
int _ts_lfs_dir_rewind(lfs_t *lfs, lfs_dir_t *dir) int lfs_dir_rewind_ts(lfs_t *lfs, lfs_dir_t *dir)
{ {
int err = lfs->cfg->lock(lfs->cfg); int err = lfs->cfg->lock(lfs->cfg);
if(err) if(err)
{ {
return err; return err;
} }
err = lfs_dir_rewind(lfs, dir); err = lfs_dir_rewind_raw(lfs, dir);
lfs->cfg->unlock(lfs->cfg); lfs->cfg->unlock(lfs->cfg);
return err; return err;
} }
lfs_ssize_t _ts_lfs_fs_size(lfs_t *lfs) lfs_ssize_t lfs_fs_size_ts(lfs_t *lfs)
{ {
int err = lfs->cfg->lock(lfs->cfg); int err = lfs->cfg->lock(lfs->cfg);
if(err) if(err)
{ {
return err; return err;
} }
err = lfs_fs_size(lfs); err = lfs_fs_size_raw(lfs);
lfs->cfg->unlock(lfs->cfg); lfs->cfg->unlock(lfs->cfg);
return err; return err;
} }
int _ts_lfs_fs_traverse(lfs_t *lfs, int (*cb)(void*, lfs_block_t), void *data) int lfs_fs_traverse_ts(lfs_t *lfs, int (*cb)(void*, lfs_block_t), void *data)
{ {
int err = lfs->cfg->lock(lfs->cfg); int err = lfs->cfg->lock(lfs->cfg);
if(err) if(err)
{ {
return err; return err;
} }
err = lfs_fs_traverse(lfs, cb, data); err = lfs_fs_traverse_raw(lfs, cb, data);
lfs->cfg->unlock(lfs->cfg); lfs->cfg->unlock(lfs->cfg);
return err; return err;
} }
int _ts_lfs_migrate(lfs_t *lfs, const struct lfs_config *cfg) int lfs_migrate_ts(lfs_t *lfs, const struct lfs_config *cfg)
{ {
int err = lfs->cfg->lock(lfs->cfg); int err = lfs->cfg->lock(lfs->cfg);
if(err) if(err)
{ {
return err; return err;
} }
err = lfs_migrate(lfs, cfg); err = lfs_migrate_raw(lfs, cfg);
lfs->cfg->unlock(lfs->cfg); lfs->cfg->unlock(lfs->cfg);

250
lfs.h
View File

@@ -54,7 +54,7 @@ typedef uint32_t lfs_block_t;
// Maximum size of a file in bytes, may be redefined to limit to support other // 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 // drivers. Limited on disk to <= 4294967296. However, above 2147483647 the
// functions _lfs_file_seek, _lfs_file_size, and _lfs_file_tell will return // functions lfs_file_seek_raw, lfs_file_size_raw, and lfs_file_tell_raw will return
// incorrect values due to using signed integers. Stored in superblock and // incorrect values due to using signed integers. Stored in superblock and
// must be respected by other littlefs drivers. // must be respected by other littlefs drivers.
#ifndef LFS_FILE_MAX #ifndef LFS_FILE_MAX
@@ -420,7 +420,7 @@ typedef struct lfs {
// be zeroed for defaults and backwards compatibility. // be zeroed for defaults and backwards compatibility.
// //
// Returns a negative error code on failure. // Returns a negative error code on failure.
int _lfs_format(lfs_t *lfs, const struct lfs_config *config); int lfs_format_raw(lfs_t *lfs, const struct lfs_config *config);
// Mounts a littlefs // Mounts a littlefs
// //
@@ -430,13 +430,13 @@ int _lfs_format(lfs_t *lfs, const struct lfs_config *config);
// be zeroed for defaults and backwards compatibility. // be zeroed for defaults and backwards compatibility.
// //
// Returns a negative error code on failure. // Returns a negative error code on failure.
int _lfs_mount(lfs_t *lfs, const struct lfs_config *config); int lfs_mount_raw(lfs_t *lfs, const struct lfs_config *config);
// Unmounts a littlefs // Unmounts a littlefs
// //
// Does nothing besides releasing any allocated resources. // Does nothing besides releasing any allocated resources.
// Returns a negative error code on failure. // Returns a negative error code on failure.
int _lfs_unmount(lfs_t *lfs); int lfs_unmount_raw(lfs_t *lfs);
/// General operations /// /// General operations ///
@@ -444,7 +444,7 @@ int _lfs_unmount(lfs_t *lfs);
// //
// If removing a directory, the directory must be empty. // If removing a directory, the directory must be empty.
// Returns a negative error code on failure. // Returns a negative error code on failure.
int _lfs_remove(lfs_t *lfs, const char *path); int lfs_remove_raw(lfs_t *lfs, const char *path);
// Rename or move a file or directory // Rename or move a file or directory
// //
@@ -452,13 +452,13 @@ int _lfs_remove(lfs_t *lfs, const char *path);
// If the destination is a directory, the directory must be empty. // If the destination is a directory, the directory must be empty.
// //
// Returns a negative error code on failure. // Returns a negative error code on failure.
int _lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath); int lfs_rename_raw(lfs_t *lfs, const char *oldpath, const char *newpath);
// Find info about a file or directory // Find info about a file or directory
// //
// Fills out the info structure, based on the specified file or directory. // Fills out the info structure, based on the specified file or directory.
// Returns a negative error code on failure. // Returns a negative error code on failure.
int _lfs_stat(lfs_t *lfs, const char *path, struct lfs_info *info); int lfs_stat_raw(lfs_t *lfs, const char *path, struct lfs_info *info);
// Get a custom attribute // Get a custom attribute
// //
@@ -472,7 +472,7 @@ int _lfs_stat(lfs_t *lfs, const char *path, struct lfs_info *info);
// Note, the returned size is the size of the attribute on disk, irrespective // Note, the returned size is the size of the attribute on disk, irrespective
// of the size of the buffer. This can be used to dynamically allocate a buffer // of the size of the buffer. This can be used to dynamically allocate a buffer
// or check for existance. // or check for existance.
lfs_ssize_t _lfs_getattr(lfs_t *lfs, const char *path, lfs_ssize_t lfs_getattr_raw(lfs_t *lfs, const char *path,
uint8_t type, void *buffer, lfs_size_t size); uint8_t type, void *buffer, lfs_size_t size);
// Set custom attributes // Set custom attributes
@@ -482,7 +482,7 @@ lfs_ssize_t _lfs_getattr(lfs_t *lfs, const char *path,
// implicitly created. // implicitly created.
// //
// Returns a negative error code on failure. // Returns a negative error code on failure.
int _lfs_setattr(lfs_t *lfs, const char *path, int lfs_setattr_raw(lfs_t *lfs, const char *path,
uint8_t type, const void *buffer, lfs_size_t size); uint8_t type, const void *buffer, lfs_size_t size);
// Removes a custom attribute // Removes a custom attribute
@@ -490,7 +490,7 @@ int _lfs_setattr(lfs_t *lfs, const char *path,
// If an attribute is not found, nothing happens. // If an attribute is not found, nothing happens.
// //
// Returns a negative error code on failure. // Returns a negative error code on failure.
int _lfs_removeattr(lfs_t *lfs, const char *path, uint8_t type); int lfs_removeattr_raw(lfs_t *lfs, const char *path, uint8_t type);
/// File operations /// /// File operations ///
@@ -501,7 +501,7 @@ int _lfs_removeattr(lfs_t *lfs, const char *path, uint8_t type);
// are values from the enum lfs_open_flags that are bitwise-ored together. // are values from the enum lfs_open_flags that are bitwise-ored together.
// //
// Returns a negative error code on failure. // Returns a negative error code on failure.
int _lfs_file_open(lfs_t *lfs, lfs_file_t *file, int lfs_file_open_raw(lfs_t *lfs, lfs_file_t *file,
const char *path, int flags); const char *path, int flags);
// Open a file with extra configuration // Open a file with extra configuration
@@ -514,7 +514,7 @@ int _lfs_file_open(lfs_t *lfs, lfs_file_t *file,
// config struct must be zeroed for defaults and backwards compatibility. // config struct must be zeroed for defaults and backwards compatibility.
// //
// Returns a negative error code on failure. // Returns a negative error code on failure.
int _lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file, int lfs_file_opencfg_raw(lfs_t *lfs, lfs_file_t *file,
const char *path, int flags, const char *path, int flags,
const struct lfs_file_config *config); const struct lfs_file_config *config);
@@ -524,19 +524,19 @@ int _lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file,
// sync had been called and releases any allocated resources. // sync had been called and releases any allocated resources.
// //
// Returns a negative error code on failure. // Returns a negative error code on failure.
int _lfs_file_close(lfs_t *lfs, lfs_file_t *file); int lfs_file_close_raw(lfs_t *lfs, lfs_file_t *file);
// Synchronize a file on storage // Synchronize a file on storage
// //
// Any pending writes are written out to storage. // Any pending writes are written out to storage.
// Returns a negative error code on failure. // Returns a negative error code on failure.
int _lfs_file_sync(lfs_t *lfs, lfs_file_t *file); int lfs_file_sync_raw(lfs_t *lfs, lfs_file_t *file);
// Read data from file // Read data from file
// //
// Takes a buffer and size indicating where to store the read data. // Takes a buffer and size indicating where to store the read data.
// Returns the number of bytes read, or a negative error code on failure. // Returns the number of bytes read, or a negative error code on failure.
lfs_ssize_t _lfs_file_read(lfs_t *lfs, lfs_file_t *file, lfs_ssize_t lfs_file_read_raw(lfs_t *lfs, lfs_file_t *file,
void *buffer, lfs_size_t size); void *buffer, lfs_size_t size);
// Write data to file // Write data to file
@@ -545,38 +545,38 @@ lfs_ssize_t _lfs_file_read(lfs_t *lfs, lfs_file_t *file,
// actually be updated on the storage until either sync or close is called. // actually be updated on the storage until either sync or close is called.
// //
// Returns the number of bytes written, or a negative error code on failure. // Returns the number of bytes written, or a negative error code on failure.
lfs_ssize_t _lfs_file_write(lfs_t *lfs, lfs_file_t *file, lfs_ssize_t lfs_file_write_raw(lfs_t *lfs, lfs_file_t *file,
const void *buffer, lfs_size_t size); const void *buffer, lfs_size_t size);
// Change the position of the file // Change the position of the file
// //
// The change in position is determined by the offset and whence flag. // The change in position is determined by the offset and whence flag.
// Returns the new position of the file, or a negative error code on failure. // Returns the new position of the file, or a negative error code on failure.
lfs_soff_t _lfs_file_seek(lfs_t *lfs, lfs_file_t *file, lfs_soff_t lfs_file_seek_raw(lfs_t *lfs, lfs_file_t *file,
lfs_soff_t off, int whence); lfs_soff_t off, int whence);
// Truncates the size of the file to the specified size // Truncates the size of the file to the specified size
// //
// Returns a negative error code on failure. // Returns a negative error code on failure.
int _lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size); int lfs_file_truncate_raw(lfs_t *lfs, lfs_file_t *file, lfs_off_t size);
// Return the position of the file // Return the position of the file
// //
// Equivalent to _lfs_file_seek(lfs, file, 0, LFS_SEEK_CUR) // Equivalent to lfs_file_seek_raw(lfs, file, 0, LFS_SEEK_CUR)
// Returns the position of the file, or a negative error code on failure. // Returns the position of the file, or a negative error code on failure.
lfs_soff_t _lfs_file_tell(lfs_t *lfs, lfs_file_t *file); lfs_soff_t lfs_file_tell_raw(lfs_t *lfs, lfs_file_t *file);
// Change the position of the file to the beginning of the file // Change the position of the file to the beginning of the file
// //
// Equivalent to _lfs_file_seek(lfs, file, 0, LFS_SEEK_SET) // Equivalent to lfs_file_seek_raw(lfs, file, 0, LFS_SEEK_SET)
// Returns a negative error code on failure. // Returns a negative error code on failure.
int _lfs_file_rewind(lfs_t *lfs, lfs_file_t *file); int lfs_file_rewind_raw(lfs_t *lfs, lfs_file_t *file);
// Return the size of the file // Return the size of the file
// //
// Similar to _lfs_file_seek(lfs, file, 0, LFS_SEEK_END) // Similar to lfs_file_seek_raw(lfs, file, 0, LFS_SEEK_END)
// Returns the size of the file, or a negative error code on failure. // Returns the size of the file, or a negative error code on failure.
lfs_soff_t _lfs_file_size(lfs_t *lfs, lfs_file_t *file); lfs_soff_t lfs_file_size_raw(lfs_t *lfs, lfs_file_t *file);
/// Directory operations /// /// Directory operations ///
@@ -584,26 +584,26 @@ lfs_soff_t _lfs_file_size(lfs_t *lfs, lfs_file_t *file);
// Create a directory // Create a directory
// //
// Returns a negative error code on failure. // Returns a negative error code on failure.
int _lfs_mkdir(lfs_t *lfs, const char *path); int lfs_mkdir_raw(lfs_t *lfs, const char *path);
// Open a directory // Open a directory
// //
// Once open a directory can be used with read to iterate over files. // Once open a directory can be used with read to iterate over files.
// Returns a negative error code on failure. // Returns a negative error code on failure.
int _lfs_dir_open(lfs_t *lfs, lfs_dir_t *dir, const char *path); int lfs_dir_open_raw(lfs_t *lfs, lfs_dir_t *dir, const char *path);
// Close a directory // Close a directory
// //
// Releases any allocated resources. // Releases any allocated resources.
// Returns a negative error code on failure. // Returns a negative error code on failure.
int _lfs_dir_close(lfs_t *lfs, lfs_dir_t *dir); int lfs_dir_close_raw(lfs_t *lfs, lfs_dir_t *dir);
// Read an entry in the directory // Read an entry in the directory
// //
// Fills out the info structure, based on the specified file or directory. // Fills out the info structure, based on the specified file or directory.
// Returns a positive value on success, 0 at the end of directory, // Returns a positive value on success, 0 at the end of directory,
// or a negative error code on failure. // or a negative error code on failure.
int _lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info); int lfs_dir_read_raw(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info);
// Change the position of the directory // Change the position of the directory
// //
@@ -611,7 +611,7 @@ int _lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info);
// an absolute offset in the directory seek. // an absolute offset in the directory seek.
// //
// Returns a negative error code on failure. // Returns a negative error code on failure.
int _lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off); int lfs_dir_seek_raw(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off);
// Return the position of the directory // Return the position of the directory
// //
@@ -619,12 +619,12 @@ int _lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off);
// sense, but does indicate the current position in the directory iteration. // sense, but does indicate the current position in the directory iteration.
// //
// Returns the position of the directory, or a negative error code on failure. // Returns the position of the directory, or a negative error code on failure.
lfs_soff_t _lfs_dir_tell(lfs_t *lfs, lfs_dir_t *dir); lfs_soff_t lfs_dir_tell_raw(lfs_t *lfs, lfs_dir_t *dir);
// Change the position of the directory to the beginning of the directory // Change the position of the directory to the beginning of the directory
// //
// Returns a negative error code on failure. // Returns a negative error code on failure.
int _lfs_dir_rewind(lfs_t *lfs, lfs_dir_t *dir); int lfs_dir_rewind_raw(lfs_t *lfs, lfs_dir_t *dir);
/// Filesystem-level filesystem operations /// Filesystem-level filesystem operations
@@ -635,7 +635,7 @@ int _lfs_dir_rewind(lfs_t *lfs, lfs_dir_t *dir);
// size may be larger than the filesystem actually is. // size may be larger than the filesystem actually is.
// //
// Returns the number of allocated blocks, or a negative error code on failure. // Returns the number of allocated blocks, or a negative error code on failure.
lfs_ssize_t _lfs_fs_size(lfs_t *lfs); lfs_ssize_t lfs_fs_size_raw(lfs_t *lfs);
// Traverse through all blocks in use by the filesystem // Traverse through all blocks in use by the filesystem
// //
@@ -644,12 +644,12 @@ lfs_ssize_t _lfs_fs_size(lfs_t *lfs);
// blocks are in use or how much of the storage is available. // blocks are in use or how much of the storage is available.
// //
// Returns a negative error code on failure. // Returns a negative error code on failure.
int _lfs_fs_traverse(lfs_t *lfs, int (*cb)(void*, lfs_block_t), void *data); int lfs_fs_traverse_raw(lfs_t *lfs, int (*cb)(void*, lfs_block_t), void *data);
#ifdef LFS_MIGRATE #ifdef LFS_MIGRATE
// Attempts to migrate a previous version of littlefs // Attempts to migrate a previous version of littlefs
// //
// Behaves similarly to the _lfs_format function. Attempts to mount // Behaves similarly to the lfs_format_raw function. Attempts to mount
// the previous version of littlefs and update the filesystem so it can be // the previous version of littlefs and update the filesystem so it can be
// mounted with the current version of littlefs. // mounted with the current version of littlefs.
// //
@@ -658,105 +658,105 @@ int _lfs_fs_traverse(lfs_t *lfs, int (*cb)(void*, lfs_block_t), void *data);
// be zeroed for defaults and backwards compatibility. // be zeroed for defaults and backwards compatibility.
// //
// Returns a negative error code on failure. // Returns a negative error code on failure.
int _lfs_migrate(lfs_t *lfs, const struct lfs_config *cfg); int lfs_migrate_raw(lfs_t *lfs, const struct lfs_config *cfg);
#endif #endif
#if LFS_THREAD_SAFE #if LFS_THREAD_SAFE
int _ts_lfs_format(lfs_t *lfs, const struct lfs_config *config); int lfs_format_ts(lfs_t *lfs, const struct lfs_config *config);
int _ts_lfs_mount(lfs_t *lfs, const struct lfs_config *config); int lfs_mount_ts(lfs_t *lfs, const struct lfs_config *config);
int _ts_lfs_unmount(lfs_t *lfs); int lfs_unmount_ts(lfs_t *lfs);
int _ts_lfs_remove(lfs_t *lfs, const char *path); int lfs_remove_ts(lfs_t *lfs, const char *path);
int _ts_lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath); int lfs_rename_ts(lfs_t *lfs, const char *oldpath, const char *newpath);
int _ts_lfs_stat(lfs_t *lfs, const char *path, struct lfs_info *info); int lfs_stat_ts(lfs_t *lfs, const char *path, struct lfs_info *info);
lfs_ssize_t _ts_lfs_getattr(lfs_t *lfs, const char *path, uint8_t type, void *buffer, lfs_size_t size); lfs_ssize_t lfs_getattr_ts(lfs_t *lfs, const char *path, uint8_t type, void *buffer, lfs_size_t size);
int _ts_lfs_setattr(lfs_t *lfs, const char *path, uint8_t type, const void *buffer, lfs_size_t size); int lfs_setattr_ts(lfs_t *lfs, const char *path, uint8_t type, const void *buffer, lfs_size_t size);
int _ts_lfs_removeattr(lfs_t *lfs, const char *path, uint8_t type); int lfs_removeattr_ts(lfs_t *lfs, const char *path, uint8_t type);
int _ts_lfs_file_open(lfs_t *lfs, lfs_file_t *file, const char *path, int flags); int lfs_file_open_ts(lfs_t *lfs, lfs_file_t *file, const char *path, int flags);
int _ts_lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file, const char *path, int flags, const struct lfs_file_config *config); int lfs_file_opencfg_ts(lfs_t *lfs, lfs_file_t *file, const char *path, int flags, const struct lfs_file_config *config);
int _ts_lfs_file_close(lfs_t *lfs, lfs_file_t *file); int lfs_file_close_ts(lfs_t *lfs, lfs_file_t *file);
int _ts_lfs_file_sync(lfs_t *lfs, lfs_file_t *file); int lfs_file_sync_ts(lfs_t *lfs, lfs_file_t *file);
lfs_ssize_t _ts_lfs_file_read(lfs_t *lfs, lfs_file_t *file, void *buffer, lfs_size_t size); lfs_ssize_t lfs_file_read_ts(lfs_t *lfs, lfs_file_t *file, void *buffer, lfs_size_t size);
lfs_ssize_t _ts_lfs_file_write(lfs_t *lfs, lfs_file_t *file, const void *buffer, lfs_size_t size); lfs_ssize_t lfs_file_write_ts(lfs_t *lfs, lfs_file_t *file, const void *buffer, lfs_size_t size);
lfs_soff_t _ts_lfs_file_seek(lfs_t *lfs, lfs_file_t *file, lfs_soff_t off, int whence); lfs_soff_t lfs_file_seek_ts(lfs_t *lfs, lfs_file_t *file, lfs_soff_t off, int whence);
int _ts_lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size); int lfs_file_truncate_ts(lfs_t *lfs, lfs_file_t *file, lfs_off_t size);
lfs_soff_t _ts_lfs_file_tell(lfs_t *lfs, lfs_file_t *file); lfs_soff_t lfs_file_tell_ts(lfs_t *lfs, lfs_file_t *file);
int _ts_lfs_file_rewind(lfs_t *lfs, lfs_file_t *file); int lfs_file_rewind_ts(lfs_t *lfs, lfs_file_t *file);
lfs_soff_t _ts_lfs_file_size(lfs_t *lfs, lfs_file_t *file); lfs_soff_t lfs_file_size_ts(lfs_t *lfs, lfs_file_t *file);
int _ts_lfs_mkdir(lfs_t *lfs, const char *path); int lfs_mkdir_ts(lfs_t *lfs, const char *path);
int _ts_lfs_dir_open(lfs_t *lfs, lfs_dir_t *dir, const char *path); int lfs_dir_open_ts(lfs_t *lfs, lfs_dir_t *dir, const char *path);
int _ts_lfs_dir_close(lfs_t *lfs, lfs_dir_t *dir); int lfs_dir_close_ts(lfs_t *lfs, lfs_dir_t *dir);
int _ts_lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info); int lfs_dir_read_ts(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info);
int _ts_lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off); int lfs_dir_seek_ts(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off);
lfs_soff_t _ts_lfs_dir_tell(lfs_t *lfs, lfs_dir_t *dir); lfs_soff_t lfs_dir_tell_ts(lfs_t *lfs, lfs_dir_t *dir);
int _ts_lfs_dir_rewind(lfs_t *lfs, lfs_dir_t *dir); int lfs_dir_rewind_ts(lfs_t *lfs, lfs_dir_t *dir);
lfs_ssize_t _ts_lfs_fs_size(lfs_t *lfs); lfs_ssize_t lfs_fs_size_ts(lfs_t *lfs);
int _ts_lfs_fs_traverse(lfs_t *lfs, int (*cb)(void*, lfs_block_t), void *data); int lfs_fs_traverse_ts(lfs_t *lfs, int (*cb)(void*, lfs_block_t), void *data);
int _ts_lfs_migrate(lfs_t *lfs, const struct lfs_config *cfg); int lfs_migrate_ts(lfs_t *lfs, const struct lfs_config *cfg);
#define lfs_format _ts_lfs_format #define lfs_format lfs_format_ts
#define lfs_mount _ts_lfs_mount #define lfs_mount lfs_mount_ts
#define lfs_unmount _ts_lfs_unmount #define lfs_unmount lfs_unmount_ts
#define lfs_remove _ts_lfs_remove #define lfs_remove lfs_remove_ts
#define lfs_rename _ts_lfs_rename #define lfs_rename lfs_rename_ts
#define lfs_stat _ts_lfs_stat #define lfs_stat lfs_stat_ts
#define lfs_getattr _ts_lfs_getattr #define lfs_getattr lfs_getattr_ts
#define lfs_setattr _ts_lfs_setattr #define lfs_setattr lfs_setattr_ts
#define lfs_removeattr _ts_lfs_removeattr #define lfs_removeattr lfs_removeattr_ts
#define lfs_file_open _ts_lfs_file_open #define lfs_file_open lfs_file_open_ts
#define lfs_file_opencfg _ts_lfs_file_opencfg #define lfs_file_opencfg lfs_file_opencfg_ts
#define lfs_file_close _ts_lfs_file_close #define lfs_file_close lfs_file_close_ts
#define lfs_file_sync _ts_lfs_file_sync #define lfs_file_sync lfs_file_sync_ts
#define lfs_file_read _ts_lfs_file_read #define lfs_file_read lfs_file_read_ts
#define lfs_file_write _ts_lfs_file_write #define lfs_file_write lfs_file_write_ts
#define lfs_file_seek _ts_lfs_file_seek #define lfs_file_seek lfs_file_seek_ts
#define lfs_file_truncate _ts_lfs_file_truncate #define lfs_file_truncate lfs_file_truncate_ts
#define lfs_file_tell _ts_lfs_file_tell #define lfs_file_tell lfs_file_tell_ts
#define lfs_file_rewind _ts_lfs_file_rewind #define lfs_file_rewind lfs_file_rewind_ts
#define lfs_file_size _ts_lfs_file_size #define lfs_file_size lfs_file_size_ts
#define lfs_mkdir _ts_lfs_mkdir #define lfs_mkdir lfs_mkdir_ts
#define lfs_dir_open _ts_lfs_dir_open #define lfs_dir_open lfs_dir_open_ts
#define lfs_dir_close _ts_lfs_dir_close #define lfs_dir_close lfs_dir_close_ts
#define lfs_dir_read _ts_lfs_dir_read #define lfs_dir_read lfs_dir_read_ts
#define lfs_dir_seek _ts_lfs_dir_seek #define lfs_dir_seek lfs_dir_seek_ts
#define lfs_dir_tell _ts_lfs_dir_tell #define lfs_dir_tell lfs_dir_tell_ts
#define lfs_dir_rewind _ts_lfs_dir_rewind #define lfs_dir_rewind lfs_dir_rewind_ts
#define lfs_fs_size _ts_lfs_fs_size #define lfs_fs_size lfs_fs_size_ts
#define lfs_fs_traverse _ts_lfs_fs_traverse #define lfs_fs_traverse lfs_fs_traverse_ts
#define lfs_migrate _ts_lfs_migrate #define lfs_migrate lfs_migrate_ts
#else #else
#define lfs_format _lfs_format #define lfs_format lfs_format_raw
#define lfs_mount _lfs_mount #define lfs_mount lfs_mount_raw
#define lfs_unmount _lfs_unmount #define lfs_unmount lfs_unmount_raw
#define lfs_remove _lfs_remove #define lfs_remove lfs_remove_raw
#define lfs_rename _lfs_rename #define lfs_rename lfs_rename_raw
#define lfs_stat _lfs_stat #define lfs_stat lfs_stat_raw
#define lfs_getattr _lfs_getattr #define lfs_getattr lfs_getattr_raw
#define lfs_setattr _lfs_setattr #define lfs_setattr lfs_setattr_raw
#define lfs_removeattr _lfs_removeattr #define lfs_removeattr lfs_removeattr_raw
#define lfs_file_open _lfs_file_open #define lfs_file_open lfs_file_open_raw
#define lfs_file_opencfg _lfs_file_opencfg #define lfs_file_opencfg lfs_file_opencfg_raw
#define lfs_file_close _lfs_file_close #define lfs_file_close lfs_file_close_raw
#define lfs_file_sync _lfs_file_sync #define lfs_file_sync lfs_file_sync_raw
#define lfs_file_read _lfs_file_read #define lfs_file_read lfs_file_read_raw
#define lfs_file_write _lfs_file_write #define lfs_file_write lfs_file_write_raw
#define lfs_file_seek _lfs_file_seek #define lfs_file_seek lfs_file_seek_raw
#define lfs_file_truncate _lfs_file_truncate #define lfs_file_truncate lfs_file_truncate_raw
#define lfs_file_tell _lfs_file_tell #define lfs_file_tell lfs_file_tell_raw
#define lfs_file_rewind _lfs_file_rewind #define lfs_file_rewind lfs_file_rewind_raw
#define lfs_file_size _lfs_file_size #define lfs_file_size lfs_file_size_raw
#define lfs_mkdir _lfs_mkdir #define lfs_mkdir lfs_mkdir_raw
#define lfs_dir_open _lfs_dir_open #define lfs_dir_open lfs_dir_open_raw
#define lfs_dir_close _lfs_dir_close #define lfs_dir_close lfs_dir_close_raw
#define lfs_dir_read _lfs_dir_read #define lfs_dir_read lfs_dir_read_raw
#define lfs_dir_seek _lfs_dir_seek #define lfs_dir_seek lfs_dir_seek_raw
#define lfs_dir_tell _lfs_dir_tell #define lfs_dir_tell lfs_dir_tell_raw
#define lfs_dir_rewind _lfs_dir_rewind #define lfs_dir_rewind lfs_dir_rewind_raw
#define lfs_fs_size _lfs_fs_size #define lfs_fs_size lfs_fs_size_raw
#define lfs_fs_traverse _lfs_fs_traverse #define lfs_fs_traverse lfs_fs_traverse_raw
#define lfs_migrate _lfs_migrate #define lfs_migrate lfs_migrate_raw
#endif #endif