mirror of
https://github.com/FreeRTOS/FreeRTOS-Kernel.git
synced 2025-10-19 19:27:45 -04:00
Bring in the patches from FreeRTOS dir to FreeRTOS-Plus (#306)
* MISRA v5 * Update patches in FreeRTOS-Plus to match those in FreeRTOS
This commit is contained in:
parent
6cc5310f38
commit
a8290734d8
4 changed files with 63 additions and 46 deletions
|
@ -1,22 +1,22 @@
|
|||
diff --git a/FreeRTOS/Source/queue.c b/FreeRTOS/Source/queue.c
|
||||
index df2b9c8c..c2265c26 100644
|
||||
index edd08b26e..8fa137c9b 100644
|
||||
--- a/FreeRTOS/Source/queue.c
|
||||
+++ b/FreeRTOS/Source/queue.c
|
||||
@@ -105,7 +105,7 @@ static BaseType_t prvIsQueueFull( const Queue_t *pxQueue ) PRIVILEGED_FUNCTION;
|
||||
@@ -191,7 +191,7 @@ static BaseType_t prvIsQueueFull( const Queue_t * pxQueue ) PRIVILEGED_FUNCTION;
|
||||
* Copies an item into the queue, either at the front of the queue or the
|
||||
* back of the queue.
|
||||
*/
|
||||
-static BaseType_t prvCopyDataToQueue( Queue_t * const pxQueue, const void *pvItemToQueue, const BaseType_t xPosition ) PRIVILEGED_FUNCTION;
|
||||
+BaseType_t prvCopyDataToQueue( Queue_t * const pxQueue, const void *pvItemToQueue, const BaseType_t xPosition ) PRIVILEGED_FUNCTION;
|
||||
|
||||
/*
|
||||
* Copies an item out of a queue.
|
||||
@@ -1985,7 +1985,7 @@ Queue_t * const pxQueue = xQueue;
|
||||
-static BaseType_t prvCopyDataToQueue( Queue_t * const pxQueue,
|
||||
+BaseType_t prvCopyDataToQueue( Queue_t * const pxQueue,
|
||||
const void * pvItemToQueue,
|
||||
const BaseType_t xPosition ) PRIVILEGED_FUNCTION;
|
||||
|
||||
@@ -2120,7 +2120,7 @@ void vQueueDelete( QueueHandle_t xQueue )
|
||||
#endif /* configUSE_MUTEXES */
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
-static BaseType_t prvCopyDataToQueue( Queue_t * const pxQueue, const void *pvItemToQueue, const BaseType_t xPosition )
|
||||
+BaseType_t prvCopyDataToQueue( Queue_t * const pxQueue, const void *pvItemToQueue, const BaseType_t xPosition )
|
||||
|
||||
-static BaseType_t prvCopyDataToQueue( Queue_t * const pxQueue,
|
||||
+BaseType_t prvCopyDataToQueue( Queue_t * const pxQueue,
|
||||
const void * pvItemToQueue,
|
||||
const BaseType_t xPosition )
|
||||
{
|
||||
BaseType_t xReturn = pdFALSE;
|
||||
UBaseType_t uxMessagesWaiting;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue