diff options
author | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-01-09 16:52:30 +0000 |
---|---|---|
committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-01-09 16:52:30 +0000 |
commit | 927be6a82c604b6da23ed29815326c5da60b6337 (patch) | |
tree | 1e0bb6d8535e35f18128ac0f162e0b80b8dfc084 | |
parent | 958435b034750b49f2a7ff2ec44fdda301191ebb (diff) | |
download | ChibiOS-927be6a82c604b6da23ed29815326c5da60b6337.tar.gz ChibiOS-927be6a82c604b6da23ed29815326c5da60b6337.tar.bz2 ChibiOS-927be6a82c604b6da23ed29815326c5da60b6337.zip |
Fixed bug #688.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8730 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r-- | os/rt/src/chtm.c | 4 | ||||
-rw-r--r-- | readme.txt | 2 |
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.
|