Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/sdmmc_test' into 'master'

Browse source 
sdmmc: don't use high speed mode with SD over SPI

See merge request !1149
This commit is contained in:
Ivan Grokhotkov 2017-08-28 11:32:20 +08:00
parent ce03879300 631f552489
commit a4fe12cb6d
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
components/sdmmc/sdmmc_cmd.c
View file

@ -233,7 +233,7 @@ esp_err_t sdmmc_card_init(const sdmmc_host_t* config, sdmmc_card_t* card)
/* Wait for the card to be ready for data transfers */
uint32_t status = 0;
while (!host_is_spi(card) && !(status & MMC_R1_READY_FOR_DATA)) {
while (!is_spi && !(status & MMC_R1_READY_FOR_DATA)) {
// TODO: add some timeout here
uint32_t count = 0;
err = sdmmc_send_cmd_send_status(card, &status);
@ -249,7 +249,8 @@ esp_err_t sdmmc_card_init(const sdmmc_host_t* config, sdmmc_card_t* card)
* clock rate which both host and the card support, and switch to it.
*/
bool freq_switched = false;
if (config->max_freq_khz >= SDMMC_FREQ_HIGHSPEED) {
if (config->max_freq_khz >= SDMMC_FREQ_HIGHSPEED &&
!is_spi /* SPI doesn't support >26MHz in some cases */) {
/* This will determine if the card supports SWITCH_FUNC command,
* and high speed mode. If the cards supports both, this will enable
* high speed mode at the card side.

1
components/sdmmc/test/test_sd.c
View file

@ -164,7 +164,6 @@ TEST_CASE("can write and read back blocks", "[sd][test_env=UT_T1_SDMODE]")
TEST_CASE("can write and read back blocks(using SPI)", "[sdspi][test_env=UT_T1_SPIMODE]")
{
sdmmc_host_t config = SDSPI_HOST_DEFAULT();
config.max_freq_khz = SDMMC_FREQ_HIGHSPEED;
sdspi_slot_config_t slot_config = SDSPI_SLOT_CONFIG_DEFAULT();
TEST_ESP_OK(sdspi_host_init());
TEST_ESP_OK(sdspi_host_init_slot(config.slot, &slot_config));

5
docs/api-reference/storage/sdmmc.rst
View file

@ -106,6 +106,11 @@ SD SPI driver is represented using an ``sdmmc_host_t`` structure initialized usi
SD SPI driver APIs are very similar to SDMMC host APIs. As with the SDMMC host driver, only ``sdspi_host_init``, ``sdspi_host_init_slot``, and ``sdspi_host_deinit`` functions are normally used by the applications. Other functions are called by the protocol level driver via function pointers in ``sdmmc_host_t`` structure.
.. note:
SD over SPI does not support speeds above SDMMC_FREQ_DEFAULT due to a limitation of SPI driver.
.. doxygenfunction:: sdspi_host_init
.. doxygendefine:: SDSPI_HOST_DEFAULT