Use UBaseType_t as interrupt mask (#689)
* Use UBaseType_t as interrupt mask
* Update GCC posix port to use UBaseType_t as interrupt mask
diff --git a/event_groups.c b/event_groups.c
index 5c4b429..d7238d8 100644
--- a/event_groups.c
+++ b/event_groups.c
@@ -521,15 +521,15 @@
EventBits_t xEventGroupGetBitsFromISR( EventGroupHandle_t xEventGroup )
{
- portBASE_TYPE xSavedInterruptStatus;
+ UBaseType_t uxSavedInterruptStatus;
EventGroup_t const * const pxEventBits = xEventGroup;
EventBits_t uxReturn;
- xSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
+ uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
{
uxReturn = pxEventBits->uxEventBits;
}
- portCLEAR_INTERRUPT_MASK_FROM_ISR( xSavedInterruptStatus );
+ portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus );
return uxReturn;
} /*lint !e818 EventGroupHandle_t is a typedef used in other functions to so can't be pointer to const. */
diff --git a/portable/ThirdParty/GCC/Posix/port.c b/portable/ThirdParty/GCC/Posix/port.c
index 5ac570d..23aec65 100644
--- a/portable/ThirdParty/GCC/Posix/port.c
+++ b/portable/ThirdParty/GCC/Posix/port.c
@@ -332,17 +332,17 @@
}
/*-----------------------------------------------------------*/
-portBASE_TYPE xPortSetInterruptMask( void )
+UBaseType_t xPortSetInterruptMask( void )
{
/* Interrupts are always disabled inside ISRs (signals
* handlers). */
- return pdTRUE;
+ return ( UBaseType_t )0;
}
/*-----------------------------------------------------------*/
-void vPortClearInterruptMask( portBASE_TYPE xMask )
+void vPortClearInterruptMask( UBaseType_t uxMask )
{
- ( void ) xMask;
+ ( void ) uxMask;
}
/*-----------------------------------------------------------*/
diff --git a/portable/ThirdParty/GCC/Posix/portmacro.h b/portable/ThirdParty/GCC/Posix/portmacro.h
index a3ab7d3..df2db07 100644
--- a/portable/ThirdParty/GCC/Posix/portmacro.h
+++ b/portable/ThirdParty/GCC/Posix/portmacro.h
@@ -94,8 +94,8 @@
#define portSET_INTERRUPT_MASK() ( vPortDisableInterrupts() )
#define portCLEAR_INTERRUPT_MASK() ( vPortEnableInterrupts() )
-extern portBASE_TYPE xPortSetInterruptMask( void );
-extern void vPortClearInterruptMask( portBASE_TYPE xMask );
+extern UBaseType_t xPortSetInterruptMask( void );
+extern void vPortClearInterruptMask( UBaseType_t xMask );
extern void vPortEnterCritical( void );
extern void vPortExitCritical( void );
diff --git a/queue.c b/queue.c
index 27776f0..23e9704 100644
--- a/queue.c
+++ b/queue.c
@@ -1099,7 +1099,7 @@
const BaseType_t xCopyPosition )
{
BaseType_t xReturn;
- portBASE_TYPE xSavedInterruptStatus;
+ UBaseType_t uxSavedInterruptStatus;
Queue_t * const pxQueue = xQueue;
configASSERT( pxQueue );
@@ -1127,7 +1127,7 @@
* read, instead return a flag to say whether a context switch is required or
* not (i.e. has a task with a higher priority than us been woken by this
* post). */
- xSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
+ uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
{
if( ( pxQueue->uxMessagesWaiting < pxQueue->uxLength ) || ( xCopyPosition == queueOVERWRITE ) )
{
@@ -1252,7 +1252,7 @@
xReturn = errQUEUE_FULL;
}
}
- portCLEAR_INTERRUPT_MASK_FROM_ISR( xSavedInterruptStatus );
+ portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus );
return xReturn;
}
@@ -1262,7 +1262,7 @@
BaseType_t * const pxHigherPriorityTaskWoken )
{
BaseType_t xReturn;
- portBASE_TYPE xSavedInterruptStatus;
+ UBaseType_t uxSavedInterruptStatus;
Queue_t * const pxQueue = xQueue;
/* Similar to xQueueGenericSendFromISR() but used with semaphores where the
@@ -1298,7 +1298,7 @@
* link: https://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html */
portASSERT_IF_INTERRUPT_PRIORITY_INVALID();
- xSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
+ uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
{
const UBaseType_t uxMessagesWaiting = pxQueue->uxMessagesWaiting;
@@ -1418,7 +1418,7 @@
xReturn = errQUEUE_FULL;
}
}
- portCLEAR_INTERRUPT_MASK_FROM_ISR( xSavedInterruptStatus );
+ portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus );
return xReturn;
}
@@ -1933,7 +1933,7 @@
BaseType_t * const pxHigherPriorityTaskWoken )
{
BaseType_t xReturn;
- portBASE_TYPE xSavedInterruptStatus;
+ UBaseType_t uxSavedInterruptStatus;
Queue_t * const pxQueue = xQueue;
configASSERT( pxQueue );
@@ -1955,7 +1955,7 @@
* link: https://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html */
portASSERT_IF_INTERRUPT_PRIORITY_INVALID();
- xSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
+ uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
{
const UBaseType_t uxMessagesWaiting = pxQueue->uxMessagesWaiting;
@@ -2015,7 +2015,7 @@
traceQUEUE_RECEIVE_FROM_ISR_FAILED( pxQueue );
}
}
- portCLEAR_INTERRUPT_MASK_FROM_ISR( xSavedInterruptStatus );
+ portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus );
return xReturn;
}
@@ -2025,7 +2025,7 @@
void * const pvBuffer )
{
BaseType_t xReturn;
- portBASE_TYPE xSavedInterruptStatus;
+ UBaseType_t uxSavedInterruptStatus;
int8_t * pcOriginalReadPosition;
Queue_t * const pxQueue = xQueue;
@@ -2049,7 +2049,7 @@
* link: https://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html */
portASSERT_IF_INTERRUPT_PRIORITY_INVALID();
- xSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
+ uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
{
/* Cannot block in an ISR, so check there is data available. */
if( pxQueue->uxMessagesWaiting > ( UBaseType_t ) 0 )
@@ -2070,7 +2070,7 @@
traceQUEUE_PEEK_FROM_ISR_FAILED( pxQueue );
}
}
- portCLEAR_INTERRUPT_MASK_FROM_ISR( xSavedInterruptStatus );
+ portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus );
return xReturn;
}
diff --git a/stream_buffer.c b/stream_buffer.c
index 7dbebbd..7754306 100644
--- a/stream_buffer.c
+++ b/stream_buffer.c
@@ -96,9 +96,9 @@
#define sbRECEIVE_COMPLETED_FROM_ISR( pxStreamBuffer, \
pxHigherPriorityTaskWoken ) \
do { \
- portBASE_TYPE xSavedInterruptStatus; \
+ UBaseType_t uxSavedInterruptStatus; \
\
- xSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR(); \
+ uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR(); \
{ \
if( ( pxStreamBuffer )->xTaskWaitingToSend != NULL ) \
{ \
@@ -109,7 +109,7 @@
( pxStreamBuffer )->xTaskWaitingToSend = NULL; \
} \
} \
- portCLEAR_INTERRUPT_MASK_FROM_ISR( xSavedInterruptStatus ); \
+ portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus ); \
} while( 0 )
#endif /* sbRECEIVE_COMPLETED_FROM_ISR */
@@ -173,9 +173,9 @@
#ifndef sbSEND_COMPLETE_FROM_ISR
#define sbSEND_COMPLETE_FROM_ISR( pxStreamBuffer, pxHigherPriorityTaskWoken ) \
do { \
- portBASE_TYPE xSavedInterruptStatus; \
+ UBaseType_t uxSavedInterruptStatus; \
\
- xSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR(); \
+ uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR(); \
{ \
if( ( pxStreamBuffer )->xTaskWaitingToReceive != NULL ) \
{ \
@@ -186,7 +186,7 @@
( pxStreamBuffer )->xTaskWaitingToReceive = NULL; \
} \
} \
- portCLEAR_INTERRUPT_MASK_FROM_ISR( xSavedInterruptStatus ); \
+ portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus ); \
} while( 0 )
#endif /* sbSEND_COMPLETE_FROM_ISR */
@@ -1214,11 +1214,11 @@
{
StreamBuffer_t * const pxStreamBuffer = xStreamBuffer;
BaseType_t xReturn;
- portBASE_TYPE xSavedInterruptStatus;
+ UBaseType_t uxSavedInterruptStatus;
configASSERT( pxStreamBuffer );
- xSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
+ uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
{
if( ( pxStreamBuffer )->xTaskWaitingToReceive != NULL )
{
@@ -1234,7 +1234,7 @@
xReturn = pdFALSE;
}
}
- portCLEAR_INTERRUPT_MASK_FROM_ISR( xSavedInterruptStatus );
+ portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus );
return xReturn;
}
@@ -1245,11 +1245,11 @@
{
StreamBuffer_t * const pxStreamBuffer = xStreamBuffer;
BaseType_t xReturn;
- portBASE_TYPE xSavedInterruptStatus;
+ UBaseType_t uxSavedInterruptStatus;
configASSERT( pxStreamBuffer );
- xSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
+ uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
{
if( ( pxStreamBuffer )->xTaskWaitingToSend != NULL )
{
@@ -1265,7 +1265,7 @@
xReturn = pdFALSE;
}
}
- portCLEAR_INTERRUPT_MASK_FROM_ISR( xSavedInterruptStatus );
+ portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus );
return xReturn;
}
diff --git a/tasks.c b/tasks.c
index f2d6a40..5548220 100644
--- a/tasks.c
+++ b/tasks.c
@@ -1481,7 +1481,7 @@
{
TCB_t const * pxTCB;
UBaseType_t uxReturn;
- portBASE_TYPE xSavedInterruptState;
+ UBaseType_t uxSavedInterruptState;
/* RTOS ports that support interrupt nesting have the concept of a
* maximum system call (or maximum API call) interrupt priority.
@@ -1501,14 +1501,14 @@
* https://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html */
portASSERT_IF_INTERRUPT_PRIORITY_INVALID();
- xSavedInterruptState = portSET_INTERRUPT_MASK_FROM_ISR();
+ uxSavedInterruptState = portSET_INTERRUPT_MASK_FROM_ISR();
{
/* If null is passed in here then it is the priority of the calling
* task that is being queried. */
pxTCB = prvGetTCBFromHandle( xTask );
uxReturn = pxTCB->uxPriority;
}
- portCLEAR_INTERRUPT_MASK_FROM_ISR( xSavedInterruptState );
+ portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptState );
return uxReturn;
}
@@ -1894,7 +1894,7 @@
{
BaseType_t xYieldRequired = pdFALSE;
TCB_t * const pxTCB = xTaskToResume;
- portBASE_TYPE xSavedInterruptStatus;
+ UBaseType_t uxSavedInterruptStatus;
configASSERT( xTaskToResume );
@@ -1916,7 +1916,7 @@
* https://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html */
portASSERT_IF_INTERRUPT_PRIORITY_INVALID();
- xSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
+ uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
{
if( prvTaskIsTaskSuspended( pxTCB ) != pdFALSE )
{
@@ -1957,7 +1957,7 @@
mtCOVERAGE_TEST_MARKER();
}
}
- portCLEAR_INTERRUPT_MASK_FROM_ISR( xSavedInterruptStatus );
+ portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus );
return xYieldRequired;
}
@@ -2315,7 +2315,7 @@
TickType_t xTaskGetTickCountFromISR( void )
{
TickType_t xReturn;
- portBASE_TYPE xSavedInterruptStatus;
+ UBaseType_t uxSavedInterruptStatus;
/* RTOS ports that support interrupt nesting have the concept of a maximum
* system call (or maximum API call) interrupt priority. Interrupts that are
@@ -2333,11 +2333,11 @@
* link: https://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html */
portASSERT_IF_INTERRUPT_PRIORITY_INVALID();
- xSavedInterruptStatus = portTICK_TYPE_SET_INTERRUPT_MASK_FROM_ISR();
+ uxSavedInterruptStatus = portTICK_TYPE_SET_INTERRUPT_MASK_FROM_ISR();
{
xReturn = xTickCount;
}
- portTICK_TYPE_CLEAR_INTERRUPT_MASK_FROM_ISR( xSavedInterruptStatus );
+ portTICK_TYPE_CLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus );
return xReturn;
}
@@ -3015,18 +3015,18 @@
{
TCB_t * pxTCB;
TaskHookFunction_t xReturn;
- portBASE_TYPE xSavedInterruptStatus;
+ UBaseType_t uxSavedInterruptStatus;
/* If xTask is NULL then set the calling task's hook. */
pxTCB = prvGetTCBFromHandle( xTask );
/* Save the hook function in the TCB. A critical section is required as
* the value can be accessed from an interrupt. */
- xSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
+ uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
{
xReturn = pxTCB->pxTaskTag;
}
- portCLEAR_INTERRUPT_MASK_FROM_ISR( xSavedInterruptStatus );
+ portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus );
return xReturn;
}
@@ -5035,7 +5035,7 @@
TCB_t * pxTCB;
uint8_t ucOriginalNotifyState;
BaseType_t xReturn = pdPASS;
- portBASE_TYPE xSavedInterruptStatus;
+ UBaseType_t uxSavedInterruptStatus;
configASSERT( xTaskToNotify );
configASSERT( uxIndexToNotify < configTASK_NOTIFICATION_ARRAY_ENTRIES );
@@ -5060,7 +5060,7 @@
pxTCB = xTaskToNotify;
- xSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
+ uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
{
if( pulPreviousNotificationValue != NULL )
{
@@ -5154,7 +5154,7 @@
}
}
}
- portCLEAR_INTERRUPT_MASK_FROM_ISR( xSavedInterruptStatus );
+ portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus );
return xReturn;
}
@@ -5170,7 +5170,7 @@
{
TCB_t * pxTCB;
uint8_t ucOriginalNotifyState;
- portBASE_TYPE xSavedInterruptStatus;
+ UBaseType_t uxSavedInterruptStatus;
configASSERT( xTaskToNotify );
configASSERT( uxIndexToNotify < configTASK_NOTIFICATION_ARRAY_ENTRIES );
@@ -5195,7 +5195,7 @@
pxTCB = xTaskToNotify;
- xSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
+ uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
{
ucOriginalNotifyState = pxTCB->ucNotifyState[ uxIndexToNotify ];
pxTCB->ucNotifyState[ uxIndexToNotify ] = taskNOTIFICATION_RECEIVED;
@@ -5245,7 +5245,7 @@
}
}
}
- portCLEAR_INTERRUPT_MASK_FROM_ISR( xSavedInterruptStatus );
+ portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus );
}
#endif /* configUSE_TASK_NOTIFICATIONS */
