Merge branch 'main' into update_readme_tcp_qemu

kar-rahul-aws · Jul 15, 2024 · 7bfacae · 7bfacae
2 parents a3eb9b4 + 82099c3
commit 7bfacae
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/FreeRTOS/Demo/CORTEX_MPU_M3_MPS2_QEMU_GCC/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_MPU_M3_MPS2_QEMU_GCC/FreeRTOSConfig.h
@@ -72,7 +72,6 @@ extern void vAssertCalled( void );
 #define configUSE_COUNTING_SEMAPHORES                    1
 #define configSUPPORT_DYNAMIC_ALLOCATION                 1
 #define configSUPPORT_STATIC_ALLOCATION                  1
-#define configNUM_TX_DESCRIPTORS                         15
 #define configSTREAM_BUFFER_TRIGGER_LEVEL_TEST_MARGIN    2
 #define configCHECK_FOR_STACK_OVERFLOW                   2
 #define configALLOW_UNPRIVILEGED_CRITICAL_SECTIONS       0
@@ -134,9 +133,4 @@ unsigned long ulGetRunTimeCounterValue( void ); /* Prototype of function that re
 extern void vLoggingPrintf( const char * pcFormatString,
                             ... );
 
-#ifdef HEAP3
-    #define xPortGetMinimumEverFreeHeapSize    ( x )
-    #define xPortGetFreeHeapSize               ( x )
-#endif
-
 #endif /* FREERTOS_CONFIG_H */
diff --git a/FreeRTOS/Demo/Posix_GCC/main.c b/FreeRTOS/Demo/Posix_GCC/main.c
@@ -268,7 +268,7 @@ void vApplicationTickHook( void )
 
 /*-----------------------------------------------------------*/
 
-void traceOnEnter()
+void traceOnEnter( void )
 {
     #if ( TRACE_ON_ENTER == 1 )
         int xReturn;