Update to use the heap_useNewlib_ST.c from Dave Nadler

fpistm · fpistm · commit 4b76cae7f0ce · 2021-04-16T17:43:59.000+02:00
Signed-off-by: Frederic Pillon &lt;frederic.pillon@st.com&gt;
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ By default, the `heap_useNewlib.c` is used. It can be changed thanks a define in
 ```
 /* Define memory allocation implementations to use:
  * 1 to 5 for heap_[1-5].c
- * -1 for heap_useNewlib.c
+ * -1 for heap_useNewlib_ST.c
  * Default -1 see heap.c
  */
 ```
diff --git a/portable/MemMang/heap_useNewlib.c b/portable/MemMang/heap_useNewlib.c
diff --git a/src/FreeRTOSConfig_Default.h b/src/FreeRTOSConfig_Default.h
@@ -44,7 +44,7 @@
 /* Begin custom definitions for STM32 */
 /* Define memory allocation implementations to use:
  * 1 to 5 for heap_[1-5].c
- * -1 for heap_useNewlib.c
+ * -1 for heap_useNewlib_ST.c
  * Default -1 see heap.c
  */
 /*#define configMEMMANG_HEAP_NB             3*/
@@ -82,7 +82,7 @@
 
 #define configMINIMAL_STACK_SIZE          ((uint16_t)128)
 #define configTOTAL_HEAP_SIZE             ((size_t)(15 * 1024))
-
+#define configISR_STACK_SIZE_WORDS        (0x100)
 #else
 extern char _end; /* Defined in the linker script */
 extern char _estack; /* Defined in the linker script */
@@ -97,7 +97,7 @@ extern char _Min_Stack_Size; /* Defined in the linker script */
  */
 #define configMINIMAL_STACK_SIZE          ((uint16_t)((uint32_t)&_Min_Stack_Size/8))
 #define configTOTAL_HEAP_SIZE             ((size_t)(&_estack - _Min_Stack_Size - &_end))
-
+#define configISR_STACK_SIZE_WORDS        ((uint32_t)&_Min_Stack_Size/4)
 #endif /* configUSE_CMSIS_RTOS_V2 */
 
 #define configUSE_PREEMPTION              1
diff --git a/src/heap.c b/src/heap.c
@@ -2,7 +2,7 @@
  * @file    heap.c
  * @author  Frederic Pillon <frederic.pillon@st.com> for STMicroelectronics.
  * @brief   Provide Memory allocation implementations included in the FreeRTOS source
- * heap_useNewlib - thread-safe memory manager using C runtime (Newlib)
+ * heap_useNewlib_ST - thread-safe memory manager using C runtime (Newlib)
  * heap_1 - the very simplest, does not permit memory to be freed
  * heap_2 - permits memory to be freed, but not does coalescence adjacent free blocks.
  * heap_3 - simply wraps the standard malloc() and free() for thread safety
@@ -16,7 +16,7 @@
 #endif
 
 #if (configMEMMANG_HEAP_NB == -1)
-#include "../portable/MemMang/heap_useNewlib.c"
+#include "../portable/MemMang/heap_useNewlib_ST.c"
 #elif (configMEMMANG_HEAP_NB == 1)
 #include "../portable/MemMang/heap_1.c"
 #elif (configMEMMANG_HEAP_NB == 2)
