X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=os%2Fhptime.h;h=4eb91a6d9ce49ce10c37ddf11c638bf513e71598;hb=46626ce710c12ab2799c63893b09d06831297213;hp=7b05dbe6f0ad3eb09a128ebc9ee3cb18186eaafa;hpb=f4a24c811a668a072b6688bcdfcd927529977b26;p=bertos.git

diff --git a/os/hptime.h b/os/hptime.h
index 7b05dbe6..4eb91a6d 100755
--- a/os/hptime.h
+++ b/os/hptime.h
@@ -1,8 +1,8 @@
-/*!
+/**
  * \file
  * <!--
- * Copyright 2003,2004 Develer S.r.l. (http://www.develer.com/)
- * All rights reserved.
+ * Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
+ * This file is part of DevLib - See README.devlib for information.
  * -->
  *
  * \brief Portable abstraction for high-resolution time handling (interface)
@@ -11,12 +11,36 @@
  * \author Bernardo Innocenti <bernie@develer.com>
  */
 
-/*
- * $Log$
- * Revision 1.1  2004/06/03 09:01:06  bernie
- * Import into DevLib.
- *
- */
+/*#*
+ *#* $Log$
+ *#* Revision 1.9  2006/07/19 12:53:58  bernie
+ *#* Documentation fixes.
+ *#*
+ *#* Revision 1.8  2006/02/20 01:46:46  bernie
+ *#* Port to MacOSX.
+ *#*
+ *#* Revision 1.7  2006/01/16 03:28:25  bernie
+ *#* Remove redundant mtime_t definition (cfg/compiler.h has one already).
+ *#*
+ *#* Revision 1.6  2005/11/27 03:57:22  bernie
+ *#* Use C99 types to match cfg/compiler.h without depending on it.
+ *#*
+ *#* Revision 1.5  2005/11/04 16:20:02  bernie
+ *#* Fix reference to README.devlib in header.
+ *#*
+ *#* Revision 1.4  2004/08/25 14:12:09  rasky
+ *#* Aggiornato il comment block dei log RCS
+ *#*
+ *#* Revision 1.3  2004/08/10 05:45:04  bernie
+ *#* Fix spacing in header.
+ *#*
+ *#* Revision 1.2  2004/06/03 11:27:09  bernie
+ *#* Add dual-license information.
+ *#*
+ *#* Revision 1.1  2004/06/03 09:01:06  bernie
+ *#* Import into DevLib.
+ *#*
+ *#*/
 #ifndef HPTIME_H
 #define HPTIME_H
 
@@ -26,33 +50,29 @@ extern "C" {
 
 #ifdef _WIN32
 
-	/* type for time expressed in ms */
-	typedef unsigned long mtime_t;
-
-	/* our type for "high precision absolute time" */
-	typedef unsigned __int64 hptime_t;
+	/** our type for "high precision absolute time" */
+	typedef __int64 hptime_t;
 
 	#define HPTIME_TICKS_PER_SECOND		((hptime_t)10000000I64)
 	#define HPTIME_TICKS_PER_MILLISEC	((hptime_t)10000I64)
 	#define HPTIME_TICKS_PER_MICRO		((hptime_t)10I64)
 
-#elif defined(__unix__)
+#elif defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
 
-	/* type for time expressed in ms */
-	typedef long mtime_t;
+	#include <stdint.h>
 
-	/* our type for "high precision absolute time" */
-	typedef long long hptime_t;
+	/** Type for "high precision absolute time". */
+	typedef int64_t hptime_t;
 
-	#define HPTIME_TICKS_PER_SECOND		((hptime_t)1000000LL)
-	#define HPTIME_TICKS_PER_MILLISEC	((hptime_t)1000LL)
-	#define HPTIME_TICKS_PER_MICRO		((hptime_t)1LL)
+	#define HPTIME_TICKS_PER_SECOND		1000000LL
+	#define HPTIME_TICKS_PER_MILLISEC	1000LL
+	#define HPTIME_TICKS_PER_MICRO		1LL
 
 #else /* !__unix__ */
 	#error OS dependent support code missing for this OS
 #endif /* !__unix__ */
 
-/*!
+/**
  * Return the current time with the maximum precision made available from the hosting OS
  */
 extern hptime_t hptime_get(void);