git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2031 35acf78f-673a-0410-8e92-d51de3d6d3f4

os/hal/platforms/STM32/hal_lld_f103.h

@@ -325,18 +325,21 @@
 #endif
 
 /**
- * @brief   Timers clocks.
+ * @brief   Timers 2, 3, 4, 5, 6, 7, 12, 13, 14 clock.
  */
 #if (STM32_PPRE1 == STM32_PPRE1_DIV1) || defined(__DOXYGEN__)
-#define STM32_TIMCLK1   (STM32_PCLK1 * 1)
+#define STM32_TIMCLK1               (STM32_PCLK1 * 1)
 #else
-#define STM32_TIMCLK1   (STM32_PCLK1 * 2)
+#define STM32_TIMCLK1               (STM32_PCLK1 * 2)
 #endif
 
+/**
+ * @brief   Timers 1, 8, 9, 10 and 11 clock.
+ */
 #if (STM32_PPRE2 == STM32_PPRE2_DIV1) || defined(__DOXYGEN__)
-#define STM32_TIMCLK2   (STM32_PCLK2 * 1)
+#define STM32_TIMCLK2               (STM32_PCLK2 * 1)
 #else
-#define STM32_TIMCLK2   (STM32_PCLK2 * 2)
+#define STM32_TIMCLK2               (STM32_PCLK2 * 2)
 #endif
 
 /**

os/hal/platforms/STM32/hal_lld_f105_f107.h

@@ -426,6 +426,24 @@
 #error "STM32_ADCCLK exceeding maximum frequency (14MHz)"
 #endif
 
+/**
+ * @brief   Timers 2, 3, 4, 5, 6, 7 clock.
+ */
+#if (STM32_PPRE1 == STM32_PPRE1_DIV1) || defined(__DOXYGEN__)
+#define STM32_TIMCLK1               (STM32_PCLK1 * 1)
+#else
+#define STM32_TIMCLK1               (STM32_PCLK1 * 2)
+#endif
+
+/**
+ * @brief   Timer 1 clock.
+ */
+#if (STM32_PPRE2 == STM32_PPRE2_DIV1) || defined(__DOXYGEN__)
+#define STM32_TIMCLK2               (STM32_PCLK2 * 1)
+#else
+#define STM32_TIMCLK2               (STM32_PCLK2 * 2)
+#endif
+
 /**
  * @brief   Flash settings.
  */

readme.txt

@@ -65,6 +65,8 @@
   in 2.0.1).
 - FIX: Fixed broken AVR port (bug 3016619)(backported in 2.0.0).
 - FIX: Fixed assertion in adcStop() (bug 3015109)(backported in 2.0.0).
+- NEW: Added timers clock macros to the STM32 clock tree HAL driver (backported
+  in 2.0.1).
 - OPT: Simplified the test suite code, now it is smaller.
 - Reorganized the documentation, now the description of the device drivers
   implementation is under the HAL module instead of the Ports module.