Skip to content

Commit a5fd8e2

Browse files
kar-rahul-awskar-rahul-aws
authored
Merge branch 'main' into fix-smp-debugging
2 parents 79bd2eb + b4a9707 commit a5fd8e2

File tree

64 files changed

+74
-74
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+74
-74
lines changed

‎include/FreeRTOS.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,13 @@
9494
#define configUSE_MALLOC_FAILED_HOOK 0
9595
#endif
9696

97+
#ifndef configASSERT
98+
#define configASSERT( x )
99+
#define configASSERT_DEFINED 0
100+
#else
101+
#define configASSERT_DEFINED 1
102+
#endif
103+
97104
/* Basic FreeRTOS definitions. */
98105
#include "projdefs.h"
99106

@@ -364,13 +371,6 @@
364371
#error configMAX_TASK_NAME_LEN must be set to a minimum of 1 in FreeRTOSConfig.h
365372
#endif
366373

367-
#ifndef configASSERT
368-
#define configASSERT( x )
369-
#define configASSERT_DEFINED 0
370-
#else
371-
#define configASSERT_DEFINED 1
372-
#endif
373-
374374
/* configPRECONDITION should be defined as configASSERT.
375375
* The CBMC proofs need a way to track assumptions and assertions.
376376
* A configPRECONDITION statement should express an implicit invariant or

‎portable/ARMv8M/non_secure/portmacrocommon.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
312312
* @brief Validate priority of ISRs that are allowed to call FreeRTOS
313313
* system calls.
314314
*/
315-
#ifdef configASSERT
315+
#if ( configASSERT_DEFINED == 1 )
316316
#if ( portHAS_ARMV8M_MAIN_EXTENSION == 1 )
317317
void vPortValidateInterruptPriority( void );
318318
#define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() vPortValidateInterruptPriority()

‎portable/CCS/ARM_CM3/portmacro.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
#define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void * pvParameters )
171171
/*-----------------------------------------------------------*/
172172

173-
#ifdef configASSERT
173+
#if ( configASSERT_DEFINED == 1 )
174174
void vPortValidateInterruptPriority( void );
175175
#define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() vPortValidateInterruptPriority()
176176
#endif

‎portable/CCS/ARM_CM4F/portmacro.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
#define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void * pvParameters )
165165
/*-----------------------------------------------------------*/
166166

167-
#ifdef configASSERT
167+
#if ( configASSERT_DEFINED == 1 )
168168
void vPortValidateInterruptPriority( void );
169169
#define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() vPortValidateInterruptPriority()
170170
#endif

‎portable/GCC/ARM_AARCH64/portmacro.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ void FreeRTOS_Tick_Handler( void );
169169

170170
#endif /* configUSE_PORT_OPTIMISED_TASK_SELECTION */
171171

172-
#ifdef configASSERT
172+
#if ( configASSERT_DEFINED == 1 )
173173
void vPortValidateInterruptPriority( void );
174174
#define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() vPortValidateInterruptPriority()
175175
#endif /* configASSERT */

‎portable/GCC/ARM_AARCH64_SRE/portmacro.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ void vPortTaskUsesFPU( void );
160160

161161
#endif /* configUSE_PORT_OPTIMISED_TASK_SELECTION */
162162

163-
#ifdef configASSERT
163+
#if ( configASSERT_DEFINED == 1 )
164164
void vPortValidateInterruptPriority( void );
165165
#define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() vPortValidateInterruptPriority()
166166
#endif /* configASSERT */

‎portable/GCC/ARM_CA9/portmacro.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ void FreeRTOS_Tick_Handler( void );
157157

158158
#endif /* configUSE_PORT_OPTIMISED_TASK_SELECTION */
159159

160-
#ifdef configASSERT
160+
#if ( configASSERT_DEFINED == 1 )
161161
void vPortValidateInterruptPriority( void );
162162
#define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() vPortValidateInterruptPriority()
163163
#endif /* configASSERT */

‎portable/GCC/ARM_CM23/non_secure/portmacrocommon.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
312312
* @brief Validate priority of ISRs that are allowed to call FreeRTOS
313313
* system calls.
314314
*/
315-
#ifdef configASSERT
315+
#if ( configASSERT_DEFINED == 1 )
316316
#if ( portHAS_ARMV8M_MAIN_EXTENSION == 1 )
317317
void vPortValidateInterruptPriority( void );
318318
#define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() vPortValidateInterruptPriority()

‎portable/GCC/ARM_CM23_NTZ/non_secure/portmacrocommon.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
312312
* @brief Validate priority of ISRs that are allowed to call FreeRTOS
313313
* system calls.
314314
*/
315-
#ifdef configASSERT
315+
#if ( configASSERT_DEFINED == 1 )
316316
#if ( portHAS_ARMV8M_MAIN_EXTENSION == 1 )
317317
void vPortValidateInterruptPriority( void );
318318
#define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() vPortValidateInterruptPriority()

‎portable/GCC/ARM_CM3/portmacro.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ extern void vPortExitCritical( void );
171171

172172
/*-----------------------------------------------------------*/
173173

174-
#ifdef configASSERT
174+
#if ( configASSERT_DEFINED == 1 )
175175
void vPortValidateInterruptPriority( void );
176176
#define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() vPortValidateInterruptPriority()
177177
#endif

0 commit comments

Comments
 (0)