X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=cfg%2Fdebug.h;h=0abfe275086dddf406e2eb14cb6ddcbe455bc79a;hb=7ec832a1222f7efd9127d17c6ac979a4a3d4aebe;hp=3b077448e0db3c9615041d8c97a1926c074ad8ca;hpb=4d062df20ce3b853319899469adbc37457b15499;p=bertos.git

diff --git a/cfg/debug.h b/cfg/debug.h
old mode 100755
new mode 100644
index 3b077448..0abfe275
--- a/cfg/debug.h
+++ b/cfg/debug.h
@@ -1,8 +1,33 @@
-/*!
+/**
  * \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 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
- * This file is part of DevLib - See README.devlib for information.
+ *
  * -->
  *
  * \brief Simple debug facilities for hosted and embedded C/C++ applications.
@@ -17,6 +42,15 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.14  2006/07/19 12:56:25  bernie
+ *#* Convert to new Doxygen style.
+ *#*
+ *#* Revision 1.13  2006/03/22 13:34:34  bernie
+ *#* MSVC support.
+ *#*
+ *#* Revision 1.12  2006/03/22 09:48:23  bernie
+ *#* Simplify.
+ *#*
  *#* Revision 1.11  2006/02/23 11:17:16  bernie
  *#* Documentation fixes.
  *#*
@@ -78,27 +112,7 @@
 #define DEVLIB_DEBUG_H
 
 #include <cfg/os.h>
-
-#if OS_HOSTED
-	/*
-	 * For now, avoid dependency on compiler.h
-	 */
-	#ifndef FORMAT
-	#define FORMAT(x,y,z) /* nothing */
-	#endif
-	#ifndef INLINE
-	#define INLINE static inline
-	#endif
-	#ifndef UNUSED_ARG
-	#ifdef __cplusplus
-		#define UNUSED_ARG(type,name) type
-	#else
-		#define UNUSED_ARG(type,name) type name
-	#endif
-	#endif
-#else /* !OS_HOSTED */
-	#include <cfg/compiler.h>
-#endif /* !OS_HOSTED */
+#include <cfg/compiler.h>
 
 
 /*
@@ -143,7 +157,7 @@
 	#undef NDEBUG
 	#endif
 
-	/*!
+	/**
 	 * This macro duplicates the old MSVC trick of redefining
 	 * THIS_FILE locally to avoid the overhead of many duplicate
 	 * strings in ASSERT().
@@ -152,7 +166,7 @@
 		#define THIS_FILE  __FILE__
 	#endif
 
-	/*!
+	/**
 	 * This macro can be used to conditionally exclude one or more
 	 * statements conditioned on \c _DEBUG, avoiding the clutter
 	 * of ifdef/endif pairs.
@@ -190,6 +204,7 @@
 			/* G++ can't inline functions with variable arguments... */
 			#define kprintf(fmt, ...) fprintf(stderr, fmt, ## __VA_ARGS__)
 		#else
+			#define kvprintf(fmt, ap) vfprintf(stderr, fmt, ap)
 			INLINE int kprintf(const char *fmt, ...)
 			{
 				va_list ap;
@@ -202,7 +217,6 @@
 				return result;
 			}
 		#endif
-		#define kvprintf(fmt, ap) vfprintf(stderr, fmt, ap)
 		void kdump(const void *buf, size_t len); /* UNIMPLEMENTED */
 
 		#ifndef ASSERT
@@ -249,7 +263,7 @@
 	#else /* !OS_HOSTED */
 
 		#include <appconfig.h>  /* CONFIG_KDEBUG_ASSERT_NO_TEXT */
-		#include <cfg/cpu.h>  /* CPU_HARVARD */
+		#include <cpu/cpu.h>  /* CPU_HARVARD */
 
 		/* These are implemented in drv/kdebug.c */
 		void kdbg_init(void);
@@ -305,7 +319,7 @@
 
 	#endif /* !OS_HOSTED */
 
-	/*!
+	/**
 	 * \name Walls to detect data corruption
 	 * \{
 	 */
@@ -317,7 +331,7 @@
 	#define CHECK_WALL(name)             __check_wall((name), countof(name), #name, THIS_FILE, __LINE__)
 	/*\}*/
 
-	/*!
+	/**
 	 * Check that the given pointer actually points to an object
 	 * of the specified type.
 	 */
@@ -326,7 +340,7 @@
 		ASSERT(dynamic_cast<_t>((_o)) != NULL); \
 	}
 
-	/*!
+	/**
 	 * \name Debug object creation and destruction.
 	 *
 	 * These macros help track some kinds of leaks in C++ programs.