diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-04-05 13:03:46 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-04-05 13:03:46 +0000 |
| commit | 0f063da229cb9afd722e403e41c2b224df28dddf (patch) | |
| tree | efe4bdbb8ed4c516ee0a4b564979341d73f0cb7c /os/various/cpp_wrappers/ch.cpp | |
| parent | ae3021458a60832178b9ed70b502b8178918aea8 (diff) | |
| download | ChibiOS-0f063da229cb9afd722e403e41c2b224df28dddf.tar.gz ChibiOS-0f063da229cb9afd722e403e41c2b224df28dddf.tar.bz2 ChibiOS-0f063da229cb9afd722e403e41c2b224df28dddf.zip | |
C++ API improvements.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7857 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/various/cpp_wrappers/ch.cpp')
| -rw-r--r-- | os/various/cpp_wrappers/ch.cpp | 118 |
1 files changed, 15 insertions, 103 deletions
diff --git a/os/various/cpp_wrappers/ch.cpp b/os/various/cpp_wrappers/ch.cpp index 33138807d..f827d285a 100644 --- a/os/various/cpp_wrappers/ch.cpp +++ b/os/various/cpp_wrappers/ch.cpp @@ -26,66 +26,9 @@ namespace chibios_rt {
/*------------------------------------------------------------------------*
- * chibios_rt::System *
- *------------------------------------------------------------------------*/
- void System::init(void) {
-
- chSysInit();
- }
-
- void System::lock(void) {
-
- chSysLock();
- }
-
- void System::unlock(void) {
-
- chSysUnlock();
- }
-
- void System::lockFromIsr(void) {
-
- chSysLockFromISR();
- }
-
- void System::unlockFromIsr(void) {
-
- chSysUnlockFromISR();
- }
-
- systime_t System::getTime(void) {
-
- return chVTGetSystemTimeX();
- }
-
- bool System::isTimeWithin(systime_t start, systime_t end) {
-
- return chVTIsSystemTimeWithinX(start, end);
- }
-
- /*------------------------------------------------------------------------*
- * chibios_rt::Core *
- *------------------------------------------------------------------------*/
-#if CH_CFG_USE_MEMCORE
- void *Core::alloc(size_t size) {
-
- return chCoreAlloc(size);
- }
-
- void *Core::allocI(size_t size) {
-
- return chCoreAllocI(size);
- }
-
- size_t Core::getStatus(void) {
-
- return chCoreGetStatusX();
- }
-#endif /* CH_CFG_USE_MEMCORE */
-
- /*------------------------------------------------------------------------*
* chibios_rt::Timer *
*------------------------------------------------------------------------*/
+
void Timer::setI(systime_t time, vtfunc_t vtfunc, void *par) {
chVTSetI(&timer_ref, time, vtfunc, par);
@@ -103,67 +46,36 @@ namespace chibios_rt { }
/*------------------------------------------------------------------------*
- * chibios_rt::ThreadReference *
+ * chibios_rt::ThreadStayPoint *
*------------------------------------------------------------------------*/
- void ThreadReference::stop(void) {
+ msg_t ThreadStayPoint::suspendS(void) {
- chSysHalt("invoked unimplemented method stop()");
+ return chThdSuspendS(&thread_ref);
}
- msg_t ThreadReference::suspend(void) {
- msg_t msg;
+ msg_t ThreadStayPoint::suspendS(systime_t timeout) {
- chSysLock();
-
- chDbgAssert(thread_ref != NULL,
- "already referenced");
-
- thread_ref = chThdGetSelfX();
- chSchGoSleepS(CH_STATE_SUSPENDED);
- msg = thread_ref->p_u.rdymsg;
-
- chSysUnlock();
- return msg;
+ return chThdSuspendTimeoutS(&thread_ref, timeout);
}
- msg_t ThreadReference::suspendS(void) {
+ void ThreadStayPoint::resumeI(msg_t msg) {
- chDbgAssert(thread_ref == NULL,
- "already referenced");
-
- thread_ref = chThdGetSelfX();
- chSchGoSleepS(CH_STATE_SUSPENDED);
- return thread_ref->p_u.rdymsg;
+ chThdResumeI(&thread_ref, msg);
}
- void ThreadReference::resume(msg_t msg) {
-
- chSysLock();
+ void ThreadStayPoint::resumeS(msg_t msg) {
- chDbgAssert(thread_ref != NULL,
- "not referenced");
-
- if (thread_ref) {
- thread_t *tp = thread_ref;
- thread_ref = NULL;
- chSchWakeupS(tp, msg);
- }
-
- chSysUnlock();
+ chThdResumeS(&thread_ref, msg);
}
- void ThreadReference::resumeI(msg_t msg) {
+ /*------------------------------------------------------------------------*
+ * chibios_rt::ThreadReference *
+ *------------------------------------------------------------------------*/
- chDbgAssert(thread_ref != NULL,
- "not referenced");
+ void ThreadReference::stop(void) {
- if (thread_ref) {
- thread_t *tp = thread_ref;
- thread_ref = NULL;
- tp->p_msg = msg;
- chSchReadyI(tp);
- }
+ chSysHalt("invoked unimplemented method stop()");
}
void ThreadReference::requestTerminate(void) {
|