diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2017-10-16 09:31:32 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2017-10-16 09:31:32 +0000 |
| commit | 6bbfd2126f0cd20c733b78682d322250d8223d93 (patch) | |
| tree | 9f9856ad4e17aeee3dba156e5211eb0579061844 /os/common/oslib/include/chbsem.h | |
| parent | 97442e7faaed76d0da347c96df3da2122e033bd1 (diff) | |
| parent | 5596d3e69e0d1c7c9a7b07f9bf83416d2c25cd8b (diff) | |
| download | ChibiOS-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/common/oslib/include/chbsem.h')
| -rw-r--r-- | os/common/oslib/include/chbsem.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/os/common/oslib/include/chbsem.h b/os/common/oslib/include/chbsem.h index 3a6956017..bf77700d1 100644 --- a/os/common/oslib/include/chbsem.h +++ b/os/common/oslib/include/chbsem.h @@ -166,7 +166,7 @@ static inline msg_t chBSemWaitS(binary_semaphore_t *bsp) { * @brief Wait operation on the binary semaphore.
*
* @param[in] bsp pointer to a @p binary_semaphore_t structure
- * @param[in] time the number of ticks before the operation timeouts,
+ * @param[in] timeout the number of ticks before the operation timeouts,
* the following special values are allowed:
* - @a TIME_IMMEDIATE immediate timeout.
* - @a TIME_INFINITE no timeout.
@@ -182,18 +182,18 @@ static inline msg_t chBSemWaitS(binary_semaphore_t *bsp) { * @sclass
*/
static inline msg_t chBSemWaitTimeoutS(binary_semaphore_t *bsp,
- systime_t time) {
+ sysinterval_t timeout) {
chDbgCheckClassS();
- return chSemWaitTimeoutS(&bsp->sem, time);
+ return chSemWaitTimeoutS(&bsp->sem, timeout);
}
/**
* @brief Wait operation on the binary semaphore.
*
* @param[in] bsp pointer to a @p binary_semaphore_t structure
- * @param[in] time the number of ticks before the operation timeouts,
+ * @param[in] timeout the number of ticks before the operation timeouts,
* the following special values are allowed:
* - @a TIME_IMMEDIATE immediate timeout.
* - @a TIME_INFINITE no timeout.
@@ -209,9 +209,9 @@ static inline msg_t chBSemWaitTimeoutS(binary_semaphore_t *bsp, * @api
*/
static inline msg_t chBSemWaitTimeout(binary_semaphore_t *bsp,
- systime_t time) {
+ sysinterval_t timeout) {
- return chSemWaitTimeout(&bsp->sem, time);
+ return chSemWaitTimeout(&bsp->sem, timeout);
}
/**
|