|
1 | 1 | /*
|
2 |
| - * FreeRTOS Kernel V10.4.6 |
| 2 | + * FreeRTOS Kernel V10.5.0 |
3 | 3 | * Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
4 | 4 | *
|
5 | 5 | * SPDX-License-Identifier: MIT
|
|
295 | 295 | #endif
|
296 | 296 |
|
297 | 297 | #ifndef portCLEAR_INTERRUPT_MASK_FROM_ISR
|
298 |
| - #define portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedStatusValue ) ( void ) uxSavedStatusValue |
| 298 | + #define portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedStatusValue ) ( void ) ( uxSavedStatusValue ) |
299 | 299 | #endif
|
300 | 300 |
|
301 | 301 | #ifndef portCLEAN_UP_TCB
|
302 |
| - #define portCLEAN_UP_TCB( pxTCB ) ( void ) pxTCB |
| 302 | + #define portCLEAN_UP_TCB( pxTCB ) ( void ) ( pxTCB ) |
303 | 303 | #endif
|
304 | 304 |
|
305 | 305 | #ifndef portPRE_TASK_DELETE_HOOK
|
306 | 306 | #define portPRE_TASK_DELETE_HOOK( pvTaskToDelete, pxYieldPending )
|
307 | 307 | #endif
|
308 | 308 |
|
309 | 309 | #ifndef portSETUP_TCB
|
310 |
| - #define portSETUP_TCB( pxTCB ) ( void ) pxTCB |
| 310 | + #define portSETUP_TCB( pxTCB ) ( void ) ( pxTCB ) |
311 | 311 | #endif
|
312 | 312 |
|
313 | 313 | #ifndef configQUEUE_REGISTRY_SIZE
|
|
619 | 619 | #endif
|
620 | 620 |
|
621 | 621 | #ifndef traceEVENT_GROUP_SYNC_END
|
622 |
| - #define traceEVENT_GROUP_SYNC_END( xEventGroup, uxBitsToSet, uxBitsToWaitFor, xTimeoutOccurred ) ( void ) xTimeoutOccurred |
| 622 | + #define traceEVENT_GROUP_SYNC_END( xEventGroup, uxBitsToSet, uxBitsToWaitFor, xTimeoutOccurred ) ( void ) ( xTimeoutOccurred ) |
623 | 623 | #endif
|
624 | 624 |
|
625 | 625 | #ifndef traceEVENT_GROUP_WAIT_BITS_BLOCK
|
626 | 626 | #define traceEVENT_GROUP_WAIT_BITS_BLOCK( xEventGroup, uxBitsToWaitFor )
|
627 | 627 | #endif
|
628 | 628 |
|
629 | 629 | #ifndef traceEVENT_GROUP_WAIT_BITS_END
|
630 |
| - #define traceEVENT_GROUP_WAIT_BITS_END( xEventGroup, uxBitsToWaitFor, xTimeoutOccurred ) ( void ) xTimeoutOccurred |
| 630 | + #define traceEVENT_GROUP_WAIT_BITS_END( xEventGroup, uxBitsToWaitFor, xTimeoutOccurred ) ( void ) ( xTimeoutOccurred ) |
631 | 631 | #endif
|
632 | 632 |
|
633 | 633 | #ifndef traceEVENT_GROUP_CLEAR_BITS
|
|
896 | 896 | #define configSUPPORT_DYNAMIC_ALLOCATION 1
|
897 | 897 | #endif
|
898 | 898 |
|
| 899 | +#if ( ( configUSE_STATS_FORMATTING_FUNCTIONS > 0 ) && ( configSUPPORT_DYNAMIC_ALLOCATION != 1 ) ) |
| 900 | + #error configUSE_STATS_FORMATTING_FUNCTIONS cannot be used without dynamic allocation, but configSUPPORT_DYNAMIC_ALLOCATION is not set to 1. |
| 901 | +#endif |
| 902 | + |
| 903 | +#if ( configUSE_STATS_FORMATTING_FUNCTIONS > 0 ) |
| 904 | + #if ( ( configUSE_TRACE_FACILITY != 1 ) && ( configGENERATE_RUN_TIME_STATS != 1 ) ) |
| 905 | + #error configUSE_STATS_FORMATTING_FUNCTIONS is 1 but the functions it enables are not used because neither configUSE_TRACE_FACILITY or configGENERATE_RUN_TIME_STATS are 1. Set configUSE_STATS_FORMATTING_FUNCTIONS to 0 in FreeRTOSConfig.h. |
| 906 | + #endif |
| 907 | +#endif |
| 908 | + |
899 | 909 | #ifndef configSTACK_DEPTH_TYPE
|
900 | 910 |
|
901 | 911 | /* Defaults to uint16_t for backward compatibility, but can be overridden
|
|
954 | 964 | #define portTICK_TYPE_ENTER_CRITICAL()
|
955 | 965 | #define portTICK_TYPE_EXIT_CRITICAL()
|
956 | 966 | #define portTICK_TYPE_SET_INTERRUPT_MASK_FROM_ISR() 0
|
957 |
| - #define portTICK_TYPE_CLEAR_INTERRUPT_MASK_FROM_ISR( x ) ( void ) x |
| 967 | + #define portTICK_TYPE_CLEAR_INTERRUPT_MASK_FROM_ISR( x ) ( void ) ( x ) |
958 | 968 | #endif /* if ( portTICK_TYPE_IS_ATOMIC == 0 ) */
|
959 | 969 |
|
960 | 970 | /* Definitions to allow backward compatibility with FreeRTOS versions prior to
|
@@ -1208,8 +1218,8 @@ typedef struct xSTATIC_TCB
|
1208 | 1218 | #if ( configGENERATE_RUN_TIME_STATS == 1 )
|
1209 | 1219 | configRUN_TIME_COUNTER_TYPE ulDummy16;
|
1210 | 1220 | #endif
|
1211 |
| - #if ( configUSE_NEWLIB_REENTRANT == 1 ) |
1212 |
| - struct _reent xDummy17; |
| 1221 | + #if ( ( configUSE_NEWLIB_REENTRANT == 1 ) || ( configUSE_C_RUNTIME_TLS_SUPPORT == 1 ) ) |
| 1222 | + configTLS_BLOCK_TYPE xDummy17; |
1213 | 1223 | #endif
|
1214 | 1224 | #if ( configUSE_TASK_NOTIFICATIONS == 1 )
|
1215 | 1225 | uint32_t ulDummy18[ configTASK_NOTIFICATION_ARRAY_ENTRIES ];
|
|
0 commit comments