[stm32] boards: convert remaining RCC_APB2x

paparazzi · Feb 21, 2014 · 6e73c99 · 6e73c99
1 parent 64f80c6
commit 6e73c99
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 25 deletions.
diff --git a/sw/airborne/boards/lisa_l_1.0.h b/sw/airborne/boards/lisa_l_1.0.h
@@ -18,23 +18,23 @@
 
 /* SPI slave mapping */
 
-#define SPI_SELECT_SLAVE0_PERIPH RCC_APB2ENR_IOPAEN
+#define SPI_SELECT_SLAVE0_PERIPH RCC_GPIOA
 #define SPI_SELECT_SLAVE0_PORT GPIOA
 #define SPI_SELECT_SLAVE0_PIN GPIO15
 
-#define SPI_SELECT_SLAVE1_PERIPH RCC_APB2ENR_IOPAEN
+#define SPI_SELECT_SLAVE1_PERIPH RCC_GPIOA
 #define SPI_SELECT_SLAVE1_PORT GPIOA
 #define SPI_SELECT_SLAVE1_PIN GPIO4
 
-#define SPI_SELECT_SLAVE2_PERIPH RCC_APB2ENR_IOPBEN
+#define SPI_SELECT_SLAVE2_PERIPH RCC_GPIOB
 #define SPI_SELECT_SLAVE2_PORT GPIOB
 #define SPI_SELECT_SLAVE2_PIN GPIO12
 
-#define SPI_SELECT_SLAVE3_PERIPH RCC_APB2ENR_IOPCEN
+#define SPI_SELECT_SLAVE3_PERIPH RCC_GPIOC
 #define SPI_SELECT_SLAVE3_PORT GPIOC
 #define SPI_SELECT_SLAVE3_PIN GPIO13
 
-#define SPI_SELECT_SLAVE4_PERIPH RCC_APB2ENR_IOPCEN
+#define SPI_SELECT_SLAVE4_PERIPH RCC_GPIOC
 #define SPI_SELECT_SLAVE4_PORT GPIOC
 #define SPI_SELECT_SLAVE4_PIN GPIO12
 
@@ -206,7 +206,7 @@
 #if USE_PWM1
 #define PWM_SERVO_1 0
 #define PWM_SERVO_1_TIMER TIM3
-#define PWM_SERVO_1_RCC RCC_APB2ENR_IOPCEN
+#define PWM_SERVO_1_RCC RCC_GPIOC
 #define PWM_SERVO_1_GPIO GPIOC
 #define PWM_SERVO_1_PIN GPIO6
 #define PWM_SERVO_1_AF 0
@@ -219,7 +219,7 @@
 #if USE_PWM2
 #define PWM_SERVO_2 1
 #define PWM_SERVO_2_TIMER TIM3
-#define PWM_SERVO_2_RCC RCC_APB2ENR_IOPCEN
+#define PWM_SERVO_2_RCC RCC_GPIOC
 #define PWM_SERVO_2_GPIO GPIOC
 #define PWM_SERVO_2_PIN GPIO7
 #define PWM_SERVO_2_AF 0
@@ -232,7 +232,7 @@
 #if USE_PWM3
 #define PWM_SERVO_3 2
 #define PWM_SERVO_3_TIMER TIM3
-#define PWM_SERVO_3_RCC RCC_APB2ENR_IOPCEN
+#define PWM_SERVO_3_RCC RCC_GPIOC
 #define PWM_SERVO_3_GPIO GPIOC
 #define PWM_SERVO_3_PIN GPIO8
 #define PWM_SERVO_3_AF 0
@@ -245,7 +245,7 @@
 #if USE_PWM4
 #define PWM_SERVO_4 3
 #define PWM_SERVO_4_TIMER TIM3
-#define PWM_SERVO_4_RCC RCC_APB2ENR_IOPCEN
+#define PWM_SERVO_4_RCC RCC_GPIOC
 #define PWM_SERVO_4_GPIO GPIOC
 #define PWM_SERVO_4_PIN GPIO9
 #define PWM_SERVO_4_AF 0
@@ -258,7 +258,7 @@
 #if USE_PWM5
 #define PWM_SERVO_5 4
 #define PWM_SERVO_5_TIMER TIM4
-#define PWM_SERVO_5_RCC RCC_APB2ENR_IOPBEN
+#define PWM_SERVO_5_RCC RCC_GPIOB
 #define PWM_SERVO_5_GPIO GPIOB
 #define PWM_SERVO_5_PIN GPIO8
 #define PWM_SERVO_5_AF 0
@@ -271,7 +271,7 @@
 #if USE_PWM6
 #define PWM_SERVO_6 5
 #define PWM_SERVO_6_TIMER TIM4
-#define PWM_SERVO_6_RCC RCC_APB2ENR_IOPBEN
+#define PWM_SERVO_6_RCC RCC_GPIOB
 #define PWM_SERVO_6_GPIO GPIOB
 #define PWM_SERVO_6_PIN GPIO9
 #define PWM_SERVO_6_AF 0

diff --git a/sw/airborne/boards/lisa_m_common.h b/sw/airborne/boards/lisa_m_common.h
@@ -246,7 +246,7 @@
 #if USE_PWM1
 #define PWM_SERVO_1 0
 #define PWM_SERVO_1_TIMER TIM3
-#define PWM_SERVO_1_RCC RCC_APB2ENR_IOPCEN
+#define PWM_SERVO_1_RCC RCC_GPIOC
 #define PWM_SERVO_1_GPIO GPIOC
 #define PWM_SERVO_1_PIN GPIO6
 #define PWM_SERVO_1_AF 0
@@ -259,7 +259,7 @@
 #if USE_PWM2
 #define PWM_SERVO_2 1
 #define PWM_SERVO_2_TIMER TIM3
-#define PWM_SERVO_2_RCC RCC_APB2ENR_IOPCEN
+#define PWM_SERVO_2_RCC RCC_GPIOC
 #define PWM_SERVO_2_GPIO GPIOC
 #define PWM_SERVO_2_PIN GPIO7
 #define PWM_SERVO_2_AF 0
@@ -272,7 +272,7 @@
 #if USE_PWM3
 #define PWM_SERVO_3 2
 #define PWM_SERVO_3_TIMER TIM3
-#define PWM_SERVO_3_RCC RCC_APB2ENR_IOPCEN
+#define PWM_SERVO_3_RCC RCC_GPIOC
 #define PWM_SERVO_3_GPIO GPIOC
 #define PWM_SERVO_3_PIN GPIO8
 #define PWM_SERVO_3_AF 0
@@ -285,7 +285,7 @@
 #if USE_PWM4
 #define PWM_SERVO_4 3
 #define PWM_SERVO_4_TIMER TIM3
-#define PWM_SERVO_4_RCC RCC_APB2ENR_IOPCEN
+#define PWM_SERVO_4_RCC RCC_GPIOC
 #define PWM_SERVO_4_GPIO GPIOC
 #define PWM_SERVO_4_PIN GPIO9
 #define PWM_SERVO_4_AF 0
@@ -298,7 +298,7 @@
 #if USE_PWM5
 #define PWM_SERVO_5 4
 #define PWM_SERVO_5_TIMER TIM5
-#define PWM_SERVO_5_RCC RCC_APB2ENR_IOPAEN
+#define PWM_SERVO_5_RCC RCC_GPIOA
 #define PWM_SERVO_5_GPIO GPIOA
 #define PWM_SERVO_5_PIN GPIO0
 #define PWM_SERVO_5_AF 0
@@ -311,7 +311,7 @@
 #if USE_PWM6
 #define PWM_SERVO_6 5
 #define PWM_SERVO_6_TIMER TIM5
-#define PWM_SERVO_6_RCC RCC_APB2ENR_IOPAEN
+#define PWM_SERVO_6_RCC RCC_GPIOA
 #define PWM_SERVO_6_GPIO GPIOA
 #define PWM_SERVO_6_PIN GPIO1
 #define PWM_SERVO_6_AF 0
@@ -324,7 +324,7 @@
 #if USE_PWM7
 #define PWM_SERVO_7 6
 #define PWM_SERVO_7_TIMER TIM4
-#define PWM_SERVO_7_RCC RCC_APB2ENR_IOPBEN
+#define PWM_SERVO_7_RCC RCC_GPIOB
 #define PWM_SERVO_7_GPIO GPIOB
 #define PWM_SERVO_7_PIN GPIO6
 #define PWM_SERVO_7_AF 0
@@ -337,7 +337,7 @@
 #if USE_PWM8
 #define PWM_SERVO_8 7
 #define PWM_SERVO_8_TIMER TIM4
-#define PWM_SERVO_8_RCC RCC_APB2ENR_IOPBEN
+#define PWM_SERVO_8_RCC RCC_GPIOB
 #define PWM_SERVO_8_GPIO GPIOB
 #define PWM_SERVO_8_PIN GPIO7
 #define PWM_SERVO_8_AF 0

diff --git a/sw/airborne/boards/lisa_s_0.1.h b/sw/airborne/boards/lisa_s_0.1.h
@@ -307,7 +307,7 @@
 #if USE_PWM1
 #define PWM_SERVO_1 4
 #define PWM_SERVO_1_TIMER TIM4
-#define PWM_SERVO_1_RCC RCC_APB2ENR_IOPBEN
+#define PWM_SERVO_1_RCC RCC_GPIOB
 #define PWM_SERVO_1_GPIO GPIOB
 #define PWM_SERVO_1_PIN GPIO6
 #define PWM_SERVO_1_AF 0
@@ -320,7 +320,7 @@
 #if USE_PWM2
 #define PWM_SERVO_2 5
 #define PWM_SERVO_2_TIMER TIM4
-#define PWM_SERVO_2_RCC RCC_APB2ENR_IOPBEN
+#define PWM_SERVO_2_RCC RCC_GPIOB
 #define PWM_SERVO_2_GPIO GPIOB
 #define PWM_SERVO_2_PIN GPIO7
 #define PWM_SERVO_2_AF 0
@@ -333,7 +333,7 @@
 #if USE_PWM3
 #define PWM_SERVO_3 0
 #define PWM_SERVO_3_TIMER TIM4
-#define PWM_SERVO_3_RCC RCC_APB2ENR_IOPBEN
+#define PWM_SERVO_3_RCC RCC_GPIOB
 #define PWM_SERVO_3_GPIO GPIOB
 #define PWM_SERVO_3_PIN GPIO8
 #define PWM_SERVO_3_AF 0
@@ -346,7 +346,7 @@
 #if USE_PWM4
 #define PWM_SERVO_4 1
 #define PWM_SERVO_4_TIMER TIM4
-#define PWM_SERVO_4_RCC RCC_APB2ENR_IOPBEN
+#define PWM_SERVO_4_RCC RCC_GPIOB
 #define PWM_SERVO_4_GPIO GPIOB
 #define PWM_SERVO_4_PIN GPIO9
 #define PWM_SERVO_4_AF 0
@@ -359,7 +359,7 @@
 #if USE_PWM5
 #define PWM_SERVO_5 2
 #define PWM_SERVO_5_TIMER TIM5
-#define PWM_SERVO_5_RCC RCC_APB2ENR_IOPAEN
+#define PWM_SERVO_5_RCC RCC_GPIOA
 #define PWM_SERVO_5_GPIO GPIOA
 #define PWM_SERVO_5_PIN GPIO0
 #define PWM_SERVO_5_AF 0
@@ -372,7 +372,7 @@
 #if USE_PWM6
 #define PWM_SERVO_6 3
 #define PWM_SERVO_6_TIMER TIM5
-#define PWM_SERVO_6_RCC RCC_APB2ENR_IOPAEN
+#define PWM_SERVO_6_RCC RCC_GPIOA
 #define PWM_SERVO_6_GPIO GPIOA
 #define PWM_SERVO_6_PIN GPIO1
 #define PWM_SERVO_6_AF 0