From c8cdb0941bea91018362a4c9bc9b0b7f3db14784 Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Sat, 4 Nov 2017 16:10:48 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10940
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 testhal/STM32/STM32L4xx/ADC/Makefile       | 4 ++--
 testhal/STM32/STM32L4xx/CAN/Makefile       | 4 ++--
 testhal/STM32/STM32L4xx/CAN/main.c         | 4 ++--
 testhal/STM32/STM32L4xx/GPT-ADC/Makefile   | 4 ++--
 testhal/STM32/STM32L4xx/IRQ_STORM/Makefile | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'testhal/STM32/STM32L4xx')

diff --git a/testhal/STM32/STM32L4xx/ADC/Makefile b/testhal/STM32/STM32L4xx/ADC/Makefile
index 15c3ccb9c..772a73dc2 100644
--- a/testhal/STM32/STM32L4xx/ADC/Makefile
+++ b/testhal/STM32/STM32L4xx/ADC/Makefile
@@ -99,8 +99,8 @@ include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.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/rt/rt_test.mk
+#include $(CHIBIOS)/test/oslib/oslib_test.mk
 
 # Define linker script file here
 LDSCRIPT= $(STARTUPLD)/STM32L476xG.ld
diff --git a/testhal/STM32/STM32L4xx/CAN/Makefile b/testhal/STM32/STM32L4xx/CAN/Makefile
index 15c3ccb9c..772a73dc2 100644
--- a/testhal/STM32/STM32L4xx/CAN/Makefile
+++ b/testhal/STM32/STM32L4xx/CAN/Makefile
@@ -99,8 +99,8 @@ include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.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/rt/rt_test.mk
+#include $(CHIBIOS)/test/oslib/oslib_test.mk
 
 # Define linker script file here
 LDSCRIPT= $(STARTUPLD)/STM32L476xG.ld
diff --git a/testhal/STM32/STM32L4xx/CAN/main.c b/testhal/STM32/STM32L4xx/CAN/main.c
index 809d5ab5e..5aaea86ec 100644
--- a/testhal/STM32/STM32L4xx/CAN/main.c
+++ b/testhal/STM32/STM32L4xx/CAN/main.c
@@ -48,7 +48,7 @@ static THD_FUNCTION(can_rx, p) {
   chRegSetThreadName("receiver");
   chEvtRegister(&cip->canp->rxfull_event, &el, 0);
   while(!chThdShouldTerminateX()) {
-    if (chEvtWaitAnyTimeout(ALL_EVENTS, MS2ST(100)) == 0)
+    if (chEvtWaitAnyTimeout(ALL_EVENTS, TIME_MS2I(100)) == 0)
       continue;
     while (canReceive(cip->canp, CAN_ANY_MAILBOX,
                       &rxmsg, TIME_IMMEDIATE) == MSG_OK) {
@@ -76,7 +76,7 @@ static THD_FUNCTION(can_tx, p) {
   txmsg.data32[1] = 0x00FF00FF;
 
   while (!chThdShouldTerminateX()) {
-    canTransmit(&CAND1, CAN_ANY_MAILBOX, &txmsg, MS2ST(100));
+    canTransmit(&CAND1, CAN_ANY_MAILBOX, &txmsg, TIME_MS2I(100));
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/testhal/STM32/STM32L4xx/GPT-ADC/Makefile b/testhal/STM32/STM32L4xx/GPT-ADC/Makefile
index 15c3ccb9c..772a73dc2 100644
--- a/testhal/STM32/STM32L4xx/GPT-ADC/Makefile
+++ b/testhal/STM32/STM32L4xx/GPT-ADC/Makefile
@@ -99,8 +99,8 @@ include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.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/rt/rt_test.mk
+#include $(CHIBIOS)/test/oslib/oslib_test.mk
 
 # Define linker script file here
 LDSCRIPT= $(STARTUPLD)/STM32L476xG.ld
diff --git a/testhal/STM32/STM32L4xx/IRQ_STORM/Makefile b/testhal/STM32/STM32L4xx/IRQ_STORM/Makefile
index 35f7fdd60..33623be13 100644
--- a/testhal/STM32/STM32L4xx/IRQ_STORM/Makefile
+++ b/testhal/STM32/STM32L4xx/IRQ_STORM/Makefile
@@ -99,8 +99,8 @@ include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.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/rt/rt_test.mk
+#include $(CHIBIOS)/test/oslib/oslib_test.mk
 
 # Define linker script file here
 LDSCRIPT= $(STARTUPLD)/STM32L476xG.ld
-- 
cgit v1.2.3