From 104204ce56d6a2843de168c65b4321ef28882ef4 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Mon, 9 Oct 2017 12:36:21 +0800 Subject: [PATCH] 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. --- components/fatfs/src/diskio_sdmmc.c | 4 ++-- components/fatfs/src/diskio_spiflash.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/fatfs/src/diskio_sdmmc.c b/components/fatfs/src/diskio_sdmmc.c index 51f0587b0a..430f1ba420 100644 --- 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 2fdf075dea..2f03a24e94 100644 --- 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: return RES_OK; case GET_SECTOR_COUNT: - *((uint32_t *) buff) = wl_size(wl_handle) / wl_sector_size(wl_handle); + *((DWORD *) buff) = wl_size(wl_handle) / wl_sector_size(wl_handle); return RES_OK; case GET_SECTOR_SIZE: - *((uint32_t *) buff) = wl_sector_size(wl_handle); + *((WORD *) buff) = wl_sector_size(wl_handle); return RES_OK; case GET_BLOCK_SIZE: return RES_ERROR;