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

Merge branch 'contrib/github_pr_15247' into 'master'

Browse Source 
refactor(components/fatfs): replace assert expression (GitHub PR)

Closes IDFGH-14473

See merge request espressif/esp-idf!38194
This commit is contained in:
Tomas Rohlinek
2025-04-02 18:21:55 +08:00
parent 01ce024636 c399089248
commit f945dae618
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,7 @@ 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];
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)); 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)) { if (unlikely(err != ESP_OK)) {
ESP_LOGE(TAG, "wl_read failed (0x%x)", err); ESP_LOGE(TAG, "wl_read failed (0x%x)", err);
@@ -46,7 +46,7 @@ static DRESULT ff_wl_write (BYTE pdrv, const BYTE *buff, DWORD sector, UINT coun
{ {
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];
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)); 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)) { if (unlikely(err != ESP_OK)) {
ESP_LOGE(TAG, "wl_erase_range failed (0x%x)", err); ESP_LOGE(TAG, "wl_erase_range failed (0x%x)", err);
@@ -64,7 +64,7 @@ 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);
assert(wl_handle + 1); assert(wl_handle != WL_INVALID_HANDLE);
switch (cmd) { switch (cmd) {
case CTRL_SYNC: case CTRL_SYNC:
return RES_OK; return RES_OK;