diff options
| -rw-r--r-- | doc/hal/Doxyfile_chm | 2 | ||||
| -rw-r--r-- | doc/hal/Doxyfile_html | 2 | ||||
| -rw-r--r-- | doc/rt/Doxyfile_chm | 2 | ||||
| -rw-r--r-- | doc/rt/Doxyfile_html | 2 | ||||
| -rw-r--r-- | os/hal/include/hal.h | 4 | ||||
| -rw-r--r-- | os/rt/include/ch.h | 4 | ||||
| -rw-r--r-- | os/rt/src/chmtx.c | 8 | ||||
| -rw-r--r-- | readme.txt | 2 |
8 files changed, 17 insertions, 9 deletions
diff --git a/doc/hal/Doxyfile_chm b/doc/hal/Doxyfile_chm index 9930c3c28..5c5e56329 100644 --- a/doc/hal/Doxyfile_chm +++ b/doc/hal/Doxyfile_chm @@ -38,7 +38,7 @@ PROJECT_NAME = ChibiOS/HAL # could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = 3.0.0
+PROJECT_NUMBER = 3.0.1
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
diff --git a/doc/hal/Doxyfile_html b/doc/hal/Doxyfile_html index 9ff5e9d6b..21147269e 100644 --- a/doc/hal/Doxyfile_html +++ b/doc/hal/Doxyfile_html @@ -38,7 +38,7 @@ PROJECT_NAME = ChibiOS/HAL # could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = 3.0.0
+PROJECT_NUMBER = 3.0.1
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
diff --git a/doc/rt/Doxyfile_chm b/doc/rt/Doxyfile_chm index cb4387d5f..876a180d1 100644 --- a/doc/rt/Doxyfile_chm +++ b/doc/rt/Doxyfile_chm @@ -38,7 +38,7 @@ PROJECT_NAME = ChibiOS/RT # could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = 3.0.0
+PROJECT_NUMBER = 3.0.2
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
diff --git a/doc/rt/Doxyfile_html b/doc/rt/Doxyfile_html index c32ddf2af..5c791e5a5 100644 --- a/doc/rt/Doxyfile_html +++ b/doc/rt/Doxyfile_html @@ -38,7 +38,7 @@ PROJECT_NAME = ChibiOS/RT # could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = 3.0.0
+PROJECT_NUMBER = 3.0.2
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
diff --git a/os/hal/include/hal.h b/os/hal/include/hal.h index 1c6405991..bb1a3281b 100644 --- a/os/hal/include/hal.h +++ b/os/hal/include/hal.h @@ -101,7 +101,7 @@ /**
* @brief HAL version string.
*/
-#define HAL_VERSION "3.0.0"
+#define HAL_VERSION "3.0.1"
/**
* @brief HAL version major number.
@@ -116,7 +116,7 @@ /**
* @brief HAL version patch number.
*/
-#define CH_HAL_PATCH 0
+#define CH_HAL_PATCH 1
/** @} */
/**
diff --git a/os/rt/include/ch.h b/os/rt/include/ch.h index fdfec3823..cb4db9392 100644 --- a/os/rt/include/ch.h +++ b/os/rt/include/ch.h @@ -48,7 +48,7 @@ /**
* @brief Kernel version string.
*/
-#define CH_KERNEL_VERSION "3.0.0"
+#define CH_KERNEL_VERSION "3.0.2"
/**
* @brief Kernel version major number.
@@ -63,7 +63,7 @@ /**
* @brief Kernel version patch number.
*/
-#define CH_KERNEL_PATCH 0
+#define CH_KERNEL_PATCH 2
/** @} */
/* Core headers.*/
diff --git a/os/rt/src/chmtx.c b/os/rt/src/chmtx.c index 03f78a3ce..42c2836ae 100644 --- a/os/rt/src/chmtx.c +++ b/os/rt/src/chmtx.c @@ -375,7 +375,13 @@ void chMtxUnlock(mutex_t *mp) { mp->m_owner = tp;
mp->m_next = tp->p_mtxlist;
tp->p_mtxlist = mp;
- chSchWakeupS(tp, MSG_OK);
+
+ /* Note, not using chSchWakeupS() becuase that function expects the
+ current thread to have the higher or equal priority than the ones
+ in the ready list. This is not necessarily true here because we
+ just changed priority.*/
+ (void) chSchReadyI(tp);
+ chSchRescheduleS();
}
else {
mp->m_owner = NULL;
diff --git a/readme.txt b/readme.txt index ffa0c2613..8b9cded9b 100644 --- a/readme.txt +++ b/readme.txt @@ -95,6 +95,8 @@ - HAL: Introduced support for TIM21 and TIM22 in STM32 ST driver.
- HAL: Updated STM32F0xx headers to STM32CubeF0 version 1.3.0. Added support
for STM32F030xC, STM32F070x6, STM32F070xB devices.
+- RT: Fixed problem with RT mutexes involving priority inheritance (bug #632)
+ (backported to 3.0.2 and 2.6.10).
- HAL: Fixed HAL to RT dependency in STM32 DAC driver (bug #631)(backported
to 3.0.2).
- HAL: Fixed problem with STM32 I2S driver restart (bug #630)(backported
|