Skip to content

Commit 37d0afb

Browse files
alfred2galfred2g
authored
Merge branch 'main' into picolibc
2 parents 5f91cb5 + ac69aa8 commit 37d0afb

File tree

14 files changed

+96
-90
lines changed

14 files changed

+96
-90
lines changed

‎.github/workflows/unit-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
- name: Install packages
2626
run: |
27-
sudo apt-get install lcov cflow ruby doxygen build-essential
27+
sudo apt-get install lcov cflow ruby doxygen build-essential unifdef
2828
- name: Run Unit Tests with ENABLE_SANITIZER=1
2929
run: |
3030
make -C FreeRTOS/Test/CMock clean

‎croutine.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@
6565
* This macro accesses the co-routine ready lists and therefore must not be
6666
* used from within an ISR.
6767
*/
68-
#define prvAddCoRoutineToReadyQueue( pxCRCB ) \
69-
{ \
70-
if( pxCRCB->uxPriority > uxTopCoRoutineReadyPriority ) \
71-
{ \
72-
uxTopCoRoutineReadyPriority = pxCRCB->uxPriority; \
73-
} \
74-
vListInsertEnd( ( List_t * ) &( pxReadyCoRoutineLists[ pxCRCB->uxPriority ] ), &( pxCRCB->xGenericListItem ) ); \
68+
#define prvAddCoRoutineToReadyQueue( pxCRCB ) \
69+
{ \
70+
if( ( pxCRCB )->uxPriority > uxTopCoRoutineReadyPriority ) \
71+
{ \
72+
uxTopCoRoutineReadyPriority = ( pxCRCB )->uxPriority; \
73+
} \
74+
vListInsertEnd( ( List_t * ) &( pxReadyCoRoutineLists[ ( pxCRCB )->uxPriority ] ), &( ( pxCRCB )->xGenericListItem ) ); \
7575
}
7676

7777
/*

‎include/FreeRTOS.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -399,19 +399,19 @@
399399
#endif
400400

401401
#ifndef portCLEAR_INTERRUPT_MASK_FROM_ISR
402-
#define portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedStatusValue ) ( void ) uxSavedStatusValue
402+
#define portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedStatusValue ) ( void ) ( uxSavedStatusValue )
403403
#endif
404404

405405
#ifndef portCLEAN_UP_TCB
406-
#define portCLEAN_UP_TCB( pxTCB ) ( void ) pxTCB
406+
#define portCLEAN_UP_TCB( pxTCB ) ( void ) ( pxTCB )
407407
#endif
408408

409409
#ifndef portPRE_TASK_DELETE_HOOK
410410
#define portPRE_TASK_DELETE_HOOK( pvTaskToDelete, pxYieldPending )
411411
#endif
412412

413413
#ifndef portSETUP_TCB
414-
#define portSETUP_TCB( pxTCB ) ( void ) pxTCB
414+
#define portSETUP_TCB( pxTCB ) ( void ) ( pxTCB )
415415
#endif
416416

417417
#ifndef configQUEUE_REGISTRY_SIZE
@@ -723,15 +723,15 @@
723723
#endif
724724

725725
#ifndef traceEVENT_GROUP_SYNC_END
726-
#define traceEVENT_GROUP_SYNC_END( xEventGroup, uxBitsToSet, uxBitsToWaitFor, xTimeoutOccurred ) ( void ) xTimeoutOccurred
726+
#define traceEVENT_GROUP_SYNC_END( xEventGroup, uxBitsToSet, uxBitsToWaitFor, xTimeoutOccurred ) ( void ) ( xTimeoutOccurred )
727727
#endif
728728

729729
#ifndef traceEVENT_GROUP_WAIT_BITS_BLOCK
730730
#define traceEVENT_GROUP_WAIT_BITS_BLOCK( xEventGroup, uxBitsToWaitFor )
731731
#endif
732732

733733
#ifndef traceEVENT_GROUP_WAIT_BITS_END
734-
#define traceEVENT_GROUP_WAIT_BITS_END( xEventGroup, uxBitsToWaitFor, xTimeoutOccurred ) ( void ) xTimeoutOccurred
734+
#define traceEVENT_GROUP_WAIT_BITS_END( xEventGroup, uxBitsToWaitFor, xTimeoutOccurred ) ( void ) ( xTimeoutOccurred )
735735
#endif
736736

737737
#ifndef traceEVENT_GROUP_CLEAR_BITS
@@ -1062,7 +1062,7 @@
10621062
#define portTICK_TYPE_ENTER_CRITICAL()
10631063
#define portTICK_TYPE_EXIT_CRITICAL()
10641064
#define portTICK_TYPE_SET_INTERRUPT_MASK_FROM_ISR() 0
1065-
#define portTICK_TYPE_CLEAR_INTERRUPT_MASK_FROM_ISR( x ) ( void ) x
1065+
#define portTICK_TYPE_CLEAR_INTERRUPT_MASK_FROM_ISR( x ) ( void ) ( x )
10661066
#endif /* if ( portTICK_TYPE_IS_ATOMIC == 0 ) */
10671067

10681068
/* Definitions to allow backward compatibility with FreeRTOS versions prior to

‎include/event_groups.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ EventBits_t xEventGroupClearBits( EventGroupHandle_t xEventGroup,
423423
const EventBits_t uxBitsToClear ) PRIVILEGED_FUNCTION;
424424
#else
425425
#define xEventGroupClearBitsFromISR( xEventGroup, uxBitsToClear ) \
426-
xTimerPendFunctionCallFromISR( vEventGroupClearBitsCallback, ( void * ) xEventGroup, ( uint32_t ) uxBitsToClear, NULL )
426+
xTimerPendFunctionCallFromISR( vEventGroupClearBitsCallback, ( void * ) ( xEventGroup ), ( uint32_t ) ( uxBitsToClear ), NULL )
427427
#endif
428428

429429
/**
@@ -579,7 +579,7 @@ EventBits_t xEventGroupSetBits( EventGroupHandle_t xEventGroup,
579579
BaseType_t * pxHigherPriorityTaskWoken ) PRIVILEGED_FUNCTION;
580580
#else
581581
#define xEventGroupSetBitsFromISR( xEventGroup, uxBitsToSet, pxHigherPriorityTaskWoken ) \
582-
xTimerPendFunctionCallFromISR( vEventGroupSetBitsCallback, ( void * ) xEventGroup, ( uint32_t ) uxBitsToSet, pxHigherPriorityTaskWoken )
582+
xTimerPendFunctionCallFromISR( vEventGroupSetBitsCallback, ( void * ) ( xEventGroup ), ( uint32_t ) ( uxBitsToSet ), ( pxHigherPriorityTaskWoken ) )
583583
#endif
584584

585585
/**
@@ -728,7 +728,7 @@ EventBits_t xEventGroupSync( EventGroupHandle_t xEventGroup,
728728
* \defgroup xEventGroupGetBits xEventGroupGetBits
729729
* \ingroup EventGroup
730730
*/
731-
#define xEventGroupGetBits( xEventGroup ) xEventGroupClearBits( xEventGroup, 0 )
731+
#define xEventGroupGetBits( xEventGroup ) xEventGroupClearBits( ( xEventGroup ), 0 )
732732

733733
/**
734734
* event_groups.h

‎include/message_buffer.h

+10-10
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,11 @@ typedef StreamBufferHandle_t MessageBufferHandle_t;
156156
* \ingroup MessageBufferManagement
157157
*/
158158
#define xMessageBufferCreate( xBufferSizeBytes ) \
159-
xStreamBufferGenericCreate( xBufferSizeBytes, ( size_t ) 0, pdTRUE, NULL, NULL )
159+
xStreamBufferGenericCreate( ( xBufferSizeBytes ), ( size_t ) 0, pdTRUE, NULL, NULL )
160160

161161
#if ( configUSE_SB_COMPLETED_CALLBACK == 1 )
162162
#define xMessageBufferCreateWithCallback( xBufferSizeBytes, pxSendCompletedCallback, pxReceiveCompletedCallback ) \
163-
xStreamBufferGenericCreate( xBufferSizeBytes, ( size_t ) 0, pdTRUE, pxSendCompletedCallback, pxReceiveCompletedCallback )
163+
xStreamBufferGenericCreate( ( xBufferSizeBytes ), ( size_t ) 0, pdTRUE, ( pxSendCompletedCallback ), ( pxReceiveCompletedCallback ) )
164164
#endif
165165

166166
/**
@@ -238,11 +238,11 @@ typedef StreamBufferHandle_t MessageBufferHandle_t;
238238
* \ingroup MessageBufferManagement
239239
*/
240240
#define xMessageBufferCreateStatic( xBufferSizeBytes, pucMessageBufferStorageArea, pxStaticMessageBuffer ) \
241-
xStreamBufferGenericCreateStatic( xBufferSizeBytes, 0, pdTRUE, pucMessageBufferStorageArea, pxStaticMessageBuffer, NULL, NULL )
241+
xStreamBufferGenericCreateStatic( ( xBufferSizeBytes ), 0, pdTRUE, ( pucMessageBufferStorageArea ), ( pxStaticMessageBuffer ), NULL, NULL )
242242

243243
#if ( configUSE_SB_COMPLETED_CALLBACK == 1 )
244244
#define xMessageBufferCreateStaticWithCallback( xBufferSizeBytes, pucMessageBufferStorageArea, pxStaticMessageBuffer, pxSendCompletedCallback, pxReceiveCompletedCallback ) \
245-
xStreamBufferGenericCreateStatic( xBufferSizeBytes, 0, pdTRUE, pucMessageBufferStorageArea, pxStaticMessageBuffer, pxSendCompletedCallback, pxReceiveCompletedCallback )
245+
xStreamBufferGenericCreateStatic( ( xBufferSizeBytes ), 0, pdTRUE, ( pucMessageBufferStorageArea ), ( pxStaticMessageBuffer ), ( pxSendCompletedCallback ), ( pxReceiveCompletedCallback ) )
246246
#endif
247247

248248
/**
@@ -343,7 +343,7 @@ typedef StreamBufferHandle_t MessageBufferHandle_t;
343343
* \ingroup MessageBufferManagement
344344
*/
345345
#define xMessageBufferSend( xMessageBuffer, pvTxData, xDataLengthBytes, xTicksToWait ) \
346-
xStreamBufferSend( xMessageBuffer, pvTxData, xDataLengthBytes, xTicksToWait )
346+
xStreamBufferSend( ( xMessageBuffer ), ( pvTxData ), ( xDataLengthBytes ), ( xTicksToWait ) )
347347

348348
/**
349349
* message_buffer.h
@@ -448,7 +448,7 @@ typedef StreamBufferHandle_t MessageBufferHandle_t;
448448
* \ingroup MessageBufferManagement
449449
*/
450450
#define xMessageBufferSendFromISR( xMessageBuffer, pvTxData, xDataLengthBytes, pxHigherPriorityTaskWoken ) \
451-
xStreamBufferSendFromISR( xMessageBuffer, pvTxData, xDataLengthBytes, pxHigherPriorityTaskWoken )
451+
xStreamBufferSendFromISR( ( xMessageBuffer ), ( pvTxData ), ( xDataLengthBytes ), ( pxHigherPriorityTaskWoken ) )
452452

453453
/**
454454
* message_buffer.h
@@ -537,7 +537,7 @@ typedef StreamBufferHandle_t MessageBufferHandle_t;
537537
* \ingroup MessageBufferManagement
538538
*/
539539
#define xMessageBufferReceive( xMessageBuffer, pvRxData, xBufferLengthBytes, xTicksToWait ) \
540-
xStreamBufferReceive( xMessageBuffer, pvRxData, xBufferLengthBytes, xTicksToWait )
540+
xStreamBufferReceive( ( xMessageBuffer ), ( pvRxData ), ( xBufferLengthBytes ), ( xTicksToWait ) )
541541

542542

543543
/**
@@ -639,7 +639,7 @@ typedef StreamBufferHandle_t MessageBufferHandle_t;
639639
* \ingroup MessageBufferManagement
640640
*/
641641
#define xMessageBufferReceiveFromISR( xMessageBuffer, pvRxData, xBufferLengthBytes, pxHigherPriorityTaskWoken ) \
642-
xStreamBufferReceiveFromISR( xMessageBuffer, pvRxData, xBufferLengthBytes, pxHigherPriorityTaskWoken )
642+
xStreamBufferReceiveFromISR( ( xMessageBuffer ), ( pvRxData ), ( xBufferLengthBytes ), ( pxHigherPriorityTaskWoken ) )
643643

644644
/**
645645
* message_buffer.h
@@ -804,7 +804,7 @@ typedef StreamBufferHandle_t MessageBufferHandle_t;
804804
* \ingroup StreamBufferManagement
805805
*/
806806
#define xMessageBufferSendCompletedFromISR( xMessageBuffer, pxHigherPriorityTaskWoken ) \
807-
xStreamBufferSendCompletedFromISR( xMessageBuffer, pxHigherPriorityTaskWoken )
807+
xStreamBufferSendCompletedFromISR( ( xMessageBuffer ), ( pxHigherPriorityTaskWoken ) )
808808

809809
/**
810810
* message_buffer.h
@@ -845,7 +845,7 @@ typedef StreamBufferHandle_t MessageBufferHandle_t;
845845
* \ingroup StreamBufferManagement
846846
*/
847847
#define xMessageBufferReceiveCompletedFromISR( xMessageBuffer, pxHigherPriorityTaskWoken ) \
848-
xStreamBufferReceiveCompletedFromISR( xMessageBuffer, pxHigherPriorityTaskWoken )
848+
xStreamBufferReceiveCompletedFromISR( ( xMessageBuffer ), ( pxHigherPriorityTaskWoken ) )
849849

850850
/* *INDENT-OFF* */
851851
#if defined( __cplusplus )

‎include/mpu_wrappers.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -182,10 +182,10 @@
182182
#define xPortRaisePrivilege( xRunningPrivileged ) \
183183
{ \
184184
/* Check whether the processor is already privileged. */ \
185-
xRunningPrivileged = portIS_PRIVILEGED(); \
185+
( xRunningPrivileged ) = portIS_PRIVILEGED(); \
186186
\
187187
/* If the processor is not already privileged, raise privilege. */ \
188-
if( xRunningPrivileged == pdFALSE ) \
188+
if( ( xRunningPrivileged ) == pdFALSE ) \
189189
{ \
190190
portRAISE_PRIVILEGE(); \
191191
} \
@@ -197,7 +197,7 @@
197197
*/
198198
#define vPortResetPrivilege( xRunningPrivileged ) \
199199
{ \
200-
if( xRunningPrivileged == pdFALSE ) \
200+
if( ( xRunningPrivileged ) == pdFALSE ) \
201201
{ \
202202
portRESET_PRIVILEGE(); \
203203
} \

‎include/queue.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1478,7 +1478,7 @@ BaseType_t xQueueGiveMutexRecursive( QueueHandle_t xMutex ) PRIVILEGED_FUNCTION;
14781478
* Reset a queue back to its original empty state. The return value is now
14791479
* obsolete and is always set to pdPASS.
14801480
*/
1481-
#define xQueueReset( xQueue ) xQueueGenericReset( xQueue, pdFALSE )
1481+
#define xQueueReset( xQueue ) xQueueGenericReset( ( xQueue ), pdFALSE )
14821482

14831483
/*
14841484
* The registry is provided as a means for kernel aware debuggers to

‎include/semphr.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ typedef QueueHandle_t SemaphoreHandle_t;
225225
* \ingroup Semaphores
226226
*/
227227
#if ( configSUPPORT_STATIC_ALLOCATION == 1 )
228-
#define xSemaphoreCreateBinaryStatic( pxStaticSemaphore ) xQueueGenericCreateStatic( ( UBaseType_t ) 1, semSEMAPHORE_QUEUE_ITEM_LENGTH, NULL, pxStaticSemaphore, queueQUEUE_TYPE_BINARY_SEMAPHORE )
228+
#define xSemaphoreCreateBinaryStatic( pxStaticSemaphore ) xQueueGenericCreateStatic( ( UBaseType_t ) 1, semSEMAPHORE_QUEUE_ITEM_LENGTH, NULL, ( pxStaticSemaphore ), queueQUEUE_TYPE_BINARY_SEMAPHORE )
229229
#endif /* configSUPPORT_STATIC_ALLOCATION */
230230

231231
/**
@@ -940,7 +940,7 @@ typedef QueueHandle_t SemaphoreHandle_t;
940940
* \ingroup Semaphores
941941
*/
942942
#if ( ( configSUPPORT_STATIC_ALLOCATION == 1 ) && ( configUSE_RECURSIVE_MUTEXES == 1 ) )
943-
#define xSemaphoreCreateRecursiveMutexStatic( pxStaticSemaphore ) xQueueCreateMutexStatic( queueQUEUE_TYPE_RECURSIVE_MUTEX, pxStaticSemaphore )
943+
#define xSemaphoreCreateRecursiveMutexStatic( pxStaticSemaphore ) xQueueCreateMutexStatic( queueQUEUE_TYPE_RECURSIVE_MUTEX, ( pxStaticSemaphore ) )
944944
#endif /* configSUPPORT_STATIC_ALLOCATION */
945945

946946
/**

‎include/stream_buffer.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,11 @@ typedef void (* StreamBufferCallbackFunction_t)( StreamBufferHandle_t xStreamBuf
155155
*/
156156

157157
#define xStreamBufferCreate( xBufferSizeBytes, xTriggerLevelBytes ) \
158-
xStreamBufferGenericCreate( xBufferSizeBytes, xTriggerLevelBytes, pdFALSE, NULL, NULL )
158+
xStreamBufferGenericCreate( ( xBufferSizeBytes ), ( xTriggerLevelBytes ), pdFALSE, NULL, NULL )
159159

160160
#if ( configUSE_SB_COMPLETED_CALLBACK == 1 )
161161
#define xStreamBufferCreateWithCallback( xBufferSizeBytes, xTriggerLevelBytes, pxSendCompletedCallback, pxReceiveCompletedCallback ) \
162-
xStreamBufferGenericCreate( xBufferSizeBytes, xTriggerLevelBytes, pdFALSE, pxSendCompletedCallback, pxReceiveCompletedCallback )
162+
xStreamBufferGenericCreate( ( xBufferSizeBytes ), ( xTriggerLevelBytes ), pdFALSE, ( pxSendCompletedCallback ), ( pxReceiveCompletedCallback ) )
163163
#endif
164164

165165
/**
@@ -253,11 +253,11 @@ typedef void (* StreamBufferCallbackFunction_t)( StreamBufferHandle_t xStreamBuf
253253
*/
254254

255255
#define xStreamBufferCreateStatic( xBufferSizeBytes, xTriggerLevelBytes, pucStreamBufferStorageArea, pxStaticStreamBuffer ) \
256-
xStreamBufferGenericCreateStatic( xBufferSizeBytes, xTriggerLevelBytes, pdFALSE, pucStreamBufferStorageArea, pxStaticStreamBuffer, NULL, NULL )
256+
xStreamBufferGenericCreateStatic( ( xBufferSizeBytes ), ( xTriggerLevelBytes ), pdFALSE, ( pucStreamBufferStorageArea ), ( pxStaticStreamBuffer ), NULL, NULL )
257257

258258
#if ( configUSE_SB_COMPLETED_CALLBACK == 1 )
259259
#define xStreamBufferCreateStaticWithCallback( xBufferSizeBytes, xTriggerLevelBytes, pucStreamBufferStorageArea, pxStaticStreamBuffer, pxSendCompletedCallback, pxReceiveCompletedCallback ) \
260-
xStreamBufferGenericCreateStatic( xBufferSizeBytes, xTriggerLevelBytes, pdFALSE, pucStreamBufferStorageArea, pxStaticStreamBuffer, pxSendCompletedCallback, pxReceiveCompletedCallback )
260+
xStreamBufferGenericCreateStatic( ( xBufferSizeBytes ), ( xTriggerLevelBytes ), pdFALSE, ( pucStreamBufferStorageArea ), ( pxStaticStreamBuffer ), ( pxSendCompletedCallback ), ( pxReceiveCompletedCallback ) )
261261
#endif
262262

263263
/**

‎include/task.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -865,9 +865,9 @@ BaseType_t xTaskDelayUntil( TickType_t * const pxPreviousWakeTime,
865865
* vTaskDelayUntil() is the older version of xTaskDelayUntil() and does not
866866
* return a value.
867867
*/
868-
#define vTaskDelayUntil( pxPreviousWakeTime, xTimeIncrement ) \
869-
{ \
870-
( void ) xTaskDelayUntil( pxPreviousWakeTime, xTimeIncrement ); \
868+
#define vTaskDelayUntil( pxPreviousWakeTime, xTimeIncrement ) \
869+
{ \
870+
( void ) xTaskDelayUntil( ( pxPreviousWakeTime ), ( xTimeIncrement ) ); \
871871
}
872872

873873

‎portable/ThirdParty/GCC/Posix/port.c

+6-1
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,7 @@ portBASE_TYPE xPortSetInterruptMask( void )
325325

326326
void vPortClearInterruptMask( portBASE_TYPE xMask )
327327
{
328+
( void ) xMask;
328329
}
329330
/*-----------------------------------------------------------*/
330331

@@ -385,6 +386,8 @@ static void vPortSystemTickHandler( int sig )
385386
Thread_t * pxThreadToSuspend;
386387
Thread_t * pxThreadToResume;
387388

389+
( void ) sig;
390+
388391
/* uint64_t xExpectedTicks; */
389392

390393
uxCriticalNesting++; /* Signals are blocked in this signal handler. */
@@ -425,6 +428,8 @@ void vPortThreadDying( void * pxTaskToDelete,
425428
{
426429
Thread_t * pxThread = prvGetThreadFromTask( pxTaskToDelete );
427430

431+
( void ) pxPendYield;
432+
428433
pxThread->xDying = pdTRUE;
429434
}
430435

@@ -526,7 +531,7 @@ static void prvResumeThread( Thread_t * xThreadId )
526531

527532
static void prvSetupSignalsAndSchedulerPolicy( void )
528533
{
529-
struct sigaction sigresume, sigtick;
534+
struct sigaction sigtick;
530535
int iRet;
531536

532537
hMainThread = pthread_self();

‎portable/ThirdParty/GCC/RP2040/library.cmake

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ target_sources(FreeRTOS-Kernel INTERFACE
2727
)
2828

2929
target_include_directories(FreeRTOS-Kernel INTERFACE
30-
${CMAKE_CURRENT_LIST_DIR}/include)
30+
${CMAKE_CURRENT_LIST_DIR}/include
31+
${FREERTOS_CONFIG_FILE_DIRECTORY})
3132

3233
target_link_libraries(FreeRTOS-Kernel INTERFACE
3334
FreeRTOS-Kernel-Core

0 commit comments

Comments
 (0)