From 94c2467dd60f7b4d8707b28cab01a11a9b2075c3 Mon Sep 17 00:00:00 2001 From: Darian Leung Date: Thu, 10 Mar 2022 21:22:35 +0800 Subject: [PATCH] esp_common: Rename esp_macro.h to esp_macros.h --- components/esp_common/include/{esp_macro.h => esp_macros.h} | 0 .../portable/xtensa/include/freertos/portmacro.h | 2 +- .../FreeRTOS-Kernel/portable/riscv/include/freertos/portmacro.h | 2 +- .../portable/xtensa/include/freertos/portmacro.h | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename components/esp_common/include/{esp_macro.h => esp_macros.h} (100%) diff --git a/components/esp_common/include/esp_macro.h b/components/esp_common/include/esp_macros.h similarity index 100% rename from components/esp_common/include/esp_macro.h rename to components/esp_common/include/esp_macros.h diff --git a/components/freertos/FreeRTOS-Kernel-SMP/portable/xtensa/include/freertos/portmacro.h b/components/freertos/FreeRTOS-Kernel-SMP/portable/xtensa/include/freertos/portmacro.h index 480c5cb8f3..b1d00bfd1b 100644 --- a/components/freertos/FreeRTOS-Kernel-SMP/portable/xtensa/include/freertos/portmacro.h +++ b/components/freertos/FreeRTOS-Kernel-SMP/portable/xtensa/include/freertos/portmacro.h @@ -15,7 +15,7 @@ #include "xtensa/config/specreg.h" #include "xt_instr_macros.h" #include "portbenchmark.h" -#include "esp_macro.h" +#include "esp_macros.h" #include "hal/cpu_hal.h" #include "esp_private/crosscore_int.h" diff --git a/components/freertos/FreeRTOS-Kernel/portable/riscv/include/freertos/portmacro.h b/components/freertos/FreeRTOS-Kernel/portable/riscv/include/freertos/portmacro.h index 8bc5cfea3a..25086ad841 100644 --- a/components/freertos/FreeRTOS-Kernel/portable/riscv/include/freertos/portmacro.h +++ b/components/freertos/FreeRTOS-Kernel/portable/riscv/include/freertos/portmacro.h @@ -44,7 +44,7 @@ #include #include "spinlock.h" #include "soc/interrupt_core0_reg.h" -#include "esp_macro.h" +#include "esp_macros.h" #include "esp_attr.h" #include "esp_rom_sys.h" #include "esp_timer.h" /* required for FreeRTOS run time stats */ diff --git a/components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/portmacro.h b/components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/portmacro.h index 8c7ea62afe..231b34c4b2 100644 --- a/components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/portmacro.h +++ b/components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/portmacro.h @@ -74,7 +74,7 @@ #include "spinlock.h" #include "hal/cpu_hal.h" #include "esp_private/crosscore_int.h" -#include "esp_macro.h" +#include "esp_macros.h" #include "esp_attr.h" #include "esp_timer.h" /* required for esp_timer_get_time. [refactor-todo] make this common between archs */ #include "esp_newlib.h" /* required for esp_reent_init() in tasks.c */