mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'contrib/github_pr_7710' into 'master' 

sdspi_host: fix clock being sent out before the bus is acquired (GitHub PR)

Closes IDFGH-6024

See merge request espressif/esp-idf!16851
pull/8396/head
Ivan Grokhotkov 2022-02-11 08:27:06 +00:00
rodzic b07dbc9e58 8bb95150bf
commit c372248624
1 zmienionych plików z 4 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
components/driver/sdspi_host.c
Wyświetl plik

@ -75,6 +75,8 @@ static esp_err_t start_command_default(slot_info_t *slot, int flags, sdspi_hw_cm
static esp_err_t shift_cmd_response(sdspi_hw_cmd_t *cmd, int sent_bytes); static esp_err_t shift_cmd_response(sdspi_hw_cmd_t *cmd, int sent_bytes);
static esp_err_t poll_busy(slot_info_t *slot, int timeout_ms, bool polling);
/// A few helper functions /// A few helper functions
/// Map handle to pointer of slot information /// Map handle to pointer of slot information
@ -435,6 +437,8 @@ esp_err_t sdspi_host_start_command(sdspi_dev_handle_t handle, sdspi_hw_cmd_t *cm
ESP_LOGV(TAG, "%s: slot=%i, CMD%d, arg=0x%08x flags=0x%x, data=%p, data_size=%i crc=0x%02x", ESP_LOGV(TAG, "%s: slot=%i, CMD%d, arg=0x%08x flags=0x%x, data=%p, data_size=%i crc=0x%02x",
__func__, handle, cmd_index, cmd_arg, flags, data, data_size, cmd->crc7); __func__, handle, cmd_index, cmd_arg, flags, data, data_size, cmd->crc7);
spi_device_acquire_bus(slot->spi_handle, portMAX_DELAY);
poll_busy(slot, 40, true);
// For CMD0, clock out 80 cycles to help the card enter idle state, // For CMD0, clock out 80 cycles to help the card enter idle state,
// *before* CS is asserted. // *before* CS is asserted.
@ -444,7 +448,6 @@ esp_err_t sdspi_host_start_command(sdspi_dev_handle_t handle, sdspi_hw_cmd_t *cm
// actual transaction // actual transaction
esp_err_t ret = ESP_OK; esp_err_t ret = ESP_OK;
spi_device_acquire_bus(slot->spi_handle, portMAX_DELAY);
cs_low(slot); cs_low(slot);
if (flags & SDSPI_CMD_FLAG_DATA) { if (flags & SDSPI_CMD_FLAG_DATA) {
const bool multi_block = flags & SDSPI_CMD_FLAG_MULTI_BLK; const bool multi_block = flags & SDSPI_CMD_FLAG_MULTI_BLK;