From: Flavio Bayer <admin@anoniamto.com>
Date: Fri, 13 Apr 2018 19:34:23 +0000 (-0300)
Subject: bugfix/sdspi_host.c: wrong CD/WP pin configuration
X-Git-Tag: v3.1-beta1~225^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d477d3c5bd07d3627e7ef84786b47336c3aaac84;p=esp-idf

bugfix/sdspi_host.c: wrong CD/WP pin configuration

Looks like the configuration of CP and WP pins are wrong, since the check for `gpio_cd` and `gpio_wp` in `slot_config` seems to be swapped.
---

diff --git a/components/driver/sdspi_host.c b/components/driver/sdspi_host.c
index 5c9db7e46a..f47b590031 100644
--- a/components/driver/sdspi_host.c
+++ b/components/driver/sdspi_host.c
@@ -316,16 +316,16 @@ esp_err_t sdspi_host_init_slot(int slot, const sdspi_slot_config_t* slot_config)
     };
     if (slot_config->gpio_cd != SDSPI_SLOT_NO_CD) {
         io_conf.pin_bit_mask |= (1 << slot_config->gpio_cd);
-        s_slots[slot].gpio_wp = slot_config->gpio_wp;
+        s_slots[slot].gpio_cd = slot_config->gpio_cd;
     } else {
-        s_slots[slot].gpio_wp = GPIO_UNUSED;
+        s_slots[slot].gpio_cd = GPIO_UNUSED;
     }
 
     if (slot_config->gpio_wp != SDSPI_SLOT_NO_WP) {
         io_conf.pin_bit_mask |= (1 << slot_config->gpio_wp);
-        s_slots[slot].gpio_cd = slot_config->gpio_cd;
+        s_slots[slot].gpio_wp = slot_config->gpio_wp;
     } else {
-        s_slots[slot].gpio_cd = GPIO_UNUSED;
+        s_slots[slot].gpio_wp = GPIO_UNUSED;
     }
 
     if (io_conf.pin_bit_mask != 0) {