diff --git a/components/log/include/esp_log_buffer.h b/components/log/include/esp_log_buffer.h index e38bde768c..e34ba29551 100644 --- a/components/log/include/esp_log_buffer.h +++ b/components/log/include/esp_log_buffer.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -147,30 +147,6 @@ void esp_log_buffer_hexdump_internal(const char *tag, const void *buffer, uint16 #define ESP_LOG_BUFFER_CHAR(tag, buffer, buff_len) \ do { if (ESP_LOG_ENABLED(ESP_LOG_INFO)) {ESP_LOG_BUFFER_CHAR_LEVEL(tag, buffer, buff_len, ESP_LOG_INFO);} } while(0) -/** @cond */ -/** - * @note For back compatible - * @deprecated This function is deprecated and will be removed in the future. - * Please use ESP_LOG_BUFFER_HEX - */ -__attribute__((deprecated("Use 'ESP_LOG_BUFFER_HEX' instead"))) -static inline void esp_log_buffer_hex(const char *tag, const void *buffer, uint16_t buff_len) -{ - ESP_LOG_BUFFER_HEX(tag, buffer, buff_len); -} - -/** - * @note For back compatible - * @deprecated This function is deprecated and will be removed in the future. - * Please use ESP_LOG_BUFFER_CHAR - */ -__attribute__((deprecated("Use 'ESP_LOG_BUFFER_CHAR' instead"))) -static inline void esp_log_buffer_char(const char *tag, const void *buffer, uint16_t buff_len) -{ - ESP_LOG_BUFFER_CHAR(tag, buffer, buff_len); -} -/** @endcond */ - #ifdef __cplusplus } #endif diff --git a/components/log/include/esp_log_internal.h b/components/log/include/esp_log_internal.h deleted file mode 100644 index cee155fd64..0000000000 --- a/components/log/include/esp_log_internal.h +++ /dev/null @@ -1,9 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#pragma once -#warning "esp_log_internal.h is deprecated, please migrate to esp_log_buffer.h" -#include "esp_log_buffer.h" 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 1f9439bd7c..b907b3c864 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 @@ -116,6 +116,20 @@ Ring Buffer To reduce IRAM usage, the default placement for `esp_ringbuf` functions has been changed from IRAM to Flash. Consequently, the ``CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH`` option has been removed. This change saves a significant amount of IRAM but may have a slight performance impact. For performance-critical applications, the previous behavior can be restored by enabling the new :ref:`CONFIG_RINGBUF_IN_IRAM` option. +Log +--- + +**Removed Functions** + +The following deprecated Log functions have been removed in ESP-IDF v6.0: + +- :cpp:func:`esp_log_buffer_hex` - Use :cpp:func:`ESP_LOG_BUFFER_HEX` instead. +- :cpp:func:`esp_log_buffer_char` - Use :cpp:func:`ESP_LOG_BUFFER_CHAR` instead. + +**Removed Headers** + +- ``esp_log_internal.h`` - Use ``esp_log_buffer.h`` instead. + Core Dump --------- diff --git a/docs/zh_CN/migration-guides/release-6.x/6.0/system.rst b/docs/zh_CN/migration-guides/release-6.x/6.0/system.rst index e9047c55ca..c47745b478 100644 --- a/docs/zh_CN/migration-guides/release-6.x/6.0/system.rst +++ b/docs/zh_CN/migration-guides/release-6.x/6.0/system.rst @@ -116,6 +116,20 @@ FreeRTOS 为了减少 IRAM 的使用,`esp_ringbuf` 函数的默认位置已从 IRAM 更改为 Flash。因此,``CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH`` 选项已被移除。此举可节省大量 IRAM,但可能会对性能造成轻微影响。对于性能要求严苛的应用程序,可通过启用新增的 :ref:`CONFIG_RINGBUF_IN_IRAM` 选项来恢复之前的行为。 +Log +--- + +**已移除的函数** + +以下已弃用的 Log 函数已在 ESP-IDF v6.0 中移除: + +- :cpp:func:`esp_log_buffer_hex` – 请使用 :cpp:func:`ESP_LOG_BUFFER_HEX` 替代。 +- :cpp:func:`esp_log_buffer_char` – 请使用 :cpp:func:`ESP_LOG_BUFFER_CHAR` 替代。 + +**已移除的头文件** + +- ``esp_log_internal.h`` – 请使用 ``esp_log_buffer.h`` 替代。 + 核心转储 -------- diff --git a/tools/ci/check_public_headers_exceptions.txt b/tools/ci/check_public_headers_exceptions.txt index 497a452bc1..bcf2d42dc8 100644 --- a/tools/ci/check_public_headers_exceptions.txt +++ b/tools/ci/check_public_headers_exceptions.txt @@ -14,7 +14,6 @@ components/freertos/FreeRTOS-Kernel-SMP/include/freertos/ components/freertos/FreeRTOS-Kernel-SMP/portable/xtensa/include/freertos/ -components/log/include/esp_log_internal.h