From: asterix Date: Tue, 20 May 2008 14:23:04 +0000 (+0000) Subject: Remove CVS logs. Reformat. X-Git-Tag: 2.0.0~638 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=9b5ed5a7350e86199d01c9165d0a24ec6150b811;p=bertos.git Remove CVS logs. Reformat. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1296 38d2e660-2303-0410-9eaa-f027e97ec537 --- diff --git a/bertos/mware/heap.c b/bertos/mware/heap.c index bced107e..3cdc64f3 100644 --- a/bertos/mware/heap.c +++ b/bertos/mware/heap.c @@ -38,39 +38,13 @@ * \author Bernardo 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 diff --git a/bertos/mware/heap.h b/bertos/mware/heap.h index 97cef8a3..f02a7d55 100644 --- a/bertos/mware/heap.h +++ b/bertos/mware/heap.h @@ -43,43 +43,13 @@ * */ -/*#* - *#* $Log$ - *#* Revision 1.7 2006/07/19 12:56:27 bernie - *#* Convert to new Doxygen style. - *#* - *#* Revision 1.6 2005/11/27 23:36:19 bernie - *#* Use appconfig.h instead of cfg/config.h. - *#* - *#* Revision 1.5 2005/11/04 16:20:02 bernie - *#* Fix reference to README.devlib in header. - *#* - *#* Revision 1.4 2005/04/11 19:10:28 bernie - *#* Include top-level headers from cfg/ subdir. - *#* - *#* Revision 1.3 2004/08/25 14:12:09 rasky - *#* Aggiornato il comment block dei log RCS - *#* - *#* Revision 1.2 2004/08/04 15:54:18 rasky - *#* Merge da SC: prima versione veramente funzionante - *#* - *#* 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. - *#* - *#*/ - #ifndef MWARE_HEAP_H #define MWARE_HEAP_H -#include #include +#include + struct _MemChunk; /// A heap