baords: fixed timer config for stm32f1 based boards

7 years ago · eeea9c9cfb
parent be2100e2eb
commit eeea9c9cfb
4 changed files with 52 additions and 16 deletions
--- a/boards/fox/include/periph_conf.h
+++ b/boards/fox/include/periph_conf.h
@ -51,13 +51,22 @@ extern "C" {
 /** @} */

 /**
- * @brief Timer configuration
+ * @brief   Timer configuration
 * @{
 */
 static const timer_conf_t timer_config[] = {
-    /* device, APB bus, rcc_bit */
-    { TIM2, APB1, RCC_APB1ENR_TIM2EN, TIM2_IRQn },
-    { TIM3, APB1, RCC_APB1ENR_TIM3EN, TIM3_IRQn }
+    {
+        .dev     = TIM2,
+        .rcc_bit = RCC_APB1ENR_TIM2EN,
+        .bus     = APB1,
+        .irqn    = TIM2_IRQn
+    },
+    {
+        .dev     = TIM3,
+        .rcc_bit = RCC_APB1ENR_TIM3EN,
+        .bus     = APB1,
+        .irqn    = TIM3_IRQn
+    }
 };

 #define TIMER_0_ISR         isr_tim2
--- a/boards/iotlab-m3/include/periph_conf.h
+++ b/boards/iotlab-m3/include/periph_conf.h
@ -57,13 +57,22 @@ extern "C" {
 /** @} */

 /**
- * @brief Timer configuration
+ * @brief   Timer configuration
 * @{
 */
 static const timer_conf_t timer_config[] = {
-    /* device, APB bus, rcc_bit */
-    { TIM2, APB1, RCC_APB1ENR_TIM2EN, TIM2_IRQn },
-    { TIM3, APB1, RCC_APB1ENR_TIM3EN, TIM3_IRQn }
+    {
+        .dev     = TIM2,
+        .rcc_bit = RCC_APB1ENR_TIM2EN,
+        .bus     = APB1,
+        .irqn    = TIM2_IRQn
+    },
+    {
+        .dev     = TIM3,
+        .rcc_bit = RCC_APB1ENR_TIM3EN,
+        .bus     = APB1,
+        .irqn    = TIM3_IRQn
+    }
 };

 #define TIMER_0_ISR         isr_tim2
--- a/boards/nucleo-f103/include/periph_conf.h
+++ b/boards/nucleo-f103/include/periph_conf.h
@ -53,13 +53,22 @@ extern "C" {
 /** @} */

 /**
- * @brief Timer configuration
+ * @brief   Timer configuration
 * @{
 */
 static const timer_conf_t timer_config[] = {
-    /* device, APB bus, rcc_bit */
-    { TIM2, APB1, RCC_APB1ENR_TIM2EN, TIM2_IRQn },
-    { TIM3, APB1, RCC_APB1ENR_TIM3EN, TIM3_IRQn }
+    {
+        .dev     = TIM2,
+        .rcc_bit = RCC_APB1ENR_TIM2EN,
+        .bus     = APB1,
+        .irqn    = TIM2_IRQn
+    },
+    {
+        .dev     = TIM3,
+        .rcc_bit = RCC_APB1ENR_TIM3EN,
+        .bus     = APB1,
+        .irqn    = TIM3_IRQn
+    }
 };

 #define TIMER_0_ISR         isr_tim2
--- a/boards/spark-core/include/periph_conf.h
+++ b/boards/spark-core/include/periph_conf.h
@ -51,13 +51,22 @@
 /** @} */

 /**
- * @brief Timer configuration
+ * @brief   Timer configuration
 * @{
 */
 static const timer_conf_t timer_config[] = {
-    /* device, APB bus, rcc_bit */
-    { TIM2, APB1, RCC_APB1ENR_TIM2EN, TIM2_IRQn },
-    { TIM3, APB1, RCC_APB1ENR_TIM3EN, TIM3_IRQn }
+    {
+        .dev     = TIM2,
+        .rcc_bit = RCC_APB1ENR_TIM2EN,
+        .bus     = APB1,
+        .irqn    = TIM2_IRQn
+    },
+    {
+        .dev     = TIM3,
+        .rcc_bit = RCC_APB1ENR_TIM3EN,
+        .bus     = APB1,
+        .irqn    = TIM3_IRQn
+    }
 };

 #define TIMER_0_ISR         isr_tim2