Skip to content

upgrade to v2.1.4 #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 12 commits into from
Closed

upgrade to v2.1.4 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
47d3796
v2.1.1
pilotak Aug 15, 2019
c64408d
mbed 5.15 CRC update
pilotak Feb 6, 2020
3defbe9
v2.1.4
pilotak Feb 6, 2020
eec00b1
travis test fix
pilotak Feb 6, 2020
c950c89
test.py chmod
pilotak Feb 6, 2020
f68bc61
scripts chmod & NO_INTRINSICS macro
pilotak Feb 6, 2020
5892861
chmod test_relocations.sh
pilotak Feb 6, 2020
3c9e5e5
library setting fix
pilotak Feb 6, 2020
c6c8ef1
missing library setting
pilotak Feb 6, 2020
6438cbd
travis new tests
pilotak Feb 6, 2020
c4819de
request travis again
pilotak Feb 6, 2020
512a0b5
skip the problematic test
pilotak Feb 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ script:

# Run littlefs functional tests with different configurations
# Note: r/w size of 64 is default in mbed
- make -Clittlefs test QUIET=1 CFLAGS+="-DLFS_READ_SIZE=64 -DLFS_PROG_SIZE=64"
- make -Clittlefs test QUIET=1 CFLAGS+="-DLFS_READ_SIZE=1 -DLFS_PROG_SIZE=1"
- make -Clittlefs test QUIET=1 CFLAGS+="-DLFS_READ_SIZE=512 -DLFS_PROG_SIZE=512"
- make -Clittlefs test QUIET=1 CFLAGS+="-DLFS_BLOCK_COUNT=1023"
- make -Clittlefs test QUIET=1 CFLAGS+="-DLFS_LOOKAHEAD=2048"
- make -Clittlefs test QUIET=1 CFLAGS+="-DLFS2_READ_SIZE=64 -DLFS2_CACHE_SIZE=64"
- make -Clittlefs test QUIET=1 CFLAGS+="-DLFS2_READ_SIZE=1 -DLFS2_CACHE_SIZE=1"
- make -Clittlefs test QUIET=1 CFLAGS+="-DLFS2_READ_SIZE=512 -DLFS2_CACHE_SIZE=512 -DLFS2_BLOCK_CYCLES=16"
- make -Clittlefs test QUIET=1 CFLAGS+="-DLFS2_READ_SIZE=8 -DLFS2_CACHE_SIZE=16 -DLFS2_BLOCK_CYCLES=2"
- make -Clittlefs test QUIET=1 CFLAGS+="-DLFS_BLOCK_COUNT=1023 -DLFS_LOOKAHEAD_SIZE=256"

install:
# Get arm-none-eabi-gcc
Expand Down
119 changes: 60 additions & 59 deletions LittleFileSystem2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@ namespace mbed {

extern "C" uint32_t lfs2_crc(uint32_t crc, const void *buffer, size_t size)
{
uint32_t initial_xor = crc;
MbedCRC<POLY_32BIT_REV_ANSI, 32> ct(initial_xor, 0x0, true, false);
uint32_t initial_xor = lfs2_rbit(crc);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@geky, @kjbracey-arm This part is like black magic for me so I trust you also take a look.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was taken from https://github.com/ARMmbed/mbed-os/blob/master/features/storage/filesystem/littlefs/LittleFileSystem.cpp#L27

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which comes from this PR from @kjbracey-arm ARMmbed/mbed-os#11957

Given that it's the same as what's on mbed-os, I think it should be fine. The CRC didn't change v1->v2.

MbedCRC<POLY_32BIT_ANSI, 32, CrcMode::TABLE> ct(initial_xor, 0x0, true, true);

ct.compute((void *)buffer, size, &crc);
return crc;
}
Expand Down Expand Up @@ -166,12 +167,12 @@ LittleFileSystem2::~LittleFileSystem2()
int LittleFileSystem2::mount(BlockDevice *bd)
{
_mutex.lock();
LFS2_INFO("mount(%p)", bd);
LFS2_TRACE("mount(%p)", bd);
_bd = bd;
int err = _bd->init();
if (err) {
_bd = NULL;
LFS2_INFO("mount -> %d", err);
LFS2_TRACE("mount -> %d", err);
_mutex.unlock();
return err;
}
Expand All @@ -192,20 +193,20 @@ int LittleFileSystem2::mount(BlockDevice *bd)
err = lfs2_mount(&_lfs, &_config);
if (err) {
_bd = NULL;
LFS2_INFO("mount -> %d", lfs2_toerror(err));
LFS2_TRACE("mount -> %d", lfs2_toerror(err));
_mutex.unlock();
return lfs2_toerror(err);
}

_mutex.unlock();
LFS2_INFO("mount -> %d", 0);
LFS2_TRACE("mount -> %d", 0);
return 0;
}

int LittleFileSystem2::unmount()
{
_mutex.lock();
LFS2_INFO("unmount(%s)", "");
LFS2_TRACE("unmount(%s)", "");
int res = 0;
if (_bd) {
int err = lfs2_unmount(&_lfs);
Expand All @@ -221,7 +222,7 @@ int LittleFileSystem2::unmount()
_bd = NULL;
}

LFS2_INFO("unmount -> %d", res);
LFS2_TRACE("unmount -> %d", res);
_mutex.unlock();
return res;
}
Expand All @@ -230,11 +231,11 @@ int LittleFileSystem2::format(BlockDevice *bd,
lfs2_size_t block_size, uint32_t block_cycles,
lfs2_size_t cache_size, lfs2_size_t lookahead_size)
{
LFS2_INFO("format(%p, %ld, %ld, %ld, %ld)",
LFS2_TRACE("format(%p, %ld, %ld, %ld, %ld)",
bd, block_size, block_cycles, cache_size, lookahead_size);
int err = bd->init();
if (err) {
LFS2_INFO("format -> %d", err);
LFS2_TRACE("format -> %d", err);
return err;
}

Expand All @@ -257,39 +258,39 @@ int LittleFileSystem2::format(BlockDevice *bd,

err = lfs2_format(&_lfs, &_config);
if (err) {
LFS2_INFO("format -> %d", lfs2_toerror(err));
LFS2_TRACE("format -> %d", lfs2_toerror(err));
return lfs2_toerror(err);
}

err = bd->deinit();
if (err) {
LFS2_INFO("format -> %d", err);
LFS2_TRACE("format -> %d", err);
return err;
}

LFS2_INFO("format -> %d", 0);
LFS2_TRACE("format -> %d", 0);
return 0;
}

int LittleFileSystem2::reformat(BlockDevice *bd)
{
_mutex.lock();
LFS2_INFO("reformat(%p)", bd);
LFS2_TRACE("reformat(%p)", bd);
if (_bd) {
if (!bd) {
bd = _bd;
}

int err = unmount();
if (err) {
LFS2_INFO("reformat -> %d", err);
LFS2_TRACE("reformat -> %d", err);
_mutex.unlock();
return err;
}
}

if (!bd) {
LFS2_INFO("reformat -> %d", -ENODEV);
LFS2_TRACE("reformat -> %d", -ENODEV);
_mutex.unlock();
return -ENODEV;
}
Expand All @@ -300,49 +301,49 @@ int LittleFileSystem2::reformat(BlockDevice *bd)
_config.cache_size,
_config.lookahead_size);
if (err) {
LFS2_INFO("reformat -> %d", err);
LFS2_TRACE("reformat -> %d", err);
_mutex.unlock();
return err;
}

err = mount(bd);
if (err) {
LFS2_INFO("reformat -> %d", err);
LFS2_TRACE("reformat -> %d", err);
_mutex.unlock();
return err;
}

LFS2_INFO("reformat -> %d", 0);
LFS2_TRACE("reformat -> %d", 0);
_mutex.unlock();
return 0;
}

int LittleFileSystem2::remove(const char *filename)
{
_mutex.lock();
LFS2_INFO("remove(\"%s\")", filename);
LFS2_TRACE("remove(\"%s\")", filename);
int err = lfs2_remove(&_lfs, filename);
LFS2_INFO("remove -> %d", lfs2_toerror(err));
LFS2_TRACE("remove -> %d", lfs2_toerror(err));
_mutex.unlock();
return lfs2_toerror(err);
}

int LittleFileSystem2::rename(const char *oldname, const char *newname)
{
_mutex.lock();
LFS2_INFO("rename(\"%s\", \"%s\")", oldname, newname);
LFS2_TRACE("rename(\"%s\", \"%s\")", oldname, newname);
int err = lfs2_rename(&_lfs, oldname, newname);
LFS2_INFO("rename -> %d", lfs2_toerror(err));
LFS2_TRACE("rename -> %d", lfs2_toerror(err));
_mutex.unlock();
return lfs2_toerror(err);
}

int LittleFileSystem2::mkdir(const char *name, mode_t mode)
{
_mutex.lock();
LFS2_INFO("mkdir(\"%s\", 0x%lx)", name, mode);
LFS2_TRACE("mkdir(\"%s\", 0x%lx)", name, mode);
int err = lfs2_mkdir(&_lfs, name);
LFS2_INFO("mkdir -> %d", lfs2_toerror(err));
LFS2_TRACE("mkdir -> %d", lfs2_toerror(err));
_mutex.unlock();
return lfs2_toerror(err);
}
Expand All @@ -351,9 +352,9 @@ int LittleFileSystem2::stat(const char *name, struct stat *st)
{
struct lfs2_info info;
_mutex.lock();
LFS2_INFO("stat(\"%s\", %p)", name, st);
LFS2_TRACE("stat(\"%s\", %p)", name, st);
int err = lfs2_stat(&_lfs, name, &info);
LFS2_INFO("stat -> %d", lfs2_toerror(err));
LFS2_TRACE("stat -> %d", lfs2_toerror(err));
_mutex.unlock();
st->st_size = info.size;
st->st_mode = lfs2_tomode(info.type);
Expand All @@ -366,9 +367,9 @@ int LittleFileSystem2::statvfs(const char *name, struct statvfs *st)

lfs2_ssize_t in_use = 0;
_mutex.lock();
LFS2_INFO("statvfs(\"%s\", %p)", name, st);
LFS2_TRACE("statvfs(\"%s\", %p)", name, st);
in_use = lfs2_fs_size(&_lfs);
LFS2_INFO("statvfs -> %d", lfs2_toerror(in_use));
LFS2_TRACE("statvfs -> %d", lfs2_toerror(in_use));
_mutex.unlock();
if (in_use < 0) {
return in_use;
Expand All @@ -388,9 +389,9 @@ int LittleFileSystem2::file_open(fs_file_t *file, const char *path, int flags)
{
lfs2_file_t *f = new lfs2_file_t;
_mutex.lock();
LFS2_INFO("file_open(%p, \"%s\", 0x%x)", *file, path, flags);
LFS2_TRACE("file_open(%p, \"%s\", 0x%x)", *file, path, flags);
int err = lfs2_file_open(&_lfs, f, path, lfs2_fromflags(flags));
LFS2_INFO("file_open -> %d", lfs2_toerror(err));
LFS2_TRACE("file_open -> %d", lfs2_toerror(err));
_mutex.unlock();
if (!err) {
*file = f;
Expand All @@ -404,9 +405,9 @@ int LittleFileSystem2::file_close(fs_file_t file)
{
lfs2_file_t *f = (lfs2_file_t *)file;
_mutex.lock();
LFS2_INFO("file_close(%p)", file);
LFS2_TRACE("file_close(%p)", file);
int err = lfs2_file_close(&_lfs, f);
LFS2_INFO("file_close -> %d", lfs2_toerror(err));
LFS2_TRACE("file_close -> %d", lfs2_toerror(err));
_mutex.unlock();
delete f;
return lfs2_toerror(err);
Expand All @@ -416,9 +417,9 @@ ssize_t LittleFileSystem2::file_read(fs_file_t file, void *buffer, size_t len)
{
lfs2_file_t *f = (lfs2_file_t *)file;
_mutex.lock();
LFS2_INFO("file_read(%p, %p, %d)", file, buffer, len);
LFS2_TRACE("file_read(%p, %p, %d)", file, buffer, len);
lfs2_ssize_t res = lfs2_file_read(&_lfs, f, buffer, len);
LFS2_INFO("file_read -> %d", lfs2_toerror(res));
LFS2_TRACE("file_read -> %d", lfs2_toerror(res));
_mutex.unlock();
return lfs2_toerror(res);
}
Expand All @@ -427,9 +428,9 @@ ssize_t LittleFileSystem2::file_write(fs_file_t file, const void *buffer, size_t
{
lfs2_file_t *f = (lfs2_file_t *)file;
_mutex.lock();
LFS2_INFO("file_write(%p, %p, %d)", file, buffer, len);
LFS2_TRACE("file_write(%p, %p, %d)", file, buffer, len);
lfs2_ssize_t res = lfs2_file_write(&_lfs, f, buffer, len);
LFS2_INFO("file_write -> %d", lfs2_toerror(res));
LFS2_TRACE("file_write -> %d", lfs2_toerror(res));
_mutex.unlock();
return lfs2_toerror(res);
}
Expand All @@ -438,9 +439,9 @@ int LittleFileSystem2::file_sync(fs_file_t file)
{
lfs2_file_t *f = (lfs2_file_t *)file;
_mutex.lock();
LFS2_INFO("file_sync(%p)", file);
LFS2_TRACE("file_sync(%p)", file);
int err = lfs2_file_sync(&_lfs, f);
LFS2_INFO("file_sync -> %d", lfs2_toerror(err));
LFS2_TRACE("file_sync -> %d", lfs2_toerror(err));
_mutex.unlock();
return lfs2_toerror(err);
}
Expand All @@ -449,9 +450,9 @@ off_t LittleFileSystem2::file_seek(fs_file_t file, off_t offset, int whence)
{
lfs2_file_t *f = (lfs2_file_t *)file;
_mutex.lock();
LFS2_INFO("file_seek(%p, %ld, %d)", file, offset, whence);
LFS2_TRACE("file_seek(%p, %ld, %d)", file, offset, whence);
off_t res = lfs2_file_seek(&_lfs, f, offset, lfs2_fromwhence(whence));
LFS2_INFO("file_seek -> %d", lfs2_toerror(res));
LFS2_TRACE("file_seek -> %d", lfs2_toerror(res));
_mutex.unlock();
return lfs2_toerror(res);
}
Expand All @@ -460,9 +461,9 @@ off_t LittleFileSystem2::file_tell(fs_file_t file)
{
lfs2_file_t *f = (lfs2_file_t *)file;
_mutex.lock();
LFS2_INFO("file_tell(%p)", file);
LFS2_TRACE("file_tell(%p)", file);
off_t res = lfs2_file_tell(&_lfs, f);
LFS2_INFO("file_tell -> %d", lfs2_toerror(res));
LFS2_TRACE("file_tell -> %d", lfs2_toerror(res));
_mutex.unlock();
return lfs2_toerror(res);
}
Expand All @@ -471,9 +472,9 @@ off_t LittleFileSystem2::file_size(fs_file_t file)
{
lfs2_file_t *f = (lfs2_file_t *)file;
_mutex.lock();
LFS2_INFO("file_size(%p)", file);
LFS2_TRACE("file_size(%p)", file);
off_t res = lfs2_file_size(&_lfs, f);
LFS2_INFO("file_size -> %d", lfs2_toerror(res));
LFS2_TRACE("file_size -> %d", lfs2_toerror(res));
_mutex.unlock();
return lfs2_toerror(res);
}
Expand All @@ -482,9 +483,9 @@ int LittleFileSystem2::file_truncate(fs_file_t file, off_t length)
{
lfs2_file_t *f = (lfs2_file_t *)file;
_mutex.lock();
LFS2_INFO("file_truncate(%p)", file);
LFS2_TRACE("file_truncate(%p)", file);
int err = lfs2_file_truncate(&_lfs, f, length);
LFS2_INFO("file_truncate -> %d", lfs2_toerror(err));
LFS2_TRACE("file_truncate -> %d", lfs2_toerror(err));
_mutex.unlock();
return lfs2_toerror(err);
}
Expand All @@ -495,9 +496,9 @@ int LittleFileSystem2::dir_open(fs_dir_t *dir, const char *path)
{
lfs2_dir_t *d = new lfs2_dir_t;
_mutex.lock();
LFS2_INFO("dir_open(%p, \"%s\")", *dir, path);
LFS2_TRACE("dir_open(%p, \"%s\")", *dir, path);
int err = lfs2_dir_open(&_lfs, d, path);
LFS2_INFO("dir_open -> %d", lfs2_toerror(err));
LFS2_TRACE("dir_open -> %d", lfs2_toerror(err));
_mutex.unlock();
if (!err) {
*dir = d;
Expand All @@ -511,9 +512,9 @@ int LittleFileSystem2::dir_close(fs_dir_t dir)
{
lfs2_dir_t *d = (lfs2_dir_t *)dir;
_mutex.lock();
LFS2_INFO("dir_close(%p)", dir);
LFS2_TRACE("dir_close(%p)", dir);
int err = lfs2_dir_close(&_lfs, d);
LFS2_INFO("dir_close -> %d", lfs2_toerror(err));
LFS2_TRACE("dir_close -> %d", lfs2_toerror(err));
_mutex.unlock();
delete d;
return lfs2_toerror(err);
Expand All @@ -524,9 +525,9 @@ ssize_t LittleFileSystem2::dir_read(fs_dir_t dir, struct dirent *ent)
lfs2_dir_t *d = (lfs2_dir_t *)dir;
struct lfs2_info info;
_mutex.lock();
LFS2_INFO("dir_read(%p, %p)", dir, ent);
LFS2_TRACE("dir_read(%p, %p)", dir, ent);
int res = lfs2_dir_read(&_lfs, d, &info);
LFS2_INFO("dir_read -> %d", lfs2_toerror(res));
LFS2_TRACE("dir_read -> %d", lfs2_toerror(res));
_mutex.unlock();
if (res == 1) {
ent->d_type = lfs2_totype(info.type);
Expand All @@ -539,19 +540,19 @@ void LittleFileSystem2::dir_seek(fs_dir_t dir, off_t offset)
{
lfs2_dir_t *d = (lfs2_dir_t *)dir;
_mutex.lock();
LFS2_INFO("dir_seek(%p, %ld)", dir, offset);
LFS2_TRACE("dir_seek(%p, %ld)", dir, offset);
lfs2_dir_seek(&_lfs, d, offset);
LFS2_INFO("dir_seek -> %s", "void");
LFS2_TRACE("dir_seek -> %s", "void");
_mutex.unlock();
}

off_t LittleFileSystem2::dir_tell(fs_dir_t dir)
{
lfs2_dir_t *d = (lfs2_dir_t *)dir;
_mutex.lock();
LFS2_INFO("dir_tell(%p)", dir);
LFS2_TRACE("dir_tell(%p)", dir);
lfs2_soff_t res = lfs2_dir_tell(&_lfs, d);
LFS2_INFO("dir_tell -> %d", lfs2_toerror(res));
LFS2_TRACE("dir_tell -> %d", lfs2_toerror(res));
_mutex.unlock();
return lfs2_toerror(res);
}
Expand All @@ -560,9 +561,9 @@ void LittleFileSystem2::dir_rewind(fs_dir_t dir)
{
lfs2_dir_t *d = (lfs2_dir_t *)dir;
_mutex.lock();
LFS2_INFO("dir_rewind(%p)", dir);
LFS2_TRACE("dir_rewind(%p)", dir);
lfs2_dir_rewind(&_lfs, d);
LFS2_INFO("dir_rewind -> %s", "void");
LFS2_TRACE("dir_rewind -> %s", "void");
_mutex.unlock();
}

Expand Down
Loading