From 8f296da30c916ae6e73df742f7eaeb9296bc5152 Mon Sep 17 00:00:00 2001 From: boarchuz <46267286+boarchuz@users.noreply.github.com> Date: Tue, 27 Oct 2020 14:09:26 +1100 Subject: [PATCH] fix rtc_gpio_desc_t compilation error --- components/soc/esp32/rtc_io_periph.c | 2 +- components/soc/include/soc/rtc_io_periph.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/soc/esp32/rtc_io_periph.c b/components/soc/esp32/rtc_io_periph.c index dee0e6481b..9f8a864b9d 100644 --- a/components/soc/esp32/rtc_io_periph.c +++ b/components/soc/esp32/rtc_io_periph.c @@ -82,7 +82,7 @@ const rtc_io_desc_t rtc_io_desc[SOC_RTCIO_PIN_COUNT] = { #ifdef CONFIG_RTCIO_SUPPORT_RTC_GPIO_DESC //Reg,Mux,Fun,IE,Up,Down,Rtc_number -const rtc_gpio_desc_t rtc_gpio_desc[GPIO_PIN_COUNT] = { +const rtc_gpio_desc_t rtc_gpio_desc[SOC_GPIO_PIN_COUNT] = { {RTC_IO_TOUCH_PAD1_REG, RTC_IO_TOUCH_PAD1_MUX_SEL_M, RTC_IO_TOUCH_PAD1_FUN_SEL_S, RTC_IO_TOUCH_PAD1_FUN_IE_M, RTC_IO_TOUCH_PAD1_RUE_M, RTC_IO_TOUCH_PAD1_RDE_M, RTC_IO_TOUCH_PAD1_SLP_SEL_M, RTC_IO_TOUCH_PAD1_SLP_IE_M, RTC_IO_TOUCH_PAD1_HOLD_M, RTC_CNTL_TOUCH_PAD1_HOLD_FORCE_M, RTC_IO_TOUCH_PAD1_DRV_V, RTC_IO_TOUCH_PAD1_DRV_S, RTCIO_GPIO0_CHANNEL}, //0 {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1}, //1 {RTC_IO_TOUCH_PAD2_REG, RTC_IO_TOUCH_PAD2_MUX_SEL_M, RTC_IO_TOUCH_PAD2_FUN_SEL_S, RTC_IO_TOUCH_PAD2_FUN_IE_M, RTC_IO_TOUCH_PAD2_RUE_M, RTC_IO_TOUCH_PAD2_RDE_M, RTC_IO_TOUCH_PAD2_SLP_SEL_M, RTC_IO_TOUCH_PAD2_SLP_IE_M, RTC_IO_TOUCH_PAD2_HOLD_M, RTC_CNTL_TOUCH_PAD2_HOLD_FORCE_M, RTC_IO_TOUCH_PAD2_DRV_V, RTC_IO_TOUCH_PAD2_DRV_S, RTCIO_GPIO2_CHANNEL}, //2 diff --git a/components/soc/include/soc/rtc_io_periph.h b/components/soc/include/soc/rtc_io_periph.h index 570f103244..3bf77472ce 100644 --- a/components/soc/include/soc/rtc_io_periph.h +++ b/components/soc/include/soc/rtc_io_periph.h @@ -108,7 +108,7 @@ typedef struct { * This is an internal function of the driver, and is not usually useful * for external use. */ -extern const rtc_gpio_desc_t rtc_gpio_desc[GPIO_PIN_COUNT]; +extern const rtc_gpio_desc_t rtc_gpio_desc[SOC_GPIO_PIN_COUNT]; #endif // CONFIG_RTCIO_SUPPORT_RTC_GPIO_DESC