diff --git a/lib/lv_fs_if/lv_fs_pc.c b/lib/lv_fs_if/lv_fs_pc.c index 9444ebe5..d76ab87e 100644 --- a/lib/lv_fs_if/lv_fs_pc.c +++ b/lib/lv_fs_if/lv_fs_pc.c @@ -3,65 +3,63 @@ * */ - /********************* * INCLUDES *********************/ #include "lv_fs_if.h" #if LV_USE_FS_IF -#if LV_FS_IF_PC != '\0' + #if LV_FS_IF_PC != '\0' -#include -#include -#include -#include -#ifdef WIN32 -#include -#endif + #include + #include + #include + #include + #ifdef WIN32 + #include + #endif -/********************* - * DEFINES - *********************/ -#ifndef LV_FS_PC_PATH -# ifndef WIN32 -# define LV_FS_PC_PATH "./" /*Projet root*/ -# else -# define LV_FS_PC_PATH ".\\" /*Projet root*/ -# endif -#endif /*LV_FS_PATH*/ + /********************* + * DEFINES + *********************/ + #ifndef LV_FS_PC_PATH + #ifndef WIN32 + #define LV_FS_PC_PATH "/fs" /*Projet root*/ + #else + #define LV_FS_PC_PATH ".\\" /*Projet root*/ + #endif + #endif /*LV_FS_PATH*/ /********************** * TYPEDEFS **********************/ /* Create a type to store the required data about your file. */ -typedef FILE * file_t; +typedef FILE * file_t; -/*Similarly to `file_t` create a type for directory reading too */ -#ifndef WIN32 -typedef DIR * dir_t; -#else + /*Similarly to `file_t` create a type for directory reading too */ + #ifndef WIN32 +typedef DIR * dir_t; + #else typedef HANDLE dir_t; -#endif - + #endif /********************** * STATIC PROTOTYPES **********************/ -static lv_fs_res_t fs_open (lv_fs_drv_t * drv, void * file_p, const char * path, lv_fs_mode_t mode); -static lv_fs_res_t fs_close (lv_fs_drv_t * drv, void * file_p); -static lv_fs_res_t fs_read (lv_fs_drv_t * drv, void * file_p, void * buf, uint32_t btr, uint32_t * br); +static lv_fs_res_t fs_open(lv_fs_drv_t * drv, void * file_p, const char * path, lv_fs_mode_t mode); +static lv_fs_res_t fs_close(lv_fs_drv_t * drv, void * file_p); +static lv_fs_res_t fs_read(lv_fs_drv_t * drv, void * file_p, void * buf, uint32_t btr, uint32_t * br); static lv_fs_res_t fs_write(lv_fs_drv_t * drv, void * file_p, const void * buf, uint32_t btw, uint32_t * bw); -static lv_fs_res_t fs_seek (lv_fs_drv_t * drv, void * file_p, uint32_t pos); -static lv_fs_res_t fs_size (lv_fs_drv_t * drv, void * file_p, uint32_t * size_p); -static lv_fs_res_t fs_tell (lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p); -static lv_fs_res_t fs_remove (lv_fs_drv_t * drv, const char *path); -static lv_fs_res_t fs_trunc (lv_fs_drv_t * drv, void * file_p); -static lv_fs_res_t fs_rename (lv_fs_drv_t * drv, const char * oldname, const char * newname); -static lv_fs_res_t fs_free (lv_fs_drv_t * drv, uint32_t * total_p, uint32_t * free_p); -static lv_fs_res_t fs_dir_open (lv_fs_drv_t * drv, void * dir_p, const char *path); -static lv_fs_res_t fs_dir_read (lv_fs_drv_t * drv, void * dir_p, char *fn); -static lv_fs_res_t fs_dir_close (lv_fs_drv_t * drv, void * dir_p); +static lv_fs_res_t fs_seek(lv_fs_drv_t * drv, void * file_p, uint32_t pos); +static lv_fs_res_t fs_size(lv_fs_drv_t * drv, void * file_p, uint32_t * size_p); +static lv_fs_res_t fs_tell(lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p); +static lv_fs_res_t fs_remove(lv_fs_drv_t * drv, const char * path); +static lv_fs_res_t fs_trunc(lv_fs_drv_t * drv, void * file_p); +static lv_fs_res_t fs_rename(lv_fs_drv_t * drv, const char * oldname, const char * newname); +static lv_fs_res_t fs_free(lv_fs_drv_t * drv, uint32_t * total_p, uint32_t * free_p); +static lv_fs_res_t fs_dir_open(lv_fs_drv_t * drv, void * dir_p, const char * path); +static lv_fs_res_t fs_dir_read(lv_fs_drv_t * drv, void * dir_p, char * fn); +static lv_fs_res_t fs_dir_close(lv_fs_drv_t * drv, void * dir_p); /********************** * STATIC VARIABLES @@ -80,35 +78,35 @@ static lv_fs_res_t fs_dir_close (lv_fs_drv_t * drv, void * dir_p); */ void lv_fs_if_pc_init(void) { - /*--------------------------------------------------- - * Register the file system interface in LittlevGL - *--------------------------------------------------*/ + /*--------------------------------------------------- + * Register the file system interface in LittlevGL + *--------------------------------------------------*/ - /* Add a simple drive to open images */ - lv_fs_drv_t fs_drv; /*A driver descriptor*/ - lv_fs_drv_init(&fs_drv); + /* Add a simple drive to open images */ + lv_fs_drv_t fs_drv; /*A driver descriptor*/ + lv_fs_drv_init(&fs_drv); - /*Set up fields...*/ - fs_drv.file_size = sizeof(file_t); - fs_drv.letter = LV_FS_IF_PC; - fs_drv.open_cb = fs_open; - fs_drv.close_cb = fs_close; - fs_drv.read_cb = fs_read; - fs_drv.write_cb = fs_write; - fs_drv.seek_cb = fs_seek; - fs_drv.tell_cb = fs_tell; - fs_drv.free_space_cb = fs_free; - fs_drv.size_cb = fs_size; - fs_drv.remove_cb = fs_remove; - fs_drv.rename_cb = fs_rename; - fs_drv.trunc_cb = fs_trunc; + /*Set up fields...*/ + fs_drv.file_size = sizeof(file_t); + fs_drv.letter = LV_FS_IF_PC; + fs_drv.open_cb = fs_open; + fs_drv.close_cb = fs_close; + fs_drv.read_cb = fs_read; + fs_drv.write_cb = fs_write; + fs_drv.seek_cb = fs_seek; + fs_drv.tell_cb = fs_tell; + fs_drv.free_space_cb = fs_free; + fs_drv.size_cb = fs_size; + fs_drv.remove_cb = fs_remove; + fs_drv.rename_cb = fs_rename; + fs_drv.trunc_cb = fs_trunc; - fs_drv.rddir_size = sizeof(dir_t); - fs_drv.dir_close_cb = fs_dir_close; - fs_drv.dir_open_cb = fs_dir_open; - fs_drv.dir_read_cb = fs_dir_read; + fs_drv.rddir_size = sizeof(dir_t); + fs_drv.dir_close_cb = fs_dir_close; + fs_drv.dir_open_cb = fs_dir_open; + fs_drv.dir_read_cb = fs_dir_read; - lv_fs_drv_register(&fs_drv); + lv_fs_drv_register(&fs_drv); } /********************** @@ -123,42 +121,47 @@ void lv_fs_if_pc_init(void) * @param mode read: FS_MODE_RD, write: FS_MODE_WR, both: FS_MODE_RD | FS_MODE_WR * @return LV_FS_RES_OK or any error from lv_fs_res_t enum */ -static lv_fs_res_t fs_open (lv_fs_drv_t * drv, void * file_p, const char * path, lv_fs_mode_t mode) +static lv_fs_res_t fs_open(lv_fs_drv_t * drv, void * file_p, const char * path, lv_fs_mode_t mode) { - (void) drv; /*Unused*/ - errno = 0; + (void)drv; /*Unused*/ + errno = 0; - const char * flags = ""; + const char * flags = ""; - if(mode == LV_FS_MODE_WR) flags = "wb"; - else if(mode == LV_FS_MODE_RD) flags = "rb"; - else if(mode == (LV_FS_MODE_WR | LV_FS_MODE_RD)) flags = "rb+"; + if(mode == LV_FS_MODE_WR) + flags = "wb"; + else if(mode == LV_FS_MODE_RD) + flags = "rb"; + else if(mode == (LV_FS_MODE_WR | LV_FS_MODE_RD)) + flags = "rb+"; - /*Make the path relative to the current directory (the projects root folder)*/ + /*Make the path relative to the current directory (the projects root folder)*/ -#ifndef WIN32 - char buf[256]; - sprintf(buf, LV_FS_PC_PATH "/%s", path); -#else - char buf[256]; - sprintf(buf, LV_FS_PC_PATH "\\%s", path); -#endif + #ifndef WIN32 + char buf[256]; + sprintf(buf, LV_FS_PC_PATH "/%s", path); + printf("%s\n", buf); + #else + char buf[256]; + sprintf(buf, LV_FS_PC_PATH "\\%s", path); + #endif - file_t f = fopen(buf, flags); - if(f == NULL) return LV_FS_RES_UNKNOWN; + file_t f = fopen(buf, flags); + if(f == NULL) { + printf("Failed to open %s\n", buf); + return LV_FS_RES_UNKNOWN; + } + /*Be sure we are the beginning of the file*/ + fseek(f, 0, SEEK_SET); - /*Be sure we are the beginning of the file*/ - fseek(f, 0, SEEK_SET); + /* 'file_p' is pointer to a file descriptor and + * we need to store our file descriptor here*/ + file_t * fp = file_p; /*Just avoid the confusing casings*/ + *fp = f; - /* 'file_p' is pointer to a file descriptor and - * we need to store our file descriptor here*/ - file_t * fp = file_p; /*Just avoid the confusing casings*/ - *fp = f; - - return LV_FS_RES_OK; + return LV_FS_RES_OK; } - /** * Close an opened file * @param drv pointer to a driver where this function belongs @@ -166,12 +169,12 @@ static lv_fs_res_t fs_open (lv_fs_drv_t * drv, void * file_p, const char * path, * @return LV_FS_RES_OK: no error, the file is read * any error from lv_fs_res_t enum */ -static lv_fs_res_t fs_close (lv_fs_drv_t * drv, void * file_p) +static lv_fs_res_t fs_close(lv_fs_drv_t * drv, void * file_p) { - (void) drv; /*Unused*/ - file_t * fp = file_p; /*Just avoid the confusing casings*/ - fclose(*fp); - return LV_FS_RES_OK; + (void)drv; /*Unused*/ + file_t * fp = file_p; /*Just avoid the confusing casings*/ + fclose(*fp); + return LV_FS_RES_OK; } /** @@ -184,12 +187,12 @@ static lv_fs_res_t fs_close (lv_fs_drv_t * drv, void * file_p) * @return LV_FS_RES_OK: no error, the file is read * any error from lv_fs_res_t enum */ -static lv_fs_res_t fs_read (lv_fs_drv_t * drv, void * file_p, void * buf, uint32_t btr, uint32_t * br) +static lv_fs_res_t fs_read(lv_fs_drv_t * drv, void * file_p, void * buf, uint32_t btr, uint32_t * br) { - (void) drv; /*Unused*/ - file_t * fp = file_p; /*Just avoid the confusing casings*/ - *br = fread(buf, 1, btr, *fp); - return LV_FS_RES_OK; + (void)drv; /*Unused*/ + file_t * fp = file_p; /*Just avoid the confusing casings*/ + *br = fread(buf, 1, btr, *fp); + return LV_FS_RES_OK; } /** @@ -203,10 +206,10 @@ static lv_fs_res_t fs_read (lv_fs_drv_t * drv, void * file_p, void * buf, uint32 */ static lv_fs_res_t fs_write(lv_fs_drv_t * drv, void * file_p, const void * buf, uint32_t btw, uint32_t * bw) { - (void) drv; /*Unused*/ - file_t * fp = file_p; /*Just avoid the confusing casings*/ - *bw = fwrite(buf, 1, btw, *fp); - return LV_FS_RES_OK; + (void)drv; /*Unused*/ + file_t * fp = file_p; /*Just avoid the confusing casings*/ + *bw = fwrite(buf, 1, btw, *fp); + return LV_FS_RES_OK; } /** @@ -217,12 +220,12 @@ static lv_fs_res_t fs_write(lv_fs_drv_t * drv, void * file_p, const void * buf, * @return LV_FS_RES_OK: no error, the file is read * any error from lv_fs_res_t enum */ -static lv_fs_res_t fs_seek (lv_fs_drv_t * drv, void * file_p, uint32_t pos) +static lv_fs_res_t fs_seek(lv_fs_drv_t * drv, void * file_p, uint32_t pos) { - (void) drv; /*Unused*/ - file_t * fp = file_p; /*Just avoid the confusing casings*/ - fseek(*fp, pos, SEEK_SET); - return LV_FS_RES_OK; + (void)drv; /*Unused*/ + file_t * fp = file_p; /*Just avoid the confusing casings*/ + fseek(*fp, pos, SEEK_SET); + return LV_FS_RES_OK; } /** @@ -232,20 +235,20 @@ static lv_fs_res_t fs_seek (lv_fs_drv_t * drv, void * file_p, uint32_t pos) * @param size pointer to a variable to store the size * @return LV_FS_RES_OK or any error from lv_fs_res_t enum */ -static lv_fs_res_t fs_size (lv_fs_drv_t * drv, void * file_p, uint32_t * size_p) +static lv_fs_res_t fs_size(lv_fs_drv_t * drv, void * file_p, uint32_t * size_p) { - (void) drv; /*Unused*/ - file_t * fp = file_p; /*Just avoid the confusing casings*/ + (void)drv; /*Unused*/ + file_t * fp = file_p; /*Just avoid the confusing casings*/ - uint32_t cur = ftell(*fp); + uint32_t cur = ftell(*fp); - fseek(*fp, 0L, SEEK_END); - *size_p = ftell(*fp); + fseek(*fp, 0L, SEEK_END); + *size_p = ftell(*fp); - /*Restore file pointer*/ - fseek(*fp, cur, SEEK_SET); + /*Restore file pointer*/ + fseek(*fp, cur, SEEK_SET); - return LV_FS_RES_OK; + return LV_FS_RES_OK; } /** * Give the position of the read write pointer @@ -255,12 +258,12 @@ static lv_fs_res_t fs_size (lv_fs_drv_t * drv, void * file_p, uint32_t * size_p) * @return LV_FS_RES_OK: no error, the file is read * any error from lv_fs_res_t enum */ -static lv_fs_res_t fs_tell (lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p) +static lv_fs_res_t fs_tell(lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p) { - (void) drv; /*Unused*/ - file_t * fp = file_p; /*Just avoid the confusing casings*/ - *pos_p = ftell(*fp); - return LV_FS_RES_OK; + (void)drv; /*Unused*/ + file_t * fp = file_p; /*Just avoid the confusing casings*/ + *pos_p = ftell(*fp); + return LV_FS_RES_OK; } /** @@ -269,14 +272,14 @@ static lv_fs_res_t fs_tell (lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p) * @param path path of the file to delete * @return LV_FS_RES_OK or any error from lv_fs_res_t enum */ -static lv_fs_res_t fs_remove (lv_fs_drv_t * drv, const char *path) +static lv_fs_res_t fs_remove(lv_fs_drv_t * drv, const char * path) { - (void) drv; /*Unused*/ - lv_fs_res_t res = LV_FS_RES_NOT_IMP; + (void)drv; /*Unused*/ + lv_fs_res_t res = LV_FS_RES_NOT_IMP; - /* Add your code here*/ + /* Add your code here*/ - return res; + return res; } /** @@ -286,15 +289,15 @@ static lv_fs_res_t fs_remove (lv_fs_drv_t * drv, const char *path) * @return LV_FS_RES_OK: no error, the file is read * any error from lv_fs_res_t enum */ -static lv_fs_res_t fs_trunc (lv_fs_drv_t * drv, void * file_p) +static lv_fs_res_t fs_trunc(lv_fs_drv_t * drv, void * file_p) { - (void) drv; /*Unused*/ - file_t * fp = file_p; /*Just avoid the confusing casings*/ + (void)drv; /*Unused*/ + file_t * fp = file_p; /*Just avoid the confusing casings*/ - fflush(*fp); /*If not syncronized fclose can write the truncated part*/ - uint32_t p = ftell(*fp); - ftruncate(fileno(*fp), p); - return LV_FS_RES_OK; + fflush(*fp); /*If not syncronized fclose can write the truncated part*/ + uint32_t p = ftell(*fp); + // ftruncate(fileno(*fp), p); + return LV_FS_RES_OK; } /** @@ -304,19 +307,21 @@ static lv_fs_res_t fs_trunc (lv_fs_drv_t * drv, void * file_p) * @param newname path with the new name * @return LV_FS_RES_OK or any error from 'fs_res_t' */ -static lv_fs_res_t fs_rename (lv_fs_drv_t * drv, const char * oldname, const char * newname) +static lv_fs_res_t fs_rename(lv_fs_drv_t * drv, const char * oldname, const char * newname) { - (void) drv; /*Unused*/ - static char new[512]; - static char old[512]; + (void)drv; /*Unused*/ + static char new[512]; + static char old[512]; - sprintf(old, LV_FS_PC_PATH "/%s", oldname); - sprintf(new, LV_FS_PC_PATH "/%s", newname); + sprintf(old, LV_FS_PC_PATH "/%s", oldname); + sprintf(new, LV_FS_PC_PATH "/%s", newname); - int r = rename(old, new); + int r = rename(old, new); - if(r == 0) return LV_FS_RES_OK; - else return LV_FS_RES_UNKNOWN; + if(r == 0) + return LV_FS_RES_OK; + else + return LV_FS_RES_UNKNOWN; } /** @@ -327,20 +332,19 @@ static lv_fs_res_t fs_rename (lv_fs_drv_t * drv, const char * oldname, const cha * @param free_p pointer to store the free size [kB] * @return LV_FS_RES_OK or any error from lv_fs_res_t enum */ -static lv_fs_res_t fs_free (lv_fs_drv_t * drv, uint32_t * total_p, uint32_t * free_p) +static lv_fs_res_t fs_free(lv_fs_drv_t * drv, uint32_t * total_p, uint32_t * free_p) { - (void) drv; /*Unused*/ - lv_fs_res_t res = LV_FS_RES_NOT_IMP; + (void)drv; /*Unused*/ + lv_fs_res_t res = LV_FS_RES_NOT_IMP; - /* Add your code here*/ + /* Add your code here*/ - return res; + return res; } - -#ifdef WIN32 + #ifdef WIN32 static char next_fn[256]; -#endif + #endif /** * Initialize a 'fs_read_dir_t' variable for directory reading @@ -349,53 +353,52 @@ static char next_fn[256]; * @param path path to a directory * @return LV_FS_RES_OK or any error from lv_fs_res_t enum */ -static lv_fs_res_t fs_dir_open (lv_fs_drv_t * drv, void * dir_p, const char *path) +static lv_fs_res_t fs_dir_open(lv_fs_drv_t * drv, void * dir_p, const char * path) { - (void) drv; /*Unused*/ - dir_t d; -#ifndef WIN32 - /*Make the path relative to the current directory (the projects root folder)*/ - char buf[256]; - sprintf(buf, LV_FS_PC_PATH "/%s", path); - if ((d = opendir(buf)) == NULL) { - return LV_FS_RES_FS_ERR; - } else { - /* 'dir_p' is pointer to a file descriptor and - * we need to store our file descriptor here*/ - dir_t * dp = dir_p; /*Just avoid the confusing casings*/ - *dp = d; - } -#else - d = INVALID_HANDLE_VALUE; - WIN32_FIND_DATA fdata; + (void)drv; /*Unused*/ + dir_t d; + #ifndef WIN32 + /*Make the path relative to the current directory (the projects root folder)*/ + char buf[256]; + sprintf(buf, LV_FS_PC_PATH "/%s", path); + if((d = opendir(buf)) == NULL) { + return LV_FS_RES_FS_ERR; + } else { + /* 'dir_p' is pointer to a file descriptor and + * we need to store our file descriptor here*/ + dir_t * dp = dir_p; /*Just avoid the confusing casings*/ + *dp = d; + } + #else + d = INVALID_HANDLE_VALUE; + WIN32_FIND_DATA fdata; - /*Make the path relative to the current directory (the projects root folder)*/ - char buf[256]; - sprintf(buf, LV_FS_PC_PATH "\\%s\\*", path); + /*Make the path relative to the current directory (the projects root folder)*/ + char buf[256]; + sprintf(buf, LV_FS_PC_PATH "\\%s\\*", path); - strcpy(next_fn, ""); - d = FindFirstFile(buf, &fdata); - do { - if (strcmp(fdata.cFileName, ".") == 0 || strcmp(fdata.cFileName, "..") == 0) { - continue; - } else { + strcpy(next_fn, ""); + d = FindFirstFile(buf, &fdata); + do { + if(strcmp(fdata.cFileName, ".") == 0 || strcmp(fdata.cFileName, "..") == 0) { + continue; + } else { - if (fdata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - { - sprintf(next_fn, "/%s", fdata.cFileName); - } else { - sprintf(next_fn, "%s", fdata.cFileName); - } - break; - } - } while(FindNextFileA(d, &fdata)); + if(fdata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { + sprintf(next_fn, "/%s", fdata.cFileName); + } else { + sprintf(next_fn, "%s", fdata.cFileName); + } + break; + } + } while(FindNextFileA(d, &fdata)); - dir_t * dp = dir_p; /*Just avoid the confusing casings*/ - *dp = d; + dir_t * dp = dir_p; /*Just avoid the confusing casings*/ + *dp = d; -#endif + #endif - return LV_FS_RES_OK; + return LV_FS_RES_OK; } /** @@ -406,47 +409,48 @@ static lv_fs_res_t fs_dir_open (lv_fs_drv_t * drv, void * dir_p, const char *pat * @param fn pointer to a buffer to store the filename * @return LV_FS_RES_OK or any error from lv_fs_res_t enum */ -static lv_fs_res_t fs_dir_read (lv_fs_drv_t * drv, void * dir_p, char *fn) +static lv_fs_res_t fs_dir_read(lv_fs_drv_t * drv, void * dir_p, char * fn) { - (void) drv; /*Unused*/ - dir_t * dp = dir_p; /*Just avoid the confusing casings*/ + (void)drv; /*Unused*/ + dir_t * dp = dir_p; /*Just avoid the confusing casings*/ -#ifndef WIN32 - struct dirent *entry; - do { - entry = readdir(*dp); + #ifndef WIN32 + struct dirent * entry; + do { + entry = readdir(*dp); - if(entry) { - if(entry->d_type == DT_DIR) sprintf(fn, "/%s", entry->d_name); - else strcpy(fn, entry->d_name); - } else { - strcpy(fn, ""); - } - } while(strcmp(fn, "/.") == 0 || strcmp(fn, "/..") == 0); -#else - strcpy(fn, next_fn); + if(entry) { + if(entry->d_type == DT_DIR) + sprintf(fn, "/%s", entry->d_name); + else + strcpy(fn, entry->d_name); + } else { + strcpy(fn, ""); + } + } while(strcmp(fn, "/.") == 0 || strcmp(fn, "/..") == 0); + #else + strcpy(fn, next_fn); - strcpy(next_fn, ""); - WIN32_FIND_DATA fdata; + strcpy(next_fn, ""); + WIN32_FIND_DATA fdata; - if(FindNextFile(*dp, &fdata) == false) return LV_FS_RES_OK; - do { - if (strcmp(fdata.cFileName, ".") == 0 || strcmp(fdata.cFileName, "..") == 0) { - continue; - } else { + if(FindNextFile(*dp, &fdata) == false) return LV_FS_RES_OK; + do { + if(strcmp(fdata.cFileName, ".") == 0 || strcmp(fdata.cFileName, "..") == 0) { + continue; + } else { - if (fdata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - { - sprintf(next_fn, "/%s", fdata.cFileName); - } else { - sprintf(next_fn, "%s", fdata.cFileName); - } - break; - } - } while(FindNextFile(*dp, &fdata)); + if(fdata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { + sprintf(next_fn, "/%s", fdata.cFileName); + } else { + sprintf(next_fn, "%s", fdata.cFileName); + } + break; + } + } while(FindNextFile(*dp, &fdata)); -#endif - return LV_FS_RES_OK; + #endif + return LV_FS_RES_OK; } /** @@ -455,18 +459,18 @@ static lv_fs_res_t fs_dir_read (lv_fs_drv_t * drv, void * dir_p, char *fn) * @param dir_p pointer to an initialized 'fs_read_dir_t' variable * @return LV_FS_RES_OK or any error from lv_fs_res_t enum */ -static lv_fs_res_t fs_dir_close (lv_fs_drv_t * drv, void * dir_p) +static lv_fs_res_t fs_dir_close(lv_fs_drv_t * drv, void * dir_p) { - (void) drv; /*Unused*/ - dir_t * dp = dir_p; -#ifndef WIN32 - closedir(*dp); -#else - FindClose(*dp); - *dp = INVALID_HANDLE_VALUE; -#endif - return LV_FS_RES_OK; + (void)drv; /*Unused*/ + dir_t * dp = dir_p; + #ifndef WIN32 + closedir(*dp); + #else + FindClose(*dp); + *dp = INVALID_HANDLE_VALUE; + #endif + return LV_FS_RES_OK; } -#endif /*LV_USE_FS_IF*/ -#endif /*LV_FS_IF_FATFS*/ + #endif /*LV_USE_FS_IF*/ +#endif /*LV_FS_IF_FATFS*/