From 4b8f96c73f96f1b8b788cc8a5ad50402737aaed0 Mon Sep 17 00:00:00 2001 From: Zim Kalinowski Date: Mon, 4 Oct 2021 09:02:12 +0800 Subject: [PATCH] resolve conflicts --- .../freertos/port/riscv/include/freertos/portmacro.h | 8 +++----- .../freertos/port/xtensa/include/freertos/portmacro.h | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/components/freertos/port/riscv/include/freertos/portmacro.h b/components/freertos/port/riscv/include/freertos/portmacro.h index ee984c77e5..8c09ba7df2 100644 --- a/components/freertos/port/riscv/include/freertos/portmacro.h +++ b/components/freertos/port/riscv/include/freertos/portmacro.h @@ -89,10 +89,8 @@ typedef uint32_t TickType_t; #define portTASK_FUNCTION_PROTO(vFunction, pvParameters) void vFunction(void *pvParameters) #define portTASK_FUNCTION(vFunction, pvParameters) void vFunction(void *pvParameters) -static inline BaseType_t IRAM_ATTR xPortGetCoreID(void) { - return (uint32_t) cpu_hal_get_core_id(); -} - +// interrupt module will mask interrupt with priority less than threshold +#define RVHAL_EXCM_LEVEL 4 /* ----------------------------------------------- Port Configurations ------------------------------------------------- @@ -378,7 +376,7 @@ void vPortSetStackWatchpoint(void *pxStackStart); */ static inline BaseType_t IRAM_ATTR xPortGetCoreID(void) { - return cpu_hal_get_core_id(); + return (uint32_t) cpu_hal_get_core_id(); } diff --git a/components/freertos/port/xtensa/include/freertos/portmacro.h b/components/freertos/port/xtensa/include/freertos/portmacro.h index f1520b70c2..47187379c6 100644 --- a/components/freertos/port/xtensa/include/freertos/portmacro.h +++ b/components/freertos/port/xtensa/include/freertos/portmacro.h @@ -636,7 +636,7 @@ static inline bool IRAM_ATTR xPortCanYield(void) static inline BaseType_t IRAM_ATTR xPortGetCoreID(void) { - return cpu_hal_get_core_id(); + return (uint32_t) cpu_hal_get_core_id(); }