alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'fix/sdmmc_io_rw_extended_unreachable_logic' into 'master'

Browse Source 
fix(sdmmc): Fix logically dead code in sdmmc_io_rw_extended

Closes IDF-10272

See merge request espressif/esp-idf!32217
This commit is contained in:
Adam Múdry 2024-07-19 18:59:04 +08:00
commit c52a4bd1d7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/sdmmc/sdmmc_io.c
View File

@ -364,7 +364,9 @@ esp_err_t sdmmc_io_rw_extended(sdmmc_card_t* card, int func,
err = sdmmc_send_cmd(card, &cmd);
if (arg & SD_ARG_CMD53_READ &&
// Cannot do a normal bitmask check (arg & SD_ARG_CMD53_READ)
// since SD_ARG_CMD53_READ (0<<31) is 0
if (!(arg & SD_ARG_CMD53_WRITE) &&
datalen > 0 && cmd.data == card->host.dma_aligned_buffer) {
assert(datalen <= SDMMC_IO_BLOCK_SIZE);
memcpy(datap, card->host.dma_aligned_buffer, datalen);
@ -672,7 +674,7 @@ static bool check_tuples_in_buffer(uint8_t* buf, int buffer_size, int* inout_cis
esp_err_t sdmmc_io_get_cis_data(sdmmc_card_t* card, uint8_t* out_buffer, size_t buffer_size, size_t* inout_cis_size)
{
esp_err_t ret = ESP_OK;
WORD_ALIGNED_ATTR uint8_t buf[CIS_GET_MINIMAL_SIZE];
WORD_ALIGNED_ATTR uint8_t buf[CIS_GET_MINIMAL_SIZE] = {0};
/* Pointer to size is a mandatory parameter */
assert(inout_cis_size);