diff --git a/components/freertos/CMakeLists.txt b/components/freertos/CMakeLists.txt index bd5acf5a2f..69961a95ef 100644 --- a/components/freertos/CMakeLists.txt +++ b/components/freertos/CMakeLists.txt @@ -8,64 +8,64 @@ idf_build_get_property(target IDF_TARGET) if(CONFIG_IDF_TARGET_ARCH_XTENSA) set(srcs - "port/xtensa/port.c" - "port/xtensa/portasm.S" - "port/xtensa/xtensa_context.S" - "port/xtensa/xtensa_init.c" - "port/xtensa/xtensa_overlay_os_hook.c" - "port/xtensa/xtensa_vector_defaults.S" - "port/xtensa/xtensa_vectors.S") + "FreeRTOS-Kernel/portable/xtensa/port.c" + "FreeRTOS-Kernel/portable/xtensa/portasm.S" + "FreeRTOS-Kernel/portable/xtensa/xtensa_context.S" + "FreeRTOS-Kernel/portable/xtensa/xtensa_init.c" + "FreeRTOS-Kernel/portable/xtensa/xtensa_overlay_os_hook.c" + "FreeRTOS-Kernel/portable/xtensa/xtensa_vector_defaults.S" + "FreeRTOS-Kernel/portable/xtensa/xtensa_vectors.S") set(include_dirs - include - include/esp_additions/freertos # For files with #include "FreeRTOSConfig.h" - port/xtensa/include # For including arch-specific FreeRTOSConfig_arch.h in port//include - include/esp_additions) # For files with #include "freertos/FreeRTOSConfig.h" + FreeRTOS-Kernel/include + esp_additions/include/freertos # For files with #include "FreeRTOSConfig.h" + FreeRTOS-Kernel/portable/xtensa/include # For arch-specific FreeRTOSConfig_arch.h in portable//include + esp_additions/include) # For files with #include "freertos/FreeRTOSConfig.h" set(private_include_dirs - port/xtensa/include/freertos - port/xtensa - port/priv_include + FreeRTOS-Kernel/portable/xtensa/include/freertos + FreeRTOS-Kernel/portable/xtensa + FreeRTOS-Kernel/portable/priv_include .) elseif(CONFIG_IDF_TARGET_ARCH_RISCV) set(srcs - "port/riscv/port.c" - "port/riscv/portasm.S") + "FreeRTOS-Kernel/portable/riscv/port.c" + "FreeRTOS-Kernel/portable/riscv/portasm.S") set(include_dirs - include - include/esp_additions/freertos # For files with #include "FreeRTOSConfig.h" - port/riscv/include # For including arch-specific FreeRTOSConfig_arch.h in port//include - include/esp_additions) # For files with #include "freertos/FreeRTOSConfig.h" + FreeRTOS-Kernel/include + esp_additions/include/freertos # For files with #include "FreeRTOSConfig.h" + FreeRTOS-Kernel/portable/riscv/include # For arch-specific FreeRTOSConfig_arch.h in portable//include + esp_additions/include) # For files with #include "freertos/FreeRTOSConfig.h" set(private_include_dirs - port/riscv/include/freertos - port/riscv - port/priv_include + FreeRTOS-Kernel/portable/riscv/include/freertos + FreeRTOS-Kernel/portable/riscv + FreeRTOS-Kernel/portable/priv_include .) endif() list(APPEND srcs "esp_additions/task_snapshot.c" - "port/port_common.c" - "port/port_systick.c" - "croutine.c" - "event_groups.c" - "list.c" - "queue.c" - "tasks.c" - "timers.c" - "stream_buffer.c" + "FreeRTOS-Kernel/portable/port_common.c" + "FreeRTOS-Kernel/portable/port_systick.c" + "FreeRTOS-Kernel/croutine.c" + "FreeRTOS-Kernel/event_groups.c" + "FreeRTOS-Kernel/list.c" + "FreeRTOS-Kernel/queue.c" + "FreeRTOS-Kernel/tasks.c" + "FreeRTOS-Kernel/timers.c" + "FreeRTOS-Kernel/stream_buffer.c" "FreeRTOS-openocd.c" - "freertos_v8_compat.c") + "esp_additions/freertos_v8_compat.c") list(APPEND private_include_dirs - "include/freertos") + "FreeRTOS-Kernel/include/freertos") if(CONFIG_ESP32_IRAM_AS_8BIT_ACCESSIBLE_MEMORY) - list(APPEND srcs "port/xtensa/xtensa_loadstore_handler.S") + list(APPEND srcs "FreeRTOS-Kernel/portable/xtensa/xtensa_loadstore_handler.S") endif() # esp_timer is required by FreeRTOS because we use esp_tiemr_get_time() to do profiling diff --git a/components/freertos/GitHub-FreeRTOS-Kernel-Home.url b/components/freertos/FreeRTOS-Kernel/GitHub-FreeRTOS-Kernel-Home.url similarity index 100% rename from components/freertos/GitHub-FreeRTOS-Kernel-Home.url rename to components/freertos/FreeRTOS-Kernel/GitHub-FreeRTOS-Kernel-Home.url diff --git a/components/freertos/History.txt b/components/freertos/FreeRTOS-Kernel/History.txt similarity index 100% rename from components/freertos/History.txt rename to components/freertos/FreeRTOS-Kernel/History.txt diff --git a/components/freertos/LICENSE.md b/components/freertos/FreeRTOS-Kernel/LICENSE.md similarity index 100% rename from components/freertos/LICENSE.md rename to components/freertos/FreeRTOS-Kernel/LICENSE.md diff --git a/components/freertos/Quick_Start_Guide.url b/components/freertos/FreeRTOS-Kernel/Quick_Start_Guide.url similarity index 100% rename from components/freertos/Quick_Start_Guide.url rename to components/freertos/FreeRTOS-Kernel/Quick_Start_Guide.url diff --git a/components/freertos/croutine.c b/components/freertos/FreeRTOS-Kernel/croutine.c similarity index 100% rename from components/freertos/croutine.c rename to components/freertos/FreeRTOS-Kernel/croutine.c diff --git a/components/freertos/event_groups.c b/components/freertos/FreeRTOS-Kernel/event_groups.c similarity index 100% rename from components/freertos/event_groups.c rename to components/freertos/FreeRTOS-Kernel/event_groups.c diff --git a/components/freertos/include/freertos/FreeRTOS.h b/components/freertos/FreeRTOS-Kernel/include/freertos/FreeRTOS.h similarity index 100% rename from components/freertos/include/freertos/FreeRTOS.h rename to components/freertos/FreeRTOS-Kernel/include/freertos/FreeRTOS.h diff --git a/components/freertos/include/freertos/StackMacros.h b/components/freertos/FreeRTOS-Kernel/include/freertos/StackMacros.h similarity index 100% rename from components/freertos/include/freertos/StackMacros.h rename to components/freertos/FreeRTOS-Kernel/include/freertos/StackMacros.h diff --git a/components/freertos/include/freertos/atomic.h b/components/freertos/FreeRTOS-Kernel/include/freertos/atomic.h similarity index 100% rename from components/freertos/include/freertos/atomic.h rename to components/freertos/FreeRTOS-Kernel/include/freertos/atomic.h diff --git a/components/freertos/include/freertos/croutine.h b/components/freertos/FreeRTOS-Kernel/include/freertos/croutine.h similarity index 100% rename from components/freertos/include/freertos/croutine.h rename to components/freertos/FreeRTOS-Kernel/include/freertos/croutine.h diff --git a/components/freertos/include/freertos/deprecated_definitions.h b/components/freertos/FreeRTOS-Kernel/include/freertos/deprecated_definitions.h similarity index 100% rename from components/freertos/include/freertos/deprecated_definitions.h rename to components/freertos/FreeRTOS-Kernel/include/freertos/deprecated_definitions.h diff --git a/components/freertos/include/freertos/event_groups.h b/components/freertos/FreeRTOS-Kernel/include/freertos/event_groups.h similarity index 100% rename from components/freertos/include/freertos/event_groups.h rename to components/freertos/FreeRTOS-Kernel/include/freertos/event_groups.h diff --git a/components/freertos/include/freertos/list.h b/components/freertos/FreeRTOS-Kernel/include/freertos/list.h similarity index 100% rename from components/freertos/include/freertos/list.h rename to components/freertos/FreeRTOS-Kernel/include/freertos/list.h diff --git a/components/freertos/include/freertos/message_buffer.h b/components/freertos/FreeRTOS-Kernel/include/freertos/message_buffer.h similarity index 100% rename from components/freertos/include/freertos/message_buffer.h rename to components/freertos/FreeRTOS-Kernel/include/freertos/message_buffer.h diff --git a/components/freertos/include/freertos/mpu_prototypes.h b/components/freertos/FreeRTOS-Kernel/include/freertos/mpu_prototypes.h similarity index 100% rename from components/freertos/include/freertos/mpu_prototypes.h rename to components/freertos/FreeRTOS-Kernel/include/freertos/mpu_prototypes.h diff --git a/components/freertos/include/freertos/mpu_wrappers.h b/components/freertos/FreeRTOS-Kernel/include/freertos/mpu_wrappers.h similarity index 100% rename from components/freertos/include/freertos/mpu_wrappers.h rename to components/freertos/FreeRTOS-Kernel/include/freertos/mpu_wrappers.h diff --git a/components/freertos/include/freertos/portable.h b/components/freertos/FreeRTOS-Kernel/include/freertos/portable.h similarity index 100% rename from components/freertos/include/freertos/portable.h rename to components/freertos/FreeRTOS-Kernel/include/freertos/portable.h diff --git a/components/freertos/include/freertos/projdefs.h b/components/freertos/FreeRTOS-Kernel/include/freertos/projdefs.h similarity index 100% rename from components/freertos/include/freertos/projdefs.h rename to components/freertos/FreeRTOS-Kernel/include/freertos/projdefs.h diff --git a/components/freertos/include/freertos/queue.h b/components/freertos/FreeRTOS-Kernel/include/freertos/queue.h similarity index 100% rename from components/freertos/include/freertos/queue.h rename to components/freertos/FreeRTOS-Kernel/include/freertos/queue.h diff --git a/components/freertos/include/freertos/semphr.h b/components/freertos/FreeRTOS-Kernel/include/freertos/semphr.h similarity index 100% rename from components/freertos/include/freertos/semphr.h rename to components/freertos/FreeRTOS-Kernel/include/freertos/semphr.h diff --git a/components/freertos/include/freertos/stack_macros.h b/components/freertos/FreeRTOS-Kernel/include/freertos/stack_macros.h similarity index 100% rename from components/freertos/include/freertos/stack_macros.h rename to components/freertos/FreeRTOS-Kernel/include/freertos/stack_macros.h diff --git a/components/freertos/include/freertos/stdint.readme b/components/freertos/FreeRTOS-Kernel/include/freertos/stdint.readme similarity index 100% rename from components/freertos/include/freertos/stdint.readme rename to components/freertos/FreeRTOS-Kernel/include/freertos/stdint.readme diff --git a/components/freertos/include/freertos/stream_buffer.h b/components/freertos/FreeRTOS-Kernel/include/freertos/stream_buffer.h similarity index 100% rename from components/freertos/include/freertos/stream_buffer.h rename to components/freertos/FreeRTOS-Kernel/include/freertos/stream_buffer.h diff --git a/components/freertos/include/freertos/task.h b/components/freertos/FreeRTOS-Kernel/include/freertos/task.h similarity index 100% rename from components/freertos/include/freertos/task.h rename to components/freertos/FreeRTOS-Kernel/include/freertos/task.h diff --git a/components/freertos/include/freertos/timers.h b/components/freertos/FreeRTOS-Kernel/include/freertos/timers.h similarity index 100% rename from components/freertos/include/freertos/timers.h rename to components/freertos/FreeRTOS-Kernel/include/freertos/timers.h diff --git a/components/freertos/list.c b/components/freertos/FreeRTOS-Kernel/list.c similarity index 100% rename from components/freertos/list.c rename to components/freertos/FreeRTOS-Kernel/list.c diff --git a/components/freertos/port/linux/include/freertos/FreeRTOSConfig_arch.h b/components/freertos/FreeRTOS-Kernel/portable/linux/include/freertos/FreeRTOSConfig_arch.h similarity index 100% rename from components/freertos/port/linux/include/freertos/FreeRTOSConfig_arch.h rename to components/freertos/FreeRTOS-Kernel/portable/linux/include/freertos/FreeRTOSConfig_arch.h diff --git a/components/freertos/port/linux/include/freertos/portmacro.h b/components/freertos/FreeRTOS-Kernel/portable/linux/include/freertos/portmacro.h similarity index 100% rename from components/freertos/port/linux/include/freertos/portmacro.h rename to components/freertos/FreeRTOS-Kernel/portable/linux/include/freertos/portmacro.h diff --git a/components/freertos/port/port_common.c b/components/freertos/FreeRTOS-Kernel/portable/port_common.c similarity index 100% rename from components/freertos/port/port_common.c rename to components/freertos/FreeRTOS-Kernel/portable/port_common.c diff --git a/components/freertos/port/port_systick.c b/components/freertos/FreeRTOS-Kernel/portable/port_systick.c similarity index 100% rename from components/freertos/port/port_systick.c rename to components/freertos/FreeRTOS-Kernel/portable/port_systick.c diff --git a/components/freertos/port/priv_include/port_systick.h b/components/freertos/FreeRTOS-Kernel/portable/priv_include/port_systick.h similarity index 100% rename from components/freertos/port/priv_include/port_systick.h rename to components/freertos/FreeRTOS-Kernel/portable/priv_include/port_systick.h diff --git a/components/freertos/port/riscv/include/freertos/FreeRTOSConfig_arch.h b/components/freertos/FreeRTOS-Kernel/portable/riscv/include/freertos/FreeRTOSConfig_arch.h similarity index 100% rename from components/freertos/port/riscv/include/freertos/FreeRTOSConfig_arch.h rename to components/freertos/FreeRTOS-Kernel/portable/riscv/include/freertos/FreeRTOSConfig_arch.h diff --git a/components/freertos/port/riscv/include/freertos/portbenchmark.h b/components/freertos/FreeRTOS-Kernel/portable/riscv/include/freertos/portbenchmark.h similarity index 100% rename from components/freertos/port/riscv/include/freertos/portbenchmark.h rename to components/freertos/FreeRTOS-Kernel/portable/riscv/include/freertos/portbenchmark.h diff --git a/components/freertos/port/riscv/include/freertos/portmacro.h b/components/freertos/FreeRTOS-Kernel/portable/riscv/include/freertos/portmacro.h similarity index 100% rename from components/freertos/port/riscv/include/freertos/portmacro.h rename to components/freertos/FreeRTOS-Kernel/portable/riscv/include/freertos/portmacro.h diff --git a/components/freertos/port/riscv/include/freertos/portmacro_deprecated.h b/components/freertos/FreeRTOS-Kernel/portable/riscv/include/freertos/portmacro_deprecated.h similarity index 100% rename from components/freertos/port/riscv/include/freertos/portmacro_deprecated.h rename to components/freertos/FreeRTOS-Kernel/portable/riscv/include/freertos/portmacro_deprecated.h diff --git a/components/freertos/port/riscv/port.c b/components/freertos/FreeRTOS-Kernel/portable/riscv/port.c similarity index 100% rename from components/freertos/port/riscv/port.c rename to components/freertos/FreeRTOS-Kernel/portable/riscv/port.c diff --git a/components/freertos/port/riscv/portasm.S b/components/freertos/FreeRTOS-Kernel/portable/riscv/portasm.S similarity index 100% rename from components/freertos/port/riscv/portasm.S rename to components/freertos/FreeRTOS-Kernel/portable/riscv/portasm.S diff --git a/components/freertos/port/xtensa/include/freertos/FreeRTOSConfig_arch.h b/components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/FreeRTOSConfig_arch.h similarity index 100% rename from components/freertos/port/xtensa/include/freertos/FreeRTOSConfig_arch.h rename to components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/FreeRTOSConfig_arch.h diff --git a/components/freertos/port/xtensa/include/freertos/portbenchmark.h b/components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/portbenchmark.h similarity index 100% rename from components/freertos/port/xtensa/include/freertos/portbenchmark.h rename to components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/portbenchmark.h diff --git a/components/freertos/port/xtensa/include/freertos/portmacro.h b/components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/portmacro.h similarity index 100% rename from components/freertos/port/xtensa/include/freertos/portmacro.h rename to components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/portmacro.h diff --git a/components/freertos/port/xtensa/include/freertos/portmacro_deprecated.h b/components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/portmacro_deprecated.h similarity index 100% rename from components/freertos/port/xtensa/include/freertos/portmacro_deprecated.h rename to components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/portmacro_deprecated.h diff --git a/components/freertos/port/xtensa/include/freertos/xtensa_api.h b/components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/xtensa_api.h similarity index 100% rename from components/freertos/port/xtensa/include/freertos/xtensa_api.h rename to components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/xtensa_api.h diff --git a/components/freertos/port/xtensa/include/freertos/xtensa_config.h b/components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/xtensa_config.h similarity index 100% rename from components/freertos/port/xtensa/include/freertos/xtensa_config.h rename to components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/xtensa_config.h diff --git a/components/freertos/port/xtensa/include/freertos/xtensa_context.h b/components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/xtensa_context.h similarity index 100% rename from components/freertos/port/xtensa/include/freertos/xtensa_context.h rename to components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/xtensa_context.h diff --git a/components/freertos/port/xtensa/include/freertos/xtensa_rtos.h b/components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/xtensa_rtos.h similarity index 100% rename from components/freertos/port/xtensa/include/freertos/xtensa_rtos.h rename to components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/xtensa_rtos.h diff --git a/components/freertos/port/xtensa/include/freertos/xtensa_timer.h b/components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/xtensa_timer.h similarity index 100% rename from components/freertos/port/xtensa/include/freertos/xtensa_timer.h rename to components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/xtensa_timer.h diff --git a/components/freertos/port/xtensa/port.c b/components/freertos/FreeRTOS-Kernel/portable/xtensa/port.c similarity index 100% rename from components/freertos/port/xtensa/port.c rename to components/freertos/FreeRTOS-Kernel/portable/xtensa/port.c diff --git a/components/freertos/port/xtensa/portasm.S b/components/freertos/FreeRTOS-Kernel/portable/xtensa/portasm.S similarity index 100% rename from components/freertos/port/xtensa/portasm.S rename to components/freertos/FreeRTOS-Kernel/portable/xtensa/portasm.S diff --git a/components/freertos/port/xtensa/readme_xtensa.txt b/components/freertos/FreeRTOS-Kernel/portable/xtensa/readme_xtensa.txt similarity index 100% rename from components/freertos/port/xtensa/readme_xtensa.txt rename to components/freertos/FreeRTOS-Kernel/portable/xtensa/readme_xtensa.txt diff --git a/components/freertos/port/xtensa/xt_asm_utils.h b/components/freertos/FreeRTOS-Kernel/portable/xtensa/xt_asm_utils.h similarity index 77% rename from components/freertos/port/xtensa/xt_asm_utils.h rename to components/freertos/FreeRTOS-Kernel/portable/xtensa/xt_asm_utils.h index db8f229fc3..b56fc39ffc 100644 --- a/components/freertos/port/xtensa/xt_asm_utils.h +++ b/components/freertos/FreeRTOS-Kernel/portable/xtensa/xt_asm_utils.h @@ -4,19 +4,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -/* Copyright 2015-2018 Espressif Systems (Shanghai) PTE LTD +/* + * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO 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-License-Identifier: Apache-2.0 */ /* File adapted to use on IDF FreeRTOS component, extracted diff --git a/components/freertos/port/xtensa/xtensa_context.S b/components/freertos/FreeRTOS-Kernel/portable/xtensa/xtensa_context.S similarity index 100% rename from components/freertos/port/xtensa/xtensa_context.S rename to components/freertos/FreeRTOS-Kernel/portable/xtensa/xtensa_context.S diff --git a/components/freertos/port/xtensa/xtensa_init.c b/components/freertos/FreeRTOS-Kernel/portable/xtensa/xtensa_init.c similarity index 100% rename from components/freertos/port/xtensa/xtensa_init.c rename to components/freertos/FreeRTOS-Kernel/portable/xtensa/xtensa_init.c diff --git a/components/freertos/port/xtensa/xtensa_loadstore_handler.S b/components/freertos/FreeRTOS-Kernel/portable/xtensa/xtensa_loadstore_handler.S similarity index 100% rename from components/freertos/port/xtensa/xtensa_loadstore_handler.S rename to components/freertos/FreeRTOS-Kernel/portable/xtensa/xtensa_loadstore_handler.S diff --git a/components/freertos/port/xtensa/xtensa_overlay_os_hook.c b/components/freertos/FreeRTOS-Kernel/portable/xtensa/xtensa_overlay_os_hook.c similarity index 100% rename from components/freertos/port/xtensa/xtensa_overlay_os_hook.c rename to components/freertos/FreeRTOS-Kernel/portable/xtensa/xtensa_overlay_os_hook.c diff --git a/components/freertos/port/xtensa/xtensa_vector_defaults.S b/components/freertos/FreeRTOS-Kernel/portable/xtensa/xtensa_vector_defaults.S similarity index 100% rename from components/freertos/port/xtensa/xtensa_vector_defaults.S rename to components/freertos/FreeRTOS-Kernel/portable/xtensa/xtensa_vector_defaults.S diff --git a/components/freertos/port/xtensa/xtensa_vectors.S b/components/freertos/FreeRTOS-Kernel/portable/xtensa/xtensa_vectors.S similarity index 100% rename from components/freertos/port/xtensa/xtensa_vectors.S rename to components/freertos/FreeRTOS-Kernel/portable/xtensa/xtensa_vectors.S diff --git a/components/freertos/queue.c b/components/freertos/FreeRTOS-Kernel/queue.c similarity index 100% rename from components/freertos/queue.c rename to components/freertos/FreeRTOS-Kernel/queue.c diff --git a/components/freertos/stream_buffer.c b/components/freertos/FreeRTOS-Kernel/stream_buffer.c similarity index 100% rename from components/freertos/stream_buffer.c rename to components/freertos/FreeRTOS-Kernel/stream_buffer.c diff --git a/components/freertos/tasks.c b/components/freertos/FreeRTOS-Kernel/tasks.c similarity index 100% rename from components/freertos/tasks.c rename to components/freertos/FreeRTOS-Kernel/tasks.c diff --git a/components/freertos/timers.c b/components/freertos/FreeRTOS-Kernel/timers.c similarity index 100% rename from components/freertos/timers.c rename to components/freertos/FreeRTOS-Kernel/timers.c diff --git a/components/freertos/component.mk b/components/freertos/component.mk index 2fd40c90ac..7922d63da8 100644 --- a/components/freertos/component.mk +++ b/components/freertos/component.mk @@ -6,9 +6,9 @@ ifdef CONFIG_FREERTOS_DEBUG_OCDAWARE COMPONENT_ADD_LDFLAGS += -Wl,--undefined=uxTopUsedPriority endif -COMPONENT_ADD_INCLUDEDIRS := include include/esp_additions include/esp_additions/freertos port/xtensa/include -COMPONENT_PRIV_INCLUDEDIRS := include/esp_additions include/esp_additions/freertos include/freertos port/xtensa/include/freertos port/xtensa port/priv_include . -COMPONENT_SRCDIRS += port port/xtensa esp_additions/ +COMPONENT_ADD_INCLUDEDIRS := FreeRTOS-Kernel/include esp_additions/include esp_additions/include/freertos FreeRTOS-Kernel/portable/xtensa/include +COMPONENT_PRIV_INCLUDEDIRS := esp_additions/include esp_additions/include/freertos FreeRTOS-Kernel/include/freertos FreeRTOS-Kernel/portable/xtensa/include/freertos FreeRTOS-Kernel/portable/xtensa FreeRTOS-Kernel/portable/priv_include . +COMPONENT_SRCDIRS += FreeRTOS-Kernel FreeRTOS-Kernel/portable FreeRTOS-Kernel/portable/xtensa esp_additions/ ifndef CONFIG_ESP32_IRAM_AS_8BIT_ACCESSIBLE_MEMORY COMPONENT_OBJEXCLUDE := xtensa/xtensa_loadstore_handler.o diff --git a/components/freertos/esp_additions/freertos_v8_compat.c b/components/freertos/esp_additions/freertos_v8_compat.c new file mode 100644 index 0000000000..eda3675ee6 --- /dev/null +++ b/components/freertos/esp_additions/freertos_v8_compat.c @@ -0,0 +1,25 @@ +/* + * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include "FreeRTOS.h" +#include "queue.h" +#include "semphr.h" + +/* This API is kept for backward ABI compatibility with prebuilt libraries against FreeRTOS v8/v9 in ESP-IDF */ +BaseType_t xQueueGenericReceive( QueueHandle_t xQueue, void * const pvBuffer, TickType_t xTicksToWait, const BaseType_t xPeek ) +{ + if ( xPeek == pdTRUE ) + { + return xQueuePeek( xQueue, pvBuffer, xTicksToWait ); + } + + if ( pvBuffer == NULL ) + { + return xQueueSemaphoreTake( xQueue, xTicksToWait ); + } + + return xQueueReceive( xQueue, pvBuffer, xTicksToWait ); +} diff --git a/components/freertos/include/esp_additions/freertos/FreeRTOSConfig.h b/components/freertos/esp_additions/include/freertos/FreeRTOSConfig.h similarity index 100% rename from components/freertos/include/esp_additions/freertos/FreeRTOSConfig.h rename to components/freertos/esp_additions/include/freertos/FreeRTOSConfig.h diff --git a/components/freertos/include/esp_additions/freertos/task_snapshot.h b/components/freertos/esp_additions/include/freertos/task_snapshot.h similarity index 82% rename from components/freertos/include/esp_additions/freertos/task_snapshot.h rename to components/freertos/esp_additions/include/freertos/task_snapshot.h index 1ad04cce69..b6fc2d089c 100644 --- a/components/freertos/include/esp_additions/freertos/task_snapshot.h +++ b/components/freertos/esp_additions/include/freertos/task_snapshot.h @@ -1,16 +1,8 @@ -// Copyright 2015-2021 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-2021 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #pragma once diff --git a/components/freertos/include/esp_additions/freertos_tasks_c_additions.h b/components/freertos/esp_additions/include/freertos_tasks_c_additions.h similarity index 69% rename from components/freertos/include/esp_additions/freertos_tasks_c_additions.h rename to components/freertos/esp_additions/include/freertos_tasks_c_additions.h index 464c0b3ffb..b535b84fc4 100644 --- a/components/freertos/include/esp_additions/freertos_tasks_c_additions.h +++ b/components/freertos/esp_additions/include/freertos_tasks_c_additions.h @@ -1,16 +1,8 @@ -// Copyright 2015-2021 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-2021 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #pragma once diff --git a/components/freertos/freertos_v8_compat.c b/components/freertos/freertos_v8_compat.c deleted file mode 100644 index fe8d689125..0000000000 --- a/components/freertos/freertos_v8_compat.c +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2020 Espressif Systems (Shanghai) Co., 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. - -#include "FreeRTOS.h" -#include "queue.h" -#include "semphr.h" - -/* This API is kept for backward ABI compatibility with prebuilt libraries against FreeRTOS v8/v9 in ESP-IDF */ -BaseType_t xQueueGenericReceive( QueueHandle_t xQueue, void * const pvBuffer, TickType_t xTicksToWait, const BaseType_t xPeek ) -{ - if ( xPeek == pdTRUE ) - { - return xQueuePeek( xQueue, pvBuffer, xTicksToWait ); - } - - if ( pvBuffer == NULL ) - { - return xQueueSemaphoreTake( xQueue, xTicksToWait ); - } - - return xQueueReceive( xQueue, pvBuffer, xTicksToWait ); -} diff --git a/components/lwip/test_afl_host/Makefile b/components/lwip/test_afl_host/Makefile index 2eeda96a7d..efa71a43c4 100644 --- a/components/lwip/test_afl_host/Makefile +++ b/components/lwip/test_afl_host/Makefile @@ -2,7 +2,7 @@ COMPONENTS_DIR=../.. COMPILER_ICLUDE_DIR=$(shell echo `which xtensa-esp32-elf-gcc | xargs dirname | xargs dirname`/xtensa-esp32-elf) CFLAGS=-std=gnu99 -Og -ggdb -ffunction-sections -fdata-sections -nostdlib -Wall -Werror=all -Wno-int-to-pointer-cast -Wno-error=unused-function -Wno-error=unused-variable -Wno-error=deprecated-declarations -Wno-macro-redefined -Wno-constant-conversion -Wno-incompatible-pointer-types-discards-qualifiers -Wno-typedef-redefinition -Wno-incompatible-pointer-types -Wextra \ -Wno-unused-parameter -Wno-sign-compare -Wno-address -Wno-unused-variable -DESP_PLATFORM -D IDF_VER=\"v3.1\" -MMD -MP -DWITH_POSIX -DLWIP_NO_CTYPE_H=1 -INC_DIRS=-I . -I ./build/config -I $(COMPONENTS_DIR)/newlib/platform_include -I $(COMPONENTS_DIR)/newlib/include -I $(COMPONENTS_DIR)/driver/include -I $(COMPONENTS_DIR)/esp32/include -I $(COMPONENTS_DIR)/ethernet/include -I $(COMPONENTS_DIR)/freertos/include/esp_additions -I $(COMPONENTS_DIR)/freertos/include/esp_additions/freertos -I $(COMPONENTS_DIR)/freertos/include -I $(COMPONENTS_DIR)/heap/include -I $(COMPONENTS_DIR)/lwip/lwip/src/include -I $(COMPONENTS_DIR)/lwip/include/apps -I $(COMPONENTS_DIR)/lwip/lwip/src/include/netif -I $(COMPONENTS_DIR)/lwip/lwip/src/include/posix -I $(COMPONENTS_DIR)/lwip/port/esp32/include -I $(COMPONENTS_DIR)/lwip/lwip/src/include/posix -I $(COMPONENTS_DIR)/lwip/include/apps/ping -I $(COMPONENTS_DIR)/lwip/include/apps/sntp -I $(COMPONENTS_DIR)/soc/esp32/include -I $(COMPONENTS_DIR)/soc/include -I $(COMPONENTS_DIR)/tcpip_adapter/include -I $(COMPONENTS_DIR)/esp_rom/include -I $(COMPONENTS_DIR)/esp_common/include -I $(COMPONENTS_DIR)/esp_hw_support/include -I $(COMPONENTS_DIR)/xtensa/include -I $(COMPONENTS_DIR)/xtensa/esp32/include -I $(COMPONENTS_DIR)/esp_wifi/include -I $(COMPONENTS_DIR)/esp_event/include -I $(COMPONENTS_DIR)/freertos/port/xtensa/include -I $(COMPONENTS_DIR)/esp_system/include -I $(COMPONENTS_DIR)/esp_timer/include -I $(COMPONENTS_DIR)/soc/include -I $(COMPONENTS_DIR)/soc/include -I $(COMPONENTS_DIR)/soc/src/esp32/include -I $(COMPONENTS_DIR)/soc/esp32/include -I $(COMPONENTS_DIR)/esp_netif/include -I $(COMPONENTS_DIR)/esp_eth/include -I $(COMPONENTS_DIR)/esp_netif/lwip -I $(COMPONENTS_DIR)/hal/include -I $(COMPONENTS_DIR)/hal/esp32/include -I $(COMPILER_ICLUDE_DIR)/include +INC_DIRS=-I . -I ./build/config -I $(COMPONENTS_DIR)/newlib/platform_include -I $(COMPONENTS_DIR)/newlib/include -I $(COMPONENTS_DIR)/driver/include -I $(COMPONENTS_DIR)/esp32/include -I $(COMPONENTS_DIR)/ethernet/include -I $(COMPONENTS_DIR)/freertos/esp_additions/include -I $(COMPONENTS_DIR)/freertos/esp_additions/include/freertos -I $(COMPONENTS_DIR)/freertos/FreeRTOS-Kernel/include -I $(COMPONENTS_DIR)/heap/include -I $(COMPONENTS_DIR)/lwip/lwip/src/include -I $(COMPONENTS_DIR)/lwip/include/apps -I $(COMPONENTS_DIR)/lwip/lwip/src/include/netif -I $(COMPONENTS_DIR)/lwip/lwip/src/include/posix -I $(COMPONENTS_DIR)/lwip/port/esp32/include -I $(COMPONENTS_DIR)/lwip/lwip/src/include/posix -I $(COMPONENTS_DIR)/lwip/include/apps/ping -I $(COMPONENTS_DIR)/lwip/include/apps/sntp -I $(COMPONENTS_DIR)/soc/esp32/include -I $(COMPONENTS_DIR)/soc/include -I $(COMPONENTS_DIR)/tcpip_adapter/include -I $(COMPONENTS_DIR)/esp_rom/include -I $(COMPONENTS_DIR)/esp_common/include -I $(COMPONENTS_DIR)/esp_hw_support/include -I $(COMPONENTS_DIR)/xtensa/include -I $(COMPONENTS_DIR)/xtensa/esp32/include -I $(COMPONENTS_DIR)/esp_wifi/include -I $(COMPONENTS_DIR)/esp_event/include -I $(COMPONENTS_DIR)/freertos/FreeRTOS-Kernel/portable/xtensa/include -I $(COMPONENTS_DIR)/esp_system/include -I $(COMPONENTS_DIR)/esp_timer/include -I $(COMPONENTS_DIR)/soc/include -I $(COMPONENTS_DIR)/soc/include -I $(COMPONENTS_DIR)/soc/src/esp32/include -I $(COMPONENTS_DIR)/soc/esp32/include -I $(COMPONENTS_DIR)/esp_netif/include -I $(COMPONENTS_DIR)/esp_eth/include -I $(COMPONENTS_DIR)/esp_netif/lwip -I $(COMPONENTS_DIR)/hal/include -I $(COMPONENTS_DIR)/hal/esp32/include -I $(COMPILER_ICLUDE_DIR)/include TEST_NAME=test FUZZ=afl-fuzz GEN_CFG=generate_config diff --git a/components/mdns/test_afl_fuzz_host/Makefile b/components/mdns/test_afl_fuzz_host/Makefile index 4d6067bb4c..a343fe3d64 100644 --- a/components/mdns/test_afl_fuzz_host/Makefile +++ b/components/mdns/test_afl_fuzz_host/Makefile @@ -18,9 +18,9 @@ CFLAGS=-g -Wno-unused-value -Wno-missing-declarations -Wno-pointer-bool-conversi -I$(COMPONENTS_DIR)/esp_system/include \ -I$(COMPONENTS_DIR)/esp_timer/include \ -I$(COMPONENTS_DIR)/esp_wifi/include \ - -I$(COMPONENTS_DIR)/freertos \ - -I$(COMPONENTS_DIR)/freertos/include \ - -I$(COMPONENTS_DIR)/freertos/port/xtensa/include \ + -I$(COMPONENTS_DIR)/freertos/FreeRTOS-Kernel \ + -I$(COMPONENTS_DIR)/freertos/FreeRTOS-Kernel/include \ + -I$(COMPONENTS_DIR)/freertos/FreeRTOS-Kernel/portable/xtensa/include \ -I$(COMPONENTS_DIR)/hal/include \ -I$(COMPONENTS_DIR)/hal/esp32/include \ -I$(COMPONENTS_DIR)/heap/include \ diff --git a/components/mqtt/CMakeLists.txt b/components/mqtt/CMakeLists.txt index e88c582ac4..d97d3a646c 100644 --- a/components/mqtt/CMakeLists.txt +++ b/components/mqtt/CMakeLists.txt @@ -57,9 +57,9 @@ idf_component_get_property(mbedtls_dir mbedtls COMPONENT_DIR) ${esp_hw_support_dir}/include/esp_random.h ${esp_system_dir}/include/esp_system.h ${esp_tls_dir}/esp_tls.h - ${freertos_dir}/include/freertos/queue.h - ${freertos_dir}/include/freertos/task.h - ${freertos_dir}/include/freertos/event_groups.h + ${freertos_dir}/FreeRTOS-Kernel/include/freertos/queue.h + ${freertos_dir}/FreeRTOS-Kernel/include/freertos/task.h + ${freertos_dir}/FreeRTOS-Kernel/include/freertos/event_groups.h ${log_dir}/include/esp_log.h ${nghttp_dir}/port/include/http_parser.h ) @@ -103,7 +103,7 @@ idf_component_get_property(mbedtls_dir mbedtls COMPONENT_DIR) ${CMAKE_CURRENT_SOURCE_DIR}/host_test/mocks/include ${tcp_transport_dir}/include ${esp_tls_dir} - ${freertos_dir}/include + ${freertos_dir}/FreeRTOS-Kernel/include ${esp_event_dir}/include ${esp_system_dir}/include ${esp_common_dir}/include @@ -115,7 +115,7 @@ idf_component_get_property(mbedtls_dir mbedtls COMPONENT_DIR) ${mbedtls_dir}/port/include ${nghttp_dir}/port/include ${mbedtls_dir}/mbedtls/include - ${freertos_dir}/include/freertos + ${freertos_dir}/FreeRTOS-Kernel/include/freertos esp-mqtt/lib/include ${MOCK_GEN_DIR} ) diff --git a/components/tinyusb/CMakeLists.txt b/components/tinyusb/CMakeLists.txt index e7c1b7edbc..854a7e7378 100644 --- a/components/tinyusb/CMakeLists.txt +++ b/components/tinyusb/CMakeLists.txt @@ -37,7 +37,7 @@ if(CONFIG_TINYUSB) "tinyusb/src/" "additions/include" # The FreeRTOS API include convention in tinyusb is different from esp-idf - "${freertos_component_dir}/include/freertos" + "${freertos_component_dir}/FreeRTOS-Kernel/include/freertos" ) list(APPEND srcs diff --git a/docs/doxygen/Doxyfile b/docs/doxygen/Doxyfile index a76548f5f9..ce870f9e94 100644 --- a/docs/doxygen/Doxyfile +++ b/docs/doxygen/Doxyfile @@ -206,13 +206,13 @@ INPUT = \ $(PROJECT_PATH)/components/efuse/include/esp_efuse.h \ $(PROJECT_PATH)/components/bootloader_support/include/esp_app_format.h \ $(PROJECT_PATH)/components/pthread/include/esp_pthread.h \ - $(PROJECT_PATH)/components/freertos/include/freertos/task.h \ - $(PROJECT_PATH)/components/freertos/include/freertos/queue.h \ - $(PROJECT_PATH)/components/freertos/include/freertos/semphr.h \ - $(PROJECT_PATH)/components/freertos/include/freertos/timers.h \ - $(PROJECT_PATH)/components/freertos/include/freertos/event_groups.h \ - $(PROJECT_PATH)/components/freertos/include/freertos/stream_buffer.h \ - $(PROJECT_PATH)/components/freertos/include/freertos/message_buffer.h \ + $(PROJECT_PATH)/components/freertos/FreeRTOS-Kernel/include/freertos/task.h \ + $(PROJECT_PATH)/components/freertos/FreeRTOS-Kernel/include/freertos/queue.h \ + $(PROJECT_PATH)/components/freertos/FreeRTOS-Kernel/include/freertos/semphr.h \ + $(PROJECT_PATH)/components/freertos/FreeRTOS-Kernel/include/freertos/timers.h \ + $(PROJECT_PATH)/components/freertos/FreeRTOS-Kernel/include/freertos/event_groups.h \ + $(PROJECT_PATH)/components/freertos/FreeRTOS-Kernel/include/freertos/stream_buffer.h \ + $(PROJECT_PATH)/components/freertos/FreeRTOS-Kernel/include/freertos/message_buffer.h \ $(PROJECT_PATH)/components/esp_ringbuf/include/freertos/ringbuf.h \ $(PROJECT_PATH)/components/esp_common/include/esp_err.h \ $(PROJECT_PATH)/components/esp_common/include/esp_check.h \ diff --git a/docs/en/COPYRIGHT.rst b/docs/en/COPYRIGHT.rst index ea02eb0a4b..85e638e4bd 100644 --- a/docs/en/COPYRIGHT.rst +++ b/docs/en/COPYRIGHT.rst @@ -19,7 +19,7 @@ These third party libraries can be included into the application (firmware) prod * :component:`Xtensa header files` are Copyright (C) 2013 Tensilica Inc and are licensed under the MIT License as reproduced in the individual header files. -* Original parts of FreeRTOS_ (components/freertos) are Copyright (C) 2017 Amazon.com, Inc. or its affiliates are licensed under the MIT License, as described in :component_file:`license.txt`. +* Original parts of FreeRTOS_ (components/freertos) are Copyright (C) 2017 Amazon.com, Inc. or its affiliates are licensed under the MIT License, as described in :component_file:`license.txt`. * Original parts of LWIP_ (components/lwip) are Copyright (C) 2001, 2002 Swedish Institute of Computer Science and are licensed under the BSD License as described in :component_file:`COPYING file`. diff --git a/docs/en/api-guides/freertos-smp.rst b/docs/en/api-guides/freertos-smp.rst index 7b8585ab2b..45c7061344 100644 --- a/docs/en/api-guides/freertos-smp.rst +++ b/docs/en/api-guides/freertos-smp.rst @@ -88,7 +88,7 @@ and :cpp:func:`xTaskCreateStatic` have led to the addition of :cpp:func:`xTaskCreatePinnedToCore` and :cpp:func:`xTaskCreateStaticPinnedToCore` in ESP-IDF FreeRTOS -For more details see :component_file:`freertos/tasks.c` +For more details see :component_file:`freertos/FreeRTOS-Kernel/tasks.c` The ESP-IDF FreeRTOS task creation functions are nearly identical to their vanilla counterparts with the exception of the extra parameter known as @@ -333,8 +333,8 @@ The ESP-IDF FreeRTOS critical section functions have been modified as follows… in order to be in compliance with Vanilla FreeRTOS. For more details see :component_file:`esp_hw_support/include/soc/spinlock.h`, -:component_file:`freertos/include/freertos/task.h`, -and :component_file:`freertos/tasks.c` +:component_file:`freertos/FreeRTOS-Kernel/include/freertos/task.h`, +and :component_file:`freertos/FreeRTOS-Kernel/tasks.c` It should be noted that when modifying vanilla FreeRTOS code to be ESP-IDF FreeRTOS compatible, it is trivial to modify the type of critical section called diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt index 96058137d5..5e15d266a7 100644 --- a/tools/ci/check_copyright_ignore.txt +++ b/tools/ci/check_copyright_ignore.txt @@ -1244,54 +1244,52 @@ components/fatfs/vfs/esp_vfs_fat.h components/fatfs/vfs/vfs_fat_internal.h components/fatfs/vfs/vfs_fat_sdmmc.c components/fatfs/vfs/vfs_fat_spiflash.c +components/freertos/FreeRTOS-Kernel/croutine.c +components/freertos/FreeRTOS-Kernel/event_groups.c +components/freertos/FreeRTOS-Kernel/include/freertos/FreeRTOS.h +components/freertos/FreeRTOS-Kernel/include/freertos/StackMacros.h +components/freertos/FreeRTOS-Kernel/include/freertos/atomic.h +components/freertos/FreeRTOS-Kernel/include/freertos/croutine.h +components/freertos/FreeRTOS-Kernel/include/freertos/deprecated_definitions.h +components/freertos/FreeRTOS-Kernel/include/freertos/event_groups.h +components/freertos/FreeRTOS-Kernel/include/freertos/list.h +components/freertos/FreeRTOS-Kernel/include/freertos/message_buffer.h +components/freertos/FreeRTOS-Kernel/include/freertos/mpu_prototypes.h +components/freertos/FreeRTOS-Kernel/include/freertos/mpu_wrappers.h +components/freertos/FreeRTOS-Kernel/include/freertos/portable.h +components/freertos/FreeRTOS-Kernel/include/freertos/projdefs.h +components/freertos/FreeRTOS-Kernel/include/freertos/queue.h +components/freertos/FreeRTOS-Kernel/include/freertos/semphr.h +components/freertos/FreeRTOS-Kernel/include/freertos/stack_macros.h +components/freertos/FreeRTOS-Kernel/include/freertos/stream_buffer.h +components/freertos/FreeRTOS-Kernel/include/freertos/task.h +components/freertos/FreeRTOS-Kernel/include/freertos/timers.h +components/freertos/FreeRTOS-Kernel/list.c +components/freertos/FreeRTOS-Kernel/portable/linux/include/freertos/FreeRTOSConfig_arch.h +components/freertos/FreeRTOS-Kernel/portable/linux/include/freertos/portmacro.h +components/freertos/FreeRTOS-Kernel/portable/riscv/include/freertos/FreeRTOSConfig_arch.h +components/freertos/FreeRTOS-Kernel/portable/riscv/include/freertos/portbenchmark.h +components/freertos/FreeRTOS-Kernel/portable/riscv/include/freertos/portmacro.h +components/freertos/FreeRTOS-Kernel/portable/riscv/port.c +components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/FreeRTOSConfig_arch.h +components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/portbenchmark.h +components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/portmacro.h +components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/portmacro_priv.h +components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/xtensa_api.h +components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/xtensa_config.h +components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/xtensa_context.h +components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/xtensa_rtos.h +components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/xtensa_timer.h +components/freertos/FreeRTOS-Kernel/portable/xtensa/port.c +components/freertos/FreeRTOS-Kernel/portable/xtensa/xtensa_init.c +components/freertos/FreeRTOS-Kernel/portable/xtensa/xtensa_overlay_os_hook.c +components/freertos/FreeRTOS-Kernel/queue.c +components/freertos/FreeRTOS-Kernel/stream_buffer.c +components/freertos/FreeRTOS-Kernel/tasks.c +components/freertos/FreeRTOS-Kernel/timers.c components/freertos/FreeRTOS-openocd.c -components/freertos/croutine.c -components/freertos/event_groups.c -components/freertos/freertos_v8_compat.c -components/freertos/include/esp_additions/freertos/FreeRTOSConfig.h -components/freertos/include/esp_additions/freertos/task_snapshot.h -components/freertos/include/esp_additions/freertos_tasks_c_additions.h -components/freertos/include/freertos/FreeRTOS.h -components/freertos/include/freertos/StackMacros.h -components/freertos/include/freertos/atomic.h -components/freertos/include/freertos/croutine.h -components/freertos/include/freertos/deprecated_definitions.h -components/freertos/include/freertos/event_groups.h -components/freertos/include/freertos/list.h -components/freertos/include/freertos/message_buffer.h -components/freertos/include/freertos/mpu_prototypes.h -components/freertos/include/freertos/mpu_wrappers.h -components/freertos/include/freertos/portable.h -components/freertos/include/freertos/projdefs.h -components/freertos/include/freertos/queue.h -components/freertos/include/freertos/semphr.h -components/freertos/include/freertos/stack_macros.h -components/freertos/include/freertos/stream_buffer.h -components/freertos/include/freertos/task.h -components/freertos/include/freertos/timers.h -components/freertos/list.c -components/freertos/port/linux/include/freertos/FreeRTOSConfig_arch.h -components/freertos/port/linux/include/freertos/portmacro.h -components/freertos/port/riscv/include/freertos/FreeRTOSConfig_arch.h -components/freertos/port/riscv/include/freertos/portbenchmark.h -components/freertos/port/riscv/include/freertos/portmacro.h -components/freertos/port/riscv/port.c -components/freertos/port/xtensa/include/freertos/FreeRTOSConfig_arch.h -components/freertos/port/xtensa/include/freertos/portbenchmark.h -components/freertos/port/xtensa/include/freertos/portmacro.h -components/freertos/port/xtensa/include/freertos/portmacro_priv.h -components/freertos/port/xtensa/include/freertos/xtensa_api.h -components/freertos/port/xtensa/include/freertos/xtensa_config.h -components/freertos/port/xtensa/include/freertos/xtensa_context.h -components/freertos/port/xtensa/include/freertos/xtensa_rtos.h -components/freertos/port/xtensa/include/freertos/xtensa_timer.h -components/freertos/port/xtensa/port.c -components/freertos/port/xtensa/xt_asm_utils.h -components/freertos/port/xtensa/xtensa_init.c -components/freertos/port/xtensa/xtensa_overlay_os_hook.c -components/freertos/queue.c -components/freertos/stream_buffer.c -components/freertos/tasks.c +components/freertos/esp_additions/include/freertos/FreeRTOSConfig.h +components/freertos/esp_additions/task_snapshot.c components/freertos/test/test_context_save_clobber.c components/freertos/test/test_float_in_isr.c components/freertos/test/test_freertos_backported_functions.c @@ -1320,7 +1318,6 @@ components/freertos/test/test_tasks_snapshot.c components/freertos/test/test_thread_local.c components/freertos/test/test_timers.c components/freertos/test/test_xtensa_loadstore_handler.c -components/freertos/timers.c components/hal/adc_hal.c components/hal/aes_hal.c components/hal/cpu_hal.c diff --git a/tools/ci/check_public_headers_exceptions.txt b/tools/ci/check_public_headers_exceptions.txt index 152543ff6e..d7e6e4f4ff 100644 --- a/tools/ci/check_public_headers_exceptions.txt +++ b/tools/ci/check_public_headers_exceptions.txt @@ -6,8 +6,8 @@ components/xtensa/esp32/include/xtensa/config/ components/newlib/platform_include/ -components/freertos/include/freertos/ -components/freertos/port/xtensa/include/freertos/ +components/freertos/FreeRTOS-Kernel/include/freertos/ +components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/ components/log/include/esp_log_internal.h diff --git a/tools/ci/sonar_exclude_list.txt b/tools/ci/sonar_exclude_list.txt index a91e445f52..0f4f992cd5 100644 --- a/tools/ci/sonar_exclude_list.txt +++ b/tools/ci/sonar_exclude_list.txt @@ -7,8 +7,8 @@ # lines start with # will be ignored # FreeRTOS upstream code (don't include our port files here) -components/freertos/*.c -components/freertos/include/freertos/*.h +components/freertos/FreeRTOS-Kernel/*.c +components/freertos/FreeRTOS-Kernel/include/freertos/*.h # wpa_supplicant upstream code components/wpa_supplicant/src/** diff --git a/tools/ci/test_build_system.sh b/tools/ci/test_build_system.sh index fc41e7fed8..031ff6c9d1 100755 --- a/tools/ci/test_build_system.sh +++ b/tools/ci/test_build_system.sh @@ -183,7 +183,7 @@ function run_tests() # and therefore should rebuild assert_rebuilt newlib/newlib_init.o assert_rebuilt nvs_flash/src/nvs_api.o - assert_rebuilt freertos/port/xtensa/xtensa_vectors.o + assert_rebuilt freertos/FreeRTOS-Kernel/portable/xtensa/xtensa_vectors.o print_status "Updating project Makefile triggers full recompile" make @@ -193,7 +193,7 @@ function run_tests() # similar to previous test assert_rebuilt newlib/newlib_init.o assert_rebuilt nvs_flash/src/nvs_api.o - assert_rebuilt freertos/port/xtensa/xtensa_vectors.o + assert_rebuilt freertos/FreeRTOS-Kernel/portable/xtensa/xtensa_vectors.o print_status "print_flash_cmd target should produce one line of output" make diff --git a/tools/ci/test_build_system_cmake.sh b/tools/ci/test_build_system_cmake.sh index 7fc5e94e18..c880d609d1 100755 --- a/tools/ci/test_build_system_cmake.sh +++ b/tools/ci/test_build_system_cmake.sh @@ -251,7 +251,7 @@ function run_tests() # and therefore should rebuild assert_rebuilt esp-idf/newlib/CMakeFiles/${IDF_COMPONENT_PREFIX}_newlib.dir/newlib_init.c.obj assert_rebuilt esp-idf/nvs_flash/CMakeFiles/${IDF_COMPONENT_PREFIX}_nvs_flash.dir/src/nvs_api.cpp.obj - assert_rebuilt esp-idf/freertos/CMakeFiles/${IDF_COMPONENT_PREFIX}_freertos.dir/port/xtensa/xtensa_vectors.S.obj + assert_rebuilt esp-idf/freertos/CMakeFiles/${IDF_COMPONENT_PREFIX}_freertos.dir/FreeRTOS-Kernel/portable/xtensa/xtensa_vectors.S.obj mv sdkconfig.bak sdkconfig print_status "Updating project CMakeLists.txt triggers full recompile" @@ -266,7 +266,7 @@ function run_tests() # similar to previous test assert_rebuilt esp-idf/newlib/CMakeFiles/${IDF_COMPONENT_PREFIX}_newlib.dir/newlib_init.c.obj assert_rebuilt esp-idf/nvs_flash/CMakeFiles/${IDF_COMPONENT_PREFIX}_nvs_flash.dir/src/nvs_api.cpp.obj - assert_rebuilt esp-idf/freertos/CMakeFiles/${IDF_COMPONENT_PREFIX}_freertos.dir/port/xtensa/xtensa_vectors.S.obj + assert_rebuilt esp-idf/freertos/CMakeFiles/${IDF_COMPONENT_PREFIX}_freertos.dir/FreeRTOS-Kernel/portable/xtensa/xtensa_vectors.S.obj mv sdkconfig.bak sdkconfig print_status "Can build with Ninja (no idf.py)" diff --git a/tools/mocks/freertos/CMakeLists.txt b/tools/mocks/freertos/CMakeLists.txt index b96f65969d..4409be36f3 100644 --- a/tools/mocks/freertos/CMakeLists.txt +++ b/tools/mocks/freertos/CMakeLists.txt @@ -5,14 +5,14 @@ message(STATUS "building FREERTOS MOCKS (only task and queue)") idf_component_get_property(original_freertos_dir freertos COMPONENT_OVERRIDEN_DIR) set(include_dirs - "${original_freertos_dir}/include" - "${original_freertos_dir}/include/esp_additions" - "${original_freertos_dir}/include/esp_additions/freertos" - "${original_freertos_dir}/include/freertos" # this is due to the way includes are generated in CMock - "${original_freertos_dir}/port/linux/include") + "${original_freertos_dir}/FreeRTOS-Kernel/include" + "${original_freertos_dir}/esp_additions/include" + "${original_freertos_dir}/esp_additions/include/freertos" + "${original_freertos_dir}/FreeRTOS-Kernel/include/freertos" # this is due to the way includes are generated in CMock + "${original_freertos_dir}/FreeRTOS-Kernel/portable/linux/include") idf_component_mock(INCLUDE_DIRS ${include_dirs} REQUIRES esp_common MOCK_HEADER_FILES - ${original_freertos_dir}/include/freertos/task.h - ${original_freertos_dir}/include/freertos/queue.h) + ${original_freertos_dir}/FreeRTOS-Kernel/include/freertos/task.h + ${original_freertos_dir}/FreeRTOS-Kernel/include/freertos/queue.h)