From ecc23fc6fa3c3a866cf8dbbb0a118adbe7e61568 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Fri, 7 Apr 2023 12:25:27 -0400 Subject: [PATCH] stm32: Prefer "MACH_STM32F1" test over "MACH_STM32F103 || MACH_N32G45x" Signed-off-by: Kevin O'Connor --- src/stm32/hard_pwm.c | 2 +- src/stm32/usbfs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/stm32/hard_pwm.c b/src/stm32/hard_pwm.c index 6f7d8d08..dbed84c1 100644 --- a/src/stm32/hard_pwm.c +++ b/src/stm32/hard_pwm.c @@ -20,7 +20,7 @@ struct gpio_pwm_info { }; static const struct gpio_pwm_info pwm_regs[] = { -#if CONFIG_MACH_STM32F103 || CONFIG_MACH_N32G45x +#if CONFIG_MACH_STM32F1 {TIM2, GPIO('A', 0), 1, GPIO_FUNCTION(2)}, {TIM2, GPIO('A', 1), 2, GPIO_FUNCTION(2)}, {TIM2, GPIO('A', 2), 3, GPIO_FUNCTION(2)}, diff --git a/src/stm32/usbfs.c b/src/stm32/usbfs.c index f2c3057f..fda2ce9d 100644 --- a/src/stm32/usbfs.c +++ b/src/stm32/usbfs.c @@ -15,7 +15,7 @@ #include "internal.h" // GPIO #include "sched.h" // DECL_INIT -#if CONFIG_MACH_STM32F103 || CONFIG_MACH_STM32G4 || CONFIG_MACH_N32G45x +#if CONFIG_MACH_STM32F1 || CONFIG_MACH_STM32G4 // Transfer memory is accessed with 32bits, but contains only 16bits of data typedef volatile uint32_t epmword_t; #define WSIZE 2