diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-02-26 09:29:02 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-02-26 09:29:02 +0000 |
| commit | 50439eed0df5c61ecb70483ad7d999f0038f1b3d (patch) | |
| tree | 017bb6e6d51502856b80d3c16e6ffb1a44548580 /os/hal/include/hal_pal.h | |
| parent | 4a03cef983fcf64c8b6fbdc888dfe4b05915425e (diff) | |
| download | ChibiOS-50439eed0df5c61ecb70483ad7d999f0038f1b3d.tar.gz ChibiOS-50439eed0df5c61ecb70483ad7d999f0038f1b3d.tar.bz2 ChibiOS-50439eed0df5c61ecb70483ad7d999f0038f1b3d.zip | |
Added back missing revisions in trunk.
git-svn-id: https://svn.code.sf.net/p/chibios/svn2/trunk@11544 110e8d01-0319-4d1e-a829-52ad28d1bb01
Diffstat (limited to 'os/hal/include/hal_pal.h')
| -rw-r--r-- | os/hal/include/hal_pal.h | 51 |
1 files changed, 3 insertions, 48 deletions
diff --git a/os/hal/include/hal_pal.h b/os/hal/include/hal_pal.h index a3c9818ce..86a4fe699 100644 --- a/os/hal/include/hal_pal.h +++ b/os/hal/include/hal_pal.h @@ -949,54 +949,6 @@ typedef struct { } while (false)
#endif /* PAL_USE_CALLBACKS == TRUE */
-#if (PAL_USE_WAIT == TRUE) || defined(__DOXYGEN__)
-/**
- * @brief Waits for an edge on the specified port/pad.
- *
- * @param[in] port port identifier
- * @param[in] pad pad number within the port
- * @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.
- * .
- * @returns The operation state.
- * @retval MSG_OK if an edge has been detected.
- * @retval MSG_TIMEOUT if a timeout occurred before an edge cound be detected.
- * @retval MSG_RESET if the event has been disabled while the thread was
- * waiting for an edge.
- *
- * @api
- */
-#define palWaitPadTimeout(port, pad, timeout) \
- do { \
- osalSysLock(); \
- palWaitPadTimeoutS(port, pad, timeout); \
- osalSysUnlock(); \
- } while (false)
-
-
-/**
- * @brief Waits for an edge on the specified line.
- *
- * @param[in] line line identifier
- * @param[in] timeout operation timeout
- * @returns The operation state.
- * @retval MSG_OK if an edge has been detected.
- * @retval MSG_TIMEOUT if a timeout occurred before an edge cound be detected.
- * @retval MSG_RESET if the event has been disabled while the thread was
- * waiting for an edge.
- *
- * @api
- */
-#define palWaitLineTimeout(line, timeout) \
- do { \
- osalSysLock(); \
- palWaitLineTimeoutS(line, timeout); \
- osalSysUnlock(); \
- } while (false)
-#endif /* PAL_USE_WAIT == TRUE */
-
/** @} */
/*===========================================================================*/
@@ -1017,7 +969,10 @@ extern "C" { #if (PAL_USE_WAIT == TRUE) || defined(__DOXYGEN__)
msg_t palWaitPadTimeoutS(ioportid_t port, iopadid_t pad,
sysinterval_t timeout);
+ msg_t palWaitPadTimeout(ioportid_t port, iopadid_t pad,
+ sysinterval_t timeout);
msg_t palWaitLineTimeoutS(ioline_t line, sysinterval_t timeout);
+ msg_t palWaitLineTimeout(ioline_t line, sysinterval_t timeout);
#endif /* PAL_USE_WAIT == TRUE */
#ifdef __cplusplus
}
|