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

Generated v2 prefixes

Browse Source
This commit is contained in:
geky bot
2019-10-15 16:52:45 +00:00
parent c39b1de658 6b65737715
commit 893325aeb9
3 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@@ -53,6 +53,7 @@ const struct lfs2_config cfg = {
.block_count = 128, .block_count = 128,
.cache_size = 16, .cache_size = 16,
.lookahead_size = 16, .lookahead_size = 16,
.block_cycles = 500,
}; };
// entry point // entry point

40
lfs2.c
View File

@@ -977,7 +977,7 @@ static int lfs2_dir_fetch(lfs2_t *lfs2,
lfs2_mdir_t *dir, const lfs2_block_t pair[2]) { lfs2_mdir_t *dir, const lfs2_block_t pair[2]) {
// note, mask=-1, tag=0 can never match a tag since this // note, mask=-1, tag=0 can never match a tag since this
// pattern has the invalid bit set // pattern has the invalid bit set
return lfs2_dir_fetchmatch(lfs2, dir, pair, -1, 0, NULL, NULL, NULL); return (int)lfs2_dir_fetchmatch(lfs2, dir, pair, -1, 0, NULL, NULL, NULL);
} }
static int lfs2_dir_getgstate(lfs2_t *lfs2, const lfs2_mdir_t *dir, static int lfs2_dir_getgstate(lfs2_t *lfs2, const lfs2_mdir_t *dir,
@@ -1010,7 +1010,7 @@ static int lfs2_dir_getinfo(lfs2_t *lfs2, lfs2_mdir_t *dir,
lfs2_stag_t tag = lfs2_dir_get(lfs2, dir, LFS2_MKTAG(0x780, 0x3ff, 0), lfs2_stag_t tag = lfs2_dir_get(lfs2, dir, LFS2_MKTAG(0x780, 0x3ff, 0),
LFS2_MKTAG(LFS2_TYPE_NAME, id, lfs2->name_max+1), info->name); LFS2_MKTAG(LFS2_TYPE_NAME, id, lfs2->name_max+1), info->name);
if (tag < 0) { if (tag < 0) {
return tag; return (int)tag;
} }
info->type = lfs2_tag_type3(tag); info->type = lfs2_tag_type3(tag);
@@ -1019,7 +1019,7 @@ static int lfs2_dir_getinfo(lfs2_t *lfs2, lfs2_mdir_t *dir,
tag = lfs2_dir_get(lfs2, dir, LFS2_MKTAG(0x700, 0x3ff, 0), tag = lfs2_dir_get(lfs2, dir, LFS2_MKTAG(0x700, 0x3ff, 0),
LFS2_MKTAG(LFS2_TYPE_STRUCT, id, sizeof(ctz)), &ctz); LFS2_MKTAG(LFS2_TYPE_STRUCT, id, sizeof(ctz)), &ctz);
if (tag < 0) { if (tag < 0) {
return tag; return (int)tag;
} }
lfs2_ctz_fromle32(&ctz); lfs2_ctz_fromle32(&ctz);
@@ -1062,7 +1062,7 @@ static int lfs2_dir_find_match(void *data,
return LFS2_CMP_EQ; return LFS2_CMP_EQ;
} }
static int lfs2_dir_find(lfs2_t *lfs2, lfs2_mdir_t *dir, static lfs2_stag_t lfs2_dir_find(lfs2_t *lfs2, lfs2_mdir_t *dir,
const char **path, uint16_t *id) { const char **path, uint16_t *id) {
// we reduce path to a single name if we can find it // we reduce path to a single name if we can find it
const char *name = *path; const char *name = *path;
@@ -3006,10 +3006,10 @@ int lfs2_file_truncate(lfs2_t *lfs2, lfs2_file_t *file, lfs2_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) {
int err = lfs2_file_seek(lfs2, file, 0, LFS2_SEEK_END); lfs2_soff_t res = lfs2_file_seek(lfs2, file, 0, LFS2_SEEK_END);
if (err < 0) { if (res < 0) {
LFS2_TRACE("lfs2_file_truncate -> %d", err); LFS2_TRACE("lfs2_file_truncate -> %d", res);
return err; return (int)res;
} }
} }
@@ -3018,16 +3018,16 @@ int lfs2_file_truncate(lfs2_t *lfs2, lfs2_file_t *file, lfs2_off_t size) {
lfs2_ssize_t res = lfs2_file_write(lfs2, file, &(uint8_t){0}, 1); lfs2_ssize_t res = lfs2_file_write(lfs2, file, &(uint8_t){0}, 1);
if (res < 0) { if (res < 0) {
LFS2_TRACE("lfs2_file_truncate -> %d", res); LFS2_TRACE("lfs2_file_truncate -> %d", res);
return res; return (int)res;
} }
} }
} }
// restore pos // restore pos
int err = lfs2_file_seek(lfs2, file, pos, LFS2_SEEK_SET); lfs2_soff_t res = lfs2_file_seek(lfs2, file, pos, LFS2_SEEK_SET);
if (err < 0) { if (res < 0) {
LFS2_TRACE("lfs2_file_truncate -> %d", err); LFS2_TRACE("lfs2_file_truncate -> %d", res);
return err; return (int)res;
} }
LFS2_TRACE("lfs2_file_truncate -> %d", 0); LFS2_TRACE("lfs2_file_truncate -> %d", 0);
@@ -3047,7 +3047,7 @@ int lfs2_file_rewind(lfs2_t *lfs2, lfs2_file_t *file) {
lfs2_soff_t res = lfs2_file_seek(lfs2, file, 0, LFS2_SEEK_SET); lfs2_soff_t res = lfs2_file_seek(lfs2, file, 0, LFS2_SEEK_SET);
if (res < 0) { if (res < 0) {
LFS2_TRACE("lfs2_file_rewind -> %d", res); LFS2_TRACE("lfs2_file_rewind -> %d", res);
return res; return (int)res;
} }
LFS2_TRACE("lfs2_file_rewind -> %d", 0); LFS2_TRACE("lfs2_file_rewind -> %d", 0);
@@ -3076,7 +3076,7 @@ int lfs2_stat(lfs2_t *lfs2, const char *path, struct lfs2_info *info) {
lfs2_stag_t tag = lfs2_dir_find(lfs2, &cwd, &path, NULL); lfs2_stag_t tag = lfs2_dir_find(lfs2, &cwd, &path, NULL);
if (tag < 0) { if (tag < 0) {
LFS2_TRACE("lfs2_stat -> %d", tag); LFS2_TRACE("lfs2_stat -> %d", tag);
return tag; return (int)tag;
} }
int err = lfs2_dir_getinfo(lfs2, &cwd, lfs2_tag_id(tag), info); int err = lfs2_dir_getinfo(lfs2, &cwd, lfs2_tag_id(tag), info);
@@ -3097,7 +3097,7 @@ int lfs2_remove(lfs2_t *lfs2, const char *path) {
lfs2_stag_t tag = lfs2_dir_find(lfs2, &cwd, &path, NULL); lfs2_stag_t tag = lfs2_dir_find(lfs2, &cwd, &path, NULL);
if (tag < 0 || lfs2_tag_id(tag) == 0x3ff) { if (tag < 0 || lfs2_tag_id(tag) == 0x3ff) {
LFS2_TRACE("lfs2_remove -> %d", (tag < 0) ? tag : LFS2_ERR_INVAL); LFS2_TRACE("lfs2_remove -> %d", (tag < 0) ? tag : LFS2_ERR_INVAL);
return (tag < 0) ? tag : LFS2_ERR_INVAL; return (tag < 0) ? (int)tag : LFS2_ERR_INVAL;
} }
lfs2_mdir_t dir; lfs2_mdir_t dir;
@@ -3108,7 +3108,7 @@ int lfs2_remove(lfs2_t *lfs2, const char *path) {
LFS2_MKTAG(LFS2_TYPE_STRUCT, lfs2_tag_id(tag), 8), pair); LFS2_MKTAG(LFS2_TYPE_STRUCT, lfs2_tag_id(tag), 8), pair);
if (res < 0) { if (res < 0) {
LFS2_TRACE("lfs2_remove -> %d", res); LFS2_TRACE("lfs2_remove -> %d", res);
return res; return (int)res;
} }
lfs2_pair_fromle32(pair); lfs2_pair_fromle32(pair);
@@ -3171,7 +3171,7 @@ int lfs2_rename(lfs2_t *lfs2, const char *oldpath, const char *newpath) {
lfs2_stag_t oldtag = lfs2_dir_find(lfs2, &oldcwd, &oldpath, NULL); lfs2_stag_t oldtag = lfs2_dir_find(lfs2, &oldcwd, &oldpath, NULL);
if (oldtag < 0 || lfs2_tag_id(oldtag) == 0x3ff) { if (oldtag < 0 || lfs2_tag_id(oldtag) == 0x3ff) {
LFS2_TRACE("lfs2_rename -> %d", (oldtag < 0) ? oldtag : LFS2_ERR_INVAL); LFS2_TRACE("lfs2_rename -> %d", (oldtag < 0) ? oldtag : LFS2_ERR_INVAL);
return (oldtag < 0) ? oldtag : LFS2_ERR_INVAL; return (oldtag < 0) ? (int)oldtag : LFS2_ERR_INVAL;
} }
// find new entry // find new entry
@@ -3181,7 +3181,7 @@ int lfs2_rename(lfs2_t *lfs2, const char *oldpath, const char *newpath) {
if ((prevtag < 0 || lfs2_tag_id(prevtag) == 0x3ff) && if ((prevtag < 0 || lfs2_tag_id(prevtag) == 0x3ff) &&
!(prevtag == LFS2_ERR_NOENT && newid != 0x3ff)) { !(prevtag == LFS2_ERR_NOENT && newid != 0x3ff)) {
LFS2_TRACE("lfs2_rename -> %d", (prevtag < 0) ? prevtag : LFS2_ERR_INVAL); LFS2_TRACE("lfs2_rename -> %d", (prevtag < 0) ? prevtag : LFS2_ERR_INVAL);
return (prevtag < 0) ? prevtag : LFS2_ERR_INVAL; return (prevtag < 0) ? (int)prevtag : LFS2_ERR_INVAL;
} }
lfs2_mdir_t prevdir; lfs2_mdir_t prevdir;
@@ -3202,7 +3202,7 @@ int lfs2_rename(lfs2_t *lfs2, const char *oldpath, const char *newpath) {
LFS2_MKTAG(LFS2_TYPE_STRUCT, newid, 8), prevpair); LFS2_MKTAG(LFS2_TYPE_STRUCT, newid, 8), prevpair);
if (res < 0) { if (res < 0) {
LFS2_TRACE("lfs2_rename -> %d", res); LFS2_TRACE("lfs2_rename -> %d", res);
return res; return (int)res;
} }
lfs2_pair_fromle32(prevpair); lfs2_pair_fromle32(prevpair);

4
tests/test_paths.sh
View File

@@ -179,7 +179,7 @@ echo "--- Really big path test ---"
scripts/test.py << TEST scripts/test.py << TEST
lfs2_mount(&lfs2, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
memset(path, 'w', LFS2_NAME_MAX); memset(path, 'w', LFS2_NAME_MAX);
path[LFS2_NAME_MAX+1] = '\0'; path[LFS2_NAME_MAX] = '\0';
lfs2_mkdir(&lfs2, path) => 0; lfs2_mkdir(&lfs2, path) => 0;
lfs2_remove(&lfs2, path) => 0; lfs2_remove(&lfs2, path) => 0;
lfs2_file_open(&lfs2, &file, path, lfs2_file_open(&lfs2, &file, path,
@@ -189,7 +189,7 @@ scripts/test.py << TEST
memcpy(path, "coffee/", strlen("coffee/")); memcpy(path, "coffee/", strlen("coffee/"));
memset(path+strlen("coffee/"), 'w', LFS2_NAME_MAX); memset(path+strlen("coffee/"), 'w', LFS2_NAME_MAX);
path[strlen("coffee/")+LFS2_NAME_MAX+1] = '\0'; path[strlen("coffee/")+LFS2_NAME_MAX] = '\0';
lfs2_mkdir(&lfs2, path) => 0; lfs2_mkdir(&lfs2, path) => 0;
lfs2_remove(&lfs2, path) => 0; lfs2_remove(&lfs2, path) => 0;
lfs2_file_open(&lfs2, &file, path, lfs2_file_open(&lfs2, &file, path,