projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change doxygen \param tag to \a.
[bertos.git]
/
os
/
hptime.h
diff --git
a/os/hptime.h
b/os/hptime.h
index 7b05dbe6f0ad3eb09a128ebc9ee3cb18186eaafa..a5072cca4801c18ae17cd2bc43d6d38287e7d533 100755
(executable)
--- a/
os/hptime.h
+++ b/
os/hptime.h
@@
-1,22
+1,14
@@
-/*
!
+/*
*
* \file
* <!--
* \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)
*
* -->
*
* \brief Portable abstraction for high-resolution time handling (interface)
*
- * \version $Id$
* \author Bernardo Innocenti <bernie@develer.com>
*/
* \author Bernardo Innocenti <bernie@develer.com>
*/
-
-/*
- * $Log$
- * Revision 1.1 2004/06/03 09:01:06 bernie
- * Import into DevLib.
- *
- */
#ifndef HPTIME_H
#define HPTIME_H
#ifndef HPTIME_H
#define HPTIME_H
@@
-26,33
+18,36
@@
extern "C" {
#ifdef _WIN32
#ifdef _WIN32
- /*
type for time expressed in ms
*/
- typedef
unsigned long m
time_t;
+ /*
* our type for "high precision absolute time"
*/
+ typedef
__int64 hp
time_t;
- /* our type for "high precision absolute time" */
- typedef unsigned __int64 hptime_t;
+ #define HPTIME_TICKS_PER_SECOND (10000000I64)
+ #define HPTIME_TICKS_PER_MILLISEC (10000I64)
+ #define HPTIME_TICKS_PER_MICRO (10I64)
- #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__) || (defined(__APPLE__) && defined(__MACH__))
-#elif defined(__unix__)
+ #include <stdint.h> /* int64_t */
- /* type for time expressed in ms */
- typedef long mtime_t;
+ #ifndef DEVLIB_MTIME_DEFINED
+ #define DEVLIB_MTIME_DEFINED 1 /* Resolve conflict with <cfg/compiler.h> */
+ typedef int32_t mtime_t;
+ #define SIZEOF_MTIME_T (32 / CPU_BITS_PER_CHAR)
+ #define MTIME_INFINITE 0x7FFFFFFFL
+ #endif
- /*
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__ */
#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);
* Return the current time with the maximum precision made available from the hosting OS
*/
extern hptime_t hptime_get(void);