From 2d281c7951acb0443488a89b694434ebf2d55be0 Mon Sep 17 00:00:00 2001
From: chinglee-iot <61685396+chinglee-iot@users.noreply.github.com>
Date: Fri, 21 Apr 2023 12:34:03 +0800
Subject: [PATCH] Update XMOS AICORE conflict (#77)

* Define portBASE_TYPE in XMOS AICORE porting

* Update enter critical from ISR API
---
 portable/ThirdParty/xClang/XCOREAI/portmacro.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/portable/ThirdParty/xClang/XCOREAI/portmacro.h b/portable/ThirdParty/xClang/XCOREAI/portmacro.h
index aef12cf3749..019d29a3c7a 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
@@ -163,8 +165,8 @@ void vTaskExitCritical(void);
 #define portENTER_CRITICAL()                   vTaskEnterCritical()
 #define portEXIT_CRITICAL()                    vTaskExitCritical()
 
-extern UBaseType_t vTaskEnterCriticalFromISR( void );
-extern void vTaskExitCriticalFromISR( UBaseType_t uxSavedInterruptStatus );
+extern portBASE_TYPE vTaskEnterCriticalFromISR( void );
+extern void vTaskExitCriticalFromISR( portBASE_TYPE xSavedInterruptStatus );
 #define portENTER_CRITICAL_FROM_ISR             vTaskEnterCriticalFromISR
 #define portEXIT_CRITICAL_FROM_ISR              vTaskExitCriticalFromISR