aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-08-05 10:30:44 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-08-05 10:30:44 +0000
commit125d7946bc695ca1c4b08dccdfae2bc6074cc082 (patch)
treeaac9629347d21e69e55a11b325c5ac6c3f0d7006
parent331803d0ee028b9b999bd651a71417d4731f01d2 (diff)
downloadChibiOS-125d7946bc695ca1c4b08dccdfae2bc6074cc082.tar.gz
ChibiOS-125d7946bc695ca1c4b08dccdfae2bc6074cc082.tar.bz2
ChibiOS-125d7946bc695ca1c4b08dccdfae2bc6074cc082.zip
Fixed bug #426.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6080 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--os/hal/platforms/STM32F30x/stm32_registry.h4
-rw-r--r--readme.txt2
2 files changed, 4 insertions, 2 deletions
diff --git a/os/hal/platforms/STM32F30x/stm32_registry.h b/os/hal/platforms/STM32F30x/stm32_registry.h
index f32637aa4..f54164b4f 100644
--- a/os/hal/platforms/STM32F30x/stm32_registry.h
+++ b/os/hal/platforms/STM32F30x/stm32_registry.h
@@ -180,13 +180,13 @@
#define STM32_USART3_TX_DMA_MSK (STM32_DMA_STREAM_ID_MSK(1, 2))
#define STM32_USART3_TX_DMA_CHN 0x00000000
-#define STM32_HAS_UART4 FALSE
+#define STM32_HAS_UART4 TRUE
#define STM32_UART4_RX_DMA_MSK (STM32_DMA_STREAM_ID_MSK(2, 3))
#define STM32_UART4_RX_DMA_CHN 0x00000000
#define STM32_UART4_TX_DMA_MSK (STM32_DMA_STREAM_ID_MSK(2, 5))
#define STM32_UART4_TX_DMA_CHN 0x00000000
-#define STM32_HAS_UART5 FALSE
+#define STM32_HAS_UART5 TRUE
#define STM32_UART5_RX_DMA_MSK 0
#define STM32_UART5_RX_DMA_CHN 0x00000000
#define STM32_UART5_TX_DMA_MSK 0
diff --git a/readme.txt b/readme.txt
index b1ede2a92..71fc1cbe5 100644
--- a/readme.txt
+++ b/readme.txt
@@ -89,6 +89,8 @@
*****************************************************************************
*** 2.7.0 ***
+- FIX: Fixed UART4 and 5 marked as not present in STM32F30x devices (bug #426)
+ (backported to 2.6.1).
- FIX: Fixed conditional code error in STM32 PWM driver (bug #424)(backported
to 2.6.1).
- FIX: Fixed error in Guards of pwm_lld.h from STM32 (bug #423)(backported to