From 3fa0c8a11e73cf3710da802dbd6fde9d6692ba8a Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Tue, 7 Feb 2012 19:00:57 +0000
Subject: [PATCH] Fixed bug 3484942.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_2.4.x@3935 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/STM32F2xx/adc_lld.h | 9 +++------
 os/hal/platforms/STM32F2xx/hal_lld.c | 4 ++--
 os/hal/platforms/STM32F4xx/adc_lld.h | 9 +++------
 os/kernel/include/ch.h               | 4 ++--
 readme.txt                           | 4 ++++
 9 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/docs/Doxyfile_chm b/docs/Doxyfile_chm
index e51860562..d2cf569b3 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.4.0
+PROJECT_NUMBER         = 2.4.1
 
 # 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 7e1bd6292..515f84d90 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.4.0
+PROJECT_NUMBER         = 2.4.1
 
 # 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 f1075c032..70f3ceb42 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.4.0</span></div>
+   <div id="projectname">ChibiOS/RT&#160;<span id="projectnumber">2.4.1</span></div>
   </td>
  </tr>
  </tbody>
diff --git a/docs/rsc/header_html.html b/docs/rsc/header_html.html
index a87ddb7b2..8bb21d9e3 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.4.0</span></div>
+   <div id="projectname">ChibiOS/RT<br><span id="projectnumber">2.4.1</span></div>
   </td>
   <td style="padding-left: 3em;">
 <script type="text/javascript"><!--
diff --git a/os/hal/platforms/STM32F2xx/adc_lld.h b/os/hal/platforms/STM32F2xx/adc_lld.h
index dfe681104..08e15d778 100644
--- a/os/hal/platforms/STM32F2xx/adc_lld.h
+++ b/os/hal/platforms/STM32F2xx/adc_lld.h
@@ -53,11 +53,8 @@
 
 /**
  * @brief   Maximum HSE  clock frequency.
- * @note    This value is arbitrary defined, the current datasheet does not
- *          define a maximum value (it is TBD). A value of 36MHz is mentioned
- *          but without relationship to VDD ranges.
  */
-#define STM32_ADCCLK_MAX        42000000
+#define STM32_ADCCLK_MAX        30000000
 /** @} */
 
 /**
@@ -130,9 +127,9 @@
 /**
  * @brief   ADC common clock divider.
  * @note    This setting is influenced by the VDDA voltage and other
- *          external conditions, please refer to the STM32L15x datasheet
+ *          external conditions, please refer to the STM32F2xx datasheet
  *          for more info.<br>
- *          See section 6.3.15 "12-bit ADC characteristics".
+ *          See section 5.3.20 "12-bit ADC characteristics".
  */
 #if !defined(STM32_ADC_ADCPRE) || defined(__DOXYGEN__)
 #define STM32_ADC_ADCPRE                    ADC_CCR_ADCPRE_DIV2
diff --git a/os/hal/platforms/STM32F2xx/hal_lld.c b/os/hal/platforms/STM32F2xx/hal_lld.c
index d2d6f99af..286b5752b 100644
--- a/os/hal/platforms/STM32F2xx/hal_lld.c
+++ b/os/hal/platforms/STM32F2xx/hal_lld.c
@@ -26,8 +26,8 @@
 */
 
 /**
- * @file    STM32F4xx/hal_lld.c
- * @brief   STM32F4xx HAL subsystem low level driver source.
+ * @file    STM32F2xx/hal_lld.c
+ * @brief   STM32F2xx HAL subsystem low level driver source.
  *
  * @addtogroup HAL
  * @{
diff --git a/os/hal/platforms/STM32F4xx/adc_lld.h b/os/hal/platforms/STM32F4xx/adc_lld.h
index 6649ceafc..559dd1c54 100644
--- a/os/hal/platforms/STM32F4xx/adc_lld.h
+++ b/os/hal/platforms/STM32F4xx/adc_lld.h
@@ -53,11 +53,8 @@
 
 /**
  * @brief   Maximum HSE  clock frequency.
- * @note    This value is arbitrary defined, the current datasheet does not
- *          define a maximum value (it is TBD). A value of 36MHz is mentioned
- *          but without relationship to VDD ranges.
  */
-#define STM32_ADCCLK_MAX        42000000
+#define STM32_ADCCLK_MAX        36000000
 /** @} */
 
 /**
@@ -130,9 +127,9 @@
 /**
  * @brief   ADC common clock divider.
  * @note    This setting is influenced by the VDDA voltage and other
- *          external conditions, please refer to the STM32L15x datasheet
+ *          external conditions, please refer to the STM32F4xx datasheet
  *          for more info.<br>
- *          See section 6.3.15 "12-bit ADC characteristics".
+ *          See section 5.3.20 "12-bit ADC characteristics".
  */
 #if !defined(STM32_ADC_ADCPRE) || defined(__DOXYGEN__)
 #define STM32_ADC_ADCPRE                    ADC_CCR_ADCPRE_DIV2
diff --git a/os/kernel/include/ch.h b/os/kernel/include/ch.h
index 4b10b023b..96e429bca 100644
--- a/os/kernel/include/ch.h
+++ b/os/kernel/include/ch.h
@@ -47,7 +47,7 @@
 /**
  * @brief   Kernel version string.
  */
-#define CH_KERNEL_VERSION       "2.4.0"
+#define CH_KERNEL_VERSION       "2.4.1"
 
 /**
  * @name    Kernel version
@@ -66,7 +66,7 @@
 /**
  * @brief   Kernel version patch number.
  */
-#define CH_KERNEL_PATCH         0
+#define CH_KERNEL_PATCH         1
 /** @} */
 
 /*
diff --git a/readme.txt b/readme.txt
index fea818f85..0d96d2543 100644
--- a/readme.txt
+++ b/readme.txt
@@ -78,6 +78,10 @@
 *** Releases                                                              ***
 *****************************************************************************
 
+*** 2.4.1 ***
+- FIX: Fixed various minor documentation errors and fixed ADC maximum
+  frequency limit in STM32F2/F4 ADC drivers (bug 3484942).
+
 *** 2.4.0 ***
 - NEW: Implemented new makefile system for ARM GCC ports, now objects,
   listings and output files are generated into a "build" directory and not