alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

change(xtensa): Deprecate ".../xtensa_context.h" include path

Browse Source 
This commit deprecates the "freertos/xtensa_context.h" and "xtensa/xtensa_context.h"
include paths. Users should use "xtensa_context.h" instead.

- Replace legacy include paths
- Removed some unnecessary includes of "xtensa_api.h"
- Add warning to compatibility header
This commit is contained in:
Darian Leung 2023-10-27 18:10:47 +08:00
parent 2204c8e137
commit a5d5ee7445
20 changed files with 32 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/bt/controller/esp32/hli_vectors.S
View File

@ -8,7 +8,7 @@
#include <xtensa/coreasm.h>
#include <xtensa/corebits.h>
#include <xtensa/config/system.h>
#include "freertos/xtensa_context.h"
#include "xtensa_context.h"
#include "sdkconfig.h"
#include "soc/soc.h"

2
components/esp_gdbstub/src/port/xtensa/include/esp_gdbstub_arch.h
View File

@ -6,7 +6,7 @@
#pragma once
#include <stdint.h>
#include "freertos/xtensa_context.h"
#include "xtensa_context.h"
#include "sdkconfig.h"
#if CONFIG_IDF_TARGET_ESP32

2
components/esp_gdbstub/src/port/xtensa/xt_debugexception.S
View File

@ -7,7 +7,7 @@
#include <xtensa/coreasm.h>
#include <xtensa/corebits.h>
#include <xtensa/config/system.h>
#include "freertos/xtensa_context.h"
#include "xtensa_context.h"
.section .iram1,"ax"
.global _xt_panic_gdbstub

2
components/esp_hw_support/test_apps/esp_hw_support_unity_tests/main/test_dport_xt_highint5.S
View File

@ -9,7 +9,7 @@
#include <xtensa/coreasm.h>
#include <xtensa/corebits.h>
#include <xtensa/config/system.h>
#include "freertos/xtensa_context.h"
#include "xtensa_context.h"
#include "esp_private/panic_reason.h"
#include "soc/soc.h"
#include "soc/dport_reg.h"

2
components/esp_system/port/arch/xtensa/debug_helpers.c
View File

@ -15,7 +15,7 @@
#include "esp_cpu_utils.h"
#include "esp_private/panic_internal.h"
#include "xtensa/xtensa_context.h"
#include "xtensa_context.h"
#include "sdkconfig.h"

2
components/esp_system/port/arch/xtensa/esp_ipc_isr_handler.S
View File

@ -7,7 +7,7 @@
#include <xtensa/coreasm.h>
#include <xtensa/corebits.h>
#include <xtensa/config/system.h>
#include "freertos/xtensa_context.h"
#include "xtensa_context.h"
#include "esp_private/panic_reason.h"
#include "sdkconfig.h"
#include "soc/soc.h"

20
components/esp_system/port/arch/xtensa/expression_with_stack_asm.S
View File

@ -1,18 +1,10 @@
// Copyright 2015-2019 Espressif Systems (Shanghai) PTE LTD
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
/*
* SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
#include <freertos/xtensa_context.h>
#include <xtensa_context.h>
.extern xtensa_shared_stack
.extern xtensa_shared_stack_callback

2
components/esp_system/port/arch/xtensa/panic_arch.c
View File

@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include "freertos/xtensa_context.h"
#include "xtensa_context.h"
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"

2
components/esp_system/port/soc/esp32/highint_hdl.S
View File

@ -8,7 +8,7 @@
#include <xtensa/coreasm.h>
#include <xtensa/corebits.h>
#include <xtensa/config/system.h>
#include "freertos/xtensa_context.h"
#include "xtensa_context.h"
#include "freertos/xtensa_rtos.h"
#include "esp_private/panic_reason.h"
#include "sdkconfig.h"

20
components/esp_system/port/soc/esp32s2/highint_hdl.S
View File

@ -1,22 +1,14 @@
// Copyright 2015-2017 Espressif Systems (Shanghai) PTE LTD
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
/*
* SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
#include <xtensa/coreasm.h>
#include <xtensa/corebits.h>
#include <xtensa/config/system.h>
#include "freertos/xtensa_context.h"
#include "xtensa_context.h"
#include "esp_private/panic_reason.h"
#include "sdkconfig.h"
#include "soc/soc.h"

2
components/esp_system/port/soc/esp32s3/highint_hdl.S
View File

@ -8,7 +8,7 @@
#include <xtensa/coreasm.h>
#include <xtensa/corebits.h>
#include <xtensa/config/system.h>
#include "freertos/xtensa_context.h"
#include "xtensa_context.h"
#include "esp_private/panic_reason.h"
#include "sdkconfig.h"
#include "soc/soc.h"

2
components/espcoredump/src/port/xtensa/core_dump_port.c
View File

@ -14,7 +14,7 @@
#include "soc/soc_memory_layout.h"
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"
#include "freertos/xtensa_context.h"
#include "xtensa_context.h"
#include "esp_rom_sys.h"
#include "esp_core_dump_common.h"
#include "esp_core_dump_port.h"

2
components/freertos/FreeRTOS-Kernel-SMP/portable/xtensa/port.c
View File

@ -13,7 +13,7 @@
#include "portmacro.h"
#include "spinlock.h"
#include "xt_instr_macros.h"
#include "xtensa/xtensa_context.h"
#include "xtensa_context.h"
#include "xtensa/corebits.h"
#include "xtensa/config/core.h"
#include "xtensa/config/core-isa.h"

2
components/freertos/FreeRTOS-Kernel/portable/xtensa/port.c
View File

@ -37,7 +37,7 @@
#include <stdlib.h>
#include <string.h>
#include <xtensa/config/core.h>
#include <xtensa/xtensa_context.h>
#include <xtensa_context.h>
#include "soc/soc_caps.h"
#include "esp_attr.h"
#include "esp_private/crosscore_int.h"

6
components/xtensa/deprecated_include/freertos/xtensa_context.h
View File

@ -6,6 +6,6 @@
#pragma once
/* This header file has been moved, thus `#include <freertos/xtensa_context.h>` is deprecated. Please use `#include <xtensa_context.h>` instead */
/* Todo: IDF-7230 */
#include <xtensa/xtensa_context.h>
#warning "This header file has been moved, thus `#include <freertos/xtensa_context.h>` is deprecated. Please use `#include <xtensa_context.h>` instead"
#include <xtensa_context.h>

4
components/xtensa/deprecated_include/xtensa/xtensa_context.h
View File

@ -6,6 +6,6 @@
#pragma once
/* This header file has been moved, thus `#include <xtensa/xtensa_context.h>` is deprecated. Please use `#include <xtensa_context.h>` instead */
/* Todo: IDF-7230 */
#warning "This header file has been moved, thus `#include <xtensa/xtensa_context.h>` is deprecated. Please use `#include <xtensa_context.h>` instead"
#include <xtensa_context.h>

2
components/xtensa/xtensa_intr_asm.S
View File

@ -36,7 +36,7 @@
#include <xtensa/hal.h>
#include <xtensa/config/core.h>
#include "xtensa/xtensa_context.h"
#include "xtensa_context.h"
/*
* When compiling for G0-only, we don't have FreeRTOS component.

2
tools/test_apps/system/memprot/main/esp32s2/test_panic.c
View File

@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include "freertos/xtensa_context.h"
#include "xtensa_context.h"
#include "esp_private/panic_internal.h"
extern void esp_panic_handler(panic_info_t *info);

2
tools/test_apps/system/memprot/main/esp32s3/test_panic.c
View File

@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include "freertos/xtensa_context.h"
#include "xtensa_context.h"
#include "esp_private/panic_internal.h"
#include "hal/wdt_hal.h"

1
tools/test_apps/system/panic/main/panic_utils/memprot_panic_utils_xtensa.c
View File

@ -4,7 +4,6 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include "freertos/xtensa_context.h"
#include "esp_private/panic_internal.h"
#include "esp_rom_sys.h"