Skip to content
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

Jump to bottom

Update to new version of VFS API #205

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update to new version of VFS API #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a1f8b2
Update to new version of VFS API
haberturdeur Nov 15, 2024
548e35d
Fix size data type in tests
haberturdeur Nov 21, 2024
1e3b3bd
fix open-maximum-number-of-files test.
BrianPugh Nov 22, 2024
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
63 changes: 63 additions & 0 deletions src/esp_littlefs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@ static ssize_t vfs_littlefs_pread(void *ctx, int fd, void *dst, size_t size, o
static int vfs_littlefs_close(void* ctx, int fd);
static off_t vfs_littlefs_lseek(void* ctx, int fd, off_t offset, int mode);
static int vfs_littlefs_fsync(void* ctx, int fd);
#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 4, 0)
static esp_vfs_t vfs_littlefs_create_struct(bool writeable);
#endif // ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 4, 0)

#ifdef CONFIG_VFS_SUPPORT_DIR
static int vfs_littlefs_stat(void* ctx, const char * path, struct stat * st);
Expand Down Expand Up @@ -364,10 +366,58 @@ esp_err_t esp_littlefs_sdmmc_info(sdmmc_card_t *sdcard, size_t *total_bytes, siz
}
#endif

#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)

#ifdef CONFIG_VFS_SUPPORT_DIR
static esp_vfs_dir_ops_t s_vfs_littlefs_dir = {
.stat_p = &vfs_littlefs_stat,
.link_p = NULL, /* Not Supported */
.unlink_p = &vfs_littlefs_unlink,
.rename_p = &vfs_littlefs_rename,
.opendir_p = &vfs_littlefs_opendir,
.readdir_p = &vfs_littlefs_readdir,
.readdir_r_p = &vfs_littlefs_readdir_r,
.telldir_p = &vfs_littlefs_telldir,
.seekdir_p = &vfs_littlefs_seekdir,
.closedir_p = &vfs_littlefs_closedir,
.mkdir_p = &vfs_littlefs_mkdir,
.rmdir_p = &vfs_littlefs_rmdir,
// access_p
.truncate_p = &vfs_littlefs_truncate,
#ifdef ESP_LITTLEFS_ENABLE_FTRUNCATE
.ftruncate_p = &vfs_littlefs_ftruncate,
#endif // ESP_LITTLEFS_ENABLE_FTRUNCATE
#if CONFIG_LITTLEFS_USE_MTIME
.utime_p = &vfs_littlefs_utime,
#endif // CONFIG_LITTLEFS_USE_MTIME
};
#endif // CONFIG_VFS_SUPPORT_DIR

static esp_vfs_fs_ops_t s_vfs_littlefs = {
.write_p = &vfs_littlefs_write,
.pwrite_p = &vfs_littlefs_pwrite,
.lseek_p = &vfs_littlefs_lseek,
.read_p = &vfs_littlefs_read,
.pread_p = &vfs_littlefs_pread,
.open_p = &vfs_littlefs_open,
.close_p = &vfs_littlefs_close,
.fsync_p = &vfs_littlefs_fsync,
.fcntl_p = &vfs_littlefs_fcntl,
#ifndef CONFIG_LITTLEFS_USE_ONLY_HASH
.fstat_p = &vfs_littlefs_fstat,
#endif
#ifdef CONFIG_VFS_SUPPORT_DIR
.dir = &s_vfs_littlefs_dir,
#endif // CONFIG_VFS_SUPPORT_DIR
};

#endif // ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)
esp_err_t esp_vfs_littlefs_register(const esp_vfs_littlefs_conf_t * conf)
{
assert(conf->base_path);
#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 4, 0)
const esp_vfs_t vfs = vfs_littlefs_create_struct(!conf->read_only);
#endif // ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 4, 0)

esp_err_t err = esp_littlefs_init(conf);
if (err != ESP_OK) {
Expand Down Expand Up @@ -399,7 +449,15 @@ esp_err_t esp_vfs_littlefs_register(const esp_vfs_littlefs_conf_t * conf)
}

strlcat(_efs[index]->base_path, conf->base_path, ESP_VFS_PATH_MAX + 1);
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)
int flags = ESP_VFS_FLAG_CONTEXT_PTR | ESP_VFS_FLAG_STATIC;
if (conf->read_only) {
flags |= ESP_VFS_FLAG_READONLY_FS;
}
err = esp_vfs_register_fs(conf->base_path, &s_vfs_littlefs, flags, _efs[index]);
#else
err = esp_vfs_register(conf->base_path, &vfs, _efs[index]);
#endif // ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)
if (err != ESP_OK) {
esp_littlefs_free(&_efs[index]);
ESP_LOGE(ESP_LITTLEFS_TAG, "Failed to register Littlefs to \"%s\"", conf->base_path);
Expand Down Expand Up @@ -636,6 +694,7 @@ static const char * esp_littlefs_errno(enum lfs_error lfs_errno) {
#define esp_littlefs_errno(x) ""
#endif

#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 4, 0)
static esp_vfs_t vfs_littlefs_create_struct(bool writeable) {
esp_vfs_t vfs = {
.flags = ESP_VFS_FLAG_CONTEXT_PTR,
Expand Down Expand Up @@ -675,6 +734,9 @@ static esp_vfs_t vfs_littlefs_create_struct(bool writeable) {
#endif // CONFIG_VFS_SUPPORT_DIR
};
if(!writeable) {
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0)
vfs.flags |= ESP_VFS_FLAG_READONLY_FS;
#endif // ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0)
vfs.write_p = NULL;
vfs.pwrite_p = NULL;
vfs.fsync_p = NULL;
Expand All @@ -686,6 +748,7 @@ static esp_vfs_t vfs_littlefs_create_struct(bool writeable) {
}
return vfs;
}
#endif // ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 4, 0)

/**
* @brief Free and clear a littlefs definition structure.
Expand Down
3 changes: 2 additions & 1 deletion test/test_littlefs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,8 @@ TEST_CASE("w+ mode read and write file", "[littlefs]")

TEST_CASE("can open maximum number of files", "[littlefs]")
{
size_t max_files = 61; /* account for stdin, stdout, stderr, esp-idf defaults to maximum 64 file descriptors */
size_t max_files = FOPEN_MAX - 3; /* account for stdin, stdout, stderr, esp-idf defaults to maximum 64 file descriptors */

test_setup();
test_littlefs_open_max_files("/littlefs/f", max_files);
test_teardown();
Expand Down
4 changes: 2 additions & 2 deletions test/test_littlefs_static_partition.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ TEST_CASE("grow filesystem", "[littlefs]")
.partition = (const esp_partition_t *) &partition,
};

uint32_t shrink_bytes;
size_t shrink_bytes;

/* Format a smaller partition */
{
Expand All @@ -158,7 +158,7 @@ TEST_CASE("grow filesystem", "[littlefs]")

/* Mount, ensure that it DOES grow */
{
uint32_t grow_bytes;
size_t grow_bytes;
conf.grow_on_mount = true;
TEST_ESP_OK(esp_vfs_littlefs_register(&conf));
TEST_ESP_OK(esp_littlefs_partition_info(&partition, &grow_bytes, NULL));
Expand Down