X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=cfg%2Fcompiler.h;h=6485473cf2f12d086e99acca3599b83fbbfb5a0e;hb=3fc75747c81395f9027b6b27cd03037e2a8eec08;hp=aadb25217a04d8d8dc390a9e4ffae6d68bcb904e;hpb=8caababa25c2e1190fc5bf8ee19cdfaf9ccedde1;p=bertos.git

diff --git a/cfg/compiler.h b/cfg/compiler.h
old mode 100755
new mode 100644
index aadb2521..6485473c
--- a/cfg/compiler.h
+++ b/cfg/compiler.h
@@ -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 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
  * Copyright 2001, 2002, 2003 Bernardo Innocenti <bernie@codewiz.org>
- * This file is part of DevLib - See README.devlib for information.
+ *
  * -->
  *
  * \brief Additional support macros for compiler independance
@@ -12,75 +37,10 @@
  * \author Bernardo Innocenti <bernie@develer.com>
  */
 
-/*#*
- *#* $Log$
- *#* Revision 1.21  2006/07/19 12:53:43  bernie
- *#* Prune log.
- *#*
- *#* Revision 1.20  2006/06/10 05:36:15  bernie
- *#* Convert to new Doxygen comments.
- *#*
- *#* Revision 1.19  2006/04/11 00:07:33  bernie
- *#* Implemenent MF_SAVESEL flag.
- *#*
- *#* Revision 1.18  2006/03/22 13:34:34  bernie
- *#* MSVC support.
- *#*
- *#* Revision 1.17  2006/03/22 09:48:35  bernie
- *#* Formatting.
- *#*
- *#* Revision 1.16  2006/03/20 17:48:09  bernie
- *#* Fix for avr-libc; INTERRUPT(): Remove macro.
- *#*
- *#* Revision 1.15  2006/03/13 02:06:25  bernie
- *#* containerof(): New macro.
- *#*
- *#* Revision 1.14  2006/02/23 08:36:33  bernie
- *#* Emulate __func__ on MSVC.
- *#*
- *#* Revision 1.13  2006/02/23 07:37:37  bernie
- *#* Compile fix for MSVC.
- *#*
- *#* Revision 1.12  2006/02/21 16:06:31  bernie
- *#* Fix ssize_t redefinitions on glibc systems.
- *#*
- *#* Revision 1.11  2006/02/20 14:34:58  bernie
- *#* Use portable type checking.
- *#*
- *#* Revision 1.10  2006/02/15 09:12:01  bernie
- *#* Fixes for ARM/IAR support.
- *#*
- *#* Revision 1.9  2006/02/10 12:38:00  bernie
- *#* Add support for ARM on IAR.
- *#*
- *#* Revision 1.8  2006/01/16 03:27:49  bernie
- *#* Rename sig_t to sigbit_t to avoid clash with POSIX.
- *#*
- *#* Revision 1.7  2005/11/27 23:33:05  bernie
- *#* Drop avr-libc hack for missing stdint.h.
- *#*
- *#* Revision 1.6  2005/07/19 07:27:31  bernie
- *#* Don't use CPU_REG_BITS from cpu.h to avoid circular header dependendy.
- *#*
- *#* Revision 1.5  2005/06/27 21:24:37  bernie
- *#* ticks_t: New typedef.
- *#*
- *#* Revision 1.4  2005/06/14 06:15:10  bernie
- *#* Add X86_64 support.
- *#*
- *#* Revision 1.3  2005/04/12 01:37:01  bernie
- *#* Metrowerks touchups from HeCo.
- *#*
- *#* Revision 1.2  2005/04/11 19:10:27  bernie
- *#* Include top-level headers from cfg/ subdir.
- *#*
- *#* Revision 1.1  2005/04/11 19:04:13  bernie
- *#* Move top-level headers to cfg/ subdir.
- *#*/
 #ifndef DEVLIB_COMPILER_H
 #define DEVLIB_COMPILER_H
 
-#include <cfg/cpu_detect.h>
+#include <cpu/detect.h>
 
 
 #if defined __GNUC__ && defined __GNUC_MINOR__
@@ -416,11 +376,16 @@
 	#define MTIME_INFINITE 0x7FFFL
 #else
 	typedef int32_t ticks_t;  /**< Type for time expressed in ticks. */
-	typedef int32_t mtime_t;  /**< Type for time expressed in milliseconds. */
+
 	typedef int32_t utime_t;  /**< Type for time expressed in microseconds. */
-	#define SIZEOF_MTIME_T (32 / CPU_BITS_PER_CHAR)
 	#define SIZEOF_UTIME_T (32 / CPU_BITS_PER_CHAR)
-	#define MTIME_INFINITE 0x7FFFFFFFL
+
+	#ifndef DEVLIB_MTIME_DEFINED
+		#define DEVLIB_MTIME_DEFINED 1 /* Resolve conflict with <os/hptime.h> */
+		typedef int32_t mtime_t;  /**< Type for time expressed in milliseconds. */
+		#define SIZEOF_MTIME_T (32 / CPU_BITS_PER_CHAR)
+		#define MTIME_INFINITE 0x7FFFFFFFL
+	#endif
 #endif
 
 /** Bulk storage large enough for both pointers or integers. */
@@ -534,15 +499,15 @@ typedef unsigned char page_t;    /**< Type for banked memory pages. */
 	UNUSED_VAR(extern char, STATIC_ASSERTION_FAILED__[(condition) ? 1 : -1])
 
 #ifndef ASSERT_TYPE_EQUAL
-/** Ensure two variables have the same type. */
-#define ASSERT_TYPE_EQUAL(var1, var2)  \
-		do { (void)(&(var1) == &(var2)); } while(0)
+	/** Ensure two variables have the same type. */
+	#define ASSERT_TYPE_EQUAL(var1, var2)  \
+			do { (void)(&(var1) == &(var2)); } while(0)
 #endif
 
 #ifndef ASSERT_TYPE_IS
-/** Ensure variable is of specified type. */
-#define ASSERT_TYPE_IS(var, type)  \
-		do { (void)(&(var) == (type *)0); } while(0)
+	/** Ensure variable is of specified type. */
+	#define ASSERT_TYPE_IS(var, type)  \
+			do { (void)(&(var) == (type *)0); } while(0)
 #endif
 
 #endif /* DEVLIB_COMPILER_H */