diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-02-27 16:22:37 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-02-27 16:22:37 +0000 |
| commit | 215138abcf29dd99fa4916c442a4626d3550777a (patch) | |
| tree | 0b17a28f0426eec0c7c101840616247977cf28bd /os/various/cpp_wrappers | |
| parent | 04429bc93f8c06ffd6dd43b9048c2743c237f0a7 (diff) | |
| download | ChibiOS-215138abcf29dd99fa4916c442a4626d3550777a.tar.gz ChibiOS-215138abcf29dd99fa4916c442a4626d3550777a.tar.bz2 ChibiOS-215138abcf29dd99fa4916c442a4626d3550777a.zip | |
Enhanced .ld files. Mass update of shell demos.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8963 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/various/cpp_wrappers')
| -rw-r--r-- | os/various/cpp_wrappers/ch.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/os/various/cpp_wrappers/ch.cpp b/os/various/cpp_wrappers/ch.cpp index bb698d675..f827d285a 100644 --- a/os/various/cpp_wrappers/ch.cpp +++ b/os/various/cpp_wrappers/ch.cpp @@ -78,15 +78,13 @@ namespace chibios_rt { chSysHalt("invoked unimplemented method stop()");
}
-#if CH_CFG_USE_EVENTS
void ThreadReference::requestTerminate(void) {
chDbgAssert(thread_ref != NULL,
"not referenced");
- chEvtSignal(thread_ref, CH_EVENT_TERMINATE);
+ chThdTerminate(thread_ref);
}
-#endif
#if CH_CFG_USE_WAITEXIT
msg_t ThreadReference::wait(void) {
@@ -198,12 +196,10 @@ namespace chibios_rt { chThdExitS(msg);
}
-#if CH_CFG_USE_EVENTS
bool BaseThread::shouldTerminate(void) {
- return (chEvtGetEventsX() & CH_EVENT_TERMINATE) != 0;
+ return chThdShouldTerminateX();
}
-#endif
void BaseThread::sleep(systime_t interval){
|