diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-08-06 09:19:19 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-08-06 09:19:19 +0000 |
| commit | 04601b760b4d72a400237c5469a0962a66251507 (patch) | |
| tree | 9761c4f0f7fa3303e3c120652a6d3acbe7bcf1b8 /os/kernel/include/chvt.h | |
| parent | d7d1667ccd6032d570e9d53ec4988c4b1761a71f (diff) | |
| download | ChibiOS-04601b760b4d72a400237c5469a0962a66251507.tar.gz ChibiOS-04601b760b4d72a400237c5469a0962a66251507.tar.bz2 ChibiOS-04601b760b4d72a400237c5469a0962a66251507.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6084 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/kernel/include/chvt.h')
| -rw-r--r-- | os/kernel/include/chvt.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/os/kernel/include/chvt.h b/os/kernel/include/chvt.h index 10168a66e..75823f954 100644 --- a/os/kernel/include/chvt.h +++ b/os/kernel/include/chvt.h @@ -41,12 +41,12 @@ /* Derived constants and error checks. */
/*===========================================================================*/
-#if CH_CFG_FREQUENCY <= 0
-#error "invalid CH_CFG_FREQUENCY specified"
+#if CH_CFG_ST_FREQUENCY <= 0
+#error "invalid CH_CFG_ST_FREQUENCY specified"
#endif
#if (CH_CFG_TIMEDELTA < 0) || (CH_CFG_TIMEDELTA == 1)
-#error "invalid NIL_CFG_TIMEDELTA specified"
+#error "invalid CH_CFG_TIMEDELTA specified"
#endif
#if (CH_CFG_TIMEDELTA > 0) && (CH_CFG_TIME_QUANTUM > 0)
@@ -125,7 +125,7 @@ struct virtual_timer { * @api
*/
#define S2ST(sec) \
- ((systime_t)((uint32_t)(sec) * (uint32_t)CH_CFG_FREQUENCY))
+ ((systime_t)((uint32_t)(sec) * (uint32_t)CH_CFG_ST_FREQUENCY))
/**
* @brief Milliseconds to system ticks.
@@ -138,8 +138,8 @@ struct virtual_timer { * @api
*/
#define MS2ST(msec) \
- ((systime_t)(((((uint32_t)(msec)) * ((uint32_t)CH_CFG_FREQUENCY) - 1UL) / \
- 1000UL) + 1UL))
+ ((systime_t)(((((uint32_t)(msec)) * \
+ ((uint32_t)CH_CFG_ST_FREQUENCY) - 1UL) / 1000UL) + 1UL))
/**
* @brief Microseconds to system ticks.
@@ -152,8 +152,8 @@ struct virtual_timer { * @api
*/
#define US2ST(usec) \
- ((systime_t)(((((uint32_t)(usec)) * ((uint32_t)CH_CFG_FREQUENCY) - 1UL) / \
- 1000000UL) + 1UL))
+ ((systime_t)(((((uint32_t)(usec)) * \
+ ((uint32_t)CH_CFG_ST_FREQUENCY) - 1UL) / 1000000UL) + 1UL))
/** @} */
/*===========================================================================*/
|