diff options
| -rw-r--r-- | os/nil/include/nil.h | 6 | ||||
| -rw-r--r-- | os/nil/src/nil.c | 2 | ||||
| -rw-r--r-- | readme.txt | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/os/nil/include/nil.h b/os/nil/include/nil.h index b94fb8eab..168709049 100644 --- a/os/nil/include/nil.h +++ b/os/nil/include/nil.h @@ -61,7 +61,7 @@ typedef struct nil_thread thread_t; /**
* @brief Kernel version string.
*/
-#define CH_KERNEL_VERSION "1.1.0"
+#define CH_KERNEL_VERSION "1.1.1"
/**
* @brief Kernel version major number.
@@ -76,7 +76,7 @@ typedef struct nil_thread thread_t; /**
* @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 chSemReset(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 chEvtSignalI(thread_t *tp, eventmask_t mask);
eventmask_t chEvtWaitAnyTimeout(eventmask_t mask, systime_t timeout);
eventmask_t chEvtWaitAnyTimeoutS(eventmask_t mask, systime_t timeout);
+#endif
#ifdef __cplusplus
}
#endif
diff --git a/os/nil/src/nil.c b/os/nil/src/nil.c index 766f17162..0db75db37 100644 --- a/os/nil/src/nil.c +++ b/os/nil/src/nil.c @@ -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.
*
@@ -834,5 +835,6 @@ eventmask_t chEvtWaitAnyTimeoutS(eventmask_t mask, systime_t timeout) { return m;
}
+#endif /* NIL_CFG_USE_EVENTS == TRUE */
/** @} */
diff --git a/readme.txt b/readme.txt index 29afe7a02..136cf3ca8 100644 --- a/readme.txt +++ b/readme.txt @@ -76,6 +76,8 @@ - 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
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
(bug #693)(backported to 3.0.5 and 16.1.1).
- NIL: Fixed NIL test suite calls I and S functions outside critical zone
|