From ce5df79674aa3830b3fba2b43109dcf632c022b9 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Mon, 16 Jan 2017 21:12:13 +1100 Subject: [PATCH] SDK headers: Use new esp-idf signal name VSPICLK_OUT_IDX (#130) --- cores/esp32/esp32-hal-spi.c | 2 +- tools/sdk/include/esp32/soc/gpio_sig_map.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cores/esp32/esp32-hal-spi.c b/cores/esp32/esp32-hal-spi.c index 09052c6c..eecb7674 100644 --- a/cores/esp32/esp32-hal-spi.c +++ b/cores/esp32/esp32-hal-spi.c @@ -27,7 +27,7 @@ #include "soc/gpio_sig_map.h" #include "soc/dport_reg.h" -#define SPI_CLK_IDX(p) ((p==0)?SPICLK_OUT_IDX:((p==1)?SPICLK_OUT_IDX:((p==2)?HSPICLK_OUT_IDX:((p==3)?VSPICLK_OUT_MUX_IDX:0)))) +#define SPI_CLK_IDX(p) ((p==0)?SPICLK_OUT_IDX:((p==1)?SPICLK_OUT_IDX:((p==2)?HSPICLK_OUT_IDX:((p==3)?VSPICLK_OUT_IDX:0)))) #define SPI_MISO_IDX(p) ((p==0)?SPIQ_OUT_IDX:((p==1)?SPIQ_OUT_IDX:((p==2)?HSPIQ_OUT_IDX:((p==3)?VSPIQ_OUT_IDX:0)))) #define SPI_MOSI_IDX(p) ((p==0)?SPID_IN_IDX:((p==1)?SPID_IN_IDX:((p==2)?HSPID_IN_IDX:((p==3)?VSPID_IN_IDX:0)))) diff --git a/tools/sdk/include/esp32/soc/gpio_sig_map.h b/tools/sdk/include/esp32/soc/gpio_sig_map.h index 4d2943fb..1d3dc5b0 100644 --- a/tools/sdk/include/esp32/soc/gpio_sig_map.h +++ b/tools/sdk/include/esp32/soc/gpio_sig_map.h @@ -135,7 +135,7 @@ #define HSPICS2_IN_IDX 62 #define HSPICS2_OUT_IDX 62 #define VSPICLK_IN_IDX 63 -#define VSPICLK_OUT_MUX_IDX 63 +#define VSPICLK_OUT_IDX 63 #define VSPIQ_IN_IDX 64 #define VSPIQ_OUT_IDX 64 #define VSPID_IN_IDX 65