From 5047ce62e8c7c4b702d68f29dff42e65200924b1 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sat, 4 Apr 2015 08:19:04 +0000 Subject: Time conversion macros fixes. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7851 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/nil/include/nil.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'os/nil') diff --git a/os/nil/include/nil.h b/os/nil/include/nil.h index 3babb8da9..e17aeef99 100644 --- a/os/nil/include/nil.h +++ b/os/nil/include/nil.h @@ -596,8 +596,8 @@ struct nil_system { * @api */ #define MS2ST(msec) \ - ((systime_t)((((((uint32_t)(msec)) * \ - ((uint32_t)NIL_CFG_ST_FREQUENCY)) - 1UL) / 1000UL) + 1UL)) + ((systime_t)((((uint32_t)(msec)) * \ + ((uint32_t)NIL_CFG_ST_FREQUENCY) + 999UL) / 1000UL)) /** * @brief Microseconds to system ticks. @@ -610,8 +610,8 @@ struct nil_system { * @api */ #define US2ST(usec) \ - ((systime_t)((((((uint32_t)(usec)) * \ - ((uint32_t)NIL_CFG_ST_FREQUENCY)) - 1UL) / 1000000UL) + 1UL)) + ((systime_t)((((uint32_t)(usec)) * \ + ((uint32_t)NIL_CFG_ST_FREQUENCY) + 999999UL) / 1000000UL)) /** @} */ /** -- cgit v1.2.3