diff options
author | Fabio Utzig <utzig@utzig.org> | 2016-04-10 21:09:36 -0300 |
---|---|---|
committer | Fabio Utzig <utzig@utzig.org> | 2016-04-10 21:09:36 -0300 |
commit | 5323be76402e0359570e81cdabd3cf929b8d41b2 (patch) | |
tree | 1c17a57e5f4ec142f0a3cc609ce5f60999d623d1 /demos/TIVA/RT-TM4C1294-LAUNCHPAD/main.c | |
parent | 99c3815a527585127b850f555078de4792ca7caf (diff) | |
parent | b86af2c09feea9b50cb241c147a3881e55763a55 (diff) | |
download | ChibiOS-Contrib-5323be76402e0359570e81cdabd3cf929b8d41b2.tar.gz ChibiOS-Contrib-5323be76402e0359570e81cdabd3cf929b8d41b2.tar.bz2 ChibiOS-Contrib-5323be76402e0359570e81cdabd3cf929b8d41b2.zip |
Merge branch 'master' into fix-nrf51-port
Diffstat (limited to 'demos/TIVA/RT-TM4C1294-LAUNCHPAD/main.c')
-rw-r--r-- | demos/TIVA/RT-TM4C1294-LAUNCHPAD/main.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/main.c b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/main.c index bb2b0e3..adb915e 100644 --- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/main.c +++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/main.c @@ -16,7 +16,7 @@ #include "ch.h" #include "hal.h" -#include "test.h" +#include "ch_test.h" typedef struct led_config { @@ -32,8 +32,7 @@ static THD_WORKING_AREA(waBlinkLed1, 128); static THD_WORKING_AREA(waBlinkLed2, 128); static THD_WORKING_AREA(waBlinkLed3, 128); static THD_WORKING_AREA(waBlinkLed4, 128); -static msg_t blinkLed(void *arg) -{ +static THD_FUNCTION(blinkLed, arg) { led_config_t *ledConfig = (led_config_t*) arg; chRegSetThreadName("Blinker"); @@ -45,8 +44,6 @@ static msg_t blinkLed(void *arg) chThdSleepMilliseconds(ledConfig->sleep); palTogglePad(ledConfig->port, ledConfig->pin); } - - return (msg_t) 0; } /* @@ -74,7 +71,7 @@ int main(void) sdStart(&SD1, NULL); if (!palReadPad(GPIOJ, GPIOJ_SW1)) { - TestThread(&SD1); + test_execute((BaseSequentialStream *)&SD1); } led1.port = GPIOF; @@ -112,6 +109,6 @@ int main(void) while (TRUE) { chThdSleepMilliseconds(100); } - + return 0; } |