From 3101a1af0bf60b0ac841c3c2d2d328e1d22bf6b4 Mon Sep 17 00:00:00 2001 From: Ching-Hsin Lee Date: Thu, 20 Apr 2023 21:57:37 +0800 Subject: [PATCH 1/2] Define portBASE_TYPE in XMOS AICORE porting --- portable/ThirdParty/xClang/XCOREAI/portmacro.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/portable/ThirdParty/xClang/XCOREAI/portmacro.h b/portable/ThirdParty/xClang/XCOREAI/portmacro.h index aef12cf3749..69a734f783e 100644 --- a/portable/ThirdParty/xClang/XCOREAI/portmacro.h +++ b/portable/ThirdParty/xClang/XCOREAI/portmacro.h @@ -26,6 +26,8 @@ typedef double portDOUBLE; typedef int32_t BaseType_t; typedef uint32_t UBaseType_t; +#define portBASE_TYPE BaseType_t + #if( configUSE_16_BIT_TICKS == 1 ) typedef uint16_t TickType_t; #define portMAX_DELAY ( TickType_t ) 0xffff @@ -164,7 +166,7 @@ void vTaskExitCritical(void); #define portEXIT_CRITICAL() vTaskExitCritical() extern UBaseType_t vTaskEnterCriticalFromISR( void ); -extern void vTaskExitCriticalFromISR( UBaseType_t uxSavedInterruptStatus ); +extern void vTaskExitCriticalFromISR( BaseType_t xSavedInterruptStatus ); #define portENTER_CRITICAL_FROM_ISR vTaskEnterCriticalFromISR #define portEXIT_CRITICAL_FROM_ISR vTaskExitCriticalFromISR From 5c094b574485ebd94786d1b4b39b0af036bb38a5 Mon Sep 17 00:00:00 2001 From: Ching-Hsin Lee Date: Thu, 20 Apr 2023 22:09:02 +0800 Subject: [PATCH 2/2] Update enter critical from ISR API --- portable/ThirdParty/xClang/XCOREAI/portmacro.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/portable/ThirdParty/xClang/XCOREAI/portmacro.h b/portable/ThirdParty/xClang/XCOREAI/portmacro.h index 69a734f783e..019d29a3c7a 100644 --- a/portable/ThirdParty/xClang/XCOREAI/portmacro.h +++ b/portable/ThirdParty/xClang/XCOREAI/portmacro.h @@ -165,8 +165,8 @@ void vTaskExitCritical(void); #define portENTER_CRITICAL() vTaskEnterCritical() #define portEXIT_CRITICAL() vTaskExitCritical() -extern UBaseType_t vTaskEnterCriticalFromISR( void ); -extern void vTaskExitCriticalFromISR( BaseType_t xSavedInterruptStatus ); +extern portBASE_TYPE vTaskEnterCriticalFromISR( void ); +extern void vTaskExitCriticalFromISR( portBASE_TYPE xSavedInterruptStatus ); #define portENTER_CRITICAL_FROM_ISR vTaskEnterCriticalFromISR #define portEXIT_CRITICAL_FROM_ISR vTaskExitCriticalFromISR