2 files changed, 3 insertions, 6 deletions
diff --git a/testhal/AVR/I2C/main.c b/testhal/AVR/I2C/main.c
index fc68956c3..50d979693 100644
--- a/testhal/AVR/I2C/main.c
+++ b/testhal/AVR/I2C/main.c
@@ -20,11 +20,10 @@
 static WORKING_AREA(waThread1, 32);
 static msg_t Thread1(void *arg) {
 
-  while (TRUE) {
+  while (true) {
     palTogglePad(IOPORT2, PORTB_LED1);
     chThdSleepMilliseconds(1000);
   }
-  return 0;
 }
 
 /*
diff --git a/testhal/AVR/ICU/main.c b/testhal/AVR/ICU/main.c
index 2cbe1db2e..3faaed2ee 100644
--- a/testhal/AVR/ICU/main.c
+++ b/testhal/AVR/ICU/main.c
@@ -58,7 +58,7 @@ void output_single_cycle(const uint16_t low, const uint16_t high) {
 }
 
 static WORKING_AREA(waThread1, 64);
-static msg_t Thread1(void *arg) {
+static THD_FUNCTION(Thread1, arg) {
 
   BaseSequentialStream *serp = (BaseSequentialStream *) &SD1;
   thread1 = chThdGetSelfX();
@@ -71,11 +71,10 @@ static msg_t Thread1(void *arg) {
                    period);
     chEvtSignal(thread_main, (eventmask_t) 1);
   }
-  return 0;
 }
 
 static WORKING_AREA(waThread2, 64);
-static msg_t Thread2(void *arg) {
+static THD_FUNCTION(Thread2, arg) {
 
   BaseSequentialStream *serp = (BaseSequentialStream *) &SD1;
   thread2 = chThdGetSelfX();
@@ -84,7 +83,6 @@ static msg_t Thread2(void *arg) {
     chprintf(serp, "OVERFLOW\r\n");
     chEvtSignal(thread_main, (eventmask_t) 2);
   }
-  return 0;
 }
 
 int main(void) {