/**
* \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
/*#*
*#* $Log$
+ *#* Revision 1.24 2007/01/09 08:58:14 bernie
+ *#* Avoid dependency on cfg/compiler.h
+ *#*
+ *#* Revision 1.23 2006/09/13 18:28:38 bernie
+ *#* Reformat.
+ *#*
*#* Revision 1.22 2006/07/19 12:56:25 bernie
*#* Convert to new Doxygen style.
*#*
#ifndef DEVLIB_COMPILER_H
#define DEVLIB_COMPILER_H
-#include <cfg/cpu_detect.h>
+#include <cpu/detect.h>
#if defined __GNUC__ && defined __GNUC_MINOR__
#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. */
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 */