From e830caa11c88812d1c738c446c83946803e49d05 Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Sat, 6 Feb 2016 10:57:37 +0000
Subject: [PATCH] Fixed bug #698.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8838 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 doc/hal/Doxyfile_chm                     |  2 +-
 doc/hal/Doxyfile_html                    |  2 +-
 os/hal/include/hal.h                     |  4 ++--
 os/hal/ports/STM32/STM32F0xx/stm32_rcc.h | 18 +++++++++---------
 readme.txt                               |  8 +++++---
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/doc/hal/Doxyfile_chm b/doc/hal/Doxyfile_chm
index f3db17881..cf7ae25bc 100644
--- a/doc/hal/Doxyfile_chm
+++ b/doc/hal/Doxyfile_chm
@@ -38,7 +38,7 @@ PROJECT_NAME           = ChibiOS/HAL
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 4.0.0
+PROJECT_NUMBER         = 4.1.0
 
 # 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 a
diff --git a/doc/hal/Doxyfile_html b/doc/hal/Doxyfile_html
index 9fe01d526..14e5cfc3a 100644
--- a/doc/hal/Doxyfile_html
+++ b/doc/hal/Doxyfile_html
@@ -38,7 +38,7 @@ PROJECT_NAME           = ChibiOS/HAL
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 4.0.0
+PROJECT_NUMBER         = 4.1.0
 
 # 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 a
diff --git a/os/hal/include/hal.h b/os/hal/include/hal.h
index b030ae7ae..0f501c794 100644
--- a/os/hal/include/hal.h
+++ b/os/hal/include/hal.h
@@ -103,7 +103,7 @@
 /**
  * @brief   HAL version string.
  */
-#define HAL_VERSION             "4.0.0dev"
+#define HAL_VERSION             "4.1.0"
 
 /**
  * @brief   HAL version major number.
@@ -113,7 +113,7 @@
 /**
  * @brief   HAL version minor number.
  */
-#define CH_HAL_MINOR            0
+#define CH_HAL_MINOR            1
 
 /**
  * @brief   HAL version patch number.
diff --git a/os/hal/ports/STM32/STM32F0xx/stm32_rcc.h b/os/hal/ports/STM32/STM32F0xx/stm32_rcc.h
index 22b0e8806..82d923159 100644
--- a/os/hal/ports/STM32/STM32F0xx/stm32_rcc.h
+++ b/os/hal/ports/STM32/STM32F0xx/stm32_rcc.h
@@ -645,7 +645,7 @@
  *
  * @api
  */
-#define rccEnableTIM15(lp) rccEnableAPB1(RCC_APB2ENR_TIM15EN, lp)
+#define rccEnableTIM15(lp) rccEnableAPB2(RCC_APB2ENR_TIM15EN, lp)
 
 /**
  * @brief   Disables the TIM15 peripheral clock.
@@ -655,14 +655,14 @@
  *
  * @api
  */
-#define rccDisableTIM15(lp) rccDisableAPB1(RCC_APB2ENR_TIM15EN, lp)
+#define rccDisableTIM15(lp) rccDisableAPB2(RCC_APB2ENR_TIM15EN, lp)
 
 /**
  * @brief   Resets the TIM15 peripheral.
  *
  * @api
  */
-#define rccResetTIM15() rccResetAPB1(RCC_APB2RSTR_TIM15RST)
+#define rccResetTIM15() rccResetAPB2(RCC_APB2RSTR_TIM15RST)
 
 /**
  * @brief   Enables the TIM16 peripheral clock.
@@ -672,7 +672,7 @@
  *
  * @api
  */
-#define rccEnableTIM16(lp) rccEnableAPB1(RCC_APB2ENR_TIM16EN, lp)
+#define rccEnableTIM16(lp) rccEnableAPB2(RCC_APB2ENR_TIM16EN, lp)
 
 /**
  * @brief   Disables the TIM16 peripheral clock.
@@ -682,14 +682,14 @@
  *
  * @api
  */
-#define rccDisableTIM16(lp) rccDisableAPB1(RCC_APB2ENR_TIM16EN, lp)
+#define rccDisableTIM16(lp) rccDisableAPB2(RCC_APB2ENR_TIM16EN, lp)
 
 /**
  * @brief   Resets the TIM16 peripheral.
  *
  * @api
  */
-#define rccResetTIM16() rccResetAPB1(RCC_APB2RSTR_TIM16RST)
+#define rccResetTIM16() rccResetAPB2(RCC_APB2RSTR_TIM16RST)
 
 /**
  * @brief   Enables the TIM17 peripheral clock.
@@ -699,7 +699,7 @@
  *
  * @api
  */
-#define rccEnableTIM17(lp) rccEnableAPB1(RCC_APB2ENR_TIM17EN, lp)
+#define rccEnableTIM17(lp) rccEnableAPB2(RCC_APB2ENR_TIM17EN, lp)
 
 /**
  * @brief   Disables the TIM17 peripheral clock.
@@ -709,14 +709,14 @@
  *
  * @api
  */
-#define rccDisableTIM17(lp) rccDisableAPB1(RCC_APB2ENR_TIM17EN, lp)
+#define rccDisableTIM17(lp) rccDisableAPB2(RCC_APB2ENR_TIM17EN, lp)
 
 /**
  * @brief   Resets the TIM17 peripheral.
  *
  * @api
  */
-#define rccResetTIM17() rccResetAPB1(RCC_APB2RSTR_TIM17RST)
+#define rccResetTIM17() rccResetAPB2(RCC_APB2RSTR_TIM17RST)
 /** @} */
 
 /**
diff --git a/readme.txt b/readme.txt
index d22a5d2c2..4afea22b2 100644
--- a/readme.txt
+++ b/readme.txt
@@ -76,9 +76,11 @@
 - RT:  Removed the p_msg field from the thread_t structure saving a
        msg_t-sized field from the structure. Messages now use a new field
        into the p_u union. Now synchronous messages are even faster.
-- RT:  Fixed useless call to chTMStartMeasurementX() in _thread_init() 
-- VAR: Fixed missing time convesion in lwIP arch module (bug #697)
-       (backported to 3.0.6 and 16.1.3).
+- HAL: Fixed typos in STM32F0 RCC enable/disable macros (bug #698)(backported
+       to 16.1.2).
+- RT:  Fixed useless call to chTMStartMeasurementX() in _thread_init()
+       (bug #697)(backported to 3.0.6 and 16.1.3).
+- VAR: Fixed missing time conversion in lwIP arch module (bug #696)
        (backported to 2.6.10, 3.0.5 and 16.1.2).
 - HAL: Fixed incorrect handling of TIME_IMMEDIATE in the HAL buffer queues
        (bug #695)(backported to 16.1.2).