From af91aa771b7eccb3a069d1e08c0b765ad0807216 Mon Sep 17 00:00:00 2001 From: Marius Vikhammer Date: Fri, 12 Sep 2025 11:49:20 +0800 Subject: [PATCH] change(rom): removed deprecated STATUS enum, use ETS_STATUS instead --- .../esp_rom/esp32/include/esp32/rom/ets_sys.h | 13 +---------- .../esp32c2/include/esp32c2/rom/ets_sys.h | 13 +---------- .../esp32c3/include/esp32c3/rom/ets_sys.h | 13 +---------- .../esp32c5/include/esp32c5/rom/ets_sys.h | 11 ---------- .../esp32c6/include/esp32c6/rom/ets_sys.h | 13 +---------- .../esp32c61/include/esp32c61/rom/ets_sys.h | 11 ---------- .../esp32h2/include/esp32h2/rom/ets_sys.h | 13 +---------- .../esp32h21/include/esp32h21/rom/ets_sys.h | 11 ---------- .../esp32h4/include/esp32h4/rom/ets_sys.h | 11 ---------- .../esp32p4/include/esp32p4/rom/ets_sys.h | 10 +-------- .../esp32p4/include/esp32p4/rom/uart.h | 22 +++++++++---------- .../esp32s2/include/esp32s2/rom/ets_sys.h | 13 +---------- .../esp32s3/include/esp32s3/rom/ets_sys.h | 13 +---------- .../release-6.x/6.0/system.rst | 6 +++++ 14 files changed, 25 insertions(+), 148 deletions(-) diff --git a/components/esp_rom/esp32/include/esp32/rom/ets_sys.h b/components/esp_rom/esp32/include/esp32/rom/ets_sys.h index eb73b89795..0d6e49f799 100644 --- a/components/esp_rom/esp32/include/esp32/rom/ets_sys.h +++ b/components/esp_rom/esp32/include/esp32/rom/ets_sys.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2010-2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2010-2025 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -624,17 +624,6 @@ void intr_matrix_set(int cpu_no, uint32_t model_num, uint32_t intr_num); #define ETS_MEM_BAR() asm volatile ( "" : : : "memory" ) -#ifdef ESP_PLATFORM -// Remove in IDF v6.0 (IDF-7044) -typedef enum { - OK = 0, - FAIL, - PENDING, - BUSY, - CANCEL, -} STATUS __attribute__((deprecated("Use ETS_STATUS instead"))); -#endif - /** * @} */ diff --git a/components/esp_rom/esp32c2/include/esp32c2/rom/ets_sys.h b/components/esp_rom/esp32c2/include/esp32c2/rom/ets_sys.h index 2665a1f58a..d9c2b1643e 100644 --- a/components/esp_rom/esp32c2/include/esp32c2/rom/ets_sys.h +++ b/components/esp_rom/esp32c2/include/esp32c2/rom/ets_sys.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2024 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2025 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -456,17 +456,6 @@ void intr_matrix_set(int cpu_no, uint32_t model_num, uint32_t intr_num); #define ETS_MEM_BAR() asm volatile ( "" : : : "memory" ) -#ifdef ESP_PLATFORM -// Remove in IDF v6.0 (IDF-7044) -typedef enum { - OK = 0, - FAIL, - PENDING, - BUSY, - CANCEL, -} STATUS __attribute__((deprecated("Use ETS_STATUS instead"))); -#endif - /** * @} */ diff --git a/components/esp_rom/esp32c3/include/esp32c3/rom/ets_sys.h b/components/esp_rom/esp32c3/include/esp32c3/rom/ets_sys.h index 96ade75932..61eff312f8 100644 --- a/components/esp_rom/esp32c3/include/esp32c3/rom/ets_sys.h +++ b/components/esp_rom/esp32c3/include/esp32c3/rom/ets_sys.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2023 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2025 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -433,17 +433,6 @@ void intr_matrix_set(int cpu_no, uint32_t model_num, uint32_t intr_num); #define ETS_MEM_BAR() asm volatile ( "" : : : "memory" ) -#ifdef ESP_PLATFORM -// Remove in IDF v6.0 (IDF-7044) -typedef enum { - OK = 0, - FAIL, - PENDING, - BUSY, - CANCEL, -} STATUS __attribute__((deprecated("Use ETS_STATUS instead"))); -#endif - /** * @} */ diff --git a/components/esp_rom/esp32c5/include/esp32c5/rom/ets_sys.h b/components/esp_rom/esp32c5/include/esp32c5/rom/ets_sys.h index 35b2bcc075..ec2f218f1e 100644 --- a/components/esp_rom/esp32c5/include/esp32c5/rom/ets_sys.h +++ b/components/esp_rom/esp32c5/include/esp32c5/rom/ets_sys.h @@ -410,17 +410,6 @@ void intr_matrix_set(int cpu_no, uint32_t model_num, uint32_t intr_num); #define ETS_MEM_BAR() asm volatile ( "" : : : "memory" ) -#ifdef ESP_PLATFORM -// Remove in IDF v6.0 (IDF-7044) -typedef enum { - OK = 0, - FAIL, - PENDING, - BUSY, - CANCEL, -} STATUS __attribute__((deprecated("Use ETS_STATUS instead"))); -#endif - /** * @brief Returns the offset from which the bootloader image is used to load. * diff --git a/components/esp_rom/esp32c6/include/esp32c6/rom/ets_sys.h b/components/esp_rom/esp32c6/include/esp32c6/rom/ets_sys.h index d4b0989650..5b20565588 100644 --- a/components/esp_rom/esp32c6/include/esp32c6/rom/ets_sys.h +++ b/components/esp_rom/esp32c6/include/esp32c6/rom/ets_sys.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -410,17 +410,6 @@ void intr_matrix_set(int cpu_no, uint32_t model_num, uint32_t intr_num); #define ETS_MEM_BAR() asm volatile ( "" : : : "memory" ) -#ifdef ESP_PLATFORM -// Remove in IDF v6.0 (IDF-7044) -typedef enum { - OK = 0, - FAIL, - PENDING, - BUSY, - CANCEL, -} STATUS __attribute__((deprecated("Use ETS_STATUS instead"))); -#endif - /** * @} */ diff --git a/components/esp_rom/esp32c61/include/esp32c61/rom/ets_sys.h b/components/esp_rom/esp32c61/include/esp32c61/rom/ets_sys.h index e65942925c..7d86da0d6e 100644 --- a/components/esp_rom/esp32c61/include/esp32c61/rom/ets_sys.h +++ b/components/esp_rom/esp32c61/include/esp32c61/rom/ets_sys.h @@ -410,17 +410,6 @@ void intr_matrix_set(int cpu_no, uint32_t model_num, uint32_t intr_num); #define ETS_MEM_BAR() asm volatile ( "" : : : "memory" ) -#ifdef ESP_PLATFORM -// Remove in IDF v6.0 (IDF-7044) -typedef enum { - OK = 0, - FAIL, - PENDING, - BUSY, - CANCEL, -} STATUS __attribute__((deprecated("Use ETS_STATUS instead"))); -#endif - /** * @brief Returns the offset from which the bootloader image is used to load. * diff --git a/components/esp_rom/esp32h2/include/esp32h2/rom/ets_sys.h b/components/esp_rom/esp32h2/include/esp32h2/rom/ets_sys.h index 0b19741d5d..6aeb68bccd 100644 --- a/components/esp_rom/esp32h2/include/esp32h2/rom/ets_sys.h +++ b/components/esp_rom/esp32h2/include/esp32h2/rom/ets_sys.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -409,17 +409,6 @@ void intr_matrix_set(int cpu_no, uint32_t model_num, uint32_t intr_num); #define ETS_MEM_BAR() asm volatile ( "" : : : "memory" ) -#ifdef ESP_PLATFORM -// Remove in IDF v6.0 (IDF-7044) -typedef enum { - OK = 0, - FAIL, - PENDING, - BUSY, - CANCEL, -} STATUS __attribute__((deprecated("Use ETS_STATUS instead"))); -#endif - /** * @} */ diff --git a/components/esp_rom/esp32h21/include/esp32h21/rom/ets_sys.h b/components/esp_rom/esp32h21/include/esp32h21/rom/ets_sys.h index 52114de8c6..83b6b4b6e1 100644 --- a/components/esp_rom/esp32h21/include/esp32h21/rom/ets_sys.h +++ b/components/esp_rom/esp32h21/include/esp32h21/rom/ets_sys.h @@ -409,17 +409,6 @@ void intr_matrix_set(int cpu_no, uint32_t model_num, uint32_t intr_num); #define ETS_MEM_BAR() asm volatile ( "" : : : "memory" ) -#ifdef ESP_PLATFORM -// Remove in IDF v6.0 (IDF-7044) -typedef enum { - OK = 0, - FAIL, - PENDING, - BUSY, - CANCEL, -} STATUS __attribute__((deprecated("Use ETS_STATUS instead"))); -#endif - /** * @} */ diff --git a/components/esp_rom/esp32h4/include/esp32h4/rom/ets_sys.h b/components/esp_rom/esp32h4/include/esp32h4/rom/ets_sys.h index 6ecb2b3a1d..7a63d372c8 100644 --- a/components/esp_rom/esp32h4/include/esp32h4/rom/ets_sys.h +++ b/components/esp_rom/esp32h4/include/esp32h4/rom/ets_sys.h @@ -414,17 +414,6 @@ void ets_set_appcpu_boot_addr(uint32_t start); #define ETS_MEM_BAR() asm volatile ( "" : : : "memory" ) -#ifdef ESP_PLATFORM -// Remove in IDF v6.0 (IDF-7044) -typedef enum { - OK = 0, - FAIL, - PENDING, - BUSY, - CANCEL, -} STATUS __attribute__((deprecated("Use ETS_STATUS instead"))); -#endif - /** * @} */ diff --git a/components/esp_rom/esp32p4/include/esp32p4/rom/ets_sys.h b/components/esp_rom/esp32p4/include/esp32p4/rom/ets_sys.h index 95d8b092fc..b48d9ef3ce 100644 --- a/components/esp_rom/esp32p4/include/esp32p4/rom/ets_sys.h +++ b/components/esp_rom/esp32p4/include/esp32p4/rom/ets_sys.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -508,14 +508,6 @@ void intr_matrix_set(int cpu_no, uint32_t model_num, uint32_t intr_num); #define ETS_MEM_BAR() asm volatile ( "" : : : "memory" ) -typedef enum { - OK = 0, - FAIL, - PENDING, - BUSY, - CANCEL, -} STATUS; - /** * @} */ diff --git a/components/esp_rom/esp32p4/include/esp32p4/rom/uart.h b/components/esp_rom/esp32p4/include/esp32p4/rom/uart.h index b3a399356c..0d836c1b42 100644 --- a/components/esp_rom/esp32p4/include/esp32p4/rom/uart.h +++ b/components/esp_rom/esp32p4/include/esp32p4/rom/uart.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -31,7 +31,7 @@ extern "C" { //uart int enable register ctrl bits #define UART_RCV_INTEN BIT0 #define UART_TRX_INTEN BIT1 -#define UART_LINE_STATUS_INTEN BIT2 +#define UART_LINE_ETS_STATUS_INTEN BIT2 //uart int identification ctrl bits #define UART_INT_FLAG_MASK 0x0E @@ -58,7 +58,7 @@ extern "C" { #define FRAME_FLAG 0x7E typedef enum { - UART_LINE_STATUS_INT_FLAG = 0x06, + UART_LINE_ETS_STATUS_INT_FLAG = 0x06, UART_RCV_FIFO_INT_FLAG = 0x04, UART_RCV_TMOUT_INT_FLAG = 0x0C, UART_TXBUFF_EMPTY_INT_FLAG = 0x02 @@ -228,7 +228,7 @@ void uart_buff_switch(uint8_t uart_no); * * @return OK. */ -STATUS uart_tx_one_char(uint8_t TxChar); +ETS_STATUS uart_tx_one_char(uint8_t TxChar); /** * @brief Output a char to message exchange channel, wait until fifo not full. @@ -238,7 +238,7 @@ STATUS uart_tx_one_char(uint8_t TxChar); * * @return OK. */ -STATUS uart_tx_one_char2(uint8_t TxChar); +ETS_STATUS uart_tx_one_char2(uint8_t TxChar); /** * @brief Wait until uart tx full empty. @@ -268,7 +268,7 @@ void uart_tx_wait_idle(uint8_t uart_no); * @return OK for successful. * FAIL for failed. */ -STATUS uart_rx_one_char(uint8_t *pRxChar); +ETS_STATUS uart_rx_one_char(uint8_t *pRxChar); /** * @brief Get an input char from message channel, wait until successful. @@ -290,7 +290,7 @@ char uart_rx_one_char_block(void); * * @return OK. */ -STATUS UartRxString(uint8_t *pString, uint8_t MaxStrlen); +ETS_STATUS UartRxString(uint8_t *pString, uint8_t MaxStrlen); /** * @brief Process uart received information in the interrupt handler. @@ -313,7 +313,7 @@ void uart_rx_intr_handler(void *para); * @return OK for successful. * FAIL for failed. */ -STATUS uart_rx_readbuff( RcvMsgBuff *pRxBuff, uint8_t *pRxByte); +ETS_STATUS uart_rx_readbuff( RcvMsgBuff *pRxBuff, uint8_t *pRxByte); /** * @brief Get all chars from receive buffer. @@ -324,7 +324,7 @@ STATUS uart_rx_readbuff( RcvMsgBuff *pRxBuff, uint8_t *pRxByte); * @return OK for successful. * FAIL for failed. */ -STATUS UartGetCmdLn(uint8_t *pCmdLn); +ETS_STATUS UartGetCmdLn(uint8_t *pCmdLn); /** * @brief Get uart configuration struct. @@ -374,7 +374,7 @@ int recv_packet(uint8_t *p, int len, uint8_t is_sync); * @return OK for successful. * FAIL for failed. */ -STATUS SendMsg(uint8_t *pData, uint16_t DataLen); +ETS_STATUS SendMsg(uint8_t *pData, uint16_t DataLen); /** * @brief Receive an packet from download tool, with SLIP escaping. @@ -390,7 +390,7 @@ STATUS SendMsg(uint8_t *pData, uint16_t DataLen); * @return OK for successful. * FAIL for failed. */ -STATUS RcvMsg(uint8_t *pData, uint16_t MaxDataLen, uint8_t is_sync); +ETS_STATUS RcvMsg(uint8_t *pData, uint16_t MaxDataLen, uint8_t is_sync); /** * @brief Check if this UART is in download connection. diff --git a/components/esp_rom/esp32s2/include/esp32s2/rom/ets_sys.h b/components/esp_rom/esp32s2/include/esp32s2/rom/ets_sys.h index 8cb3832e37..0a16b03dd1 100644 --- a/components/esp_rom/esp32s2/include/esp32s2/rom/ets_sys.h +++ b/components/esp_rom/esp32s2/include/esp32s2/rom/ets_sys.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2010-2024 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2010-2025 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -574,17 +574,6 @@ void intr_matrix_set(int cpu_no, uint32_t model_num, uint32_t intr_num); #define ETS_MEM_BAR() asm volatile ( "" : : : "memory" ) -#ifdef ESP_PLATFORM -// Remove in IDF v6.0 (IDF-7044) -typedef enum { - OK = 0, - FAIL, - PENDING, - BUSY, - CANCEL, -} STATUS __attribute__((deprecated("Use ETS_STATUS instead"))); -#endif - /** * @} */ diff --git a/components/esp_rom/esp32s3/include/esp32s3/rom/ets_sys.h b/components/esp_rom/esp32s3/include/esp32s3/rom/ets_sys.h index 7bc91572f2..4122830f47 100644 --- a/components/esp_rom/esp32s3/include/esp32s3/rom/ets_sys.h +++ b/components/esp_rom/esp32s3/include/esp32s3/rom/ets_sys.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2010-2023 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2010-2025 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -546,17 +546,6 @@ void intr_matrix_set(int cpu_no, uint32_t model_num, uint32_t intr_num); #define ETS_MEM_BAR() asm volatile ( "" : : : "memory" ) -#ifdef ESP_PLATFORM -// Remove in IDF v6.0 (IDF-7044) -typedef enum { - OK = 0, - FAIL, - PENDING, - BUSY, - CANCEL, -} STATUS __attribute__((deprecated("Use ETS_STATUS instead"))); -#endif - /** * @} */ diff --git a/docs/en/migration-guides/release-6.x/6.0/system.rst b/docs/en/migration-guides/release-6.x/6.0/system.rst index 9b858ca496..7faccc5126 100644 --- a/docs/en/migration-guides/release-6.x/6.0/system.rst +++ b/docs/en/migration-guides/release-6.x/6.0/system.rst @@ -60,6 +60,12 @@ The deprecated ``intr_types.h`` header file has been removed. Please include the The deprecated ``esp_private/interrupt_deprecated.h`` header file, which was available to users through the ``riscv/interrupt.h`` header, has been removed. The deprecated functions are no longer available, please use the non-deprecated versions instead. +ROM Headers +----------- + +The deprecated ``STATUS`` type has been removed from ``ets_sys.h`` ROM header files. Please use ``ETS_STATUS`` instead. + + App Trace ----------