aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgdisirio <gdisirio@110e8d01-0319-4d1e-a829-52ad28d1bb01>2018-07-10 12:00:23 +0000
committergdisirio <gdisirio@110e8d01-0319-4d1e-a829-52ad28d1bb01>2018-07-10 12:00:23 +0000
commitbae460fde165578a93c3aa6b980c73b49aba9d9c (patch)
tree35df8fb65a62546eda6ba74b9083a410a176b916
parent0082938a9990953a91f1ce78edb35de3b0967239 (diff)
downloadChibiOS-bae460fde165578a93c3aa6b980c73b49aba9d9c.tar.gz
ChibiOS-bae460fde165578a93c3aa6b980c73b49aba9d9c.tar.bz2
ChibiOS-bae460fde165578a93c3aa6b980c73b49aba9d9c.zip
Fixed bug #959.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12153 110e8d01-0319-4d1e-a829-52ad28d1bb01
-rw-r--r--os/hal/include/hal_i2s.h9
-rw-r--r--readme.txt2
2 files changed, 6 insertions, 5 deletions
diff --git a/os/hal/include/hal_i2s.h b/os/hal/include/hal_i2s.h
index a7ec3b352..5d9e3cc57 100644
--- a/os/hal/include/hal_i2s.h
+++ b/os/hal/include/hal_i2s.h
@@ -129,17 +129,16 @@ typedef enum {
*
* @notapi
*/
-#define _i2s_isr_full_code(i2sp) { \
+#define _i2s_isr_full_code(i2sp) { \
if ((i2sp)->config->end_cb) { \
(i2sp)->state = I2S_COMPLETE; \
(i2sp)->config->end_cb(i2sp, \
(i2sp)->config->size / 2, \
(i2sp)->config->size / 2); \
- if ((i2sp)->state == I2S_COMPLETE) \
- (i2sp)->state = I2S_READY; \
+ if ((i2sp)->state == I2S_COMPLETE) { \
+ (i2sp)->state = I2S_ACTIVE; \
+ } \
} \
- else \
- (i2sp)->state = I2S_READY; \
}
/** @} */
diff --git a/readme.txt b/readme.txt
index f39a1e970..372d71e9d 100644
--- a/readme.txt
+++ b/readme.txt
@@ -141,6 +141,8 @@
- EX: Updated LIS302DL to 1.1.0 (backported to 18.2.1).
- EX: Updated LPS25H to 1.1.0 (backported to 18.2.1).
- EX: Updated LSM303DLHC to 1.1.0 (backported to 18.2.1).
+- HAL: Fixed incorrect state change in I2S driver (bug #959)(backported
+ to 18.2.2 and 17.6.5).
- HAL: Fixed incorrect TCIE handling in STM32 serial drivers (bug #958)
(backported to 18.2.2 and 17.6.5).
- HAL: Fixed invalid period calculation in STM32 GPT driver (bug #957)