summaryrefslogtreecommitdiff
path: root/board/servo_v4
diff options
context:
space:
mode:
Diffstat (limited to 'board/servo_v4')
-rw-r--r--board/servo_v4/board.c10
-rw-r--r--board/servo_v4/usb_pd_config.h10
2 files changed, 10 insertions, 10 deletions
diff --git a/board/servo_v4/board.c b/board/servo_v4/board.c
index 982ed9ccfb..6890027346 100644
--- a/board/servo_v4/board.c
+++ b/board/servo_v4/board.c
@@ -41,7 +41,7 @@
void board_config_pre_init(void)
{
/* enable SYSCFG clock */
- STM32_RCC_APB2ENR |= 1 << 0;
+ STM32_RCC_APB2ENR |= BIT(0);
/*
* the DMA mapping is :
@@ -60,13 +60,13 @@ void board_config_pre_init(void)
* Reference Manual
*/
/* Remap USART1 Tx from DMA channel 2 to channel 4 */
- STM32_SYSCFG_CFGR1 |= (1 << 9);
+ STM32_SYSCFG_CFGR1 |= BIT(9);
/* Remap USART1 Rx from DMA channel 3 to channel 5 */
- STM32_SYSCFG_CFGR1 |= (1 << 10);
+ STM32_SYSCFG_CFGR1 |= BIT(10);
/* Remap TIM3_CH1 from DMA channel 4 to channel 6 */
- STM32_SYSCFG_CFGR1 |= (1 << 30);
+ STM32_SYSCFG_CFGR1 |= BIT(30);
/* Remap SPI2 Tx from DMA channel 5 to channel 7 */
- STM32_SYSCFG_CFGR1 |= (1 << 24);
+ STM32_SYSCFG_CFGR1 |= BIT(24);
}
/******************************************************************************
diff --git a/board/servo_v4/usb_pd_config.h b/board/servo_v4/usb_pd_config.h
index 56c8d3aa02..41963a8360 100644
--- a/board/servo_v4/usb_pd_config.h
+++ b/board/servo_v4/usb_pd_config.h
@@ -83,7 +83,7 @@ static inline void spi_enable_clock(int port)
* EXTI line 22 is connected to the CMP2 output,
* CHG uses CMP2, and DUT uses CMP1.
*/
-#define EXTI_COMP_MASK(p) ((p) ? (1<<21) : (1 << 22))
+#define EXTI_COMP_MASK(p) ((p) ? (1<<21) : BIT(22))
#define IRQ_COMP STM32_IRQ_COMP
/* triggers packet detection on comparator falling edge */
@@ -119,12 +119,12 @@ static inline void pd_tx_spi_reset(int port)
{
if (port == 0) {
/* Reset SPI1 */
- STM32_RCC_APB2RSTR |= (1 << 12);
- STM32_RCC_APB2RSTR &= ~(1 << 12);
+ STM32_RCC_APB2RSTR |= BIT(12);
+ STM32_RCC_APB2RSTR &= ~BIT(12);
} else {
/* Reset SPI2 */
- STM32_RCC_APB1RSTR |= (1 << 14);
- STM32_RCC_APB1RSTR &= ~(1 << 14);
+ STM32_RCC_APB1RSTR |= BIT(14);
+ STM32_RCC_APB1RSTR &= ~BIT(14);
}
}