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

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7254 35acf78f-673a-0410-8e92-d51de3d6d3f4

master
gdisirio 2014-09-10 10:18:02 +00:00
parent e5f3bc7f86
commit 530c3a6f9e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
os/rt/include/chsys.h
View File

@ -362,26 +362,26 @@ static inline void chSysUnlockFromISR(void) {
} }
/** /**
* @brief Conditionally enters the kernel lock state. * @brief Unconditionally enters the kernel lock state.
* @note Can be called without previous knowledge of the current lock state. * @note Can be called without previous knowledge of the current lock state.
* The final state is "s-locked". * The final state is "s-locked".
* *
* @special * @special
*/ */
static inline void chSysConditionalLock(void) { static inline void chSysUnconditionalLock(void) {
if (port_irq_enabled(port_get_irq_status())) if (port_irq_enabled(port_get_irq_status()))
chSysLock(); chSysLock();
} }
/** /**
* @brief Conditionally leaves the kernel lock state. * @brief Unconditionally leaves the kernel lock state.
* @note Can be called without previous knowledge of the current lock state. * @note Can be called without previous knowledge of the current lock state.
* The final state is "normal". * The final state is "normal".
* *
* @special * @special
*/ */
static inline void chSysConditionalUnlock(void) { static inline void chSysUnconditionalUnlock(void) {
if (!port_irq_enabled(port_get_irq_status())) if (!port_irq_enabled(port_get_irq_status()))
chSysUnlock(); chSysUnlock();

6
os/rt/include/chthreads.h
View File

@ -168,7 +168,7 @@ typedef msg_t (*tfunc_t)(void *);
* *
* @param[in] name the name of the threads queue variable * @param[in] name the name of the threads queue variable
*/ */
#define _threads_queue_t_DATA(name) {(thread_t *)&name, (thread_t *)&name} #define _THREADS_QUEUE_DATA(name) {(thread_t *)&name, (thread_t *)&name}
/** /**
* @brief Static threads queue object initializer. * @brief Static threads queue object initializer.
@ -177,8 +177,8 @@ typedef msg_t (*tfunc_t)(void *);
* *
* @param[in] name the name of the threads queue variable * @param[in] name the name of the threads queue variable
*/ */
#define threads_queue_t_DECL(name) \ #define _THREADS_QUEUE_DECL(name) \
threads_queue_t name = _threads_queue_t_DATA(name) threads_queue_t name = _THREADS_QUEUE_DATA(name)
/** @} */ /** @} */
/** /**