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@7568 35acf78f-673a-0410-8e92-d51de3d6d3f4

master
gdisirio 2014-12-10 14:25:41 +00:00
parent 12350f77ac
commit 7009a64a03
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os/nil/include/nil.h
View File

@ -835,8 +835,8 @@ extern "C" {
void chSysInit(void); void chSysInit(void);
void chSysHalt(const char *reason); void chSysHalt(const char *reason);
void chSysTimerHandlerI(void); void chSysTimerHandlerI(void);
void chSysConditionalLock(void); void chSysUnconditionalLock(void);
void chSysConditionalUnlock(void); void chSysUnconditionalUnlock(void);
syssts_t chSysGetStatusAndLockX(void); syssts_t chSysGetStatusAndLockX(void);
void chSysRestoreStatusX(syssts_t sts); void chSysRestoreStatusX(syssts_t sts);
thread_t *chSchReadyI(thread_t *tp, msg_t msg); thread_t *chSchReadyI(thread_t *tp, msg_t msg);

8
os/nil/src/nil.c
View File

@ -220,26 +220,26 @@ void chSysTimerHandlerI(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
*/ */
void chSysConditionalLock(void) { 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
*/ */
void chSysConditionalUnlock(void) { void chSysUnconditionalUnlock(void) {
if (!port_irq_enabled(port_get_irq_status())) if (!port_irq_enabled(port_get_irq_status()))
chSysUnlock(); chSysUnlock();