summaryrefslogtreecommitdiff
path: root/lib/fatfs/diskio
diff options
context:
space:
mode:
Diffstat (limited to 'lib/fatfs/diskio')
-rw-r--r--lib/fatfs/diskio/diskio.c6
-rw-r--r--lib/fatfs/diskio/diskio_rawflash.c16
-rw-r--r--lib/fatfs/diskio/diskio_sdmmc.c18
-rw-r--r--lib/fatfs/diskio/diskio_sdmmc.h2
-rw-r--r--lib/fatfs/diskio/diskio_wl.c24
5 files changed, 33 insertions, 33 deletions
diff --git a/lib/fatfs/diskio/diskio.c b/lib/fatfs/diskio/diskio.c
index 4bafa7ea..7d39835f 100644
--- a/lib/fatfs/diskio/diskio.c
+++ b/lib/fatfs/diskio/diskio.c
@@ -1,10 +1,10 @@
/*-----------------------------------------------------------------------*/
/* Low level disk I/O module skeleton for FatFs (C)ChaN, 2016 */
-/* ESP-IDF port Copyright 2016 Espressif Systems (Shanghai) PTE LTD */
+/* ESP-IDF port Copyright 2016-2025 Espressif Systems (Shanghai) PTE LTD */
/*-----------------------------------------------------------------------*/
/* If a working storage control module is available, it should be */
/* attached to the FatFs via a glue function rather than modifying it. */
-/* This is an example of glue functions to attach various exsisting */
+/* This is an example of glue functions to attach various existing */
/* storage control modules to the FatFs module with a defined API. */
/*-----------------------------------------------------------------------*/
@@ -19,7 +19,7 @@
static ff_diskio_impl_t * s_impls[FF_VOLUMES] = { NULL };
#if FF_MULTI_PARTITION /* Multiple partition configuration */
-const PARTITION VolToPart[FF_VOLUMES] = {
+PARTITION VolToPart[FF_VOLUMES] = {
{0, 0}, /* Logical drive 0 ==> Physical drive 0, auto detection */
#if FF_VOLUMES > 1
{1, 0}, /* Logical drive 1 ==> Physical drive 1, auto detection */
diff --git a/lib/fatfs/diskio/diskio_rawflash.c b/lib/fatfs/diskio/diskio_rawflash.c
index 313aacec..4bc3eb8e 100644
--- a/lib/fatfs/diskio/diskio_rawflash.c
+++ b/lib/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,16 +84,16 @@ 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);
- assert(part);
+ assert(s_ff_raw_handles[pdrv]);
+
switch (cmd) {
case CTRL_SYNC:
return RES_OK;
diff --git a/lib/fatfs/diskio/diskio_sdmmc.c b/lib/fatfs/diskio/diskio_sdmmc.c
index 3e61eb00..689a07bc 100644
--- a/lib/fatfs/diskio/diskio_sdmmc.c
+++ b/lib/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,12 +34,12 @@ 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);
@@ -47,32 +47,32 @@ DSTATUS ff_sdmmc_status(BYTE 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);
esp_err_t err = sdmmc_read_sectors(card, buff, sector, count);
if (unlikely(err != ESP_OK)) {
- ESP_LOGE(TAG, "sdmmc_read_blocks failed (%d)", err);
+ ESP_LOGE(TAG, "sdmmc_read_blocks failed (0x%x)", err);
return RES_ERROR;
}
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);
esp_err_t err = sdmmc_write_sectors(card, buff, sector, count);
if (unlikely(err != ESP_OK)) {
- ESP_LOGE(TAG, "sdmmc_write_blocks failed (%d)", err);
+ ESP_LOGE(TAG, "sdmmc_write_blocks failed (0x%x)", err);
return RES_ERROR;
}
return RES_OK;
}
#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/lib/fatfs/diskio/diskio_sdmmc.h b/lib/fatfs/diskio/diskio_sdmmc.h
index 2ba4c2d9..d6c881ae 100644
--- a/lib/fatfs/diskio/diskio_sdmmc.h
+++ b/lib/fatfs/diskio/diskio_sdmmc.h
@@ -7,7 +7,7 @@
#pragma once
#include "sdmmc_cmd.h"
-#include "driver/sdmmc_defs.h"
+#include "sd_protocol_defs.h"
#ifdef __cplusplus
extern "C" {
diff --git a/lib/fatfs/diskio/diskio_wl.c b/lib/fatfs/diskio/diskio_wl.c
index 8e20290e..4852ca7a 100644
--- a/lib/fatfs/diskio/diskio_wl.c
+++ b/lib/fatfs/diskio/diskio_wl.c
@@ -1,5 +1,5 @@
/*
- * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -19,52 +19,52 @@ 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];
- assert(wl_handle + 1);
+ assert(wl_handle != WL_INVALID_HANDLE);
esp_err_t err = wl_read(wl_handle, sector * wl_sector_size(wl_handle), buff, count * wl_sector_size(wl_handle));
if (unlikely(err != ESP_OK)) {
- ESP_LOGE(TAG, "wl_read failed (%d)", err);
+ ESP_LOGE(TAG, "wl_read failed (0x%x)", err);
return RES_ERROR;
}
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];
- assert(wl_handle + 1);
+ assert(wl_handle != WL_INVALID_HANDLE);
esp_err_t err = wl_erase_range(wl_handle, sector * wl_sector_size(wl_handle), count * wl_sector_size(wl_handle));
if (unlikely(err != ESP_OK)) {
- ESP_LOGE(TAG, "wl_erase_range failed (%d)", err);
+ ESP_LOGE(TAG, "wl_erase_range failed (0x%x)", err);
return RES_ERROR;
}
err = wl_write(wl_handle, sector * wl_sector_size(wl_handle), buff, count * wl_sector_size(wl_handle));
if (unlikely(err != ESP_OK)) {
- ESP_LOGE(TAG, "wl_write failed (%d)", err);
+ ESP_LOGE(TAG, "wl_write failed (0x%x)", err);
return RES_ERROR;
}
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);
- assert(wl_handle + 1);
+ assert(wl_handle != WL_INVALID_HANDLE);
switch (cmd) {
case CTRL_SYNC:
return RES_OK;
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-29 15:44:53 +0000