aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2010-09-30 17:49:20 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2010-09-30 17:49:20 +0000
commitfa774e9c8e25e0cac57268ae532dd22fd38c04ff (patch)
tree2bc0930d2ae4f46d02bec11c059ecd67d5131984
parent44b87c4e1d8048217cfdc6428db70aa01c95e2d4 (diff)
downloadChibiOS-fa774e9c8e25e0cac57268ae532dd22fd38c04ff.tar.gz
ChibiOS-fa774e9c8e25e0cac57268ae532dd22fd38c04ff.tar.bz2
ChibiOS-fa774e9c8e25e0cac57268ae532dd22fd38c04ff.zip
Fixed bug 3078891.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2213 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--os/hal/platforms/STM32/serial_lld.h2
-rw-r--r--readme.txt2
2 files changed, 3 insertions, 1 deletions
diff --git a/os/hal/platforms/STM32/serial_lld.h b/os/hal/platforms/STM32/serial_lld.h
index 011dd865a..128920860 100644
--- a/os/hal/platforms/STM32/serial_lld.h
+++ b/os/hal/platforms/STM32/serial_lld.h
@@ -79,7 +79,7 @@
* @details If set to @p TRUE the support for UART5 is included.
* @note The default is @p FALSE.
*/
-#if !defined(STM32_SERIAL_USE_USART3) || defined(__DOXYGEN__)
+#if !defined(STM32_SERIAL_USE_UART5) || defined(__DOXYGEN__)
#define STM32_SERIAL_USE_UART5 TRUE
#endif
diff --git a/readme.txt b/readme.txt
index bb0e4e41c..e9d42154e 100644
--- a/readme.txt
+++ b/readme.txt
@@ -62,6 +62,8 @@
*****************************************************************************
*** 2.1.2 ***
+- FIX: Fixed wrong macro check in STM32 serial support (but 3078891)(backported
+ to 2.0.6).
- FIX: Fixed non functioning option CH_USE_NESTED_LOCKS (bug 3075544)
(backported to 2.0.6).
- FIX: Incorrect AT91SAM7X initialization, thanks Leszek (bug 3075354)