len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-04-20 05:21:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add in the portSET_INTERRUPT_MASK_FROM_ISR() and portCLEAR_INTERRUPT_MASK_FROM_ISR() macros.

Browse source
This commit is contained in:
Richard Barry 2008-05-07 18:00:26 +00:00
parent 676139e920
commit 5d27f3ccf7
1 changed files with 57 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
Source/queue.c
View file

@ -808,40 +808,44 @@ signed portBASE_TYPE xReturn;
queue read, instead we return a flag to say whether a context switch is queue read, instead we 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 required or not (i.e. has a task with a higher priority than us been woken
by this post). */ by this post). */
if( pxQueue->uxMessagesWaiting < pxQueue->uxLength ) portSET_INTERRUPT_MASK_FROM_ISR();
{ {
traceQUEUE_SEND_FROM_ISR( pxQueue ); if( pxQueue->uxMessagesWaiting < pxQueue->uxLength )
prvCopyDataToQueue( pxQueue, pvItemToQueue, xCopyPosition );
/* If the queue is locked we do not alter the event list. This will
be done when the queue is unlocked later. */
if( pxQueue->xTxLock == queueUNLOCKED )
{ {
if( !listLIST_IS_EMPTY( &( pxQueue->xTasksWaitingToReceive ) ) ) traceQUEUE_SEND_FROM_ISR( pxQueue );
prvCopyDataToQueue( pxQueue, pvItemToQueue, xCopyPosition );
/* If the queue is locked we do not alter the event list. This will
be done when the queue is unlocked later. */
if( pxQueue->xTxLock == queueUNLOCKED )
{ {
if( xTaskRemoveFromEventList( &( pxQueue->xTasksWaitingToReceive ) ) != pdFALSE ) if( !listLIST_IS_EMPTY( &( pxQueue->xTasksWaitingToReceive ) ) )
{ {
/* The task waiting has a higher priority so record that a if( xTaskRemoveFromEventList( &( pxQueue->xTasksWaitingToReceive ) ) != pdFALSE )
context switch is required. */ {
*pxHigherPriorityTaskWoken = pdTRUE; /* The task waiting has a higher priority so record that a
context switch is required. */
*pxHigherPriorityTaskWoken = pdTRUE;
}
} }
} }
else
{
/* Increment the lock count so the task that unlocks the queue
knows that data was posted while it was locked. */
++( pxQueue->xTxLock );
}
xReturn = pdPASS;
} }
else else
{ {
/* Increment the lock count so the task that unlocks the queue traceQUEUE_SEND_FROM_ISR_FAILED( pxQueue );
knows that data was posted while it was locked. */ xReturn = errQUEUE_FULL;
++( pxQueue->xTxLock );
} }
xReturn = pdPASS;
}
else
{
traceQUEUE_SEND_FROM_ISR_FAILED( pxQueue );
xReturn = errQUEUE_FULL;
} }
portCLEAR_INTERRUPT_MASK_FROM_ISR();
return xReturn; return xReturn;
} }
@ -1004,43 +1008,47 @@ signed portBASE_TYPE xQueueReceiveFromISR( xQueueHandle pxQueue, void * const pv
{ {
signed portBASE_TYPE xReturn; signed portBASE_TYPE xReturn;
/* We cannot block from an ISR, so check there is data available. */ portSET_INTERRUPT_MASK_FROM_ISR();
if( pxQueue->uxMessagesWaiting > ( unsigned portBASE_TYPE ) 0 )
{ {
traceQUEUE_RECEIVE_FROM_ISR( pxQueue ); /* We cannot block from an ISR, so check there is data available. */
if( pxQueue->uxMessagesWaiting > ( unsigned portBASE_TYPE ) 0 )
prvCopyDataFromQueue( pxQueue, pvBuffer );
--( pxQueue->uxMessagesWaiting );
/* If the queue is locked we will not modify the event list. Instead
we update the lock count so the task that unlocks the queue will know
that an ISR has removed data while the queue was locked. */
if( pxQueue->xRxLock == queueUNLOCKED )
{ {
if( !listLIST_IS_EMPTY( &( pxQueue->xTasksWaitingToSend ) ) ) traceQUEUE_RECEIVE_FROM_ISR( pxQueue );
prvCopyDataFromQueue( pxQueue, pvBuffer );
--( pxQueue->uxMessagesWaiting );
/* If the queue is locked we will not modify the event list. Instead
we update the lock count so the task that unlocks the queue will know
that an ISR has removed data while the queue was locked. */
if( pxQueue->xRxLock == queueUNLOCKED )
{ {
if( xTaskRemoveFromEventList( &( pxQueue->xTasksWaitingToSend ) ) != pdFALSE ) if( !listLIST_IS_EMPTY( &( pxQueue->xTasksWaitingToSend ) ) )
{ {
/* The task waiting has a higher priority than us so if( xTaskRemoveFromEventList( &( pxQueue->xTasksWaitingToSend ) ) != pdFALSE )
force a context switch. */ {
*pxTaskWoken = pdTRUE; /* The task waiting has a higher priority than us so
force a context switch. */
*pxTaskWoken = pdTRUE;
}
} }
} }
else
{
/* Increment the lock count so the task that unlocks the queue
knows that data was removed while it was locked. */
++( pxQueue->xRxLock );
}
xReturn = pdPASS;
} }
else else
{ {
/* Increment the lock count so the task that unlocks the queue xReturn = pdFAIL;
knows that data was removed while it was locked. */ traceQUEUE_RECEIVE_FROM_ISR_FAILED( pxQueue );
++( pxQueue->xRxLock );
} }
xReturn = pdPASS;
}
else
{
xReturn = pdFAIL;
traceQUEUE_RECEIVE_FROM_ISR_FAILED( pxQueue );
} }
portCLEAR_INTERRUPT_MASK_FROM_ISR();
return xReturn; return xReturn;
} }