From 37e7834f456837979cef502be97a0afa07e36897 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sun, 31 Oct 2010 08:34:16 +0000
Subject: New version numbers, fixed bug 3099701.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2311 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 docs/Doxyfile                    | 2 +-
 os/hal/platforms/STM32/hal_lld.c | 2 +-
 os/kernel/include/ch.h           | 4 ++--
 readme.txt                       | 3 +++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/Doxyfile b/docs/Doxyfile
index 7aa877d07..d7e6dd73b 100644
--- a/docs/Doxyfile
+++ b/docs/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME           = ChibiOS/RT
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 2.1.2
+PROJECT_NUMBER         = 2.1.3
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
diff --git a/os/hal/platforms/STM32/hal_lld.c b/os/hal/platforms/STM32/hal_lld.c
index 58efada69..f099be983 100644
--- a/os/hal/platforms/STM32/hal_lld.c
+++ b/os/hal/platforms/STM32/hal_lld.c
@@ -83,7 +83,7 @@ void hal_lld_init(void) {
                   SysTick_CTRL_ENABLE_Msk |
                   SysTick_CTRL_TICKINT_Msk;
 
-#if CH_HAL_USE_ADC || CH_HAL_USE_SPI
+#if CH_HAL_USE_ADC || CH_HAL_USE_SPI || CH_HAL_USE_UART
   dmaInit();
 #endif
 }
diff --git a/os/kernel/include/ch.h b/os/kernel/include/ch.h
index d048b99b7..58be5472a 100644
--- a/os/kernel/include/ch.h
+++ b/os/kernel/include/ch.h
@@ -39,7 +39,7 @@
 /**
  * @brief   Kernel version string.
  */
-#define CH_KERNEL_VERSION       "2.1.2unstable"
+#define CH_KERNEL_VERSION       "2.1.3unstable"
 
 /**
  * @brief   Kernel version major number.
@@ -54,7 +54,7 @@
 /**
  * @brief   Kernel version patch number.
  */
-#define CH_KERNEL_PATCH         2
+#define CH_KERNEL_PATCH         3
 
 /*
  * Common values.
diff --git a/readme.txt b/readme.txt
index 44a9c0405..452d9884a 100644
--- a/readme.txt
+++ b/readme.txt
@@ -63,6 +63,9 @@
 *** Releases                                                              ***
 *****************************************************************************
 
+*** 2.1.3 ***
+- FIX: DMA not initialized under some conditions (bug 3099701).
+
 *** 2.1.2 ***
 - FIX: Fixed typo in memstreams.h (bug 3089567)(backported to 2.0.6).
 - FIX: Fixed wrong macro check in LPC214x and AT91SAM7 serial drivers (bug
-- 
cgit v1.2.3