Use FreeRTOS heap instead of LwIP heap

[pes-rpp/rpp-lwip.git] / src / include / lwip / mem.h

diff --git a/src/include/lwip/mem.h b/src/include/lwip/mem.h
index 6e6c1d92536f1a94ebbb61073d89de61fc52e107..cc13611f3fb366c8465d61d519dd5a41c5f88fbf 100644 (file)
--- a/src/include/lwip/mem.h
+++ b/src/include/lwip/mem.h
@@ -43,17 +43,20 @@ extern "C" {
 #include <stddef.h> /* for size_t */
 
 typedef size_t mem_size_t;
+#define MEM_SIZE_F SZT_F
 
 /* aliases for C library malloc() */
 #define mem_init()
 /* in case C library malloc() needs extra protection,
  * allow these defines to be overridden.
  */
+extern void vPortFree( void *pv );
+extern void *pvPortMalloc( size_t xWantedSize );
 #ifndef mem_free
-#define mem_free free
+#define mem_free( pv ) vPortFree( pv )
 #endif
 #ifndef mem_malloc
-#define mem_malloc malloc
+#define mem_malloc( size ) pvPortMalloc( size )
 #endif
 #ifndef mem_calloc
 #define mem_calloc calloc
@@ -68,10 +71,12 @@ typedef size_t mem_size_t;
 /* MEM_SIZE would have to be aligned, but using 64000 here instead of
  * 65535 leaves some room for alignment...
  */
-#if MEM_SIZE > 64000l
+#if MEM_SIZE > 64000L
 typedef u32_t mem_size_t;
+#define MEM_SIZE_F U32_F
 #else
 typedef u16_t mem_size_t;
+#define MEM_SIZE_F U16_F
 #endif /* MEM_SIZE > 64000 */
 
 #if MEM_USE_POOLS
@@ -90,10 +95,25 @@ void *mem_calloc(mem_size_t count, mem_size_t size);
 void  mem_free(void *mem);
 #endif /* MEM_LIBC_MALLOC */
 
+/** Calculate memory size for an aligned buffer - returns the next highest
+ * multiple of MEM_ALIGNMENT (e.g. LWIP_MEM_ALIGN_SIZE(3) and
+ * LWIP_MEM_ALIGN_SIZE(4) will both yield 4 for MEM_ALIGNMENT == 4).
+ */
 #ifndef LWIP_MEM_ALIGN_SIZE
 #define LWIP_MEM_ALIGN_SIZE(size) (((size) + MEM_ALIGNMENT - 1) & ~(MEM_ALIGNMENT-1))
 #endif
 
+/** Calculate safe memory size for an aligned buffer when using an unaligned
+ * type as storage. This includes a safety-margin on (MEM_ALIGNMENT - 1) at the
+ * start (e.g. if buffer is u8_t[] and actual data will be u32_t*)
+ */
+#ifndef LWIP_MEM_ALIGN_BUFFER
+#define LWIP_MEM_ALIGN_BUFFER(size) (((size) + MEM_ALIGNMENT - 1))
+#endif
+
+/** Align a memory pointer to the alignment defined by MEM_ALIGNMENT
+ * so that ADDR % MEM_ALIGNMENT == 0
+ */
 #ifndef LWIP_MEM_ALIGN
 #define LWIP_MEM_ALIGN(addr) ((void *)(((mem_ptr_t)(addr) + MEM_ALIGNMENT - 1) & ~(mem_ptr_t)(MEM_ALIGNMENT-1)))
 #endif