zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[CPP wrappers] xxxTimeout(timeout) functions replaced with overloaded ones like xxx(timeout) 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7256 35acf78f-673a-0410-8e92-d51de3d6d3f4
master
barthess 2014-09-10 18:36:23 +00:00
parent 3b9ae6825f
commit 80fe560f5b
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
os/various/cpp_wrappers/ch.cpp
View File

@ -410,12 +410,12 @@ namespace chibios_rt {
return chSemWaitS(&sem); return chSemWaitS(&sem);
} }
msg_t CounterSemaphore::waitTimeout(systime_t time) { msg_t CounterSemaphore::wait(systime_t time) {
return chSemWaitTimeout(&sem, time); return chSemWaitTimeout(&sem, time);
} }
msg_t CounterSemaphore::waitTimeoutS(systime_t time) { msg_t CounterSemaphore::waitS(systime_t time) {
return chSemWaitTimeoutS(&sem, time); return chSemWaitTimeoutS(&sem, time);
} }
@ -464,12 +464,12 @@ namespace chibios_rt {
return chBSemWaitS(&bsem); return chBSemWaitS(&bsem);
} }
msg_t BinarySemaphore::waitTimeout(systime_t time) { msg_t BinarySemaphore::wait(systime_t time) {
return chBSemWaitTimeout(&bsem, time); return chBSemWaitTimeout(&bsem, time);
} }
msg_t BinarySemaphore::waitTimeoutS(systime_t time) { msg_t BinarySemaphore::waitS(systime_t time) {
return chBSemWaitTimeoutS(&bsem, time); return chBSemWaitTimeoutS(&bsem, time);
} }
@ -579,7 +579,7 @@ namespace chibios_rt {
} }
#if CH_CFG_USE_CONDVARS_TIMEOUT #if CH_CFG_USE_CONDVARS_TIMEOUT
msg_t CondVar::waitTimeout(systime_t time) { msg_t CondVar::wait(systime_t time) {
return chCondWaitTimeout(&condvar, time); return chCondWaitTimeout(&condvar, time);
} }
@ -681,12 +681,12 @@ namespace chibios_rt {
return chIQGet(&iq); return chIQGet(&iq);
} }
msg_t InQueue::getTimeout(systime_t time) { msg_t InQueue::get(systime_t time) {
return chIQGetTimeout(&iq, time); return chIQGetTimeout(&iq, time);
} }
size_t InQueue::readTimeout(uint8_t *bp, size_t n, systime_t time) { size_t InQueue::read(uint8_t *bp, size_t n, systime_t time) {
return chIQReadTimeout(&iq, bp, n, time); return chIQReadTimeout(&iq, bp, n, time);
} }
@ -729,7 +729,7 @@ namespace chibios_rt {
return chOQPut(&oq, b); return chOQPut(&oq, b);
} }
msg_t OutQueue::putTimeout(uint8_t b, systime_t time) { msg_t OutQueue::put(uint8_t b, systime_t time) {
return chOQPutTimeout(&oq, b, time); return chOQPutTimeout(&oq, b, time);
} }
@ -739,8 +739,7 @@ namespace chibios_rt {
return chOQGetI(&oq); return chOQGetI(&oq);
} }
size_t OutQueue::writeTimeout(const uint8_t *bp, size_t n, size_t OutQueue::write(const uint8_t *bp, size_t n, systime_t time) {
systime_t time) {
return chOQWriteTimeout(&oq, bp, n, time); return chOQWriteTimeout(&oq, bp, n, time);
} }

18
os/various/cpp_wrappers/ch.hpp
View File

@ -901,7 +901,7 @@ namespace chibios_rt {
* *
* @api * @api
*/ */
msg_t waitTimeout(systime_t time); msg_t wait(systime_t time);
/** /**
* @brief Performs a wait operation on a semaphore with timeout * @brief Performs a wait operation on a semaphore with timeout
@ -923,7 +923,7 @@ namespace chibios_rt {
* *
* @sclass * @sclass
*/ */
msg_t waitTimeoutS(systime_t time); msg_t waitS(systime_t time);
/** /**
* @brief Performs a signal operation on a semaphore. * @brief Performs a signal operation on a semaphore.
@ -1056,7 +1056,7 @@ namespace chibios_rt {
* *
* @api * @api
*/ */
msg_t waitTimeout(systime_t time); msg_t wait(systime_t time);
/** /**
* @brief Wait operation on the binary semaphore. * @brief Wait operation on the binary semaphore.
@ -1077,7 +1077,7 @@ namespace chibios_rt {
* *
* @sclass * @sclass
*/ */
msg_t waitTimeoutS(systime_t time); msg_t waitS(systime_t time);
/** /**
* @brief Reset operation on the binary semaphore. * @brief Reset operation on the binary semaphore.
@ -1348,7 +1348,7 @@ namespace chibios_rt {
* *
* @api * @api
*/ */
msg_t waitTimeout(systime_t time); msg_t wait(systime_t time);
#endif /* CH_CFG_USE_CONDVARS_TIMEOUT */ #endif /* CH_CFG_USE_CONDVARS_TIMEOUT */
}; };
#endif /* CH_CFG_USE_CONDVARS */ #endif /* CH_CFG_USE_CONDVARS */
@ -1599,7 +1599,7 @@ namespace chibios_rt {
* *
* @api * @api
*/ */
msg_t getTimeout(systime_t time); msg_t get(systime_t time);
/** /**
* @brief Input queue read with timeout. * @brief Input queue read with timeout.
@ -1624,7 +1624,7 @@ namespace chibios_rt {
* *
* @api * @api
*/ */
size_t readTimeout(uint8_t *bp, size_t n, systime_t time); size_t read(uint8_t *bp, size_t n, systime_t time);
}; };
/*------------------------------------------------------------------------* /*------------------------------------------------------------------------*
@ -1771,7 +1771,7 @@ namespace chibios_rt {
* *
* @api * @api
*/ */
msg_t putTimeout(uint8_t b, systime_t time); msg_t put(uint8_t b, systime_t time);
/** /**
* @brief Output queue read. * @brief Output queue read.
@ -1807,7 +1807,7 @@ namespace chibios_rt {
* *
* @api * @api
*/ */
size_t writeTimeout(const uint8_t *bp, size_t n, systime_t time); size_t write(const uint8_t *bp, size_t n, systime_t time);
}; };
/*------------------------------------------------------------------------* /*------------------------------------------------------------------------*