diff --git a/components/fs/littlefs/lfs_api.c b/components/fs/littlefs/lfs_api.c index 92c0194c..b36dee95 100644 --- a/components/fs/littlefs/lfs_api.c +++ b/components/fs/littlefs/lfs_api.c @@ -38,7 +38,7 @@ FileDirInfo g_lfsDir[LFS_MAX_OPEN_DIRS] = {0}; FileOpInfo g_fsOp; static LittleFsHandleStruct g_handle[LITTLE_FS_MAX_OPEN_FILES] = {0}; struct dirent g_nameValue; -struct fsmap_t g_fsmap[MAX_FILE_SYSTEM_LEN] = {0}; +struct FsMap g_fsmap[MAX_FILE_SYSTEM_LEN] = {0}; static pthread_mutex_t g_FslocalMutex = PTHREAD_MUTEX_INITIALIZER; FileOpInfo GetFsOpInfo(void) @@ -83,7 +83,7 @@ int InitMountInfo(const char *fileSystemType, const struct MountOps *fsMops) if (g_fsmap[i].fileSystemtype == NULL) { g_fsmap[i].fileSystemtype = (char*)malloc(len); memcpy_s(g_fsmap[i].fileSystemtype, len, fileSystemType, len); - g_fsmap[i].fs_mops = fsMops; + g_fsmap[i].fsMops = fsMops; return VFS_OK; } } @@ -91,9 +91,9 @@ int InitMountInfo(const char *fileSystemType, const struct MountOps *fsMops) return VFS_ERROR; } -const struct fsmap_t *MountFindfs(const char *fileSystemtype) +const struct FsMap *MountFindfs(const char *fileSystemtype) { - struct fsmap_t *m = NULL; + struct FsMap *m = NULL; for (int i = 0; i < MAX_FILE_SYSTEM_LEN; i++) { m = &(g_fsmap[i]); @@ -102,7 +102,7 @@ const struct fsmap_t *MountFindfs(const char *fileSystemtype) } } - return (const struct fsmap_t *)NULL; + return (const struct FsMap *)NULL; } const struct MountOps g_fsMnt = { @@ -110,7 +110,7 @@ const struct MountOps g_fsMnt = { .Umount = LfsUmount, }; -const struct FileOps lfs_vops = { +const struct FileOps g_lfsVops = { .Mkdir = LfsMkdir, .Unlink = LfsUnlink, .Rmdir = LfsRmdir, @@ -132,7 +132,7 @@ int LfsMount(const char *source, const char *target, const char *fileSystemType, { int ret; - g_fsOp.fsVops = &lfs_vops; + g_fsOp.fsVops = &g_lfsVops; ret = lfs_mount(&g_lfs, (struct lfs_config*)data); return ret; @@ -200,7 +200,7 @@ struct dirent *LfsReaddir(DIR *dir) return NULL; } -int LfsClosedir(DIR *dir) +int LfsClosedir(const DIR *dir) { return lfs_dir_close(&g_lfs, (lfs_dir_t *)dir); } diff --git a/components/fs/littlefs/lfs_api.h b/components/fs/littlefs/lfs_api.h index db0d116e..780ef397 100644 --- a/components/fs/littlefs/lfs_api.h +++ b/components/fs/littlefs/lfs_api.h @@ -29,11 +29,12 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "lfs.h" -#include "lfs_util.h" -#include "dirent.h" #include "bits/alltypes.h" #include "sys/stat.h" + +#include "dirent.h" +#include "lfs.h" +#include "lfs_util.h" #include "memory.h" #include "pthread.h" @@ -60,9 +61,9 @@ struct MountOps { int (*Umount)(const char* target); }; -struct fsmap_t { +struct FsMap { const char *fileSystemtype; - const struct MountOps *fs_mops; + const struct MountOps *fsMops; }; struct FileOps { @@ -73,7 +74,7 @@ struct FileOps { int (*Mkdir)(const char *dirName, mode_t mode); struct dirent *(*Readdir)(DIR *dir); DIR *(*Opendir)(const char *dirName); - int (*Closedir)(DIR *dir); + int (*Closedir)(const DIR *dir); int (*Read)(int fd, void *buf, size_t len); int (*Write)(int fd, const void *buf, size_t len); int (*Seek)(int fd, off_t offset, int whence); @@ -116,7 +117,7 @@ int LfsMkdir(const char *dirName, mode_t mode); int LfsRmdir(const char *dirName); DIR *LfsOpendir(const char *dirName); struct dirent *LfsReaddir(DIR *dir); -int LfsClosedir(DIR *dir); +int LfsClosedir(const DIR *dir); int LfsOpen(const char *path, int openFlag, int mode); int LfsRead(int fd, void *buf, unsigned int len); int LfsWrite(int fd, const void *buf, unsigned int len); @@ -127,6 +128,6 @@ int LfsStat(const char *path, struct stat *buf); int LfsFsync(int fd); FileOpInfo GetFsOpInfo(void); -const struct fsmap_t *MountFindfs(const char *filesystemtype); +const struct FsMap *MountFindfs(const char *filesystemtype);