diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-11-14 18:38:36 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-11-14 18:38:36 +0000 |
| commit | 4031ccce3ae6544e81f1b26f8e407efb15594278 (patch) | |
| tree | 58db811ad78f18f559a139d68622789ae2f02741 | |
| parent | 3f53115539e279a12f04ce07ef9f021bfee310fa (diff) | |
| download | ChibiOS-4031ccce3ae6544e81f1b26f8e407efb15594278.tar.gz ChibiOS-4031ccce3ae6544e81f1b26f8e407efb15594278.tar.bz2 ChibiOS-4031ccce3ae6544e81f1b26f8e407efb15594278.zip | |
Fixed bug #671.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8490 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | os/hal/ports/STM32/LLD/I2Cv2/i2c_lld.c | 7 | ||||
| -rw-r--r-- | readme.txt | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/os/hal/ports/STM32/LLD/I2Cv2/i2c_lld.c b/os/hal/ports/STM32/LLD/I2Cv2/i2c_lld.c index e0bc31979..991e77b01 100644 --- a/os/hal/ports/STM32/LLD/I2Cv2/i2c_lld.c +++ b/os/hal/ports/STM32/LLD/I2Cv2/i2c_lld.c @@ -844,8 +844,11 @@ void i2c_lld_start(I2CDriver *i2cp) { #endif
/* Reset i2c peripheral, the TCIE bit will be handled separately.*/
- dp->CR1 = i2cp->config->cr1 | I2C_CR1_ERRIE | I2C_CR1_NACKIE |
- I2C_CR1_TXDMAEN | I2C_CR1_RXDMAEN;
+ dp->CR1 = i2cp->config->cr1 |
+#if STM32_I2C_USE_DMA == TRUE
+ I2C_CR1_TXDMAEN | I2C_CR1_RXDMAEN | /* Enable only if using DMA */
+#endif
+ I2C_CR1_ERRIE | I2C_CR1_NACKIE;
/* Setup I2C parameters.*/
dp->TIMINGR = i2cp->config->timingr;
diff --git a/readme.txt b/readme.txt index 06857c225..3fe6a3d4c 100644 --- a/readme.txt +++ b/readme.txt @@ -134,6 +134,7 @@ - HAL: Updated STM32F0xx headers to STM32CubeF0 version 1.3.0. Added support
for STM32F030xC, STM32F070x6, STM32F070xB, STM32F091xC,
STM32F098xx devices.
+- HAL: Fixed STM32 I2Cv2 DMA conflict (bug #671)(backported to 3.0.4).
- HAL: Fixed I2S clock selection not working in STM32F4xx HAL (bug #667)
(backported to 3.0.4 and 2.6.10).
- HAL: Fixed differences in STM32F3 ADC macro definitions (bug #665)
|