From bc38934ca2e1ce3f9031ad5dc1d0d087b404b349 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Tue, 4 Jun 2013 14:36:20 +0000
Subject: [PATCH] Fixed bug #415.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_2.4.x@5815 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/kernel/include/chvt.h | 9 ++++++---
 readme.txt               | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/os/kernel/include/chvt.h b/os/kernel/include/chvt.h
index 76a53c01b..f8710cd81 100644
--- a/os/kernel/include/chvt.h
+++ b/os/kernel/include/chvt.h
@@ -50,7 +50,8 @@
  *
  * @api
  */
-#define S2ST(sec)   ((systime_t)((sec) * CH_FREQUENCY))
+#define S2ST(sec)                                                           \
+  ((systime_t)((sec) * CH_FREQUENCY))
 
 /**
  * @brief   Milliseconds to system ticks.
@@ -62,7 +63,8 @@
  *
  * @api
  */
-#define MS2ST(msec) ((systime_t)(((((msec) - 1L) * CH_FREQUENCY) / 1000L) + 1L))
+#define MS2ST(msec)                                                         \
+  ((systime_t)((((msec) * CH_FREQUENCY - 1L) / 1000L) + 1L))
 
 /**
  * @brief   Microseconds to system ticks.
@@ -74,7 +76,8 @@
  *
  * @api
  */
-#define US2ST(usec) ((systime_t)(((((usec) - 1L) * CH_FREQUENCY) / 1000000L) + 1L))
+#define US2ST(usec)                                                         \
+  ((systime_t)((((usec) * CH_FREQUENCY - 1L) / 1000000L) + 1L))
 /** @} */
 
 /**
diff --git a/readme.txt b/readme.txt
index c23044963..66aeac1d5 100644
--- a/readme.txt
+++ b/readme.txt
@@ -79,6 +79,7 @@
 *****************************************************************************
 
 *** 2.4.4 ***
+- FIX: Fixed MS2ST() and US2ST() macros error (bug #415).
 - FIX: Fixed STM32_PLLI2SCLKOUT miscalculated (bug #413).
 - FIX: Fixed STM32 wrong peripherals reset procedure (bug #409).
 - FIX: Fixed wrong Keil project in ARMCM3-STM32F107 demo (bug #408).