aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2015-08-26 16:49:41 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2015-08-26 16:49:41 +0000
commitb19f4e38da58ee3a6025775ebcb63b6878904291 (patch)
tree139698da278107c32f8f11b6a77803ca4ecfa26f
parent3a5c3788fa9bc4b900926daceb86ad525fb28df4 (diff)
downloadChibiOS-b19f4e38da58ee3a6025775ebcb63b6878904291.tar.gz
ChibiOS-b19f4e38da58ee3a6025775ebcb63b6878904291.tar.bz2
ChibiOS-b19f4e38da58ee3a6025775ebcb63b6878904291.zip
Fixed bug #637.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8245 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--os/hal/ports/STM32/STM32F3xx/stm32_registry.h4
-rw-r--r--readme.txt2
2 files changed, 4 insertions, 2 deletions
diff --git a/os/hal/ports/STM32/STM32F3xx/stm32_registry.h b/os/hal/ports/STM32/STM32F3xx/stm32_registry.h
index 26857c93c..585a3728e 100644
--- a/os/hal/ports/STM32/STM32F3xx/stm32_registry.h
+++ b/os/hal/ports/STM32/STM32F3xx/stm32_registry.h
@@ -838,8 +838,8 @@
/* I2C attributes.*/
#define STM32_HAS_I2C1 TRUE
-#define STM32_I2C_I2C2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 7)
-#define STM32_I2C_I2C2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6)
+#define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 7)
+#define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6)
#define STM32_HAS_I2C2 TRUE
#define STM32_I2C_I2C2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 5)
diff --git a/readme.txt b/readme.txt
index fa4a85b00..9bb82ef2a 100644
--- a/readme.txt
+++ b/readme.txt
@@ -94,6 +94,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.
+- HAL: Fixed wrong DMA assignment for I2C1 in STM32F302xC registry (bug #637)
+ (backported to 3.0.2).
- VAR: Fixed CRT0_CALL_DESTRUCTORS not utilised in crt0_v7m.s (bug #635)
(backported to 3.0.2).
- HAL: Fixed wrong ld file in STM32F072xB USB CDC demo (bug #634)(backported