Skip to content

Commit 2d281c7

Browse files
authored
Update XMOS AICORE conflict (#77)
* Define portBASE_TYPE in XMOS AICORE porting * Update enter critical from ISR API
1 parent 9da6836 commit 2d281c7

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

portable/ThirdParty/xClang/XCOREAI/portmacro.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ typedef double portDOUBLE;
2626
typedef int32_t BaseType_t;
2727
typedef uint32_t UBaseType_t;
2828

29+
#define portBASE_TYPE BaseType_t
30+
2931
#if( configUSE_16_BIT_TICKS == 1 )
3032
typedef uint16_t TickType_t;
3133
#define portMAX_DELAY ( TickType_t ) 0xffff
@@ -163,8 +165,8 @@ void vTaskExitCritical(void);
163165
#define portENTER_CRITICAL() vTaskEnterCritical()
164166
#define portEXIT_CRITICAL() vTaskExitCritical()
165167

166-
extern UBaseType_t vTaskEnterCriticalFromISR( void );
167-
extern void vTaskExitCriticalFromISR( UBaseType_t uxSavedInterruptStatus );
168+
extern portBASE_TYPE vTaskEnterCriticalFromISR( void );
169+
extern void vTaskExitCriticalFromISR( portBASE_TYPE xSavedInterruptStatus );
168170
#define portENTER_CRITICAL_FROM_ISR vTaskEnterCriticalFromISR
169171
#define portEXIT_CRITICAL_FROM_ISR vTaskExitCriticalFromISR
170172

0 commit comments

Comments
 (0)