From 702d6495985451c7d37a7a46c639e694887a84c1 Mon Sep 17 00:00:00 2001
From: Marti Bolivar <mbolivar@leaflabs.com>
Date: Mon, 9 Apr 2012 13:56:03 -0400
Subject: stm32f2/rcc: Fix timer rcc_clk_id enumerators.

The timer enumerators are different tokens on F2 than they are on F1.
This is wrong (breaks portability), so fix it, and update the F2
rcc_dev_info table to match.

Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
---
 libmaple/stm32f2/include/series/rcc.h | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'libmaple/stm32f2/include')

diff --git a/libmaple/stm32f2/include/series/rcc.h b/libmaple/stm32f2/include/series/rcc.h
index 79bdf73..540eb66 100644
--- a/libmaple/stm32f2/include/series/rcc.h
+++ b/libmaple/stm32f2/include/series/rcc.h
@@ -807,18 +807,18 @@ typedef enum rcc_clk_id {
     RCC_SPI3,
     RCC_SPI2,
     RCC_WWDG,
-    RCC_TIM14,
-    RCC_TIM13,
-    RCC_TIM12,
-    RCC_TIM7,
-    RCC_TIM6,
-    RCC_TIM5,
-    RCC_TIM4,
-    RCC_TIM3,
-    RCC_TIM2,
-    RCC_TIM11,
-    RCC_TIM10,
-    RCC_TIM9,
+    RCC_TIMER14,
+    RCC_TIMER13,
+    RCC_TIMER12,
+    RCC_TIMER7,
+    RCC_TIMER6,
+    RCC_TIMER5,
+    RCC_TIMER4,
+    RCC_TIMER3,
+    RCC_TIMER2,
+    RCC_TIMER11,
+    RCC_TIMER10,
+    RCC_TIMER9,
     RCC_SYSCFG,
     RCC_SPI1,
     RCC_SDIO,
@@ -827,8 +827,8 @@ typedef enum rcc_clk_id {
     RCC_ADC1,
     RCC_USART6,
     RCC_USART1,
-    RCC_TIM8,
-    RCC_TIM1,
+    RCC_TIMER8,
+    RCC_TIMER1,
 } rcc_clk_id;
 
 /**
-- 
cgit v1.2.3