From 8c2949a97e95cdd2535bd266371389e900499c6b Mon Sep 17 00:00:00 2001 From: Darian Leung Date: Fri, 27 Oct 2023 18:14:53 +0800 Subject: [PATCH] change(xtensa): Deprecate ".../xtensa_timer.h" include path This commit deprecates the "freertos/xtensa_timer.h" and "xtensa/xtensa_timer.h" include paths. Users should use "xtensa_timer.h" instead. - Replace legacy include paths - Removed some unnecessary includes of "xtensa_timer.h" - Add warning to compatibility header --- .../test_apps/esp_hw_support_unity_tests/main/test_dport.c | 2 +- components/esp_pm/pm_impl.c | 2 +- components/mbedtls/test_apps/main/test_aes_sha_rsa.c | 1 - components/xtensa/deprecated_include/freertos/xtensa_timer.h | 4 ++-- components/xtensa/deprecated_include/xtensa/xtensa_timer.h | 4 ++-- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/main/test_dport.c b/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/main/test_dport.c index 6c8494e57b..755d75a94a 100644 --- a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/main/test_dport.c +++ b/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/main/test_dport.c @@ -17,7 +17,7 @@ #include "freertos/FreeRTOS.h" #include "freertos/task.h" #include "freertos/semphr.h" -#include "freertos/xtensa_timer.h" +#include "xtensa_timer.h" #include "driver/uart.h" #include "unity.h" #include "test_utils.h" diff --git a/components/esp_pm/pm_impl.c b/components/esp_pm/pm_impl.c index c594a3d3db..09e42125ad 100644 --- a/components/esp_pm/pm_impl.c +++ b/components/esp_pm/pm_impl.c @@ -29,7 +29,7 @@ #include "freertos/FreeRTOS.h" #include "freertos/task.h" #if CONFIG_FREERTOS_SYSTICK_USES_CCOUNT -#include "freertos/xtensa_timer.h" +#include "xtensa_timer.h" #include "xtensa/core-macros.h" #endif diff --git a/components/mbedtls/test_apps/main/test_aes_sha_rsa.c b/components/mbedtls/test_apps/main/test_aes_sha_rsa.c index 497180fba1..650d7b7882 100644 --- a/components/mbedtls/test_apps/main/test_aes_sha_rsa.c +++ b/components/mbedtls/test_apps/main/test_aes_sha_rsa.c @@ -14,7 +14,6 @@ #include "freertos/FreeRTOS.h" #include "freertos/task.h" #include "freertos/semphr.h" -#include "freertos/xtensa_timer.h" #include "unity.h" #include "test_utils.h" #include "esp32/rom/sha.h" diff --git a/components/xtensa/deprecated_include/freertos/xtensa_timer.h b/components/xtensa/deprecated_include/freertos/xtensa_timer.h index 40f7223f44..5f33d4b91c 100644 --- a/components/xtensa/deprecated_include/freertos/xtensa_timer.h +++ b/components/xtensa/deprecated_include/freertos/xtensa_timer.h @@ -6,6 +6,6 @@ #pragma once -/* This header file has been moved, thus `#include ` is deprecated. Please use `#include ` instead */ -/* Todo: IDF-7230 */ +#warning "This header file has been moved, thus `#include ` is deprecated. Please use `#include ` instead" + #include diff --git a/components/xtensa/deprecated_include/xtensa/xtensa_timer.h b/components/xtensa/deprecated_include/xtensa/xtensa_timer.h index 7df0c8d502..b17332c9f1 100644 --- a/components/xtensa/deprecated_include/xtensa/xtensa_timer.h +++ b/components/xtensa/deprecated_include/xtensa/xtensa_timer.h @@ -6,6 +6,6 @@ #pragma once -/* This header file has been moved, thus `#include ` is deprecated. Please use `#include ` instead */ -/* Todo: IDF-7230 */ +#warning "This header file has been moved, thus `#include ` is deprecated. Please use `#include ` instead" + #include