X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fmware%2Fheap.c;h=3bed89935860a8e04e1dc526c0035623c13decd5;hb=4cc44c9888a0336b9d01121ec0b7ad95f4a76195;hp=bced107e809c5f7f16b15b363b9f212004e67601;hpb=791e167e053bdd9250d34a9a5ccae6ccde4d6679;p=bertos.git diff --git a/bertos/mware/heap.c b/bertos/mware/heap.c index bced107e..3bed8993 100644 --- a/bertos/mware/heap.c +++ b/bertos/mware/heap.c @@ -27,7 +27,7 @@ * the GNU General Public License. * * Copyright 2004 Develer S.r.l. (http://www.develer.com/) - * Copyright 1999,2000,2001 Bernardo Innocenti + * Copyright 1999,2000,2001 Bernie Innocenti * * --> * @@ -35,42 +35,16 @@ * * \version $Id$ * - * \author Bernardo Innocenti + * \author Bernie Innocenti */ -/*#* - *#* $Log$ - *#* Revision 1.9 2006/07/19 12:56:27 bernie - *#* Convert to new Doxygen style. - *#* - *#* Revision 1.8 2005/11/04 16:20:02 bernie - *#* Fix reference to README.devlib in header. - *#* - *#* Revision 1.7 2005/04/11 19:10:28 bernie - *#* Include top-level headers from cfg/ subdir. - *#* - *#* Revision 1.6 2004/10/26 09:02:13 bernie - *#* heap_free(): Handle NULL pointers like free(), write documentation. - *#* - *#* Revision 1.5 2004/10/03 20:43:22 bernie - *#* Import changes from sc/firmware. - *#* - *#* Revision 1.1 2004/07/31 16:33:58 rasky - *#* Spostato lo heap da kern/ a mware/ - *#* - *#* Revision 1.2 2004/06/03 11:27:09 bernie - *#* Add dual-license information. - *#* - *#* Revision 1.1 2004/05/23 17:27:00 bernie - *#* Import kern/ subdirectory. - *#* - *#*/ - #include "heap.h" -#include // memset() + #include // IS_POW2() #include // ASSERT() +#include // memset() + /* NOTE: struct size must be a 2's power! */ typedef struct _MemChunk { @@ -144,7 +118,6 @@ void *heap_allocmem(struct Heap* h, size_t size) void heap_freemem(struct Heap* h, void *mem, size_t size) { MemChunk *prev; - ASSERT(mem); #ifdef _DEBUG