X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Fheap.c;h=bced107e809c5f7f16b15b363b9f212004e67601;hb=17dbfa90b14431b6b3343486c0062e22dd457826;hp=f1315505e6eaf06265a8770694eccca4b9c8b9c4;hpb=e4ba598c0bbe1627a16804c88776d76b7314e1b6;p=bertos.git

diff --git a/mware/heap.c b/mware/heap.c
old mode 100755
new mode 100644
index f1315505..bced107e
--- a/mware/heap.c
+++ b/mware/heap.c
@@ -1,9 +1,34 @@
-/*!
+/**
  * \file
  * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
  * Copyright 2004 Develer S.r.l. (http://www.develer.com/)
  * Copyright 1999,2000,2001 Bernardo Innocenti <bernie@develer.com>
- * This file is part of DevLib - See devlib/README for information.
+ *
  * -->
  *
  * \brief Heap subsystem (public interface).
@@ -15,6 +40,15 @@
 
 /*#*
  *#* $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.
  *#*
@@ -34,8 +68,8 @@
 
 #include "heap.h"
 #include <string.h>           // memset()
-#include <macros.h>           // IS_POW2()
-#include <debug.h>            // ASSERT()
+#include <cfg/macros.h>           // IS_POW2()
+#include <cfg/debug.h>            // ASSERT()
 
 /* NOTE: struct size must be a 2's power! */
 typedef struct _MemChunk
@@ -204,7 +238,7 @@ void *heap_calloc(struct Heap* h, size_t size)
 	return mem;
 }
 
-/*!
+/**
  * Free a block of memory, determining its size automatically.
  *
  * \param h    Heap from which the block was allocated.