This commit is contained in:
likewise 2003-04-15 14:40:55 +00:00
parent 4ecb01f4fd
commit ed14a32224

View File

@ -1,3 +1,9 @@
/** @file
*
* Dynamic memory manager
*
*/
/*
* Copyright (c) 2001-2003 Swedish Institute of Computer Science.
* All rights reserved.
@ -30,13 +36,6 @@
*
*/
/*-----------------------------------------------------------------------------------*/
/* mem.c
*
* Memory manager.
*
*/
/*-----------------------------------------------------------------------------------*/
#include "lwip/arch.h"
#include "lwip/opt.h"
@ -74,7 +73,6 @@ static struct mem *lfree; /* pointer to the lowest free block */
static sys_sem_t mem_sem;
/*-----------------------------------------------------------------------------------*/
static void
plug_holes(struct mem *mem)
{
@ -108,7 +106,6 @@ plug_holes(struct mem *mem)
}
}
/*-----------------------------------------------------------------------------------*/
void
mem_init(void)
{
@ -132,13 +129,13 @@ mem_init(void)
lwip_stats.mem.avail = MEM_SIZE;
#endif /* MEM_STATS */
}
/*-----------------------------------------------------------------------------------*/
void
mem_free(void *rmem)
{
struct mem *mem;
if (rmem == NULL) {
DEBUGF(MEM_DEBUG | DBG_TRACE | 2, ("mem_free(p == NULL) was called.\n"));
return;
}
@ -147,7 +144,6 @@ mem_free(void *rmem)
LWIP_ASSERT("mem_free: legal memory", (u8_t *)rmem >= (u8_t *)ram &&
(u8_t *)rmem < (u8_t *)ram_end);
if ((u8_t *)rmem < (u8_t *)ram || (u8_t *)rmem >= (u8_t *)ram_end) {
DEBUGF(MEM_DEBUG | 3, ("mem_free: illegal memory\n"));
#ifdef MEM_STATS
@ -173,7 +169,6 @@ mem_free(void *rmem)
plug_holes(mem);
sys_sem_signal(mem_sem);
}
/*-----------------------------------------------------------------------------------*/
void *
mem_reallocm(void *rmem, mem_size_t newsize)
{
@ -238,7 +233,6 @@ mem_realloc(void *rmem, mem_size_t newsize)
sys_sem_signal(mem_sem);
return rmem;
}
/*-----------------------------------------------------------------------------------*/
void *
mem_malloc(mem_size_t size)
{
@ -309,4 +303,3 @@ mem_malloc(mem_size_t size)
sys_sem_signal(mem_sem);
return NULL;
}
/*-----------------------------------------------------------------------------------*/