update stm32 demo and testhal projects to upstream chibios

1 files changed, 2 insertions, 63 deletions

diff --git a/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/main.c b/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/main.c
index 25ffd87..a7a33f6 100644
--- a/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/main.c
+++ b/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/main.c
@@ -16,7 +16,6 @@
 

 #include "ch.h"

 #include "hal.h"

-#include "test.h"

 

 #include "chprintf.h"

 #include "shell.h"

@@ -197,63 +196,6 @@ static THD_FUNCTION(writer_thread, arg) {
 #define SHELL_WA_SIZE   THD_WORKING_AREA_SIZE(2048)

 #define TEST_WA_SIZE    THD_WORKING_AREA_SIZE(256)

 

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

-

-  size_t n, size;

-  (void)argv;

-

-  if (argc > 0) {

-    chprintf(chp, "Usage: mem\r\n");

-    return;

-  }

-

-  n = chHeapStatus(NULL, &size);

-  chprintf(chp, "core free memory : %u bytes\r\n", chCoreGetStatusX());

-  chprintf(chp, "heap fragments   : %u\r\n", n);

-  chprintf(chp, "heap free total  : %u bytes\r\n", size);

-}

-

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

-

-  static const char *states[] = {CH_STATE_NAMES};

-  thread_t *tp;

-  (void)argv;

-

-  if (argc > 0) {

-    chprintf(chp, "Usage: threads\r\n");

-    return;

-  }

-

-  chprintf(chp, "    addr    stack prio refs     state name\r\n");

-  tp = chRegFirstThread();

-  do {

-    chprintf(chp, "%08lx %08lx %4lu %4lu %9s %s\r\n",

-            (uint32_t)tp, (uint32_t)tp->p_ctx.r13,

-            (uint32_t)tp->p_prio, (uint32_t)(tp->p_refs - 1),

-            states[tp->p_state], tp->p_name);

-    tp = chRegNextThread(tp);

-  } while (tp != NULL);

-}

-

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

-

-  thread_t *tp;

-  (void)argv;

-

-  if (argc > 0) {

-    chprintf(chp, "Usage: test\r\n");

-    return;

-  }

-

-  tp = chThdCreateFromHeap(NULL, TEST_WA_SIZE, chThdGetPriorityX(),

-                           TestThread, chp);

-  if (tp == NULL) {

-    chprintf(chp, "out of memory\r\n");

-    return;

-  }

-  chThdWait(tp);

-}

-

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

 

   (void)argv;

@@ -444,9 +386,6 @@ static void cmd_params(BaseSequentialStream *chp, int argc, char *argv[]) {
 }

 

 static const ShellCommand commands[] = {

-  {"mem", cmd_mem},

-  {"threads", cmd_threads},

-  {"test", cmd_test},

   {"reset", cmd_reset},

   {"run", cmd_run},

   {"stop", cmd_stop},

@@ -530,10 +469,10 @@ int main(void) {
 #if (HAL_USE_SERIAL_USB == TRUE)

       if (SDU1.config->usbp->state == USB_ACTIVE) {

         /* Spawns a new shell.*/

-        shelltp = shellCreate(&shell_cfg1, SHELL_WA_SIZE, NORMALPRIO);

+        shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE, "shell", NORMALPRIO, shellThread, (void *) &shell_cfg1);

       }

 #else

-      shelltp = shellCreate(&shell_cfg1, SHELL_WA_SIZE, NORMALPRIO);

+      shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE, "shell", NORMALPRIO, shellThread, (void *) &shell_cfg1);

 #endif

     }

     else {