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

10 files changed, 21 insertions, 21 deletions

diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile b/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile
index aa4f4e0aa..e7d85605c 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile
@@ -5,19 +5,19 @@
 all:

 	@echo

 	@echo === Building for STM32F407-Olimex ==================================

-	@make --no-print-directory -f Makefile-stm32f407_olimex all

+	+@make --no-print-directory -f Makefile-stm32f407_olimex all

 	@echo ====================================================================

 	@echo

 	@echo === Building for STM32F746-Discovery ===============================

-	@make --no-print-directory -f Makefile-stm32f746_discovery all

+	+@make --no-print-directory -f Makefile-stm32f746_discovery all

 	@echo ====================================================================

 	@echo

 

 clean:

 	@echo

-	-@make --no-print-directory -f Makefile-stm32f407_olimex clean

+	+@make --no-print-directory -f Makefile-stm32f407_olimex clean

 	@echo

-	-@make --no-print-directory -f Makefile-stm32f746_discovery clean

+	+@make --no-print-directory -f Makefile-stm32f746_discovery clean

 	@echo

 

 #

diff --git a/demos/STM32/RT-STM32F031K6-NUCLEO32/Makefile b/demos/STM32/RT-STM32F031K6-NUCLEO32/Makefile
index 8a46fe43b..0c04646cc 100644
--- a/demos/STM32/RT-STM32F031K6-NUCLEO32/Makefile
+++ b/demos/STM32/RT-STM32F031K6-NUCLEO32/Makefile
@@ -100,7 +100,7 @@ include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk
 # Other files (optional).

 include $(CHIBIOS)/test/lib/test.mk

 include $(CHIBIOS)/test/rt/rt_test.mk

-include $(CHIBIOS)/test/oslib/oslib_test.mk

+#include $(CHIBIOS)/test/oslib/oslib_test.mk

 

 # Define linker script file here

 LDSCRIPT= $(STARTUPLD)/STM32F031x6.ld

diff --git a/demos/STM32/RT-STM32F031K6-NUCLEO32/main.c b/demos/STM32/RT-STM32F031K6-NUCLEO32/main.c
index aa0504184..bc5723384 100644
--- a/demos/STM32/RT-STM32F031K6-NUCLEO32/main.c
+++ b/demos/STM32/RT-STM32F031K6-NUCLEO32/main.c
@@ -17,7 +17,7 @@
 #include "ch.h"

 #include "hal.h"

 #include "rt_test_root.h"

-#include "oslib_test_root.h"

+//#include "oslib_test_root.h"

 

 /*

  * Green LED blinker thread, times are in milliseconds.

@@ -68,7 +68,7 @@ int main(void) {
   while (true) {

     if (!palReadLine(LINE_ARD_D3)) {

       test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);

-      test_execute((BaseSequentialStream *)&SD1, &oslib_test_suite);

+//      test_execute((BaseSequentialStream *)&SD1, &oslib_test_suite);

     }

     chThdSleepMilliseconds(500);

   }

diff --git a/demos/STM32/RT-STM32F042K6-NUCLEO32/Makefile b/demos/STM32/RT-STM32F042K6-NUCLEO32/Makefile
index 14d063217..4f22d408f 100644
--- a/demos/STM32/RT-STM32F042K6-NUCLEO32/Makefile
+++ b/demos/STM32/RT-STM32F042K6-NUCLEO32/Makefile
@@ -100,7 +100,7 @@ include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk
 # Other files (optional).

 include $(CHIBIOS)/test/lib/test.mk

 include $(CHIBIOS)/test/rt/rt_test.mk

-include $(CHIBIOS)/test/oslib/oslib_test.mk

+#include $(CHIBIOS)/test/oslib/oslib_test.mk

 

 # Define linker script file here

 LDSCRIPT= $(STARTUPLD)/STM32F042x6.ld

diff --git a/demos/STM32/RT-STM32F042K6-NUCLEO32/main.c b/demos/STM32/RT-STM32F042K6-NUCLEO32/main.c
index 9db2932f4..a9b66d3ee 100644
--- a/demos/STM32/RT-STM32F042K6-NUCLEO32/main.c
+++ b/demos/STM32/RT-STM32F042K6-NUCLEO32/main.c
@@ -17,7 +17,7 @@
 #include "ch.h"

 #include "hal.h"

 #include "rt_test_root.h"

-#include "oslib_test_root.h"

+//#include "oslib_test_root.h"

 

 /*

  * Green LED blinker thread, times are in milliseconds.

@@ -68,7 +68,7 @@ int main(void) {
   while (true) {

     if (!palReadLine(LINE_ARD_D3)) {

       test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);

-      test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);

+//      test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);

     }

     chThdSleepMilliseconds(500);

   }

diff --git a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/main.c b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/main.c
index 85f0e4a4f..b9b7289ba 100755
--- a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/main.c
+++ b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/main.c
@@ -72,7 +72,7 @@ static void tmrfunc(void *p) {
       chEvtBroadcastI(&removed_event);

     }

   }

-  chVTSetI(&tmr, MS2ST(POLLING_DELAY), tmrfunc, bbdp);

+  chVTSetI(&tmr, TIME_MS2I(POLLING_DELAY), tmrfunc, bbdp);

   chSysUnlockFromISR();

 }

 

@@ -89,7 +89,7 @@ static void tmr_init(void *p) {
   chEvtObjectInit(&removed_event);

   chSysLock();

   cnt = POLLING_INTERVAL;

-  chVTSetI(&tmr, MS2ST(POLLING_DELAY), tmrfunc, p);

+  chVTSetI(&tmr, TIME_MS2I(POLLING_DELAY), tmrfunc, p);

   chSysUnlock();

 }

 

@@ -323,6 +323,6 @@ int main(void) {
                                     "shell", NORMALPRIO + 1,

                                     shellThread, (void *)&shell_cfg1);

     }

-    chEvtDispatch(evhndl, chEvtWaitOneTimeout(ALL_EVENTS, MS2ST(500)));

+    chEvtDispatch(evhndl, chEvtWaitOneTimeout(ALL_EVENTS, TIME_MS2I(500)));

   }

 }

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 ec91f939a..fa411e5ec 100644
--- a/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/main.c
+++ b/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/main.c
@@ -75,7 +75,7 @@ static void tmrfunc(void *p) {
       chEvtBroadcastI(&removed_event);

     }

   }

-  chVTSetI(&tmr, MS2ST(POLLING_DELAY), tmrfunc, bbdp);

+  chVTSetI(&tmr, TIME_MS2I(POLLING_DELAY), tmrfunc, bbdp);

   chSysUnlockFromISR();

 }

 

@@ -92,7 +92,7 @@ static void tmr_init(void *p) {
   chEvtObjectInit(&removed_event);

   chSysLock();

   cnt = POLLING_INTERVAL;

-  chVTSetI(&tmr, MS2ST(POLLING_DELAY), tmrfunc, p);

+  chVTSetI(&tmr, TIME_MS2I(POLLING_DELAY), tmrfunc, p);

   chSysUnlock();

 }

 

@@ -321,6 +321,6 @@ int main(void) {
                                     "shell", NORMALPRIO + 1,

                                     shellThread, (void *)&shell_cfg1);

     }

-    chEvtDispatch(evhndl, chEvtWaitOneTimeout(ALL_EVENTS, MS2ST(500)));

+    chEvtDispatch(evhndl, chEvtWaitOneTimeout(ALL_EVENTS, TIME_MS2I(500)));

   }

 }

diff --git a/demos/STM32/RT-STM32F407-DISCOVERY-G++/main.cpp b/demos/STM32/RT-STM32F407-DISCOVERY-G++/main.cpp
index 67868c5bc..5ebcdc852 100644
--- a/demos/STM32/RT-STM32F407-DISCOVERY-G++/main.cpp
+++ b/demos/STM32/RT-STM32F407-DISCOVERY-G++/main.cpp
@@ -95,7 +95,7 @@ protected:
     while (true) {
       switch(curr->action) {
       case SLEEP:
-        sleep(MS2ST(curr->value));
+        sleep(TIME_MS2I(curr->value));
         break;
       case GOTO:
         curr = &base[curr->value];
@@ -187,7 +187,7 @@ int main(void) {
       tester.start(NORMALPRIO);
       tester.wait();
     };
-    BaseThread::sleep(MS2ST(500));
+    BaseThread::sleep(TIME_MS2I(500));
   }
 
   return 0;
diff --git a/demos/STM32/RT-STM32L031K6-NUCLEO32/Makefile b/demos/STM32/RT-STM32L031K6-NUCLEO32/Makefile
index 19d5a0ea1..9552c31d8 100644
--- a/demos/STM32/RT-STM32L031K6-NUCLEO32/Makefile
+++ b/demos/STM32/RT-STM32L031K6-NUCLEO32/Makefile
@@ -100,7 +100,7 @@ include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk
 # Other files (optional).

 include $(CHIBIOS)/test/lib/test.mk

 include $(CHIBIOS)/test/rt/rt_test.mk

-include $(CHIBIOS)/test/oslib/oslib_test.mk

+#include $(CHIBIOS)/test/oslib/oslib_test.mk

 

 # Define linker script file here

 LDSCRIPT= $(STARTUPLD)/STM32L031x6.ld

diff --git a/demos/STM32/RT-STM32L031K6-NUCLEO32/main.c b/demos/STM32/RT-STM32L031K6-NUCLEO32/main.c
index 9db2932f4..a7311819a 100644
--- a/demos/STM32/RT-STM32L031K6-NUCLEO32/main.c
+++ b/demos/STM32/RT-STM32L031K6-NUCLEO32/main.c
@@ -17,7 +17,7 @@
 #include "ch.h"

 #include "hal.h"

 #include "rt_test_root.h"

-#include "oslib_test_root.h"

+//#include "oslib_test_root.h"

 

 /*

  * Green LED blinker thread, times are in milliseconds.

@@ -68,7 +68,7 @@ int main(void) {
   while (true) {

     if (!palReadLine(LINE_ARD_D3)) {

       test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);

-      test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);

+ //     test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);

     }

     chThdSleepMilliseconds(500);

   }