fatfs: use correct return types in ioctl calls

GET_SECTOR_SIZE should return WORD (unsigned short) but returned
uint32_t.

Reference: http://elm-chan.org/fsw/ff/doc/dioctl.html

Closes https://github.com/espressif/esp-idf/pull/1031.

diff --git a/components/fatfs/src/diskio_sdmmc.c b/components/fatfs/src/diskio_sdmmc.c
index 51f0587b0a38360a5cede10fbd06a57fe7c7ca0e..430f1ba420a06c96cc5adb8c426af3f9f903f5db 100644 (file)
--- a/components/fatfs/src/diskio_sdmmc.c
+++ b/components/fatfs/src/diskio_sdmmc.c
@@ -64,10 +64,10 @@ DRESULT ff_sdmmc_ioctl (BYTE pdrv, BYTE cmd, void* buff)
         case CTRL_SYNC:
             return RES_OK;
         case GET_SECTOR_COUNT:
-            *((uint32_t*) buff) = card->csd.capacity;
+            *((DWORD*) buff) = card->csd.capacity;
             return RES_OK;
         case GET_SECTOR_SIZE:
-            *((uint32_t*) buff) = card->csd.sector_size;
+            *((WORD*) buff) = card->csd.sector_size;
             return RES_OK;
         case GET_BLOCK_SIZE:
             return RES_ERROR;

diff --git a/components/fatfs/src/diskio_spiflash.c b/components/fatfs/src/diskio_spiflash.c
index 2fdf075dea1f31badc6bb85618fab35f4c5e352d..2f03a24e943e6e021e371131c3229e2df6e09513 100644 (file)
--- a/components/fatfs/src/diskio_spiflash.c
+++ b/components/fatfs/src/diskio_spiflash.c
@@ -77,10 +77,10 @@ DRESULT ff_wl_ioctl (BYTE pdrv, BYTE cmd, void *buff)
     case CTRL_SYNC:\r
         return RES_OK;\r
     case GET_SECTOR_COUNT:\r
-        *((uint32_t *) buff) = wl_size(wl_handle) / wl_sector_size(wl_handle);\r
+        *((DWORD *) buff) = wl_size(wl_handle) / wl_sector_size(wl_handle);\r
         return RES_OK;\r
     case GET_SECTOR_SIZE:\r
-        *((uint32_t *) buff) = wl_sector_size(wl_handle);\r
+        *((WORD *) buff) = wl_sector_size(wl_handle);\r
         return RES_OK;\r
     case GET_BLOCK_SIZE:\r
         return RES_ERROR;\r