aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2023-04-07 12:25:27 -0400
committerKevin O'Connor <kevin@koconnor.net>2023-04-07 12:25:27 -0400
commitecc23fc6fa3c3a866cf8dbbb0a118adbe7e61568 (patch)
treee4672d221f021f39bd06d116cc9b63eec1a4a3d5
parentef34c5bb5d026203396969dd6c3120d900ad64b9 (diff)
downloadkutter-ecc23fc6fa3c3a866cf8dbbb0a118adbe7e61568.tar.gz
kutter-ecc23fc6fa3c3a866cf8dbbb0a118adbe7e61568.tar.xz
kutter-ecc23fc6fa3c3a866cf8dbbb0a118adbe7e61568.zip
stm32: Prefer "MACH_STM32F1" test over "MACH_STM32F103 || MACH_N32G45x"
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
-rw-r--r--src/stm32/hard_pwm.c2
-rw-r--r--src/stm32/usbfs.c2
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