diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-01-16 12:01:40 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-01-16 12:01:40 +0000 |
| commit | b8dfd95a2e9b35b252ed06acb46cbf6e6012829b (patch) | |
| tree | bbb47c5b100e120706b35c7c0b21d310ff498854 /os | |
| parent | 9bec8d317920fba8fa8ab59a45c112432ff39481 (diff) | |
| download | ChibiOS-b8dfd95a2e9b35b252ed06acb46cbf6e6012829b.tar.gz ChibiOS-b8dfd95a2e9b35b252ed06acb46cbf6e6012829b.tar.bz2 ChibiOS-b8dfd95a2e9b35b252ed06acb46cbf6e6012829b.zip | |
Fixed bug #694.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8770 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
| -rw-r--r-- | os/nil/include/nil.h | 6 | ||||
| -rw-r--r-- | os/nil/src/nil.c | 2 |
2 files changed, 6 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 */
/** @} */
|