Merge branch 'fix/fatfs_diskio_static_func' into 'master'

RathiSonika · RathiSonika · commit b0aac120fbe1 · 2025-02-03T18:27:30.000+08:00
fix(fatfs): make the diskio functions static

See merge request espressif/esp-idf!36694
diff --git a/components/fatfs/diskio/diskio_rawflash.c b/components/fatfs/diskio/diskio_rawflash.c
@@ -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
  */
@@ -25,7 +25,7 @@ static uint8_t s_initialized[FF_VOLUMES];
 #define BPB_TotSec32 32
 
 
-DSTATUS ff_raw_initialize (BYTE pdrv)
+static DSTATUS ff_raw_initialize (BYTE pdrv)
 {
 
     uint16_t sector_size_tmp;
@@ -61,7 +61,7 @@ DSTATUS ff_raw_initialize (BYTE pdrv)
     return STA_PROTECT;
 }
 
-DSTATUS ff_raw_status (BYTE pdrv)
+static DSTATUS ff_raw_status (BYTE pdrv)
 {
     DSTATUS status = STA_PROTECT;
     if (!s_initialized[pdrv]) {
@@ -70,7 +70,7 @@ DSTATUS ff_raw_status (BYTE pdrv)
     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);
     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;
 }
 
-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];
     ESP_LOGV(TAG, "ff_raw_ioctl: cmd=%in", cmd);
diff --git a/components/fatfs/diskio/diskio_sdmmc.c b/components/fatfs/diskio/diskio_sdmmc.c
@@ -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
  */
@@ -34,20 +34,20 @@ static DSTATUS ff_sdmmc_card_available(BYTE pdrv)
 *   fails. This error value is checked throughout the FATFS code.
 *   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);
 }
 
-DSTATUS ff_sdmmc_status(BYTE pdrv)
+static DSTATUS ff_sdmmc_status(BYTE pdrv)
 {
     if (s_disk_status_check_en[pdrv]) {
         return ff_sdmmc_card_available(pdrv);
     }
     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];
     assert(card);
@@ -59,7 +59,7 @@ DRESULT ff_sdmmc_read (BYTE pdrv, BYTE* buff, DWORD sector, UINT count)
     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];
     assert(card);
@@ -72,7 +72,7 @@ DRESULT ff_sdmmc_write (BYTE pdrv, const BYTE* buff, DWORD sector, UINT count)
 }
 
 #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];
     assert(card);
@@ -88,7 +88,7 @@ DRESULT ff_sdmmc_trim (BYTE pdrv, DWORD start_sector, DWORD sector_count)
 }
 #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];
     assert(card);
diff --git a/components/fatfs/diskio/diskio_wl.c b/components/fatfs/diskio/diskio_wl.c
@@ -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
  */
@@ -19,17 +19,17 @@ wl_handle_t ff_wl_handles[FF_VOLUMES] = {
         [0 ... FF_VOLUMES - 1] = WL_INVALID_HANDLE
 };
 
-DSTATUS ff_wl_initialize (BYTE pdrv)
+static DSTATUS ff_wl_initialize (BYTE pdrv)
 {
     return 0;
 }
 
-DSTATUS ff_wl_status (BYTE pdrv)
+static DSTATUS ff_wl_status (BYTE pdrv)
 {
     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);
     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;
 }
 
-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);
     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;
 }
 
-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];
     ESP_LOGV(TAG, "ff_wl_ioctl: cmd=%i", cmd);

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD`
	`2`	`+ * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD`
`3`	`3`	`*`
`4`	`4`	`* SPDX-License-Identifier: Apache-2.0`
`5`	`5`	`*/`
`@@ -25,7 +25,7 @@ static uint8_t s_initialized[FF_VOLUMES];`
`25`	`25`	`#define BPB_TotSec32 32`
`26`	`26`
`27`	`27`
`28`		`-DSTATUS ff_raw_initialize (BYTE pdrv)`
	`28`	`+static DSTATUS ff_raw_initialize (BYTE pdrv)`
`29`	`29`	`{`
`30`	`30`
`31`	`31`	`uint16_t sector_size_tmp;`
`@@ -61,7 +61,7 @@ DSTATUS ff_raw_initialize (BYTE pdrv)`
`61`	`61`	`return STA_PROTECT;`
`62`	`62`	`}`
`63`	`63`
`64`		`-DSTATUS ff_raw_status (BYTE pdrv)`
	`64`	`+static DSTATUS ff_raw_status (BYTE pdrv)`
`65`	`65`	`{`
`66`	`66`	`DSTATUS status = STA_PROTECT;`
`67`	`67`	`if (!s_initialized[pdrv]) {`
`@@ -70,7 +70,7 @@ DSTATUS ff_raw_status (BYTE pdrv)`
`70`	`70`	`return status;`
`71`	`71`	`}`
`72`	`72`
`73`		`-DRESULT ff_raw_read (BYTE pdrv, BYTE *buff, DWORD sector, UINT count)`
	`73`	`+static DRESULT ff_raw_read (BYTE pdrv, BYTE *buff, DWORD sector, UINT count)`
`74`	`74`	`{`
`75`	`75`	`ESP_LOGV(TAG, "ff_raw_read - pdrv=%i, sector=%i, count=%in", (unsigned int)pdrv, (unsigned int)sector, (unsigned int)count);`
`76`	`76`	`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)`
`84`	`84`	`}`
`85`	`85`
`86`	`86`
`87`		`-DRESULT ff_raw_write (BYTE pdrv, const BYTE *buff, DWORD sector, UINT count)`
	`87`	`+static DRESULT ff_raw_write (BYTE pdrv, const BYTE *buff, DWORD sector, UINT count)`
`88`	`88`	`{`
`89`	`89`	`return RES_WRPRT;`
`90`	`90`	`}`
`91`	`91`
`92`		`-DRESULT ff_raw_ioctl (BYTE pdrv, BYTE cmd, void *buff)`
	`92`	`+static DRESULT ff_raw_ioctl (BYTE pdrv, BYTE cmd, void *buff)`
`93`	`93`	`{`
`94`	`94`	`const esp_partition_t* part = s_ff_raw_handles[pdrv];`
`95`	`95`	`ESP_LOGV(TAG, "ff_raw_ioctl: cmd=%in", cmd);`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD`
	`2`	`+ * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD`
`3`	`3`	`*`
`4`	`4`	`* SPDX-License-Identifier: Apache-2.0`
`5`	`5`	`*/`
`@@ -34,20 +34,20 @@ static DSTATUS ff_sdmmc_card_available(BYTE pdrv)`
`34`	`34`	`* fails. This error value is checked throughout the FATFS code.`
`35`	`35`	`* Both functions return 0 on success.`
`36`	`36`	`*/`
`37`		`-DSTATUS ff_sdmmc_initialize (BYTE pdrv)`
	`37`	`+static DSTATUS ff_sdmmc_initialize (BYTE pdrv)`
`38`	`38`	`{`
`39`	`39`	`return ff_sdmmc_card_available(pdrv);`
`40`	`40`	`}`
`41`	`41`
`42`		`-DSTATUS ff_sdmmc_status(BYTE pdrv)`
	`42`	`+static DSTATUS ff_sdmmc_status(BYTE pdrv)`
`43`	`43`	`{`
`44`	`44`	`if (s_disk_status_check_en[pdrv]) {`
`45`	`45`	`return ff_sdmmc_card_available(pdrv);`
`46`	`46`	`}`
`47`	`47`	`return 0;`
`48`	`48`	`}`
`49`	`49`
`50`		`-DRESULT ff_sdmmc_read (BYTE pdrv, BYTE* buff, DWORD sector, UINT count)`
	`50`	`+static DRESULT ff_sdmmc_read (BYTE pdrv, BYTE* buff, DWORD sector, UINT count)`
`51`	`51`	`{`
`52`	`52`	`sdmmc_card_t* card = s_cards[pdrv];`
`53`	`53`	`assert(card);`
`@@ -59,7 +59,7 @@ DRESULT ff_sdmmc_read (BYTE pdrv, BYTE* buff, DWORD sector, UINT count)`
`59`	`59`	`return RES_OK;`
`60`	`60`	`}`
`61`	`61`
`62`		`-DRESULT ff_sdmmc_write (BYTE pdrv, const BYTE* buff, DWORD sector, UINT count)`
	`62`	`+static DRESULT ff_sdmmc_write (BYTE pdrv, const BYTE* buff, DWORD sector, UINT count)`
`63`	`63`	`{`
`64`	`64`	`sdmmc_card_t* card = s_cards[pdrv];`
`65`	`65`	`assert(card);`
`@@ -72,7 +72,7 @@ DRESULT ff_sdmmc_write (BYTE pdrv, const BYTE* buff, DWORD sector, UINT count)`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`#if FF_USE_TRIM`
`75`		`-DRESULT ff_sdmmc_trim (BYTE pdrv, DWORD start_sector, DWORD sector_count)`
	`75`	`+static DRESULT ff_sdmmc_trim (BYTE pdrv, DWORD start_sector, DWORD sector_count)`
`76`	`76`	`{`
`77`	`77`	`sdmmc_card_t* card = s_cards[pdrv];`
`78`	`78`	`assert(card);`
`@@ -88,7 +88,7 @@ DRESULT ff_sdmmc_trim (BYTE pdrv, DWORD start_sector, DWORD sector_count)`
`88`	`88`	`}`
`89`	`89`	`#endif //FF_USE_TRIM`
`90`	`90`
`91`		`-DRESULT ff_sdmmc_ioctl (BYTE pdrv, BYTE cmd, void* buff)`
	`91`	`+static DRESULT ff_sdmmc_ioctl (BYTE pdrv, BYTE cmd, void* buff)`
`92`	`92`	`{`
`93`	`93`	`sdmmc_card_t* card = s_cards[pdrv];`
`94`	`94`	`assert(card);`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD`
	`2`	`+ * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD`
`3`	`3`	`*`
`4`	`4`	`* SPDX-License-Identifier: Apache-2.0`
`5`	`5`	`*/`
`@@ -19,17 +19,17 @@ wl_handle_t ff_wl_handles[FF_VOLUMES] = {`
`19`	`19`	`[0 ... FF_VOLUMES - 1] = WL_INVALID_HANDLE`
`20`	`20`	`};`
`21`	`21`
`22`		`-DSTATUS ff_wl_initialize (BYTE pdrv)`
	`22`	`+static DSTATUS ff_wl_initialize (BYTE pdrv)`
`23`	`23`	`{`
`24`	`24`	`return 0;`
`25`	`25`	`}`
`26`	`26`
`27`		`-DSTATUS ff_wl_status (BYTE pdrv)`
	`27`	`+static DSTATUS ff_wl_status (BYTE pdrv)`
`28`	`28`	`{`
`29`	`29`	`return 0;`
`30`	`30`	`}`
`31`	`31`
`32`		`-DRESULT ff_wl_read (BYTE pdrv, BYTE *buff, DWORD sector, UINT count)`
	`32`	`+static DRESULT ff_wl_read (BYTE pdrv, BYTE *buff, DWORD sector, UINT count)`
`33`	`33`	`{`
`34`	`34`	`ESP_LOGV(TAG, "ff_wl_read - pdrv=%i, sector=%i, count=%i", (unsigned int)pdrv, (unsigned int)sector, (unsigned int)count);`
`35`	`35`	`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)`
`42`	`42`	`return RES_OK;`
`43`	`43`	`}`
`44`	`44`
`45`		`-DRESULT ff_wl_write (BYTE pdrv, const BYTE *buff, DWORD sector, UINT count)`
	`45`	`+static DRESULT ff_wl_write (BYTE pdrv, const BYTE *buff, DWORD sector, UINT count)`
`46`	`46`	`{`
`47`	`47`	`ESP_LOGV(TAG, "ff_wl_write - pdrv=%i, sector=%i, count=%i", (unsigned int)pdrv, (unsigned int)sector, (unsigned int)count);`
`48`	`48`	`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)`
`60`	`60`	`return RES_OK;`
`61`	`61`	`}`
`62`	`62`
`63`		`-DRESULT ff_wl_ioctl (BYTE pdrv, BYTE cmd, void *buff)`
	`63`	`+static DRESULT ff_wl_ioctl (BYTE pdrv, BYTE cmd, void *buff)`
`64`	`64`	`{`
`65`	`65`	`wl_handle_t wl_handle = ff_wl_handles[pdrv];`
`66`	`66`	`ESP_LOGV(TAG, "ff_wl_ioctl: cmd=%i", cmd);`