From ae3021458a60832178b9ed70b502b8178918aea8 Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Sun, 5 Apr 2015 10:32:38 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7856
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 demos/STM32/RT-STM32F407-DISCOVERY-G++/Makefile               |  2 +-
 ...RT-STM32F407-DISCOVERY-G++ (OpenOCD, Flash and Run).launch |  2 +-
 demos/STM32/RT-STM32F407-DISCOVERY-G++/main.cpp               | 11 ++++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'demos/STM32')

diff --git a/demos/STM32/RT-STM32F407-DISCOVERY-G++/Makefile b/demos/STM32/RT-STM32F407-DISCOVERY-G++/Makefile
index b1883dcb1..84ec63f29 100644
--- a/demos/STM32/RT-STM32F407-DISCOVERY-G++/Makefile
+++ b/demos/STM32/RT-STM32F407-DISCOVERY-G++/Makefile
@@ -30,7 +30,7 @@ endif
 
 # Enable this if you want link time optimizations (LTO)
 ifeq ($(USE_LTO),)
-  USE_LTO = yes
+  USE_LTO = no
 endif
 
 # If enabled, this option allows to compile the application in THUMB mode.
diff --git a/demos/STM32/RT-STM32F407-DISCOVERY-G++/debug/RT-STM32F407-DISCOVERY-G++ (OpenOCD, Flash and Run).launch b/demos/STM32/RT-STM32F407-DISCOVERY-G++/debug/RT-STM32F407-DISCOVERY-G++ (OpenOCD, Flash and Run).launch
index 34c552911..3d650c74d 100644
--- a/demos/STM32/RT-STM32F407-DISCOVERY-G++/debug/RT-STM32F407-DISCOVERY-G++ (OpenOCD, Flash and Run).launch	
+++ b/demos/STM32/RT-STM32F407-DISCOVERY-G++/debug/RT-STM32F407-DISCOVERY-G++ (OpenOCD, Flash and Run).launch	
@@ -41,7 +41,7 @@
 <booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
 <stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="0.114656749"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/RT-STM32F407-DISCOVERY-G++/>
+<listEntry value="/RT-STM32F407-DISCOVERY-G++"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="4"/>
diff --git a/demos/STM32/RT-STM32F407-DISCOVERY-G++/main.cpp b/demos/STM32/RT-STM32F407-DISCOVERY-G++/main.cpp
index 36ac8a8c7..aa80f83a3 100644
--- a/demos/STM32/RT-STM32F407-DISCOVERY-G++/main.cpp
+++ b/demos/STM32/RT-STM32F407-DISCOVERY-G++/main.cpp
@@ -87,20 +87,20 @@ private:
   const seqop_t *base, *curr;                   // Thread local variables.
 
 protected:
-  virtual msg_t main(void) {
+  virtual void main(void) {
 
     setName("sequencer");
 
     while (true) {
       switch(curr->action) {
       case SLEEP:
-        sleep(curr->value);
+        sleep(MS2ST(curr->value));
         break;
       case GOTO:
         curr = &base[curr->value];
         continue;
       case STOP:
-        return 0;
+        return;
       case BITCLEAR:
         palClearPort(GPIOD, curr->value);
         break;
@@ -125,11 +125,12 @@ public:
 class TesterThread : public BaseStaticThread<256> {
 
 protected:
-  virtual msg_t main(void) {
+  virtual void main(void) {
 
     setName("tester");
 
-    return TestThread(&SD2);
+    TestThread(&SD2);
+    exit(test_global_fail);
   }
 
 public:
-- 
cgit v1.2.3