From 0faef9a2928309385c52f25fb892ac46ced093ab Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sat, 3 Dec 2011 08:49:51 +0000
Subject: Fixed bug 3449139, increased version numbers.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3552 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 docs/Doxyfile_chm                    | 2 +-
 docs/Doxyfile_html                   | 2 +-
 docs/rsc/header_chm.html             | 2 +-
 docs/rsc/header_html.html            | 2 +-
 os/hal/platforms/STM32F4xx/hal_lld.c | 7 ++++++-
 os/hal/platforms/STM32L1xx/hal_lld.c | 8 ++++++--
 os/kernel/include/ch.h               | 4 ++--
 readme.txt                           | 1 +
 8 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/docs/Doxyfile_chm b/docs/Doxyfile_chm
index bcda68230..c1333cd33 100644
--- a/docs/Doxyfile_chm
+++ b/docs/Doxyfile_chm
@@ -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.3.4
+PROJECT_NUMBER         = 2.3.5
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer
diff --git a/docs/Doxyfile_html b/docs/Doxyfile_html
index 5cba063d7..bbf7156a0 100644
--- a/docs/Doxyfile_html
+++ b/docs/Doxyfile_html
@@ -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.3.4
+PROJECT_NUMBER         = 2.3.5
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer
diff --git a/docs/rsc/header_chm.html b/docs/rsc/header_chm.html
index 1365da6dd..4ce33e42f 100644
--- a/docs/rsc/header_chm.html
+++ b/docs/rsc/header_chm.html
@@ -13,7 +13,7 @@
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">ChibiOS/RT&#160;<span id="projectnumber">2.3.4</span></div>
+   <div id="projectname">ChibiOS/RT&#160;<span id="projectnumber">2.3.5</span></div>
   </td>
  </tr>
  </tbody>
diff --git a/docs/rsc/header_html.html b/docs/rsc/header_html.html
index 202da80ca..243097201 100644
--- a/docs/rsc/header_html.html
+++ b/docs/rsc/header_html.html
@@ -20,7 +20,7 @@ $(document).ready(initResizable);
  <tbody>
  <tr style="height: 92px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">ChibiOS/RT<br><span id="projectnumber">2.3.4</span></div>
+   <div id="projectname">ChibiOS/RT<br><span id="projectnumber">2.3.5</span></div>
   </td>
   <td style="padding-left: 3em;">
 <script type="text/javascript"><!--
diff --git a/os/hal/platforms/STM32F4xx/hal_lld.c b/os/hal/platforms/STM32F4xx/hal_lld.c
index 5033c41c8..6922ff3df 100644
--- a/os/hal/platforms/STM32F4xx/hal_lld.c
+++ b/os/hal/platforms/STM32F4xx/hal_lld.c
@@ -62,8 +62,9 @@ void hal_lld_init(void) {
      been initialized in the board initialization file (board.c).*/
   rccResetAHB1(!0);
   rccResetAHB2(!0);
+  rccResetAHB3(!0);
   rccResetAPB1(!RCC_APB1RSTR_PWRRST);
-  rccResetAPB2(!RCC_APB2RSTR_SYSCFGRST);
+  rccResetAPB2(!0);
 
   /* SysTick initialization using the system clock.*/
   SysTick->LOAD = STM32_HCLK / CH_FREQUENCY - 1;
@@ -152,6 +153,10 @@ void stm32_clock_init(void) {
     ;
 #endif
 #endif /* STM32_NO_INIT */
+
+  /* SYSCFG clock enabled here because it is a multi-functional unit shared
+     among multiple drivers.*/
+  rccEnableAPB2(RCC_APB2ENR_SYSCFGEN, TRUE);
 }
 
 /** @} */
diff --git a/os/hal/platforms/STM32L1xx/hal_lld.c b/os/hal/platforms/STM32L1xx/hal_lld.c
index c59aa3f1c..96b18a656 100644
--- a/os/hal/platforms/STM32L1xx/hal_lld.c
+++ b/os/hal/platforms/STM32L1xx/hal_lld.c
@@ -60,8 +60,8 @@ void hal_lld_init(void) {
 
   /* Reset of all peripherals.*/
   rccResetAHB(!RCC_AHBRSTR_FLITFRST);
-  rccResetAPB1(!0);
-  rccResetAPB2(!RCC_APB2RSTR_SYSCFGRST);
+  rccResetAPB1(!RCC_APB1RSTR_PWRRST);
+  rccResetAPB2(!0);
 
   /* SysTick initialization using the system clock.*/
   SysTick->LOAD = STM32_HCLK / CH_FREQUENCY - 1;
@@ -170,6 +170,10 @@ void stm32_clock_init(void) {
     ;
 #endif
 #endif /* STM32_NO_INIT */
+
+  /* SYSCFG clock enabled here because it is a multi-functional unit shared
+     among multiple drivers.*/
+  rccEnableAPB2(RCC_APB2ENR_SYSCFGEN, TRUE);
 }
 #else
 void stm32_clock_init(void) {}
diff --git a/os/kernel/include/ch.h b/os/kernel/include/ch.h
index e751e0fc5..14fefa558 100644
--- a/os/kernel/include/ch.h
+++ b/os/kernel/include/ch.h
@@ -40,7 +40,7 @@
 /**
  * @brief   Kernel version string.
  */
-#define CH_KERNEL_VERSION       "2.3.4unstable"
+#define CH_KERNEL_VERSION       "2.3.5unstable"
 
 /**
  * @name    Kernel version
@@ -59,7 +59,7 @@
 /**
  * @brief   Kernel version patch number.
  */
-#define CH_KERNEL_PATCH         4
+#define CH_KERNEL_PATCH         5
 /** @} */
 
 /*
diff --git a/readme.txt b/readme.txt
index c9fe0d8d9..cb5ef15ca 100644
--- a/readme.txt
+++ b/readme.txt
@@ -74,6 +74,7 @@
 *****************************************************************************
 
 *** 2.3.5 ***
+- FIX: Fixed SYSCFG clock not started in STM32L1/F4 HALs (bug 3449139).
 - FIX: Fixed wrong definitions in STM32L-Discovery board file (bug 3449076).
 
 *** 2.3.4 ***
-- 
cgit v1.2.3