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/src/chmempools.c | |
| 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/src/chmempools.c')
| -rw-r--r-- | os/common/oslib/src/chmempools.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/os/common/oslib/src/chmempools.c b/os/common/oslib/src/chmempools.c index aec47400c..5e23273f5 100644 --- a/os/common/oslib/src/chmempools.c +++ b/os/common/oslib/src/chmempools.c @@ -268,7 +268,7 @@ void chGuardedPoolLoadArray(guarded_memory_pool_t *gmp, void *p, size_t n) { * @sclass
*/
void *chGuardedPoolAllocTimeoutS(guarded_memory_pool_t *gmp,
- systime_t timeout) {
+ sysinterval_t timeout) {
msg_t msg;
msg = chSemWaitTimeoutS(&gmp->sem, timeout);
@@ -295,7 +295,7 @@ void *chGuardedPoolAllocTimeoutS(guarded_memory_pool_t *gmp, * @api
*/
void *chGuardedPoolAllocTimeout(guarded_memory_pool_t *gmp,
- systime_t timeout) {
+ sysinterval_t timeout) {
void *p;
chSysLock();
|