Time conversion macros fixes.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7851 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
parent
b3c635dc4b
commit
5047ce62e8
|
@ -425,8 +425,8 @@ typedef struct {
|
|||
* @api
|
||||
*/
|
||||
#define OSAL_MS2ST(msec) \
|
||||
((systime_t)((((((uint32_t)(msec)) * \
|
||||
((uint32_t)OSAL_ST_FREQUENCY)) - 1UL) / 1000UL) + 1UL))
|
||||
((systime_t)((((uint32_t)(msec)) * \
|
||||
((uint32_t)OSAL_ST_FREQUENCY) + 999UL) / 1000UL))
|
||||
|
||||
/**
|
||||
* @brief Microseconds to system ticks.
|
||||
|
@ -439,8 +439,8 @@ typedef struct {
|
|||
* @api
|
||||
*/
|
||||
#define OSAL_US2ST(usec) \
|
||||
((systime_t)((((((uint32_t)(usec)) * \
|
||||
((uint32_t)OSAL_ST_FREQUENCY)) - 1UL) / 1000000UL) + 1UL))
|
||||
((systime_t)((((uint32_t)(usec)) * \
|
||||
((uint32_t)OSAL_ST_FREQUENCY) + 999999UL) / 1000000UL))
|
||||
/** @} */
|
||||
|
||||
/**
|
||||
|
|
|
@ -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))
|
||||
/** @} */
|
||||
|
||||
/**
|
||||
|
|
|
@ -118,8 +118,8 @@
|
|||
* @api
|
||||
*/
|
||||
#define MS2ST(msec) \
|
||||
((systime_t)((((((uint32_t)(msec)) * \
|
||||
((uint32_t)CH_CFG_ST_FREQUENCY)) - 1UL) / 1000UL) + 1UL))
|
||||
((systime_t)((((uint32_t)(msec)) * \
|
||||
((uint32_t)CH_CFG_ST_FREQUENCY) + 999UL) / 1000UL))
|
||||
|
||||
/**
|
||||
* @brief Microseconds to system ticks.
|
||||
|
@ -132,8 +132,8 @@
|
|||
* @api
|
||||
*/
|
||||
#define US2ST(usec) \
|
||||
((systime_t)((((((uint32_t)(usec)) * \
|
||||
((uint32_t)CH_CFG_ST_FREQUENCY)) - 1UL) / 1000000UL) + 1UL))
|
||||
((systime_t)((((uint32_t)(usec)) * \
|
||||
((uint32_t)CH_CFG_ST_FREQUENCY) + 999999UL) / 1000000UL))
|
||||
|
||||
/**
|
||||
* @brief System ticks to seconds.
|
||||
|
@ -145,7 +145,7 @@
|
|||
*
|
||||
* @api
|
||||
*/
|
||||
#define ST2S(n) (((((n) - 1UL) * 1UL) / CH_CFG_ST_FREQUENCY) + 1UL)
|
||||
#define ST2S(n) (((n) + CH_CFG_ST_FREQUENCY - 1UL) / CH_CFG_ST_FREQUENCY)
|
||||
|
||||
/**
|
||||
* @brief System ticks to milliseconds.
|
||||
|
@ -157,7 +157,8 @@
|
|||
*
|
||||
* @api
|
||||
*/
|
||||
#define ST2MS(n) (((((n) - 1UL) * 1000UL) / CH_CFG_ST_FREQUENCY) + 1UL)
|
||||
#define ST2MS(n) (((n) * 1000UL + CH_CFG_ST_FREQUENCY - 1UL) / \
|
||||
CH_CFG_ST_FREQUENCY)
|
||||
|
||||
/**
|
||||
* @brief System ticks to microseconds.
|
||||
|
@ -169,7 +170,8 @@
|
|||
*
|
||||
* @api
|
||||
*/
|
||||
#define ST2US(n) (((((n) - 1UL) * 1000000UL) / CH_CFG_ST_FREQUENCY) + 1UL)
|
||||
#define ST2US(n) (((n) * 1000000UL + CH_CFG_ST_FREQUENCY - 1UL) / \
|
||||
CH_CFG_ST_FREQUENCY)
|
||||
/** @} */
|
||||
|
||||
/*===========================================================================*/
|
||||
|
|
Loading…
Reference in New Issue