aboutsummaryrefslogtreecommitdiffstats
path: root/os/rt/include/chcond.h
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2017-10-16 09:31:32 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2017-10-16 09:31:32 +0000
commit6bbfd2126f0cd20c733b78682d322250d8223d93 (patch)
tree9f9856ad4e17aeee3dba156e5211eb0579061844 /os/rt/include/chcond.h
parent97442e7faaed76d0da347c96df3da2122e033bd1 (diff)
parent5596d3e69e0d1c7c9a7b07f9bf83416d2c25cd8b (diff)
downloadChibiOS-6bbfd2126f0cd20c733b78682d322250d8223d93.tar.gz
ChibiOS-6bbfd2126f0cd20c733b78682d322250d8223d93.tar.bz2
ChibiOS-6bbfd2126f0cd20c733b78682d322250d8223d93.zip
Reintegrated RT5 point1 branch.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10833 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/rt/include/chcond.h')
-rw-r--r--os/rt/include/chcond.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/os/rt/include/chcond.h b/os/rt/include/chcond.h
index bf1e02cd5..9b753f274 100644
--- a/os/rt/include/chcond.h
+++ b/os/rt/include/chcond.h
@@ -98,8 +98,8 @@ extern "C" {
msg_t chCondWait(condition_variable_t *cp);
msg_t chCondWaitS(condition_variable_t *cp);
#if CH_CFG_USE_CONDVARS_TIMEOUT == TRUE
- msg_t chCondWaitTimeout(condition_variable_t *cp, systime_t time);
- msg_t chCondWaitTimeoutS(condition_variable_t *cp, systime_t time);
+ msg_t chCondWaitTimeout(condition_variable_t *cp, sysinterval_t timeout);
+ msg_t chCondWaitTimeoutS(condition_variable_t *cp, sysinterval_t timeout);
#endif
#ifdef __cplusplus
}