From ebcc14dabdd50ec9aca76b8209879c5c9f61ecb4 Mon Sep 17 00:00:00 2001 From: ALTracer Date: Thu, 28 Dec 2023 20:33:12 +0300 Subject: [PATCH] blackpill-f4: fixup! Review edits (bus turnaround) --- .../common/blackpill-f4/blackpill-f4.h | 34 +++++++------------ 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/src/platforms/common/blackpill-f4/blackpill-f4.h b/src/platforms/common/blackpill-f4/blackpill-f4.h index 95bd1d16fce..5b471a6d158 100644 --- a/src/platforms/common/blackpill-f4/blackpill-f4.h +++ b/src/platforms/common/blackpill-f4/blackpill-f4.h @@ -115,16 +115,8 @@ #define SWDIO_PORT TMS_PORT #define SWDIO_PIN TMS_PIN -#if 0 -#define TMS_SET_MODE() gpio_mode_setup(TMS_PORT, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, TMS_PIN); -#define SWDIO_MODE_FLOAT() gpio_mode_setup(SWDIO_PORT, GPIO_MODE_INPUT, GPIO_PUPD_NONE, SWDIO_PIN); - -#define SWDIO_MODE_DRIVE() gpio_mode_setup(SWDIO_PORT, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, SWDIO_PIN); - -#else - -#define SWDIO_MODE_REG_MULT_PB9 (1 << (9 << 1)) -#define SWDIO_MODE_REG_MULT_PB8 (1 << (8 << 1)) +#define SWDIO_MODE_REG_MULT_PB9 (1 << (9U << 1)) +#define SWDIO_MODE_REG_MULT_PB8 (1 << (8U << 1)) /* Update when adding more alternative pinouts */ #define SWDIO_MODE_REG_MULT PINOUT_SWITCH(SWDIO_MODE_REG_MULT_PB9, SWDIO_MODE_REG_MULT_PB8) #define SWDIO_MODE_REG GPIO_MODER(TMS_PORT) @@ -134,22 +126,20 @@ gpio_set_output_options(TMS_PORT, GPIO_OTYPE_PP, GPIO_OSPEED_2MHZ, TMS_PIN); /* Perform SWDIO bus turnaround faster than a gpio_mode_setup() call */ -#define SWDIO_MODE_FLOAT() \ - do { \ - uint32_t mode_reg = SWDIO_MODE_REG; \ - mode_reg &= ~(0x3 * SWDIO_MODE_REG_MULT); \ - SWDIO_MODE_REG = mode_reg; \ +#define SWDIO_MODE_FLOAT() \ + do { \ + uint32_t mode_reg = SWDIO_MODE_REG; \ + mode_reg &= ~(3U * SWDIO_MODE_REG_MULT); \ + SWDIO_MODE_REG = mode_reg; \ } while (0) -#define SWDIO_MODE_DRIVE() \ - do { \ - uint32_t mode_reg = SWDIO_MODE_REG; \ - mode_reg |= (1 * SWDIO_MODE_REG_MULT); \ - SWDIO_MODE_REG = mode_reg; \ +#define SWDIO_MODE_DRIVE() \ + do { \ + uint32_t mode_reg = SWDIO_MODE_REG; \ + mode_reg |= (1U * SWDIO_MODE_REG_MULT); \ + SWDIO_MODE_REG = mode_reg; \ } while (0) -#endif - #define TRST_PORT PINOUT_SWITCH(GPIOA, GPIOB) #define TRST_PIN PINOUT_SWITCH(GPIO6, GPIO3)