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/hal/src/hal_can.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/hal/src/hal_can.c')
| -rw-r--r-- | os/hal/src/hal_can.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/os/hal/src/hal_can.c b/os/hal/src/hal_can.c index 014d59c70..122e5eb76 100644 --- a/os/hal/src/hal_can.c +++ b/os/hal/src/hal_can.c @@ -233,7 +233,7 @@ bool canTryReceiveI(CANDriver *canp, msg_t canTransmitTimeout(CANDriver *canp,
canmbx_t mailbox,
const CANTxFrame *ctfp,
- systime_t timeout) {
+ sysinterval_t timeout) {
osalDbgCheck((canp != NULL) && (ctfp != NULL) &&
(mailbox <= (canmbx_t)CAN_TX_MAILBOXES));
@@ -281,7 +281,7 @@ msg_t canTransmitTimeout(CANDriver *canp, msg_t canReceiveTimeout(CANDriver *canp,
canmbx_t mailbox,
CANRxFrame *crfp,
- systime_t timeout) {
+ sysinterval_t timeout) {
osalDbgCheck((canp != NULL) && (crfp != NULL) &&
(mailbox <= (canmbx_t)CAN_RX_MAILBOXES));
|