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/chfifo.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/chfifo.h')
-rw-r--r-- | os/common/oslib/include/chfifo.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/os/common/oslib/include/chfifo.h b/os/common/oslib/include/chfifo.h index 1df57ef41..78ba16132 100644 --- a/os/common/oslib/include/chfifo.h +++ b/os/common/oslib/include/chfifo.h @@ -164,7 +164,7 @@ static inline void *chFifoTakeObjectI(objects_fifo_t *ofp) { * @sclass
*/
static inline void *chFifoTakeObjectTimeoutS(objects_fifo_t *ofp,
- systime_t timeout) {
+ sysinterval_t timeout) {
return chGuardedPoolAllocTimeoutS(&ofp->free, timeout);
}
@@ -185,7 +185,7 @@ static inline void *chFifoTakeObjectTimeoutS(objects_fifo_t *ofp, * @api
*/
static inline void *chFifoTakeObjectTimeout(objects_fifo_t *ofp,
- systime_t timeout) {
+ sysinterval_t timeout) {
return chGuardedPoolAllocTimeout(&ofp->free, timeout);
}
@@ -304,7 +304,7 @@ static inline msg_t chFifoReceiveObjectI(objects_fifo_t *ofp, */
static inline msg_t chFifoReceiveObjectTimeoutS(objects_fifo_t *ofp,
void **objpp,
- systime_t timeout) {
+ sysinterval_t timeout) {
return chMBFetchTimeoutS(&ofp->mbx, (msg_t *)objpp, timeout);
}
@@ -327,7 +327,7 @@ static inline msg_t chFifoReceiveObjectTimeoutS(objects_fifo_t *ofp, */
static inline msg_t chFifoReceiveObjectTimeout(objects_fifo_t *ofp,
void **objpp,
- systime_t timeout) {
+ sysinterval_t timeout) {
return chMBFetchTimeout(&ofp->mbx, (msg_t *)objpp, timeout);
}
|