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

sdmmc: Use slot width as default slot_config width parameter, instead of 4

Browse Source 
Ref #361 https://github.com/espressif/esp-idf/pull/361
This commit is contained in:
Angus Gratton 2017-03-02 17:18:44 +11:00
parent a4a790030d
commit 6ee5a1e492
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/driver/include/driver/sdmmc_host.h
View File

@ -55,6 +55,7 @@ typedef struct {
#define SDMMC_SLOT_NO_CD ((gpio_num_t) -1) ///< indicates that card detect line is not used #define SDMMC_SLOT_NO_CD ((gpio_num_t) -1) ///< indicates that card detect line is not used
#define SDMMC_SLOT_NO_WP ((gpio_num_t) -1) ///< indicates that write protect line is not used #define SDMMC_SLOT_NO_WP ((gpio_num_t) -1) ///< indicates that write protect line is not used
#define SDMMC_SLOT_WIDTH_DEFAULT 0 ///< use the default width for the slot (8 for slot 0, 4 for slot 1)
/** /**
* Macro defining default configuration of SDMMC host slot * Macro defining default configuration of SDMMC host slot
@ -62,7 +63,7 @@ typedef struct {
#define SDMMC_SLOT_CONFIG_DEFAULT() {\ #define SDMMC_SLOT_CONFIG_DEFAULT() {\
.gpio_cd = SDMMC_SLOT_NO_CD, \ .gpio_cd = SDMMC_SLOT_NO_CD, \
.gpio_wp = SDMMC_SLOT_NO_WP, \ .gpio_wp = SDMMC_SLOT_NO_WP, \
.width = 4, \ .width = SDMMC_SLOT_WIDTH_DEFAULT, \
} }
/** /**

10
components/driver/sdmmc_host.c
View File

@ -299,22 +299,26 @@ esp_err_t sdmmc_host_init_slot(int slot, const sdmmc_slot_config_t* slot_config)
} }
int gpio_cd = slot_config->gpio_cd; int gpio_cd = slot_config->gpio_cd;
int gpio_wp = slot_config->gpio_wp; int gpio_wp = slot_config->gpio_wp;
uint8_t slot_width = slot_config->width;
// Configure pins // Configure pins
const sdmmc_slot_info_t* pslot = &s_slot_info[slot]; const sdmmc_slot_info_t* pslot = &s_slot_info[slot];
if (slot_config->width > pslot->width) { if (slot_width == SDMMC_SLOT_WIDTH_DEFAULT) {
slot_width = pslot->width;
}
else if (slot_width > pslot->width) {
return ESP_ERR_INVALID_ARG; return ESP_ERR_INVALID_ARG;
} }
configure_pin(pslot->clk); configure_pin(pslot->clk);
configure_pin(pslot->cmd); configure_pin(pslot->cmd);
configure_pin(pslot->d0); configure_pin(pslot->d0);
if (slot_config->width >= 4) { if (slot_width >= 4) {
configure_pin(pslot->d1); configure_pin(pslot->d1);
configure_pin(pslot->d2); configure_pin(pslot->d2);
configure_pin(pslot->d3); configure_pin(pslot->d3);
if (slot_config->width == 8) { if (slot_width == 8) {
configure_pin(pslot->d4); configure_pin(pslot->d4);
configure_pin(pslot->d5); configure_pin(pslot->d5);
configure_pin(pslot->d6); configure_pin(pslot->d6);

1
docs/api/storage/sdmmc.rst
View File

@ -79,6 +79,7 @@ Of all the funtions listed below, only ``sdmmc_host_init``, ``sdmmc_host_init_sl
.. doxygendefine:: SDMMC_HOST_SLOT_0 .. doxygendefine:: SDMMC_HOST_SLOT_0
.. doxygendefine:: SDMMC_HOST_SLOT_1 .. doxygendefine:: SDMMC_HOST_SLOT_1
.. doxygendefine:: SDMMC_HOST_DEFAULT .. doxygendefine:: SDMMC_HOST_DEFAULT
.. doxygendefine:: SDMMC_SLOT_WIDTH_DEFAULT
.. doxygenfunction:: sdmmc_host_init_slot .. doxygenfunction:: sdmmc_host_init_slot