sync lvgl/lv_fs_if (#2676)

* sync lvgl/lv_fs_if

* fix copy paste issues

* Update src/extra/libs/fs/lv_fs_fatfs.c

Co-authored-by: Gabor Kiss-Vamosi <kisvegabor@gmail.com>
This commit is contained in:
woody
2021-10-16 15:11:22 +08:00
committed by GitHub
parent dc384a328a
commit bd19083aed

View File

@@ -113,6 +113,7 @@ static void * fs_open (lv_fs_drv_t * drv, const char * path, lv_fs_mode_t mode)
f_lseek(f, 0); f_lseek(f, 0);
return f; return f;
} else { } else {
lv_mem_free(f);
return NULL; return NULL;
} }
} }
@@ -128,6 +129,7 @@ static void * fs_open (lv_fs_drv_t * drv, 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_close (lv_fs_drv_t * drv, void * file_p)
{ {
f_close(file_p); f_close(file_p);
lv_mem_free(file_p);
return LV_FS_RES_OK; return LV_FS_RES_OK;
} }
@@ -175,8 +177,20 @@ static lv_fs_res_t fs_write(lv_fs_drv_t * drv, void * file_p, const void * buf,
*/ */
static lv_fs_res_t fs_seek (lv_fs_drv_t * drv, void * file_p, uint32_t pos, lv_fs_whence_t whence) static lv_fs_res_t fs_seek (lv_fs_drv_t * drv, void * file_p, uint32_t pos, lv_fs_whence_t whence)
{ {
LV_UNUSED(whence); switch (whence)
{
case LV_FS_SEEK_SET:
f_lseek(file_p, pos); f_lseek(file_p, pos);
break;
case LV_FS_SEEK_CUR:
f_lseek(file_p, f_tell((FIL *)file_p) + pos);
break;
case LV_FS_SEEK_END:
f_lseek(file_p, f_size((FIL *)file_p) + pos);
break;
default:
break;
}
return LV_FS_RES_OK; return LV_FS_RES_OK;
} }
@@ -252,6 +266,7 @@ 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_dir_close (lv_fs_drv_t * drv, void * dir_p)
{ {
f_closedir(dir_p); f_closedir(dir_p);
lv_mem_free(dir_p);
return LV_FS_RES_OK; return LV_FS_RES_OK;
} }