blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-09 09:09:10 -04:00
Code Issues Projects Releases Wiki Activity

resolve conflicts

Browse Source
This commit is contained in:
Zim Kalinowski 2021-10-04 09:02:12 +08:00
parent d98b3948b8
commit 4b8f96c73f
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/freertos/port/riscv/include/freertos/portmacro.h
View File

@ -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();
}

2
components/freertos/port/xtensa/include/freertos/portmacro.h
View File

@ -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();
}