From 215138abcf29dd99fa4916c442a4626d3550777a Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Sat, 27 Feb 2016 16:22:37 +0000
Subject: Enhanced .ld files. Mass update of shell demos.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8963 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 demos/STM32/RT-STM32F103-MAPLEMINI/main.c                  | 1 -
 demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/main.c    | 2 +-
 demos/STM32/RT-STM32F103_INEMO_DISCOVERY/main.c            | 1 -
 demos/STM32/RT-STM32F407-DISCOVERY-MEMS/main.c             | 1 -
 demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/main.c | 2 +-
 demos/STM32/RT-STM32F429-DISCOVERY/main.c                  | 1 -
 demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/main.c  | 2 +-
 7 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'demos/STM32')

diff --git a/demos/STM32/RT-STM32F103-MAPLEMINI/main.c b/demos/STM32/RT-STM32F103-MAPLEMINI/main.c
index 5cde100ed..61135db78 100644
--- a/demos/STM32/RT-STM32F103-MAPLEMINI/main.c
+++ b/demos/STM32/RT-STM32F103-MAPLEMINI/main.c
@@ -153,7 +153,6 @@ int __attribute__((noreturn)) main(void) {
                                               "shell", NORMALPRIO + 1,
                                               shellThread, (void *)&shell_cfg1);
       chThdWait(shelltp);               /* Waiting termination.             */
-      chThdFreeToHeap(shelltp);         /* Returning memory to heap.        */
     }
     chThdSleepMilliseconds(1000);
   }
diff --git a/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/main.c b/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/main.c
index 50f0d2cdf..c14a5dd5b 100644
--- a/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/main.c
+++ b/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/main.c
@@ -236,7 +236,7 @@ static void ShellHandler(eventid_t id) {
 
   (void)id;
   if (chThdTerminatedX(shelltp)) {
-    chThdFreeToHeap(shelltp);         /* Returning memory to heap.        */
+    chThdWait(shelltp);                 /* Returning memory to heap.        */
     shelltp = NULL;
   }
 }
diff --git a/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/main.c b/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/main.c
index cb564126b..dde705852 100644
--- a/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/main.c
+++ b/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/main.c
@@ -153,7 +153,6 @@ int main(void) {
                                               "shell", NORMALPRIO + 1,
                                               shellThread, (void *)&shell_cfg1);
       chThdWait(shelltp);               /* Waiting termination.             */
-      chThdFreeToHeap(shelltp);         /* Returning memory to heap.        */
     }
     chThdSleepMilliseconds(1000);
   }
diff --git a/demos/STM32/RT-STM32F407-DISCOVERY-MEMS/main.c b/demos/STM32/RT-STM32F407-DISCOVERY-MEMS/main.c
index aa32b54ed..27910cb33 100644
--- a/demos/STM32/RT-STM32F407-DISCOVERY-MEMS/main.c
+++ b/demos/STM32/RT-STM32F407-DISCOVERY-MEMS/main.c
@@ -252,7 +252,6 @@ int main(void) {
                                               "shell", NORMALPRIO + 1,
                                               shellThread, (void *)&shell_cfg1);
       chThdWait(shelltp);               /* Waiting termination.             */
-      chThdFreeToHeap(shelltp);         /* Returning memory to heap.        */
     }
     chThdSleepMilliseconds(1000);
   }
diff --git a/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/main.c b/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/main.c
index 384cdb4b3..db8f9a9d6 100644
--- a/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/main.c
+++ b/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/main.c
@@ -239,7 +239,7 @@ static void ShellHandler(eventid_t id) {
 
   (void)id;
   if (chThdTerminatedX(shelltp)) {
-    chThdFreeToHeap(shelltp);         /* Returning memory to heap.        */
+    chThdWait(shelltp);                 /* Returning memory to heap.        */
     shelltp = NULL;
   }
 }
diff --git a/demos/STM32/RT-STM32F429-DISCOVERY/main.c b/demos/STM32/RT-STM32F429-DISCOVERY/main.c
index a78734b5b..7d368645b 100644
--- a/demos/STM32/RT-STM32F429-DISCOVERY/main.c
+++ b/demos/STM32/RT-STM32F429-DISCOVERY/main.c
@@ -127,7 +127,6 @@ int main(void) {
                                               "shell", NORMALPRIO + 1,
                                               shellThread, (void *)&shell_cfg1);
       chThdWait(shelltp);               /* Waiting termination.             */
-      chThdFreeToHeap(shelltp);         /* Returning memory to heap.        */
     }
     chThdSleepMilliseconds(1000);
   }
diff --git a/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/main.c b/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/main.c
index 498c23319..ff087583f 100644
--- a/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/main.c
+++ b/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/main.c
@@ -239,7 +239,7 @@ static void ShellHandler(eventid_t id) {
 
   (void)id;
   if (chThdTerminatedX(shelltp)) {
-    chThdFreeToHeap(shelltp);         /* Returning memory to heap.        */
+    chThdRelease(shelltp);
     shelltp = NULL;
   }
 }
-- 
cgit v1.2.3