aboutsummaryrefslogtreecommitdiffstats
path: root/testhal/common
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2016-02-18 12:05:17 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2016-02-18 12:05:17 +0000
commitd7d709ee5a1fd389602ac48735d17e7b7f421fec (patch)
tree4ee7afc77ff8b36314930ace0ff87e61a4218c77 /testhal/common
parent84f7aa84b3a62ecc4ffc940bca7f220f48e99107 (diff)
downloadChibiOS-d7d709ee5a1fd389602ac48735d17e7b7f421fec.tar.gz
ChibiOS-d7d709ee5a1fd389602ac48735d17e7b7f421fec.tar.bz2
ChibiOS-d7d709ee5a1fd389602ac48735d17e7b7f421fec.zip
Continue merge of RT4/NIL2.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8908 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'testhal/common')
-rw-r--r--testhal/common/irq_storm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/testhal/common/irq_storm.c b/testhal/common/irq_storm.c
index 2e5382881..42a7a52be 100644
--- a/testhal/common/irq_storm.c
+++ b/testhal/common/irq_storm.c
@@ -92,7 +92,7 @@ static THD_FUNCTION(irq_storm_thread, arg) {
chRegSetThreadName("irq_storm");
/* Thread loop, until terminated.*/
- while (chThdShouldTerminateX() == false) {
+ while ((chEvtGetEventsX() & CH_EVENT_TERMINATE) != 0U) {
/* Waiting for a message.*/
chMBFetch(&mb[me], &msg, TIME_INFINITE);
@@ -271,7 +271,7 @@ void irq_storm_execute(const irq_storm_config_t *cfg) {
/* Terminating threads and cleaning up.*/
for (i = 0; i < IRQ_STORM_CFG_NUM_THREADS; i++) {
- chThdTerminate(threads[i]);
+ chEvtSignal(threads[i], CH_EVENT_TERMINATE);
chThdWait(threads[i]);
threads[i] = NULL;
}