aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--os/rt/src/chtm.c4
-rw-r--r--readme.txt2
2 files changed, 3 insertions, 3 deletions
diff --git a/os/rt/src/chtm.c b/os/rt/src/chtm.c
index a0001cb62..2ab4619c2 100644
--- a/os/rt/src/chtm.c
+++ b/os/rt/src/chtm.c
@@ -57,14 +57,12 @@ static inline void tm_stop(time_measurement_t *tmp,
tmp->n++;
tmp->last = (now - tmp->last) - offset;
tmp->cumulative += (rttime_t)tmp->last;
- /*lint -save -e9013 [15.7] There is no else because it is not needed.*/
if (tmp->last > tmp->worst) {
tmp->worst = tmp->last;
}
- else if (tmp->last < tmp->best) {
+ if (tmp->last < tmp->best) {
tmp->best = tmp->last;
}
- /*lint -restore*/
}
/*===========================================================================*/
diff --git a/readme.txt b/readme.txt
index e5d5320e2..8280d06c4 100644
--- a/readme.txt
+++ b/readme.txt
@@ -76,6 +76,8 @@
- OPT: Removed the p_msg field from the thread_t structure saving a
msg_t-sized field from the structure. Messages now use a new field
into the p_u union. Now synchnorous messages are even faster.
+- FIX: Fixed tm_stop - best case bug (bug #688)(backported to 16.1.0
+ and 3.0.5).
*** 16.1.0 ***
- RT: Added CodeWarrior compiler support to the e200 port.