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

---
 testhal/STM32/STM32F1xx/CAN/Makefile | 4 ++--
 testhal/STM32/STM32F1xx/CAN/main.c   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'testhal/STM32/STM32F1xx/CAN')

diff --git a/testhal/STM32/STM32F1xx/CAN/Makefile b/testhal/STM32/STM32F1xx/CAN/Makefile
index c136795b9..119141822 100644
--- a/testhal/STM32/STM32F1xx/CAN/Makefile
+++ b/testhal/STM32/STM32F1xx/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)/STM32F103xB.ld
diff --git a/testhal/STM32/STM32F1xx/CAN/main.c b/testhal/STM32/STM32F1xx/CAN/main.c
index 7b05c028d..2f8d1f42c 100644
--- a/testhal/STM32/STM32F1xx/CAN/main.c
+++ b/testhal/STM32/STM32F1xx/CAN/main.c
@@ -40,7 +40,7 @@ static THD_FUNCTION(can_rx, p) {
   chRegSetThreadName("receiver");
   chEvtRegister(&CAND1.rxfull_event, &el, 0);
   while (true) {
-    if (chEvtWaitAnyTimeout(ALL_EVENTS, MS2ST(100)) == 0)
+    if (chEvtWaitAnyTimeout(ALL_EVENTS, TIME_MS2I(100)) == 0)
       continue;
     while (canReceive(&CAND1, CAN_ANY_MAILBOX, &rxmsg, TIME_IMMEDIATE) == MSG_OK) {
       /* Process message.*/
@@ -67,7 +67,7 @@ static THD_FUNCTION(can_tx, p) {
   txmsg.data32[1] = 0x00FF00FF;
 
   while (true) {
-    canTransmit(&CAND1, CAN_ANY_MAILBOX, &txmsg, MS2ST(100));
+    canTransmit(&CAND1, CAN_ANY_MAILBOX, &txmsg, TIME_MS2I(100));
     chThdSleepMilliseconds(500);
   }
 }
-- 
cgit v1.2.3