Various fixes after recent changes.

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

4 files changed, 37 insertions, 13 deletions

diff --git a/os/various/lwip_bindings/arch/sys_arch.c b/os/various/lwip_bindings/arch/sys_arch.c
index 13590fd98..8e0f56ea5 100644
--- a/os/various/lwip_bindings/arch/sys_arch.c
+++ b/os/various/lwip_bindings/arch/sys_arch.c
@@ -101,18 +101,19 @@ void sys_sem_signal_S(sys_sem_t *sem) {
 }

 

 u32_t sys_arch_sem_wait(sys_sem_t *sem, u32_t timeout) {

-  systime_t tmo, start, remaining;

+  systime_t start;

+  sysinterval_t tmo, remaining;

 

   osalSysLock();

-  tmo = timeout > 0 ? MS2ST((systime_t)timeout) : TIME_INFINITE;

+  tmo = timeout > 0 ? TIME_MS2I((time_msecs_t)timeout) : TIME_INFINITE;

   start = osalOsGetSystemTimeX();

   if (chSemWaitTimeoutS(*sem, tmo) != MSG_OK) {

     osalSysUnlock();

     return SYS_ARCH_TIMEOUT;

   }

-  remaining = osalOsGetSystemTimeX() - start;

+  remaining = chTimeDiffX(start, osalOsGetSystemTimeX());

   osalSysUnlock();

-  return (u32_t)ST2MS(remaining);

+  return (u32_t)TIME_I2MS(remaining);

 }

 

 int sys_sem_valid(sys_sem_t *sem) {

@@ -173,18 +174,19 @@ err_t sys_mbox_trypost(sys_mbox_t *mbox, void *msg) {
 }

 

 u32_t sys_arch_mbox_fetch(sys_mbox_t *mbox, void **msg, u32_t timeout) {

-  systime_t tmo, start, remaining;

+  systime_t start;

+  sysinterval_t tmo, remaining;

 

   osalSysLock();

-  tmo = timeout > 0 ? MS2ST((systime_t)timeout) : TIME_INFINITE;

+  tmo = timeout > 0 ? TIME_MS2I((time_msecs_t)timeout) : TIME_INFINITE;

   start = osalOsGetSystemTimeX();

   if (chMBFetchTimeoutS(*mbox, (msg_t *)msg, tmo) != MSG_OK) {

     osalSysUnlock();

     return SYS_ARCH_TIMEOUT;

   }

-  remaining = osalOsGetSystemTimeX() - start;

+  remaining = chTimeDiffX(start, osalOsGetSystemTimeX());

   osalSysUnlock();

-  return (u32_t)ST2MS(remaining);

+  return (u32_t)TIME_I2MS(remaining);

 }

 

 u32_t sys_arch_mbox_tryfetch(sys_mbox_t *mbox, void **msg) {

diff --git a/os/various/lwip_bindings/lwipthread.c b/os/various/lwip_bindings/lwipthread.c
index df70dd021..5a7b3d732 100644
--- a/os/various/lwip_bindings/lwipthread.c
+++ b/os/various/lwip_bindings/lwipthread.c
@@ -129,7 +129,7 @@ static err_t low_level_output(struct netif *netif, struct pbuf *p) {
   MACTransmitDescriptor td;

 

   (void)netif;

-  if (macWaitTransmitDescriptor(&ETHD1, &td, MS2ST(LWIP_SEND_TIMEOUT)) != MSG_OK)

+  if (macWaitTransmitDescriptor(&ETHD1, &td, TIME_MS2I(LWIP_SEND_TIMEOUT)) != MSG_OK)

     return ERR_TIMEOUT;

 

 #if ETH_PAD_SIZE

diff --git a/os/various/lwip_bindings/lwipthread.h b/os/various/lwip_bindings/lwipthread.h
index 61eb1b2dd..ae72ccb74 100644
--- a/os/various/lwip_bindings/lwipthread.h
+++ b/os/various/lwip_bindings/lwipthread.h
@@ -65,7 +65,7 @@
  * @brief   Link poll interval.

  */

 #if !defined(LWIP_LINK_POLL_INTERVAL) || defined(__DOXYGEN__)

-#define LWIP_LINK_POLL_INTERVAL             S2ST(5)

+#define LWIP_LINK_POLL_INTERVAL             TIME_S2I(5)

 #endif

 

 /**

diff --git a/os/various/shell/shell_cmd.c b/os/various/shell/shell_cmd.c
index cf350ff4d..63a433e0c 100644
--- a/os/various/shell/shell_cmd.c
+++ b/os/various/shell/shell_cmd.c
@@ -32,6 +32,7 @@
 

 #if (SHELL_CMD_TEST_ENABLED == TRUE) || defined(__DOXYGEN__)

 #include "rt_test_root.h"

+#include "oslib_test_root.h"

 #endif

 

 /*===========================================================================*/

@@ -171,17 +172,38 @@ static void cmd_threads(BaseSequentialStream *chp, int argc, char *argv[]) {
 #endif

 

 #if (SHELL_CMD_TEST_ENABLED == TRUE) || defined(__DOXYGEN__)

+static THD_FUNCTION(test_rt, arg) {

+  BaseSequentialStream *chp = (BaseSequentialStream *)arg;

+  test_execute(chp, &rt_test_suite);

+}

+

+static THD_FUNCTION(test_oslib, arg) {

+  BaseSequentialStream *chp = (BaseSequentialStream *)arg;

+  test_execute(chp, &oslib_test_suite);

+}

+

 static void cmd_test(BaseSequentialStream *chp, int argc, char *argv[]) {

   thread_t *tp;

+  tfunc_t tfp;

 

   (void)argv;

-  if (argc > 0) {

-    shellUsage(chp, "test");

+  if (argc != 1) {

+    shellUsage(chp, "test rt|oslib");

+    return;

+  }

+  if (!strcmp(argv[0], "rt")) {

+    tfp = test_rt;

+  }

+  else if (!strcmp(argv[0], "oslib")) {

+    tfp = test_oslib;

+  }

+  else {

+    shellUsage(chp, "test rt|oslib");

     return;

   }

   tp = chThdCreateFromHeap(NULL, SHELL_CMD_TEST_WA_SIZE,

                            "test", chThdGetPriorityX(),

-                           (tfunc_t)test_execute, chp);

+                           tfp, chp);

   if (tp == NULL) {

     chprintf(chp, "out of memory"SHELL_NEWLINE_STR);

     return;