Fix multiple heap files issue and change in data type

renesas · May 21, 2021 · d3996d6 · d3996d6
1 parent fa0d36d
commit d3996d6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/configuration/freertos.xml b/configuration/freertos.xml
@@ -77,7 +77,7 @@
     <package>
         <type>rtosmodule</type>
         <name>FreeRTOSKernel</name>
-        <version>10.4.3-rx-1.0.0</version>
+        <version>10.4.3-rx-1.0.1</version>
         <!-- include path setting -->
         <incdir>
             <path>src/FreeRTOS/Source/include</path>
@@ -250,6 +250,12 @@
             <file>portable/readme.txt</file>
             <path>src/FreeRTOS/Source/portable</path>
         </impdir>
+        <excludebuild>
+            <path>src/FreeRTOS/Source/portable/MemMang/heap_1.c</path>
+            <path>src/FreeRTOS/Source/portable/MemMang/heap_2.c</path>
+            <path>src/FreeRTOS/Source/portable/MemMang/heap_3.c</path>
+            <path>src/FreeRTOS/Source/portable/MemMang/heap_5.c</path>
+        </excludebuild>
     </package>
     <!-- Heap Information. The purpose is to provide information to estimate Heap Size -->
     <!-- The redundant zero number before a numerical data may cause it to be wrong, because some numerical data are input of an javascript engine -->

diff --git a/configuration/startup/freertos_start.c b/configuration/startup/freertos_start.c
@@ -73,7 +73,7 @@ void vAssertCalled(void);
 void vApplicationIdleHook(void);
 void vApplicationTickHook(void);
 void vApplicationMallocFailedHook(void);
-void vApplicationStackOverflowHook(TaskHandle_t xTask, signed char *pcTaskName);
+void vApplicationStackOverflowHook(TaskHandle_t xTask, char *pcTaskName);
 
 /* FreeRTOS's processing before start the kernel. */
 void Processing_Before_Start_Kernel(void);
@@ -326,7 +326,7 @@ void vApplicationMallocFailedHook(void)
 *                    Pointer of where to store the task's name
 * Return Value : None.
 ******************************************************************************/
-void vApplicationStackOverflowHook(TaskHandle_t pxTask, signed char *pcTaskName)
+void vApplicationStackOverflowHook(TaskHandle_t pxTask, char *pcTaskName)
 {
     ( void ) pcTaskName;
     ( void ) pxTask;