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_mac.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_mac.c')
| -rw-r--r-- | os/hal/src/hal_mac.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/os/hal/src/hal_mac.c b/os/hal/src/hal_mac.c index 7d0f4cf43..2ae0b677d 100644 --- a/os/hal/src/hal_mac.c +++ b/os/hal/src/hal_mac.c @@ -149,7 +149,7 @@ void macStop(MACDriver *macp) { */
msg_t macWaitTransmitDescriptor(MACDriver *macp,
MACTransmitDescriptor *tdp,
- systime_t timeout) {
+ sysinterval_t timeout) {
msg_t msg;
systime_t now;
@@ -157,7 +157,7 @@ msg_t macWaitTransmitDescriptor(MACDriver *macp, osalDbgAssert(macp->state == MAC_ACTIVE, "not active");
while (((msg = mac_lld_get_transmit_descriptor(macp, tdp)) != MSG_OK) &&
- (timeout > (systime_t)0)) {
+ (timeout > (sysinterval_t)0)) {
osalSysLock();
now = osalOsGetSystemTimeX();
msg = osalThreadEnqueueTimeoutS(&macp->tdqueue, timeout);
@@ -209,7 +209,7 @@ void macReleaseTransmitDescriptor(MACTransmitDescriptor *tdp) { */
msg_t macWaitReceiveDescriptor(MACDriver *macp,
MACReceiveDescriptor *rdp,
- systime_t timeout) {
+ sysinterval_t timeout) {
msg_t msg;
systime_t now;
@@ -217,7 +217,7 @@ msg_t macWaitReceiveDescriptor(MACDriver *macp, osalDbgAssert(macp->state == MAC_ACTIVE, "not active");
while (((msg = mac_lld_get_receive_descriptor(macp, rdp)) != MSG_OK) &&
- (timeout > (systime_t)0)) {
+ (timeout > (sysinterval_t)0)) {
osalSysLock();
now = osalOsGetSystemTimeX();
msg = osalThreadEnqueueTimeoutS(&macp->rdqueue, timeout);
|