change(rom): removed deprecated STATUS enum, use ETS_STATUS instead

This commit is contained in:
Marius Vikhammer
2025-09-12 11:49:20 +08:00
committed by Zhang Shuxian
parent ab2829d65f
commit af91aa771b
14 changed files with 25 additions and 148 deletions

View File

@@ -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 * 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" ) #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
/** /**
* @} * @}
*/ */

View File

@@ -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 * 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" ) #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
/** /**
* @} * @}
*/ */

View File

@@ -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 * 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" ) #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
/** /**
* @} * @}
*/ */

View File

@@ -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" ) #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. * @brief Returns the offset from which the bootloader image is used to load.
* *

View File

@@ -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 * 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" ) #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
/** /**
* @} * @}
*/ */

View File

@@ -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" ) #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. * @brief Returns the offset from which the bootloader image is used to load.
* *

View File

@@ -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 * 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" ) #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
/** /**
* @} * @}
*/ */

View File

@@ -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" ) #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
/** /**
* @} * @}
*/ */

View File

@@ -414,17 +414,6 @@ void ets_set_appcpu_boot_addr(uint32_t start);
#define ETS_MEM_BAR() asm volatile ( "" : : : "memory" ) #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
/** /**
* @} * @}
*/ */

View File

@@ -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 * 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" ) #define ETS_MEM_BAR() asm volatile ( "" : : : "memory" )
typedef enum {
OK = 0,
FAIL,
PENDING,
BUSY,
CANCEL,
} STATUS;
/** /**
* @} * @}
*/ */

View File

@@ -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 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -31,7 +31,7 @@ extern "C" {
//uart int enable register ctrl bits //uart int enable register ctrl bits
#define UART_RCV_INTEN BIT0 #define UART_RCV_INTEN BIT0
#define UART_TRX_INTEN BIT1 #define UART_TRX_INTEN BIT1
#define UART_LINE_STATUS_INTEN BIT2 #define UART_LINE_ETS_STATUS_INTEN BIT2
//uart int identification ctrl bits //uart int identification ctrl bits
#define UART_INT_FLAG_MASK 0x0E #define UART_INT_FLAG_MASK 0x0E
@@ -58,7 +58,7 @@ extern "C" {
#define FRAME_FLAG 0x7E #define FRAME_FLAG 0x7E
typedef enum { typedef enum {
UART_LINE_STATUS_INT_FLAG = 0x06, UART_LINE_ETS_STATUS_INT_FLAG = 0x06,
UART_RCV_FIFO_INT_FLAG = 0x04, UART_RCV_FIFO_INT_FLAG = 0x04,
UART_RCV_TMOUT_INT_FLAG = 0x0C, UART_RCV_TMOUT_INT_FLAG = 0x0C,
UART_TXBUFF_EMPTY_INT_FLAG = 0x02 UART_TXBUFF_EMPTY_INT_FLAG = 0x02
@@ -228,7 +228,7 @@ void uart_buff_switch(uint8_t uart_no);
* *
* @return OK. * @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. * @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. * @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. * @brief Wait until uart tx full empty.
@@ -268,7 +268,7 @@ void uart_tx_wait_idle(uint8_t uart_no);
* @return OK for successful. * @return OK for successful.
* FAIL for failed. * 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. * @brief Get an input char from message channel, wait until successful.
@@ -290,7 +290,7 @@ char uart_rx_one_char_block(void);
* *
* @return OK. * @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. * @brief Process uart received information in the interrupt handler.
@@ -313,7 +313,7 @@ void uart_rx_intr_handler(void *para);
* @return OK for successful. * @return OK for successful.
* FAIL for failed. * 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. * @brief Get all chars from receive buffer.
@@ -324,7 +324,7 @@ STATUS uart_rx_readbuff( RcvMsgBuff *pRxBuff, uint8_t *pRxByte);
* @return OK for successful. * @return OK for successful.
* FAIL for failed. * FAIL for failed.
*/ */
STATUS UartGetCmdLn(uint8_t *pCmdLn); ETS_STATUS UartGetCmdLn(uint8_t *pCmdLn);
/** /**
* @brief Get uart configuration struct. * @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. * @return OK for successful.
* FAIL for failed. * 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. * @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. * @return OK for successful.
* FAIL for failed. * 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. * @brief Check if this UART is in download connection.

View File

@@ -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 * 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" ) #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
/** /**
* @} * @}
*/ */

View File

@@ -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 * 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" ) #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
/** /**
* @} * @}
*/ */

View File

@@ -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. 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 App Trace
---------- ----------