diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-06-18 17:28:41 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-06-18 17:28:41 +0000 |
| commit | cbfc9a5396c2924d6b8fa3c03e4ea8bbda386a15 (patch) | |
| tree | f3951c02e52661d699c16c484a6f7d15f6d1c02e | |
| parent | cdb43a7cd26172cd6ee32dae5f160e615a7af4f5 (diff) | |
| download | ChibiOS-cbfc9a5396c2924d6b8fa3c03e4ea8bbda386a15.tar.gz ChibiOS-cbfc9a5396c2924d6b8fa3c03e4ea8bbda386a15.tar.bz2 ChibiOS-cbfc9a5396c2924d6b8fa3c03e4ea8bbda386a15.zip | |
Fixed bug 3536070.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4300 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | os/hal/platforms/STM32F1xx/hal_lld_f100.h | 8 | ||||
| -rw-r--r-- | readme.txt | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/os/hal/platforms/STM32F1xx/hal_lld_f100.h b/os/hal/platforms/STM32F1xx/hal_lld_f100.h index 4a01eb739..3237fd5d0 100644 --- a/os/hal/platforms/STM32F1xx/hal_lld_f100.h +++ b/os/hal/platforms/STM32F1xx/hal_lld_f100.h @@ -439,10 +439,10 @@ #define STM32_USART1_TX_DMA_CHN 0x00000000
#define STM32_HAS_USART2 TRUE
-#define STM32_I2C2_RX_DMA_MSK (STM32_DMA_STREAM_ID_MSK(1, 5))
-#define STM32_I2C2_RX_DMA_CHN 0x00000000
-#define STM32_I2C2_TX_DMA_MSK (STM32_DMA_STREAM_ID_MSK(1, 4))
-#define STM32_I2C2_TX_DMA_CHN 0x00000000
+#define STM32_USART2_RX_DMA_MSK (STM32_DMA_STREAM_ID_MSK(1, 6))
+#define STM32_USART2_RX_DMA_CHN 0x00000000
+#define STM32_USART2_TX_DMA_MSK (STM32_DMA_STREAM_ID_MSK(1, 7))
+#define STM32_USART2_TX_DMA_CHN 0x00000000
#define STM32_HAS_USART3 TRUE
#define STM32_USART3_RX_DMA_MSK (STM32_DMA_STREAM_ID_MSK(1, 3))
diff --git a/readme.txt b/readme.txt index 01b04339b..5a20f983d 100644 --- a/readme.txt +++ b/readme.txt @@ -81,6 +81,8 @@ *****************************************************************************
*** 2.5.0 ***
+- FIX: Fixed wrong DMA channels on USART2 in STM32F10X_MD_VL devices (bug
+ 3536070)(backported to 2.4.2).
- FIX: Fixed issue with DMA channel init in STM32 ADC and SPI drivers (bug
3535938)(backported to 2.2.10 and 2.4.2).
- FIX: Fixed issue debugging mmc_spi (bug 3535887)(trunk only).
|