diff --git a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c2.c b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c2.c index 3028000aa7..374201d681 100644 --- a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c2.c +++ b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c2.c @@ -101,10 +101,10 @@ void IRAM_ATTR bootloader_configure_spi_pins(int drv) esp_rom_gpio_pad_set_drv(q_gpio_num, drv); esp_rom_gpio_pad_set_drv(d_gpio_num, drv); esp_rom_gpio_pad_set_drv(cs0_gpio_num, drv); - if (hd_gpio_num <= MAX_PAD_GPIO_NUM) { + if (hd_gpio_num < SOC_GPIO_PIN_COUNT) { esp_rom_gpio_pad_set_drv(hd_gpio_num, drv); } - if (wp_gpio_num <= MAX_PAD_GPIO_NUM) { + if (wp_gpio_num < SOC_GPIO_PIN_COUNT) { esp_rom_gpio_pad_set_drv(wp_gpio_num, drv); } } diff --git a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c3.c b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c3.c index c99ee89dc6..a13f1460e6 100644 --- a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c3.c +++ b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c3.c @@ -112,10 +112,10 @@ void IRAM_ATTR bootloader_configure_spi_pins(int drv) esp_rom_gpio_pad_set_drv(q_gpio_num, drv); esp_rom_gpio_pad_set_drv(d_gpio_num, drv); esp_rom_gpio_pad_set_drv(cs0_gpio_num, drv); - if (hd_gpio_num <= MAX_PAD_GPIO_NUM) { + if (hd_gpio_num < SOC_GPIO_PIN_COUNT) { esp_rom_gpio_pad_set_drv(hd_gpio_num, drv); } - if (wp_gpio_num <= MAX_PAD_GPIO_NUM) { + if (wp_gpio_num < SOC_GPIO_PIN_COUNT) { esp_rom_gpio_pad_set_drv(wp_gpio_num, drv); } } diff --git a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32s2.c b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32s2.c index 15b8c1350d..0139d5c98b 100644 --- a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32s2.c +++ b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32s2.c @@ -114,10 +114,10 @@ void IRAM_ATTR bootloader_configure_spi_pins(int drv) esp_rom_gpio_pad_set_drv(q_gpio_num, drv); esp_rom_gpio_pad_set_drv(d_gpio_num, drv); esp_rom_gpio_pad_set_drv(cs0_gpio_num, drv); - if (hd_gpio_num <= MAX_PAD_GPIO_NUM) { + if (hd_gpio_num < SOC_GPIO_PIN_COUNT) { esp_rom_gpio_pad_set_drv(hd_gpio_num, drv); } - if (wp_gpio_num <= MAX_PAD_GPIO_NUM) { + if (wp_gpio_num < SOC_GPIO_PIN_COUNT) { esp_rom_gpio_pad_set_drv(wp_gpio_num, drv); } } diff --git a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32s3.c b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32s3.c index f027fdc381..e24506db6e 100644 --- a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32s3.c +++ b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32s3.c @@ -125,10 +125,10 @@ void IRAM_ATTR bootloader_configure_spi_pins(int drv) esp_rom_gpio_pad_set_drv(q_gpio_num, drv); esp_rom_gpio_pad_set_drv(d_gpio_num, drv); esp_rom_gpio_pad_set_drv(cs0_gpio_num, drv); - if (hd_gpio_num <= MAX_PAD_GPIO_NUM) { + if (hd_gpio_num < SOC_GPIO_PIN_COUNT) { esp_rom_gpio_pad_set_drv(hd_gpio_num, drv); } - if (wp_gpio_num <= MAX_PAD_GPIO_NUM) { + if (wp_gpio_num < SOC_GPIO_PIN_COUNT) { esp_rom_gpio_pad_set_drv(wp_gpio_num, drv); } } diff --git a/components/esp_driver_gpio/include/driver/gpio.h b/components/esp_driver_gpio/include/driver/gpio.h index 7cbb8b0142..6c8a02458d 100644 --- a/components/esp_driver_gpio/include/driver/gpio.h +++ b/components/esp_driver_gpio/include/driver/gpio.h @@ -344,8 +344,11 @@ esp_err_t gpio_install_isr_service(int intr_alloc_flags); /** * @brief Uninstall the driver's GPIO ISR service, freeing related resources. + * + * @return + * - ESP_OK Success */ -void gpio_uninstall_isr_service(void); +esp_err_t gpio_uninstall_isr_service(void); /** * @brief Add ISR handler for the corresponding GPIO pin. diff --git a/components/esp_driver_gpio/src/gpio.c b/components/esp_driver_gpio/src/gpio.c index df11fb96a9..28cebb45b5 100644 --- a/components/esp_driver_gpio/src/gpio.c +++ b/components/esp_driver_gpio/src/gpio.c @@ -579,14 +579,14 @@ esp_err_t gpio_isr_handler_remove(gpio_num_t gpio_num) return ESP_OK; } -void gpio_uninstall_isr_service(void) +esp_err_t gpio_uninstall_isr_service(void) { gpio_isr_func_t *gpio_isr_func_free = NULL; gpio_isr_handle_t gpio_isr_handle_free = NULL; portENTER_CRITICAL(&gpio_context.gpio_spinlock); if (gpio_context.gpio_isr_func == NULL) { portEXIT_CRITICAL(&gpio_context.gpio_spinlock); - return; + return ESP_OK; } gpio_isr_func_free = gpio_context.gpio_isr_func; gpio_context.gpio_isr_func = NULL; @@ -596,7 +596,7 @@ void gpio_uninstall_isr_service(void) portEXIT_CRITICAL(&gpio_context.gpio_spinlock); esp_intr_free(gpio_isr_handle_free); free(gpio_isr_func_free); - return; + return ESP_OK; } static void gpio_isr_register_on_core_static(void *param) diff --git a/components/esp_rom/esp32/include/esp32/rom/gpio.h b/components/esp_rom/esp32/include/esp32/rom/gpio.h index 24570f19ef..6119ac2ff5 100644 --- a/components/esp_rom/esp32/include/esp32/rom/gpio.h +++ b/components/esp_rom/esp32/include/esp32/rom/gpio.h @@ -37,10 +37,10 @@ extern "C" { #define GPIO_REGID_TO_PINIDX(reg_id) ((reg_id) - GPIO_ID_PIN0) #define GPIO_OUTPUT_SET(gpio_no, bit_value) \ - ((gpio_no < 32) ? gpio_output_set(bit_value<>gpio_no)&BIT0) : ((gpio_input_get_high()>>(gpio_no - 32))&BIT0)) + ((gpio_no < 32) ? rom_gpio_output_set(bit_value<>gpio_no)&BIT0) : ((rom_gpio_input_get_high()>>(gpio_no - 32))&BIT0)) /** * @brief Change GPIO(0-31) pin output by setting, clearing, or disabling pins, GPIO0<->BIT(0). @@ -57,7 +57,7 @@ extern "C" { * * @return None */ -void gpio_output_set(uint32_t set_mask, uint32_t clear_mask, uint32_t enable_mask, uint32_t disable_mask); +void rom_gpio_output_set(uint32_t set_mask, uint32_t clear_mask, uint32_t enable_mask, uint32_t disable_mask); /** * @brief Change GPIO(32-39) pin output by setting, clearing, or disabling pins, GPIO32<->BIT(0). @@ -74,7 +74,7 @@ void gpio_output_set(uint32_t set_mask, uint32_t clear_mask, uint32_t enable_mas * * @return None */ -void gpio_output_set_high(uint32_t set_mask, uint32_t clear_mask, uint32_t enable_mask, uint32_t disable_mask); +void rom_gpio_output_set_high(uint32_t set_mask, uint32_t clear_mask, uint32_t enable_mask, uint32_t disable_mask); /** * @brief Sample the value of GPIO input pins(0-31) and returns a bitmask. @@ -83,7 +83,7 @@ void gpio_output_set_high(uint32_t set_mask, uint32_t clear_mask, uint32_t enabl * * @return uint32_t : bitmask for GPIO input pins, BIT(0) for GPIO0. */ -uint32_t gpio_input_get(void); +uint32_t rom_gpio_input_get(void); /** * @brief Sample the value of GPIO input pins(32-39) and returns a bitmask. @@ -92,7 +92,7 @@ uint32_t gpio_input_get(void); * * @return uint32_t : bitmask for GPIO input pins, BIT(0) for GPIO32. */ -uint32_t gpio_input_get_high(void); +uint32_t rom_gpio_input_get_high(void); /** * @brief set gpio input to a signal, one gpio can input to several signals. @@ -108,7 +108,7 @@ uint32_t gpio_input_get_high(void); * * @return None */ -void gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); +void rom_gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); /** * @brief set signal output to gpio, one signal can output to several gpios. @@ -124,7 +124,7 @@ void gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); * * @return None */ -void gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_inv); +void rom_gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_inv); /** * @brief Select pad as a gpio function from IOMUX. @@ -133,7 +133,7 @@ void gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_ * * @return None */ -void gpio_pad_select_gpio(uint8_t gpio_num); +void rom_gpio_pad_select_gpio(uint8_t gpio_num); /** * @brief Set pad driver capability. @@ -144,7 +144,7 @@ void gpio_pad_select_gpio(uint8_t gpio_num); * * @return None */ -void gpio_pad_set_drv(uint8_t gpio_num, uint8_t drv); +void rom_gpio_pad_set_drv(uint8_t gpio_num, uint8_t drv); /** * @brief Pull up the pad from gpio number. @@ -153,7 +153,7 @@ void gpio_pad_set_drv(uint8_t gpio_num, uint8_t drv); * * @return None */ -void gpio_pad_pullup(uint8_t gpio_num); +void rom_gpio_pad_pullup(uint8_t gpio_num); /** * @brief Pull down the pad from gpio number. @@ -162,7 +162,7 @@ void gpio_pad_pullup(uint8_t gpio_num); * * @return None */ -void gpio_pad_pulldown(uint8_t gpio_num); +void rom_gpio_pad_pulldown(uint8_t gpio_num); /** * @brief Unhold the pad from gpio number. @@ -171,7 +171,7 @@ void gpio_pad_pulldown(uint8_t gpio_num); * * @return None */ -void gpio_pad_unhold(uint8_t gpio_num); +void rom_gpio_pad_unhold(uint8_t gpio_num); /** * @brief Hold the pad from gpio number. @@ -180,7 +180,7 @@ void gpio_pad_unhold(uint8_t gpio_num); * * @return None */ -void gpio_pad_hold(uint8_t gpio_num); +void rom_gpio_pad_hold(uint8_t gpio_num); /** * @} diff --git a/components/esp_rom/esp32/ld/esp32.rom.api.ld b/components/esp_rom/esp32/ld/esp32.rom.api.ld index f09cc10453..1321113c17 100644 --- a/components/esp_rom/esp32/ld/esp32.rom.api.ld +++ b/components/esp_rom/esp32/ld/esp32.rom.api.ld @@ -8,12 +8,12 @@ PROVIDE ( esp_rom_crc32_be = crc32_be ); PROVIDE ( esp_rom_crc16_be = crc16_be ); PROVIDE ( esp_rom_crc8_be = crc8_be ); -PROVIDE ( esp_rom_gpio_pad_select_gpio = gpio_pad_select_gpio ); -PROVIDE ( esp_rom_gpio_pad_pullup_only = gpio_pad_pullup ); -PROVIDE ( esp_rom_gpio_pad_set_drv = gpio_pad_set_drv ); -PROVIDE ( esp_rom_gpio_pad_unhold = gpio_pad_unhold ); -PROVIDE ( esp_rom_gpio_connect_in_signal = gpio_matrix_in ); -PROVIDE ( esp_rom_gpio_connect_out_signal = gpio_matrix_out ); +PROVIDE ( esp_rom_gpio_pad_select_gpio = rom_gpio_pad_select_gpio ); +PROVIDE ( esp_rom_gpio_pad_pullup_only = rom_gpio_pad_pullup ); +PROVIDE ( esp_rom_gpio_pad_set_drv = rom_gpio_pad_set_drv ); +PROVIDE ( esp_rom_gpio_pad_unhold = rom_gpio_pad_unhold ); +PROVIDE ( esp_rom_gpio_connect_in_signal = rom_gpio_matrix_in ); +PROVIDE ( esp_rom_gpio_connect_out_signal = rom_gpio_matrix_out ); PROVIDE ( esp_rom_efuse_mac_address_crc8 = esp_crc8 ); PROVIDE ( esp_rom_efuse_get_flash_gpio_info = ets_efuse_get_spiconfig ); diff --git a/components/esp_rom/esp32/ld/esp32.rom.ld b/components/esp_rom/esp32/ld/esp32.rom.ld index 6cca533158..9c27c7746b 100644 --- a/components/esp_rom/esp32/ld/esp32.rom.ld +++ b/components/esp_rom/esp32/ld/esp32.rom.ld @@ -1503,18 +1503,18 @@ PROVIDE ( gpio_register_get = 0x40009cbc ); PROVIDE ( gpio_register_set = 0x40009bbc ); */ /* These are still part of that driver, but have been verified not to use static RAM, so they can be used. */ -PROVIDE ( gpio_output_set = 0x40009b24 ); -PROVIDE ( gpio_output_set_high = 0x40009b5c ); -PROVIDE ( gpio_input_get = 0x40009b88 ); -PROVIDE ( gpio_input_get_high = 0x40009b9c ); -PROVIDE ( gpio_matrix_in = 0x40009edc ); -PROVIDE ( gpio_matrix_out = 0x40009f0c ); -PROVIDE ( gpio_pad_select_gpio = 0x40009fdc ); -PROVIDE ( gpio_pad_set_drv = 0x4000a11c ); -PROVIDE ( gpio_pad_pulldown = 0x4000a348 ); -PROVIDE ( gpio_pad_pullup = 0x4000a22c ); -PROVIDE ( gpio_pad_hold = 0x4000a734 ); -PROVIDE ( gpio_pad_unhold = 0x4000a484 ); +PROVIDE ( rom_gpio_output_set = 0x40009b24 ); +PROVIDE ( rom_gpio_output_set_high = 0x40009b5c ); +PROVIDE ( rom_gpio_input_get = 0x40009b88 ); +PROVIDE ( rom_gpio_input_get_high = 0x40009b9c ); +PROVIDE ( rom_gpio_matrix_in = 0x40009edc ); +PROVIDE ( rom_gpio_matrix_out = 0x40009f0c ); +PROVIDE ( rom_gpio_pad_select_gpio = 0x40009fdc ); +PROVIDE ( rom_gpio_pad_set_drv = 0x4000a11c ); +PROVIDE ( rom_gpio_pad_pulldown = 0x4000a348 ); +PROVIDE ( rom_gpio_pad_pullup = 0x4000a22c ); +PROVIDE ( rom_gpio_pad_hold = 0x4000a734 ); +PROVIDE ( rom_gpio_pad_unhold = 0x4000a484 ); /* These functions are part of the non-os kernel (etsc). diff --git a/components/esp_rom/esp32c2/include/esp32c2/rom/gpio.h b/components/esp_rom/esp32c2/include/esp32c2/rom/gpio.h index d0a4521ac3..250c7afa7a 100644 --- a/components/esp_rom/esp32c2/include/esp32c2/rom/gpio.h +++ b/components/esp_rom/esp32c2/include/esp32c2/rom/gpio.h @@ -61,7 +61,7 @@ typedef enum { * * @return None */ -void gpio_output_set(uint32_t set_mask, uint32_t clear_mask, uint32_t enable_mask, uint32_t disable_mask); +void rom_gpio_output_set(uint32_t set_mask, uint32_t clear_mask, uint32_t enable_mask, uint32_t disable_mask); /** * @brief Sample the value of GPIO input pins(0-20) and returns a bitmask. @@ -70,7 +70,7 @@ void gpio_output_set(uint32_t set_mask, uint32_t clear_mask, uint32_t enable_mas * * @return uint32_t : bitmask for GPIO input pins, BIT(0) for GPIO0. */ -uint32_t gpio_input_get(void); +uint32_t rom_gpio_input_get(void); /** * @brief Set GPIO to wakeup the chip. @@ -82,7 +82,7 @@ uint32_t gpio_input_get(void); * * @return None */ -void gpio_pin_wakeup_enable(uint32_t i, GPIO_INT_TYPE intr_state); +void rom_gpio_pin_wakeup_enable(uint32_t i, GPIO_INT_TYPE intr_state); /** * @brief disable GPIOs to wakeup the chip. @@ -92,7 +92,7 @@ void gpio_pin_wakeup_enable(uint32_t i, GPIO_INT_TYPE intr_state); * * @return None */ -void gpio_pin_wakeup_disable(void); +void rom_gpio_pin_wakeup_disable(void); /** * @brief set gpio input to a signal, one gpio can input to several signals. @@ -107,7 +107,7 @@ void gpio_pin_wakeup_disable(void); * * @return None */ -void gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); +void rom_gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); /** * @brief set signal output to gpio, one signal can output to several gpios. @@ -123,7 +123,7 @@ void gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); * * @return None */ -void gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_inv); +void rom_gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_inv); /** * @brief Select pad as a gpio function from IOMUX. @@ -132,7 +132,7 @@ void gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_ * * @return None */ -void gpio_pad_select_gpio(uint32_t gpio_num); +void rom_gpio_pad_select_gpio(uint32_t gpio_num); /** * @brief Set pad driver capability. @@ -143,7 +143,7 @@ void gpio_pad_select_gpio(uint32_t gpio_num); * * @return None */ -void gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); +void rom_gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); /** * @brief Pull up the pad from gpio number. @@ -152,7 +152,7 @@ void gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); * * @return None */ -void gpio_pad_pullup(uint32_t gpio_num); +void rom_gpio_pad_pullup(uint32_t gpio_num); /** * @brief Pull down the pad from gpio number. @@ -161,7 +161,7 @@ void gpio_pad_pullup(uint32_t gpio_num); * * @return None */ -void gpio_pad_pulldown(uint32_t gpio_num); +void rom_gpio_pad_pulldown(uint32_t gpio_num); /** * @brief Unhold the pad from gpio number. @@ -170,7 +170,7 @@ void gpio_pad_pulldown(uint32_t gpio_num); * * @return None */ -void gpio_pad_unhold(uint32_t gpio_num); +void rom_gpio_pad_unhold(uint32_t gpio_num); /** * @brief Hold the pad from gpio number. @@ -179,7 +179,7 @@ void gpio_pad_unhold(uint32_t gpio_num); * * @return None */ -void gpio_pad_hold(uint32_t gpio_num); +void rom_gpio_pad_hold(uint32_t gpio_num); /** * @brief enable gpio pad input. @@ -188,7 +188,7 @@ void gpio_pad_hold(uint32_t gpio_num); * * @return None */ -void gpio_pad_input_enable(uint32_t gpio_num); +void rom_gpio_pad_input_enable(uint32_t gpio_num); /** * @brief disable gpio pad input. @@ -197,7 +197,7 @@ void gpio_pad_input_enable(uint32_t gpio_num); * * @return None */ -void gpio_pad_input_disable(uint32_t gpio_num); +void rom_gpio_pad_input_disable(uint32_t gpio_num); /** * @} diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.api.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.api.ld index f8a46d0e4c..e9c6eb95e9 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.api.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.api.ld @@ -12,12 +12,12 @@ PROVIDE ( esp_rom_crc32_be = crc32_be ); PROVIDE ( esp_rom_crc16_be = crc16_be ); PROVIDE ( esp_rom_crc8_be = crc8_be ); -PROVIDE ( esp_rom_gpio_pad_select_gpio = gpio_pad_select_gpio ); -PROVIDE ( esp_rom_gpio_pad_pullup_only = gpio_pad_pullup ); -PROVIDE ( esp_rom_gpio_pad_set_drv = gpio_pad_set_drv ); -PROVIDE ( esp_rom_gpio_pad_unhold = gpio_pad_unhold ); -PROVIDE ( esp_rom_gpio_connect_in_signal = gpio_matrix_in ); -PROVIDE ( esp_rom_gpio_connect_out_signal = gpio_matrix_out ); +PROVIDE ( esp_rom_gpio_pad_select_gpio = rom_gpio_pad_select_gpio ); +PROVIDE ( esp_rom_gpio_pad_pullup_only = rom_gpio_pad_pullup ); +PROVIDE ( esp_rom_gpio_pad_set_drv = rom_gpio_pad_set_drv ); +PROVIDE ( esp_rom_gpio_pad_unhold = rom_gpio_pad_unhold ); +PROVIDE ( esp_rom_gpio_connect_in_signal = rom_gpio_matrix_in ); +PROVIDE ( esp_rom_gpio_connect_out_signal = rom_gpio_matrix_out ); PROVIDE ( esp_rom_efuse_mac_address_crc8 = esp_crc8 ); PROVIDE ( esp_rom_efuse_is_secure_boot_enabled = ets_efuse_secure_boot_enabled ); diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld index 8808b00589..3dbe4a215a 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld @@ -358,23 +358,23 @@ ets_get_xtal_freq = 0x40000784; ***************************************/ /* Functions */ -gpio_input_get = 0x40000788; -gpio_matrix_in = 0x4000078c; -gpio_matrix_out = 0x40000790; -/* gpio_output_disable = 0x40000794; */ -/* gpio_output_enable = 0x40000798; */ -gpio_output_set = 0x4000079c; -gpio_pad_hold = 0x400007a0; -gpio_pad_input_disable = 0x400007a4; -gpio_pad_input_enable = 0x400007a8; -gpio_pad_pulldown = 0x400007ac; -gpio_pad_pullup = 0x400007b0; -gpio_pad_select_gpio = 0x400007b4; -gpio_pad_set_drv = 0x400007b8; -gpio_pad_unhold = 0x400007bc; -gpio_pin_wakeup_disable = 0x400007c0; -gpio_pin_wakeup_enable = 0x400007c4; -gpio_bypass_matrix_in = 0x400007c8; +rom_gpio_input_get = 0x40000788; +rom_gpio_matrix_in = 0x4000078c; +rom_gpio_matrix_out = 0x40000790; +rom_gpio_output_disable = 0x40000794; +rom_gpio_output_enable = 0x40000798; +rom_gpio_output_set = 0x4000079c; +rom_gpio_pad_hold = 0x400007a0; +rom_gpio_pad_input_disable = 0x400007a4; +rom_gpio_pad_input_enable = 0x400007a8; +rom_gpio_pad_pulldown = 0x400007ac; +rom_gpio_pad_pullup = 0x400007b0; +rom_gpio_pad_select_gpio = 0x400007b4; +rom_gpio_pad_set_drv = 0x400007b8; +rom_gpio_pad_unhold = 0x400007bc; +rom_gpio_pin_wakeup_disable = 0x400007c0; +rom_gpio_pin_wakeup_enable = 0x400007c4; +rom_gpio_bypass_matrix_in = 0x400007c8; /*************************************** diff --git a/components/esp_rom/esp32c3/include/esp32c3/rom/gpio.h b/components/esp_rom/esp32c3/include/esp32c3/rom/gpio.h index 868235ffc8..b927d0356f 100644 --- a/components/esp_rom/esp32c3/include/esp32c3/rom/gpio.h +++ b/components/esp_rom/esp32c3/include/esp32c3/rom/gpio.h @@ -61,7 +61,7 @@ typedef enum { * * @return None */ -void gpio_output_set(uint32_t set_mask, uint32_t clear_mask, uint32_t enable_mask, uint32_t disable_mask); +void rom_gpio_output_set(uint32_t set_mask, uint32_t clear_mask, uint32_t enable_mask, uint32_t disable_mask); /** * @brief Sample the value of GPIO input pins(0-21) and returns a bitmask. @@ -70,7 +70,7 @@ void gpio_output_set(uint32_t set_mask, uint32_t clear_mask, uint32_t enable_mas * * @return uint32_t : bitmask for GPIO input pins, BIT(0) for GPIO0. */ -uint32_t gpio_input_get(void); +uint32_t rom_gpio_input_get(void); /** * @brief Set GPIO to wakeup the chip. @@ -82,7 +82,7 @@ uint32_t gpio_input_get(void); * * @return None */ -void gpio_pin_wakeup_enable(uint32_t i, GPIO_INT_TYPE intr_state); +void rom_gpio_pin_wakeup_enable(uint32_t i, GPIO_INT_TYPE intr_state); /** * @brief disable GPIOs to wakeup the chip. @@ -92,7 +92,7 @@ void gpio_pin_wakeup_enable(uint32_t i, GPIO_INT_TYPE intr_state); * * @return None */ -void gpio_pin_wakeup_disable(void); +void rom_gpio_pin_wakeup_disable(void); /** * @brief set gpio input to a signal, one gpio can input to several signals. @@ -107,7 +107,7 @@ void gpio_pin_wakeup_disable(void); * * @return None */ -void gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); +void rom_gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); /** * @brief set signal output to gpio, one signal can output to several gpios. @@ -123,7 +123,7 @@ void gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); * * @return None */ -void gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_inv); +void rom_gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_inv); /** * @brief Select pad as a gpio function from IOMUX. @@ -132,7 +132,7 @@ void gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_ * * @return None */ -void gpio_pad_select_gpio(uint32_t gpio_num); +void rom_gpio_pad_select_gpio(uint32_t gpio_num); /** * @brief Set pad driver capability. @@ -143,7 +143,7 @@ void gpio_pad_select_gpio(uint32_t gpio_num); * * @return None */ -void gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); +void rom_gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); /** * @brief Pull up the pad from gpio number. @@ -152,7 +152,7 @@ void gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); * * @return None */ -void gpio_pad_pullup(uint32_t gpio_num); +void rom_gpio_pad_pullup(uint32_t gpio_num); /** * @brief Pull down the pad from gpio number. @@ -161,7 +161,7 @@ void gpio_pad_pullup(uint32_t gpio_num); * * @return None */ -void gpio_pad_pulldown(uint32_t gpio_num); +void rom_gpio_pad_pulldown(uint32_t gpio_num); /** * @brief Unhold the pad from gpio number. @@ -170,7 +170,7 @@ void gpio_pad_pulldown(uint32_t gpio_num); * * @return None */ -void gpio_pad_unhold(uint32_t gpio_num); +void rom_gpio_pad_unhold(uint32_t gpio_num); /** * @brief Hold the pad from gpio number. @@ -179,7 +179,7 @@ void gpio_pad_unhold(uint32_t gpio_num); * * @return None */ -void gpio_pad_hold(uint32_t gpio_num); +void rom_gpio_pad_hold(uint32_t gpio_num); /** * @brief enable gpio pad input. @@ -188,7 +188,7 @@ void gpio_pad_hold(uint32_t gpio_num); * * @return None */ -void gpio_pad_input_enable(uint32_t gpio_num); +void rom_gpio_pad_input_enable(uint32_t gpio_num); /** * @brief disable gpio pad input. @@ -197,7 +197,7 @@ void gpio_pad_input_enable(uint32_t gpio_num); * * @return None */ -void gpio_pad_input_disable(uint32_t gpio_num); +void rom_gpio_pad_input_disable(uint32_t gpio_num); /** * @} diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.api.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.api.ld index c7cf3573b8..a1b8713c2f 100644 --- a/components/esp_rom/esp32c3/ld/esp32c3.rom.api.ld +++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.api.ld @@ -8,12 +8,12 @@ PROVIDE ( esp_rom_crc32_be = crc32_be ); PROVIDE ( esp_rom_crc16_be = crc16_be ); PROVIDE ( esp_rom_crc8_be = crc8_be ); -PROVIDE ( esp_rom_gpio_pad_select_gpio = gpio_pad_select_gpio ); -PROVIDE ( esp_rom_gpio_pad_pullup_only = gpio_pad_pullup ); -PROVIDE ( esp_rom_gpio_pad_set_drv = gpio_pad_set_drv ); -PROVIDE ( esp_rom_gpio_pad_unhold = gpio_pad_unhold ); -PROVIDE ( esp_rom_gpio_connect_in_signal = gpio_matrix_in ); -PROVIDE ( esp_rom_gpio_connect_out_signal = gpio_matrix_out ); +PROVIDE ( esp_rom_gpio_pad_select_gpio = rom_gpio_pad_select_gpio ); +PROVIDE ( esp_rom_gpio_pad_pullup_only = rom_gpio_pad_pullup ); +PROVIDE ( esp_rom_gpio_pad_set_drv = rom_gpio_pad_set_drv ); +PROVIDE ( esp_rom_gpio_pad_unhold = rom_gpio_pad_unhold ); +PROVIDE ( esp_rom_gpio_connect_in_signal = rom_gpio_matrix_in ); +PROVIDE ( esp_rom_gpio_connect_out_signal = rom_gpio_matrix_out ); PROVIDE ( esp_rom_efuse_mac_address_crc8 = esp_crc8 ); PROVIDE ( esp_rom_efuse_get_flash_gpio_info = ets_efuse_get_spiconfig ); diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld index 44cda153ad..3f7198e10b 100644 --- a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld +++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld @@ -363,23 +363,23 @@ ets_get_xtal_freq = 0x40000598; ***************************************/ /* Functions */ -gpio_input_get = 0x4000059c; -gpio_matrix_in = 0x400005a0; -gpio_matrix_out = 0x400005a4; -/* gpio_output_disable = 0x400005a8; */ -/* gpio_output_enable = 0x400005ac; */ -gpio_output_set = 0x400005b0; -gpio_pad_hold = 0x400005b4; -gpio_pad_input_disable = 0x400005b8; -gpio_pad_input_enable = 0x400005bc; -gpio_pad_pulldown = 0x400005c0; -gpio_pad_pullup = 0x400005c4; -gpio_pad_select_gpio = 0x400005c8; -gpio_pad_set_drv = 0x400005cc; -gpio_pad_unhold = 0x400005d0; -gpio_pin_wakeup_disable = 0x400005d4; -gpio_pin_wakeup_enable = 0x400005d8; -gpio_bypass_matrix_in = 0x400005dc; +rom_gpio_input_get = 0x4000059c; +rom_gpio_matrix_in = 0x400005a0; +rom_gpio_matrix_out = 0x400005a4; +rom_gpio_output_disable = 0x400005a8; +rom_gpio_output_enable = 0x400005ac; +rom_gpio_output_set = 0x400005b0; +rom_gpio_pad_hold = 0x400005b4; +rom_gpio_pad_input_disable = 0x400005b8; +rom_gpio_pad_input_enable = 0x400005bc; +rom_gpio_pad_pulldown = 0x400005c0; +rom_gpio_pad_pullup = 0x400005c4; +rom_gpio_pad_select_gpio = 0x400005c8; +rom_gpio_pad_set_drv = 0x400005cc; +rom_gpio_pad_unhold = 0x400005d0; +rom_gpio_pin_wakeup_disable = 0x400005d4; +rom_gpio_pin_wakeup_enable = 0x400005d8; +rom_gpio_bypass_matrix_in = 0x400005dc; /*************************************** diff --git a/components/esp_rom/esp32c5/include/esp32c5/rom/gpio.h b/components/esp_rom/esp32c5/include/esp32c5/rom/gpio.h index 321b1d7923..0d99c3607c 100644 --- a/components/esp_rom/esp32c5/include/esp32c5/rom/gpio.h +++ b/components/esp_rom/esp32c5/include/esp32c5/rom/gpio.h @@ -40,7 +40,7 @@ extern "C" { * @param gpio_num GPIO number * @param level Output level, 0:low; 1:high */ -void gpio_set_output_level(uint32_t gpio_num, uint32_t level); +void rom_gpio_set_output_level(uint32_t gpio_num, uint32_t level); /** * @brief Get GPIO input level @@ -49,7 +49,7 @@ void gpio_set_output_level(uint32_t gpio_num, uint32_t level); * * @return 0:the GPIO_input level is low; 1:the GPIO input level is high */ -uint32_t gpio_get_input_level(uint32_t gpio_num); +uint32_t rom_gpio_get_input_level(uint32_t gpio_num); /** * @brief set gpio input to a signal, one gpio can input to several signals. @@ -64,7 +64,7 @@ uint32_t gpio_get_input_level(uint32_t gpio_num); * * @return None */ -void gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); +void rom_gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); /** * @brief set signal output to gpio, one signal can output to several gpios. @@ -80,7 +80,7 @@ void gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); * * @return None */ -void gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_inv); +void rom_gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_inv); /** * @brief Select pad as a gpio function from IOMUX. @@ -89,7 +89,7 @@ void gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_ * * @return None */ -void gpio_pad_select_gpio(uint32_t gpio_num); +void rom_gpio_pad_select_gpio(uint32_t gpio_num); /** * @brief Set pad driver capability. @@ -100,7 +100,7 @@ void gpio_pad_select_gpio(uint32_t gpio_num); * * @return None */ -void gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); +void rom_gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); /** * @brief Pull up the pad from gpio number. @@ -109,7 +109,7 @@ void gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); * * @return None */ -void gpio_pad_pullup(uint32_t gpio_num); +void rom_gpio_pad_pullup(uint32_t gpio_num); /** * @brief Pull down the pad from gpio number. @@ -118,7 +118,7 @@ void gpio_pad_pullup(uint32_t gpio_num); * * @return None */ -void gpio_pad_pulldown(uint32_t gpio_num); +void rom_gpio_pad_pulldown(uint32_t gpio_num); /** * @brief Unhold the pad from gpio number. @@ -127,7 +127,7 @@ void gpio_pad_pulldown(uint32_t gpio_num); * * @return None */ -void gpio_pad_unhold(uint32_t gpio_num); +void rom_gpio_pad_unhold(uint32_t gpio_num); /** * @brief Hold the pad from gpio number. @@ -136,7 +136,7 @@ void gpio_pad_unhold(uint32_t gpio_num); * * @return None */ -void gpio_pad_hold(uint32_t gpio_num); +void rom_gpio_pad_hold(uint32_t gpio_num); /** * @brief enable gpio pad input. @@ -145,7 +145,7 @@ void gpio_pad_hold(uint32_t gpio_num); * * @return None */ -void gpio_pad_input_enable(uint32_t gpio_num); +void rom_gpio_pad_input_enable(uint32_t gpio_num); /** * @brief disable gpio pad input. @@ -154,7 +154,7 @@ void gpio_pad_input_enable(uint32_t gpio_num); * * @return None */ -void gpio_pad_input_disable(uint32_t gpio_num); +void rom_gpio_pad_input_disable(uint32_t gpio_num); /** * @} diff --git a/components/esp_rom/esp32c5/ld/esp32c5.rom.api.ld b/components/esp_rom/esp32c5/ld/esp32c5.rom.api.ld index a75eccc3c0..2062c57061 100644 --- a/components/esp_rom/esp32c5/ld/esp32c5.rom.api.ld +++ b/components/esp_rom/esp32c5/ld/esp32c5.rom.api.ld @@ -13,12 +13,12 @@ PROVIDE ( esp_rom_crc32_be = crc32_be ); PROVIDE ( esp_rom_crc16_be = crc16_be ); PROVIDE ( esp_rom_crc8_be = crc8_be ); -PROVIDE ( esp_rom_gpio_pad_select_gpio = gpio_pad_select_gpio ); -PROVIDE ( esp_rom_gpio_pad_pullup_only = gpio_pad_pullup ); -PROVIDE ( esp_rom_gpio_pad_set_drv = gpio_pad_set_drv ); -PROVIDE ( esp_rom_gpio_pad_unhold = gpio_pad_unhold ); -PROVIDE ( esp_rom_gpio_connect_in_signal = gpio_matrix_in ); -PROVIDE ( esp_rom_gpio_connect_out_signal = gpio_matrix_out ); +PROVIDE ( esp_rom_gpio_pad_select_gpio = rom_gpio_pad_select_gpio ); +PROVIDE ( esp_rom_gpio_pad_pullup_only = rom_gpio_pad_pullup ); +PROVIDE ( esp_rom_gpio_pad_set_drv = rom_gpio_pad_set_drv ); +PROVIDE ( esp_rom_gpio_pad_unhold = rom_gpio_pad_unhold ); +PROVIDE ( esp_rom_gpio_connect_in_signal = rom_gpio_matrix_in ); +PROVIDE ( esp_rom_gpio_connect_out_signal = rom_gpio_matrix_out ); PROVIDE ( esp_rom_efuse_mac_address_crc8 = esp_crc8 ); PROVIDE ( esp_rom_efuse_is_secure_boot_enabled = ets_efuse_secure_boot_enabled ); diff --git a/components/esp_rom/esp32c5/ld/esp32c5.rom.ld b/components/esp_rom/esp32c5/ld/esp32c5.rom.ld index a4bb7e2ddf..0a97095219 100644 --- a/components/esp_rom/esp32c5/ld/esp32c5.rom.ld +++ b/components/esp_rom/esp32c5/ld/esp32c5.rom.ld @@ -253,21 +253,21 @@ ets_clk_get_cpu_freq = 0x40000704; ***************************************/ /* Functions */ -gpio_set_output_level = 0x40000708; -gpio_get_input_level = 0x4000070c; -gpio_matrix_in = 0x40000710; -gpio_matrix_out = 0x40000714; -gpio_bypass_matrix_in = 0x40000718; -/* gpio_output_disable = 0x4000071c; */ -/* gpio_output_enable = 0x40000720; */ -gpio_pad_input_disable = 0x40000724; -gpio_pad_input_enable = 0x40000728; -gpio_pad_pulldown = 0x4000072c; -gpio_pad_pullup = 0x40000730; -gpio_pad_select_gpio = 0x40000734; -gpio_pad_set_drv = 0x40000738; -gpio_pad_unhold = 0x4000073c; -gpio_pad_hold = 0x40000740; +rom_gpio_set_output_level = 0x40000708; +rom_gpio_get_input_level = 0x4000070c; +rom_gpio_matrix_in = 0x40000710; +rom_gpio_matrix_out = 0x40000714; +rom_gpio_bypass_matrix_in = 0x40000718; +rom_gpio_output_disable = 0x4000071c; +rom_gpio_output_enable = 0x40000720; +rom_gpio_pad_input_disable = 0x40000724; +rom_gpio_pad_input_enable = 0x40000728; +rom_gpio_pad_pulldown = 0x4000072c; +rom_gpio_pad_pullup = 0x40000730; +rom_gpio_pad_select_gpio = 0x40000734; +rom_gpio_pad_set_drv = 0x40000738; +rom_gpio_pad_unhold = 0x4000073c; +rom_gpio_pad_hold = 0x40000740; /*************************************** diff --git a/components/esp_rom/esp32c6/include/esp32c6/rom/gpio.h b/components/esp_rom/esp32c6/include/esp32c6/rom/gpio.h index 935cbd1e97..6395e4e86c 100644 --- a/components/esp_rom/esp32c6/include/esp32c6/rom/gpio.h +++ b/components/esp_rom/esp32c6/include/esp32c6/rom/gpio.h @@ -61,7 +61,7 @@ typedef enum { * * @return None */ -void gpio_output_set(uint32_t set_mask, uint32_t clear_mask, uint32_t enable_mask, uint32_t disable_mask); +void rom_gpio_output_set(uint32_t set_mask, uint32_t clear_mask, uint32_t enable_mask, uint32_t disable_mask); /** * @brief Sample the value of GPIO input pins(0-30) and returns a bitmask. @@ -69,7 +69,7 @@ void gpio_output_set(uint32_t set_mask, uint32_t clear_mask, uint32_t enable_mas * * @return uint32_t : bitmask for GPIO input pins, BIT(0) for GPIO0. */ -uint32_t gpio_input_get(void); +uint32_t rom_gpio_input_get(void); /** * @brief Set GPIO to wakeup the chip. @@ -81,7 +81,7 @@ uint32_t gpio_input_get(void); * * @return None */ -void gpio_pin_wakeup_enable(uint32_t i, GPIO_INT_TYPE intr_state); +void rom_gpio_pin_wakeup_enable(uint32_t i, GPIO_INT_TYPE intr_state); /** * @brief disable GPIOs to wakeup the chip. @@ -91,7 +91,7 @@ void gpio_pin_wakeup_enable(uint32_t i, GPIO_INT_TYPE intr_state); * * @return None */ -void gpio_pin_wakeup_disable(void); +void rom_gpio_pin_wakeup_disable(void); /** * @brief set gpio input to a signal, one gpio can input to several signals. @@ -107,7 +107,7 @@ void gpio_pin_wakeup_disable(void); * * @return None */ -void gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); +void rom_gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); /** * @brief set signal output to gpio, one signal can output to several gpios. @@ -123,7 +123,7 @@ void gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); * * @return None */ -void gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_inv); +void rom_gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_inv); /** * @brief Select pad as a gpio function from IOMUX. @@ -132,7 +132,7 @@ void gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_ * * @return None */ -void gpio_pad_select_gpio(uint32_t gpio_num); +void rom_gpio_pad_select_gpio(uint32_t gpio_num); /** * @brief Set pad driver capability. @@ -143,7 +143,7 @@ void gpio_pad_select_gpio(uint32_t gpio_num); * * @return None */ -void gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); +void rom_gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); /** * @brief Pull up the pad from gpio number. @@ -152,7 +152,7 @@ void gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); * * @return None */ -void gpio_pad_pullup(uint32_t gpio_num); +void rom_gpio_pad_pullup(uint32_t gpio_num); /** * @brief Pull down the pad from gpio number. @@ -161,7 +161,7 @@ void gpio_pad_pullup(uint32_t gpio_num); * * @return None */ -void gpio_pad_pulldown(uint32_t gpio_num); +void rom_gpio_pad_pulldown(uint32_t gpio_num); /** * @brief Unhold the pad from gpio number. @@ -170,7 +170,7 @@ void gpio_pad_pulldown(uint32_t gpio_num); * * @return None */ -void gpio_pad_unhold(uint32_t gpio_num); +void rom_gpio_pad_unhold(uint32_t gpio_num); /** * @brief Hold the pad from gpio number. @@ -179,7 +179,7 @@ void gpio_pad_unhold(uint32_t gpio_num); * * @return None */ -void gpio_pad_hold(uint32_t gpio_num); +void rom_gpio_pad_hold(uint32_t gpio_num); /** * @brief enable gpio pad input. @@ -188,7 +188,7 @@ void gpio_pad_hold(uint32_t gpio_num); * * @return None */ -void gpio_pad_input_enable(uint32_t gpio_num); +void rom_gpio_pad_input_enable(uint32_t gpio_num); /** * @brief disable gpio pad input. @@ -197,7 +197,7 @@ void gpio_pad_input_enable(uint32_t gpio_num); * * @return None */ -void gpio_pad_input_disable(uint32_t gpio_num); +void rom_gpio_pad_input_disable(uint32_t gpio_num); /** * @} diff --git a/components/esp_rom/esp32c6/ld/esp32c6.rom.api.ld b/components/esp_rom/esp32c6/ld/esp32c6.rom.api.ld index 421134e7c2..bff5be9ac8 100644 --- a/components/esp_rom/esp32c6/ld/esp32c6.rom.api.ld +++ b/components/esp_rom/esp32c6/ld/esp32c6.rom.api.ld @@ -13,12 +13,12 @@ PROVIDE ( esp_rom_crc32_be = crc32_be ); PROVIDE ( esp_rom_crc16_be = crc16_be ); PROVIDE ( esp_rom_crc8_be = crc8_be ); -PROVIDE ( esp_rom_gpio_pad_select_gpio = gpio_pad_select_gpio ); -PROVIDE ( esp_rom_gpio_pad_pullup_only = gpio_pad_pullup ); -PROVIDE ( esp_rom_gpio_pad_set_drv = gpio_pad_set_drv ); -PROVIDE ( esp_rom_gpio_pad_unhold = gpio_pad_unhold ); -PROVIDE ( esp_rom_gpio_connect_in_signal = gpio_matrix_in ); -PROVIDE ( esp_rom_gpio_connect_out_signal = gpio_matrix_out ); +PROVIDE ( esp_rom_gpio_pad_select_gpio = rom_gpio_pad_select_gpio ); +PROVIDE ( esp_rom_gpio_pad_pullup_only = rom_gpio_pad_pullup ); +PROVIDE ( esp_rom_gpio_pad_set_drv = rom_gpio_pad_set_drv ); +PROVIDE ( esp_rom_gpio_pad_unhold = rom_gpio_pad_unhold ); +PROVIDE ( esp_rom_gpio_connect_in_signal = rom_gpio_matrix_in ); +PROVIDE ( esp_rom_gpio_connect_out_signal = rom_gpio_matrix_out ); PROVIDE ( esp_rom_efuse_mac_address_crc8 = esp_crc8 ); PROVIDE ( esp_rom_efuse_is_secure_boot_enabled = ets_efuse_secure_boot_enabled ); diff --git a/components/esp_rom/esp32c6/ld/esp32c6.rom.ld b/components/esp_rom/esp32c6/ld/esp32c6.rom.ld index 79737553fe..18fcdaf40b 100644 --- a/components/esp_rom/esp32c6/ld/esp32c6.rom.ld +++ b/components/esp_rom/esp32c6/ld/esp32c6.rom.ld @@ -235,23 +235,23 @@ ets_clk_mspi_apb_wait_ready = 0x400006d0; ***************************************/ /* Functions */ -gpio_input_get = 0x400006d4; -gpio_matrix_in = 0x400006d8; -gpio_matrix_out = 0x400006dc; -/* gpio_output_disable = 0x400006e0; */ -/* gpio_output_enable = 0x400006e4; */ -gpio_output_set = 0x400006e8; -gpio_pad_hold = 0x400006ec; -gpio_pad_input_disable = 0x400006f0; -gpio_pad_input_enable = 0x400006f4; -gpio_pad_pulldown = 0x400006f8; -gpio_pad_pullup = 0x400006fc; -gpio_pad_select_gpio = 0x40000700; -gpio_pad_set_drv = 0x40000704; -gpio_pad_unhold = 0x40000708; -gpio_pin_wakeup_disable = 0x4000070c; -gpio_pin_wakeup_enable = 0x40000710; -gpio_bypass_matrix_in = 0x40000714; +rom_gpio_input_get = 0x400006d4; +rom_gpio_matrix_in = 0x400006d8; +rom_gpio_matrix_out = 0x400006dc; +rom_gpio_output_disable = 0x400006e0; +rom_gpio_output_enable = 0x400006e4; +rom_gpio_output_set = 0x400006e8; +rom_gpio_pad_hold = 0x400006ec; +rom_gpio_pad_input_disable = 0x400006f0; +rom_gpio_pad_input_enable = 0x400006f4; +rom_gpio_pad_pulldown = 0x400006f8; +rom_gpio_pad_pullup = 0x400006fc; +rom_gpio_pad_select_gpio = 0x40000700; +rom_gpio_pad_set_drv = 0x40000704; +rom_gpio_pad_unhold = 0x40000708; +rom_gpio_pin_wakeup_disable = 0x4000070c; +rom_gpio_pin_wakeup_enable = 0x40000710; +rom_gpio_bypass_matrix_in = 0x40000714; /*************************************** diff --git a/components/esp_rom/esp32c61/include/esp32c61/rom/gpio.h b/components/esp_rom/esp32c61/include/esp32c61/rom/gpio.h index 9ba44accc7..f20577aa45 100644 --- a/components/esp_rom/esp32c61/include/esp32c61/rom/gpio.h +++ b/components/esp_rom/esp32c61/include/esp32c61/rom/gpio.h @@ -40,7 +40,7 @@ extern "C" { * @param gpio_num GPIO number * @param level Output level, 0:low; 1:high */ -void gpio_set_output_level(uint32_t gpio_num, uint32_t level); +void rom_gpio_set_output_level(uint32_t gpio_num, uint32_t level); /** * @brief Get GPIO input level @@ -49,7 +49,7 @@ void gpio_set_output_level(uint32_t gpio_num, uint32_t level); * * @return 0:the GPIO_input level is low; 1:the GPIO input level is high */ -uint32_t gpio_get_input_level(uint32_t gpio_num); +uint32_t rom_gpio_get_input_level(uint32_t gpio_num); /** * @brief set gpio input to a signal, one gpio can input to several signals. @@ -64,7 +64,7 @@ uint32_t gpio_get_input_level(uint32_t gpio_num); * * @return None */ -void gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); +void rom_gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); /** * @brief set signal output to gpio, one signal can output to several gpios. @@ -80,7 +80,7 @@ void gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); * * @return None */ -void gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_inv); +void rom_gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_inv); /** * @brief Select pad as a gpio function from IOMUX. @@ -89,7 +89,7 @@ void gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_ * * @return None */ -void gpio_pad_select_gpio(uint32_t gpio_num); +void rom_gpio_pad_select_gpio(uint32_t gpio_num); /** * @brief Set pad driver capability. @@ -100,7 +100,7 @@ void gpio_pad_select_gpio(uint32_t gpio_num); * * @return None */ -void gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); +void rom_gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); /** * @brief Pull up the pad from gpio number. @@ -109,7 +109,7 @@ void gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); * * @return None */ -void gpio_pad_pullup(uint32_t gpio_num); +void rom_gpio_pad_pullup(uint32_t gpio_num); /** * @brief Pull down the pad from gpio number. @@ -118,7 +118,7 @@ void gpio_pad_pullup(uint32_t gpio_num); * * @return None */ -void gpio_pad_pulldown(uint32_t gpio_num); +void rom_gpio_pad_pulldown(uint32_t gpio_num); /** * @brief Unhold the pad from gpio number. @@ -127,7 +127,7 @@ void gpio_pad_pulldown(uint32_t gpio_num); * * @return None */ -void gpio_pad_unhold(uint32_t gpio_num); +void rom_gpio_pad_unhold(uint32_t gpio_num); /** * @brief Hold the pad from gpio number. @@ -136,7 +136,7 @@ void gpio_pad_unhold(uint32_t gpio_num); * * @return None */ -void gpio_pad_hold(uint32_t gpio_num); +void rom_gpio_pad_hold(uint32_t gpio_num); /** * @brief enable gpio pad input. @@ -145,7 +145,7 @@ void gpio_pad_hold(uint32_t gpio_num); * * @return None */ -void gpio_pad_input_enable(uint32_t gpio_num); +void rom_gpio_pad_input_enable(uint32_t gpio_num); /** * @brief disable gpio pad input. @@ -154,7 +154,7 @@ void gpio_pad_input_enable(uint32_t gpio_num); * * @return None */ -void gpio_pad_input_disable(uint32_t gpio_num); +void rom_gpio_pad_input_disable(uint32_t gpio_num); /** * @} diff --git a/components/esp_rom/esp32c61/ld/esp32c61.rom.api.ld b/components/esp_rom/esp32c61/ld/esp32c61.rom.api.ld index 5189b24fa8..6911d48cff 100644 --- a/components/esp_rom/esp32c61/ld/esp32c61.rom.api.ld +++ b/components/esp_rom/esp32c61/ld/esp32c61.rom.api.ld @@ -11,12 +11,12 @@ PROVIDE ( esp_rom_crc32_be = crc32_be ); PROVIDE ( esp_rom_crc16_be = crc16_be ); PROVIDE ( esp_rom_crc8_be = crc8_be ); -PROVIDE ( esp_rom_gpio_pad_select_gpio = gpio_pad_select_gpio ); -PROVIDE ( esp_rom_gpio_pad_pullup_only = gpio_pad_pullup ); -PROVIDE ( esp_rom_gpio_pad_set_drv = gpio_pad_set_drv ); -PROVIDE ( esp_rom_gpio_pad_unhold = gpio_pad_unhold ); -PROVIDE ( esp_rom_gpio_connect_in_signal = gpio_matrix_in ); -PROVIDE ( esp_rom_gpio_connect_out_signal = gpio_matrix_out ); +PROVIDE ( esp_rom_gpio_pad_select_gpio = rom_gpio_pad_select_gpio ); +PROVIDE ( esp_rom_gpio_pad_pullup_only = rom_gpio_pad_pullup ); +PROVIDE ( esp_rom_gpio_pad_set_drv = rom_gpio_pad_set_drv ); +PROVIDE ( esp_rom_gpio_pad_unhold = rom_gpio_pad_unhold ); +PROVIDE ( esp_rom_gpio_connect_in_signal = rom_gpio_matrix_in ); +PROVIDE ( esp_rom_gpio_connect_out_signal = rom_gpio_matrix_out ); PROVIDE ( esp_rom_efuse_mac_address_crc8 = esp_crc8 ); PROVIDE ( esp_rom_efuse_is_secure_boot_enabled = ets_efuse_secure_boot_enabled ); diff --git a/components/esp_rom/esp32c61/ld/esp32c61.rom.ld b/components/esp_rom/esp32c61/ld/esp32c61.rom.ld index d68ff6d40b..f0cde7e910 100644 --- a/components/esp_rom/esp32c61/ld/esp32c61.rom.ld +++ b/components/esp_rom/esp32c61/ld/esp32c61.rom.ld @@ -249,21 +249,21 @@ ets_clk_get_cpu_freq = 0x400006e8; ***************************************/ /* Functions */ -gpio_set_output_level = 0x400006ec; -gpio_get_input_level = 0x400006f0; -gpio_matrix_in = 0x400006f4; -gpio_matrix_out = 0x400006f8; -gpio_bypass_matrix_in = 0x400006fc; -/* gpio_output_disable = 0x40000700; */ -/* gpio_output_enable = 0x40000704; */ -gpio_pad_input_disable = 0x40000708; -gpio_pad_input_enable = 0x4000070c; -gpio_pad_pulldown = 0x40000710; -gpio_pad_pullup = 0x40000714; -gpio_pad_select_gpio = 0x40000718; -gpio_pad_set_drv = 0x4000071c; -gpio_pad_unhold = 0x40000720; -gpio_pad_hold = 0x40000724; +rom_gpio_set_output_level = 0x400006ec; +rom_gpio_get_input_level = 0x400006f0; +rom_gpio_matrix_in = 0x400006f4; +rom_gpio_matrix_out = 0x400006f8; +rom_gpio_bypass_matrix_in = 0x400006fc; +rom_gpio_output_disable = 0x40000700; +rom_gpio_output_enable = 0x40000704; +rom_gpio_pad_input_disable = 0x40000708; +rom_gpio_pad_input_enable = 0x4000070c; +rom_gpio_pad_pulldown = 0x40000710; +rom_gpio_pad_pullup = 0x40000714; +rom_gpio_pad_select_gpio = 0x40000718; +rom_gpio_pad_set_drv = 0x4000071c; +rom_gpio_pad_unhold = 0x40000720; +rom_gpio_pad_hold = 0x40000724; /*************************************** diff --git a/components/esp_rom/esp32h2/include/esp32h2/rom/gpio.h b/components/esp_rom/esp32h2/include/esp32h2/rom/gpio.h index 74551dd693..cd6b894726 100644 --- a/components/esp_rom/esp32h2/include/esp32h2/rom/gpio.h +++ b/components/esp_rom/esp32h2/include/esp32h2/rom/gpio.h @@ -61,7 +61,7 @@ typedef enum { * * @return None */ -void gpio_output_set(uint32_t set_mask, uint32_t clear_mask, uint32_t enable_mask, uint32_t disable_mask); +void rom_gpio_output_set(uint32_t set_mask, uint32_t clear_mask, uint32_t enable_mask, uint32_t disable_mask); /** * @brief Sample the value of GPIO input pins(0-27) and returns a bitmask. @@ -70,7 +70,7 @@ void gpio_output_set(uint32_t set_mask, uint32_t clear_mask, uint32_t enable_mas * * @return uint32_t : bitmask for GPIO input pins, BIT(0) for GPIO0. */ -uint32_t gpio_input_get(void); +uint32_t rom_gpio_input_get(void); /** * @brief Set GPIO to wakeup the chip. @@ -82,7 +82,7 @@ uint32_t gpio_input_get(void); * * @return None */ -void gpio_pin_wakeup_enable(uint32_t i, GPIO_INT_TYPE intr_state); +void rom_gpio_pin_wakeup_enable(uint32_t i, GPIO_INT_TYPE intr_state); /** * @brief disable GPIOs to wakeup the chip. @@ -92,7 +92,7 @@ void gpio_pin_wakeup_enable(uint32_t i, GPIO_INT_TYPE intr_state); * * @return None */ -void gpio_pin_wakeup_disable(void); +void rom_gpio_pin_wakeup_disable(void); /** * @brief set gpio input to a signal, one gpio can input to several signals. @@ -108,7 +108,7 @@ void gpio_pin_wakeup_disable(void); * * @return None */ -void gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); +void rom_gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); /** * @brief set signal output to gpio, one signal can output to several gpios. @@ -124,7 +124,7 @@ void gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); * * @return None */ -void gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_inv); +void rom_gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_inv); /** * @brief Select pad as a gpio function from IOMUX. @@ -133,7 +133,7 @@ void gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_ * * @return None */ -void gpio_pad_select_gpio(uint32_t gpio_num); +void rom_gpio_pad_select_gpio(uint32_t gpio_num); /** * @brief Set pad driver capability. @@ -144,7 +144,7 @@ void gpio_pad_select_gpio(uint32_t gpio_num); * * @return None */ -void gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); +void rom_gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); /** * @brief Pull up the pad from gpio number. @@ -153,7 +153,7 @@ void gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); * * @return None */ -void gpio_pad_pullup(uint32_t gpio_num); +void rom_gpio_pad_pullup(uint32_t gpio_num); /** * @brief Pull down the pad from gpio number. @@ -162,7 +162,7 @@ void gpio_pad_pullup(uint32_t gpio_num); * * @return None */ -void gpio_pad_pulldown(uint32_t gpio_num); +void rom_gpio_pad_pulldown(uint32_t gpio_num); /** * @brief Unhold the pad from gpio number. @@ -171,7 +171,7 @@ void gpio_pad_pulldown(uint32_t gpio_num); * * @return None */ -void gpio_pad_unhold(uint32_t gpio_num); +void rom_gpio_pad_unhold(uint32_t gpio_num); /** * @brief Hold the pad from gpio number. @@ -180,7 +180,7 @@ void gpio_pad_unhold(uint32_t gpio_num); * * @return None */ -void gpio_pad_hold(uint32_t gpio_num); +void rom_gpio_pad_hold(uint32_t gpio_num); /** * @brief enable gpio pad input. @@ -189,7 +189,7 @@ void gpio_pad_hold(uint32_t gpio_num); * * @return None */ -void gpio_pad_input_enable(uint32_t gpio_num); +void rom_gpio_pad_input_enable(uint32_t gpio_num); /** * @brief disable gpio pad input. @@ -198,7 +198,7 @@ void gpio_pad_input_enable(uint32_t gpio_num); * * @return None */ -void gpio_pad_input_disable(uint32_t gpio_num); +void rom_gpio_pad_input_disable(uint32_t gpio_num); /** * @} diff --git a/components/esp_rom/esp32h2/ld/esp32h2.rom.api.ld b/components/esp_rom/esp32h2/ld/esp32h2.rom.api.ld index 41727f6a5e..fc47ae9b2f 100644 --- a/components/esp_rom/esp32h2/ld/esp32h2.rom.api.ld +++ b/components/esp_rom/esp32h2/ld/esp32h2.rom.api.ld @@ -13,12 +13,12 @@ PROVIDE ( esp_rom_crc32_be = crc32_be ); PROVIDE ( esp_rom_crc16_be = crc16_be ); PROVIDE ( esp_rom_crc8_be = crc8_be ); -PROVIDE ( esp_rom_gpio_pad_select_gpio = gpio_pad_select_gpio ); -PROVIDE ( esp_rom_gpio_pad_pullup_only = gpio_pad_pullup ); -PROVIDE ( esp_rom_gpio_pad_set_drv = gpio_pad_set_drv ); -PROVIDE ( esp_rom_gpio_pad_unhold = gpio_pad_unhold ); -PROVIDE ( esp_rom_gpio_connect_in_signal = gpio_matrix_in ); -PROVIDE ( esp_rom_gpio_connect_out_signal = gpio_matrix_out ); +PROVIDE ( esp_rom_gpio_pad_select_gpio = rom_gpio_pad_select_gpio ); +PROVIDE ( esp_rom_gpio_pad_pullup_only = rom_gpio_pad_pullup ); +PROVIDE ( esp_rom_gpio_pad_set_drv = rom_gpio_pad_set_drv ); +PROVIDE ( esp_rom_gpio_pad_unhold = rom_gpio_pad_unhold ); +PROVIDE ( esp_rom_gpio_connect_in_signal = rom_gpio_matrix_in ); +PROVIDE ( esp_rom_gpio_connect_out_signal = rom_gpio_matrix_out ); PROVIDE ( esp_rom_efuse_mac_address_crc8 = esp_crc8 ); PROVIDE ( esp_rom_efuse_is_secure_boot_enabled = ets_efuse_secure_boot_enabled ); diff --git a/components/esp_rom/esp32h2/ld/esp32h2.rom.ld b/components/esp_rom/esp32h2/ld/esp32h2.rom.ld index b7b8775614..854b22fb94 100644 --- a/components/esp_rom/esp32h2/ld/esp32h2.rom.ld +++ b/components/esp_rom/esp32h2/ld/esp32h2.rom.ld @@ -223,23 +223,23 @@ ets_clk_get_cpu_freq = 0x4000069c; ***************************************/ /* Functions */ -gpio_input_get = 0x400006a0; -gpio_matrix_in = 0x400006a4; -gpio_matrix_out = 0x400006a8; -/* gpio_output_disable = 0x400006ac; */ -/* gpio_output_enable = 0x400006b0; */ -gpio_output_set = 0x400006b4; -gpio_pad_hold = 0x400006b8; -gpio_pad_input_disable = 0x400006bc; -gpio_pad_input_enable = 0x400006c0; -gpio_pad_pulldown = 0x400006c4; -gpio_pad_pullup = 0x400006c8; -gpio_pad_select_gpio = 0x400006cc; -gpio_pad_set_drv = 0x400006d0; -gpio_pad_unhold = 0x400006d4; -gpio_pin_wakeup_disable = 0x400006d8; -gpio_pin_wakeup_enable = 0x400006dc; -gpio_bypass_matrix_in = 0x400006e0; +rom_gpio_input_get = 0x400006a0; +rom_gpio_matrix_in = 0x400006a4; +rom_gpio_matrix_out = 0x400006a8; +rom_gpio_output_disable = 0x400006ac; +rom_gpio_output_enable = 0x400006b0; +rom_gpio_output_set = 0x400006b4; +rom_gpio_pad_hold = 0x400006b8; +rom_gpio_pad_input_disable = 0x400006bc; +rom_gpio_pad_input_enable = 0x400006c0; +rom_gpio_pad_pulldown = 0x400006c4; +rom_gpio_pad_pullup = 0x400006c8; +rom_gpio_pad_select_gpio = 0x400006cc; +rom_gpio_pad_set_drv = 0x400006d0; +rom_gpio_pad_unhold = 0x400006d4; +rom_gpio_pin_wakeup_disable = 0x400006d8; +rom_gpio_pin_wakeup_enable = 0x400006dc; +rom_gpio_bypass_matrix_in = 0x400006e0; /*************************************** diff --git a/components/esp_rom/esp32h21/include/esp32h21/rom/gpio.h b/components/esp_rom/esp32h21/include/esp32h21/rom/gpio.h index 987cd887a8..e97cc22db9 100644 --- a/components/esp_rom/esp32h21/include/esp32h21/rom/gpio.h +++ b/components/esp_rom/esp32h21/include/esp32h21/rom/gpio.h @@ -61,7 +61,7 @@ typedef enum { * * @return None */ -void gpio_output_set(uint32_t set_mask, uint32_t clear_mask, uint32_t enable_mask, uint32_t disable_mask); +void rom_gpio_output_set(uint32_t set_mask, uint32_t clear_mask, uint32_t enable_mask, uint32_t disable_mask); /** * @brief Sample the value of GPIO input pins(0-25) and returns a bitmask. @@ -70,7 +70,7 @@ void gpio_output_set(uint32_t set_mask, uint32_t clear_mask, uint32_t enable_mas * * @return uint32_t : bitmask for GPIO input pins, BIT(0) for GPIO0. */ -uint32_t gpio_input_get(void); +uint32_t rom_gpio_input_get(void); /** * @brief Set GPIO to wakeup the chip. @@ -82,7 +82,7 @@ uint32_t gpio_input_get(void); * * @return None */ -void gpio_pin_wakeup_enable(uint32_t i, GPIO_INT_TYPE intr_state); +void rom_gpio_pin_wakeup_enable(uint32_t i, GPIO_INT_TYPE intr_state); /** * @brief disable GPIOs to wakeup the chip. @@ -92,7 +92,7 @@ void gpio_pin_wakeup_enable(uint32_t i, GPIO_INT_TYPE intr_state); * * @return None */ -void gpio_pin_wakeup_disable(void); +void rom_gpio_pin_wakeup_disable(void); /** * @brief set gpio input to a signal, one gpio can input to several signals. @@ -107,7 +107,7 @@ void gpio_pin_wakeup_disable(void); * * @return None */ -void gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); +void rom_gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); /** * @brief set signal output to gpio, one signal can output to several gpios. @@ -123,7 +123,7 @@ void gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); * * @return None */ -void gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_inv); +void rom_gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_inv); /** * @brief Select pad as a gpio function from IOMUX. @@ -132,7 +132,7 @@ void gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_ * * @return None */ -void gpio_pad_select_gpio(uint32_t gpio_num); +void rom_gpio_pad_select_gpio(uint32_t gpio_num); /** * @brief Set pad driver capability. @@ -143,7 +143,7 @@ void gpio_pad_select_gpio(uint32_t gpio_num); * * @return None */ -void gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); +void rom_gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); /** * @brief Pull up the pad from gpio number. @@ -152,7 +152,7 @@ void gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); * * @return None */ -void gpio_pad_pullup(uint32_t gpio_num); +void rom_gpio_pad_pullup(uint32_t gpio_num); /** * @brief Pull down the pad from gpio number. @@ -161,7 +161,7 @@ void gpio_pad_pullup(uint32_t gpio_num); * * @return None */ -void gpio_pad_pulldown(uint32_t gpio_num); +void rom_gpio_pad_pulldown(uint32_t gpio_num); /** * @brief Unhold the pad from gpio number. @@ -170,7 +170,7 @@ void gpio_pad_pulldown(uint32_t gpio_num); * * @return None */ -void gpio_pad_unhold(uint32_t gpio_num); +void rom_gpio_pad_unhold(uint32_t gpio_num); /** * @brief Hold the pad from gpio number. @@ -179,7 +179,7 @@ void gpio_pad_unhold(uint32_t gpio_num); * * @return None */ -void gpio_pad_hold(uint32_t gpio_num); +void rom_gpio_pad_hold(uint32_t gpio_num); /** * @brief enable gpio pad input. @@ -188,7 +188,7 @@ void gpio_pad_hold(uint32_t gpio_num); * * @return None */ -void gpio_pad_input_enable(uint32_t gpio_num); +void rom_gpio_pad_input_enable(uint32_t gpio_num); /** * @brief disable gpio pad input. @@ -197,7 +197,7 @@ void gpio_pad_input_enable(uint32_t gpio_num); * * @return None */ -void gpio_pad_input_disable(uint32_t gpio_num); +void rom_gpio_pad_input_disable(uint32_t gpio_num); /** * @} diff --git a/components/esp_rom/esp32h21/ld/esp32h21.rom.api.ld b/components/esp_rom/esp32h21/ld/esp32h21.rom.api.ld index 1a69c9e2e8..70139e41c2 100644 --- a/components/esp_rom/esp32h21/ld/esp32h21.rom.api.ld +++ b/components/esp_rom/esp32h21/ld/esp32h21.rom.api.ld @@ -11,12 +11,12 @@ PROVIDE ( esp_rom_crc32_be = crc32_be ); PROVIDE ( esp_rom_crc16_be = crc16_be ); PROVIDE ( esp_rom_crc8_be = crc8_be ); -PROVIDE ( esp_rom_gpio_pad_select_gpio = gpio_pad_select_gpio ); -PROVIDE ( esp_rom_gpio_pad_pullup_only = gpio_pad_pullup ); -PROVIDE ( esp_rom_gpio_pad_set_drv = gpio_pad_set_drv ); -PROVIDE ( esp_rom_gpio_pad_unhold = gpio_pad_unhold ); -PROVIDE ( esp_rom_gpio_connect_in_signal = gpio_matrix_in ); -PROVIDE ( esp_rom_gpio_connect_out_signal = gpio_matrix_out ); +PROVIDE ( esp_rom_gpio_pad_select_gpio = rom_gpio_pad_select_gpio ); +PROVIDE ( esp_rom_gpio_pad_pullup_only = rom_gpio_pad_pullup ); +PROVIDE ( esp_rom_gpio_pad_set_drv = rom_gpio_pad_set_drv ); +PROVIDE ( esp_rom_gpio_pad_unhold = rom_gpio_pad_unhold ); +PROVIDE ( esp_rom_gpio_connect_in_signal = rom_gpio_matrix_in ); +PROVIDE ( esp_rom_gpio_connect_out_signal = rom_gpio_matrix_out ); PROVIDE ( esp_rom_efuse_mac_address_crc8 = esp_crc8 ); PROVIDE ( esp_rom_efuse_is_secure_boot_enabled = ets_efuse_secure_boot_enabled ); diff --git a/components/esp_rom/esp32h21/ld/esp32h21.rom.ld b/components/esp_rom/esp32h21/ld/esp32h21.rom.ld index 564e5dbd1c..c8fe0d22c5 100644 --- a/components/esp_rom/esp32h21/ld/esp32h21.rom.ld +++ b/components/esp_rom/esp32h21/ld/esp32h21.rom.ld @@ -222,25 +222,23 @@ ets_clk_get_cpu_freq = 0x40000698; ***************************************/ /* Functions */ -gpio_input_get = 0x4000069c; -gpio_matrix_in = 0x400006a0; -gpio_matrix_out = 0x400006a4; - -/*gpio_output_disable = 0x400006a8;*/ -/*gpio_output_enable = 0x400006ac;*/ - -gpio_output_set = 0x400006b0; -gpio_pad_hold = 0x400006b4; -gpio_pad_input_disable = 0x400006b8; -gpio_pad_input_enable = 0x400006bc; -gpio_pad_pulldown = 0x400006c0; -gpio_pad_pullup = 0x400006c4; -gpio_pad_select_gpio = 0x400006c8; -gpio_pad_set_drv = 0x400006cc; -gpio_pad_unhold = 0x400006d0; -gpio_pin_wakeup_disable = 0x400006d4; -gpio_pin_wakeup_enable = 0x400006d8; -gpio_bypass_matrix_in = 0x400006dc; +rom_gpio_input_get = 0x4000069c; +rom_gpio_matrix_in = 0x400006a0; +rom_gpio_matrix_out = 0x400006a4; +rom_gpio_output_disable = 0x400006a8; +rom_gpio_output_enable = 0x400006ac; +rom_gpio_output_set = 0x400006b0; +rom_gpio_pad_hold = 0x400006b4; +rom_gpio_pad_input_disable = 0x400006b8; +rom_gpio_pad_input_enable = 0x400006bc; +rom_gpio_pad_pulldown = 0x400006c0; +rom_gpio_pad_pullup = 0x400006c4; +rom_gpio_pad_select_gpio = 0x400006c8; +rom_gpio_pad_set_drv = 0x400006cc; +rom_gpio_pad_unhold = 0x400006d0; +rom_gpio_pin_wakeup_disable = 0x400006d4; +rom_gpio_pin_wakeup_enable = 0x400006d8; +rom_gpio_bypass_matrix_in = 0x400006dc; /*************************************** diff --git a/components/esp_rom/esp32h4/include/esp32h4/rom/gpio.h b/components/esp_rom/esp32h4/include/esp32h4/rom/gpio.h index da4cec9da0..b34a1e15ce 100644 --- a/components/esp_rom/esp32h4/include/esp32h4/rom/gpio.h +++ b/components/esp_rom/esp32h4/include/esp32h4/rom/gpio.h @@ -31,7 +31,7 @@ extern "C" { * @param gpio_num GPIO number * @param level Output level, 0:low; 1:high */ -void gpio_set_output_level(uint32_t gpio_num, uint32_t level); +void rom_gpio_set_output_level(uint32_t gpio_num, uint32_t level); /** * @brief Get GPIO input level @@ -40,7 +40,7 @@ void gpio_set_output_level(uint32_t gpio_num, uint32_t level); * * @return 0:the GPIO_input level is low; 1:the GPIO input level is high */ -uint32_t gpio_get_input_level(uint32_t gpio_num); +uint32_t rom_gpio_get_input_level(uint32_t gpio_num); /** * @brief set gpio input to a signal, one gpio can input to several signals. @@ -55,13 +55,13 @@ uint32_t gpio_get_input_level(uint32_t gpio_num); * * @return None */ -void gpio_matrix_in(uint32_t gpio_num, uint32_t signal_idx, bool inv); +void rom_gpio_matrix_in(uint32_t gpio_num, uint32_t signal_idx, bool inv); /** * @brief bypass gpio matrix input to signals * @param signal_idx Internal signal index */ -void gpio_bypass_matrix_in(uint32_t signal_idx); +void rom_gpio_bypass_matrix_in(uint32_t signal_idx); /** * @brief set signal output to gpio, one signal can output to several gpios. @@ -77,25 +77,25 @@ void gpio_bypass_matrix_in(uint32_t signal_idx); * * @return None */ -void gpio_matrix_out(uint32_t gpio_num, uint32_t signal_idx, bool out_inv, bool oen_inv); +void rom_gpio_matrix_out(uint32_t gpio_num, uint32_t signal_idx, bool out_inv, bool oen_inv); -// /** -// * @brief enable gpio output. -// * -// * @param uint32_t gpio_num : gpio number -// * -// * @return None -// */ -// void gpio_output_enable(uint32_t gpio_num); +/** + * @brief enable gpio output. + * + * @param uint32_t gpio_num : gpio number + * + * @return None + */ +void rom_gpio_output_enable(uint32_t gpio_num); -// /** -// * @brief disable gpio output. -// * -// * @param uint32_t gpio_num : gpio number -// * -// * @return None -// */ -// void gpio_output_disable(uint32_t gpio_num); +/** + * @brief disable gpio output. + * + * @param uint32_t gpio_num : gpio number + * + * @return None + */ +void rom_gpio_output_disable(uint32_t gpio_num); /** * @brief Select pad as a gpio function from IOMUX. @@ -104,7 +104,7 @@ void gpio_matrix_out(uint32_t gpio_num, uint32_t signal_idx, bool out_inv, bool * * @return None */ -void gpio_pad_select_gpio(uint32_t gpio_num); +void rom_gpio_pad_select_gpio(uint32_t gpio_num); /** * @brief Set pad driver capability. @@ -115,7 +115,7 @@ void gpio_pad_select_gpio(uint32_t gpio_num); * * @return None */ -void gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); +void rom_gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); /** * @brief Pull up the pad from gpio number. @@ -124,7 +124,7 @@ void gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); * * @return None */ -void gpio_pad_pullup(uint32_t gpio_num); +void rom_gpio_pad_pullup(uint32_t gpio_num); /** * @brief Pull down the pad from gpio number. @@ -133,7 +133,7 @@ void gpio_pad_pullup(uint32_t gpio_num); * * @return None */ -void gpio_pad_pulldown(uint32_t gpio_num); +void rom_gpio_pad_pulldown(uint32_t gpio_num); /** * @brief enable gpio pad input. @@ -142,7 +142,7 @@ void gpio_pad_pulldown(uint32_t gpio_num); * * @return None */ -void gpio_pad_input_enable(uint32_t gpio_num); +void rom_gpio_pad_input_enable(uint32_t gpio_num); /** * @brief disable gpio pad input. @@ -151,7 +151,7 @@ void gpio_pad_input_enable(uint32_t gpio_num); * * @return None */ -void gpio_pad_input_disable(uint32_t gpio_num); +void rom_gpio_pad_input_disable(uint32_t gpio_num); /** * @brief Unhold the pad from gpio number. @@ -160,7 +160,7 @@ void gpio_pad_input_disable(uint32_t gpio_num); * * @return None */ -void gpio_pad_unhold(uint32_t gpio_num); +void rom_gpio_pad_unhold(uint32_t gpio_num); /** * @brief Hold the pad from gpio number. @@ -169,7 +169,7 @@ void gpio_pad_unhold(uint32_t gpio_num); * * @return None */ -void gpio_pad_hold(uint32_t gpio_num); +void rom_gpio_pad_hold(uint32_t gpio_num); /** * @} diff --git a/components/esp_rom/esp32h4/ld/esp32h4.rom.api.ld b/components/esp_rom/esp32h4/ld/esp32h4.rom.api.ld index 43060b09f6..0b49e76e4b 100644 --- a/components/esp_rom/esp32h4/ld/esp32h4.rom.api.ld +++ b/components/esp_rom/esp32h4/ld/esp32h4.rom.api.ld @@ -13,12 +13,12 @@ PROVIDE ( esp_rom_crc32_be = crc32_be ); PROVIDE ( esp_rom_crc16_be = crc16_be ); PROVIDE ( esp_rom_crc8_be = crc8_be ); -PROVIDE ( esp_rom_gpio_pad_select_gpio = gpio_pad_select_gpio ); -PROVIDE ( esp_rom_gpio_pad_pullup_only = gpio_pad_pullup ); -PROVIDE ( esp_rom_gpio_pad_set_drv = gpio_pad_set_drv ); -PROVIDE ( esp_rom_gpio_pad_unhold = gpio_pad_unhold ); -PROVIDE ( esp_rom_gpio_connect_in_signal = gpio_matrix_in ); -PROVIDE ( esp_rom_gpio_connect_out_signal = gpio_matrix_out ); +PROVIDE ( esp_rom_gpio_pad_select_gpio = rom_gpio_pad_select_gpio ); +PROVIDE ( esp_rom_gpio_pad_pullup_only = rom_gpio_pad_pullup ); +PROVIDE ( esp_rom_gpio_pad_set_drv = rom_gpio_pad_set_drv ); +PROVIDE ( esp_rom_gpio_pad_unhold = rom_gpio_pad_unhold ); +PROVIDE ( esp_rom_gpio_connect_in_signal = rom_gpio_matrix_in ); +PROVIDE ( esp_rom_gpio_connect_out_signal = rom_gpio_matrix_out ); PROVIDE ( esp_rom_efuse_mac_address_crc8 = esp_crc8 ); PROVIDE ( esp_rom_efuse_is_secure_boot_enabled = ets_efuse_secure_boot_enabled ); diff --git a/components/esp_rom/esp32h4/ld/esp32h4.rom.beta5.ld b/components/esp_rom/esp32h4/ld/esp32h4.rom.beta5.ld index 227ed25f67..1938fae87b 100644 --- a/components/esp_rom/esp32h4/ld/esp32h4.rom.beta5.ld +++ b/components/esp_rom/esp32h4/ld/esp32h4.rom.beta5.ld @@ -243,21 +243,21 @@ ets_clk_get_cpu_freq = 0x400006a4; ***************************************/ /* Functions */ -gpio_set_output_level = 0x400006a8; -gpio_get_input_level = 0x400006ac; -gpio_matrix_in = 0x400006b0; -gpio_matrix_out = 0x400006b4; -gpio_bypass_matrix_in = 0x400006b8; -/* gpio_output_disable = 0x400006bc; */ -/* gpio_output_enable = 0x400006c0; */ -gpio_pad_input_disable = 0x400006c4; -gpio_pad_input_enable = 0x400006c8; -gpio_pad_pulldown = 0x400006cc; -gpio_pad_pullup = 0x400006d0; -gpio_pad_select_gpio = 0x400006d4; -gpio_pad_set_drv = 0x400006d8; -gpio_pad_unhold = 0x400006dc; -gpio_pad_hold = 0x400006e0; +rom_gpio_set_output_level = 0x400006a8; +rom_gpio_get_input_level = 0x400006ac; +rom_gpio_matrix_in = 0x400006b0; +rom_gpio_matrix_out = 0x400006b4; +rom_gpio_bypass_matrix_in = 0x400006b8; +rom_gpio_output_disable = 0x400006bc; +rom_gpio_output_enable = 0x400006c0; +rom_gpio_pad_input_disable = 0x400006c4; +rom_gpio_pad_input_enable = 0x400006c8; +rom_gpio_pad_pulldown = 0x400006cc; +rom_gpio_pad_pullup = 0x400006d0; +rom_gpio_pad_select_gpio = 0x400006d4; +rom_gpio_pad_set_drv = 0x400006d8; +rom_gpio_pad_unhold = 0x400006dc; +rom_gpio_pad_hold = 0x400006e0; /*************************************** diff --git a/components/esp_rom/esp32h4/ld/esp32h4.rom.ld b/components/esp_rom/esp32h4/ld/esp32h4.rom.ld index 806ad416f3..ea851e6954 100644 --- a/components/esp_rom/esp32h4/ld/esp32h4.rom.ld +++ b/components/esp_rom/esp32h4/ld/esp32h4.rom.ld @@ -241,21 +241,21 @@ ets_clk_get_cpu_freq = 0x4000066c; ***************************************/ /* Functions */ -gpio_set_output_level = 0x40000670; -gpio_get_input_level = 0x40000674; -gpio_matrix_in = 0x40000678; -gpio_matrix_out = 0x4000067c; -gpio_bypass_matrix_in = 0x40000680; -gpio_output_disable = 0x40000684; -gpio_output_enable = 0x40000688; -gpio_pad_input_disable = 0x4000068c; -gpio_pad_input_enable = 0x40000690; -gpio_pad_pulldown = 0x40000694; -gpio_pad_pullup = 0x40000698; -gpio_pad_select_gpio = 0x4000069c; -gpio_pad_set_drv = 0x400006a0; -gpio_pad_unhold = 0x400006a4; -gpio_pad_hold = 0x400006a8; +rom_gpio_set_output_level = 0x40000670; +rom_gpio_get_input_level = 0x40000674; +rom_gpio_matrix_in = 0x40000678; +rom_gpio_matrix_out = 0x4000067c; +rom_gpio_bypass_matrix_in = 0x40000680; +rom_gpio_output_disable = 0x40000684; +rom_gpio_output_enable = 0x40000688; +rom_gpio_pad_input_disable = 0x4000068c; +rom_gpio_pad_input_enable = 0x40000690; +rom_gpio_pad_pulldown = 0x40000694; +rom_gpio_pad_pullup = 0x40000698; +rom_gpio_pad_select_gpio = 0x4000069c; +rom_gpio_pad_set_drv = 0x400006a0; +rom_gpio_pad_unhold = 0x400006a4; +rom_gpio_pad_hold = 0x400006a8; /*************************************** diff --git a/components/esp_rom/esp32p4/include/esp32p4/rom/gpio.h b/components/esp_rom/esp32p4/include/esp32p4/rom/gpio.h index c07d11114f..42f8d16176 100644 --- a/components/esp_rom/esp32p4/include/esp32p4/rom/gpio.h +++ b/components/esp_rom/esp32p4/include/esp32p4/rom/gpio.h @@ -44,7 +44,7 @@ extern "C" { * @param gpio_num GPIO number * @param level Output level, 0:low; 1:high */ -void gpio_set_output_level(uint32_t gpio_num, uint32_t level); +void rom_gpio_set_output_level(uint32_t gpio_num, uint32_t level); /** * @brief Get GPIO input level @@ -53,7 +53,7 @@ void gpio_set_output_level(uint32_t gpio_num, uint32_t level); * * @return 0:the GPIO_input level is low; 1:the GPIO input level is high */ -uint32_t gpio_get_input_level(uint32_t gpio_num); +uint32_t rom_gpio_get_input_level(uint32_t gpio_num); /** * @brief set gpio input to a signal, one gpio can input to several signals. @@ -68,7 +68,7 @@ uint32_t gpio_get_input_level(uint32_t gpio_num); * * @return None */ -void gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); +void rom_gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); /** * @brief set signal output to gpio, one signal can output to several gpios. @@ -84,7 +84,7 @@ void gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); * * @return None */ -void gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_inv); +void rom_gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_inv); /** * @brief Select pad as a gpio function from IOMUX. @@ -93,7 +93,7 @@ void gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_ * * @return None */ -void gpio_pad_select_gpio(uint32_t gpio_num); +void rom_gpio_pad_select_gpio(uint32_t gpio_num); /** * @brief Set pad driver capability. @@ -104,7 +104,7 @@ void gpio_pad_select_gpio(uint32_t gpio_num); * * @return None */ -void gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); +void rom_gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); /** * @brief Pull up the pad from gpio number. @@ -113,7 +113,7 @@ void gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); * * @return None */ -void gpio_pad_pullup(uint32_t gpio_num); +void rom_gpio_pad_pullup(uint32_t gpio_num); /** * @brief Pull down the pad from gpio number. @@ -122,7 +122,7 @@ void gpio_pad_pullup(uint32_t gpio_num); * * @return None */ -void gpio_pad_pulldown(uint32_t gpio_num); +void rom_gpio_pad_pulldown(uint32_t gpio_num); /** * @brief Unhold the pad from gpio number. @@ -131,7 +131,7 @@ void gpio_pad_pulldown(uint32_t gpio_num); * * @return None */ -void gpio_pad_unhold(uint32_t gpio_num); +void rom_gpio_pad_unhold(uint32_t gpio_num); /** * @brief Hold the pad from gpio number. @@ -140,7 +140,7 @@ void gpio_pad_unhold(uint32_t gpio_num); * * @return None */ -void gpio_pad_hold(uint32_t gpio_num); +void rom_gpio_pad_hold(uint32_t gpio_num); /** * @brief enable gpio pad input. @@ -149,7 +149,7 @@ void gpio_pad_hold(uint32_t gpio_num); * * @return None */ -void gpio_pad_input_enable(uint32_t gpio_num); +void rom_gpio_pad_input_enable(uint32_t gpio_num); /** * @brief disable gpio pad input. @@ -158,7 +158,7 @@ void gpio_pad_input_enable(uint32_t gpio_num); * * @return None */ -void gpio_pad_input_disable(uint32_t gpio_num); +void rom_gpio_pad_input_disable(uint32_t gpio_num); /** * @} diff --git a/components/esp_rom/esp32p4/ld/esp32p4.rom.api.ld b/components/esp_rom/esp32p4/ld/esp32p4.rom.api.ld index 77409b3198..0926faf4b9 100644 --- a/components/esp_rom/esp32p4/ld/esp32p4.rom.api.ld +++ b/components/esp_rom/esp32p4/ld/esp32p4.rom.api.ld @@ -13,12 +13,12 @@ PROVIDE ( esp_rom_crc32_be = crc32_be ); PROVIDE ( esp_rom_crc16_be = crc16_be ); PROVIDE ( esp_rom_crc8_be = crc8_be ); -PROVIDE ( esp_rom_gpio_pad_select_gpio = gpio_pad_select_gpio ); -PROVIDE ( esp_rom_gpio_pad_pullup_only = gpio_pad_pullup ); -PROVIDE ( esp_rom_gpio_pad_set_drv = gpio_pad_set_drv ); -PROVIDE ( esp_rom_gpio_pad_unhold = gpio_pad_unhold ); -PROVIDE ( esp_rom_gpio_connect_in_signal = gpio_matrix_in ); -PROVIDE ( esp_rom_gpio_connect_out_signal = gpio_matrix_out ); +PROVIDE ( esp_rom_gpio_pad_select_gpio = rom_gpio_pad_select_gpio ); +PROVIDE ( esp_rom_gpio_pad_pullup_only = rom_gpio_pad_pullup ); +PROVIDE ( esp_rom_gpio_pad_set_drv = rom_gpio_pad_set_drv ); +PROVIDE ( esp_rom_gpio_pad_unhold = rom_gpio_pad_unhold ); +PROVIDE ( esp_rom_gpio_connect_in_signal = rom_gpio_matrix_in ); +PROVIDE ( esp_rom_gpio_connect_out_signal = rom_gpio_matrix_out ); PROVIDE ( esp_rom_efuse_mac_address_crc8 = esp_crc8 ); PROVIDE ( esp_rom_efuse_is_secure_boot_enabled = ets_efuse_secure_boot_enabled ); diff --git a/components/esp_rom/esp32p4/ld/esp32p4.rom.eco5.ld b/components/esp_rom/esp32p4/ld/esp32p4.rom.eco5.ld index a60e9d0b07..9a7b75a27e 100644 --- a/components/esp_rom/esp32p4/ld/esp32p4.rom.eco5.ld +++ b/components/esp_rom/esp32p4/ld/esp32p4.rom.eco5.ld @@ -315,27 +315,27 @@ ets_clk_get_cpu_freq = 0x4fc00554; ***************************************/ /* Functions */ -gpio_set_output_level = 0x4fc00558; -gpio_get_input_level = 0x4fc0055c; -gpio_matrix_in = 0x4fc00560; -gpio_matrix_out = 0x4fc00564; -gpio_bypass_matrix_in = 0x4fc00568; -/* gpio_output_disable = 0x4fc0056c; */ -/* gpio_output_enable = 0x4fc00570; */ -gpio_pad_input_disable = 0x4fc00574; -gpio_pad_input_enable = 0x4fc00578; -gpio_pad_pulldown = 0x4fc0057c; -gpio_pad_pullup = 0x4fc00580; -gpio_pad_select_gpio = 0x4fc00584; -gpio_pad_set_drv = 0x4fc00588; -gpio_pad_unhold = 0x4fc0058c; -gpio_pad_hold = 0x4fc00590; -gpio_lppad_select_mux = 0x4fc00594; -gpio_ded_pad_set_drv = 0x4fc00598; -gpio_ded_pad_pullup = 0x4fc0059c; -gpio_ded_pad_pulldown = 0x4fc005a0; -gpio_ded_pad_hold = 0x4fc005a4; -gpio_ded_pad_unhold = 0x4fc005a8; +rom_gpio_set_output_level = 0x4fc00558; +rom_gpio_get_input_level = 0x4fc0055c; +rom_gpio_matrix_in = 0x4fc00560; +rom_gpio_matrix_out = 0x4fc00564; +rom_gpio_bypass_matrix_in = 0x4fc00568; +rom_gpio_output_disable = 0x4fc0056c; +rom_gpio_output_enable = 0x4fc00570; +rom_gpio_pad_input_disable = 0x4fc00574; +rom_gpio_pad_input_enable = 0x4fc00578; +rom_gpio_pad_pulldown = 0x4fc0057c; +rom_gpio_pad_pullup = 0x4fc00580; +rom_gpio_pad_select_gpio = 0x4fc00584; +rom_gpio_pad_set_drv = 0x4fc00588; +rom_gpio_pad_unhold = 0x4fc0058c; +rom_gpio_pad_hold = 0x4fc00590; +rom_gpio_lppad_select_mux = 0x4fc00594; +rom_gpio_ded_pad_set_drv = 0x4fc00598; +rom_gpio_ded_pad_pullup = 0x4fc0059c; +rom_gpio_ded_pad_pulldown = 0x4fc005a0; +rom_gpio_ded_pad_hold = 0x4fc005a4; +rom_gpio_ded_pad_unhold = 0x4fc005a8; /*************************************** diff --git a/components/esp_rom/esp32p4/ld/esp32p4.rom.ld b/components/esp_rom/esp32p4/ld/esp32p4.rom.ld index b9950412e0..428f076109 100644 --- a/components/esp_rom/esp32p4/ld/esp32p4.rom.ld +++ b/components/esp_rom/esp32p4/ld/esp32p4.rom.ld @@ -296,27 +296,27 @@ ets_clk_get_cpu_freq = 0x4fc00560; ***************************************/ /* Functions */ -gpio_set_output_level = 0x4fc00564; -gpio_get_input_level = 0x4fc00568; -gpio_matrix_in = 0x4fc0056c; -gpio_matrix_out = 0x4fc00570; -gpio_bypass_matrix_in = 0x4fc00574; -/* gpio_output_disable = 0x4fc00578; */ -/* gpio_output_enable = 0x4fc0057c; */ -gpio_pad_input_disable = 0x4fc00580; -gpio_pad_input_enable = 0x4fc00584; -gpio_pad_pulldown = 0x4fc00588; -gpio_pad_pullup = 0x4fc0058c; -gpio_pad_select_gpio = 0x4fc00590; -gpio_pad_set_drv = 0x4fc00594; -gpio_pad_unhold = 0x4fc00598; -gpio_pad_hold = 0x4fc0059c; -gpio_lppad_select_mux = 0x4fc005a0; -gpio_ded_pad_set_drv = 0x4fc005a4; -gpio_ded_pad_pullup = 0x4fc005a8; -gpio_ded_pad_pulldown = 0x4fc005ac; -gpio_ded_pad_hold = 0x4fc005b0; -gpio_ded_pad_unhold = 0x4fc005b4; +rom_gpio_set_output_level = 0x4fc00564; +rom_gpio_get_input_level = 0x4fc00568; +rom_gpio_matrix_in = 0x4fc0056c; +rom_gpio_matrix_out = 0x4fc00570; +rom_gpio_bypass_matrix_in = 0x4fc00574; +rom_gpio_output_disable = 0x4fc00578; +rom_gpio_output_enable = 0x4fc0057c; +rom_gpio_pad_input_disable = 0x4fc00580; +rom_gpio_pad_input_enable = 0x4fc00584; +rom_gpio_pad_pulldown = 0x4fc00588; +rom_gpio_pad_pullup = 0x4fc0058c; +rom_gpio_pad_select_gpio = 0x4fc00590; +rom_gpio_pad_set_drv = 0x4fc00594; +rom_gpio_pad_unhold = 0x4fc00598; +rom_gpio_pad_hold = 0x4fc0059c; +rom_gpio_lppad_select_mux = 0x4fc005a0; +rom_gpio_ded_pad_set_drv = 0x4fc005a4; +rom_gpio_ded_pad_pullup = 0x4fc005a8; +rom_gpio_ded_pad_pulldown = 0x4fc005ac; +rom_gpio_ded_pad_hold = 0x4fc005b0; +rom_gpio_ded_pad_unhold = 0x4fc005b4; /*************************************** diff --git a/components/esp_rom/esp32p4/ld/esp32p4lp.rom.ld b/components/esp_rom/esp32p4/ld/esp32p4lp.rom.ld index 7fba13bd4b..ab2bb38c83 100644 --- a/components/esp_rom/esp32p4/ld/esp32p4lp.rom.ld +++ b/components/esp_rom/esp32p4/ld/esp32p4lp.rom.ld @@ -38,22 +38,22 @@ GetUartDevice = 0x501000c8; ***************************************/ /* Functions */ -gpio_set_output_level = 0x501000cc; -gpio_get_input_level = 0x501000d0; -gpio_matrix_in = 0x501000d4; -gpio_matrix_out = 0x501000d8; -gpio_bypass_matrix_in = 0x501000dc; -gpio_output_disable = 0x501000e0; -/* gpio_output_enable = 0x501000e4; */ -/* gpio_pad_input_disable = 0x501000e8; */ -gpio_pad_input_enable = 0x501000ec; -gpio_pad_pulldown = 0x501000f0; -gpio_pad_pullup = 0x501000f4; -gpio_pad_select_gpio = 0x501000f8; -gpio_pad_set_drv = 0x501000fc; -gpio_pad_unhold = 0x50100100; -gpio_pad_hold = 0x50100104; -gpio_lppad_select_mux = 0x50100108; +rom_gpio_set_output_level = 0x501000cc; +rom_gpio_get_input_level = 0x501000d0; +rom_gpio_matrix_in = 0x501000d4; +rom_gpio_matrix_out = 0x501000d8; +rom_gpio_bypass_matrix_in = 0x501000dc; +rom_gpio_output_disable = 0x501000e0; +rom_gpio_output_enable = 0x501000e4; +rom_gpio_pad_input_disable = 0x501000e8; +rom_gpio_pad_input_enable = 0x501000ec; +rom_gpio_pad_pulldown = 0x501000f0; +rom_gpio_pad_pullup = 0x501000f4; +rom_gpio_pad_select_gpio = 0x501000f8; +rom_gpio_pad_set_drv = 0x501000fc; +rom_gpio_pad_unhold = 0x50100100; +rom_gpio_pad_hold = 0x50100104; +rom_gpio_lppad_select_mux = 0x50100108; /*************************************** diff --git a/components/esp_rom/esp32s2/include/esp32s2/rom/gpio.h b/components/esp_rom/esp32s2/include/esp32s2/rom/gpio.h index c350a1200c..b72d96764f 100644 --- a/components/esp_rom/esp32s2/include/esp32s2/rom/gpio.h +++ b/components/esp_rom/esp32s2/include/esp32s2/rom/gpio.h @@ -46,10 +46,10 @@ typedef enum { } GPIO_INT_TYPE; #define GPIO_OUTPUT_SET(gpio_no, bit_value) \ - ((gpio_no < 32) ? gpio_output_set(bit_value<>gpio_no)&BIT0) : ((gpio_input_get_high()>>(gpio_no - 32))&BIT0)) + ((gpio_no < 32) ? rom_gpio_output_set(bit_value<>gpio_no)&BIT0) : ((rom_gpio_input_get_high()>>(gpio_no - 32))&BIT0)) /** * @brief Change GPIO(0-31) pin output by setting, clearing, or disabling pins, GPIO0<->BIT(0). @@ -66,7 +66,7 @@ typedef enum { * * @return None */ -void gpio_output_set(uint32_t set_mask, uint32_t clear_mask, uint32_t enable_mask, uint32_t disable_mask); +void rom_gpio_output_set(uint32_t set_mask, uint32_t clear_mask, uint32_t enable_mask, uint32_t disable_mask); /** * @brief Change GPIO(32-45) pin output by setting, clearing, or disabling pins, GPIO32<->BIT(0). @@ -83,7 +83,7 @@ void gpio_output_set(uint32_t set_mask, uint32_t clear_mask, uint32_t enable_mas * * @return None */ -void gpio_output_set_high(uint32_t set_mask, uint32_t clear_mask, uint32_t enable_mask, uint32_t disable_mask); +void rom_gpio_output_set_high(uint32_t set_mask, uint32_t clear_mask, uint32_t enable_mask, uint32_t disable_mask); /** * @brief Sample the value of GPIO input pins(0-31) and returns a bitmask. @@ -92,7 +92,7 @@ void gpio_output_set_high(uint32_t set_mask, uint32_t clear_mask, uint32_t enabl * * @return uint32_t : bitmask for GPIO input pins, BIT(0) for GPIO0. */ -uint32_t gpio_input_get(void); +uint32_t rom_gpio_input_get(void); /** * @brief Sample the value of GPIO input pins(32-46) and returns a bitmask. @@ -101,7 +101,7 @@ uint32_t gpio_input_get(void); * * @return uint32_t : bitmask for GPIO input pins, BIT(0) for GPIO32. */ -uint32_t gpio_input_get_high(void); +uint32_t rom_gpio_input_get_high(void); /** * @brief Set GPIO to wakeup the chip. @@ -113,7 +113,7 @@ uint32_t gpio_input_get_high(void); * * @return None */ -void gpio_pin_wakeup_enable(uint32_t i, GPIO_INT_TYPE intr_state); +void rom_gpio_pin_wakeup_enable(uint32_t i, GPIO_INT_TYPE intr_state); /** * @brief disable GPIOs to wakeup the chip. @@ -123,7 +123,7 @@ void gpio_pin_wakeup_enable(uint32_t i, GPIO_INT_TYPE intr_state); * * @return None */ -void gpio_pin_wakeup_disable(void); +void rom_gpio_pin_wakeup_disable(void); /** * @brief set gpio input to a signal, one gpio can input to several signals. @@ -139,7 +139,7 @@ void gpio_pin_wakeup_disable(void); * * @return None */ -void gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); +void rom_gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); /** * @brief set signal output to gpio, one signal can output to several gpios. @@ -155,7 +155,7 @@ void gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); * * @return None */ -void gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_inv); +void rom_gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_inv); /** * @brief Select pad as a gpio function from IOMUX. @@ -164,7 +164,7 @@ void gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_ * * @return None */ -void gpio_pad_select_gpio(uint32_t gpio_num); +void rom_gpio_pad_select_gpio(uint32_t gpio_num); /** * @brief Set pad driver capability. @@ -175,7 +175,7 @@ void gpio_pad_select_gpio(uint32_t gpio_num); * * @return None */ -void gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); +void rom_gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); /** * @brief Pull up the pad from gpio number. @@ -184,7 +184,7 @@ void gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); * * @return None */ -void gpio_pad_pullup(uint32_t gpio_num); +void rom_gpio_pad_pullup(uint32_t gpio_num); /** * @brief Pull down the pad from gpio number. @@ -193,7 +193,7 @@ void gpio_pad_pullup(uint32_t gpio_num); * * @return None */ -void gpio_pad_pulldown(uint32_t gpio_num); +void rom_gpio_pad_pulldown(uint32_t gpio_num); /** * @brief Unhold the pad from gpio number. @@ -202,7 +202,7 @@ void gpio_pad_pulldown(uint32_t gpio_num); * * @return None */ -void gpio_pad_unhold(uint32_t gpio_num); +void rom_gpio_pad_unhold(uint32_t gpio_num); /** * @brief Hold the pad from gpio number. @@ -211,7 +211,7 @@ void gpio_pad_unhold(uint32_t gpio_num); * * @return None */ -void gpio_pad_hold(uint32_t gpio_num); +void rom_gpio_pad_hold(uint32_t gpio_num); /** * @brief enable gpio pad input. @@ -220,7 +220,7 @@ void gpio_pad_hold(uint32_t gpio_num); * * @return None */ -void gpio_pad_input_enable(uint32_t gpio_num); +void rom_gpio_pad_input_enable(uint32_t gpio_num); /** * @brief disable gpio pad input. @@ -229,7 +229,7 @@ void gpio_pad_input_enable(uint32_t gpio_num); * * @return None */ -void gpio_pad_input_disable(uint32_t gpio_num); +void rom_gpio_pad_input_disable(uint32_t gpio_num); /** * @} diff --git a/components/esp_rom/esp32s2/ld/esp32s2.rom.api.ld b/components/esp_rom/esp32s2/ld/esp32s2.rom.api.ld index 9e37ce6b92..50e54d0408 100644 --- a/components/esp_rom/esp32s2/ld/esp32s2.rom.api.ld +++ b/components/esp_rom/esp32s2/ld/esp32s2.rom.api.ld @@ -6,12 +6,12 @@ PROVIDE ( esp_rom_crc32_le = crc32_le ); PROVIDE ( esp_rom_crc16_le = crc16_le ); PROVIDE ( esp_rom_crc8_le = crc8_le ); -PROVIDE ( esp_rom_gpio_pad_select_gpio = gpio_pad_select_gpio ); -PROVIDE ( esp_rom_gpio_pad_pullup_only = gpio_pad_pullup ); -PROVIDE ( esp_rom_gpio_pad_set_drv = gpio_pad_set_drv ); -PROVIDE ( esp_rom_gpio_pad_unhold = gpio_pad_unhold ); -PROVIDE ( esp_rom_gpio_connect_in_signal = gpio_matrix_in ); -PROVIDE ( esp_rom_gpio_connect_out_signal = gpio_matrix_out ); +PROVIDE ( esp_rom_gpio_pad_select_gpio = rom_gpio_pad_select_gpio ); +PROVIDE ( esp_rom_gpio_pad_pullup_only = rom_gpio_pad_pullup ); +PROVIDE ( esp_rom_gpio_pad_set_drv = rom_gpio_pad_set_drv ); +PROVIDE ( esp_rom_gpio_pad_unhold = rom_gpio_pad_unhold ); +PROVIDE ( esp_rom_gpio_connect_in_signal = rom_gpio_matrix_in ); +PROVIDE ( esp_rom_gpio_connect_out_signal = rom_gpio_matrix_out ); PROVIDE ( esp_rom_efuse_mac_address_crc8 = esp_crc8 ); PROVIDE ( esp_rom_efuse_get_flash_gpio_info = ets_efuse_get_spiconfig ); diff --git a/components/esp_rom/esp32s2/ld/esp32s2.rom.ld b/components/esp_rom/esp32s2/ld/esp32s2.rom.ld index ed003db7a7..5f2116099e 100644 --- a/components/esp_rom/esp32s2/ld/esp32s2.rom.ld +++ b/components/esp_rom/esp32s2/ld/esp32s2.rom.ld @@ -339,24 +339,24 @@ PROVIDE ( GetUartDevice = 0x40012f60 ); PROVIDE ( __global_locale_ptr = 0x3ffffd7c ); PROVIDE ( g_phyFuns = 0x3ffffd90 ); PROVIDE ( g_phyFuns_instance = 0x3ffffd94 ); -PROVIDE ( gpio_input_get = 0x400193a0 ); -PROVIDE ( gpio_input_get_high = 0x400193b4 ); -PROVIDE ( gpio_matrix_in = 0x40019430 ); -PROVIDE ( gpio_matrix_out = 0x40019460 ); -PROVIDE ( gpio_output_disable = 0x400194dc ); -PROVIDE ( gpio_output_enable = 0x400194b0 ); -PROVIDE ( gpio_output_set = 0x4001933c ); -PROVIDE ( gpio_output_set_high = 0x40019374 ); -PROVIDE ( gpio_pad_hold = 0x40019654 ); -PROVIDE ( gpio_pad_input_disable = 0x400195f0 ); -PROVIDE ( gpio_pad_input_enable = 0x400195cc ); -PROVIDE ( gpio_pad_pulldown = 0x40019598 ); -PROVIDE ( gpio_pad_pullup = 0x40019564 ); -PROVIDE ( gpio_pad_select_gpio = 0x40019510 ); -PROVIDE ( gpio_pad_set_drv = 0x40019538 ); -PROVIDE ( gpio_pad_unhold = 0x4001961c ); -PROVIDE ( gpio_pin_wakeup_disable = 0x40019404 ); -PROVIDE ( gpio_pin_wakeup_enable = 0x400193c8 ); +PROVIDE ( rom_gpio_input_get = 0x400193a0 ); +PROVIDE ( rom_gpio_input_get_high = 0x400193b4 ); +PROVIDE ( rom_gpio_matrix_in = 0x40019430 ); +PROVIDE ( rom_gpio_matrix_out = 0x40019460 ); +PROVIDE ( rom_gpio_output_disable = 0x400194dc ); +PROVIDE ( rom_gpio_output_enable = 0x400194b0 ); +PROVIDE ( rom_gpio_output_set = 0x4001933c ); +PROVIDE ( rom_gpio_output_set_high = 0x40019374 ); +PROVIDE ( rom_gpio_pad_hold = 0x40019654 ); +PROVIDE ( rom_gpio_pad_input_disable = 0x400195f0 ); +PROVIDE ( rom_gpio_pad_input_enable = 0x400195cc ); +PROVIDE ( rom_gpio_pad_pulldown = 0x40019598 ); +PROVIDE ( rom_gpio_pad_pullup = 0x40019564 ); +PROVIDE ( rom_gpio_pad_select_gpio = 0x40019510 ); +PROVIDE ( rom_gpio_pad_set_drv = 0x40019538 ); +PROVIDE ( rom_gpio_pad_unhold = 0x4001961c ); +PROVIDE ( rom_gpio_pin_wakeup_disable = 0x40019404 ); +PROVIDE ( rom_gpio_pin_wakeup_enable = 0x400193c8 ); PROVIDE ( g_shared_buffers = 0x3ffeab04 ); PROVIDE ( g_ticks_per_us = 0x3ffffd70 ); PROVIDE ( hmac_md5 = 0x40005490 ); diff --git a/components/esp_rom/esp32s3/include/esp32s3/rom/gpio.h b/components/esp_rom/esp32s3/include/esp32s3/rom/gpio.h index 414bbc91d6..18d7a45347 100644 --- a/components/esp_rom/esp32s3/include/esp32s3/rom/gpio.h +++ b/components/esp_rom/esp32s3/include/esp32s3/rom/gpio.h @@ -61,9 +61,9 @@ typedef enum { * * @return None */ -void gpio_output_set(uint32_t set_mask, uint32_t clear_mask, uint32_t enable_mask, uint32_t disable_mask); +void rom_gpio_output_set(uint32_t set_mask, uint32_t clear_mask, uint32_t enable_mask, uint32_t disable_mask); -// gpio_output_set_high does not show in ESP32S3 ROM +// rom_gpio_output_set_high function is not exported by ESP32S3 ROM /** * @brief Sample the value of GPIO input pins(0-31) and returns a bitmask. @@ -72,9 +72,9 @@ void gpio_output_set(uint32_t set_mask, uint32_t clear_mask, uint32_t enable_mas * * @return uint32_t : bitmask for GPIO input pins, BIT(0) for GPIO0. */ -uint32_t gpio_input_get(void); +uint32_t rom_gpio_input_get(void); -// gpio_input_get_high does not show in ESP32S3 ROM +// rom_gpio_input_get_high function is not exported by ESP32S3 ROM /** * @brief Set GPIO to wakeup the chip. @@ -86,7 +86,7 @@ uint32_t gpio_input_get(void); * * @return None */ -void gpio_pin_wakeup_enable(uint32_t i, GPIO_INT_TYPE intr_state); +void rom_gpio_pin_wakeup_enable(uint32_t i, GPIO_INT_TYPE intr_state); /** * @brief disable GPIOs to wakeup the chip. @@ -96,7 +96,7 @@ void gpio_pin_wakeup_enable(uint32_t i, GPIO_INT_TYPE intr_state); * * @return None */ -void gpio_pin_wakeup_disable(void); +void rom_gpio_pin_wakeup_disable(void); /** * @brief set gpio input to a signal, one gpio can input to several signals. @@ -112,7 +112,7 @@ void gpio_pin_wakeup_disable(void); * * @return None */ -void gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); +void rom_gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); /** * @brief set signal output to gpio, one signal can output to several gpios. @@ -128,7 +128,7 @@ void gpio_matrix_in(uint32_t gpio, uint32_t signal_idx, bool inv); * * @return None */ -void gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_inv); +void rom_gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_inv); /** * @brief Select pad as a gpio function from IOMUX. @@ -137,7 +137,7 @@ void gpio_matrix_out(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_ * * @return None */ -void gpio_pad_select_gpio(uint32_t gpio_num); +void rom_gpio_pad_select_gpio(uint32_t gpio_num); /** * @brief Set pad driver capability. @@ -148,7 +148,7 @@ void gpio_pad_select_gpio(uint32_t gpio_num); * * @return None */ -void gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); +void rom_gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); /** * @brief Pull up the pad from gpio number. @@ -157,7 +157,7 @@ void gpio_pad_set_drv(uint32_t gpio_num, uint32_t drv); * * @return None */ -void gpio_pad_pullup(uint32_t gpio_num); +void rom_gpio_pad_pullup(uint32_t gpio_num); /** * @brief Pull down the pad from gpio number. @@ -166,7 +166,7 @@ void gpio_pad_pullup(uint32_t gpio_num); * * @return None */ -void gpio_pad_pulldown(uint32_t gpio_num); +void rom_gpio_pad_pulldown(uint32_t gpio_num); /** * @brief Unhold the pad from gpio number. @@ -175,7 +175,7 @@ void gpio_pad_pulldown(uint32_t gpio_num); * * @return None */ -void gpio_pad_unhold(uint32_t gpio_num); +void rom_gpio_pad_unhold(uint32_t gpio_num); /** * @brief Hold the pad from gpio number. @@ -184,7 +184,7 @@ void gpio_pad_unhold(uint32_t gpio_num); * * @return None */ -void gpio_pad_hold(uint32_t gpio_num); +void rom_gpio_pad_hold(uint32_t gpio_num); /** * @brief enable gpio pad input. @@ -193,7 +193,7 @@ void gpio_pad_hold(uint32_t gpio_num); * * @return None */ -void gpio_pad_input_enable(uint32_t gpio_num); +void rom_gpio_pad_input_enable(uint32_t gpio_num); /** * @brief disable gpio pad input. @@ -202,7 +202,7 @@ void gpio_pad_input_enable(uint32_t gpio_num); * * @return None */ -void gpio_pad_input_disable(uint32_t gpio_num); +void rom_gpio_pad_input_disable(uint32_t gpio_num); /** * @} diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.api.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.api.ld index 8d2f2500ff..5afa9926eb 100644 --- a/components/esp_rom/esp32s3/ld/esp32s3.rom.api.ld +++ b/components/esp_rom/esp32s3/ld/esp32s3.rom.api.ld @@ -8,12 +8,12 @@ PROVIDE ( esp_rom_crc32_be = crc32_be ); PROVIDE ( esp_rom_crc16_be = crc16_be ); PROVIDE ( esp_rom_crc8_be = crc8_be ); -PROVIDE ( esp_rom_gpio_pad_select_gpio = gpio_pad_select_gpio ); -PROVIDE ( esp_rom_gpio_pad_pullup_only = gpio_pad_pullup ); -PROVIDE ( esp_rom_gpio_pad_set_drv = gpio_pad_set_drv ); -PROVIDE ( esp_rom_gpio_pad_unhold = gpio_pad_unhold ); -PROVIDE ( esp_rom_gpio_connect_in_signal = gpio_matrix_in ); -PROVIDE ( esp_rom_gpio_connect_out_signal = gpio_matrix_out ); +PROVIDE ( esp_rom_gpio_pad_select_gpio = rom_gpio_pad_select_gpio ); +PROVIDE ( esp_rom_gpio_pad_pullup_only = rom_gpio_pad_pullup ); +PROVIDE ( esp_rom_gpio_pad_set_drv = rom_gpio_pad_set_drv ); +PROVIDE ( esp_rom_gpio_pad_unhold = rom_gpio_pad_unhold ); +PROVIDE ( esp_rom_gpio_connect_in_signal = rom_gpio_matrix_in ); +PROVIDE ( esp_rom_gpio_connect_out_signal = rom_gpio_matrix_out ); PROVIDE ( esp_rom_efuse_mac_address_crc8 = esp_crc8 ); PROVIDE ( esp_rom_efuse_get_flash_gpio_info = ets_efuse_get_spiconfig ); diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld index 37eaaf71a1..31ef47b830 100644 --- a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld +++ b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld @@ -455,23 +455,23 @@ ets_get_xtal_freq = 0x40001a7c; ***************************************/ /* Functions */ -gpio_input_get = 0x40001a88; -gpio_matrix_in = 0x40001a94; -gpio_matrix_out = 0x40001aa0; -/* gpio_output_disable = 0x40001aac; */ -/* gpio_output_enable = 0x40001ab8; */ -gpio_output_set = 0x40001ac4; -gpio_pad_hold = 0x40001ad0; -gpio_pad_input_disable = 0x40001adc; -gpio_pad_input_enable = 0x40001ae8; -gpio_pad_pulldown = 0x40001af4; -gpio_pad_pullup = 0x40001b00; -gpio_pad_select_gpio = 0x40001b0c; -gpio_pad_set_drv = 0x40001b18; -gpio_pad_unhold = 0x40001b24; -gpio_pin_wakeup_disable = 0x40001b30; -gpio_pin_wakeup_enable = 0x40001b3c; -gpio_bypass_matrix_in = 0x40001b48; +rom_gpio_input_get = 0x40001a88; +rom_gpio_matrix_in = 0x40001a94; +rom_gpio_matrix_out = 0x40001aa0; +rom_gpio_output_disable = 0x40001aac; +rom_gpio_output_enable = 0x40001ab8; +rom_gpio_output_set = 0x40001ac4; +rom_gpio_pad_hold = 0x40001ad0; +rom_gpio_pad_input_disable = 0x40001adc; +rom_gpio_pad_input_enable = 0x40001ae8; +rom_gpio_pad_pulldown = 0x40001af4; +rom_gpio_pad_pullup = 0x40001b00; +rom_gpio_pad_select_gpio = 0x40001b0c; +rom_gpio_pad_set_drv = 0x40001b18; +rom_gpio_pad_unhold = 0x40001b24; +rom_gpio_pin_wakeup_disable = 0x40001b30; +rom_gpio_pin_wakeup_enable = 0x40001b3c; +rom_gpio_bypass_matrix_in = 0x40001b48; /*************************************** diff --git a/components/hal/esp32c5/include/hal/gpio_ll.h b/components/hal/esp32c5/include/hal/gpio_ll.h index aeb764c15f..c1056e20ff 100644 --- a/components/hal/esp32c5/include/hal/gpio_ll.h +++ b/components/hal/esp32c5/include/hal/gpio_ll.h @@ -340,7 +340,7 @@ __attribute__((always_inline)) static inline void gpio_ll_set_level(gpio_dev_t *hw, uint32_t gpio_num, uint32_t level) { #if HAL_CONFIG(GPIO_USE_ROM_API) - gpio_set_output_level(gpio_num, level); + rom_gpio_set_output_level(gpio_num, level); #else if (level) { hw->out_w1ts.val = 1 << gpio_num; @@ -366,7 +366,7 @@ __attribute__((always_inline)) static inline int gpio_ll_get_level(gpio_dev_t *hw, uint32_t gpio_num) { #if HAL_CONFIG(GPIO_USE_ROM_API) - return gpio_get_input_level(gpio_num); + return rom_gpio_get_input_level(gpio_num); #else return (hw->in.in_data_next >> gpio_num) & 0x1; #endif diff --git a/components/hal/esp32c61/include/hal/gpio_ll.h b/components/hal/esp32c61/include/hal/gpio_ll.h index 6c961bfbac..55e7d650ea 100644 --- a/components/hal/esp32c61/include/hal/gpio_ll.h +++ b/components/hal/esp32c61/include/hal/gpio_ll.h @@ -338,7 +338,7 @@ __attribute__((always_inline)) static inline void gpio_ll_set_level(gpio_dev_t *hw, uint32_t gpio_num, uint32_t level) { #if HAL_CONFIG(GPIO_USE_ROM_API) - gpio_set_output_level(gpio_num, level); + rom_gpio_set_output_level(gpio_num, level); #else if (level) { hw->out_w1ts.val = 1 << gpio_num; @@ -364,7 +364,7 @@ __attribute__((always_inline)) static inline int gpio_ll_get_level(gpio_dev_t *hw, uint32_t gpio_num) { #if HAL_CONFIG(GPIO_USE_ROM_API) - return gpio_get_input_level(gpio_num); + return rom_gpio_get_input_level(gpio_num); #else return (hw->in.in_data_next >> gpio_num) & 0x1; #endif diff --git a/components/hal/esp32h4/include/hal/gpio_ll.h b/components/hal/esp32h4/include/hal/gpio_ll.h index db7e98a5bf..2b315c3338 100644 --- a/components/hal/esp32h4/include/hal/gpio_ll.h +++ b/components/hal/esp32h4/include/hal/gpio_ll.h @@ -327,7 +327,7 @@ __attribute__((always_inline)) static inline void gpio_ll_set_level(gpio_dev_t *hw, uint32_t gpio_num, uint32_t level) { #if HAL_CONFIG(GPIO_USE_ROM_API) - gpio_set_output_level(gpio_num, level); + rom_gpio_set_output_level(gpio_num, level); #else if (level) { if (gpio_num < 32) { @@ -361,7 +361,7 @@ __attribute__((always_inline)) static inline int gpio_ll_get_level(gpio_dev_t *hw, uint32_t gpio_num) { #if HAL_CONFIG(GPIO_USE_ROM_API) - return gpio_get_input_level(gpio_num); + return rom_gpio_get_input_level(gpio_num); #else if (gpio_num < 32) { return (hw->in.in_data_next >> gpio_num) & 0x1; diff --git a/components/hal/esp32p4/include/hal/gpio_ll.h b/components/hal/esp32p4/include/hal/gpio_ll.h index 5740207485..2fb2883253 100644 --- a/components/hal/esp32p4/include/hal/gpio_ll.h +++ b/components/hal/esp32p4/include/hal/gpio_ll.h @@ -386,7 +386,7 @@ __attribute__((always_inline)) static inline void gpio_ll_set_level(gpio_dev_t *hw, uint32_t gpio_num, uint32_t level) { #if HAL_CONFIG(GPIO_USE_ROM_API) - gpio_set_output_level(gpio_num, level); + rom_gpio_set_output_level(gpio_num, level); #else if (level) { if (gpio_num < 32) { @@ -420,7 +420,7 @@ __attribute__((always_inline)) static inline int gpio_ll_get_level(gpio_dev_t *hw, uint32_t gpio_num) { #if HAL_CONFIG(GPIO_USE_ROM_API) - return gpio_get_input_level(gpio_num); + return rom_gpio_get_input_level(gpio_num); #else if (gpio_num < 32) { return (hw->in.in_data_next >> gpio_num) & 0x1; diff --git a/components/soc/esp32c2/register/soc/io_mux_reg.h b/components/soc/esp32c2/register/soc/io_mux_reg.h index a9bbf4b915..8177c22d55 100644 --- a/components/soc/esp32c2/register/soc/io_mux_reg.h +++ b/components/soc/esp32c2/register/soc/io_mux_reg.h @@ -123,9 +123,6 @@ #define GPIO_PAD_SET_DRV(num, drv) PIN_SET_DRV(IOMUX_REG_GPIO##num, drv) #define MAX_RTC_GPIO_NUM 5 -#define MAX_PAD_GPIO_NUM 20 -#define MAX_GPIO_NUM 24 -#define DIG_IO_HOLD_BIT_SHIFT 0 #define REG_IO_MUX_BASE DR_REG_IO_MUX_BASE diff --git a/components/soc/esp32c3/register/soc/io_mux_reg.h b/components/soc/esp32c3/register/soc/io_mux_reg.h index 18858567e8..d2b6d0a130 100644 --- a/components/soc/esp32c3/register/soc/io_mux_reg.h +++ b/components/soc/esp32c3/register/soc/io_mux_reg.h @@ -133,9 +133,7 @@ #define USB_INT_PHY0_DM_GPIO_NUM 18 #define USB_INT_PHY0_DP_GPIO_NUM 19 -#define MAX_RTC_GPIO_NUM 5 -#define MAX_PAD_GPIO_NUM 21 -#define MAX_GPIO_NUM 25 +#define MAX_RTC_GPIO_NUM 5 #define REG_IO_MUX_BASE DR_REG_IO_MUX_BASE #define PIN_CTRL (REG_IO_MUX_BASE +0x00) diff --git a/components/soc/esp32c5/register/soc/io_mux_reg.h b/components/soc/esp32c5/register/soc/io_mux_reg.h index df8cc03f1c..b52198bbd1 100644 --- a/components/soc/esp32c5/register/soc/io_mux_reg.h +++ b/components/soc/esp32c5/register/soc/io_mux_reg.h @@ -134,9 +134,6 @@ extern "C" { #define USB_INT_PHY0_DP_GPIO_NUM 14 #define MAX_RTC_GPIO_NUM 6 -#define MAX_PAD_GPIO_NUM 28 -#define MAX_GPIO_NUM 32 -#define DIG_IO_HOLD_BIT_SHIFT 32 #define REG_IO_MUX_BASE DR_REG_IO_MUX_BASE // definitions above are inherited from previous version of code, should double check diff --git a/components/soc/esp32c6/register/soc/io_mux_reg.h b/components/soc/esp32c6/register/soc/io_mux_reg.h index 5b95b56ea2..179ca7a2c4 100644 --- a/components/soc/esp32c6/register/soc/io_mux_reg.h +++ b/components/soc/esp32c6/register/soc/io_mux_reg.h @@ -140,9 +140,6 @@ #define USB_INT_PHY0_DP_GPIO_NUM 13 #define MAX_RTC_GPIO_NUM 7 -#define MAX_PAD_GPIO_NUM 30 -#define MAX_GPIO_NUM 34 -#define DIG_IO_HOLD_BIT_SHIFT 32 #define REG_IO_MUX_BASE DR_REG_IO_MUX_BASE diff --git a/components/soc/esp32c61/register/soc/io_mux_reg.h b/components/soc/esp32c61/register/soc/io_mux_reg.h index b382ea6db8..f564952d9f 100644 --- a/components/soc/esp32c61/register/soc/io_mux_reg.h +++ b/components/soc/esp32c61/register/soc/io_mux_reg.h @@ -110,8 +110,7 @@ extern "C" { #define USB_INT_PHY0_DP_GPIO_NUM 13 #define MAX_RTC_GPIO_NUM 6 -#define MAX_PAD_GPIO_NUM 29 -#define MAX_GPIO_NUM 33 + #define REG_IO_MUX_BASE DR_REG_IO_MUX_BASE // definitions above are inherited from previous version of code, should double check diff --git a/components/soc/esp32h2/register/soc/io_mux_reg.h b/components/soc/esp32h2/register/soc/io_mux_reg.h index d71e6d3e7c..0398f8ef53 100644 --- a/components/soc/esp32h2/register/soc/io_mux_reg.h +++ b/components/soc/esp32h2/register/soc/io_mux_reg.h @@ -152,8 +152,6 @@ #define USB_INT_PHY0_DP_GPIO_NUM 27 #define MAX_RTC_GPIO_NUM 14 // GPIO7~14 are the pads with LP function -#define MAX_PAD_GPIO_NUM 27 -#define MAX_GPIO_NUM 31 #define REG_IO_MUX_BASE DR_REG_IO_MUX_BASE diff --git a/components/soc/esp32h21/register/soc/io_mux_reg.h b/components/soc/esp32h21/register/soc/io_mux_reg.h index 6be4fad93d..ebe6a192d3 100644 --- a/components/soc/esp32h21/register/soc/io_mux_reg.h +++ b/components/soc/esp32h21/register/soc/io_mux_reg.h @@ -145,8 +145,7 @@ extern "C" { #define USB_INT_PHY0_DP_GPIO_NUM 18 #define MAX_RTC_GPIO_NUM 11 // GPIO5~11 are the pads with LP function -#define MAX_PAD_GPIO_NUM 25 -#define MAX_GPIO_NUM 29 + #define REG_IO_MUX_BASE DR_REG_IO_MUX_BASE diff --git a/components/soc/esp32h4/register/soc/io_mux_reg.h b/components/soc/esp32h4/register/soc/io_mux_reg.h index dc183412cf..f3c2474d3e 100644 --- a/components/soc/esp32h4/register/soc/io_mux_reg.h +++ b/components/soc/esp32h4/register/soc/io_mux_reg.h @@ -138,8 +138,7 @@ extern "C" { #define USB_OTG_INT_PHY_DP_GPIO_NUM USB_INT_PHY1_DP_GPIO_NUM #define MAX_RTC_GPIO_NUM 5 -#define MAX_PAD_GPIO_NUM 39 -#define MAX_GPIO_NUM 39 + #define REG_IO_MUX_BASE DR_REG_IO_MUX_BASE // definitions above are inherited from previous version of code, should double check diff --git a/components/soc/esp32p4/register/hw_ver1/soc/io_mux_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/io_mux_reg.h index 18c8e6decd..636dfa706d 100644 --- a/components/soc/esp32p4/register/hw_ver1/soc/io_mux_reg.h +++ b/components/soc/esp32p4/register/hw_ver1/soc/io_mux_reg.h @@ -176,8 +176,6 @@ #define USB_OTG_INT_PHY_DP_GPIO_NUM USB_INT_PHY1_DP_GPIO_NUM #define MAX_RTC_GPIO_NUM 15 -#define MAX_PAD_GPIO_NUM 54 -#define MAX_GPIO_NUM 56 #define REG_IO_MUX_BASE DR_REG_IO_MUX_BASE diff --git a/components/soc/esp32p4/register/hw_ver3/soc/io_mux_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/io_mux_reg.h index 4671c68ae9..c4b16eef1a 100644 --- a/components/soc/esp32p4/register/hw_ver3/soc/io_mux_reg.h +++ b/components/soc/esp32p4/register/hw_ver3/soc/io_mux_reg.h @@ -176,8 +176,6 @@ #define USB_OTG_INT_PHY_DP_GPIO_NUM USB_INT_PHY1_DP_GPIO_NUM #define MAX_RTC_GPIO_NUM 15 -#define MAX_PAD_GPIO_NUM 54 -#define MAX_GPIO_NUM 56 #define REG_IO_MUX_BASE DR_REG_IO_MUX_BASE diff --git a/components/soc/esp32s2/register/soc/io_mux_reg.h b/components/soc/esp32s2/register/soc/io_mux_reg.h index 949be5e5d7..d5fbce4678 100644 --- a/components/soc/esp32s2/register/soc/io_mux_reg.h +++ b/components/soc/esp32s2/register/soc/io_mux_reg.h @@ -144,8 +144,6 @@ #define GPIO_PAD_SET_DRV(num, drv) PIN_SET_DRV(IOMUX_REG_GPIO##num, drv) #define MAX_RTC_GPIO_NUM 21 -#define MAX_PAD_GPIO_NUM 46 -#define MAX_GPIO_NUM 53 #define REG_IO_MUX_BASE DR_REG_IO_MUX_BASE #define PIN_CTRL (REG_IO_MUX_BASE +0x00) diff --git a/components/soc/esp32s3/register/soc/io_mux_reg.h b/components/soc/esp32s3/register/soc/io_mux_reg.h index e44cfc80e3..70ba7661cb 100644 --- a/components/soc/esp32s3/register/soc/io_mux_reg.h +++ b/components/soc/esp32s3/register/soc/io_mux_reg.h @@ -154,9 +154,8 @@ #define XTAL32K_P_GPIO_NUM 15 #define XTAL32K_N_GPIO_NUM 16 -#define MAX_RTC_GPIO_NUM 21 -#define MAX_PAD_GPIO_NUM 48 -#define MAX_GPIO_NUM 53 +#define MAX_RTC_GPIO_NUM 21 + #define REG_IO_MUX_BASE DR_REG_IO_MUX_BASE #define PIN_CTRL (REG_IO_MUX_BASE +0x00) diff --git a/docs/en/migration-guides/release-6.x/6.0/peripherals.rst b/docs/en/migration-guides/release-6.x/6.0/peripherals.rst index 8476e4fcbf..6bad501165 100644 --- a/docs/en/migration-guides/release-6.x/6.0/peripherals.rst +++ b/docs/en/migration-guides/release-6.x/6.0/peripherals.rst @@ -111,7 +111,13 @@ The ``io_od_mode`` member in the :cpp:type:`rmt_tx_channel_config_t` configurati GPIO ---- -:func:`gpio_iomux_in` and :func:`gpio_iomux_out` have been replaced by :func:`gpio_iomux_input` and :func:`gpio_iomux_output`, and have been moved to ``esp_private/gpio.h`` header file as private APIs for internal use only. +- :func:`gpio_iomux_in` and :func:`gpio_iomux_out` have been replaced by :func:`gpio_iomux_input` and :func:`gpio_iomux_output`, and have been moved to ``esp_private/gpio.h`` header file as private APIs for internal use only. + +- ``rom_`` prefix has been added to all GPIO ROM APIs in ``components/esp_rom/esp32xx/include/esp32xx/rom/gpio.h``. For example, :func:`gpio_iomux_in` is now :func:`rom_gpio_iomux_in`. + +- ``MAX_PAD_GPIO_NUM``, ``MAX_GPIO_NUM``, and ``DIG_IO_HOLD_BIT_SHIFT`` macros have been removed. + +- Added the :cpp:type:`esp_err_t` return type to :func:`gpio_uninstall_isr_service`. LEDC ---- diff --git a/docs/zh_CN/migration-guides/release-6.x/6.0/peripherals.rst b/docs/zh_CN/migration-guides/release-6.x/6.0/peripherals.rst index f8a18090f6..0e7c934c91 100644 --- a/docs/zh_CN/migration-guides/release-6.x/6.0/peripherals.rst +++ b/docs/zh_CN/migration-guides/release-6.x/6.0/peripherals.rst @@ -111,7 +111,13 @@ RMT GPIO ---- -:func:`gpio_iomux_in` 和 :func:`gpio_iomux_out` 已被 :func:`gpio_iomux_input` 和 :func:`gpio_iomux_output` 函数取代， 并移至 ``esp_private/gpio.h`` 头文件中作为仅供内部使用的私有 API。 +- :func:`gpio_iomux_in` 和 :func:`gpio_iomux_out` 已被 :func:`gpio_iomux_input` 和 :func:`gpio_iomux_output` 函数取代， 并移至 ``esp_private/gpio.h`` 头文件中作为仅供内部使用的私有 API。 + +- ``rom_`` 前缀已添加进 ``components/esp_rom/esp32xx/include/esp32xx/rom/gpio.h`` 中的所有 GPIO ROM API。例如，:func:`gpio_iomux_in` 现在为 :func:`rom_gpio_iomux_in`。 + +- ``MAX_PAD_GPIO_NUM``、 ``MAX_GPIO_NUM`` 和 ``DIG_IO_HOLD_BIT_SHIFT`` 宏已被移除。 + +- 为 :func:`gpio_uninstall_isr_service` 添加了 :cpp:type:`esp_err_t` 返回类型。 LEDC ---- diff --git a/tools/idf_py_actions/hints.yml b/tools/idf_py_actions/hints.yml index c7af7f187d..ec213e6226 100644 --- a/tools/idf_py_actions/hints.yml +++ b/tools/idf_py_actions/hints.yml @@ -524,6 +524,10 @@ re: "has no member named 'io_od_mode'" hint: "Please include 'driver/gpio.h' and call 'gpio_od_enable' to enable the open-drain mode." +- + re: "(error: implicit declaration of function|undefined reference to) '(gpio_pad_set_drv|gpio_pad_pullup|gpio_pad_select_gpio|gpio_pad_unhold|gpio_matrix_in|gpio_matrix_out)'" + hint: "The rom GPIO functions have been renamed. Please replace with the APIs in 'esp_rom_gpio.h'." + - re: "error: implicit declaration of function '(esp_dma_capable_malloc|esp_dma_capable_calloc|esp_cache_aligned_malloc|esp_cache_aligned_calloc)'" hint: "Use the memory allocation functions from the esp_heap_caps.h with proper capability flags.\nFor example, use heap_caps_malloc() with the MALLOC_CAP_CACHE_ALIGNED flag to allocate memory that is aligned to cache line."