Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compilation error, add missing gpio_periph.h header (IDFGH-2728) #4797

Merged
merged 1 commit into from
Feb 21, 2020
Merged

Conversation

nebkat
Copy link
Contributor

@nebkat nebkat commented Feb 18, 2020

Fixes following error that was introduced in c1d0daf:

In file included from /opt/esp-idf-sdk/components/esp_rom/include/esp32/rom/rtc.h:23,
                 from /opt/esp-idf-sdk/components/bootloader_support/include/bootloader_common.h:21,
                 from /opt/esp-idf-sdk/components/bootloader_support/src/esp32/bootloader_esp32.c:23:
/opt/esp-idf-sdk/components/bootloader_support/src/esp32/bootloader_esp32.c: In function 'bootloader_init_uart_console':
/opt/esp-idf-sdk/components/bootloader_support/src/esp32/bootloader_esp32.c:313:26: error: 'GPIO_PIN_MUX_REG' undeclared (first use in this function); did you mean 'GPIO_INPUT_GET'?
         PIN_INPUT_ENABLE(GPIO_PIN_MUX_REG[uart_rx_gpio]);
                          ^~~~~~~~~~~~~~~~
/opt/esp-idf-sdk/components/soc/soc/esp32/include/soc/soc.h:90:34: note: in definition of macro 'ETS_UNCACHED_ADDR'
 #define ETS_UNCACHED_ADDR(addr) (addr)
                                  ^~~~
/opt/esp-idf-sdk/components/soc/soc/esp32/include/soc/soc.h:191:13: note: in expansion of macro 'WRITE_PERI_REG'
             WRITE_PERI_REG((reg), (READ_PERI_REG(reg)|(mask)));                                                        \
             ^~~~~~~~~~~~~~
/opt/esp-idf-sdk/components/soc/soc/esp32/include/soc/io_mux_reg.h:76:50: note: in expansion of macro 'SET_PERI_REG_MASK'
 #define PIN_INPUT_ENABLE(PIN_NAME)               SET_PERI_REG_MASK(PIN_NAME,FUN_IE)
                                                  ^~~~~~~~~~~~~~~~~
/opt/esp-idf-sdk/components/bootloader_support/src/esp32/bootloader_esp32.c:313:9: note: in expansion of macro 'PIN_INPUT_ENABLE'
         PIN_INPUT_ENABLE(GPIO_PIN_MUX_REG[uart_rx_gpio]);
         ^~~~~~~~~~~~~~~~
/opt/esp-idf-sdk/components/bootloader_support/src/esp32/bootloader_esp32.c:313:26: note: each undeclared identifier is reported only once for each function it appears in
         PIN_INPUT_ENABLE(GPIO_PIN_MUX_REG[uart_rx_gpio]);
                          ^~~~~~~~~~~~~~~~
/opt/esp-idf-sdk/components/soc/soc/esp32/include/soc/soc.h:90:34: note: in definition of macro 'ETS_UNCACHED_ADDR'
 #define ETS_UNCACHED_ADDR(addr) (addr)
                                  ^~~~
/opt/esp-idf-sdk/components/soc/soc/esp32/include/soc/soc.h:191:13: note: in expansion of macro 'WRITE_PERI_REG'
             WRITE_PERI_REG((reg), (READ_PERI_REG(reg)|(mask)));                                                        \
             ^~~~~~~~~~~~~~
/opt/esp-idf-sdk/components/soc/soc/esp32/include/soc/io_mux_reg.h:76:50: note: in expansion of macro 'SET_PERI_REG_MASK'
 #define PIN_INPUT_ENABLE(PIN_NAME)               SET_PERI_REG_MASK(PIN_NAME,FUN_IE)
                                                  ^~~~~~~~~~~~~~~~~
/opt/esp-idf-sdk/components/bootloader_support/src/esp32/bootloader_esp32.c:313:9: note: in expansion of macro 'PIN_INPUT_ENABLE'
         PIN_INPUT_ENABLE(GPIO_PIN_MUX_REG[uart_rx_gpio]);
         ^~~~~~~~~~~~~~~~

@github-actions github-actions bot changed the title Fix compilation error, add missing gpio_periph.h header Fix compilation error, add missing gpio_periph.h header (IDFGH-2728) Feb 18, 2020
Copy link
Member

@igrr igrr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the PR. This is going to be merged soon along with similar changes for the ESP32-S2.

@espressif-bot espressif-bot merged commit d649ea9 into espressif:master Feb 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants