Include Calloc and Realloc functions

764c2645 · Henrique Silva · 9dc2dca1 · 764c2645 · 764c2645
Commit 764c2645 authored Feb 22, 2016 by Henrique Silva
Hide whitespace changes
Inline Side-by-side

Showing with 43 additions and 0 deletions

heap_4.c FreeRTOS/heap_4.c +41 -0

portable.h FreeRTOS/include/portable.h +2 -0

No files found.
--- a/FreeRTOS/heap_4.c
+++ b/FreeRTOS/heap_4.c
@@ -349,6 +349,47 @@ BlockLink_t *pxLink;
 }
 /*-----------------------------------------------------------*/

+#include "string.h"
+
+void *pvPortCalloc(size_t count, size_t size)
+{
+	void *p;
+
+	/* allocate 'count' objects of size 'size' */
+	p = pvPortMalloc(count * size);
+	if (p) {
+		/* zero the memory */
+		memset(p, 0, count * size);
+	}
+	return p;
+}
+
+void *calloc(size_t count, size_t nbytes) __attribute__((alias("pvPortCalloc")));
+
+/*-----------------------------------------------------------*/
+
+void *pvPortRealloc(void *mem, size_t newsize)
+{
+	void *p;
+	p = pvPortMalloc(newsize);
+
+	if (p) {
+		/* Copy the contents of the old region */
+		if (mem != NULL) {
+			memcpy(p, mem, newsize);
+			vPortFree(mem);
+		}
+	}
+
+	return p;
+}
+
+void *realloc(void *ptr, size_t nbytes) __attribute__((alias("pvPortRealloc")));
+
+/*-----------------------------------------------------------*/
+
+/*-----------------------------------------------------------*/
+
 size_t xPortGetFreeHeapSize( void )
 {
 	return xFreeBytesRemaining;

--- a/FreeRTOS/include/portable.h
+++ b/FreeRTOS/include/portable.h
@@ -162,6 +162,8 @@ void vPortDefineHeapRegions( const HeapRegion_t * const pxHeapRegions );
 */
 void *pvPortMalloc( size_t xSize ) PRIVILEGED_FUNCTION;
 void vPortFree( void *pv ) PRIVILEGED_FUNCTION;
+void *pvPortCalloc(size_t count, size_t size) PRIVILEGED_FUNCTION;
+void *pvPortRealloc(void *mem, size_t newsize) PRIVILEGED_FUNCTION;
 void vPortInitialiseBlocks( void ) PRIVILEGED_FUNCTION;
 size_t xPortGetFreeHeapSize( void ) PRIVILEGED_FUNCTION;
 size_t xPortGetMinimumEverFreeHeapSize( void ) PRIVILEGED_FUNCTION;