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 2b27b6ef930d6b93fa6dbe99fd4a43c5dc4812ea..a5072cca4801c18ae17cd2bc43d6d38287e7d533 100755
(executable)
--- a/
os/hptime.h
+++ b/
os/hptime.h
@@
-7,7
+7,6
@@
*
* \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>
*/
#ifndef HPTIME_H
* \author Bernardo Innocenti <bernie@develer.com>
*/
#ifndef HPTIME_H
@@
-22,20
+21,27
@@
extern "C" {
/** our type for "high precision absolute time" */
typedef __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)
+ #define HPTIME_TICKS_PER_SECOND (10000000I64)
+ #define HPTIME_TICKS_PER_MILLISEC (10000I64)
+ #define HPTIME_TICKS_PER_MICRO (10I64)
#elif defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
#include <stdint.h> /* int64_t */
#elif defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
#include <stdint.h> /* int64_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
+
/** Type for "high precision absolute time". */
typedef int64_t 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
#else /* !__unix__ */
#error OS dependent support code missing for this OS