diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-03-05 21:28:51 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-03-05 21:28:51 +0000 |
| commit | b53489d0e4252aafe5ada7466e0b3b7c4ad5aaaf (patch) | |
| tree | 2efd9ba0b52dfed9daefb6eb4d6b86b073776a21 /os/rt/src/chtm.c | |
| parent | 880d6916b3fb25b3972ed78b380db630524623e7 (diff) | |
| download | ChibiOS-b53489d0e4252aafe5ada7466e0b3b7c4ad5aaaf.tar.gz ChibiOS-b53489d0e4252aafe5ada7466e0b3b7c4ad5aaaf.tar.bz2 ChibiOS-b53489d0e4252aafe5ada7466e0b3b7c4ad5aaaf.zip | |
Lots of MISRA-related changes in RT. Not finished yet.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7715 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/rt/src/chtm.c')
| -rw-r--r-- | os/rt/src/chtm.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/os/rt/src/chtm.c b/os/rt/src/chtm.c index 9d95bd987..07f365114 100644 --- a/os/rt/src/chtm.c +++ b/os/rt/src/chtm.c @@ -28,7 +28,7 @@ #include "ch.h"
-#if CH_CFG_USE_TM || defined(__DOXYGEN__)
+#if (CH_CFG_USE_TM == TRUE) || defined(__DOXYGEN__)
/*===========================================================================*/
/* Module local definitions. */
@@ -55,14 +55,16 @@ static inline void tm_stop(time_measurement_t *tmp, rtcnt_t offset) {
tmp->n++;
- tmp->last = now - tmp->last - offset;
+ 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) {
tmp->best = tmp->last;
}
+ /*lint -restore*/
}
/*===========================================================================*/
@@ -151,6 +153,6 @@ NOINLINE void chTMChainMeasurementToX(time_measurement_t *tmp1, tm_stop(tmp1, tmp2->last, 0);
}
-#endif /* CH_CFG_USE_TM */
+#endif /* CH_CFG_USE_TM == TRUE */
/** @} */
|