From aed82faf72f86bfdca6568102953239116ba90c1 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sat, 2 Apr 2016 07:11:56 +0000 Subject: [PATCH] Fixed calls to test suite in all applications. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9202 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/AVR/RT-ARDUINOMEGA/main.c | 4 +- demos/KINETIS/RT-FREEDOM-K20D50M/main.c | 4 +- demos/KINETIS/RT-FREEDOM-KL25Z/main.c | 4 +- demos/KINETIS/RT-TEENSY3/main.c | 4 +- demos/LPC21xx/RT-LPC214x-OLIMEX/main.c | 4 +- demos/SPC5/RT-SPC560B-EVB/main.c | 2 +- demos/SPC5/RT-SPC560D-EVB/main.c | 2 +- demos/SPC5/RT-SPC560P-EVB/main.c | 2 +- demos/SPC5/RT-SPC563M-EVB/main.c | 2 +- demos/SPC5/RT-SPC564A-EVB/main.c | 2 +- demos/SPC5/RT-SPC56EC-EVB/main.c | 2 +- demos/SPC5/RT-SPC56EL-EVB/main.c | 2 +- demos/STM32/RT-STM32F030R8-NUCLEO/main.c | 4 +- demos/STM32/RT-STM32F031K6-NUCLEO32/main.c | 4 +- demos/STM32/RT-STM32F042K6-NUCLEO32/main.c | 4 +- demos/STM32/RT-STM32F051-DISCOVERY/main.c | 4 +- demos/STM32/RT-STM32F072-DISCOVERY/main.c | 4 +- demos/STM32/RT-STM32F072RB-NUCLEO/main.c | 4 +- demos/STM32/RT-STM32F091RC-NUCLEO/main.c | 4 +- demos/STM32/RT-STM32F100-DISCOVERY/main.c | 4 +- demos/STM32/RT-STM32F103-MAPLEMINI/chconf.h | 2 + demos/STM32/RT-STM32F103-MAPLEMINI/main.c | 2 +- .../RT-STM32F103-OLIMEX_STM32_P103/main.c | 4 +- .../main.c | 2 +- demos/STM32/RT-STM32F103RB-NUCLEO/main.c | 4 +- .../STM32/RT-STM32F103_INEMO_DISCOVERY/main.c | 2 +- demos/STM32/RT-STM32F207-DISCOVERY/main.c | 4 +- demos/STM32/RT-STM32F302R8-NUCLEO/main.c | 4 +- demos/STM32/RT-STM32F303-DISCOVERY/main.c | 4 +- demos/STM32/RT-STM32F303K8-NUCLEO32/main.c | 4 +- demos/STM32/RT-STM32F334-DISCOVERY/main.c | 4 +- demos/STM32/RT-STM32F334R8-NUCLEO/main.c | 4 +- .../STM32/RT-STM32F373-STM32373C_EVAL/main.c | 4 +- demos/STM32/RT-STM32F401C-DISCOVERY/main.c | 4 +- demos/STM32/RT-STM32F401RE-NUCLEO/main.c | 4 +- .../STM32/RT-STM32F407-DISCOVERY-G++/main.cpp | 4 +- .../STM32/RT-STM32F407-DISCOVERY-MEMS/main.c | 2 +- demos/STM32/RT-STM32F407-DISCOVERY/main.c | 4 +- .../main.c | 2 +- demos/STM32/RT-STM32F411RE-NUCLEO/main.c | 4 +- demos/STM32/RT-STM32F429-DISCOVERY/main.c | 2 +- .../main.c | 2 +- demos/STM32/RT-STM32L053R8-NUCLEO/main.c | 4 +- demos/STM32/RT-STM32L152-DISCOVERY/main.c | 4 +- demos/STM32/RT-STM32L152RE-NUCLEO/main.c | 4 +- demos/STM32/RT-STM32L476-DISCOVERY/main.c | 4 +- demos/STM32/RT-STM32L476RG-NUCLEO/main.c | 4 +- demos/various/RT-Win32-Simulator/main.c | 2 +- os/common/ports/ARM/compilers/GCC/chtypes.h | 5 ++ .../ports/ARMCMx/compilers/IAR/chtypes.h | 5 ++ .../ports/ARMCMx/compilers/RVCT/chtypes.h | 5 ++ .../ports/SIMIA32/compilers/GCC/chtypes.h | 5 ++ os/common/ports/e200/compilers/CW/chtypes.h | 10 ++++ os/common/ports/e200/compilers/GCC/chtypes.h | 10 ++++ .../ld/STM32F103xB_maplemini_bootloader.ld | 55 +++++++++++++++---- os/hal/ports/LPC/LPC214x/serial_lld.c | 8 +-- os/various/shell/shell_cmd.c | 4 +- test/lib/ch_test.c | 24 ++++---- test/lib/ch_test.h | 1 + 59 files changed, 187 insertions(+), 105 deletions(-) diff --git a/demos/AVR/RT-ARDUINOMEGA/main.c b/demos/AVR/RT-ARDUINOMEGA/main.c index a22e473c6..54b3f9c32 100644 --- a/demos/AVR/RT-ARDUINOMEGA/main.c +++ b/demos/AVR/RT-ARDUINOMEGA/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" static WORKING_AREA(waThread1, 32); static THD_FUNCTION(Thread1, arg) { @@ -56,7 +56,7 @@ int main(void) { */ chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL); - TestThread(&SD1); + test_execute((BaseSequentialStream *)&SD1); while(TRUE) { chThdSleepMilliseconds(1000); } diff --git a/demos/KINETIS/RT-FREEDOM-K20D50M/main.c b/demos/KINETIS/RT-FREEDOM-K20D50M/main.c index 45ace9ca9..1c0a91506 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 2ae990ac7..d260e8b3c 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 4606e2832..803fbda68 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/demos/LPC21xx/RT-LPC214x-OLIMEX/main.c b/demos/LPC21xx/RT-LPC214x-OLIMEX/main.c index ca271023a..761a7257d 100644 --- a/demos/LPC21xx/RT-LPC214x-OLIMEX/main.c +++ b/demos/LPC21xx/RT-LPC214x-OLIMEX/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" #define BOTH_BUTTONS (PAL_PORT_BIT(PA_BUTTON1) | PAL_PORT_BIT(PA_BUTTON2)) @@ -90,7 +90,7 @@ int main(void) { if (!palReadPad(IOPORT1, PA_BUTTON1)) sdWrite(&SD1, (uint8_t *)"Hello World!\r\n", 14); if (!palReadPad(IOPORT1, PA_BUTTON2)) - TestThread(&SD1); + test_execute((BaseSequentialStream *)&SD1); chThdSleepMilliseconds(500); } return 0; diff --git a/demos/SPC5/RT-SPC560B-EVB/main.c b/demos/SPC5/RT-SPC560B-EVB/main.c index af99d63bb..af1f4441b 100644 --- a/demos/SPC5/RT-SPC560B-EVB/main.c +++ b/demos/SPC5/RT-SPC560B-EVB/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" #include "shell.h" #include "chprintf.h" diff --git a/demos/SPC5/RT-SPC560D-EVB/main.c b/demos/SPC5/RT-SPC560D-EVB/main.c index 225feff93..427ddbcf3 100644 --- a/demos/SPC5/RT-SPC560D-EVB/main.c +++ b/demos/SPC5/RT-SPC560D-EVB/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" #include "shell.h" #include "chprintf.h" diff --git a/demos/SPC5/RT-SPC560P-EVB/main.c b/demos/SPC5/RT-SPC560P-EVB/main.c index 093270776..92aaf6769 100644 --- a/demos/SPC5/RT-SPC560P-EVB/main.c +++ b/demos/SPC5/RT-SPC560P-EVB/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" #include "shell.h" #include "chprintf.h" diff --git a/demos/SPC5/RT-SPC563M-EVB/main.c b/demos/SPC5/RT-SPC563M-EVB/main.c index e0f81ba6d..448c43705 100644 --- a/demos/SPC5/RT-SPC563M-EVB/main.c +++ b/demos/SPC5/RT-SPC563M-EVB/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" #include "shell.h" #include "chprintf.h" diff --git a/demos/SPC5/RT-SPC564A-EVB/main.c b/demos/SPC5/RT-SPC564A-EVB/main.c index e0f81ba6d..448c43705 100644 --- a/demos/SPC5/RT-SPC564A-EVB/main.c +++ b/demos/SPC5/RT-SPC564A-EVB/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" #include "shell.h" #include "chprintf.h" diff --git a/demos/SPC5/RT-SPC56EC-EVB/main.c b/demos/SPC5/RT-SPC56EC-EVB/main.c index 225feff93..427ddbcf3 100644 --- a/demos/SPC5/RT-SPC56EC-EVB/main.c +++ b/demos/SPC5/RT-SPC56EC-EVB/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" #include "shell.h" #include "chprintf.h" diff --git a/demos/SPC5/RT-SPC56EL-EVB/main.c b/demos/SPC5/RT-SPC56EL-EVB/main.c index 093270776..92aaf6769 100644 --- a/demos/SPC5/RT-SPC56EL-EVB/main.c +++ b/demos/SPC5/RT-SPC56EL-EVB/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" #include "shell.h" #include "chprintf.h" diff --git a/demos/STM32/RT-STM32F030R8-NUCLEO/main.c b/demos/STM32/RT-STM32F030R8-NUCLEO/main.c index 43a46a071..00057b532 100644 --- a/demos/STM32/RT-STM32F030R8-NUCLEO/main.c +++ b/demos/STM32/RT-STM32F030R8-NUCLEO/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" /* * Green LED blinker thread, times are in milliseconds. @@ -65,7 +65,7 @@ int main(void) { */ while (true) { if (!palReadPad(GPIOC, GPIOC_BUTTON)) - TestThread(&SD2); + test_execute((BaseSequentialStream *)&SD2); chThdSleepMilliseconds(500); } } diff --git a/demos/STM32/RT-STM32F031K6-NUCLEO32/main.c b/demos/STM32/RT-STM32F031K6-NUCLEO32/main.c index 3dd4caa35..c4441b352 100644 --- a/demos/STM32/RT-STM32F031K6-NUCLEO32/main.c +++ b/demos/STM32/RT-STM32F031K6-NUCLEO32/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" /* * Green LED blinker thread, times are in milliseconds. @@ -66,7 +66,7 @@ int main(void) { */ while (true) { if (!palReadLine(LINE_ARD_D3)) - TestThread(&SD1); + test_execute((BaseSequentialStream *)&SD1); chThdSleepMilliseconds(500); } } diff --git a/demos/STM32/RT-STM32F042K6-NUCLEO32/main.c b/demos/STM32/RT-STM32F042K6-NUCLEO32/main.c index 0c32bc4d9..e8272659a 100644 --- a/demos/STM32/RT-STM32F042K6-NUCLEO32/main.c +++ b/demos/STM32/RT-STM32F042K6-NUCLEO32/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" /* * Green LED blinker thread, times are in milliseconds. @@ -66,7 +66,7 @@ int main(void) { */ while (true) { if (!palReadLine(LINE_ARD_D3)) - TestThread(&SD2); + test_execute((BaseSequentialStream *)&SD2); chThdSleepMilliseconds(500); } } diff --git a/demos/STM32/RT-STM32F051-DISCOVERY/main.c b/demos/STM32/RT-STM32F051-DISCOVERY/main.c index 30c6cb530..74725e36d 100644 --- a/demos/STM32/RT-STM32F051-DISCOVERY/main.c +++ b/demos/STM32/RT-STM32F051-DISCOVERY/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" /* * Blue LED blinker thread, times are in milliseconds. @@ -87,7 +87,7 @@ int main(void) { */ while (true) { if (palReadPad(GPIOA, GPIOA_BUTTON)) - TestThread(&SD1); + test_execute((BaseSequentialStream *)&SD1); chThdSleepMilliseconds(500); } } diff --git a/demos/STM32/RT-STM32F072-DISCOVERY/main.c b/demos/STM32/RT-STM32F072-DISCOVERY/main.c index 63892fa69..a46f0ecce 100644 --- a/demos/STM32/RT-STM32F072-DISCOVERY/main.c +++ b/demos/STM32/RT-STM32F072-DISCOVERY/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" /* * Blue LED blinker thread, times are in milliseconds. @@ -87,7 +87,7 @@ int main(void) { */ while (true) { if (palReadPad(GPIOA, GPIOA_BUTTON)) - TestThread(&SD1); + test_execute((BaseSequentialStream *)&SD1); chThdSleepMilliseconds(500); } } diff --git a/demos/STM32/RT-STM32F072RB-NUCLEO/main.c b/demos/STM32/RT-STM32F072RB-NUCLEO/main.c index 4a497864c..5d7e7cb13 100644 --- a/demos/STM32/RT-STM32F072RB-NUCLEO/main.c +++ b/demos/STM32/RT-STM32F072RB-NUCLEO/main.c @@ -17,7 +17,7 @@ #include "ch.h" #include "hal.h" #include "chprintf.h" -#include "test.h" +#include "ch_test.h" /* * Green LED blinker thread, times are in milliseconds. @@ -67,7 +67,7 @@ int main(void) { */ while (true) { if (!palReadPad(GPIOC, GPIOC_BUTTON)) - TestThread(&SD2); + test_execute((BaseSequentialStream *)&SD2); chThdSleepMilliseconds(500); } } diff --git a/demos/STM32/RT-STM32F091RC-NUCLEO/main.c b/demos/STM32/RT-STM32F091RC-NUCLEO/main.c index 43a46a071..00057b532 100644 --- a/demos/STM32/RT-STM32F091RC-NUCLEO/main.c +++ b/demos/STM32/RT-STM32F091RC-NUCLEO/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" /* * Green LED blinker thread, times are in milliseconds. @@ -65,7 +65,7 @@ int main(void) { */ while (true) { if (!palReadPad(GPIOC, GPIOC_BUTTON)) - TestThread(&SD2); + test_execute((BaseSequentialStream *)&SD2); chThdSleepMilliseconds(500); } } diff --git a/demos/STM32/RT-STM32F100-DISCOVERY/main.c b/demos/STM32/RT-STM32F100-DISCOVERY/main.c index e5381de8e..1b89c66c9 100644 --- a/demos/STM32/RT-STM32F100-DISCOVERY/main.c +++ b/demos/STM32/RT-STM32F100-DISCOVERY/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" /* * Blinker thread #1. @@ -86,7 +86,7 @@ int main(void) { */ while (true) { if (palReadPad(GPIOA, GPIOA_BUTTON)) - TestThread(&SD1); + test_execute((BaseSequentialStream *)&SD1); chThdSleepMilliseconds(500); } } diff --git a/demos/STM32/RT-STM32F103-MAPLEMINI/chconf.h b/demos/STM32/RT-STM32F103-MAPLEMINI/chconf.h index 32cc09664..1e7423018 100644 --- a/demos/STM32/RT-STM32F103-MAPLEMINI/chconf.h +++ b/demos/STM32/RT-STM32F103-MAPLEMINI/chconf.h @@ -516,6 +516,8 @@ /* Port-specific settings (override port settings defaulted in chcore.h). */ /*===========================================================================*/ +#define CORTEX_VTOR_INIT 0x5000 + #endif /* CHCONF_H */ /** @} */ diff --git a/demos/STM32/RT-STM32F103-MAPLEMINI/main.c b/demos/STM32/RT-STM32F103-MAPLEMINI/main.c index 6ebb52d3a..df5564d48 100644 --- a/demos/STM32/RT-STM32F103-MAPLEMINI/main.c +++ b/demos/STM32/RT-STM32F103-MAPLEMINI/main.c @@ -19,7 +19,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" #include "shell.h" #include "chprintf.h" diff --git a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/main.c b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/main.c index ca027f3a3..414ed96b7 100644 --- a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/main.c +++ b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" /* * Blinker thread. @@ -68,7 +68,7 @@ int main(void) { */ while (true) { if (palReadPad(GPIOA, GPIOA_BUTTON)) - TestThread(&SD2); + test_execute((BaseSequentialStream *)&SD2); chThdSleepMilliseconds(500); } } diff --git a/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/main.c b/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/main.c index 51b5fd00b..93355773f 100644 --- a/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/main.c +++ b/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/main.c @@ -19,7 +19,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" #include "chprintf.h" #include "shell.h" diff --git a/demos/STM32/RT-STM32F103RB-NUCLEO/main.c b/demos/STM32/RT-STM32F103RB-NUCLEO/main.c index 43a46a071..00057b532 100644 --- a/demos/STM32/RT-STM32F103RB-NUCLEO/main.c +++ b/demos/STM32/RT-STM32F103RB-NUCLEO/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" /* * Green LED blinker thread, times are in milliseconds. @@ -65,7 +65,7 @@ int main(void) { */ while (true) { if (!palReadPad(GPIOC, GPIOC_BUTTON)) - TestThread(&SD2); + test_execute((BaseSequentialStream *)&SD2); chThdSleepMilliseconds(500); } } diff --git a/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/main.c b/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/main.c index f66d36786..307a72023 100644 --- a/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/main.c +++ b/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/main.c @@ -19,7 +19,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" #include "shell.h" #include "chprintf.h" diff --git a/demos/STM32/RT-STM32F207-DISCOVERY/main.c b/demos/STM32/RT-STM32F207-DISCOVERY/main.c index 399b423b6..6c8873009 100644 --- a/demos/STM32/RT-STM32F207-DISCOVERY/main.c +++ b/demos/STM32/RT-STM32F207-DISCOVERY/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" /* * This is a periodic thread that does absolutely nothing except flashing @@ -69,7 +69,7 @@ int main(void) { */ while (true) { if (palReadPad(GPIOA, GPIOA_BUTTON)) - TestThread(&SD2); + test_execute((BaseSequentialStream *)&SD2); chThdSleepMilliseconds(500); } } diff --git a/demos/STM32/RT-STM32F302R8-NUCLEO/main.c b/demos/STM32/RT-STM32F302R8-NUCLEO/main.c index 3f9beda10..07ab84043 100644 --- a/demos/STM32/RT-STM32F302R8-NUCLEO/main.c +++ b/demos/STM32/RT-STM32F302R8-NUCLEO/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" /* * Green LED blinker thread, times are in milliseconds. @@ -65,7 +65,7 @@ int main(void) { */ while (true) { if (!palReadPad(GPIOC, GPIOC_BUTTON)) - TestThread(&SD2); + test_execute((BaseSequentialStream *)&SD2); chThdSleepMilliseconds(500); } } diff --git a/demos/STM32/RT-STM32F303-DISCOVERY/main.c b/demos/STM32/RT-STM32F303-DISCOVERY/main.c index 26b940664..1f91e6e63 100644 --- a/demos/STM32/RT-STM32F303-DISCOVERY/main.c +++ b/demos/STM32/RT-STM32F303-DISCOVERY/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" /* * Blinker thread #1. @@ -112,7 +112,7 @@ int main(void) { */ while (true) { if (palReadPad(GPIOA, GPIOA_BUTTON)) - TestThread(&SD1); + test_execute((BaseSequentialStream *)&SD1); chThdSleepMilliseconds(500); } } diff --git a/demos/STM32/RT-STM32F303K8-NUCLEO32/main.c b/demos/STM32/RT-STM32F303K8-NUCLEO32/main.c index 0c32bc4d9..e8272659a 100644 --- a/demos/STM32/RT-STM32F303K8-NUCLEO32/main.c +++ b/demos/STM32/RT-STM32F303K8-NUCLEO32/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" /* * Green LED blinker thread, times are in milliseconds. @@ -66,7 +66,7 @@ int main(void) { */ while (true) { if (!palReadLine(LINE_ARD_D3)) - TestThread(&SD2); + test_execute((BaseSequentialStream *)&SD2); chThdSleepMilliseconds(500); } } diff --git a/demos/STM32/RT-STM32F334-DISCOVERY/main.c b/demos/STM32/RT-STM32F334-DISCOVERY/main.c index 0a71d445e..093a64910 100644 --- a/demos/STM32/RT-STM32F334-DISCOVERY/main.c +++ b/demos/STM32/RT-STM32F334-DISCOVERY/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" /* * LEDs blinker thread, times are in milliseconds. @@ -84,7 +84,7 @@ int main(void) { */ while (true) { if (palReadPad(GPIOA, GPIOA_BUTTON)) - TestThread(&SD2); + test_execute((BaseSequentialStream *)&SD2); chThdSleepMilliseconds(500); } } diff --git a/demos/STM32/RT-STM32F334R8-NUCLEO/main.c b/demos/STM32/RT-STM32F334R8-NUCLEO/main.c index 43a46a071..00057b532 100644 --- a/demos/STM32/RT-STM32F334R8-NUCLEO/main.c +++ b/demos/STM32/RT-STM32F334R8-NUCLEO/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" /* * Green LED blinker thread, times are in milliseconds. @@ -65,7 +65,7 @@ int main(void) { */ while (true) { if (!palReadPad(GPIOC, GPIOC_BUTTON)) - TestThread(&SD2); + test_execute((BaseSequentialStream *)&SD2); chThdSleepMilliseconds(500); } } diff --git a/demos/STM32/RT-STM32F373-STM32373C_EVAL/main.c b/demos/STM32/RT-STM32F373-STM32373C_EVAL/main.c index ce239c23e..1a2b4df63 100644 --- a/demos/STM32/RT-STM32F373-STM32373C_EVAL/main.c +++ b/demos/STM32/RT-STM32F373-STM32373C_EVAL/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" /* * This is a periodic thread that does absolutely nothing except flashing LEDs. @@ -76,7 +76,7 @@ int main(void) { */ while (true) { if (palReadPad(GPIOA, GPIOA_WKUP_BUTTON)) - TestThread(&SD2); + test_execute((BaseSequentialStream *)&SD2); chThdSleepMilliseconds(500); } } diff --git a/demos/STM32/RT-STM32F401C-DISCOVERY/main.c b/demos/STM32/RT-STM32F401C-DISCOVERY/main.c index 399b423b6..6c8873009 100644 --- a/demos/STM32/RT-STM32F401C-DISCOVERY/main.c +++ b/demos/STM32/RT-STM32F401C-DISCOVERY/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" /* * This is a periodic thread that does absolutely nothing except flashing @@ -69,7 +69,7 @@ int main(void) { */ while (true) { if (palReadPad(GPIOA, GPIOA_BUTTON)) - TestThread(&SD2); + test_execute((BaseSequentialStream *)&SD2); chThdSleepMilliseconds(500); } } diff --git a/demos/STM32/RT-STM32F401RE-NUCLEO/main.c b/demos/STM32/RT-STM32F401RE-NUCLEO/main.c index 43a46a071..00057b532 100644 --- a/demos/STM32/RT-STM32F401RE-NUCLEO/main.c +++ b/demos/STM32/RT-STM32F401RE-NUCLEO/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" /* * Green LED blinker thread, times are in milliseconds. @@ -65,7 +65,7 @@ int main(void) { */ while (true) { if (!palReadPad(GPIOC, GPIOC_BUTTON)) - TestThread(&SD2); + test_execute((BaseSequentialStream *)&SD2); chThdSleepMilliseconds(500); } } diff --git a/demos/STM32/RT-STM32F407-DISCOVERY-G++/main.cpp b/demos/STM32/RT-STM32F407-DISCOVERY-G++/main.cpp index b16f9ad69..5f714836c 100644 --- a/demos/STM32/RT-STM32F407-DISCOVERY-G++/main.cpp +++ b/demos/STM32/RT-STM32F407-DISCOVERY-G++/main.cpp @@ -16,7 +16,7 @@ #include "ch.hpp" #include "hal.h" -#include "test.h" +#include "ch_test.h" using namespace chibios_rt; @@ -129,7 +129,7 @@ protected: setName("tester"); - TestThread(&SD2); + test_execute((BaseSequentialStream *)&SD2); exit(test_global_fail); } diff --git a/demos/STM32/RT-STM32F407-DISCOVERY-MEMS/main.c b/demos/STM32/RT-STM32F407-DISCOVERY-MEMS/main.c index 2eda62ab9..def958c8b 100644 --- a/demos/STM32/RT-STM32F407-DISCOVERY-MEMS/main.c +++ b/demos/STM32/RT-STM32F407-DISCOVERY-MEMS/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" #include "chprintf.h" #include "shell.h" diff --git a/demos/STM32/RT-STM32F407-DISCOVERY/main.c b/demos/STM32/RT-STM32F407-DISCOVERY/main.c index 399b423b6..6c8873009 100644 --- a/demos/STM32/RT-STM32F407-DISCOVERY/main.c +++ b/demos/STM32/RT-STM32F407-DISCOVERY/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" /* * This is a periodic thread that does absolutely nothing except flashing @@ -69,7 +69,7 @@ int main(void) { */ while (true) { if (palReadPad(GPIOA, GPIOA_BUTTON)) - TestThread(&SD2); + test_execute((BaseSequentialStream *)&SD2); chThdSleepMilliseconds(500); } } diff --git a/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/main.c b/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/main.c index c75577710..4206e22f8 100644 --- a/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/main.c +++ b/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/main.c @@ -19,7 +19,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" #include "chprintf.h" #include "shell.h" diff --git a/demos/STM32/RT-STM32F411RE-NUCLEO/main.c b/demos/STM32/RT-STM32F411RE-NUCLEO/main.c index 43a46a071..00057b532 100644 --- a/demos/STM32/RT-STM32F411RE-NUCLEO/main.c +++ b/demos/STM32/RT-STM32F411RE-NUCLEO/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" /* * Green LED blinker thread, times are in milliseconds. @@ -65,7 +65,7 @@ int main(void) { */ while (true) { if (!palReadPad(GPIOC, GPIOC_BUTTON)) - TestThread(&SD2); + test_execute((BaseSequentialStream *)&SD2); chThdSleepMilliseconds(500); } } diff --git a/demos/STM32/RT-STM32F429-DISCOVERY/main.c b/demos/STM32/RT-STM32F429-DISCOVERY/main.c index ba4dceb31..153298308 100644 --- a/demos/STM32/RT-STM32F429-DISCOVERY/main.c +++ b/demos/STM32/RT-STM32F429-DISCOVERY/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" #include "chprintf.h" #include "shell.h" diff --git a/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/main.c b/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/main.c index b2e560c14..81c5e2f10 100644 --- a/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/main.c +++ b/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/main.c @@ -19,7 +19,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" #include "chprintf.h" #include "shell.h" diff --git a/demos/STM32/RT-STM32L053R8-NUCLEO/main.c b/demos/STM32/RT-STM32L053R8-NUCLEO/main.c index 43a46a071..00057b532 100644 --- a/demos/STM32/RT-STM32L053R8-NUCLEO/main.c +++ b/demos/STM32/RT-STM32L053R8-NUCLEO/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" /* * Green LED blinker thread, times are in milliseconds. @@ -65,7 +65,7 @@ int main(void) { */ while (true) { if (!palReadPad(GPIOC, GPIOC_BUTTON)) - TestThread(&SD2); + test_execute((BaseSequentialStream *)&SD2); chThdSleepMilliseconds(500); } } diff --git a/demos/STM32/RT-STM32L152-DISCOVERY/main.c b/demos/STM32/RT-STM32L152-DISCOVERY/main.c index f11546010..79744b507 100644 --- a/demos/STM32/RT-STM32L152-DISCOVERY/main.c +++ b/demos/STM32/RT-STM32L152-DISCOVERY/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" /* * Blinker thread #1. @@ -88,7 +88,7 @@ int main(void) { */ while (true) { if (palReadPad(GPIOA, GPIOA_BUTTON)) - TestThread(&SD1); + test_execute((BaseSequentialStream *)&SD1); chThdSleepMilliseconds(500); } } diff --git a/demos/STM32/RT-STM32L152RE-NUCLEO/main.c b/demos/STM32/RT-STM32L152RE-NUCLEO/main.c index 43a46a071..00057b532 100644 --- a/demos/STM32/RT-STM32L152RE-NUCLEO/main.c +++ b/demos/STM32/RT-STM32L152RE-NUCLEO/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" /* * Green LED blinker thread, times are in milliseconds. @@ -65,7 +65,7 @@ int main(void) { */ while (true) { if (!palReadPad(GPIOC, GPIOC_BUTTON)) - TestThread(&SD2); + test_execute((BaseSequentialStream *)&SD2); chThdSleepMilliseconds(500); } } diff --git a/demos/STM32/RT-STM32L476-DISCOVERY/main.c b/demos/STM32/RT-STM32L476-DISCOVERY/main.c index ab91dcb64..50fb1dcd6 100644 --- a/demos/STM32/RT-STM32L476-DISCOVERY/main.c +++ b/demos/STM32/RT-STM32L476-DISCOVERY/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" /* * LEDs blinker thread, times are in milliseconds. @@ -69,7 +69,7 @@ int main(void) { */ while (true) { if (palReadLine(LINE_JOY_CENTER)) - TestThread(&SD2); + test_execute((BaseSequentialStream *)&SD2); chThdSleepMilliseconds(500); } } diff --git a/demos/STM32/RT-STM32L476RG-NUCLEO/main.c b/demos/STM32/RT-STM32L476RG-NUCLEO/main.c index 396000bd4..ac2b582f8 100644 --- a/demos/STM32/RT-STM32L476RG-NUCLEO/main.c +++ b/demos/STM32/RT-STM32L476RG-NUCLEO/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" /* * Green LED blinker thread, times are in milliseconds. @@ -65,7 +65,7 @@ int main(void) { */ while (true) { if (!palReadLine(LINE_BUTTON)) - TestThread(&SD2); + test_execute((BaseSequentialStream *)&SD2); chThdSleepMilliseconds(500); } } diff --git a/demos/various/RT-Win32-Simulator/main.c b/demos/various/RT-Win32-Simulator/main.c index 1c2dbd40b..17b2346c6 100644 --- a/demos/various/RT-Win32-Simulator/main.c +++ b/demos/various/RT-Win32-Simulator/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" #include "shell.h" #include "chprintf.h" diff --git a/os/common/ports/ARM/compilers/GCC/chtypes.h b/os/common/ports/ARM/compilers/GCC/chtypes.h index c3290d8cc..a34c5bd04 100644 --- a/os/common/ports/ARM/compilers/GCC/chtypes.h +++ b/os/common/ports/ARM/compilers/GCC/chtypes.h @@ -93,6 +93,11 @@ typedef uint32_t ucnt_t; /**< Generic unsigned counter. */ */ #define PACKED_VAR __attribute__((packed)) +/** + * @brief Memory alignment enforcement for variables. + */ +#define ALIGNED_VAR(n) __attribute__((aligned(n))) + #endif /* CHTYPES_H */ /** @} */ diff --git a/os/common/ports/ARMCMx/compilers/IAR/chtypes.h b/os/common/ports/ARMCMx/compilers/IAR/chtypes.h index 152a64fe0..1cec367f0 100644 --- a/os/common/ports/ARMCMx/compilers/IAR/chtypes.h +++ b/os/common/ports/ARMCMx/compilers/IAR/chtypes.h @@ -93,6 +93,11 @@ typedef uint32_t ucnt_t; /**< Generic unsigned counter. */ */ #define PACKED_VAR __packed +/** + * @brief Memory alignment enforcement for variables. + */ +#define ALIGNED_VAR(n) __attribute__((aligned(n))) + #endif /* CHTYPES_H */ /** @} */ diff --git a/os/common/ports/ARMCMx/compilers/RVCT/chtypes.h b/os/common/ports/ARMCMx/compilers/RVCT/chtypes.h index 398472dfe..73a960376 100644 --- a/os/common/ports/ARMCMx/compilers/RVCT/chtypes.h +++ b/os/common/ports/ARMCMx/compilers/RVCT/chtypes.h @@ -93,6 +93,11 @@ typedef uint32_t ucnt_t; /**< Generic unsigned counter. */ */ #define PACKED_VAR __packed +/** + * @brief Memory alignment enforcement for variables. + */ +#define ALIGNED_VAR(n) __attribute__((aligned(n))) + #endif /* CHTYPES_H */ /** @} */ diff --git a/os/common/ports/SIMIA32/compilers/GCC/chtypes.h b/os/common/ports/SIMIA32/compilers/GCC/chtypes.h index 147db448d..db35061be 100644 --- a/os/common/ports/SIMIA32/compilers/GCC/chtypes.h +++ b/os/common/ports/SIMIA32/compilers/GCC/chtypes.h @@ -105,6 +105,11 @@ typedef uint32_t ucnt_t; /**< Generic unsigned counter. */ */ #define PACKED_VAR __attribute__((packed)) +/** + * @brief Memory alignment enforcement for variables. + */ +#define ALIGNED_VAR(n) __attribute__((aligned(n))) + #endif /* CHTYPES_H */ /** @} */ diff --git a/os/common/ports/e200/compilers/CW/chtypes.h b/os/common/ports/e200/compilers/CW/chtypes.h index 4976da817..f8e6f2691 100644 --- a/os/common/ports/e200/compilers/CW/chtypes.h +++ b/os/common/ports/e200/compilers/CW/chtypes.h @@ -88,6 +88,16 @@ typedef uint32_t ucnt_t; /**< Generic unsigned counter. */ */ #define PORT_THD_FUNCTION(tname, arg) void tname(void *arg) +/** + * @brief Packed variable specifier. + */ +#define PACKED_VAR __attribute__((packed)) + +/** + * @brief Memory alignment enforcement for variables. + */ +#define ALIGNED_VAR(n) __attribute__((aligned(n))) + #endif /* CHTYPES_H */ /** @} */ diff --git a/os/common/ports/e200/compilers/GCC/chtypes.h b/os/common/ports/e200/compilers/GCC/chtypes.h index 6ee1962b1..124874850 100644 --- a/os/common/ports/e200/compilers/GCC/chtypes.h +++ b/os/common/ports/e200/compilers/GCC/chtypes.h @@ -88,6 +88,16 @@ typedef uint32_t ucnt_t; /**< Generic unsigned counter. */ */ #define PORT_THD_FUNCTION(tname, arg) void tname(void *arg) +/** + * @brief Packed variable specifier. + */ +#define PACKED_VAR __attribute__((packed)) + +/** + * @brief Memory alignment enforcement for variables. + */ +#define ALIGNED_VAR(n) __attribute__((aligned(n))) + #endif /* CHTYPES_H */ /** @} */ diff --git a/os/common/startup/ARMCMx/compilers/GCC/ld/STM32F103xB_maplemini_bootloader.ld b/os/common/startup/ARMCMx/compilers/GCC/ld/STM32F103xB_maplemini_bootloader.ld index 752432d1d..61f85a3c0 100644 --- a/os/common/startup/ARMCMx/compilers/GCC/ld/STM32F103xB_maplemini_bootloader.ld +++ b/os/common/startup/ARMCMx/compilers/GCC/ld/STM32F103xB_maplemini_bootloader.ld @@ -22,19 +22,52 @@ */ MEMORY { - flash : org = 0x08005000, len = 128k - 0x5000 - ram0 : org = 0x20000C00, len = 20k - 0xC00 - ram1 : org = 0x00000000, len = 0 - ram2 : org = 0x00000000, len = 0 - ram3 : org = 0x00000000, len = 0 - ram4 : org = 0x00000000, len = 0 - ram5 : org = 0x00000000, len = 0 - ram6 : org = 0x00000000, len = 0 - ram7 : org = 0x00000000, len = 0 + flash0 : org = 0x08005000, len = 128k - 0x5000 + flash1 : org = 0x00000000, len = 0 + flash2 : org = 0x00000000, len = 0 + flash3 : org = 0x00000000, len = 0 + flash4 : org = 0x00000000, len = 0 + flash5 : org = 0x00000000, len = 0 + flash6 : org = 0x00000000, len = 0 + flash7 : org = 0x00000000, len = 0 + ram0 : org = 0x20000C00, len = 20k - 0xC00 + ram1 : org = 0x00000000, len = 0 + ram2 : org = 0x00000000, len = 0 + ram3 : org = 0x00000000, len = 0 + ram4 : org = 0x00000000, len = 0 + ram5 : org = 0x00000000, len = 0 + ram6 : org = 0x00000000, len = 0 + ram7 : org = 0x00000000, len = 0 } +/* For each data/text section two region are defined, a virtual region + and a load region (_LMA suffix).*/ + +/* Flash region to be used for exception vectors.*/ +REGION_ALIAS("VECTORS_FLASH", flash0); +REGION_ALIAS("VECTORS_FLASH_LMA", flash0); + +/* Flash region to be used for constructors and destructors.*/ +REGION_ALIAS("XTORS_FLASH", flash0); +REGION_ALIAS("XTORS_FLASH_LMA", flash0); + +/* Flash region to be used for code text.*/ +REGION_ALIAS("TEXT_FLASH", flash0); +REGION_ALIAS("TEXT_FLASH_LMA", flash0); + +/* Flash region to be used for read only data.*/ +REGION_ALIAS("RODATA_FLASH", flash0); +REGION_ALIAS("RODATA_FLASH_LMA", flash0); + +/* Flash region to be used for various.*/ +REGION_ALIAS("VARIOUS_FLASH", flash0); +REGION_ALIAS("VARIOUS_FLASH_LMA", flash0); + +/* Flash region to be used for RAM(n) initialization data.*/ +REGION_ALIAS("RAM_INIT_FLASH_LMA", flash0); + /* RAM region to be used for Main stack. This stack accommodates the processing - of all exceptions and interrupts*/ + of all exceptions and interrupts.*/ REGION_ALIAS("MAIN_STACK_RAM", ram0); /* RAM region to be used for the process stack. This is the stack used by @@ -43,6 +76,7 @@ REGION_ALIAS("PROCESS_STACK_RAM", ram0); /* RAM region to be used for data segment.*/ REGION_ALIAS("DATA_RAM", ram0); +REGION_ALIAS("DATA_RAM_LMA", flash0); /* RAM region to be used for BSS segment.*/ REGION_ALIAS("BSS_RAM", ram0); @@ -50,4 +84,5 @@ REGION_ALIAS("BSS_RAM", ram0); /* RAM region to be used for the default heap.*/ REGION_ALIAS("HEAP_RAM", ram0); +/* Generic rules inclusion.*/ INCLUDE rules.ld diff --git a/os/hal/ports/LPC/LPC214x/serial_lld.c b/os/hal/ports/LPC/LPC214x/serial_lld.c index 17ed8b3b8..f6086a41f 100644 --- a/os/hal/ports/LPC/LPC214x/serial_lld.c +++ b/os/hal/ports/LPC/LPC214x/serial_lld.c @@ -136,12 +136,12 @@ static void serve_interrupt(SerialDriver *sdp) { case IIR_SRC_TIMEOUT: case IIR_SRC_RX: osalSysLockFromISR(); - if (chIQIsEmptyI(&sdp->iqueue)) + if (iqIsEmptyI(&sdp->iqueue)) chnAddFlagsI(sdp, CHN_INPUT_AVAILABLE); osalSysUnlockFromISR(); while (u->UART_LSR & LSR_RBR_FULL) { osalSysLockFromISR(); - if (chIQPutI(&sdp->iqueue, u->UART_RBR) < MSG_OK) + if (iqPutI(&sdp->iqueue, u->UART_RBR) < MSG_OK) chnAddFlagsI(sdp, SD_OVERRUN_ERROR); osalSysUnlockFromISR(); } @@ -153,7 +153,7 @@ static void serve_interrupt(SerialDriver *sdp) { msg_t b; osalSysLockFromISR(); - b = chOQGetI(&sdp->oqueue); + b = oqGetI(&sdp->oqueue); osalSysUnlockFromISR(); if (b < MSG_OK) { u->UART_IER &= ~IER_THRE; @@ -182,7 +182,7 @@ static void preload(SerialDriver *sdp) { if (u->UART_LSR & LSR_THRE) { int i = LPC214x_UART_FIFO_PRELOAD; do { - msg_t b = chOQGetI(&sdp->oqueue); + msg_t b = oqGetI(&sdp->oqueue); if (b < MSG_OK) { chnAddFlagsI(sdp, CHN_OUTPUT_EMPTY); return; diff --git a/os/various/shell/shell_cmd.c b/os/various/shell/shell_cmd.c index ce88aa3cb..359207da0 100644 --- a/os/various/shell/shell_cmd.c +++ b/os/various/shell/shell_cmd.c @@ -31,7 +31,7 @@ #include "chprintf.h" #if (SHELL_CMD_TEST_ENABLED == TRUE) || defined(__DOXYGEN__) -#include "test.h" +#include "ch_test.h" #endif /*===========================================================================*/ @@ -181,7 +181,7 @@ static void cmd_test(BaseSequentialStream *chp, int argc, char *argv[]) { } tp = chThdCreateFromHeap(NULL, SHELL_CMD_TEST_WA_SIZE, "test", chThdGetPriorityX(), - TestThread, chp); + (tfunc_t)test_execute, chp); if (tp == NULL) { chprintf(chp, "out of memory\r\n"); return; diff --git a/test/lib/ch_test.c b/test/lib/ch_test.c index 65f9ec9af..8dd166278 100644 --- a/test/lib/ch_test.c +++ b/test/lib/ch_test.c @@ -39,6 +39,11 @@ */ unsigned test_step; +/** + * @brief Test result flag. + */ +bool test_global_fail; + /*===========================================================================*/ /* Module local types. */ /*===========================================================================*/ @@ -48,7 +53,6 @@ unsigned test_step; /*===========================================================================*/ static bool test_local_fail; -static bool test_global_fail; static const char *test_failure_message; static char test_tokens_buffer[TEST_MAX_TOKENS]; static char *test_tokp; @@ -74,7 +78,7 @@ static void execute_test(const testcase_t *tcp) { /* Initialization */ clear_tokens(); - test_local_fail = FALSE; + test_local_fail = false; if (tcp->setup != NULL) tcp->setup(); @@ -97,17 +101,17 @@ static void print_line(void) { bool _test_fail(const char *msg) { - test_local_fail = TRUE; - test_global_fail = TRUE; + test_local_fail = true; + test_global_fail = true; test_failure_message = msg; - return TRUE; + return true; } bool _test_assert(bool condition, const char *msg) { if (!condition) return _test_fail(msg); - return FALSE; + return false; } bool _test_assert_sequence(char *expected, const char *msg) { @@ -123,7 +127,7 @@ bool _test_assert_sequence(char *expected, const char *msg) { clear_tokens(); - return FALSE; + return false; } bool _test_assert_time_window(systime_t start, @@ -215,8 +219,8 @@ void test_emit_token_i(char token) { * @param[in] stream pointer to a @p BaseSequentialStream object for test * output * @return A failure boolean value casted to @p msg_t. - * @retval FALSE if no errors occurred. - * @retval TRUE if one or more tests failed. + * @retval false if no errors occurred. + * @retval true if one or more tests failed. * * @api */ @@ -246,7 +250,7 @@ msg_t test_execute(BaseSequentialStream *stream) { #endif test_println(""); - test_global_fail = FALSE; + test_global_fail = false; i = 0; while (test_suite[i]) { j = 0; diff --git a/test/lib/ch_test.h b/test/lib/ch_test.h index 1fc78bb33..6ecdb4af8 100644 --- a/test/lib/ch_test.h +++ b/test/lib/ch_test.h @@ -156,6 +156,7 @@ typedef struct { #if !defined(__DOXYGEN__) extern unsigned test_step; +extern bool test_global_fail; #endif #ifdef __cplusplus