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

1 files changed, 12 insertions, 12 deletions

diff --git a/os/common/abstractions/cmsis_os/cmsis_os.c b/os/common/abstractions/cmsis_os/cmsis_os.c
index a871b761f..a01ebc0e0 100644
--- a/os/common/abstractions/cmsis_os/cmsis_os.c
+++ b/os/common/abstractions/cmsis_os/cmsis_os.c
@@ -68,7 +68,7 @@ static void timer_cb(void const *arg) {
   timer_id->ptimer(timer_id->argument);

   if (timer_id->type == osTimerPeriodic) {

     chSysLockFromISR();

-    chVTDoSetI(&timer_id->vt, MS2ST(timer_id->millisec),

+    chVTDoSetI(&timer_id->vt, TIME_MS2I(timer_id->millisec),

                (vtfunc_t)timer_cb, timer_id);

     chSysUnlockFromISR();

   }

@@ -226,7 +226,7 @@ osStatus osTimerStart(osTimerId timer_id, uint32_t millisec) {
     return osErrorValue;

 

   timer_id->millisec = millisec;

-  chVTSet(&timer_id->vt, MS2ST(millisec), (vtfunc_t)timer_cb, timer_id);

+  chVTSet(&timer_id->vt, TIME_MS2I(millisec), (vtfunc_t)timer_cb, timer_id);

 

   return osOK;

 }

@@ -287,8 +287,8 @@ int32_t osSignalClear(osThreadId thread_id, int32_t signals) {
  */

 osEvent osSignalWait(int32_t signals, uint32_t millisec) {

   osEvent event;

-  systime_t timeout = ((millisec == 0) || (millisec == osWaitForever)) ?

-                      TIME_INFINITE : MS2ST(millisec);

+  sysinterval_t timeout = ((millisec == 0) || (millisec == osWaitForever)) ?

+                          TIME_INFINITE : TIME_MS2I(millisec);

 

   if (signals == 0)

     event.value.signals = (uint32_t)chEvtWaitAnyTimeout(ALL_EVENTS, timeout);

@@ -324,8 +324,8 @@ osSemaphoreId osSemaphoreCreate(const osSemaphoreDef_t *semaphore_def,
  * @brief   Wait on a semaphore.

  */

 int32_t osSemaphoreWait(osSemaphoreId semaphore_id, uint32_t millisec) {

-  systime_t timeout = ((millisec == 0) || (millisec == osWaitForever)) ?

-                      TIME_INFINITE : MS2ST(millisec);

+  sysinterval_t timeout = ((millisec == 0) || (millisec == osWaitForever)) ?

+                          TIME_INFINITE : TIME_MS2I(millisec);

 

   msg_t msg = chSemWaitTimeout((semaphore_t *)semaphore_id, timeout);

   switch (msg) {

@@ -380,8 +380,8 @@ osMutexId osMutexCreate(const osMutexDef_t *mutex_def) {
  * @brief   Wait on a mutex.

  */

 osStatus osMutexWait(osMutexId mutex_id, uint32_t millisec) {

-  systime_t timeout = ((millisec == 0) || (millisec == osWaitForever)) ?

-                      TIME_INFINITE : MS2ST(millisec);

+  sysinterval_t timeout = ((millisec == 0) || (millisec == osWaitForever)) ?

+                          TIME_INFINITE : TIME_MS2I(millisec);

 

   msg_t msg = chBSemWaitTimeout((binary_semaphore_t *)mutex_id, timeout);

   switch (msg) {

@@ -495,8 +495,8 @@ osStatus osMessagePut(osMessageQId queue_id,
                       uint32_t info,

                       uint32_t millisec) {

   msg_t msg;

-  systime_t timeout = ((millisec == 0) || (millisec == osWaitForever)) ?

-                      TIME_INFINITE : MS2ST(millisec);

+  sysinterval_t timeout = ((millisec == 0) || (millisec == osWaitForever)) ?

+                          TIME_INFINITE : TIME_MS2I(millisec);

 

   if (port_is_isr_context()) {

 

@@ -522,8 +522,8 @@ osEvent osMessageGet(osMessageQId queue_id,
                      uint32_t millisec) {

   msg_t msg;

   osEvent event;

-  systime_t timeout = ((millisec == 0) || (millisec == osWaitForever)) ?

-                      TIME_INFINITE : MS2ST(millisec);

+  sysinterval_t timeout = ((millisec == 0) || (millisec == osWaitForever)) ?

+                          TIME_INFINITE : TIME_MS2I(millisec);

 

   event.def.message_id = queue_id;