andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tentative fix for bug #502. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6933 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2014-05-13 12:45:35 +00:00
parent 0360026678
commit a0cfa6d054
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os/nil/include/nil.h
View File

@ -735,7 +735,7 @@ typedef struct {
* @xclass * @xclass
*/ */
#define chVTTimeElapsedSinceX(start) \ #define chVTTimeElapsedSinceX(start) \
((systime_t)(chVTGetSystemTimeX() - start)) ((systime_t)(chVTGetSystemTimeX() - (start)))
/** /**
* @brief Checks if the specified time is within the specified time window. * @brief Checks if the specified time is within the specified time window.
@ -752,7 +752,7 @@ typedef struct {
* @xclass * @xclass
*/ */
#define chVTIsTimeWithinX(time, start, end) \ #define chVTIsTimeWithinX(time, start, end) \
((bool)((time) - (start) < (end) - (start))) ((bool)((systime_t)((time) - (start)) < (systime_t)((end) - (start))))
/** /**
* @brief Condition assertion. * @brief Condition assertion.

2
os/nil/src/nil.c
View File

@ -197,7 +197,7 @@ void chSysTimerHandlerI(void) {
chSchReadyI(tp, MSG_TIMEOUT); chSchReadyI(tp, MSG_TIMEOUT);
} }
else { else {
if (tp->timeout <= next - 1) if (tp->timeout <= (systime_t)(next - 1))
next = tp->timeout; next = tp->timeout;
} }
} }