fatfs: update diskio and vfs for FatFS changes

- do to not rely on integer.h types
- ffsystem.c does not define ff_memcalloc, replace with ff_memalloc +
  memset.

diff --git a/components/fatfs/diskio/diskio_impl.h b/components/fatfs/diskio/diskio_impl.h
index 80723490f69ad273999bb12cc1e87c1684190e3b..76c246dd8c7608363ec22d5394b3038437952a15 100644 (file)
--- a/components/fatfs/diskio/diskio_impl.h
+++ b/components/fatfs/diskio/diskio_impl.h
@@ -18,6 +18,11 @@
 extern "C" {
 #endif
 
+#include <stdint.h>
+typedef unsigned int UINT;
+typedef unsigned char BYTE;
+typedef uint32_t DWORD;
+
 #include "diskio.h"
 #include "esp_err.h"
 
@@ -27,11 +32,11 @@ extern "C" {
  * See FatFs documentation for details about these functions
  */
 typedef struct {
-    DSTATUS (*init) (BYTE pdrv);    /*!< disk initialization function */
-    DSTATUS (*status) (BYTE pdrv);  /*!< disk status check function */
-    DRESULT (*read) (BYTE pdrv, BYTE* buff, DWORD sector, UINT count);  /*!< sector read function */
-    DRESULT (*write) (BYTE pdrv, const BYTE* buff, DWORD sector, UINT count);   /*!< sector write function */
-    DRESULT (*ioctl) (BYTE pdrv, BYTE cmd, void* buff); /*!< function to get info about disk and do some misc operations */
+    DSTATUS (*init) (unsigned char pdrv);    /*!< disk initialization function */
+    DSTATUS (*status) (unsigned char pdrv);  /*!< disk status check function */
+    DRESULT (*read) (unsigned char pdrv, unsigned char* buff, uint32_t sector, unsigned count);  /*!< sector read function */
+    DRESULT (*write) (unsigned char pdrv, const unsigned char* buff, uint32_t sector, unsigned count);   /*!< sector write function */
+    DRESULT (*ioctl) (unsigned char pdrv, unsigned char cmd, void* buff); /*!< function to get info about disk and do some misc operations */
 } ff_diskio_impl_t;
 
 /**

diff --git a/components/fatfs/diskio/diskio_rawflash.h b/components/fatfs/diskio/diskio_rawflash.h
index a7b61a4708abb9a1e1c4b460c22080cde63d722e..73ff15f881018a068702e3bcfc49235f663091dd 100644 (file)
--- a/components/fatfs/diskio/diskio_rawflash.h
+++ b/components/fatfs/diskio/diskio_rawflash.h
@@ -19,7 +19,6 @@
 extern "C" {
 #endif
 
-#include "integer.h"
 #include "esp_partition.h"
 
 /**
@@ -28,8 +27,8 @@ extern "C" {
  * @param pdrv  drive number
  * @param part_handle  pointer to raw flash partition.
  */
-esp_err_t ff_diskio_register_raw_partition(BYTE pdrv, const esp_partition_t* part_handle);
-BYTE ff_diskio_get_pdrv_raw(const esp_partition_t* part_handle);
+esp_err_t ff_diskio_register_raw_partition(unsigned char pdrv, const esp_partition_t* part_handle);
+unsigned char ff_diskio_get_pdrv_raw(const esp_partition_t* part_handle);
 
 #ifdef __cplusplus
 }

diff --git a/components/fatfs/diskio/diskio_wl.h b/components/fatfs/diskio/diskio_wl.h
index 9abff7ae06dc93777f82da9261086425f53e7143..af3f1479733f1c663c819ad5d856507c93109c4a 100644 (file)
--- a/components/fatfs/diskio/diskio_wl.h
+++ b/components/fatfs/diskio/diskio_wl.h
@@ -19,7 +19,6 @@
 extern "C" {
 #endif
 
-#include "integer.h"
 #include "wear_levelling.h"
 
 
@@ -29,8 +28,8 @@ extern "C" {
  * @param pdrv  drive number
  * @param flash_handle  handle of the wear levelling partition.
  */
-esp_err_t ff_diskio_register_wl_partition(BYTE pdrv, wl_handle_t flash_handle);
-BYTE ff_diskio_get_pdrv_wl(wl_handle_t flash_handle);
+esp_err_t ff_diskio_register_wl_partition(unsigned char pdrv, wl_handle_t flash_handle);
+unsigned char ff_diskio_get_pdrv_wl(wl_handle_t flash_handle);
 void ff_diskio_clear_pdrv_wl(wl_handle_t flash_handle);
 
 #ifdef __cplusplus

diff --git a/components/fatfs/port/ffsystem.c b/components/fatfs/port/ffsystem.c
index ac023651802bf07e36751248e4784fa45f4cfcd1..e1cbbbbf76f8553007b093524797523ecfe47754 100644 (file)
--- a/components/fatfs/port/ffsystem.c
+++ b/components/fatfs/port/ffsystem.c
@@ -5,6 +5,7 @@
 
 
 #include <string.h>
+#include <stdlib.h>
 #include "ff.h"
 #include "sdkconfig.h"
 #ifdef CONFIG_FATFS_ALLOC_EXTRAM_FIRST
@@ -18,7 +19,7 @@
 /*------------------------------------------------------------------------*/
 
 void* ff_memalloc (    /* Returns pointer to the allocated memory block (null on not enough core) */
-       UINT msize              /* Number of bytes to allocate */
+       unsigned msize          /* Number of bytes to allocate */
 )
 {
 #ifdef CONFIG_FATFS_ALLOC_EXTRAM_FIRST
@@ -29,21 +30,6 @@ void* ff_memalloc (  /* Returns pointer to the allocated memory block (null on no
 #endif
 }
 
-/*------------------------------------------------------------------------*/
-/* Allocate and zero out memory block                                     */
-/*------------------------------------------------------------------------*/
-
-
-void* ff_memcalloc (UINT num, UINT size)
-{
-#ifdef CONFIG_FATFS_ALLOC_EXTRAM_FIRST
-       return heap_caps_calloc_prefer(num, size, 2, MALLOC_CAP_DEFAULT | MALLOC_CAP_SPIRAM,
-                                                                                               MALLOC_CAP_DEFAULT | MALLOC_CAP_INTERNAL);
-#else
-       return calloc(num, size);
-#endif
-}
-
 
 /*------------------------------------------------------------------------*/
 /* Free a memory block                                                    */

diff --git a/components/fatfs/vfs/vfs_fat.c b/components/fatfs/vfs/vfs_fat.c
index b38246a837c8859cf3a064411f9647d0d8402c5c..1ee269590364e3eb8f39d3fe6fca762e9bafeb64 100644 (file)
--- a/components/fatfs/vfs/vfs_fat.c
+++ b/components/fatfs/vfs/vfs_fat.c
@@ -150,15 +150,17 @@ esp_err_t esp_vfs_fat_register(const char* base_path, const char* fat_drive, siz
         .utime_p = &vfs_fat_utime,
     };
     size_t ctx_size = sizeof(vfs_fat_ctx_t) + max_files * sizeof(FIL);
-    vfs_fat_ctx_t* fat_ctx = (vfs_fat_ctx_t*) ff_memcalloc(1, ctx_size);
+    vfs_fat_ctx_t* fat_ctx = (vfs_fat_ctx_t*) ff_memalloc(ctx_size);
     if (fat_ctx == NULL) {
         return ESP_ERR_NO_MEM;
     }
+    memset(fat_ctx, 0, ctx_size);
     fat_ctx->o_append = ff_memalloc(max_files * sizeof(bool));
     if (fat_ctx->o_append == NULL) {
         free(fat_ctx);
         return ESP_ERR_NO_MEM;
     }
+    memset(fat_ctx->o_append, 0, max_files * sizeof(bool));
     fat_ctx->max_files = max_files;
     strlcpy(fat_ctx->fat_drive, fat_drive, sizeof(fat_ctx->fat_drive) - 1);
     strlcpy(fat_ctx->base_path, base_path, sizeof(fat_ctx->base_path) - 1);
@@ -512,8 +514,8 @@ static int vfs_fat_link(void* ctx, const char* n1, const char* n2)
     prepend_drive_to_path(fat_ctx, &n1, &n2);
     const size_t copy_buf_size = fat_ctx->fs.csize;
     FRESULT res;
-    FIL* pf1 = ff_memcalloc(1, sizeof(FIL));
-    FIL* pf2 = ff_memcalloc(1, sizeof(FIL));
+    FIL* pf1 = (FIL*) ff_memalloc(sizeof(FIL));
+    FIL* pf2 = (FIL*) ff_memalloc(sizeof(FIL));
     void* buf = ff_memalloc(copy_buf_size);
     if (buf == NULL || pf1 == NULL || pf2 == NULL) {
         _lock_release(&fat_ctx->lock);
@@ -524,6 +526,8 @@ static int vfs_fat_link(void* ctx, const char* n1, const char* n2)
         errno = ENOMEM;
         return -1;
     }
+    memset(pf1, 0, sizeof(*pf1));
+    memset(pf2, 0, sizeof(*pf2));
     res = f_open(pf1, n1, FA_READ | FA_OPEN_EXISTING);
     if (res != FR_OK) {
         _lock_release(&fat_ctx->lock);
@@ -591,12 +595,14 @@ static DIR* vfs_fat_opendir(void* ctx, const char* name)
     vfs_fat_ctx_t* fat_ctx = (vfs_fat_ctx_t*) ctx;
     _lock_acquire(&fat_ctx->lock);
     prepend_drive_to_path(fat_ctx, &name, NULL);
-    vfs_fat_dir_t* fat_dir = ff_memcalloc(1, sizeof(vfs_fat_dir_t));
+    vfs_fat_dir_t* fat_dir = ff_memalloc(sizeof(vfs_fat_dir_t));
     if (!fat_dir) {
         _lock_release(&fat_ctx->lock);
         errno = ENOMEM;
         return NULL;
     }
+    memset(fat_dir, 0, sizeof(*fat_dir));
+
     FRESULT res = f_opendir(&fat_dir->ffdir, name);
     _lock_release(&fat_ctx->lock);
     if (res != FR_OK) {
@@ -766,7 +772,7 @@ static int vfs_fat_truncate(void* ctx, const char *path, off_t length)
     _lock_acquire(&fat_ctx->lock);
     prepend_drive_to_path(fat_ctx, &path, NULL);
 
-    file = (FIL*) ff_memcalloc(1, sizeof(FIL));
+    file = (FIL*) ff_memalloc(sizeof(FIL));
     if (file == NULL) {
         _lock_release(&fat_ctx->lock);
         ESP_LOGD(TAG, "truncate alloc failed");
@@ -774,6 +780,7 @@ static int vfs_fat_truncate(void* ctx, const char *path, off_t length)
         ret = -1;
         goto out;
     }
+    memset(file, 0, sizeof(*file));
 
     res = f_open(file, path, FA_WRITE);