From d7ceec1a01ad9c100bac9daf555c6eafe46e793b Mon Sep 17 00:00:00 2001 From: Fabio Utzig Date: Mon, 4 Apr 2016 22:18:58 -0300 Subject: [PATCH 1/2] Fix test thread usage --- demos/KINETIS/RT-FREEDOM-K20D50M/main.c | 4 ++-- demos/KINETIS/RT-FREEDOM-KL25Z/main.c | 4 ++-- demos/KINETIS/RT-TEENSY3/main.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/demos/KINETIS/RT-FREEDOM-K20D50M/main.c b/demos/KINETIS/RT-FREEDOM-K20D50M/main.c index 9a2ca0eb..558e7adb 100644 --- a/demos/KINETIS/RT-FREEDOM-K20D50M/main.c +++ b/demos/KINETIS/RT-FREEDOM-K20D50M/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" static THD_WORKING_AREA(waThread1, 64); static THD_FUNCTION(Thread1, arg) { @@ -78,7 +78,7 @@ int main(void) { chThdCreateStatic(waThread2, sizeof(waThread2), NORMALPRIO, Thread2, NULL); chThdCreateStatic(waThread3, sizeof(waThread3), NORMALPRIO, Thread3, NULL); - TestThread(&SD1); + test_execute((BaseSequentialStream *)&SD1); while (1) { chThdSleepMilliseconds(500); } diff --git a/demos/KINETIS/RT-FREEDOM-KL25Z/main.c b/demos/KINETIS/RT-FREEDOM-KL25Z/main.c index d565ca04..479356c5 100644 --- a/demos/KINETIS/RT-FREEDOM-KL25Z/main.c +++ b/demos/KINETIS/RT-FREEDOM-KL25Z/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" static THD_WORKING_AREA(waThread1, 64); static THD_FUNCTION(Thread1, arg) { @@ -78,7 +78,7 @@ int main(void) { chThdCreateStatic(waThread2, sizeof(waThread2), NORMALPRIO, Thread2, NULL); chThdCreateStatic(waThread3, sizeof(waThread3), NORMALPRIO, Thread3, NULL); - TestThread(&SD1); + test_execute((BaseSequentialStream *)&SD1); while (1) { chThdSleepMilliseconds(500); } diff --git a/demos/KINETIS/RT-TEENSY3/main.c b/demos/KINETIS/RT-TEENSY3/main.c index ebeb6374..42d6510a 100644 --- a/demos/KINETIS/RT-TEENSY3/main.c +++ b/demos/KINETIS/RT-TEENSY3/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" /* * LED blinker thread. @@ -57,7 +57,7 @@ int main(void) { */ chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL); - TestThread(&SD1); + test_execute((BaseSequentialStream *)&SD1); while (true) { chThdSleepMilliseconds(1000); } From 8bd60ee894cf20b28bd21a8cdc9c51d525547910 Mon Sep 17 00:00:00 2001 From: Fabio Utzig Date: Mon, 4 Apr 2016 22:40:32 -0300 Subject: [PATCH 2/2] Fix testhal test thd usage --- testhal/KINETIS/FRDM-K20D50M/USB_SERIAL/main.c | 1 - testhal/KINETIS/FRDM-KL25Z/USB_SERIAL/chconf.h | 2 +- testhal/KINETIS/FRDM-KL25Z/USB_SERIAL/main.c | 1 - testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/chconf.h | 2 +- testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/main.c | 1 - testhal/KINETIS/MCHCK/USB_SERIAL/main.c | 1 - testhal/KINETIS/TEENSY3_x/USB_SERIAL/main.c | 1 - 7 files changed, 2 insertions(+), 7 deletions(-) diff --git a/testhal/KINETIS/FRDM-K20D50M/USB_SERIAL/main.c b/testhal/KINETIS/FRDM-K20D50M/USB_SERIAL/main.c index c90e014c..616c7c68 100644 --- a/testhal/KINETIS/FRDM-K20D50M/USB_SERIAL/main.c +++ b/testhal/KINETIS/FRDM-K20D50M/USB_SERIAL/main.c @@ -20,7 +20,6 @@ #include "ch.h" #include "hal.h" -#include "test.h" #include "shell.h" #include "chprintf.h" diff --git a/testhal/KINETIS/FRDM-KL25Z/USB_SERIAL/chconf.h b/testhal/KINETIS/FRDM-KL25Z/USB_SERIAL/chconf.h index a185ac6c..7b54de5d 100644 --- a/testhal/KINETIS/FRDM-KL25Z/USB_SERIAL/chconf.h +++ b/testhal/KINETIS/FRDM-KL25Z/USB_SERIAL/chconf.h @@ -366,7 +366,7 @@ * @note The default failure mode is to halt the system with the global * @p panic_msg variable set to @p NULL. */ -#define CH_DBG_ENABLE_STACK_CHECK TRUE +#define CH_DBG_ENABLE_STACK_CHECK FALSE /** * @brief Debug option, stacks initialization. diff --git a/testhal/KINETIS/FRDM-KL25Z/USB_SERIAL/main.c b/testhal/KINETIS/FRDM-KL25Z/USB_SERIAL/main.c index 103991ad..897dc58e 100644 --- a/testhal/KINETIS/FRDM-KL25Z/USB_SERIAL/main.c +++ b/testhal/KINETIS/FRDM-KL25Z/USB_SERIAL/main.c @@ -20,7 +20,6 @@ #include "ch.h" #include "hal.h" -#include "test.h" #include "shell.h" #include "chprintf.h" diff --git a/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/chconf.h b/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/chconf.h index 48f3aae3..c7ed1854 100644 --- a/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/chconf.h +++ b/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/chconf.h @@ -366,7 +366,7 @@ * @note The default failure mode is to halt the system with the global * @p panic_msg variable set to @p NULL. */ -#define CH_DBG_ENABLE_STACK_CHECK TRUE +#define CH_DBG_ENABLE_STACK_CHECK FALSE /** * @brief Debug option, stacks initialization. diff --git a/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/main.c b/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/main.c index 103991ad..897dc58e 100644 --- a/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/main.c +++ b/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/main.c @@ -20,7 +20,6 @@ #include "ch.h" #include "hal.h" -#include "test.h" #include "shell.h" #include "chprintf.h" diff --git a/testhal/KINETIS/MCHCK/USB_SERIAL/main.c b/testhal/KINETIS/MCHCK/USB_SERIAL/main.c index 62771c9c..56e02af2 100644 --- a/testhal/KINETIS/MCHCK/USB_SERIAL/main.c +++ b/testhal/KINETIS/MCHCK/USB_SERIAL/main.c @@ -20,7 +20,6 @@ #include "ch.h" #include "hal.h" -#include "test.h" #include "shell.h" #include "chprintf.h" diff --git a/testhal/KINETIS/TEENSY3_x/USB_SERIAL/main.c b/testhal/KINETIS/TEENSY3_x/USB_SERIAL/main.c index 3553c6b7..3ede0a2c 100644 --- a/testhal/KINETIS/TEENSY3_x/USB_SERIAL/main.c +++ b/testhal/KINETIS/TEENSY3_x/USB_SERIAL/main.c @@ -20,7 +20,6 @@ #include "ch.h" #include "hal.h" -#include "test.h" #include "shell.h" #include "chprintf.h"