diff options
| author | Fabio Utzig <utzig@utzig.org> | 2016-04-05 07:33:03 -0300 |
|---|---|---|
| committer | Fabio Utzig <utzig@utzig.org> | 2016-04-05 07:33:03 -0300 |
| commit | a193ca0bcbe5c2fd20cfddbc714140e9646b226e (patch) | |
| tree | 7a70a02cc15e6898ae227a52294e659e07ad71ed | |
| parent | 8514bc2c23dcaa3f0c72b5956861b70e0c6a5eaa (diff) | |
| parent | 8bd60ee894cf20b28bd21a8cdc9c51d525547910 (diff) | |
| download | ChibiOS-Contrib-a193ca0bcbe5c2fd20cfddbc714140e9646b226e.tar.gz ChibiOS-Contrib-a193ca0bcbe5c2fd20cfddbc714140e9646b226e.tar.bz2 ChibiOS-Contrib-a193ca0bcbe5c2fd20cfddbc714140e9646b226e.zip | |
Merge pull request #51 from utzig/fix-kinetis-test-thd
Fix kinetis test thd
| -rw-r--r-- | demos/KINETIS/RT-FREEDOM-K20D50M/main.c | 4 | ||||
| -rw-r--r-- | demos/KINETIS/RT-FREEDOM-KL25Z/main.c | 4 | ||||
| -rw-r--r-- | demos/KINETIS/RT-TEENSY3/main.c | 4 | ||||
| -rw-r--r-- | testhal/KINETIS/FRDM-K20D50M/USB_SERIAL/main.c | 1 | ||||
| -rw-r--r-- | testhal/KINETIS/FRDM-KL25Z/USB_SERIAL/chconf.h | 2 | ||||
| -rw-r--r-- | testhal/KINETIS/FRDM-KL25Z/USB_SERIAL/main.c | 1 | ||||
| -rw-r--r-- | testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/chconf.h | 2 | ||||
| -rw-r--r-- | testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/main.c | 1 | ||||
| -rw-r--r-- | testhal/KINETIS/MCHCK/USB_SERIAL/main.c | 1 | ||||
| -rw-r--r-- | testhal/KINETIS/TEENSY3_x/USB_SERIAL/main.c | 1 |
10 files changed, 8 insertions, 13 deletions
diff --git a/demos/KINETIS/RT-FREEDOM-K20D50M/main.c b/demos/KINETIS/RT-FREEDOM-K20D50M/main.c index 9a2ca0e..558e7ad 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 d565ca0..479356c 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 ebeb637..42d6510 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);
}
diff --git a/testhal/KINETIS/FRDM-K20D50M/USB_SERIAL/main.c b/testhal/KINETIS/FRDM-K20D50M/USB_SERIAL/main.c index c90e014..616c7c6 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 a185ac6..7b54de5 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 103991a..897dc58 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 48f3aae..c7ed185 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 103991a..897dc58 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 62771c9..56e02af 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 3553c6b..3ede0a2 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"
|