aboutsummaryrefslogtreecommitdiffstats
path: root/os/hal/src/hal_pal.c
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/hal/src/hal_pal.c
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/hal/src/hal_pal.c')
-rw-r--r--os/hal/src/hal_pal.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/os/hal/src/hal_pal.c b/os/hal/src/hal_pal.c
index b46c9e7ea..3a83005ec 100644
--- a/os/hal/src/hal_pal.c
+++ b/os/hal/src/hal_pal.c
@@ -167,7 +167,9 @@ void palSetLineCallbackI(ioline_t line, palcallback_t cb, void *arg) {
*
* @sclass
*/
-msg_t palWaitPadTimeoutS(ioportid_t port, iopadid_t pad, systime_t timeout) {
+msg_t palWaitPadTimeoutS(ioportid_t port,
+ iopadid_t pad,
+ sysinterval_t timeout) {
palevent_t *pep = pal_lld_get_pad_event(port, pad);
return osalThreadEnqueueTimeoutS(&pep->threads, timeout);
@@ -186,7 +188,8 @@ msg_t palWaitPadTimeoutS(ioportid_t port, iopadid_t pad, systime_t timeout) {
*
* @sclass
*/
-msg_t palWaitLineTimeoutS(ioline_t line, systime_t timeout) {
+msg_t palWaitLineTimeoutS(ioline_t line,
+ sysinterval_t timeout) {
palevent_t *pep = pal_lld_get_line_event(line);
return osalThreadEnqueueTimeoutS(&pep->threads, timeout);