feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'fix/fatfs_diskio_static_func' into 'master'

Browse Source 
fix(fatfs): make the diskio functions static

See merge request espressif/esp-idf!36694
This commit is contained in:
Sonika Rathi
2025-02-03 18:27:30 +08:00
parent 82f558b47a 50dc84ca6e
commit b0aac120fb
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/fatfs/diskio/diskio_rawflash.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -25,7 +25,7 @@ static uint8_t s_initialized[FF_VOLUMES];
#define BPB_TotSec32 32 #define BPB_TotSec32 32
DSTATUS ff_raw_initialize (BYTE pdrv) static DSTATUS ff_raw_initialize (BYTE pdrv)
{ {
uint16_t sector_size_tmp; uint16_t sector_size_tmp;
@@ -61,7 +61,7 @@ DSTATUS ff_raw_initialize (BYTE pdrv)
return STA_PROTECT; return STA_PROTECT;
} }
DSTATUS ff_raw_status (BYTE pdrv) static DSTATUS ff_raw_status (BYTE pdrv)
{ {
DSTATUS status = STA_PROTECT; DSTATUS status = STA_PROTECT;
if (!s_initialized[pdrv]) { if (!s_initialized[pdrv]) {
@@ -70,7 +70,7 @@ DSTATUS ff_raw_status (BYTE pdrv)
return status; return status;
} }
DRESULT ff_raw_read (BYTE pdrv, BYTE *buff, DWORD sector, UINT count) static DRESULT ff_raw_read (BYTE pdrv, BYTE *buff, DWORD sector, UINT count)
{ {
ESP_LOGV(TAG, "ff_raw_read - pdrv=%i, sector=%i, count=%in", (unsigned int)pdrv, (unsigned int)sector, (unsigned int)count); ESP_LOGV(TAG, "ff_raw_read - pdrv=%i, sector=%i, count=%in", (unsigned int)pdrv, (unsigned int)sector, (unsigned int)count);
const esp_partition_t* part = s_ff_raw_handles[pdrv]; const esp_partition_t* part = s_ff_raw_handles[pdrv];
@@ -84,12 +84,12 @@ DRESULT ff_raw_read (BYTE pdrv, BYTE *buff, DWORD sector, UINT count)
} }
DRESULT ff_raw_write (BYTE pdrv, const BYTE *buff, DWORD sector, UINT count) static DRESULT ff_raw_write (BYTE pdrv, const BYTE *buff, DWORD sector, UINT count)
{ {
return RES_WRPRT; return RES_WRPRT;
} }
DRESULT ff_raw_ioctl (BYTE pdrv, BYTE cmd, void *buff) static DRESULT ff_raw_ioctl (BYTE pdrv, BYTE cmd, void *buff)
{ {
const esp_partition_t* part = s_ff_raw_handles[pdrv]; const esp_partition_t* part = s_ff_raw_handles[pdrv];
ESP_LOGV(TAG, "ff_raw_ioctl: cmd=%in", cmd); ESP_LOGV(TAG, "ff_raw_ioctl: cmd=%in", cmd);

14
components/fatfs/diskio/diskio_sdmmc.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -34,12 +34,12 @@ static DSTATUS ff_sdmmc_card_available(BYTE pdrv)
* fails. This error value is checked throughout the FATFS code. * fails. This error value is checked throughout the FATFS code.
* Both functions return 0 on success. * Both functions return 0 on success.
*/ */
DSTATUS ff_sdmmc_initialize (BYTE pdrv) static DSTATUS ff_sdmmc_initialize (BYTE pdrv)
{ {
return ff_sdmmc_card_available(pdrv); return ff_sdmmc_card_available(pdrv);
} }
DSTATUS ff_sdmmc_status(BYTE pdrv) static DSTATUS ff_sdmmc_status(BYTE pdrv)
{ {
if (s_disk_status_check_en[pdrv]) { if (s_disk_status_check_en[pdrv]) {
return ff_sdmmc_card_available(pdrv); return ff_sdmmc_card_available(pdrv);
@@ -47,7 +47,7 @@ DSTATUS ff_sdmmc_status(BYTE pdrv)
return 0; return 0;
} }
DRESULT ff_sdmmc_read (BYTE pdrv, BYTE* buff, DWORD sector, UINT count) static DRESULT ff_sdmmc_read (BYTE pdrv, BYTE* buff, DWORD sector, UINT count)
{ {
sdmmc_card_t* card = s_cards[pdrv]; sdmmc_card_t* card = s_cards[pdrv];
assert(card); assert(card);
@@ -59,7 +59,7 @@ DRESULT ff_sdmmc_read (BYTE pdrv, BYTE* buff, DWORD sector, UINT count)
return RES_OK; return RES_OK;
} }
DRESULT ff_sdmmc_write (BYTE pdrv, const BYTE* buff, DWORD sector, UINT count) static DRESULT ff_sdmmc_write (BYTE pdrv, const BYTE* buff, DWORD sector, UINT count)
{ {
sdmmc_card_t* card = s_cards[pdrv]; sdmmc_card_t* card = s_cards[pdrv];
assert(card); assert(card);
@@ -72,7 +72,7 @@ DRESULT ff_sdmmc_write (BYTE pdrv, const BYTE* buff, DWORD sector, UINT count)
} }
#if FF_USE_TRIM #if FF_USE_TRIM
DRESULT ff_sdmmc_trim (BYTE pdrv, DWORD start_sector, DWORD sector_count) static DRESULT ff_sdmmc_trim (BYTE pdrv, DWORD start_sector, DWORD sector_count)
{ {
sdmmc_card_t* card = s_cards[pdrv]; sdmmc_card_t* card = s_cards[pdrv];
assert(card); assert(card);
@@ -88,7 +88,7 @@ DRESULT ff_sdmmc_trim (BYTE pdrv, DWORD start_sector, DWORD sector_count)
} }
#endif //FF_USE_TRIM #endif //FF_USE_TRIM
DRESULT ff_sdmmc_ioctl (BYTE pdrv, BYTE cmd, void* buff) static DRESULT ff_sdmmc_ioctl (BYTE pdrv, BYTE cmd, void* buff)
{ {
sdmmc_card_t* card = s_cards[pdrv]; sdmmc_card_t* card = s_cards[pdrv];
assert(card); assert(card);

12
components/fatfs/diskio/diskio_wl.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -19,17 +19,17 @@ wl_handle_t ff_wl_handles[FF_VOLUMES] = {
[0 ... FF_VOLUMES - 1] = WL_INVALID_HANDLE [0 ... FF_VOLUMES - 1] = WL_INVALID_HANDLE
}; };
DSTATUS ff_wl_initialize (BYTE pdrv) static DSTATUS ff_wl_initialize (BYTE pdrv)
{ {
return 0; return 0;
} }
DSTATUS ff_wl_status (BYTE pdrv) static DSTATUS ff_wl_status (BYTE pdrv)
{ {
return 0; return 0;
} }
DRESULT ff_wl_read (BYTE pdrv, BYTE *buff, DWORD sector, UINT count) static DRESULT ff_wl_read (BYTE pdrv, BYTE *buff, DWORD sector, UINT count)
{ {
ESP_LOGV(TAG, "ff_wl_read - pdrv=%i, sector=%i, count=%i", (unsigned int)pdrv, (unsigned int)sector, (unsigned int)count); ESP_LOGV(TAG, "ff_wl_read - pdrv=%i, sector=%i, count=%i", (unsigned int)pdrv, (unsigned int)sector, (unsigned int)count);
wl_handle_t wl_handle = ff_wl_handles[pdrv]; wl_handle_t wl_handle = ff_wl_handles[pdrv];
@@ -42,7 +42,7 @@ DRESULT ff_wl_read (BYTE pdrv, BYTE *buff, DWORD sector, UINT count)
return RES_OK; return RES_OK;
} }
DRESULT ff_wl_write (BYTE pdrv, const BYTE *buff, DWORD sector, UINT count) static DRESULT ff_wl_write (BYTE pdrv, const BYTE *buff, DWORD sector, UINT count)
{ {
ESP_LOGV(TAG, "ff_wl_write - pdrv=%i, sector=%i, count=%i", (unsigned int)pdrv, (unsigned int)sector, (unsigned int)count); ESP_LOGV(TAG, "ff_wl_write - pdrv=%i, sector=%i, count=%i", (unsigned int)pdrv, (unsigned int)sector, (unsigned int)count);
wl_handle_t wl_handle = ff_wl_handles[pdrv]; wl_handle_t wl_handle = ff_wl_handles[pdrv];
@@ -60,7 +60,7 @@ DRESULT ff_wl_write (BYTE pdrv, const BYTE *buff, DWORD sector, UINT count)
return RES_OK; return RES_OK;
} }
DRESULT ff_wl_ioctl (BYTE pdrv, BYTE cmd, void *buff) static DRESULT ff_wl_ioctl (BYTE pdrv, BYTE cmd, void *buff)
{ {
wl_handle_t wl_handle = ff_wl_handles[pdrv]; wl_handle_t wl_handle = ff_wl_handles[pdrv];
ESP_LOGV(TAG, "ff_wl_ioctl: cmd=%i", cmd); ESP_LOGV(TAG, "ff_wl_ioctl: cmd=%i", cmd);