stm32: Rework #if pin definition clauses in hard_pwm.c

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

1 files changed, 50 insertions, 54 deletions

diff --git a/src/stm32/hard_pwm.c b/src/stm32/hard_pwm.c
index bc52e3ac..11cfb524 100644
--- a/src/stm32/hard_pwm.c
+++ b/src/stm32/hard_pwm.c
@@ -20,49 +20,6 @@ struct gpio_pwm_info {
 };
 
 static const struct gpio_pwm_info pwm_regs[] = {
-#if CONFIG_MACH_STM32H7
-    {TIM2, GPIO('A', 0),  1, GPIO_FUNCTION(1)},
-    {TIM2, GPIO('A', 5),  1, GPIO_FUNCTION(1)},
-    {TIM2, GPIO('A', 15), 1, GPIO_FUNCTION(1)},
-    {TIM2, GPIO('B', 3),  2, GPIO_FUNCTION(1)},
-    {TIM2, GPIO('A', 1),  2, GPIO_FUNCTION(1)},
-    {TIM2, GPIO('B', 10), 3, GPIO_FUNCTION(1)},
-    {TIM2, GPIO('A', 2),  3, GPIO_FUNCTION(1)},
-    {TIM3, GPIO('C', 6),  1, GPIO_FUNCTION(2)},
-    {TIM3, GPIO('B', 4),  1, GPIO_FUNCTION(2)},
-    {TIM3, GPIO('A', 6),  1, GPIO_FUNCTION(2)},
-    {TIM3, GPIO('C', 7),  2, GPIO_FUNCTION(2)},
-    {TIM3, GPIO('B', 5),  2, GPIO_FUNCTION(2)},
-    {TIM3, GPIO('A', 7),  2, GPIO_FUNCTION(2)},
-    {TIM3, GPIO('C', 8),  3, GPIO_FUNCTION(2)},
-    {TIM3, GPIO('B', 0),  3, GPIO_FUNCTION(2)},
-    {TIM4, GPIO('D', 12), 1, GPIO_FUNCTION(2)},
-    {TIM4, GPIO('B', 6),  1, GPIO_FUNCTION(2)},
-    {TIM4, GPIO('D', 13), 2, GPIO_FUNCTION(2)},
-    {TIM4, GPIO('B', 7),  2, GPIO_FUNCTION(2)},
-    {TIM4, GPIO('D', 14), 3, GPIO_FUNCTION(2)},
-    {TIM4, GPIO('B', 8),  3, GPIO_FUNCTION(2)},
-    {TIM5, GPIO('H', 10), 1, GPIO_FUNCTION(2)},
-    {TIM5, GPIO('A', 0),  1, GPIO_FUNCTION(2)},
-    {TIM5, GPIO('H', 11), 2, GPIO_FUNCTION(2)},
-    {TIM5, GPIO('A', 1),  2, GPIO_FUNCTION(2)},
-    {TIM5, GPIO('H', 12), 3, GPIO_FUNCTION(2)},
-    {TIM5, GPIO('A', 2),  3, GPIO_FUNCTION(2)},
-    {TIM12, GPIO('H', 6),  1, GPIO_FUNCTION(2)},
-    {TIM12, GPIO('B', 14), 1, GPIO_FUNCTION(2)},
-    {TIM12, GPIO('H', 9),  2, GPIO_FUNCTION(2)},
-    {TIM12, GPIO('B', 15), 2, GPIO_FUNCTION(2)},
-    {TIM13, GPIO('F', 8),  1, GPIO_FUNCTION(9)},
-    {TIM13, GPIO('A', 6),  1, GPIO_FUNCTION(9)},
-    {TIM14, GPIO('F', 9),  1, GPIO_FUNCTION(9)},
-    {TIM14, GPIO('A', 7),  1, GPIO_FUNCTION(9)},
-    {TIM15, GPIO('E', 5),  1, GPIO_FUNCTION(4)},
-    {TIM15, GPIO('A', 2),  1, GPIO_FUNCTION(4)},
-    {TIM16, GPIO('F', 6),  1, GPIO_FUNCTION(1)},
-    {TIM16, GPIO('B', 8),  1, GPIO_FUNCTION(1)},
-    {TIM17, GPIO('F', 7),  1, GPIO_FUNCTION(1)},
-    {TIM17, GPIO('B', 9),  1, GPIO_FUNCTION(1)}
-#endif
 #if CONFIG_MACH_STM32F103
     {TIM2, GPIO('A', 0),  1, GPIO_FUNCTION(2)},
     {TIM2, GPIO('A', 1),  2, GPIO_FUNCTION(2)},
@@ -88,22 +45,19 @@ static const struct gpio_pwm_info pwm_regs[] = {
     {TIM4, GPIO('B', 7),  2, GPIO_FUNCTION(2)},
     {TIM4, GPIO('B', 8),  3, GPIO_FUNCTION(2)},
     {TIM4, GPIO('B', 9),  4, GPIO_FUNCTION(2)}
-#endif
-#if CONFIG_MACH_STM32F401
+#elif CONFIG_MACH_STM32F4
+  #if CONFIG_MACH_STM32F401
     {TIM3,  GPIO('A',  6),  1, GPIO_FUNCTION(2)},
     {TIM3,  GPIO('C',  6),  1, GPIO_FUNCTION(3)},
     {TIM3,  GPIO('A',  7),  2, GPIO_FUNCTION(2)},
     {TIM3,  GPIO('C',  7),  2, GPIO_FUNCTION(3)},
     {TIM3,  GPIO('C',  8),  3, GPIO_FUNCTION(3)},
     {TIM3,  GPIO('C',  9),  4, GPIO_FUNCTION(3)},
-#endif
-#if CONFIG_MACH_STM32F446
+  #endif
+  #if CONFIG_MACH_STM32F446
     {TIM2,  GPIO('B',  2),  4, GPIO_FUNCTION(1)},
-#endif
-#if CONFIG_MACH_STM32F405 || \
-    CONFIG_MACH_STM32F407 || \
-    CONFIG_MACH_STM32F429 || \
-    CONFIG_MACH_STM32F446
+  #endif
+  #if CONFIG_MACH_STM32F4x5 || CONFIG_MACH_STM32F446
     {TIM8,  GPIO('C',  6),  1, GPIO_FUNCTION(3)},
     {TIM8,  GPIO('C',  7),  2, GPIO_FUNCTION(3)},
     {TIM8,  GPIO('C',  8),  3, GPIO_FUNCTION(3)},
@@ -115,8 +69,8 @@ static const struct gpio_pwm_info pwm_regs[] = {
     {TIM13, GPIO('F',  8),  1, GPIO_FUNCTION(9)},
     {TIM14, GPIO('A',  7),  1, GPIO_FUNCTION(9)},
     {TIM14, GPIO('F',  9),  1, GPIO_FUNCTION(9)},
-#endif
-#if CONFIG_MACH_STM32F4 // Pins that map to all klipper defined STM32F4 procs
+  #endif
+    // Pins that map to all klipper defined STM32F4 procs
     {TIM1,  GPIO('A',  8),  1, GPIO_FUNCTION(1)},
     {TIM1,  GPIO('E',  9),  1, GPIO_FUNCTION(1)},
     {TIM1,  GPIO('A',  9),  2, GPIO_FUNCTION(1)},
@@ -148,6 +102,48 @@ static const struct gpio_pwm_info pwm_regs[] = {
     {TIM9,  GPIO('E',  6),  2, GPIO_FUNCTION(3)},
     {TIM10, GPIO('B',  8),  1, GPIO_FUNCTION(3)},
     {TIM11, GPIO('B',  9),  1, GPIO_FUNCTION(3)}
+#elif CONFIG_MACH_STM32H7
+    {TIM2, GPIO('A', 0),  1, GPIO_FUNCTION(1)},
+    {TIM2, GPIO('A', 5),  1, GPIO_FUNCTION(1)},
+    {TIM2, GPIO('A', 15), 1, GPIO_FUNCTION(1)},
+    {TIM2, GPIO('B', 3),  2, GPIO_FUNCTION(1)},
+    {TIM2, GPIO('A', 1),  2, GPIO_FUNCTION(1)},
+    {TIM2, GPIO('B', 10), 3, GPIO_FUNCTION(1)},
+    {TIM2, GPIO('A', 2),  3, GPIO_FUNCTION(1)},
+    {TIM3, GPIO('C', 6),  1, GPIO_FUNCTION(2)},
+    {TIM3, GPIO('B', 4),  1, GPIO_FUNCTION(2)},
+    {TIM3, GPIO('A', 6),  1, GPIO_FUNCTION(2)},
+    {TIM3, GPIO('C', 7),  2, GPIO_FUNCTION(2)},
+    {TIM3, GPIO('B', 5),  2, GPIO_FUNCTION(2)},
+    {TIM3, GPIO('A', 7),  2, GPIO_FUNCTION(2)},
+    {TIM3, GPIO('C', 8),  3, GPIO_FUNCTION(2)},
+    {TIM3, GPIO('B', 0),  3, GPIO_FUNCTION(2)},
+    {TIM4, GPIO('D', 12), 1, GPIO_FUNCTION(2)},
+    {TIM4, GPIO('B', 6),  1, GPIO_FUNCTION(2)},
+    {TIM4, GPIO('D', 13), 2, GPIO_FUNCTION(2)},
+    {TIM4, GPIO('B', 7),  2, GPIO_FUNCTION(2)},
+    {TIM4, GPIO('D', 14), 3, GPIO_FUNCTION(2)},
+    {TIM4, GPIO('B', 8),  3, GPIO_FUNCTION(2)},
+    {TIM5, GPIO('H', 10), 1, GPIO_FUNCTION(2)},
+    {TIM5, GPIO('A', 0),  1, GPIO_FUNCTION(2)},
+    {TIM5, GPIO('H', 11), 2, GPIO_FUNCTION(2)},
+    {TIM5, GPIO('A', 1),  2, GPIO_FUNCTION(2)},
+    {TIM5, GPIO('H', 12), 3, GPIO_FUNCTION(2)},
+    {TIM5, GPIO('A', 2),  3, GPIO_FUNCTION(2)},
+    {TIM12, GPIO('H', 6),  1, GPIO_FUNCTION(2)},
+    {TIM12, GPIO('B', 14), 1, GPIO_FUNCTION(2)},
+    {TIM12, GPIO('H', 9),  2, GPIO_FUNCTION(2)},
+    {TIM12, GPIO('B', 15), 2, GPIO_FUNCTION(2)},
+    {TIM13, GPIO('F', 8),  1, GPIO_FUNCTION(9)},
+    {TIM13, GPIO('A', 6),  1, GPIO_FUNCTION(9)},
+    {TIM14, GPIO('F', 9),  1, GPIO_FUNCTION(9)},
+    {TIM14, GPIO('A', 7),  1, GPIO_FUNCTION(9)},
+    {TIM15, GPIO('E', 5),  1, GPIO_FUNCTION(4)},
+    {TIM15, GPIO('A', 2),  1, GPIO_FUNCTION(4)},
+    {TIM16, GPIO('F', 6),  1, GPIO_FUNCTION(1)},
+    {TIM16, GPIO('B', 8),  1, GPIO_FUNCTION(1)},
+    {TIM17, GPIO('F', 7),  1, GPIO_FUNCTION(1)},
+    {TIM17, GPIO('B', 9),  1, GPIO_FUNCTION(1)}
 #endif
 };