diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-04-09 09:59:15 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-04-09 09:59:15 +0000 |
| commit | 5f8df8485c77d69e7d72cc0c14c8fe423bf3d543 (patch) | |
| tree | 26b480948437c70dc10dedd971381913299d64b4 /os/rt/include | |
| parent | 071db6ae066d17f7d9952d19d6fe49477fb8344d (diff) | |
| download | ChibiOS-5f8df8485c77d69e7d72cc0c14c8fe423bf3d543.tar.gz ChibiOS-5f8df8485c77d69e7d72cc0c14c8fe423bf3d543.tar.bz2 ChibiOS-5f8df8485c77d69e7d72cc0c14c8fe423bf3d543.zip | |
Fixed bugs 573 and 574.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7876 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/rt/include')
| -rw-r--r-- | os/rt/include/ch.h | 2 | ||||
| -rw-r--r-- | os/rt/include/chvt.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/os/rt/include/ch.h b/os/rt/include/ch.h index 8f5d0a1c4..155734ff4 100644 --- a/os/rt/include/ch.h +++ b/os/rt/include/ch.h @@ -48,7 +48,7 @@ /**
* @brief Kernel version string.
*/
-#define CH_KERNEL_VERSION "3.0.0p1"
+#define CH_KERNEL_VERSION "3.0.0p2"
/**
* @brief Kernel version major number.
diff --git a/os/rt/include/chvt.h b/os/rt/include/chvt.h index fe70aef03..de5ee765d 100644 --- a/os/rt/include/chvt.h +++ b/os/rt/include/chvt.h @@ -498,7 +498,7 @@ static inline void chVTDoTickI(void) { note that the loop is stopped by the timers header having
"ch.vtlist.vt_delta == (systime_t)-1" which is greater than
all deltas.*/
- while (vtp->vt_delta <= now - ch.vtlist.vt_lasttime) {
+ while (vtp->vt_delta <= (systime_t)(now - ch.vtlist.vt_lasttime)) {
vtfunc_t fn;
/* The "last time" becomes this timer's expiration time.*/
|