Use the new TbxMemPoolAllocateAuto().

Author: feaser

demos/ARMCM4_STM32F4_Olimex_STM32P405_CubeIDE/App/ffsyscall.c

@@ -105,31 +105,13 @@ void* ff_memalloc (	/* Returns pointer to the allocated memory block */
 {
   void * result;
 
-  /* Attempt to allocate a block from the best fitting memory pool. */
-  result = TbxMemPoolAllocate(msize);
-  /* Was the allocation not successful? */
-  if (result == NULL)
-  {
-    /* The allocation failed. This can have two reasons:
-     *   1. A memory pool for the requested size hasn't yet been created.
-     *   2. The memory pool for the requested size has no more free blocks.
-     * Both situations can be solved by calling TbxMemPoolCreate(), as this
-     * function automatically extends a memory pool, if it was created before.
-     * Note that ther is not need to check the return value, because we will
-     * attempts to allocate again right afterwards. We can catch the error
-     * there in case the allocation fails.
-     */
-    (void)TbxMemPoolCreate(1U, msize);
-
-    /* Assuming sufficient heap was available, the memory pool was extended.
-     * Attempt to allocate the block again. Note that if it fails, the result
-     * is already NULL to flag this error.
-     */
-    result = TbxMemPoolAllocate(msize);
-
-    /* Assert the allocation result for debugging purposes. */
-    TBX_ASSERT(result != NULL);
-  }
+  /* Attempt to allocate a block from a memory pool with the same size. If non-existant,
+   * automatically create the memory pool. If no more free blocks are available in the
+   * memory pool, automatically expand the memory pool by adding one more block.
+   */
+  result = TbxMemPoolAllocateAuto(msize);
+  /* Assert the allocation result for debugging purposes. */
+  TBX_ASSERT(result != NULL);
 
   /* Give the result back to the caller. */
   return result;

demos/ARMCM4_STM32F4_Olimex_STM32P405_CubeIDE/Demo Debug.launch

@@ -36,7 +36,7 @@
     <booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_check_serial_number" value="false"/>
     <stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_txt_serial_number" value="52FF73065185525338230187"/>
     <stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.watchdog_config" value="none"/>
-    <stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlinkrestart_configurations" value="{&quot;fItems&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fIsSuppressible&quot;:false,&quot;fResetAttribute&quot;:&quot;Software system reset&quot;,&quot;fResetStrategies&quot;:[{&quot;fDisplayName&quot;:&quot;Software system reset&quot;,&quot;fLaunchAttribute&quot;:&quot;system_reset&quot;,&quot;fGdbCommands&quot;:[&quot;monitor reset\n&quot;],&quot;fCmdOptions&quot;:[&quot;-g&quot;]},{&quot;fDisplayName&quot;:&quot;Hardware reset&quot;,&quot;fLaunchAttribute&quot;:&quot;hardware_reset&quot;,&quot;fGdbCommands&quot;:[&quot;monitor reset hardware\n&quot;],&quot;fCmdOptions&quot;:[&quot;-g&quot;]},{&quot;fDisplayName&quot;:&quot;Core reset&quot;,&quot;fLaunchAttribute&quot;:&quot;core_reset&quot;,&quot;fGdbCommands&quot;:[&quot;monitor reset core\n&quot;],&quot;fCmdOptions&quot;:[&quot;-g&quot;]},{&quot;fDisplayName&quot;:&quot;None&quot;,&quot;fLaunchAttribute&quot;:&quot;no_reset&quot;,&quot;fGdbCommands&quot;:[],&quot;fCmdOptions&quot;:[&quot;-g&quot;]}],&quot;fGdbCommandGroup&quot;:{&quot;name&quot;:&quot;Additional commands&quot;,&quot;commands&quot;:[]}}]}"/>
+    <stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlinkrestart_configurations" value="{&quot;fVersion&quot;:1,&quot;fItems&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fIsSuppressible&quot;:false,&quot;fResetAttribute&quot;:&quot;Software system reset&quot;,&quot;fResetStrategies&quot;:[{&quot;fDisplayName&quot;:&quot;Software system reset&quot;,&quot;fLaunchAttribute&quot;:&quot;system_reset&quot;,&quot;fGdbCommands&quot;:[&quot;monitor reset\n&quot;],&quot;fCmdOptions&quot;:[&quot;-g&quot;]},{&quot;fDisplayName&quot;:&quot;Hardware reset&quot;,&quot;fLaunchAttribute&quot;:&quot;hardware_reset&quot;,&quot;fGdbCommands&quot;:[&quot;monitor reset hardware\n&quot;],&quot;fCmdOptions&quot;:[&quot;-g&quot;]},{&quot;fDisplayName&quot;:&quot;Core reset&quot;,&quot;fLaunchAttribute&quot;:&quot;core_reset&quot;,&quot;fGdbCommands&quot;:[&quot;monitor reset core\n&quot;],&quot;fCmdOptions&quot;:[&quot;-g&quot;]},{&quot;fDisplayName&quot;:&quot;None&quot;,&quot;fLaunchAttribute&quot;:&quot;no_reset&quot;,&quot;fGdbCommands&quot;:[],&quot;fCmdOptions&quot;:[&quot;-g&quot;]}],&quot;fGdbCommandGroup&quot;:{&quot;name&quot;:&quot;Additional commands&quot;,&quot;commands&quot;:[]},&quot;fStartApplication&quot;:true}]}"/>
     <booleanAttribute key="com.st.stm32cube.ide.mcu.debug.swv.swv_wait_for_sync" value="true"/>
     <booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doHalt" value="false"/>
     <booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doReset" value="false"/>
@@ -51,7 +51,7 @@
     <booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setStopAt" value="true"/>
     <stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.stopAt" value="main"/>
     <stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="arm-none-eabi-gdb"/>
-    <booleanAttribute key="org.eclipse.cdt.dsf.gdb.NON_STOP" value="true"/>
+    <booleanAttribute key="org.eclipse.cdt.dsf.gdb.NON_STOP" value="false"/>
     <booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
     <intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
     <stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>

source/srecreader.c

@@ -322,28 +322,17 @@ static uint8_t SRecReaderFileOpen(char const * firmwareFile)
             if (segment == NULL)
             {
               /* Attempt to allocate memory to store the new segment. */
-              segment = TbxMemPoolAllocate(sizeof(tSRecSegment));
-              /* Automatically create or increase the memory pool if it was too small. */
+              segment = TbxMemPoolAllocateAuto(sizeof(tSRecSegment));
+              /* Verify segment allocation. */
               if (segment == NULL)
               {
-                /* No need to check the return value, because we'll attempt to allocate
-                 * from the memory pool right way. That will tell us if the memory pool
-                 * increase was successful.
+                /* Could not allocate memory. Heap is probably configured too small.
+                 * Increase TBX_CONF_HEAP_SIZE to resolve the problem. All we can
+                 * do now is flag the error.
                  */
-                (void)TbxMemPoolCreate(1, sizeof(tSRecSegment));
-                /* Allocation should now work. */
-                segment = TbxMemPoolAllocate(sizeof(tSRecSegment));
-                /* Verify segment allocation. */
-                if (segment == NULL)
-                {
-                  /* Could not allocate memory. Heap is probably configured too small.
-                   * Increase TBX_CONF_HEAP_SIZE to resolve the problem. All we can
-                   * do now is flag the error.
-                   */
-                  result = TBX_ERROR;
-                  stopLineLoop = TBX_TRUE;
-                  continue;
-                }
+                result = TBX_ERROR;
+                stopLineLoop = TBX_TRUE;
+                continue;
               }
               /* Initialize the newly created segment. */
               segment->addr = lineAddress;