X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=os%2Fhptime.h;h=2a9670248e9e8feed0ab3a85afad72220a00fa4f;hb=99e01af883f1ef23dbff6432d45430a59cf2535e;hp=9f91ad3677b1cf51640e972fa784cead554b3516;hpb=277b540c0764dd376dcf583acdc97a2b2fd3d8e6;p=bertos.git diff --git a/os/hptime.h b/os/hptime.h index 9f91ad36..2a967024 100755 --- a/os/hptime.h +++ b/os/hptime.h @@ -2,7 +2,7 @@ * \file * * * \brief Portable abstraction for high-resolution time handling (interface) @@ -13,6 +13,15 @@ /*#* *#* $Log$ + *#* 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 *#* @@ -35,11 +44,8 @@ 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) @@ -47,21 +53,20 @@ extern "C" { #elif defined(__unix__) - /* type for time expressed in ms */ - typedef long mtime_t; + #include - /* our type for "high precision absolute time" */ - typedef long long hptime_t; + /** our 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);