git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7759 35acf78f-673a-0410-8e92-d51de3d6d3f4

3 files changed, 7 insertions, 7 deletions

diff --git a/os/hal/src/can.c b/os/hal/src/can.c
index 094f9691f..08cdd5172 100644
--- a/os/hal/src/can.c
+++ b/os/hal/src/can.c
@@ -105,7 +105,7 @@ void canStart(CANDriver *canp, const CANConfig *config) {
                 (canp->state == CAN_READY),

                 "invalid state");

   while (canp->state == CAN_STARTING) {

-    osalThreadSleepS(1);

+    osalThreadSleepS((systime_t)1);

   }

   if (canp->state == CAN_STOP) {

     canp->config = config;

@@ -253,7 +253,7 @@ void canSleep(CANDriver *canp) {
   if (canp->state == CAN_READY) {

     can_lld_sleep(canp);

     canp->state = CAN_SLEEP;

-    osalEventBroadcastFlagsI(&canp->sleep_event, 0);

+    osalEventBroadcastFlagsI(&canp->sleep_event, (eventflags_t)0);

     osalOsRescheduleS();

   }

   osalSysUnlock();

@@ -276,7 +276,7 @@ void canWakeup(CANDriver *canp) {
   if (canp->state == CAN_SLEEP) {

     can_lld_wakeup(canp);

     canp->state = CAN_READY;

-    osalEventBroadcastFlagsI(&canp->wakeup_event, 0);

+    osalEventBroadcastFlagsI(&canp->wakeup_event, (eventflags_t)0);

     osalOsRescheduleS();

   }

   osalSysUnlock();

diff --git a/os/hal/src/mac.c b/os/hal/src/mac.c
index 88c32f3cc..b6570073e 100644
--- a/os/hal/src/mac.c
+++ b/os/hal/src/mac.c
@@ -156,7 +156,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 > 0U)) {

+         (timeout > (systime_t)0)) {

     osalSysLock();

     now = osalOsGetSystemTimeX();

     msg = osalThreadEnqueueTimeoutS(&macp->tdqueue, timeout);

@@ -216,7 +216,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 > 0U)) {

+         (timeout > (systime_t)0)) {

     osalSysLock();

     now = osalOsGetSystemTimeX();

     msg = osalThreadEnqueueTimeoutS(&macp->rdqueue, timeout);

diff --git a/os/hal/src/mmc_spi.c b/os/hal/src/mmc_spi.c
index 87c4df3af..465d2224a 100644
--- a/os/hal/src/mmc_spi.c
+++ b/os/hal/src/mmc_spi.c
@@ -182,7 +182,7 @@ static void wait(MMCDriver *mmcp) {
     }

 #if MMC_NICE_WAITING == TRUE

     /* Trying to be nice with the other threads.*/

-    osalThreadSleep(1);

+    osalThreadSleepMilliseconds(1);

 #endif

   }

 }

@@ -365,7 +365,7 @@ static void sync(MMCDriver *mmcp) {
     }

 #if MMC_NICE_WAITING == TRUE

     /* Trying to be nice with the other threads.*/

-    osalThreadSleep(1);

+    osalThreadSleepMilliseconds(1);

 #endif

   }

   spiUnselect(mmcp->config->spip);