1 files changed, 6 insertions, 6 deletions
diff --git a/testhal/STM32F30x/CAN/main.c b/testhal/STM32F30x/CAN/main.c
index c44acf566..27ba16bf7 100644
--- a/testhal/STM32F30x/CAN/main.c
+++ b/testhal/STM32F30x/CAN/main.c
@@ -30,18 +30,18 @@ static const CANConfig cancfg = {
 /*
  * Receiver thread.
  */
-static WORKING_AREA(can_rx_wa, 256);
+static THD_WORKING_AREA(can_rx_wa, 256);
 static msg_t can_rx(void *p) {
-  EventListener el;
+  event_listener_t el;
   CANRxFrame rxmsg;
 
   (void)p;
   chRegSetThreadName("receiver");
   chEvtRegister(&CAND1.rxfull_event, &el, 0);
-  while(!chThdShouldTerminate()) {
+  while(!chThdShouldTerminateX()) {
     if (chEvtWaitAnyTimeout(ALL_EVENTS, MS2ST(100)) == 0)
       continue;
-    while (canReceive(&CAND1, CAN_ANY_MAILBOX, &rxmsg, TIME_IMMEDIATE) == RDY_OK) {
+    while (canReceive(&CAND1, CAN_ANY_MAILBOX, &rxmsg, TIME_IMMEDIATE) == MSG_OK) {
       /* Process message.*/
       palTogglePad(GPIOE, GPIOE_LED3_RED);
     }
@@ -53,7 +53,7 @@ static msg_t can_rx(void *p) {
 /*
  * Transmitter thread.
  */
-static WORKING_AREA(can_tx_wa, 256);
+static THD_WORKING_AREA(can_tx_wa, 256);
 static msg_t can_tx(void * p) {
   CANTxFrame txmsg;
 
@@ -66,7 +66,7 @@ static msg_t can_tx(void * p) {
   txmsg.data32[0] = 0x55AA55AA;
   txmsg.data32[1] = 0x00FF00FF;
 
-  while (!chThdShouldTerminate()) {
+  while (!chThdShouldTerminateX()) {
     canTransmit(&CAND1, CAN_ANY_MAILBOX, &txmsg, MS2ST(100));
     chThdSleepMilliseconds(500);
   }