Skip to content

Commit eb88db0

Browse files
committed
update to 10.5.0-1
1 parent 9c78dea commit eb88db0

File tree

1 file changed

+19
-9
lines changed

1 file changed

+19
-9
lines changed

src/Arduino_FreeRTOS.h

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* FreeRTOS Kernel V10.4.6
2+
* FreeRTOS Kernel V10.5.0
33
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* SPDX-License-Identifier: MIT
@@ -295,19 +295,19 @@
295295
#endif
296296

297297
#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 )
299299
#endif
300300

301301
#ifndef portCLEAN_UP_TCB
302-
#define portCLEAN_UP_TCB( pxTCB ) ( void ) pxTCB
302+
#define portCLEAN_UP_TCB( pxTCB ) ( void ) ( pxTCB )
303303
#endif
304304

305305
#ifndef portPRE_TASK_DELETE_HOOK
306306
#define portPRE_TASK_DELETE_HOOK( pvTaskToDelete, pxYieldPending )
307307
#endif
308308

309309
#ifndef portSETUP_TCB
310-
#define portSETUP_TCB( pxTCB ) ( void ) pxTCB
310+
#define portSETUP_TCB( pxTCB ) ( void ) ( pxTCB )
311311
#endif
312312

313313
#ifndef configQUEUE_REGISTRY_SIZE
@@ -619,15 +619,15 @@
619619
#endif
620620

621621
#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 )
623623
#endif
624624

625625
#ifndef traceEVENT_GROUP_WAIT_BITS_BLOCK
626626
#define traceEVENT_GROUP_WAIT_BITS_BLOCK( xEventGroup, uxBitsToWaitFor )
627627
#endif
628628

629629
#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 )
631631
#endif
632632

633633
#ifndef traceEVENT_GROUP_CLEAR_BITS
@@ -896,6 +896,16 @@
896896
#define configSUPPORT_DYNAMIC_ALLOCATION 1
897897
#endif
898898

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+
899909
#ifndef configSTACK_DEPTH_TYPE
900910

901911
/* Defaults to uint16_t for backward compatibility, but can be overridden
@@ -954,7 +964,7 @@
954964
#define portTICK_TYPE_ENTER_CRITICAL()
955965
#define portTICK_TYPE_EXIT_CRITICAL()
956966
#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 )
958968
#endif /* if ( portTICK_TYPE_IS_ATOMIC == 0 ) */
959969

960970
/* Definitions to allow backward compatibility with FreeRTOS versions prior to
@@ -1208,8 +1218,8 @@ typedef struct xSTATIC_TCB
12081218
#if ( configGENERATE_RUN_TIME_STATS == 1 )
12091219
configRUN_TIME_COUNTER_TYPE ulDummy16;
12101220
#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;
12131223
#endif
12141224
#if ( configUSE_TASK_NOTIFICATIONS == 1 )
12151225
uint32_t ulDummy18[ configTASK_NOTIFICATION_ARRAY_ENTRIES ];

0 commit comments

Comments
 (0)