andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #694. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8770 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Giovanni Di Sirio 2016-01-16 12:01:40 +00:00
parent 9bec8d3179
commit b8dfd95a2e
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,7 +61,7 @@ typedef struct nil_thread thread_t;
/** /**
* @brief Kernel version string. * @brief Kernel version string.
*/ */
#define CH_KERNEL_VERSION "1.1.0" #define CH_KERNEL_VERSION "1.1.1"
/** /**
* @brief Kernel version major number. * @brief Kernel version major number.
@ -76,7 +76,7 @@ typedef struct nil_thread thread_t;
/** /**
* @brief Kernel version patch number. * @brief Kernel version patch number.
*/ */
#define CH_KERNEL_PATCH 0 #define CH_KERNEL_PATCH 1
/** @} */ /** @} */
/** /**
@ -988,10 +988,12 @@ extern "C" {
void chSemSignalI(semaphore_t *sp); void chSemSignalI(semaphore_t *sp);
void chSemReset(semaphore_t *sp, cnt_t n); void chSemReset(semaphore_t *sp, cnt_t n);
void chSemResetI(semaphore_t *sp, cnt_t n); void chSemResetI(semaphore_t *sp, cnt_t n);
#if NIL_CFG_USE_EVENTS == TRUE
void chEvtSignal(thread_t *tp, eventmask_t mask); void chEvtSignal(thread_t *tp, eventmask_t mask);
void chEvtSignalI(thread_t *tp, eventmask_t mask); void chEvtSignalI(thread_t *tp, eventmask_t mask);
eventmask_t chEvtWaitAnyTimeout(eventmask_t mask, systime_t timeout); eventmask_t chEvtWaitAnyTimeout(eventmask_t mask, systime_t timeout);
eventmask_t chEvtWaitAnyTimeoutS(eventmask_t mask, systime_t timeout); eventmask_t chEvtWaitAnyTimeoutS(eventmask_t mask, systime_t timeout);
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

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

@ -729,6 +729,7 @@ void chSemResetI(semaphore_t *sp, cnt_t n) {
} }
} }
#if (NIL_CFG_USE_EVENTS == TRUE) || defined(__DOXYGEN__)
/** /**
* @brief Adds a set of event flags directly to the specified @p thread_t. * @brief Adds a set of event flags directly to the specified @p thread_t.
* *
@ -834,5 +835,6 @@ eventmask_t chEvtWaitAnyTimeoutS(eventmask_t mask, systime_t timeout) {
return m; return m;
} }
#endif /* NIL_CFG_USE_EVENTS == TRUE */
/** @} */ /** @} */

2
readme.txt
View File

@ -76,6 +76,8 @@
- RT: Removed the p_msg field from the thread_t structure saving a - RT: Removed the p_msg field from the thread_t structure saving a
msg_t-sized field from the structure. Messages now use a new field msg_t-sized field from the structure. Messages now use a new field
into the p_u union. Now synchronous messages are even faster. into the p_u union. Now synchronous messages are even faster.
- NIL: NIL_CFG_USE_EVENTS not properly checked in NIL (bug #694)
(backported to 3.0.5 and 16.1.1).
- RT: Fixed ISR statistics are not updated from a critical zone in RT - RT: Fixed ISR statistics are not updated from a critical zone in RT
(bug #693)(backported to 3.0.5 and 16.1.1). (bug #693)(backported to 3.0.5 and 16.1.1).
- NIL: Fixed NIL test suite calls I and S functions outside critical zone - NIL: Fixed NIL test suite calls I and S functions outside critical zone