diff options
| author | Gwendal Grignou <gwendal@chromium.org> | 2019-03-11 16:07:55 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-03-26 04:42:56 -0700 |
| commit | ac77140b7f4f42075d2377fc9d956a636b05aacf (patch) | |
| tree | c64c6a30916ff741a2ab235141f7bd071cd54483 | |
| parent | bb266fc26fc05d4ab22de6ad7bce5b477c9f9140 (diff) | |
| download | chrome-ec-ac77140b7f4f42075d2377fc9d956a636b05aacf.tar.gz | |
common: bit change 1 << constants with BIT(constants)
Mechanical replacement of bit operation where operand is a constant.
More bit operation exist, but prone to errors.
Reveal a bug in npcx:
chip/npcx/system-npcx7.c:114:54: error: conversion from 'long unsigned int' to 'uint8_t' {aka 'volatile unsigned char'} changes value from '16777215' to '255' [-Werror=overflow]
BUG=None
BRANCH=None
TEST=None
Change-Id: I006614026143fa180702ac0d1cc2ceb1b3c6eeb0
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1518660
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
132 files changed, 511 insertions, 511 deletions
diff --git a/board/ampton/board.h b/board/ampton/board.h index 58b4844402..96b135d774 100644 --- a/board/ampton/board.h +++ b/board/ampton/board.h @@ -39,7 +39,7 @@ #define CONFIG_DYNAMIC_MOTION_SENSOR_COUNT /* Sensors without hardware FIFO are in forced mode */ -#define CONFIG_ACCEL_FORCE_MODE_MASK (1 << LID_ACCEL) +#define CONFIG_ACCEL_FORCE_MODE_MASK BIT(LID_ACCEL) #define CONFIG_LID_ANGLE #define CONFIG_LID_ANGLE_UPDATE diff --git a/board/atlas/board.h b/board/atlas/board.h index e37f72cd2f..aa94013c9d 100644 --- a/board/atlas/board.h +++ b/board/atlas/board.h @@ -215,7 +215,7 @@ enum sensor_id { }; /* LID_ALS needs to be polled */ -#define CONFIG_ACCEL_FORCE_MODE_MASK (1 << LID_ALS) +#define CONFIG_ACCEL_FORCE_MODE_MASK BIT(LID_ALS) enum adc_channel { ADC_AMON_BMON, diff --git a/board/bobba/board.h b/board/bobba/board.h index 1c508a2039..f210664f58 100644 --- a/board/bobba/board.h +++ b/board/bobba/board.h @@ -29,7 +29,7 @@ #define CONFIG_DYNAMIC_MOTION_SENSOR_COUNT /* Sensors without hardware FIFO are in forced mode */ -#define CONFIG_ACCEL_FORCE_MODE_MASK (1 << LID_ACCEL) +#define CONFIG_ACCEL_FORCE_MODE_MASK BIT(LID_ACCEL) /* Motion Sense Task Events */ #define CONFIG_ACCELGYRO_BMI160_INT_EVENT \ diff --git a/board/cheza/board.h b/board/cheza/board.h index 63aa937f0f..f9adee2690 100644 --- a/board/cheza/board.h +++ b/board/cheza/board.h @@ -214,7 +214,7 @@ void board_reset_pd_mcu(void); void base_detect_interrupt(enum gpio_signal signal); /* Sensors without hardware FIFO are in forced mode */ -#define CONFIG_ACCEL_FORCE_MODE_MASK (1 << LID_ALS) +#define CONFIG_ACCEL_FORCE_MODE_MASK BIT(LID_ALS) #endif /* !defined(__ASSEMBLER__) */ diff --git a/board/coral/board.h b/board/coral/board.h index db16a7d538..3a93a88e7c 100644 --- a/board/coral/board.h +++ b/board/coral/board.h @@ -319,7 +319,7 @@ int board_get_version(void); void board_set_tcpc_power_mode(int port, int mode); /* Sensors without hardware FIFO are in forced mode */ -#define CONFIG_ACCEL_FORCE_MODE_MASK (1 << LID_ACCEL) +#define CONFIG_ACCEL_FORCE_MODE_MASK BIT(LID_ACCEL) #endif /* !__ASSEMBLER__ */ diff --git a/board/eve/board.h b/board/eve/board.h index 5eed5b7613..fce7c0de91 100644 --- a/board/eve/board.h +++ b/board/eve/board.h @@ -150,7 +150,7 @@ #define CONFIG_GESTURE_TAP_THRES_MG 100 #define CONFIG_GESTURE_TAP_MAX_INTERSTICE_T 500 #define CONFIG_GESTURE_DETECTION_MASK \ - (1 << CONFIG_GESTURE_SENSOR_BATTERY_TAP) + BIT(CONFIG_GESTURE_SENSOR_BATTERY_TAP) /* USB */ #define CONFIG_USB_CHARGER @@ -299,7 +299,7 @@ void led_register_double_tap(void); void board_update_ac_status(void); /* Sensors without hardware FIFO are in forced mode */ -#define CONFIG_ACCEL_FORCE_MODE_MASK ((1 << LID_ACCEL) | (1 << LID_LIGHT)) +#define CONFIG_ACCEL_FORCE_MODE_MASK (BIT(LID_ACCEL) | BIT(LID_LIGHT)) #endif /* !__ASSEMBLER__ */ diff --git a/board/fizz/board.c b/board/fizz/board.c index e200c4722e..be1c65a8f0 100644 --- a/board/fizz/board.c +++ b/board/fizz/board.c @@ -711,7 +711,7 @@ static void setup_bj(void) switch (oem) { case OEM_KENCH: - bj = (BJ_ADAPTER_90W_MASK & (1 << sku)) ? + bj = (BJ_ADAPTER_90W_MASK & BIT(sku)) ? BJ_90W_19P5V : BJ_65W_19P5V; break; case OEM_TEEMO: @@ -720,14 +720,14 @@ static void setup_bj(void) case OEM_WUKONG_N: case OEM_WUKONG_A: case OEM_WUKONG_M: - bj = (BJ_ADAPTER_90W_MASK & (1 << sku)) ? + bj = (BJ_ADAPTER_90W_MASK & BIT(sku)) ? BJ_90W_19V : BJ_65W_19V; break; case OEM_JAX: bj = BJ_65W_19V; break; default: - bj = (BJ_ADAPTER_90W_MASK & (1 << sku)) ? + bj = (BJ_ADAPTER_90W_MASK & BIT(sku)) ? BJ_90W_19P5V : BJ_65W_19P5V; break; } diff --git a/board/flapjack/board.h b/board/flapjack/board.h index 3cf5bacc64..9877d2c1c9 100644 --- a/board/flapjack/board.h +++ b/board/flapjack/board.h @@ -94,7 +94,7 @@ #define ALS_COUNT 1 #define CONFIG_ALS_OPT3001 /* LID_ALS needs to be polled */ -#define CONFIG_ACCEL_FORCE_MODE_MASK (1 << LID_ALS) +#define CONFIG_ACCEL_FORCE_MODE_MASK BIT(LID_ALS) /* Camera VSYNC */ #define CONFIG_SYNC diff --git a/board/fleex/board.h b/board/fleex/board.h index 9184f85bd6..6ff03fd4c0 100644 --- a/board/fleex/board.h +++ b/board/fleex/board.h @@ -24,7 +24,7 @@ #define CONFIG_ACCEL_LIS2DE /* Lid accel */ #define CONFIG_ACCELGYRO_LSM6DSM /* Base accel */ /* Sensors without hardware FIFO are in forced mode */ -#define CONFIG_ACCEL_FORCE_MODE_MASK (1 << LID_ACCEL) +#define CONFIG_ACCEL_FORCE_MODE_MASK BIT(LID_ACCEL) #define CONFIG_DYNAMIC_MOTION_SENSOR_COUNT /* Volume button */ diff --git a/board/hatch/board.h b/board/hatch/board.h index ee4ea2fd1f..0548147c94 100644 --- a/board/hatch/board.h +++ b/board/hatch/board.h @@ -38,7 +38,7 @@ #define CONFIG_ACCELGYRO_BMI160_INT2_OUTPUT /* BMA253 Lid accel */ #define CONFIG_ACCEL_BMA255 -#define CONFIG_ACCEL_FORCE_MODE_MASK ((1 << LID_ACCEL) | (1 << LID_ALS)) +#define CONFIG_ACCEL_FORCE_MODE_MASK (BIT(LID_ACCEL) | BIT(LID_ALS)) #define CONFIG_LID_ANGLE #define CONFIG_LID_ANGLE_SENSOR_BASE BASE_ACCEL #define CONFIG_LID_ANGLE_SENSOR_LID LID_ACCEL diff --git a/board/meep/board.h b/board/meep/board.h index 7515a2ea40..39782aeaf8 100644 --- a/board/meep/board.h +++ b/board/meep/board.h @@ -29,7 +29,7 @@ #define CONFIG_ACCELGYRO_LSM6DSM /* Base accel */ /* Sensors without hardware FIFO are in forced mode */ -#define CONFIG_ACCEL_FORCE_MODE_MASK (1 << LID_ACCEL) +#define CONFIG_ACCEL_FORCE_MODE_MASK BIT(LID_ACCEL) #define CONFIG_DYNAMIC_MOTION_SENSOR_COUNT diff --git a/board/nami/board.c b/board/nami/board.c index c21fb2338a..87771912f1 100644 --- a/board/nami/board.c +++ b/board/nami/board.c @@ -990,7 +990,7 @@ static void board_init(void) * floating SPI buffer input (MISO), which causes power leakage (see * b/64797021). */ - NPCX_PUPD_EN1 |= (1 << NPCX_DEVPU1_F_SPI_PUD_EN); + NPCX_PUPD_EN1 |= BIT(NPCX_DEVPU1_F_SPI_PUD_EN); /* Provide AC status to the PCH */ gpio_set_level(GPIO_PCH_ACPRESENT, extpower_is_present()); diff --git a/board/nami/board.h b/board/nami/board.h index 45e58d49bc..27f8358a99 100644 --- a/board/nami/board.h +++ b/board/nami/board.h @@ -327,7 +327,7 @@ void board_reset_pd_mcu(void); void board_set_tcpc_power_mode(int port, int mode); /* Sensors without hardware FIFO are in forced mode */ -#define CONFIG_ACCEL_FORCE_MODE_MASK ((1 << LID_ACCEL) | (1 << LID_ALS)) +#define CONFIG_ACCEL_FORCE_MODE_MASK (BIT(LID_ACCEL) | BIT(LID_ALS)) /* These should be referenced only after HOOK_INIT:HOOK_PRIO_INIT_I2C+1. */ extern uint16_t board_version; diff --git a/board/nautilus/board.c b/board/nautilus/board.c index b87ff0ed37..dd79aebf27 100644 --- a/board/nautilus/board.c +++ b/board/nautilus/board.c @@ -428,7 +428,7 @@ static void board_init(void) * floating SPI buffer input (MISO), which causes power leakage (see * b/64797021). */ - NPCX_PUPD_EN1 |= (1 << NPCX_DEVPU1_F_SPI_PUD_EN); + NPCX_PUPD_EN1 |= BIT(NPCX_DEVPU1_F_SPI_PUD_EN); /* Provide AC status to the PCH */ gpio_set_level(GPIO_PCH_ACOK, extpower_is_present()); diff --git a/board/nautilus/board.h b/board/nautilus/board.h index acbed5897e..1d72270566 100644 --- a/board/nautilus/board.h +++ b/board/nautilus/board.h @@ -252,7 +252,7 @@ void board_reset_pd_mcu(void); void board_set_tcpc_power_mode(int port, int mode); /* Sensors without hardware FIFO are in forced mode */ -#define CONFIG_ACCEL_FORCE_MODE_MASK (1 << LID_ACCEL) +#define CONFIG_ACCEL_FORCE_MODE_MASK BIT(LID_ACCEL) #endif /* !__ASSEMBLER__ */ diff --git a/board/nocturne/board.h b/board/nocturne/board.h index 99984ae3ea..26dab74e0a 100644 --- a/board/nocturne/board.h +++ b/board/nocturne/board.h @@ -256,7 +256,7 @@ enum sensor_id { VSYNC, }; -#define CONFIG_ACCEL_FORCE_MODE_MASK (1 << LID_ALS) +#define CONFIG_ACCEL_FORCE_MODE_MASK BIT(LID_ALS) void base_pwr_fault_interrupt(enum gpio_signal s); int board_get_version(void); diff --git a/board/oak/board.c b/board/oak/board.c index 4fd49330d1..6639202654 100644 --- a/board/oak/board.c +++ b/board/oak/board.c @@ -485,7 +485,7 @@ void vbus_task(void) if (vbus) bc12[port].vbus |= 1 << port; else - bc12[port].vbus &= ~(1 << port); + bc12[port].vbus &= ~BIT(port); wake = 0; reg = pi3usb9281_get_interrupts(port); diff --git a/board/phaser/board.h b/board/phaser/board.h index 56e07ee863..b035268b1c 100644 --- a/board/phaser/board.h +++ b/board/phaser/board.h @@ -32,7 +32,7 @@ #define CONFIG_ACCEL_LIS2DE /* Lid accel */ #define CONFIG_ACCELGYRO_LSM6DSM /* Base accel */ /* Sensors without hardware FIFO are in forced mode */ -#define CONFIG_ACCEL_FORCE_MODE_MASK (1 << LID_ACCEL) +#define CONFIG_ACCEL_FORCE_MODE_MASK BIT(LID_ACCEL) #define CONFIG_LID_ANGLE #define CONFIG_LID_ANGLE_UPDATE diff --git a/board/poppy/board.c b/board/poppy/board.c index 235389fc89..36ba4561eb 100644 --- a/board/poppy/board.c +++ b/board/poppy/board.c @@ -521,7 +521,7 @@ static void board_init(void) * floating SPI buffer input (MISO), which causes power leakage (see * b/64797021). */ - NPCX_PUPD_EN1 |= (1 << NPCX_DEVPU1_F_SPI_PUD_EN); + NPCX_PUPD_EN1 |= BIT(NPCX_DEVPU1_F_SPI_PUD_EN); /* Provide AC status to the PCH */ gpio_set_level(GPIO_PCH_ACOK, extpower_is_present()); diff --git a/board/poppy/board.h b/board/poppy/board.h index 92d15ce0f7..a79216bb63 100644 --- a/board/poppy/board.h +++ b/board/poppy/board.h @@ -269,7 +269,7 @@ void board_set_tcpc_power_mode(int port, int mode); void base_detect_interrupt(enum gpio_signal signal); /* Sensors without hardware FIFO are in forced mode */ -#define CONFIG_ACCEL_FORCE_MODE_MASK (1 << LID_ALS) +#define CONFIG_ACCEL_FORCE_MODE_MASK BIT(LID_ALS) #endif /* !__ASSEMBLER__ */ diff --git a/board/rainier/board.h b/board/rainier/board.h index 3b31b2079d..334d481732 100644 --- a/board/rainier/board.h +++ b/board/rainier/board.h @@ -82,7 +82,7 @@ #define CONFIG_ACCEL_FIFO_THRES (CONFIG_ACCEL_FIFO / 3) /* Sensors without hardware FIFO are in forced mode. */ -#define CONFIG_ACCEL_FORCE_MODE_MASK (1 << LID_BARO) +#define CONFIG_ACCEL_FORCE_MODE_MASK BIT(LID_BARO) /* USB PD config */ #define CONFIG_CHARGE_MANAGER diff --git a/board/rammus/board.c b/board/rammus/board.c index 7497ac8aa5..31b0a3fb10 100644 --- a/board/rammus/board.c +++ b/board/rammus/board.c @@ -441,7 +441,7 @@ static void board_init(void) * floating SPI buffer input (MISO), which causes power leakage (see * b/64797021). */ - NPCX_PUPD_EN1 |= (1 << NPCX_DEVPU1_F_SPI_PUD_EN); + NPCX_PUPD_EN1 |= BIT(NPCX_DEVPU1_F_SPI_PUD_EN); /* Provide AC status to the PCH */ gpio_set_level(GPIO_PCH_ACPRESENT, extpower_is_present()); diff --git a/board/rammus/board.h b/board/rammus/board.h index da8f311fca..66c79f9317 100644 --- a/board/rammus/board.h +++ b/board/rammus/board.h @@ -278,7 +278,7 @@ void board_reset_pd_mcu(void); void board_set_tcpc_power_mode(int port, int mode); /* Sensors without hardware FIFO are in forced mode */ -#define CONFIG_ACCEL_FORCE_MODE_MASK (1 << LID_ACCEL) +#define CONFIG_ACCEL_FORCE_MODE_MASK BIT(LID_ACCEL) #endif /* !__ASSEMBLER__ */ diff --git a/board/reef/board.h b/board/reef/board.h index b166d24c8b..6847d82c5b 100644 --- a/board/reef/board.h +++ b/board/reef/board.h @@ -320,7 +320,7 @@ void board_set_tcpc_power_mode(int port, int mode); /* Sensors without hardware FIFO are in forced mode */ #define CONFIG_ACCEL_FORCE_MODE_MASK \ - ((1 << LID_ACCEL) | (1 << BASE_BARO) | (1 << LID_ALS)) + (BIT(LID_ACCEL) | BIT(BASE_BARO) | BIT(LID_ALS)) #endif /* !__ASSEMBLER__ */ diff --git a/board/reef_mchp/board.h b/board/reef_mchp/board.h index 1250689d0d..4526946070 100644 --- a/board/reef_mchp/board.h +++ b/board/reef_mchp/board.h @@ -343,7 +343,7 @@ uint16_t board_i2c_slave_addrs(int controller); */ /* Sensors without hardware FIFO are in forced mode */ #define CONFIG_ACCEL_FORCE_MODE_MASK \ - ((1 << LID_ACCEL) | (1 << BASE_BARO) | (1 << LID_ALS)) + (BIT(LID_ACCEL) | BIT(BASE_BARO) | BIT(LID_ALS)) #endif /* !__ASSEMBLER__ */ diff --git a/board/servo_v4/board.c b/board/servo_v4/board.c index 6890027346..15a5fcdd42 100644 --- a/board/servo_v4/board.c +++ b/board/servo_v4/board.c @@ -214,9 +214,9 @@ static void write_ioexpander(int bank, int gpio, int val) /* Read output port register */ i2c_read8(1, GPIOX_I2C_ADDR, GPIOX_OUT_PORT_A + bank, &tmp); if (val) - tmp |= (1 << gpio); + tmp |= BIT(gpio); else - tmp &= ~(1 << gpio); + tmp &= ~BIT(gpio); /* Write back modified output port register */ i2c_write8(1, GPIOX_I2C_ADDR, GPIOX_OUT_PORT_A + bank, tmp); } diff --git a/board/twinkie/sniffer.c b/board/twinkie/sniffer.c index e35b457ff7..72cd4e1348 100644 --- a/board/twinkie/sniffer.c +++ b/board/twinkie/sniffer.c @@ -301,7 +301,7 @@ void sniffer_task(void) task_wait_event(-1); /* send the available samples over USB if we have a buffer*/ while (filled_dma && free_usb) { - while (!(filled_dma & (1 << d))) { + while (!(filled_dma & BIT(d))) { d = (d + 1) & 31; off += EP_PAYLOAD_SIZE; if (off >= RX_COUNT) diff --git a/board/yorp/board.h b/board/yorp/board.h index 5a1e152b2a..01f701184a 100644 --- a/board/yorp/board.h +++ b/board/yorp/board.h @@ -27,7 +27,7 @@ #define CONFIG_ACCEL_KX022 /* Lid accel */ #define CONFIG_ACCELGYRO_LSM6DSM /* Base accel */ /* Sensors without hardware FIFO are in forced mode */ -#define CONFIG_ACCEL_FORCE_MODE_MASK (1 << LID_ACCEL) +#define CONFIG_ACCEL_FORCE_MODE_MASK BIT(LID_ACCEL) #define CONFIG_LID_ANGLE #define CONFIG_LID_ANGLE_UPDATE diff --git a/chip/g/alerts.c b/chip/g/alerts.c index 6cfb936b9c..b53045ccaf 100644 --- a/chip/g/alerts.c +++ b/chip/g/alerts.c @@ -260,7 +260,7 @@ static int alert_intr_status(int alert) int reg = alert / 32; int offset = alert % 32; - return !!(*INTR_STATUS_ADDR[reg] & (1 << offset)); + return !!(*INTR_STATUS_ADDR[reg] & BIT(offset)); } #ifdef CONFIG_BOARD_ID_SUPPORT @@ -300,7 +300,7 @@ static void command_alerts_list(void) if (fuse == BROM_FWBIT_APPLYSEC_UNKNOWN) fuse_status = '?'; - else if (fuses & (1 << fuse)) + else if (fuses & BIT(fuse)) fuse_status = '+'; else fuse_status = '#'; diff --git a/chip/g/board_space.h b/chip/g/board_space.h index 90b6c02287..1884a5c74c 100644 --- a/chip/g/board_space.h +++ b/chip/g/board_space.h @@ -37,7 +37,7 @@ struct sn_data { /* Number of bits reserved for RMA counter */ #define RMA_COUNT_BITS 7 /* Value used to indicate device has been RMA'd */ -#define RMA_INDICATOR ((uint8_t) ~(1 << RMA_COUNT_BITS)) +#define RMA_INDICATOR ((uint8_t) ~BIT(RMA_COUNT_BITS)) /* Info1 Board space contents. */ struct info1_board_space { diff --git a/chip/g/flash_config.h b/chip/g/flash_config.h index 09ddd872d5..d1bec36871 100644 --- a/chip/g/flash_config.h +++ b/chip/g/flash_config.h @@ -15,9 +15,9 @@ #define FLASH_INFO_MANUFACTURE_STATE_SIZE 0x200 -#define FLASH_REGION_EN_ALL ((1 << GC_GLOBALSEC_FLASH_REGION0_CTRL_EN_LSB) |\ - (1 << GC_GLOBALSEC_FLASH_REGION0_CTRL_RD_EN_LSB) |\ - (1 << GC_GLOBALSEC_FLASH_REGION0_CTRL_WR_EN_LSB)) +#define FLASH_REGION_EN_ALL (BIT(GC_GLOBALSEC_FLASH_REGION0_CTRL_EN_LSB) |\ + BIT(GC_GLOBALSEC_FLASH_REGION0_CTRL_RD_EN_LSB) |\ + BIT(GC_GLOBALSEC_FLASH_REGION0_CTRL_WR_EN_LSB)) /* * The below structure describes a single flash region (the hardware supports diff --git a/chip/g/pmu.c b/chip/g/pmu.c index a324e6cee7..a434a2bde5 100644 --- a/chip/g/pmu.c +++ b/chip/g/pmu.c @@ -22,7 +22,7 @@ void pmu_clock_en(uint32_t periph) { if (periph <= 31) - GR_PMU_PERICLKSET0 = (1 << periph); + GR_PMU_PERICLKSET0 = BIT(periph); else GR_PMU_PERICLKSET1 = (1 << (periph - 32)); } @@ -34,7 +34,7 @@ void pmu_clock_en(uint32_t periph) void pmu_clock_dis(uint32_t periph) { if (periph <= 31) - GR_PMU_PERICLKCLR0 = (1 << periph); + GR_PMU_PERICLKCLR0 = BIT(periph); else GR_PMU_PERICLKCLR1 = (1 << (periph - 32)); } diff --git a/chip/g/polling_uart.c b/chip/g/polling_uart.c index b1e4c4e0e3..e28abc2344 100644 --- a/chip/g/polling_uart.c +++ b/chip/g/polling_uart.c @@ -7,7 +7,7 @@ #include "registers.h" #include "uart.h" -#define UART_NCO ((16 * (1 << UART_NCO_WIDTH) * \ +#define UART_NCO ((16 * BIT(UART_NCO_WIDTH) * \ (long long)CONFIG_UART_BAUD_RATE) / PCLK_FREQ) /* 115200N81 uart0, TX on A0, RX on A1 */ diff --git a/chip/g/registers.h b/chip/g/registers.h index 9127802db3..0e69b75eaa 100644 --- a/chip/g/registers.h +++ b/chip/g/registers.h @@ -408,8 +408,8 @@ static inline int x_timehs_addr(unsigned int module, unsigned int timer, #define USB_TX_DPO BIT(1) #define USB_TX_DMO BIT(0) -#define GAHBCFG_DMA_EN (1 << GC_USB_GAHBCFG_DMAEN_LSB) -#define GAHBCFG_GLB_INTR_EN (1 << GC_USB_GAHBCFG_GLBLINTRMSK_LSB) +#define GAHBCFG_DMA_EN BIT(GC_USB_GAHBCFG_DMAEN_LSB) +#define GAHBCFG_GLB_INTR_EN BIT(GC_USB_GAHBCFG_GLBLINTRMSK_LSB) #define GAHBCFG_HBSTLEN_INCR4 (3 << GC_USB_GAHBCFG_HBSTLEN_LSB) #define GAHBCFG_NP_TXF_EMP_LVL (1 << GC_USB_GAHBCFG_NPTXFEMPLVL_LSB) @@ -418,86 +418,86 @@ static inline int x_timehs_addr(unsigned int module, unsigned int timer, #define GUSBCFG_USBTRDTIM(n) (((n) << GC_USB_GUSBCFG_USBTRDTIM_LSB) \ & GC_USB_GUSBCFG_USBTRDTIM_MASK) #define GUSBCFG_PHYSEL_HS (0 << GC_USB_GUSBCFG_PHYSEL_LSB) -#define GUSBCFG_PHYSEL_FS (1 << GC_USB_GUSBCFG_PHYSEL_LSB) +#define GUSBCFG_PHYSEL_FS BIT(GC_USB_GUSBCFG_PHYSEL_LSB) #define GUSBCFG_FSINTF_6PIN (0 << GC_USB_GUSBCFG_FSINTF_LSB) -#define GUSBCFG_FSINTF_3PIN (1 << GC_USB_GUSBCFG_FSINTF_LSB) -#define GUSBCFG_PHYIF16 (1 << GC_USB_GUSBCFG_PHYIF_LSB) +#define GUSBCFG_FSINTF_3PIN BIT(GC_USB_GUSBCFG_FSINTF_LSB) +#define GUSBCFG_PHYIF16 BIT(GC_USB_GUSBCFG_PHYIF_LSB) #define GUSBCFG_PHYIF8 (0 << GC_USB_GUSBCFG_PHYIF_LSB) -#define GUSBCFG_ULPI (1 << GC_USB_GUSBCFG_ULPI_UTMI_SEL_LSB) +#define GUSBCFG_ULPI BIT(GC_USB_GUSBCFG_ULPI_UTMI_SEL_LSB) #define GUSBCFG_UTMI (0 << GC_USB_GUSBCFG_ULPI_UTMI_SEL_LSB) -#define GRSTCTL_CSFTRST (1 << GC_USB_GRSTCTL_CSFTRST_LSB) -#define GRSTCTL_AHBIDLE (1 << GC_USB_GRSTCTL_AHBIDLE_LSB) -#define GRSTCTL_TXFFLSH (1 << GC_USB_GRSTCTL_TXFFLSH_LSB) -#define GRSTCTL_RXFFLSH (1 << GC_USB_GRSTCTL_RXFFLSH_LSB) +#define GRSTCTL_CSFTRST BIT(GC_USB_GRSTCTL_CSFTRST_LSB) +#define GRSTCTL_AHBIDLE BIT(GC_USB_GRSTCTL_AHBIDLE_LSB) +#define GRSTCTL_TXFFLSH BIT(GC_USB_GRSTCTL_TXFFLSH_LSB) +#define GRSTCTL_RXFFLSH BIT(GC_USB_GRSTCTL_RXFFLSH_LSB) #define GRSTCTL_TXFNUM(n) (((n) << GC_USB_GRSTCTL_TXFNUM_LSB) & GC_USB_GRSTCTL_TXFNUM_MASK) -#define DCFG_DEVSPD_FS (1 << GC_USB_DCFG_DEVSPD_LSB) +#define DCFG_DEVSPD_FS BIT(GC_USB_DCFG_DEVSPD_LSB) #define DCFG_DEVSPD_FS48 (3 << GC_USB_DCFG_DEVSPD_LSB) #define DCFG_DEVADDR(a) (((a) << GC_USB_DCFG_DEVADDR_LSB) & GC_USB_DCFG_DEVADDR_MASK) -#define DCFG_DESCDMA (1 << GC_USB_DCFG_DESCDMA_LSB) +#define DCFG_DESCDMA BIT(GC_USB_DCFG_DESCDMA_LSB) -#define DCTL_SFTDISCON (1 << GC_USB_DCTL_SFTDISCON_LSB) -#define DCTL_CGOUTNAK (1 << GC_USB_DCTL_CGOUTNAK_LSB) -#define DCTL_CGNPINNAK (1 << GC_USB_DCTL_CGNPINNAK_LSB) -#define DCTL_PWRONPRGDONE (1 << GC_USB_DCTL_PWRONPRGDONE_LSB) +#define DCTL_SFTDISCON BIT(GC_USB_DCTL_SFTDISCON_LSB) +#define DCTL_CGOUTNAK BIT(GC_USB_DCTL_CGOUTNAK_LSB) +#define DCTL_CGNPINNAK BIT(GC_USB_DCTL_CGNPINNAK_LSB) +#define DCTL_PWRONPRGDONE BIT(GC_USB_DCTL_PWRONPRGDONE_LSB) /* Device Endpoint Common IN Interrupt Mask bits */ -#define DIEPMSK_AHBERRMSK (1 << GC_USB_DIEPMSK_AHBERRMSK_LSB) -#define DIEPMSK_BNAININTRMSK (1 << GC_USB_DIEPMSK_BNAININTRMSK_LSB) -#define DIEPMSK_EPDISBLDMSK (1 << GC_USB_DIEPMSK_EPDISBLDMSK_LSB) -#define DIEPMSK_INEPNAKEFFMSK (1 << GC_USB_DIEPMSK_INEPNAKEFFMSK_LSB) -#define DIEPMSK_INTKNEPMISMSK (1 << GC_USB_DIEPMSK_INTKNEPMISMSK_LSB) -#define DIEPMSK_INTKNTXFEMPMSK (1 << GC_USB_DIEPMSK_INTKNTXFEMPMSK_LSB) -#define DIEPMSK_NAKMSK (1 << GC_USB_DIEPMSK_NAKMSK_LSB) -#define DIEPMSK_TIMEOUTMSK (1 << GC_USB_DIEPMSK_TIMEOUTMSK_LSB) -#define DIEPMSK_TXFIFOUNDRNMSK (1 << GC_USB_DIEPMSK_TXFIFOUNDRNMSK_LSB) -#define DIEPMSK_XFERCOMPLMSK (1 << GC_USB_DIEPMSK_XFERCOMPLMSK_LSB) +#define DIEPMSK_AHBERRMSK BIT(GC_USB_DIEPMSK_AHBERRMSK_LSB) +#define DIEPMSK_BNAININTRMSK BIT(GC_USB_DIEPMSK_BNAININTRMSK_LSB) +#define DIEPMSK_EPDISBLDMSK BIT(GC_USB_DIEPMSK_EPDISBLDMSK_LSB) +#define DIEPMSK_INEPNAKEFFMSK BIT(GC_USB_DIEPMSK_INEPNAKEFFMSK_LSB) +#define DIEPMSK_INTKNEPMISMSK BIT(GC_USB_DIEPMSK_INTKNEPMISMSK_LSB) +#define DIEPMSK_INTKNTXFEMPMSK BIT(GC_USB_DIEPMSK_INTKNTXFEMPMSK_LSB) +#define DIEPMSK_NAKMSK BIT(GC_USB_DIEPMSK_NAKMSK_LSB) +#define DIEPMSK_TIMEOUTMSK BIT(GC_USB_DIEPMSK_TIMEOUTMSK_LSB) +#define DIEPMSK_TXFIFOUNDRNMSK BIT(GC_USB_DIEPMSK_TXFIFOUNDRNMSK_LSB) +#define DIEPMSK_XFERCOMPLMSK BIT(GC_USB_DIEPMSK_XFERCOMPLMSK_LSB) /* Device Endpoint Common OUT Interrupt Mask bits */ -#define DOEPMSK_AHBERRMSK (1 << GC_USB_DOEPMSK_AHBERRMSK_LSB) -#define DOEPMSK_BBLEERRMSK (1 << GC_USB_DOEPMSK_BBLEERRMSK_LSB) -#define DOEPMSK_BNAOUTINTRMSK (1 << GC_USB_DOEPMSK_BNAOUTINTRMSK_LSB) -#define DOEPMSK_EPDISBLDMSK (1 << GC_USB_DOEPMSK_EPDISBLDMSK_LSB) -#define DOEPMSK_NAKMSK (1 << GC_USB_DOEPMSK_NAKMSK_LSB) -#define DOEPMSK_NYETMSK (1 << GC_USB_DOEPMSK_NYETMSK_LSB) -#define DOEPMSK_OUTPKTERRMSK (1 << GC_USB_DOEPMSK_OUTPKTERRMSK_LSB) -#define DOEPMSK_OUTTKNEPDISMSK (1 << GC_USB_DOEPMSK_OUTTKNEPDISMSK_LSB) -#define DOEPMSK_SETUPMSK (1 << GC_USB_DOEPMSK_SETUPMSK_LSB) -#define DOEPMSK_STSPHSERCVDMSK (1 << GC_USB_DOEPMSK_STSPHSERCVDMSK_LSB) -#define DOEPMSK_XFERCOMPLMSK (1 << GC_USB_DOEPMSK_XFERCOMPLMSK_LSB) +#define DOEPMSK_AHBERRMSK BIT(GC_USB_DOEPMSK_AHBERRMSK_LSB) +#define DOEPMSK_BBLEERRMSK BIT(GC_USB_DOEPMSK_BBLEERRMSK_LSB) +#define DOEPMSK_BNAOUTINTRMSK BIT(GC_USB_DOEPMSK_BNAOUTINTRMSK_LSB) +#define DOEPMSK_EPDISBLDMSK BIT(GC_USB_DOEPMSK_EPDISBLDMSK_LSB) +#define DOEPMSK_NAKMSK BIT(GC_USB_DOEPMSK_NAKMSK_LSB) +#define DOEPMSK_NYETMSK BIT(GC_USB_DOEPMSK_NYETMSK_LSB) +#define DOEPMSK_OUTPKTERRMSK BIT(GC_USB_DOEPMSK_OUTPKTERRMSK_LSB) +#define DOEPMSK_OUTTKNEPDISMSK BIT(GC_USB_DOEPMSK_OUTTKNEPDISMSK_LSB) +#define DOEPMSK_SETUPMSK BIT(GC_USB_DOEPMSK_SETUPMSK_LSB) +#define DOEPMSK_STSPHSERCVDMSK BIT(GC_USB_DOEPMSK_STSPHSERCVDMSK_LSB) +#define DOEPMSK_XFERCOMPLMSK BIT(GC_USB_DOEPMSK_XFERCOMPLMSK_LSB) /* Device Endpoint-n IN Interrupt Register bits */ -#define DIEPINT_AHBERR (1 << GC_USB_DIEPINT0_AHBERR_LSB) -#define DIEPINT_BBLEERR (1 << GC_USB_DIEPINT0_BBLEERR_LSB) -#define DIEPINT_BNAINTR (1 << GC_USB_DIEPINT0_BNAINTR_LSB) -#define DIEPINT_EPDISBLD (1 << GC_USB_DIEPINT0_EPDISBLD_LSB) -#define DIEPINT_INEPNAKEFF (1 << GC_USB_DIEPINT0_INEPNAKEFF_LSB) -#define DIEPINT_INTKNEPMIS (1 << GC_USB_DIEPINT0_INTKNEPMIS_LSB) -#define DIEPINT_INTKNTXFEMP (1 << GC_USB_DIEPINT0_INTKNTXFEMP_LSB) -#define DIEPINT_NAKINTRPT (1 << GC_USB_DIEPINT0_NAKINTRPT_LSB) -#define DIEPINT_NYETINTRPT (1 << GC_USB_DIEPINT0_NYETINTRPT_LSB) -#define DIEPINT_PKTDRPSTS (1 << GC_USB_DIEPINT0_PKTDRPSTS_LSB) -#define DIEPINT_TIMEOUT (1 << GC_USB_DIEPINT0_TIMEOUT_LSB) -#define DIEPINT_TXFEMP (1 << GC_USB_DIEPINT0_TXFEMP_LSB) -#define DIEPINT_TXFIFOUNDRN (1 << GC_USB_DIEPINT0_TXFIFOUNDRN_LSB) -#define DIEPINT_XFERCOMPL (1 << GC_USB_DIEPINT0_XFERCOMPL_LSB) +#define DIEPINT_AHBERR BIT(GC_USB_DIEPINT0_AHBERR_LSB) +#define DIEPINT_BBLEERR BIT(GC_USB_DIEPINT0_BBLEERR_LSB) +#define DIEPINT_BNAINTR BIT(GC_USB_DIEPINT0_BNAINTR_LSB) +#define DIEPINT_EPDISBLD BIT(GC_USB_DIEPINT0_EPDISBLD_LSB) +#define DIEPINT_INEPNAKEFF BIT(GC_USB_DIEPINT0_INEPNAKEFF_LSB) +#define DIEPINT_INTKNEPMIS BIT(GC_USB_DIEPINT0_INTKNEPMIS_LSB) +#define DIEPINT_INTKNTXFEMP BIT(GC_USB_DIEPINT0_INTKNTXFEMP_LSB) +#define DIEPINT_NAKINTRPT BIT(GC_USB_DIEPINT0_NAKINTRPT_LSB) +#define DIEPINT_NYETINTRPT BIT(GC_USB_DIEPINT0_NYETINTRPT_LSB) +#define DIEPINT_PKTDRPSTS BIT(GC_USB_DIEPINT0_PKTDRPSTS_LSB) +#define DIEPINT_TIMEOUT BIT(GC_USB_DIEPINT0_TIMEOUT_LSB) +#define DIEPINT_TXFEMP BIT(GC_USB_DIEPINT0_TXFEMP_LSB) +#define DIEPINT_TXFIFOUNDRN BIT(GC_USB_DIEPINT0_TXFIFOUNDRN_LSB) +#define DIEPINT_XFERCOMPL BIT(GC_USB_DIEPINT0_XFERCOMPL_LSB) /* Device Endpoint-n OUT Interrupt Register bits */ -#define DOEPINT_AHBERR (1 << GC_USB_DOEPINT0_AHBERR_LSB) -#define DOEPINT_BACK2BACKSETUP (1 << GC_USB_DOEPINT0_BACK2BACKSETUP_LSB) -#define DOEPINT_BBLEERR (1 << GC_USB_DOEPINT0_BBLEERR_LSB) -#define DOEPINT_BNAINTR (1 << GC_USB_DOEPINT0_BNAINTR_LSB) -#define DOEPINT_EPDISBLD (1 << GC_USB_DOEPINT0_EPDISBLD_LSB) -#define DOEPINT_NAKINTRPT (1 << GC_USB_DOEPINT0_NAKINTRPT_LSB) -#define DOEPINT_NYETINTRPT (1 << GC_USB_DOEPINT0_NYETINTRPT_LSB) -#define DOEPINT_OUTPKTERR (1 << GC_USB_DOEPINT0_OUTPKTERR_LSB) -#define DOEPINT_OUTTKNEPDIS (1 << GC_USB_DOEPINT0_OUTTKNEPDIS_LSB) -#define DOEPINT_PKTDRPSTS (1 << GC_USB_DOEPINT0_PKTDRPSTS_LSB) -#define DOEPINT_SETUP (1 << GC_USB_DOEPINT0_SETUP_LSB) -#define DOEPINT_STSPHSERCVD (1 << GC_USB_DOEPINT0_STSPHSERCVD_LSB) -#define DOEPINT_STUPPKTRCVD (1 << GC_USB_DOEPINT0_STUPPKTRCVD_LSB) -#define DOEPINT_XFERCOMPL (1 << GC_USB_DOEPINT0_XFERCOMPL_LSB) +#define DOEPINT_AHBERR BIT(GC_USB_DOEPINT0_AHBERR_LSB) +#define DOEPINT_BACK2BACKSETUP BIT(GC_USB_DOEPINT0_BACK2BACKSETUP_LSB) +#define DOEPINT_BBLEERR BIT(GC_USB_DOEPINT0_BBLEERR_LSB) +#define DOEPINT_BNAINTR BIT(GC_USB_DOEPINT0_BNAINTR_LSB) +#define DOEPINT_EPDISBLD BIT(GC_USB_DOEPINT0_EPDISBLD_LSB) +#define DOEPINT_NAKINTRPT BIT(GC_USB_DOEPINT0_NAKINTRPT_LSB) +#define DOEPINT_NYETINTRPT BIT(GC_USB_DOEPINT0_NYETINTRPT_LSB) +#define DOEPINT_OUTPKTERR BIT(GC_USB_DOEPINT0_OUTPKTERR_LSB) +#define DOEPINT_OUTTKNEPDIS BIT(GC_USB_DOEPINT0_OUTTKNEPDIS_LSB) +#define DOEPINT_PKTDRPSTS BIT(GC_USB_DOEPINT0_PKTDRPSTS_LSB) +#define DOEPINT_SETUP BIT(GC_USB_DOEPINT0_SETUP_LSB) +#define DOEPINT_STSPHSERCVD BIT(GC_USB_DOEPINT0_STSPHSERCVD_LSB) +#define DOEPINT_STUPPKTRCVD BIT(GC_USB_DOEPINT0_STUPPKTRCVD_LSB) +#define DOEPINT_XFERCOMPL BIT(GC_USB_DOEPINT0_XFERCOMPL_LSB) #define DXEPCTL_EPTYPE_CTRL (0 << GC_USB_DIEPCTL0_EPTYPE_LSB) #define DXEPCTL_EPTYPE_ISO (1 << GC_USB_DIEPCTL0_EPTYPE_LSB) @@ -505,14 +505,14 @@ static inline int x_timehs_addr(unsigned int module, unsigned int timer, #define DXEPCTL_EPTYPE_INT (3 << GC_USB_DIEPCTL0_EPTYPE_LSB) #define DXEPCTL_EPTYPE_MASK GC_USB_DIEPCTL0_EPTYPE_MASK #define DXEPCTL_TXFNUM(n) ((n) << GC_USB_DIEPCTL1_TXFNUM_LSB) -#define DXEPCTL_STALL (1 << GC_USB_DIEPCTL0_STALL_LSB) -#define DXEPCTL_CNAK (1 << GC_USB_DIEPCTL0_CNAK_LSB) -#define DXEPCTL_DPID (1 << GC_USB_DIEPCTL1_DPID_LSB) -#define DXEPCTL_SNAK (1 << GC_USB_DIEPCTL0_SNAK_LSB) -#define DXEPCTL_NAKSTS (1 << GC_USB_DIEPCTL0_NAKSTS_LSB) -#define DXEPCTL_EPENA (1 << GC_USB_DIEPCTL0_EPENA_LSB) -#define DXEPCTL_EPDIS (1 << GC_USB_DIEPCTL0_EPDIS_LSB) -#define DXEPCTL_USBACTEP (1 << GC_USB_DIEPCTL0_USBACTEP_LSB) +#define DXEPCTL_STALL BIT(GC_USB_DIEPCTL0_STALL_LSB) +#define DXEPCTL_CNAK BIT(GC_USB_DIEPCTL0_CNAK_LSB) +#define DXEPCTL_DPID BIT(GC_USB_DIEPCTL1_DPID_LSB) +#define DXEPCTL_SNAK BIT(GC_USB_DIEPCTL0_SNAK_LSB) +#define DXEPCTL_NAKSTS BIT(GC_USB_DIEPCTL0_NAKSTS_LSB) +#define DXEPCTL_EPENA BIT(GC_USB_DIEPCTL0_EPENA_LSB) +#define DXEPCTL_EPDIS BIT(GC_USB_DIEPCTL0_EPDIS_LSB) +#define DXEPCTL_USBACTEP BIT(GC_USB_DIEPCTL0_USBACTEP_LSB) #define DXEPCTL_MPS64 (0 << GC_USB_DIEPCTL0_MPS_LSB) #define DXEPCTL_MPS(cnt) ((cnt) << GC_USB_DIEPCTL1_MPS_LSB) #define DXEPCTL_SET_D0PID BIT(28) diff --git a/chip/g/uart_bitbang.c b/chip/g/uart_bitbang.c index 9f08340d3c..31bce8128a 100644 --- a/chip/g/uart_bitbang.c +++ b/chip/g/uart_bitbang.c @@ -213,7 +213,7 @@ static void uart_bitbang_write_char(char c) /* 8 data bits. */ ones = 0; for (i = 0; i < 8; i++) { - val = !!(c & (1 << i)); + val = !!(c & BIT(i)); gpio_set_level(bitbang_config.tx_gpio, val); /* Count 1's in order to handle parity bit. */ @@ -271,7 +271,7 @@ static int uart_bitbang_receive_char(uint8_t *rxed_char, uint32_t *next_tick) for (i = 0; i < 8; i++) { if (gpio_get_level(bitbang_config.rx_gpio)) { ones++; - rx_char |= (1 << i); + rx_char |= BIT(i); } wait_ticks(next_tick); } diff --git a/chip/g/uartn.c b/chip/g/uartn.c index 8f14f3c54e..da85c5cb0a 100644 --- a/chip/g/uartn.c +++ b/chip/g/uartn.c @@ -144,7 +144,7 @@ int uartn_is_enabled(int uart) void uartn_init(int uart) { - long long setting = (16 * (1 << UART_NCO_WIDTH) * + long long setting = (16 * BIT(UART_NCO_WIDTH) * (long long)CONFIG_UART_BAUD_RATE / PCLK_FREQ); /* set frequency */ diff --git a/chip/g/usb.c b/chip/g/usb.c index 37fef3179d..27ffde40aa 100644 --- a/chip/g/usb.c +++ b/chip/g/usb.c @@ -136,7 +136,7 @@ static void showbits(uint32_t b) int i; for (i = 0; i < 32; i++) - if (b & (1 << i)) { + if (b & BIT(i)) { if (deezbits[i]) ccprintf(" %s", deezbits[i]); else @@ -1255,7 +1255,7 @@ void usb_save_suspended_state(void) /* Record the state the DATA PIDs toggling on each endpoint. */ for (i = 1; i < USB_EP_COUNT; i++) { if (GR_USB_DOEPCTL(i) & DXEPCTL_DPID) - pid |= (1 << i); + pid |= BIT(i); if (GR_USB_DIEPCTL(i) & DXEPCTL_DPID) pid |= (1 << (i + 16)); } @@ -1275,7 +1275,7 @@ void usb_restore_suspended_state(void) /* Restore the DATA PIDs on endpoints. */ pid = GREG32(PMU, PWRDN_SCRATCH19); for (i = 1; i < USB_EP_COUNT; i++) { - GR_USB_DOEPCTL(i) = pid & (1 << i) ? + GR_USB_DOEPCTL(i) = pid & BIT(i) ? DXEPCTL_SET_D1PID : DXEPCTL_SET_D0PID; GR_USB_DIEPCTL(i) = pid & (1 << (i + 16)) ? DXEPCTL_SET_D1PID : DXEPCTL_SET_D0PID; diff --git a/chip/host/config_chip.h b/chip/host/config_chip.h index 8cb8bba79c..8714b57891 100644 --- a/chip/host/config_chip.h +++ b/chip/host/config_chip.h @@ -44,7 +44,7 @@ extern char __host_flash[CONFIG_FLASH_SIZE]; /* Do NOT use common timer code which is designed for hardware counters. */ #undef CONFIG_COMMON_TIMER -#define GPIO_PIN(port, index) GPIO_##port, (1 << index) +#define GPIO_PIN(port, index) GPIO_##port, BIT(index) #define GPIO_PIN_MASK(p, m) .port = GPIO_##p, .mask = (m) #define I2C_PORT_COUNT 1 diff --git a/chip/host/usb_pd_phy.c b/chip/host/usb_pd_phy.c index dd16890e6b..c44b8eea02 100644 --- a/chip/host/usb_pd_phy.c +++ b/chip/host/usb_pd_phy.c @@ -259,7 +259,7 @@ static uint8_t decode_bmc(uint32_t val10) for (i = 0; i < 5; ++i) if (!!(val10 & (1 << (2 * i))) != !!(val10 & (1 << (2 * i + 1)))) - ret |= (1 << i); + ret |= BIT(i); return ret; } diff --git a/chip/ish/hwtimer.c b/chip/ish/hwtimer.c index 63c9dcde0a..79a48783d9 100644 --- a/chip/ish/hwtimer.c +++ b/chip/ish/hwtimer.c @@ -77,7 +77,7 @@ static inline uint32_t scale_ticks2us(uint64_t ticks) #elif defined(CHIP_FAMILY_ISH4) || defined(CHIP_FAMILY_ISH5) #define CLOCK_SCALE_BITS 15 -BUILD_ASSERT((1 << CLOCK_SCALE_BITS) == ISH_HPET_CLK_FREQ); +BUILD_ASSERT(BIT(CLOCK_SCALE_BITS) == ISH_HPET_CLK_FREQ); static inline uint32_t scale_us2ticks(uint32_t us) { @@ -204,7 +204,7 @@ void __hw_clock_source_set(uint32_t ts) static void __hw_clock_source_irq(int timer_id) { /* Clear interrupt */ - HPET_INTR_CLEAR = (1 << timer_id); + HPET_INTR_CLEAR = BIT(timer_id); /* * If IRQ is from timer 0, 2^32 us have elapsed (i.e. OS timer diff --git a/chip/ish/i2c.c b/chip/ish/i2c.c index 525bee3732..79f0dd13de 100644 --- a/chip/ish/i2c.c +++ b/chip/ish/i2c.c @@ -335,7 +335,7 @@ int chip_i2c_xfer(int port, int slave_addr, const uint8_t *out, int out_size, if (in_size > (ISH_I2C_FIFO_SIZE - out_size)) { while ((i2c_mmio_read(ctx->base, IC_STATUS) & - (1 << IC_STATUS_TFE)) == 0) { + BIT(IC_STATUS_TFE)) == 0) { if (__hw_clock_source_read() >= expire_ts) { ctx->error_flag = 1; @@ -398,7 +398,7 @@ int chip_i2c_xfer(int port, int slave_addr, const uint8_t *out, int out_size, expire_ts = __hw_clock_source_read() + I2C_TSC_TIMEOUT; while (i2c_mmio_read(ctx->base, IC_STATUS) & - (1 << IC_STATUS_MASTER_ACTIVITY)) { + BIT(IC_STATUS_MASTER_ACTIVITY)) { if (__hw_clock_source_read() >= expire_ts) { ctx->error_flag = 1; diff --git a/chip/ish/ipc_heci.c b/chip/ish/ipc_heci.c index b7c471e802..41eff37667 100644 --- a/chip/ish/ipc_heci.c +++ b/chip/ish/ipc_heci.c @@ -93,7 +93,7 @@ #define IPC_DB_CMD_MASK (IPC_DB_CMD_FIELD << IPC_DB_CMD_SHIFT) #define IPC_DB_BUSY_SHIFT 31 -#define IPC_DB_BUSY_MASK (1 << IPC_DB_BUSY_SHIFT) +#define IPC_DB_BUSY_MASK BIT(IPC_DB_BUSY_SHIFT) #define IPC_DB_MSG_LENGTH(drbl) \ (((drbl) & IPC_DB_MSG_LENGTH_MASK) >> IPC_DB_MSG_LENGTH_SHIFT) diff --git a/chip/ish/ish_i2c.h b/chip/ish/ish_i2c.h index 2b88524fda..b9b284c7c5 100644 --- a/chip/ish/ish_i2c.h +++ b/chip/ish/ish_i2c.h @@ -169,7 +169,7 @@ enum { /* IC_ENABLE_STATUS_VALUES */ IC_EN_DISABLED_VAL = 0, IC_EN_DISABLED = (IC_EN_DISABLED_VAL << IC_EN_OFFSET), - IC_EN_MASK = (1 << IC_EN_OFFSET), + IC_EN_MASK = BIT(IC_EN_OFFSET), /* IC_TX_ABRT_SOURCE bits */ ABRT_7B_ADDR_NOACK = 1, }; diff --git a/chip/ish/uart_defs.h b/chip/ish/uart_defs.h index 86c6748f06..6a04557c58 100644 --- a/chip/ish/uart_defs.h +++ b/chip/ish/uart_defs.h @@ -191,7 +191,7 @@ #define UART_ISH_INPUT_FREQ MHZ(100) #endif #define UART_DEFAULT_BAUD_RATE 115200 -#define UART_STATE_CG (1 << UART_OP_CG) +#define UART_STATE_CG BIT(UART_OP_CG) enum UART_PORT { UART_PORT_0, diff --git a/chip/it83xx/adc.c b/chip/it83xx/adc.c index 71f92c44e9..0dadca3875 100644 --- a/chip/it83xx/adc.c +++ b/chip/it83xx/adc.c @@ -105,7 +105,7 @@ static void adc_disable_channel(int ch) static int adc_data_valid(enum chip_adc_channel adc_ch) { return (adc_ch <= CHIP_ADC_CH7) ? - (IT83XX_ADC_ADCDVSTS & (1 << adc_ch)) : + (IT83XX_ADC_ADCDVSTS & BIT(adc_ch)) : (IT83XX_ADC_ADCDVSTS2 & (1 << (adc_ch - CHIP_ADC_CH13))); } @@ -138,7 +138,7 @@ int adc_read_channel(enum adc_channel ch) /* W/C data valid flag */ if (adc_ch <= CHIP_ADC_CH7) - IT83XX_ADC_ADCDVSTS = (1 << adc_ch); + IT83XX_ADC_ADCDVSTS = BIT(adc_ch); else IT83XX_ADC_ADCDVSTS2 = (1 << (adc_ch - CHIP_ADC_CH13)); diff --git a/chip/it83xx/config_chip.h b/chip/it83xx/config_chip.h index aed0478b35..2e71fb3ef6 100644 --- a/chip/it83xx/config_chip.h +++ b/chip/it83xx/config_chip.h @@ -160,7 +160,7 @@ /* Chip needs to do custom pre-init */ #define CONFIG_CHIP_PRE_INIT -#define GPIO_PIN(port, index) GPIO_##port, (1 << index) +#define GPIO_PIN(port, index) GPIO_##port, BIT(index) #define GPIO_PIN_MASK(p, m) .port = GPIO_##p, .mask = (m) #endif /* __CROS_EC_CONFIG_CHIP_H */ diff --git a/chip/it83xx/espi.c b/chip/it83xx/espi.c index 9e68eedf00..972ac6c146 100644 --- a/chip/it83xx/espi.c +++ b/chip/it83xx/espi.c @@ -396,7 +396,7 @@ void espi_vw_interrupt(void) task_clear_pending_irq(IT83XX_IRQ_ESPI_VW); for (i = 0; i < ARRAY_SIZE(vw_isr_list); i++) { - if (vwidx_updated & (1 << i)) { + if (vwidx_updated & BIT(i)) { uint8_t idx_flag; idx_flag = IT83XX_ESPI_VWIDX(vw_isr_list[i].vw_index); @@ -551,7 +551,7 @@ void espi_interrupt(void) IT83XX_ESPI_ESGCTRL0 = espi_event; /* process espi interrupt events */ for (i = 0; i < ARRAY_SIZE(espi_isr); i++) { - if (espi_event & (1 << i)) + if (espi_event & BIT(i)) espi_isr[i](i); } /* diff --git a/chip/it83xx/gpio.c b/chip/it83xx/gpio.c index 5c390553ef..e5c63d4f95 100644 --- a/chip/it83xx/gpio.c +++ b/chip/it83xx/gpio.c @@ -437,7 +437,7 @@ static const char *get_gpio_string(const int port, const int mask) buffer[1] = '!'; for (i = 0; i < 8; ++i) { - if (mask & (1 << i)) { + if (mask & BIT(i)) { buffer[1] = i + '0'; break; } diff --git a/chip/it83xx/irq.c b/chip/it83xx/irq.c index fb2c0ee167..ee18050627 100644 --- a/chip/it83xx/irq.c +++ b/chip/it83xx/irq.c @@ -66,8 +66,8 @@ int chip_disable_irq(int irq) int group = irq / 8; int bit = irq % 8; - IT83XX_INTC_REG(irq_groups[group].ier_off) &= ~(1 << bit); - IT83XX_INTC_REG(IT83XX_INTC_EXT_IER_OFF(group)) &= ~(1 << bit); + IT83XX_INTC_REG(irq_groups[group].ier_off) &= ~BIT(bit); + IT83XX_INTC_REG(IT83XX_INTC_EXT_IER_OFF(group)) &= ~BIT(bit); return -1; /* we don't want to mask other IRQs */ } diff --git a/chip/it83xx/keyboard_raw.c b/chip/it83xx/keyboard_raw.c index d6d01e1247..225063f90a 100644 --- a/chip/it83xx/keyboard_raw.c +++ b/chip/it83xx/keyboard_raw.c @@ -77,7 +77,7 @@ test_mockable void keyboard_raw_drive_column(int col) mask = 0; /* Assert a single output */ else - mask = 0xffff ^ (1 << col); + mask = 0xffff ^ BIT(col); #ifdef CONFIG_KEYBOARD_COL2_INVERTED /* KSO[2] is inverted. */ diff --git a/chip/lm4/config_chip.h b/chip/lm4/config_chip.h index 020a5d7c09..2456095aba 100644 --- a/chip/lm4/config_chip.h +++ b/chip/lm4/config_chip.h @@ -102,7 +102,7 @@ /* Chip needs to do custom pre-init */ #define CONFIG_CHIP_PRE_INIT -#define GPIO_PIN(port, index) GPIO_##port, (1 << index) +#define GPIO_PIN(port, index) GPIO_##port, BIT(index) #define GPIO_PIN_MASK(p, m) .port = GPIO_##p, .mask = (m) #endif /* __CROS_EC_CONFIG_CHIP_H */ diff --git a/chip/lm4/fan.c b/chip/lm4/fan.c index 39baa0a03e..c0eee330db 100644 --- a/chip/lm4/fan.c +++ b/chip/lm4/fan.c @@ -32,14 +32,14 @@ void fan_set_enabled(int ch, int enabled) { if (enabled) - LM4_FAN_FANCTL |= (1 << ch); + LM4_FAN_FANCTL |= BIT(ch); else - LM4_FAN_FANCTL &= ~(1 << ch); + LM4_FAN_FANCTL &= ~BIT(ch); } int fan_get_enabled(int ch) { - return (LM4_FAN_FANCTL & (1 << ch)) ? 1 : 0; + return (LM4_FAN_FANCTL & BIT(ch)) ? 1 : 0; } void fan_set_duty(int ch, int percent) diff --git a/chip/lm4/flash.c b/chip/lm4/flash.c index 1c8da9b26a..135b5d0960 100644 --- a/chip/lm4/flash.c +++ b/chip/lm4/flash.c @@ -17,7 +17,7 @@ #define FLASH_FWB_BYTES (FLASH_FWB_WORDS * 4) #define BANK_SHIFT 5 /* bank registers have 32bits each, 2^32 */ -#define BANK_MASK ((1 << BANK_SHIFT) - 1) /* 5 bits */ +#define BANK_MASK (BIT(BANK_SHIFT) - 1) /* 5 bits */ #define F_BANK(b) ((b) >> BANK_SHIFT) #define F_BIT(b) (1 << ((b) & BANK_MASK)) diff --git a/chip/lm4/gpio.c b/chip/lm4/gpio.c index e90eb2bf4f..051e129dbf 100644 --- a/chip/lm4/gpio.c +++ b/chip/lm4/gpio.c @@ -61,7 +61,7 @@ void gpio_set_alternate_function(uint32_t port, uint32_t mask, int func) int i; /* Expand mask from bits to nibbles */ for (i = 0; i < 8; i++) { - if (mask & (1 << i)) + if (mask & BIT(i)) pctlmask |= 1 << (4 * i); } @@ -191,7 +191,7 @@ static int gpio_port_to_clock_gate_mask(uint32_t gpio_port) { int index = find_gpio_port_index(gpio_port); - return index >= 0 ? (1 << index) : 0; + return index >= 0 ? BIT(index) : 0; } #endif diff --git a/chip/lm4/i2c.c b/chip/lm4/i2c.c index 6a746fd9b5..1183ce9550 100644 --- a/chip/lm4/i2c.c +++ b/chip/lm4/i2c.c @@ -201,9 +201,9 @@ int chip_i2c_xfer(int port, int slave_addr, const uint8_t *out, int out_size, i2c_unwedge(port); /* Clock timeout or arbitration lost. Reset port to clear. */ - atomic_or(LM4_SYSTEM_SRI2C_ADDR, (1 << port)); + atomic_or(LM4_SYSTEM_SRI2C_ADDR, BIT(port)); clock_wait_cycles(3); - atomic_clear(LM4_SYSTEM_SRI2C_ADDR, (1 << port)); + atomic_clear(LM4_SYSTEM_SRI2C_ADDR, BIT(port)); clock_wait_cycles(3); /* Restore settings */ diff --git a/chip/lm4/keyboard_raw.c b/chip/lm4/keyboard_raw.c index 85042ce85e..00e00f1c05 100644 --- a/chip/lm4/keyboard_raw.c +++ b/chip/lm4/keyboard_raw.c @@ -68,7 +68,7 @@ test_mockable void keyboard_raw_drive_column(int col) else if (col == KEYBOARD_COLUMN_ALL) mask = 0; /* Assert all outputs */ else - mask = 0x1fff ^ (1 << col); /* Assert a single output */ + mask = 0x1fff ^ BIT(col); /* Assert a single output */ #ifdef CONFIG_KEYBOARD_COL2_INVERTED /* Invert column 2 output */ diff --git a/chip/lm4/lpc.c b/chip/lm4/lpc.c index 745e5e5465..e96e35d359 100644 --- a/chip/lm4/lpc.c +++ b/chip/lm4/lpc.c @@ -747,12 +747,12 @@ static void lpc_init(void) /* Enable LPC channels */ LM4_LPC_LPCCTL = LM4_LPC_SCI_CLK_1 | - (1 << LPC_CH_ACPI) | - (1 << LPC_CH_PORT80) | - (1 << LPC_CH_CMD_DATA) | - (1 << LPC_CH_KEYBOARD) | - (1 << LPC_CH_CMD) | - (1 << LPC_CH_MEMMAP); + BIT(LPC_CH_ACPI) | + BIT(LPC_CH_PORT80) | + BIT(LPC_CH_CMD_DATA) | + BIT(LPC_CH_KEYBOARD) | + BIT(LPC_CH_CMD) | + BIT(LPC_CH_MEMMAP); #ifdef CONFIG_UART_HOST LM4_LPC_LPCCTL |= 1 << LPC_CH_COMX; diff --git a/chip/lm4/uart.c b/chip/lm4/uart.c index 6ef9f67834..04a22c382c 100644 --- a/chip/lm4/uart.c +++ b/chip/lm4/uart.c @@ -193,7 +193,7 @@ void uart_init(void) clock_enable_peripheral(CGC_OFFSET_UART, mask, CGC_MODE_ALL); #ifdef CONFIG_UART_HOST - mask |= (1 << CONFIG_UART_HOST); + mask |= BIT(CONFIG_UART_HOST); #endif clock_enable_peripheral(CGC_OFFSET_UART, mask, diff --git a/chip/mchp/gpio.c b/chip/mchp/gpio.c index aa95b8fb0d..eed5c3efbc 100644 --- a/chip/mchp/gpio.c +++ b/chip/mchp/gpio.c @@ -62,7 +62,7 @@ void gpio_set_alternate_function(uint32_t port, uint32_t mask, int func) if (func > 0) val |= (func & 0x3) << 12; MCHP_GPIO_CTL(port, i) = val; - mask &= ~(1 << i); + mask &= ~BIT(i); } } @@ -111,7 +111,7 @@ void gpio_set_flags_by_mask(uint32_t port, uint32_t mask, uint32_t flags) while (mask) { i = GPIO_MASK_TO_NUM(mask); - mask &= ~(1 << i); + mask &= ~BIT(i); val = MCHP_GPIO_CTL(port, i); #ifdef CONFIG_GPIO_POWER_DOWN @@ -191,7 +191,7 @@ void gpio_power_off_by_mask(uint32_t port, uint32_t mask) while (mask) { i = GPIO_MASK_TO_NUM(mask); - mask &= ~(1 << i); + mask &= ~BIT(i); MCHP_GPIO_CTL(port, i) = (MCHP_GPIO_CTRL_PWR_OFF + MCHP_GPIO_INTDET_DISABLED); @@ -235,8 +235,8 @@ int gpio_enable_interrupt(enum gpio_signal signal) port = gpio_list[signal].port; girq_id = int_map[port].girq_id; - MCHP_INT_ENABLE(girq_id) = (1 << i); - MCHP_INT_BLK_EN |= (1 << girq_id); + MCHP_INT_ENABLE(girq_id) = BIT(i); + MCHP_INT_BLK_EN |= BIT(girq_id); return EC_SUCCESS; } @@ -253,7 +253,7 @@ int gpio_disable_interrupt(enum gpio_signal signal) girq_id = int_map[port].girq_id; - MCHP_INT_DISABLE(girq_id) = (1 << i); + MCHP_INT_DISABLE(girq_id) = BIT(i); return EC_SUCCESS; } @@ -291,7 +291,7 @@ int gpio_clear_pending_interrupt(enum gpio_signal signal) girq_id = int_map[port].girq_id; /* Clear interrupt source sticky status bit even if not enabled */ - MCHP_INT_SOURCE(girq_id) = (1 << i); + MCHP_INT_SOURCE(girq_id) = BIT(i); i = MCHP_INT_SOURCE(girq_id); task_clear_pending_irq(girq_id - 8); @@ -394,13 +394,13 @@ static void gpio_interrupt(int girq, int port) bit = __builtin_ffs(g->mask); if (bit) { bit--; - if (sts & (1 << bit)) { + if (sts & BIT(bit)) { trace12(0, GPIO, 0, "Bit[%d]: handler @ 0x%08x", bit, (uint32_t)gpio_irq_handlers[i]); gpio_irq_handlers[i](i); } - sts &= ~(1 << bit); + sts &= ~BIT(bit); } } } diff --git a/chip/mchp/hwtimer.c b/chip/mchp/hwtimer.c index a69fa4ab7e..e84f278f4a 100644 --- a/chip/mchp/hwtimer.c +++ b/chip/mchp/hwtimer.c @@ -115,7 +115,7 @@ int __hw_clock_source_init(uint32_t start_t) MCHP_TMR32_GIRQ_BIT(1); /* * Not needed when using direct mode interrupts - * MCHP_INT_BLK_EN |= (1 << MCHP_TMR32_GIRQ); + * MCHP_INT_BLK_EN |= BIT(MCHP_TMR32_GIRQ); */ return MCHP_IRQ_TIMER32_1; } diff --git a/chip/mec1322/gpio.c b/chip/mec1322/gpio.c index c3b62ad583..4e532e75d0 100644 --- a/chip/mec1322/gpio.c +++ b/chip/mec1322/gpio.c @@ -42,7 +42,7 @@ void gpio_set_alternate_function(uint32_t port, uint32_t mask, int func) if (func > 0) val |= (func & 0x3) << 12; MEC1322_GPIO_CTL(port, i) = val; - mask &= ~(1 << i); + mask &= ~BIT(i); } } @@ -81,7 +81,7 @@ void gpio_set_flags_by_mask(uint32_t port, uint32_t mask, uint32_t flags) uint32_t val; while (mask) { i = GPIO_MASK_TO_NUM(mask); - mask &= ~(1 << i); + mask &= ~BIT(i); val = MEC1322_GPIO_CTL(port, i); /* @@ -150,8 +150,8 @@ int gpio_enable_interrupt(enum gpio_signal signal) girq_id = int_map[port].girq_id; bit_id = (port - int_map[port].port_offset) * 8 + i; - MEC1322_INT_ENABLE(girq_id) |= (1 << bit_id); - MEC1322_INT_BLK_EN |= (1 << girq_id); + MEC1322_INT_ENABLE(girq_id) |= BIT(bit_id); + MEC1322_INT_BLK_EN |= BIT(girq_id); return EC_SUCCESS; } @@ -168,7 +168,7 @@ int gpio_disable_interrupt(enum gpio_signal signal) girq_id = int_map[port].girq_id; bit_id = (port - int_map[port].port_offset) * 8 + i; - MEC1322_INT_DISABLE(girq_id) = (1 << bit_id); + MEC1322_INT_DISABLE(girq_id) = BIT(bit_id); return EC_SUCCESS; } @@ -258,9 +258,9 @@ static void gpio_interrupt(int girq, int port_offset) for (i = 0; i < GPIO_IH_COUNT && sts; ++i, ++g) { bit = (g->port - port_offset) * 8 + __builtin_ffs(g->mask) - 1; - if (sts & (1 << bit)) + if (sts & BIT(bit)) gpio_irq_handlers[i](i); - sts &= ~(1 << bit); + sts &= ~BIT(bit); } } diff --git a/chip/mec1322/i2c.c b/chip/mec1322/i2c.c index 2c22256d81..8c59be9a38 100644 --- a/chip/mec1322/i2c.c +++ b/chip/mec1322/i2c.c @@ -120,7 +120,7 @@ static void configure_controller(int controller, int kbps) /* Enable interrupt */ MEC1322_I2C_CONFIG(controller) |= BIT(29); /* ENIDI */ - MEC1322_INT_ENABLE(12) |= (1 << controller); + MEC1322_INT_ENABLE(12) |= BIT(controller); MEC1322_INT_BLK_EN |= BIT(12); } diff --git a/chip/mt_scp/gpio.c b/chip/mt_scp/gpio.c index 7d680e6863..896baab93a 100644 --- a/chip/mt_scp/gpio.c +++ b/chip/mt_scp/gpio.c @@ -162,9 +162,9 @@ void __keep gpio_interrupt(void) while (pending) { bit = get_next_bit(&pending); - SCP_EINT_ACK[port] = (1 << bit); + SCP_EINT_ACK[port] = BIT(bit); /* Skip masked gpio */ - if (SCP_EINT_MASK_GET[port] & (1 << bit)) + if (SCP_EINT_MASK_GET[port] & BIT(bit)) continue; /* Call handler */ signal = port * 32 + bit; diff --git a/chip/mt_scp/registers.h b/chip/mt_scp/registers.h index 07634562a9..e6bcbecac3 100644 --- a/chip/mt_scp/registers.h +++ b/chip/mt_scp/registers.h @@ -155,7 +155,7 @@ #define SCP_REMAP_CFG3 REG32(SCP_CFG_BASE + 0x128) #define SCP_REMAP_ADDR_SHIFT 28 -#define SCP_REMAP_ADDR_LSB_MASK ((1 << SCP_REMAP_ADDR_SHIFT) - 1) +#define SCP_REMAP_ADDR_LSB_MASK (BIT(SCP_REMAP_ADDR_SHIFT) - 1) #define SCP_REMAP_ADDR_MSB_MASK ((~0) << SCP_REMAP_ADDR_SHIFT) /* Cached memory remap control */ @@ -184,7 +184,7 @@ #define SCP_L1_EXT_ADDR_SHIFT 20 #define SCP_L1_EXT_ADDR_OTHER_SHIFT 28 -#define SCP_L1_EXT_ADDR_OTHER_LSB_MASK ((1 << SCP_REMAP_ADDR_SHIFT) - 1) +#define SCP_L1_EXT_ADDR_OTHER_LSB_MASK (BIT(SCP_REMAP_ADDR_SHIFT) - 1) #define SCP_L1_EXT_ADDR_OTHER_MSB_MASK ((~0) << SCP_REMAP_ADDR_SHIFT) /* INTC control */ @@ -426,7 +426,7 @@ #define SCP_CACHE_OP_TADDR_SHIFT 5 #define SCP_CACHE_OP_TADDR_MASK (0x7ffffff << SCP_CACHE_OP_TADDR_SHIFT) -#define SCP_CACHE_LINE_SIZE (1 << SCP_CACHE_OP_TADDR_SHIFT) +#define SCP_CACHE_LINE_SIZE BIT(SCP_CACHE_OP_TADDR_SHIFT) /* Cache statistics */ #define SCP_CACHE_HCNT0L(x) REG32(SCP_CACHE_SEL(x) + 0x08) diff --git a/chip/mt_scp/uart.c b/chip/mt_scp/uart.c index 94f78748dd..8717d74704 100644 --- a/chip/mt_scp/uart.c +++ b/chip/mt_scp/uart.c @@ -109,7 +109,7 @@ void uart_rx_interrupt(void) uint8_t ier; task_clear_pending_irq(UART_RX_IRQ(UARTN)); - SCP_INTC_UART_RX_IRQ &= ~(1 << UARTN); + SCP_INTC_UART_RX_IRQ &= ~BIT(UARTN); uart_process(); ier = UART_IER(UARTN); UART_IER(UARTN) = 0; diff --git a/chip/npcx/cec.c b/chip/npcx/cec.c index d996695dfc..8c544c5970 100644 --- a/chip/npcx/cec.c +++ b/chip/npcx/cec.c @@ -791,7 +791,7 @@ void cec_isr(void) /* Retrieve events NPCX_TECTRL_TAXND */ events = GET_FIELD(NPCX_TECTRL(mdl), FIELD(0, 4)); - if (events & (1 << NPCX_TECTRL_TAPND)) { + if (events & BIT(NPCX_TECTRL_TAPND)) { /* Capture event */ cec_event_cap(); } else { @@ -801,11 +801,11 @@ void cec_isr(void) * happening, since we will get both events in the * edge-trigger case */ - if (events & (1 << NPCX_TECTRL_TCPND)) + if (events & BIT(NPCX_TECTRL_TCPND)) cec_event_timeout(); } /* Oneshot timer, a transfer has been initiated from AP */ - if (events & (1 << NPCX_TECTRL_TDPND)) { + if (events & BIT(NPCX_TECTRL_TDPND)) { tmr2_stop(); cec_event_tx(); } diff --git a/chip/npcx/config_chip.h b/chip/npcx/config_chip.h index 97f52963fd..7512e5a399 100644 --- a/chip/npcx/config_chip.h +++ b/chip/npcx/config_chip.h @@ -66,7 +66,7 @@ /* Default use UART1 as console */ #define CONFIG_CONSOLE_UART 0 -#define GPIO_PIN(port, index) GPIO_##port, (1 << index) +#define GPIO_PIN(port, index) GPIO_##port, BIT(index) #define GPIO_PIN_MASK(p, m) .port = GPIO_##p, .mask = (m) #endif /* __CROS_EC_CONFIG_CHIP_H */ diff --git a/chip/npcx/espi.c b/chip/npcx/espi.c index 21766701a0..d092327aed 100644 --- a/chip/npcx/espi.c +++ b/chip/npcx/espi.c @@ -532,7 +532,7 @@ void espi_interrupt(void) * Bit 17 of ESPIIE is reserved. We need to set the same bit in mask * in case bit 17 in ESPISTS of npcx7 is not cleared in ISR. */ - mask = NPCX_ESPIIE | (1 << NPCX_ESPISTS_VWUPDW); + mask = NPCX_ESPIIE | BIT(NPCX_ESPISTS_VWUPDW); #else mask = NPCX_ESPIIE; #endif diff --git a/chip/npcx/gpio.c b/chip/npcx/gpio.c index 252b915e45..8a76043d3d 100644 --- a/chip/npcx/gpio.c +++ b/chip/npcx/gpio.c @@ -313,7 +313,7 @@ void gpio_set_alternate_function(uint32_t port, uint32_t mask, int func) /* check each bit from mask */ for (pin = 0; pin < 8; pin++) - if (mask & (1 << pin)) + if (mask & BIT(pin)) gpio_alt_sel(port, pin, func); } diff --git a/chip/npcx/hwtimer.c b/chip/npcx/hwtimer.c index 76f1822a94..a201a75219 100644 --- a/chip/npcx/hwtimer.c +++ b/chip/npcx/hwtimer.c @@ -20,7 +20,7 @@ /* Depth of event timer */ #define TICK_EVT_DEPTH 16 /* Depth of event timer Unit: bits */ -#define TICK_EVT_INTERVAL (1 << TICK_EVT_DEPTH) /* Unit: us */ +#define TICK_EVT_INTERVAL BIT(TICK_EVT_DEPTH) /* Unit: us */ #define TICK_EVT_INTERVAL_MASK (TICK_EVT_INTERVAL - 1) /* Mask of interval */ #define TICK_EVT_MAX_CNT (TICK_EVT_INTERVAL - 1) /* Maximum event counter */ diff --git a/chip/npcx/keyboard_raw.c b/chip/npcx/keyboard_raw.c index 97a563c53f..9ed18b3739 100644 --- a/chip/npcx/keyboard_raw.c +++ b/chip/npcx/keyboard_raw.c @@ -101,7 +101,7 @@ test_mockable void keyboard_raw_drive_column(int col) } /* Set KBSOUT to zero to detect key-press */ else if (col == KEYBOARD_COLUMN_ALL) { - mask = ~((1 << keyboard_cols) - 1); + mask = ~(BIT(keyboard_cols) - 1); #ifdef CONFIG_KEYBOARD_COL2_INVERTED gpio_set_level(GPIO_KBD_KSO2, 1); #endif @@ -114,7 +114,7 @@ test_mockable void keyboard_raw_drive_column(int col) else gpio_set_level(GPIO_KBD_KSO2, 0); #endif - mask = ~(1 << col_out); + mask = ~BIT(col_out); } /* Set KBSOUT */ @@ -158,6 +158,6 @@ DECLARE_IRQ(NPCX_IRQ_KSI_WKINTC_1, keyboard_raw_interrupt, 5); int keyboard_raw_is_input_low(int port, int id) { - return (NPCX_PDIN(port) & (1 << id)) == 0; + return (NPCX_PDIN(port) & BIT(id)) == 0; } diff --git a/chip/npcx/lpc.c b/chip/npcx/lpc.c index 971512ec72..74d7f29d99 100644 --- a/chip/npcx/lpc.c +++ b/chip/npcx/lpc.c @@ -981,7 +981,7 @@ static void lpc_init(void) CLEAR_BIT(NPCX_HIPMIC(PMC_ACPI), NPCX_HIPMIC_SMIPOL); /* Set SMIB/SCIB to make sure SMI/SCI are high at init */ NPCX_HIPMIC(PMC_ACPI) = NPCX_HIPMIC(PMC_ACPI) - | (1 << NPCX_HIPMIC_SMIB) | (1 << NPCX_HIPMIC_SCIB); + | BIT(NPCX_HIPMIC_SMIB) | BIT(NPCX_HIPMIC_SCIB); #ifndef CONFIG_SCI_GPIO /* * Allow SMI/SCI generated from PM module. diff --git a/chip/npcx/registers.h b/chip/npcx/registers.h index 7c812e5da2..c13395eaa4 100644 --- a/chip/npcx/registers.h +++ b/chip/npcx/registers.h @@ -1005,44 +1005,44 @@ enum NPCX_PMC_PWDWN_CTL_T { }; /* TODO: set PD masks based upon actual peripheral usage */ -#define CGC_KBS_MASK (1 << NPCX_PWDWN_CTL1_KBS_PD) -#define CGC_UART_MASK (1 << NPCX_PWDWN_CTL1_UART_PD) -#define CGC_FAN_MASK ((1 << NPCX_PWDWN_CTL1_MFT1_PD) | \ - (1 << NPCX_PWDWN_CTL1_MFT2_PD)) -#define CGC_FIU_MASK (1 << NPCX_PWDWN_CTL1_FIU_PD) +#define CGC_KBS_MASK BIT(NPCX_PWDWN_CTL1_KBS_PD) +#define CGC_UART_MASK BIT(NPCX_PWDWN_CTL1_UART_PD) +#define CGC_FAN_MASK (BIT(NPCX_PWDWN_CTL1_MFT1_PD) | \ + BIT(NPCX_PWDWN_CTL1_MFT2_PD)) +#define CGC_FIU_MASK BIT(NPCX_PWDWN_CTL1_FIU_PD) #if defined(CHIP_FAMILY_NPCX5) -#define CGC_I2C_MASK ((1 << NPCX_PWDWN_CTL3_SMB0_PD) | \ - (1 << NPCX_PWDWN_CTL3_SMB1_PD) | \ - (1 << NPCX_PWDWN_CTL3_SMB2_PD) | \ - (1 << NPCX_PWDWN_CTL3_SMB3_PD)) +#define CGC_I2C_MASK (BIT(NPCX_PWDWN_CTL3_SMB0_PD) | \ + BIT(NPCX_PWDWN_CTL3_SMB1_PD) | \ + BIT(NPCX_PWDWN_CTL3_SMB2_PD) | \ + BIT(NPCX_PWDWN_CTL3_SMB3_PD)) #elif defined(CHIP_FAMILY_NPCX7) -#define CGC_I2C_MASK ((1 << NPCX_PWDWN_CTL3_SMB0_PD) | \ - (1 << NPCX_PWDWN_CTL3_SMB1_PD) | \ - (1 << NPCX_PWDWN_CTL3_SMB2_PD) | \ - (1 << NPCX_PWDWN_CTL3_SMB3_PD) | \ - (1 << NPCX_PWDWN_CTL3_SMB4_PD)) -#define CGC_I2C_MASK2 ((1 << NPCX_PWDWN_CTL7_SMB5_PD) | \ - (1 << NPCX_PWDWN_CTL7_SMB6_PD) | \ - (1 << NPCX_PWDWN_CTL7_SMB7_PD)) +#define CGC_I2C_MASK (BIT(NPCX_PWDWN_CTL3_SMB0_PD) | \ + BIT(NPCX_PWDWN_CTL3_SMB1_PD) | \ + BIT(NPCX_PWDWN_CTL3_SMB2_PD) | \ + BIT(NPCX_PWDWN_CTL3_SMB3_PD) | \ + BIT(NPCX_PWDWN_CTL3_SMB4_PD)) +#define CGC_I2C_MASK2 (BIT(NPCX_PWDWN_CTL7_SMB5_PD) | \ + BIT(NPCX_PWDWN_CTL7_SMB6_PD) | \ + BIT(NPCX_PWDWN_CTL7_SMB7_PD)) #ifdef NPCX_SECOND_UART -#define CGC_UART2_MASK (1 << NPCX_PWDWN_CTL7_UART2_PD) +#define CGC_UART2_MASK BIT(NPCX_PWDWN_CTL7_UART2_PD) #endif #ifdef NPCX_WOV_SUPPORT -#define CGC_WOV_MASK (1 << NPCX_PWDWN_CTL7_WOV_PD) +#define CGC_WOV_MASK BIT(NPCX_PWDWN_CTL7_WOV_PD) #endif #endif -#define CGC_ADC_MASK (1 << NPCX_PWDWN_CTL4_ADC_PD) -#define CGC_PECI_MASK (1 << NPCX_PWDWN_CTL4_PECI_PD) -#define CGC_SPI_MASK (1 << NPCX_PWDWN_CTL4_SPIP_PD) -#define CGC_TIMER_MASK ((1 << NPCX_PWDWN_CTL4_ITIM1_PD) | \ - (1 << NPCX_PWDWN_CTL4_ITIM2_PD) | \ - (1 << NPCX_PWDWN_CTL4_ITIM3_PD)) -#define CGC_LPC_MASK ((1 << NPCX_PWDWN_CTL5_C2HACC_PD) | \ - (1 << NPCX_PWDWN_CTL5_SHM_REG_PD) | \ - (1 << NPCX_PWDWN_CTL5_SHM_PD) | \ - (1 << NPCX_PWDWN_CTL5_DP80_PD) | \ - (1 << NPCX_PWDWN_CTL5_MSWC_PD)) -#define CGC_ESPI_MASK (1 << NPCX_PWDWN_CTL6_ESPI_PD) +#define CGC_ADC_MASK BIT(NPCX_PWDWN_CTL4_ADC_PD) +#define CGC_PECI_MASK BIT(NPCX_PWDWN_CTL4_PECI_PD) +#define CGC_SPI_MASK BIT(NPCX_PWDWN_CTL4_SPIP_PD) +#define CGC_TIMER_MASK (BIT(NPCX_PWDWN_CTL4_ITIM1_PD) | \ + BIT(NPCX_PWDWN_CTL4_ITIM2_PD) | \ + BIT(NPCX_PWDWN_CTL4_ITIM3_PD)) +#define CGC_LPC_MASK (BIT(NPCX_PWDWN_CTL5_C2HACC_PD) | \ + BIT(NPCX_PWDWN_CTL5_SHM_REG_PD) | \ + BIT(NPCX_PWDWN_CTL5_SHM_PD) | \ + BIT(NPCX_PWDWN_CTL5_DP80_PD) | \ + BIT(NPCX_PWDWN_CTL5_MSWC_PD)) +#define CGC_ESPI_MASK BIT(NPCX_PWDWN_CTL6_ESPI_PD) /******************************************************************************/ /* Flash Interface Unit (FIU) Registers */ @@ -1242,11 +1242,11 @@ enum PM_CHANNEL_T { #define NPCX_BKUP_STS_VSBY_STS 1 #define NPCX_BKUP_STS_VCC1_STS 0 #define NPCX_BKUP_STS_ALL_MASK \ - ((1 << NPCX_BKUP_STS_IBBR) | (1 << NPCX_BKUP_STS_VSBY_STS) | \ - (1 << NPCX_BKUP_STS_VCC1_STS)) + (BIT(NPCX_BKUP_STS_IBBR) | BIT(NPCX_BKUP_STS_VSBY_STS) | \ + BIT(NPCX_BKUP_STS_VCC1_STS)) #define NPCX_BBRAM_SIZE 128 /* Size of BBRAM */ #else -#define NPCX_BKUP_STS_ALL_MASK (1 << NPCX_BKUP_STS_IBBR) +#define NPCX_BKUP_STS_ALL_MASK BIT(NPCX_BKUP_STS_IBBR) #define NPCX_BBRAM_SIZE 64 /* Size of BBRAM */ #endif @@ -1625,32 +1625,32 @@ enum ITIM16_MODULE_T { #define ENABLE_ESPI_CHAN(ch) SET_BIT(NPCX_ESPICFG, ch) #define DISABLE_ESPI_CHAN(ch) CLEAR_BIT(NPCX_ESPICFG, ch) /* ESPI Slave Channel Support Definitions */ -#define ESPI_SUPP_CH_PC (1 << NPCX_ESPICFG_PCCHN_SUPP) -#define ESPI_SUPP_CH_VM (1 << NPCX_ESPICFG_VWCHN_SUPP) -#define ESPI_SUPP_CH_OOB (1 << NPCX_ESPICFG_OOBCHN_SUPP) -#define ESPI_SUPP_CH_FLASH (1 << NPCX_ESPICFG_FLASHCHN_SUPP) +#define ESPI_SUPP_CH_PC BIT(NPCX_ESPICFG_PCCHN_SUPP) +#define ESPI_SUPP_CH_VM BIT(NPCX_ESPICFG_VWCHN_SUPP) +#define ESPI_SUPP_CH_OOB BIT(NPCX_ESPICFG_OOBCHN_SUPP) +#define ESPI_SUPP_CH_FLASH BIT(NPCX_ESPICFG_FLASHCHN_SUPP) #define ESPI_SUPP_CH_ALL (ESPI_SUPP_CH_PC | ESPI_SUPP_CH_VM | \ ESPI_SUPP_CH_OOB | ESPI_SUPP_CH_FLASH) /* ESPI Interrupts Enable Definitions */ -#define ESPIIE_IBRST (1 << NPCX_ESPIIE_IBRSTIE) -#define ESPIIE_CFGUPD (1 << NPCX_ESPIIE_CFGUPDIE) -#define ESPIIE_BERR (1 << NPCX_ESPIIE_BERRIE) -#define ESPIIE_OOBRX (1 << NPCX_ESPIIE_OOBRXIE) -#define ESPIIE_FLASHRX (1 << NPCX_ESPIIE_FLASHRXIE) -#define ESPIIE_SFLASHRD (1 << NPCX_ESPIIE_SFLASHRDIE) -#define ESPIIE_PERACC (1 << NPCX_ESPIIE_PERACCIE) -#define ESPIIE_DFRD (1 << NPCX_ESPIIE_DFRDIE) -#define ESPIIE_VWUPD (1 << NPCX_ESPIIE_VWUPDIE) -#define ESPIIE_ESPIRST (1 << NPCX_ESPIIE_ESPIRSTIE) -#define ESPIIE_PLTRST (1 << NPCX_ESPIIE_PLTRSTIE) -#define ESPIIE_AMERR (1 << NPCX_ESPIIE_AMERRIE) -#define ESPIIE_AMDONE (1 << NPCX_ESPIIE_AMDONEIE) +#define ESPIIE_IBRST BIT(NPCX_ESPIIE_IBRSTIE) +#define ESPIIE_CFGUPD BIT(NPCX_ESPIIE_CFGUPDIE) +#define ESPIIE_BERR BIT(NPCX_ESPIIE_BERRIE) +#define ESPIIE_OOBRX BIT(NPCX_ESPIIE_OOBRXIE) +#define ESPIIE_FLASHRX BIT(NPCX_ESPIIE_FLASHRXIE) +#define ESPIIE_SFLASHRD BIT(NPCX_ESPIIE_SFLASHRDIE) +#define ESPIIE_PERACC BIT(NPCX_ESPIIE_PERACCIE) +#define ESPIIE_DFRD BIT(NPCX_ESPIIE_DFRDIE) +#define ESPIIE_VWUPD BIT(NPCX_ESPIIE_VWUPDIE) +#define ESPIIE_ESPIRST BIT(NPCX_ESPIIE_ESPIRSTIE) +#define ESPIIE_PLTRST BIT(NPCX_ESPIIE_PLTRSTIE) +#define ESPIIE_AMERR BIT(NPCX_ESPIIE_AMERRIE) +#define ESPIIE_AMDONE BIT(NPCX_ESPIIE_AMDONEIE) #if defined(CHIP_FAMILY_NPCX7) -#define ESPIIE_BMTXDONE (1 << NPCX_ESPIIE_BMTXDONEIE) -#define ESPIIE_PBMRX (1 << NPCX_ESPIIE_PBMRXIE) -#define ESPIIE_PMSGRX (1 << NPCX_ESPIIE_PMSGRXIE) -#define ESPIIE_BMBURSTERR (1 << NPCX_ESPIIE_BMBURSTERRIE) -#define ESPIIE_BMBURSTDONE (1 << NPCX_ESPIIE_BMBURSTDONEIE) +#define ESPIIE_BMTXDONE BIT(NPCX_ESPIIE_BMTXDONEIE) +#define ESPIIE_PBMRX BIT(NPCX_ESPIIE_PBMRXIE) +#define ESPIIE_PMSGRX BIT(NPCX_ESPIIE_PMSGRXIE) +#define ESPIIE_BMBURSTERR BIT(NPCX_ESPIIE_BMBURSTERRIE) +#define ESPIIE_BMBURSTDONE BIT(NPCX_ESPIIE_BMBURSTDONEIE) #endif /* eSPI Interrupts for VW */ #define ESPIIE_VW (ESPIIE_VWUPD | ESPIIE_PLTRST) @@ -1658,18 +1658,18 @@ enum ITIM16_MODULE_T { #define ESPIIE_GENERIC (ESPIIE_IBRST | ESPIIE_CFGUPD | \ ESPIIE_BERR | ESPIIE_ESPIRST) /* ESPI Wake-up Enable Definitions */ -#define ESPIWE_IBRST (1 << NPCX_ESPIWE_IBRSTWE) -#define ESPIWE_CFGUPD (1 << NPCX_ESPIWE_CFGUPDWE) -#define ESPIWE_BERR (1 << NPCX_ESPIWE_BERRWE) -#define ESPIWE_OOBRX (1 << NPCX_ESPIWE_OOBRXWE) -#define ESPIWE_FLASHRX (1 << NPCX_ESPIWE_FLASHRXWE) -#define ESPIWE_PERACC (1 << NPCX_ESPIWE_PERACCWE) -#define ESPIWE_DFRD (1 << NPCX_ESPIWE_DFRDWE) -#define ESPIWE_VWUPD (1 << NPCX_ESPIWE_VWUPDWE) -#define ESPIWE_ESPIRST (1 << NPCX_ESPIWE_ESPIRSTWE) +#define ESPIWE_IBRST BIT(NPCX_ESPIWE_IBRSTWE) +#define ESPIWE_CFGUPD BIT(NPCX_ESPIWE_CFGUPDWE) +#define ESPIWE_BERR BIT(NPCX_ESPIWE_BERRWE) +#define ESPIWE_OOBRX BIT(NPCX_ESPIWE_OOBRXWE) +#define ESPIWE_FLASHRX BIT(NPCX_ESPIWE_FLASHRXWE) +#define ESPIWE_PERACC BIT(NPCX_ESPIWE_PERACCWE) +#define ESPIWE_DFRD BIT(NPCX_ESPIWE_DFRDWE) +#define ESPIWE_VWUPD BIT(NPCX_ESPIWE_VWUPDWE) +#define ESPIWE_ESPIRST BIT(NPCX_ESPIWE_ESPIRSTWE) #if defined(CHIP_FAMILY_NPCX7) -#define ESPIWE_PBMRX (1 << NPCX_ESPIWE_PBMRXWE) -#define ESPIWE_PMSGRX (1 << NPCX_ESPIWE_PMSGRXWE) +#define ESPIWE_PBMRX BIT(NPCX_ESPIWE_PBMRXWE) +#define ESPIWE_PMSGRX BIT(NPCX_ESPIWE_PMSGRXWE) #endif /* eSPI Wake-up enable for VW */ #define ESPIWE_VW ESPIWE_VWUPD diff --git a/chip/npcx/shi.c b/chip/npcx/shi.c index 2e061ad2c2..2f084c597e 100644 --- a/chip/npcx/shi.c +++ b/chip/npcx/shi.c @@ -661,7 +661,7 @@ void shi_int_handler(void) /* SHI CS pin is asserted in EVSTAT2 */ if (IS_BIT_SET(stat2_reg, NPCX_EVSTAT2_CSNFE)) { /* clear CSNFE bit */ - NPCX_EVSTAT2 = (1 << NPCX_EVSTAT2_CSNFE); + NPCX_EVSTAT2 = BIT(NPCX_EVSTAT2_CSNFE); DEBUG_CPRINTF("CSNFE-"); /* * BUSY bit is set when SHI_CS is asserted. If not, leave it for @@ -688,7 +688,7 @@ void shi_int_handler(void) */ if (IS_BIT_SET(stat2_reg, NPCX_EVSTAT2_CSNRE)) { /* Clear pending bit of CSNRE */ - NPCX_EVSTAT2 = (1 << NPCX_EVSTAT2_CSNRE); + NPCX_EVSTAT2 = BIT(NPCX_EVSTAT2_CSNRE); #else if (IS_BIT_SET(stat_reg, NPCX_EVSTAT_EOR)) { #endif @@ -784,7 +784,7 @@ void shi_int_handler(void) */ if (IS_BIT_SET(stat2_reg, NPCX_EVSTAT2_IBHF2)) { /* Clear IBHF2 */ - NPCX_EVSTAT2 = (1 << NPCX_EVSTAT2_IBHF2); + NPCX_EVSTAT2 = BIT(NPCX_EVSTAT2_IBHF2); DEBUG_CPRINTF("HDR-"); /* Disable second IBF interrupt and start to parse header */ shi_sec_ibf_int_enable(0); diff --git a/chip/npcx/system-npcx7.c b/chip/npcx/system-npcx7.c index 579b2a1321..6b0e5157ea 100644 --- a/chip/npcx/system-npcx7.c +++ b/chip/npcx/system-npcx7.c @@ -22,7 +22,7 @@ /* Macros for last 32K ram block */ #define LAST_RAM_BLK ((NPCX_RAM_SIZE / (32 * 1024)) - 1) -#define RAM_PD_MASK (~(1 << LAST_RAM_BLK)) +#define RAM_PD_MASK (BIT(LAST_RAM_BLK) - 1) /*****************************************************************************/ /* IC specific low-level driver depends on chip series */ diff --git a/chip/npcx/system.c b/chip/npcx/system.c index b9d3367d91..4b2f55ddb4 100644 --- a/chip/npcx/system.c +++ b/chip/npcx/system.c @@ -117,7 +117,7 @@ static int bbram_valid(enum bbram_data_index index, int bytes) /* Check BBRAM is valid */ if (IS_BIT_SET(NPCX_BKUP_STS, NPCX_BKUP_STS_IBBR)) { - NPCX_BKUP_STS = (1 << NPCX_BKUP_STS_IBBR); + NPCX_BKUP_STS = BIT(NPCX_BKUP_STS_IBBR); panic_printf("IBBR set: BBRAM corrupted!\n"); return 0; } @@ -693,8 +693,8 @@ void system_pre_init(void) NPCX_PWDWN_CTL(NPCX_PMC_PWDWN_5) = 0xF8; pwdwn6 = 0x70 | - (1 << NPCX_PWDWN_CTL6_ITIM6_PD) | - (1 << NPCX_PWDWN_CTL6_ITIM4_PD); /* Skip ITIM5_PD */ + BIT(NPCX_PWDWN_CTL6_ITIM6_PD) | + BIT(NPCX_PWDWN_CTL6_ITIM4_PD); /* Skip ITIM5_PD */ #if !defined(CONFIG_HOSTCMD_ESPI) pwdwn6 |= 1 << NPCX_PWDWN_CTL6_ESPI_PD; #endif diff --git a/chip/npcx/uartn.c b/chip/npcx/uartn.c index d7d46e849f..692e75419f 100644 --- a/chip/npcx/uartn.c +++ b/chip/npcx/uartn.c @@ -188,9 +188,9 @@ static void uartn_set_fifo_mode(uint8_t uart_num) /* Enable the UART FIFO mode */ SET_BIT(NPCX_UMDSL(uart_num), NPCX_UMDSL_FIFO_MD); /* Disable all Tx interrupts */ - NPCX_UFTCTL(uart_num) &= ~((1 << NPCX_UFTCTL_TEMPTY_LVL_EN) | - (1 << NPCX_UFTCTL_TEMPTY_EN) | - (1 << NPCX_UFTCTL_NXIMPEN)); + NPCX_UFTCTL(uart_num) &= ~(BIT(NPCX_UFTCTL_TEMPTY_LVL_EN) | + BIT(NPCX_UFTCTL_TEMPTY_EN) | + BIT(NPCX_UFTCTL_NXIMPEN)); } #endif diff --git a/chip/nrf51/bluetooth_le.c b/chip/nrf51/bluetooth_le.c index 7fe80ff8e1..f4747cf83e 100644 --- a/chip/nrf51/bluetooth_le.c +++ b/chip/nrf51/bluetooth_le.c @@ -48,20 +48,20 @@ static void nrf2ble_packet(struct ble_pdu *ble_p, ble_p->header_type_adv = 1; ble_p->header.adv.type = radio_p->s0 & 0xf; ble_p->header.adv.txaddr = (radio_p->s0 & - (1 << BLE_ADV_HEADER_TXADD_SHIFT)) != 0; + BIT(BLE_ADV_HEADER_TXADD_SHIFT)) != 0; ble_p->header.adv.rxaddr = (radio_p->s0 & - (1 << BLE_ADV_HEADER_RXADD_SHIFT)) != 0; + BIT(BLE_ADV_HEADER_RXADD_SHIFT)) != 0; /* Length check? 6-37 Bytes */ ble_p->header.adv.length = radio_p->length; } else { ble_p->header_type_adv = 0; ble_p->header.data.llid = radio_p->s0 & 0x3; ble_p->header.data.nesn = (radio_p->s0 & - (1 << BLE_DATA_HEADER_NESN_SHIFT)) != 0; + BIT(BLE_DATA_HEADER_NESN_SHIFT)) != 0; ble_p->header.data.sn = (radio_p->s0 & - (1 << BLE_DATA_HEADER_SN_SHIFT)) != 0; + BIT(BLE_DATA_HEADER_SN_SHIFT)) != 0; ble_p->header.data.md = (radio_p->s0 & - (1 << BLE_DATA_HEADER_MD_SHIFT)) != 0; + BIT(BLE_DATA_HEADER_MD_SHIFT)) != 0; /* Length check? 0-31 Bytes */ ble_p->header.data.length = radio_p->length; } @@ -170,8 +170,8 @@ int ble_rx(struct ble_pdu *pdu, int timeout, int adv) */ ppi_channel_requested = NRF51_PPI_CH_RADIO_ADDR__TIMER0CC1; if (ppi_request_channel(&ppi_channel_requested) == EC_SUCCESS) { - NRF51_PPI_CHEN |= (1 << ppi_channel_requested); - NRF51_PPI_CHENSET |= (1 << ppi_channel_requested); + NRF51_PPI_CHEN |= BIT(ppi_channel_requested); + NRF51_PPI_CHENSET |= BIT(ppi_channel_requested); } diff --git a/chip/nrf51/config_chip.h b/chip/nrf51/config_chip.h index 374101d1bb..eb2ee93509 100644 --- a/chip/nrf51/config_chip.h +++ b/chip/nrf51/config_chip.h @@ -57,7 +57,7 @@ #undef CONFIG_UART_TX_BUF_SIZE #define CONFIG_UART_TX_BUF_SIZE 1024 -#define GPIO_PIN(port, index) GPIO_##port, (1 << index) +#define GPIO_PIN(port, index) GPIO_##port, BIT(index) #define GPIO_PIN_MASK(p, m) .port = GPIO_##p, .mask = (m) #endif /* __CROS_EC_CONFIG_CHIP_H */ diff --git a/chip/nrf51/gpio.c b/chip/nrf51/gpio.c index 3ad55f2b38..a01ee49940 100644 --- a/chip/nrf51/gpio.c +++ b/chip/nrf51/gpio.c @@ -164,7 +164,7 @@ void gpio_set_alternate_function(uint32_t port, uint32_t mask, int func) { uint32_t bit = GPIO_MASK_TO_NUM(mask); - ASSERT((~mask & (1 << bit)) == 0); /* Only one bit set. */ + ASSERT((~mask & BIT(bit)) == 0); /* Only one bit set. */ ASSERT(port == GPIO_0); ASSERT((func >= 0 && func < nrf51_alt_func_count) || func == -1); diff --git a/chip/nrf51/ppi.c b/chip/nrf51/ppi.c index d0be87f2ba..016cbf3008 100644 --- a/chip/nrf51/ppi.c +++ b/chip/nrf51/ppi.c @@ -18,10 +18,10 @@ int ppi_request_pre_programmed_channel(int ppi_chan) ASSERT(ppi_chan >= NRF51_PPI_FIRST_PP_CH && ppi_chan <= NRF51_PPI_LAST_PP_CH); - if (channels_in_use & (1 << ppi_chan)) + if (channels_in_use & BIT(ppi_chan)) return EC_ERROR_BUSY; - channels_in_use |= (1 << ppi_chan); + channels_in_use |= BIT(ppi_chan); return EC_SUCCESS; } @@ -31,25 +31,25 @@ int ppi_request_channel(int *ppi_chan) int chan; for (chan = 0; chan < NRF51_PPI_NUM_PROGRAMMABLE_CHANNELS; chan++) - if ((channels_in_use & (1 << chan)) == 0) + if ((channels_in_use & BIT(chan)) == 0) break; if (chan == NRF51_PPI_NUM_PROGRAMMABLE_CHANNELS) return EC_ERROR_BUSY; - channels_in_use |= (1 << chan); + channels_in_use |= BIT(chan); *ppi_chan = chan; return EC_SUCCESS; } void ppi_release_channel(int ppi_chan) { - channels_in_use &= ~(1 << ppi_chan); + channels_in_use &= ~BIT(ppi_chan); } void ppi_release_group(int ppi_group) { - channel_groups_in_use &= ~(1 << ppi_group); + channel_groups_in_use &= ~BIT(ppi_group); } int ppi_request_group(int *ppi_group) @@ -57,13 +57,13 @@ int ppi_request_group(int *ppi_group) int group; for (group = 0; group < NRF51_PPI_NUM_GROUPS; group++) - if ((channel_groups_in_use & (1 << group)) == 0) + if ((channel_groups_in_use & BIT(group)) == 0) break; if (group == NRF51_PPI_NUM_GROUPS) return EC_ERROR_BUSY; - channel_groups_in_use |= (1 << group); + channel_groups_in_use |= BIT(group); *ppi_group = group; return EC_SUCCESS; } diff --git a/chip/nrf51/radio_test.c b/chip/nrf51/radio_test.c index 5afb30425b..6c20874f4e 100644 --- a/chip/nrf51/radio_test.c +++ b/chip/nrf51/radio_test.c @@ -145,7 +145,7 @@ int ble_test_rx_init(int chan) int ble_test_tx_init(int chan, int len, int type) { - if (((1 << type) & BLE_TEST_TYPES_IMPLEMENTED) == 0 || + if ((BIT(type) & BLE_TEST_TYPES_IMPLEMENTED) == 0 || (len < 0 || len > BLE_MAX_TEST_PAYLOAD_OCTETS)) return HCI_ERR_Invalid_HCI_Command_Parameters; diff --git a/chip/nrf51/uart.c b/chip/nrf51/uart.c index ab52c6ad9a..eb94e53c98 100644 --- a/chip/nrf51/uart.c +++ b/chip/nrf51/uart.c @@ -34,13 +34,13 @@ void uart_tx_start(void) { disable_sleep(SLEEP_MASK_UART); should_stop = 0; - NRF51_UART_INTENSET = (1 << NRF55_UART_TXDRDY_BIT); + NRF51_UART_INTENSET = BIT(NRF55_UART_TXDRDY_BIT); task_trigger_irq(NRF51_PERID_USART); } void uart_tx_stop(void) { - NRF51_UART_INTENCLR = (1 << NRF55_UART_TXDRDY_BIT); + NRF51_UART_INTENCLR = BIT(NRF55_UART_TXDRDY_BIT); should_stop = 1; enable_sleep(SLEEP_MASK_UART); } @@ -96,7 +96,7 @@ void uart_interrupt(void) #ifndef CONFIG_UART_TX_DMA if (!should_stop) - NRF51_UART_INTENSET = (1 << NRF55_UART_TXDRDY_BIT); + NRF51_UART_INTENSET = BIT(NRF55_UART_TXDRDY_BIT); #endif /* CONFIG_UART_TX_DMA */ } @@ -113,7 +113,7 @@ void uart_init(void) task_enable_irq(NRF51_PERID_USART); - NRF51_UART_INTENSET = (1 << NRF55_UART_RXDRDY_BIT); + NRF51_UART_INTENSET = BIT(NRF55_UART_RXDRDY_BIT); NRF51_UART_STARTRX = 1; init_done = 1; diff --git a/chip/stm32/clock-stm32h7.c b/chip/stm32/clock-stm32h7.c index 30faa0035a..44d6e2e55a 100644 --- a/chip/stm32/clock-stm32h7.c +++ b/chip/stm32/clock-stm32h7.c @@ -32,7 +32,7 @@ * with /4 prescaler (2^2): period 125 us, full range ~8s */ #define LPTIM_PRESCALER_LOG2 2 -#define LPTIM_PRESCALER (1 << LPTIM_PRESCALER_LOG2) +#define LPTIM_PRESCALER BIT(LPTIM_PRESCALER_LOG2) #define LPTIM_PERIOD_US (SECOND / (STM32_LSI_CLOCK / LPTIM_PRESCALER)) /* diff --git a/chip/stm32/clock-stm32l.c b/chip/stm32/clock-stm32l.c index b0903b5cb1..2409e7918d 100644 --- a/chip/stm32/clock-stm32l.c +++ b/chip/stm32/clock-stm32l.c @@ -211,9 +211,9 @@ void clock_enable_module(enum module_id module, int enable) int new_mask; if (enable) - new_mask = clock_mask | (1 << module); + new_mask = clock_mask | BIT(module); else - new_mask = clock_mask & ~(1 << module); + new_mask = clock_mask & ~BIT(module); /* Only change clock if needed */ if ((!!new_mask) != (!!clock_mask)) { diff --git a/chip/stm32/clock-stm32l4.c b/chip/stm32/clock-stm32l4.c index c9042d10c4..182abcafca 100644 --- a/chip/stm32/clock-stm32l4.c +++ b/chip/stm32/clock-stm32l4.c @@ -324,9 +324,9 @@ void clock_enable_module(enum module_id module, int enable) int new_mask; if (enable) - new_mask = clock_mask | (1 << module); + new_mask = clock_mask | BIT(module); else - new_mask = clock_mask & ~(1 << module); + new_mask = clock_mask & ~BIT(module); /* Only change clock if needed */ if ((!!new_mask) != (!!clock_mask)) { diff --git a/chip/stm32/config_chip.h b/chip/stm32/config_chip.h index 0305197996..99cbd9b2be 100644 --- a/chip/stm32/config_chip.h +++ b/chip/stm32/config_chip.h @@ -140,7 +140,7 @@ #define CONFIG_CHIP_PRE_INIT #define GPIO_NAME_BY_PIN(port, index) #port#index -#define GPIO_PIN(port, index) GPIO_##port, (1 << index) +#define GPIO_PIN(port, index) GPIO_##port, BIT(index) #define GPIO_PIN_MASK(p, m) .port = GPIO_##p, .mask = (m) /* Prescaler values for PLL. Currently used only by STM32L476. */ diff --git a/chip/stm32/dma.c b/chip/stm32/dma.c index 26dfa0f823..e18676876f 100644 --- a/chip/stm32/dma.c +++ b/chip/stm32/dma.c @@ -65,7 +65,7 @@ void dma_select_channel(enum dma_channel channel, unsigned char stream) /* Local channel # starting from 0 on each DMA controller */ const unsigned char ch = channel % STM32_DMAC_PER_CTLR; const unsigned char shift = STM32_DMA_PERIPHERALS_PER_CHANNEL; - const unsigned char mask = (1 << shift) - 1; + const unsigned char mask = BIT(shift) - 1; uint32_t val; ASSERT(ch < STM32_DMAC_PER_CTLR); diff --git a/chip/stm32/flash-f.c b/chip/stm32/flash-f.c index aaf8e69873..8518485caa 100644 --- a/chip/stm32/flash-f.c +++ b/chip/stm32/flash-f.c @@ -442,7 +442,7 @@ int flash_physical_protect_at_boot(uint32_t new_flags) #endif if (protect) - val &= ~(1 << block); + val &= ~BIT(block); else val |= 1 << block; } diff --git a/chip/stm32/flash-stm32f0.c b/chip/stm32/flash-stm32f0.c index 6472b3e23b..e2ff2c779c 100644 --- a/chip/stm32/flash-stm32f0.c +++ b/chip/stm32/flash-stm32f0.c @@ -15,7 +15,7 @@ int flash_physical_get_protect(int block) { - return !(STM32_FLASH_WRPR & (1 << block)); + return !(STM32_FLASH_WRPR & BIT(block)); } /* diff --git a/chip/stm32/flash-stm32f3.c b/chip/stm32/flash-stm32f3.c index 843bbf48e4..ab505a082b 100644 --- a/chip/stm32/flash-stm32f3.c +++ b/chip/stm32/flash-stm32f3.c @@ -88,7 +88,7 @@ int flash_physical_get_protect(int block) { return (entire_flash_locked || #if defined(CHIP_FAMILY_STM32F3) - !(STM32_FLASH_WRPR & (1 << block)) + !(STM32_FLASH_WRPR & BIT(block)) #elif defined(CHIP_FAMILY_STM32F4) !(STM32_OPTB_WP & STM32_OPTB_nWRP(block)) #endif diff --git a/chip/stm32/flash-stm32h7.c b/chip/stm32/flash-stm32h7.c index 0f82bf409a..ba0a8a69f1 100644 --- a/chip/stm32/flash-stm32h7.c +++ b/chip/stm32/flash-stm32h7.c @@ -46,7 +46,7 @@ */ #define HWBANK_SIZE (CONFIG_FLASH_SIZE / 2) #define BLOCKS_PER_HWBANK (HWBANK_SIZE / CONFIG_FLASH_ERASE_SIZE) -#define BLOCKS_HWBANK_MASK ((1 << BLOCKS_PER_HWBANK) - 1) +#define BLOCKS_HWBANK_MASK (BIT(BLOCKS_PER_HWBANK) - 1) /* * We can tune the power consumption vs erase/write speed @@ -358,7 +358,7 @@ int flash_physical_get_protect(int block) int bank = block / BLOCKS_PER_HWBANK; int index = block % BLOCKS_PER_HWBANK; - return !(STM32_FLASH_WPSN_CUR(bank) & (1 << index)); + return !(STM32_FLASH_WPSN_CUR(bank) & BIT(index)); } /* diff --git a/chip/stm32/flash-stm32l.c b/chip/stm32/flash-stm32l.c index f796f4efaa..61916abf2d 100644 --- a/chip/stm32/flash-stm32l.c +++ b/chip/stm32/flash-stm32l.c @@ -314,13 +314,13 @@ int flash_physical_get_protect(int block) return 1; /* Check the active write protect status */ - return STM32_FLASH_WRPR & (1 << block); + return STM32_FLASH_WRPR & BIT(block); } int flash_physical_protect_at_boot(uint32_t new_flags) { uint32_t prot; - uint32_t mask = ((1 << WP_BANK_COUNT) - 1) << WP_BANK_OFFSET; + uint32_t mask = (BIT(WP_BANK_COUNT) - 1) << WP_BANK_OFFSET; int rv; if (new_flags & EC_FLASH_PROTECT_ALL_AT_BOOT) diff --git a/chip/stm32/pwm.c b/chip/stm32/pwm.c index 45d489a8c0..123c09968a 100644 --- a/chip/stm32/pwm.c +++ b/chip/stm32/pwm.c @@ -43,7 +43,7 @@ static void pwm_configure(enum pwm_channel ch) int frequency = pwm->frequency ? pwm->frequency : 100; uint16_t ccer; - if (using_pwm & (1 << ch)) + if (using_pwm & BIT(ch)) return; /* Enable timer */ @@ -109,7 +109,7 @@ static void pwm_disable(enum pwm_channel ch) const struct pwm_t *pwm = pwm_channels + ch; timer_ctlr_t *tim = (timer_ctlr_t *)(pwm->tim.base); - if ((using_pwm & (1 << ch)) == 0) + if ((using_pwm & BIT(ch)) == 0) return; /* Main output disable */ @@ -141,7 +141,7 @@ void pwm_enable(enum pwm_channel ch, int enabled) int pwm_get_enabled(enum pwm_channel ch) { - return using_pwm & (1 << ch); + return using_pwm & BIT(ch); } static void pwm_reconfigure(enum pwm_channel ch) diff --git a/chip/stm32/usb_dwc_registers.h b/chip/stm32/usb_dwc_registers.h index f8b90c1d1f..faac9ca775 100644 --- a/chip/stm32/usb_dwc_registers.h +++ b/chip/stm32/usb_dwc_registers.h @@ -175,13 +175,13 @@ extern struct dwc_usb usb_ctl; #define GR_USB_DOEPDMA(n) GR_USB_EPOREG(0x14, n) #define GR_USB_DOEPDMAB(n) GR_USB_EPOREG(0x1c, n) -#define GOTGCTL_BVALOEN (1 << GC_USB_GOTGCTL_BVALIDOVEN_LSB) +#define GOTGCTL_BVALOEN BIT(GC_USB_GOTGCTL_BVALIDOVEN_LSB) #define GOTGCTL_BVALOVAL BIT(7) /* Bit 5 */ -#define GAHBCFG_DMA_EN (1 << GC_USB_GAHBCFG_DMAEN_LSB) +#define GAHBCFG_DMA_EN BIT(GC_USB_GAHBCFG_DMAEN_LSB) /* Bit 1 */ -#define GAHBCFG_GLB_INTR_EN (1 << GC_USB_GAHBCFG_GLBLINTRMSK_LSB) +#define GAHBCFG_GLB_INTR_EN BIT(GC_USB_GAHBCFG_GLBLINTRMSK_LSB) /* HS Burst Len */ #define GAHBCFG_HBSTLEN_INCR4 (3 << GC_USB_GAHBCFG_HBSTLEN_LSB) /* Bit 7 */ @@ -194,7 +194,7 @@ extern struct dwc_usb usb_ctl; #define GUSBCFG_USBTRDTIM(n) (((n) << GC_USB_GUSBCFG_USBTRDTIM_LSB) \ & GC_USB_GUSBCFG_USBTRDTIM_MASK) /* Force device mode */ -#define GUSBCFG_FDMOD (1 << GC_USB_GUSBCFG_FDMOD_LSB) +#define GUSBCFG_FDMOD BIT(GC_USB_GUSBCFG_FDMOD_LSB) #define GUSBCFG_PHYSEL BIT(6) #define GUSBCFG_SRPCAP BIT(8) #define GUSBCFG_HNPCAP BIT(9) @@ -210,81 +210,81 @@ extern struct dwc_usb usb_ctl; #define GUSBCFG_TSDPS BIT(22) -#define GRSTCTL_CSFTRST (1 << GC_USB_GRSTCTL_CSFTRST_LSB) -#define GRSTCTL_AHBIDLE (1 << GC_USB_GRSTCTL_AHBIDLE_LSB) -#define GRSTCTL_TXFFLSH (1 << GC_USB_GRSTCTL_TXFFLSH_LSB) -#define GRSTCTL_RXFFLSH (1 << GC_USB_GRSTCTL_RXFFLSH_LSB) +#define GRSTCTL_CSFTRST BIT(GC_USB_GRSTCTL_CSFTRST_LSB) +#define GRSTCTL_AHBIDLE BIT(GC_USB_GRSTCTL_AHBIDLE_LSB) +#define GRSTCTL_TXFFLSH BIT(GC_USB_GRSTCTL_TXFFLSH_LSB) +#define GRSTCTL_RXFFLSH BIT(GC_USB_GRSTCTL_RXFFLSH_LSB) #define GRSTCTL_TXFNUM(n) \ (((n) << GC_USB_GRSTCTL_TXFNUM_LSB) & GC_USB_GRSTCTL_TXFNUM_MASK) #define DCFG_DEVSPD_HSULPI (0 << GC_USB_DCFG_DEVSPD_LSB) -#define DCFG_DEVSPD_FSULPI (1 << GC_USB_DCFG_DEVSPD_LSB) +#define DCFG_DEVSPD_FSULPI BIT(GC_USB_DCFG_DEVSPD_LSB) #define DCFG_DEVSPD_FS48 (3 << GC_USB_DCFG_DEVSPD_LSB) #define DCFG_DEVADDR(a) \ (((a) << GC_USB_DCFG_DEVADDR_LSB) & GC_USB_DCFG_DEVADDR_MASK) -#define DCFG_NZLSOHSK (1 << GC_USB_DCFG_NZSTSOUTHSHK_LSB) +#define DCFG_NZLSOHSK BIT(GC_USB_DCFG_NZSTSOUTHSHK_LSB) -#define DCTL_SFTDISCON (1 << GC_USB_DCTL_SFTDISCON_LSB) -#define DCTL_CGOUTNAK (1 << GC_USB_DCTL_CGOUTNAK_LSB) -#define DCTL_CGNPINNAK (1 << GC_USB_DCTL_CGNPINNAK_LSB) -#define DCTL_PWRONPRGDONE (1 << GC_USB_DCTL_PWRONPRGDONE_LSB) +#define DCTL_SFTDISCON BIT(GC_USB_DCTL_SFTDISCON_LSB) +#define DCTL_CGOUTNAK BIT(GC_USB_DCTL_CGOUTNAK_LSB) +#define DCTL_CGNPINNAK BIT(GC_USB_DCTL_CGNPINNAK_LSB) +#define DCTL_PWRONPRGDONE BIT(GC_USB_DCTL_PWRONPRGDONE_LSB) /* Device Endpoint Common IN Interrupt Mask bits */ -#define DIEPMSK_AHBERRMSK (1 << GC_USB_DIEPMSK_AHBERRMSK_LSB) -#define DIEPMSK_BNAININTRMSK (1 << GC_USB_DIEPMSK_BNAININTRMSK_LSB) -#define DIEPMSK_EPDISBLDMSK (1 << GC_USB_DIEPMSK_EPDISBLDMSK_LSB) -#define DIEPMSK_INEPNAKEFFMSK (1 << GC_USB_DIEPMSK_INEPNAKEFFMSK_LSB) -#define DIEPMSK_INTKNEPMISMSK (1 << GC_USB_DIEPMSK_INTKNEPMISMSK_LSB) -#define DIEPMSK_INTKNTXFEMPMSK (1 << GC_USB_DIEPMSK_INTKNTXFEMPMSK_LSB) -#define DIEPMSK_NAKMSK (1 << GC_USB_DIEPMSK_NAKMSK_LSB) -#define DIEPMSK_TIMEOUTMSK (1 << GC_USB_DIEPMSK_TIMEOUTMSK_LSB) -#define DIEPMSK_TXFIFOUNDRNMSK (1 << GC_USB_DIEPMSK_TXFIFOUNDRNMSK_LSB) -#define DIEPMSK_XFERCOMPLMSK (1 << GC_USB_DIEPMSK_XFERCOMPLMSK_LSB) +#define DIEPMSK_AHBERRMSK BIT(GC_USB_DIEPMSK_AHBERRMSK_LSB) +#define DIEPMSK_BNAININTRMSK BIT(GC_USB_DIEPMSK_BNAININTRMSK_LSB) +#define DIEPMSK_EPDISBLDMSK BIT(GC_USB_DIEPMSK_EPDISBLDMSK_LSB) +#define DIEPMSK_INEPNAKEFFMSK BIT(GC_USB_DIEPMSK_INEPNAKEFFMSK_LSB) +#define DIEPMSK_INTKNEPMISMSK BIT(GC_USB_DIEPMSK_INTKNEPMISMSK_LSB) +#define DIEPMSK_INTKNTXFEMPMSK BIT(GC_USB_DIEPMSK_INTKNTXFEMPMSK_LSB) +#define DIEPMSK_NAKMSK BIT(GC_USB_DIEPMSK_NAKMSK_LSB) +#define DIEPMSK_TIMEOUTMSK BIT(GC_USB_DIEPMSK_TIMEOUTMSK_LSB) +#define DIEPMSK_TXFIFOUNDRNMSK BIT(GC_USB_DIEPMSK_TXFIFOUNDRNMSK_LSB) +#define DIEPMSK_XFERCOMPLMSK BIT(GC_USB_DIEPMSK_XFERCOMPLMSK_LSB) /* Device Endpoint Common OUT Interrupt Mask bits */ -#define DOEPMSK_AHBERRMSK (1 << GC_USB_DOEPMSK_AHBERRMSK_LSB) -#define DOEPMSK_BBLEERRMSK (1 << GC_USB_DOEPMSK_BBLEERRMSK_LSB) -#define DOEPMSK_BNAOUTINTRMSK (1 << GC_USB_DOEPMSK_BNAOUTINTRMSK_LSB) -#define DOEPMSK_EPDISBLDMSK (1 << GC_USB_DOEPMSK_EPDISBLDMSK_LSB) -#define DOEPMSK_NAKMSK (1 << GC_USB_DOEPMSK_NAKMSK_LSB) -#define DOEPMSK_NYETMSK (1 << GC_USB_DOEPMSK_NYETMSK_LSB) -#define DOEPMSK_OUTPKTERRMSK (1 << GC_USB_DOEPMSK_OUTPKTERRMSK_LSB) -#define DOEPMSK_OUTTKNEPDISMSK (1 << GC_USB_DOEPMSK_OUTTKNEPDISMSK_LSB) -#define DOEPMSK_SETUPMSK (1 << GC_USB_DOEPMSK_SETUPMSK_LSB) -#define DOEPMSK_STSPHSERCVDMSK (1 << GC_USB_DOEPMSK_STSPHSERCVDMSK_LSB) -#define DOEPMSK_XFERCOMPLMSK (1 << GC_USB_DOEPMSK_XFERCOMPLMSK_LSB) +#define DOEPMSK_AHBERRMSK BIT(GC_USB_DOEPMSK_AHBERRMSK_LSB) +#define DOEPMSK_BBLEERRMSK BIT(GC_USB_DOEPMSK_BBLEERRMSK_LSB) +#define DOEPMSK_BNAOUTINTRMSK BIT(GC_USB_DOEPMSK_BNAOUTINTRMSK_LSB) +#define DOEPMSK_EPDISBLDMSK BIT(GC_USB_DOEPMSK_EPDISBLDMSK_LSB) +#define DOEPMSK_NAKMSK BIT(GC_USB_DOEPMSK_NAKMSK_LSB) +#define DOEPMSK_NYETMSK BIT(GC_USB_DOEPMSK_NYETMSK_LSB) +#define DOEPMSK_OUTPKTERRMSK BIT(GC_USB_DOEPMSK_OUTPKTERRMSK_LSB) +#define DOEPMSK_OUTTKNEPDISMSK BIT(GC_USB_DOEPMSK_OUTTKNEPDISMSK_LSB) +#define DOEPMSK_SETUPMSK BIT(GC_USB_DOEPMSK_SETUPMSK_LSB) +#define DOEPMSK_STSPHSERCVDMSK BIT(GC_USB_DOEPMSK_STSPHSERCVDMSK_LSB) +#define DOEPMSK_XFERCOMPLMSK BIT(GC_USB_DOEPMSK_XFERCOMPLMSK_LSB) /* Device Endpoint-n IN Interrupt Register bits */ -#define DIEPINT_AHBERR (1 << GC_USB_DIEPINT0_AHBERR_LSB) -#define DIEPINT_BBLEERR (1 << GC_USB_DIEPINT0_BBLEERR_LSB) -#define DIEPINT_BNAINTR (1 << GC_USB_DIEPINT0_BNAINTR_LSB) -#define DIEPINT_EPDISBLD (1 << GC_USB_DIEPINT0_EPDISBLD_LSB) -#define DIEPINT_INEPNAKEFF (1 << GC_USB_DIEPINT0_INEPNAKEFF_LSB) -#define DIEPINT_INTKNEPMIS (1 << GC_USB_DIEPINT0_INTKNEPMIS_LSB) -#define DIEPINT_INTKNTXFEMP (1 << GC_USB_DIEPINT0_INTKNTXFEMP_LSB) -#define DIEPINT_NAKINTRPT (1 << GC_USB_DIEPINT0_NAKINTRPT_LSB) -#define DIEPINT_NYETINTRPT (1 << GC_USB_DIEPINT0_NYETINTRPT_LSB) -#define DIEPINT_PKTDRPSTS (1 << GC_USB_DIEPINT0_PKTDRPSTS_LSB) -#define DIEPINT_TIMEOUT (1 << GC_USB_DIEPINT0_TIMEOUT_LSB) -#define DIEPINT_TXFEMP (1 << GC_USB_DIEPINT0_TXFEMP_LSB) -#define DIEPINT_TXFIFOUNDRN (1 << GC_USB_DIEPINT0_TXFIFOUNDRN_LSB) -#define DIEPINT_XFERCOMPL (1 << GC_USB_DIEPINT0_XFERCOMPL_LSB) +#define DIEPINT_AHBERR BIT(GC_USB_DIEPINT0_AHBERR_LSB) +#define DIEPINT_BBLEERR BIT(GC_USB_DIEPINT0_BBLEERR_LSB) +#define DIEPINT_BNAINTR BIT(GC_USB_DIEPINT0_BNAINTR_LSB) +#define DIEPINT_EPDISBLD BIT(GC_USB_DIEPINT0_EPDISBLD_LSB) +#define DIEPINT_INEPNAKEFF BIT(GC_USB_DIEPINT0_INEPNAKEFF_LSB) +#define DIEPINT_INTKNEPMIS BIT(GC_USB_DIEPINT0_INTKNEPMIS_LSB) +#define DIEPINT_INTKNTXFEMP BIT(GC_USB_DIEPINT0_INTKNTXFEMP_LSB) +#define DIEPINT_NAKINTRPT BIT(GC_USB_DIEPINT0_NAKINTRPT_LSB) +#define DIEPINT_NYETINTRPT BIT(GC_USB_DIEPINT0_NYETINTRPT_LSB) +#define DIEPINT_PKTDRPSTS BIT(GC_USB_DIEPINT0_PKTDRPSTS_LSB) +#define DIEPINT_TIMEOUT BIT(GC_USB_DIEPINT0_TIMEOUT_LSB) +#define DIEPINT_TXFEMP BIT(GC_USB_DIEPINT0_TXFEMP_LSB) +#define DIEPINT_TXFIFOUNDRN BIT(GC_USB_DIEPINT0_TXFIFOUNDRN_LSB) +#define DIEPINT_XFERCOMPL BIT(GC_USB_DIEPINT0_XFERCOMPL_LSB) /* Device Endpoint-n OUT Interrupt Register bits */ -#define DOEPINT_AHBERR (1 << GC_USB_DOEPINT0_AHBERR_LSB) -#define DOEPINT_BACK2BACKSETUP (1 << GC_USB_DOEPINT0_BACK2BACKSETUP_LSB) -#define DOEPINT_BBLEERR (1 << GC_USB_DOEPINT0_BBLEERR_LSB) -#define DOEPINT_BNAINTR (1 << GC_USB_DOEPINT0_BNAINTR_LSB) -#define DOEPINT_EPDISBLD (1 << GC_USB_DOEPINT0_EPDISBLD_LSB) -#define DOEPINT_NAKINTRPT (1 << GC_USB_DOEPINT0_NAKINTRPT_LSB) -#define DOEPINT_NYETINTRPT (1 << GC_USB_DOEPINT0_NYETINTRPT_LSB) -#define DOEPINT_OUTPKTERR (1 << GC_USB_DOEPINT0_OUTPKTERR_LSB) -#define DOEPINT_OUTTKNEPDIS (1 << GC_USB_DOEPINT0_OUTTKNEPDIS_LSB) -#define DOEPINT_PKTDRPSTS (1 << GC_USB_DOEPINT0_PKTDRPSTS_LSB) -#define DOEPINT_SETUP (1 << GC_USB_DOEPINT0_SETUP_LSB) -#define DOEPINT_STSPHSERCVD (1 << GC_USB_DOEPINT0_STSPHSERCVD_LSB) -#define DOEPINT_STUPPKTRCVD (1 << GC_USB_DOEPINT0_STUPPKTRCVD_LSB) -#define DOEPINT_XFERCOMPL (1 << GC_USB_DOEPINT0_XFERCOMPL_LSB) +#define DOEPINT_AHBERR BIT(GC_USB_DOEPINT0_AHBERR_LSB) +#define DOEPINT_BACK2BACKSETUP BIT(GC_USB_DOEPINT0_BACK2BACKSETUP_LSB) +#define DOEPINT_BBLEERR BIT(GC_USB_DOEPINT0_BBLEERR_LSB) +#define DOEPINT_BNAINTR BIT(GC_USB_DOEPINT0_BNAINTR_LSB) +#define DOEPINT_EPDISBLD BIT(GC_USB_DOEPINT0_EPDISBLD_LSB) +#define DOEPINT_NAKINTRPT BIT(GC_USB_DOEPINT0_NAKINTRPT_LSB) +#define DOEPINT_NYETINTRPT BIT(GC_USB_DOEPINT0_NYETINTRPT_LSB) +#define DOEPINT_OUTPKTERR BIT(GC_USB_DOEPINT0_OUTPKTERR_LSB) +#define DOEPINT_OUTTKNEPDIS BIT(GC_USB_DOEPINT0_OUTTKNEPDIS_LSB) +#define DOEPINT_PKTDRPSTS BIT(GC_USB_DOEPINT0_PKTDRPSTS_LSB) +#define DOEPINT_SETUP BIT(GC_USB_DOEPINT0_SETUP_LSB) +#define DOEPINT_STSPHSERCVD BIT(GC_USB_DOEPINT0_STSPHSERCVD_LSB) +#define DOEPINT_STUPPKTRCVD BIT(GC_USB_DOEPINT0_STUPPKTRCVD_LSB) +#define DOEPINT_XFERCOMPL BIT(GC_USB_DOEPINT0_XFERCOMPL_LSB) #define DXEPCTL_EPTYPE_CTRL (0 << GC_USB_DIEPCTL0_EPTYPE_LSB) #define DXEPCTL_EPTYPE_ISO (1 << GC_USB_DIEPCTL0_EPTYPE_LSB) @@ -292,14 +292,14 @@ extern struct dwc_usb usb_ctl; #define DXEPCTL_EPTYPE_INT (3 << GC_USB_DIEPCTL0_EPTYPE_LSB) #define DXEPCTL_EPTYPE_MASK GC_USB_DIEPCTL0_EPTYPE_MASK #define DXEPCTL_TXFNUM(n) ((n) << GC_USB_DIEPCTL1_TXFNUM_LSB) -#define DXEPCTL_STALL (1 << GC_USB_DIEPCTL0_STALL_LSB) -#define DXEPCTL_CNAK (1 << GC_USB_DIEPCTL0_CNAK_LSB) -#define DXEPCTL_DPID (1 << GC_USB_DIEPCTL0_DPID_LSB) -#define DXEPCTL_SNAK (1 << GC_USB_DIEPCTL0_SNAK_LSB) -#define DXEPCTL_NAKSTS (1 << GC_USB_DIEPCTL0_NAKSTS_LSB) -#define DXEPCTL_EPENA (1 << GC_USB_DIEPCTL0_EPENA_LSB) -#define DXEPCTL_EPDIS (1 << GC_USB_DIEPCTL0_EPDIS_LSB) -#define DXEPCTL_USBACTEP (1 << GC_USB_DIEPCTL0_USBACTEP_LSB) +#define DXEPCTL_STALL BIT(GC_USB_DIEPCTL0_STALL_LSB) +#define DXEPCTL_CNAK BIT(GC_USB_DIEPCTL0_CNAK_LSB) +#define DXEPCTL_DPID BIT(GC_USB_DIEPCTL0_DPID_LSB) +#define DXEPCTL_SNAK BIT(GC_USB_DIEPCTL0_SNAK_LSB) +#define DXEPCTL_NAKSTS BIT(GC_USB_DIEPCTL0_NAKSTS_LSB) +#define DXEPCTL_EPENA BIT(GC_USB_DIEPCTL0_EPENA_LSB) +#define DXEPCTL_EPDIS BIT(GC_USB_DIEPCTL0_EPDIS_LSB) +#define DXEPCTL_USBACTEP BIT(GC_USB_DIEPCTL0_USBACTEP_LSB) #define DXEPCTL_MPS64 (0 << GC_USB_DIEPCTL0_MPS_LSB) #define DXEPCTL_MPS(cnt) ((cnt) << GC_USB_DIEPCTL1_MPS_LSB) diff --git a/common/btle_ll.c b/common/btle_ll.c index fdf27d71c6..02f6af73d0 100644 --- a/common/btle_ll.c +++ b/common/btle_ll.c @@ -622,7 +622,7 @@ int ble_ll_adv_event(void) int rv; for (chan_idx = 0; chan_idx < 3; chan_idx++) { - if (ll_adv_params.advChannelMap & (1 << chan_idx)) { + if (ll_adv_params.advChannelMap & BIT(chan_idx)) { rv = ble_ll_adv(chan_idx + 37); if (rv != EC_SUCCESS) return rv; diff --git a/common/button.c b/common/button.c index 3caa4383b5..88cf9e69b6 100644 --- a/common/button.c +++ b/common/button.c @@ -353,7 +353,7 @@ static int console_command_button(int argc, char **argv) if (button == BUTTON_COUNT) return EC_ERROR_PARAM1 + argv_idx - 1; - button_mask |= (1 << button); + button_mask |= BIT(button); } if (!button_mask) @@ -363,7 +363,7 @@ static int console_command_button(int argc, char **argv) /* Press the button(s) */ for (button_idx = 0; button_idx < BUTTON_COUNT; button_idx++) - if (button_mask & (1 << button_idx)) + if (button_mask & BIT(button_idx)) button_interrupt_simulate(button_idx); /* Hold the button(s) */ @@ -372,7 +372,7 @@ static int console_command_button(int argc, char **argv) /* Release the button(s) */ for (button_idx = 0; button_idx < BUTTON_COUNT; button_idx++) - if (button_mask & (1 << button_idx)) + if (button_mask & BIT(button_idx)) button_interrupt_simulate(button_idx); /* Wait till button processing is finished */ diff --git a/common/charge_manager.c b/common/charge_manager.c index 6793b095b4..dcb819ee3a 100644 --- a/common/charge_manager.c +++ b/common/charge_manager.c @@ -1050,12 +1050,12 @@ int charge_manager_get_power_limit_uw(void) static inline int has_other_active_source(int port) { - return source_port_bitmap & ~(1 << port); + return source_port_bitmap & ~BIT(port); } static inline int is_active_source(int port) { - return source_port_bitmap & (1 << port); + return source_port_bitmap & BIT(port); } static int can_supply_max_current(int port) diff --git a/common/dptf.c b/common/dptf.c index 23e597bec9..0596b4100f 100644 --- a/common/dptf.c +++ b/common/dptf.c @@ -45,8 +45,8 @@ int dptf_query_next_sensor_event(void) int id; for (id = 0; id < TEMP_SENSOR_COUNT; id++) - if (dptf_seen & (1 << id)) { /* atomic? */ - atomic_clear(&dptf_seen, (1 << id)); + if (dptf_seen & BIT(id)) { /* atomic? */ + atomic_clear(&dptf_seen, BIT(id)); return id; } @@ -73,13 +73,13 @@ static int dpft_check_temp_threshold(int sensor_id, int temp) if (cond_went_true(&dptf_threshold[sensor_id][i].over)) { CPRINTS("DPTF over threshold [%d][%d", sensor_id, i); - atomic_or(&dptf_seen, (1 << sensor_id)); + atomic_or(&dptf_seen, BIT(sensor_id)); tripped = 1; } if (cond_went_false(&dptf_threshold[sensor_id][i].over)) { CPRINTS("DPTF under threshold [%d][%d", sensor_id, i); - atomic_or(&dptf_seen, (1 << sensor_id)); + atomic_or(&dptf_seen, BIT(sensor_id)); tripped = 1; } } @@ -97,7 +97,7 @@ void dptf_set_temp_threshold(int sensor_id, int temp, int idx, int enable) if (dptf_threshold[sensor_id][idx].temp == -1) cond_init(&dptf_threshold[sensor_id][idx].over, 0); dptf_threshold[sensor_id][idx].temp = temp; - atomic_clear(&dptf_seen, (1 << sensor_id)); + atomic_clear(&dptf_seen, BIT(sensor_id)); } else { dptf_threshold[sensor_id][idx].temp = -1; } diff --git a/common/fpsensor.c b/common/fpsensor.c index b3b376a400..d30d13ca40 100644 --- a/common/fpsensor.c +++ b/common/fpsensor.c @@ -167,7 +167,7 @@ static uint32_t fp_process_enroll(void) if (res < 0) return EC_MKBP_FP_ENROLL | EC_MKBP_FP_ERRCODE(EC_MKBP_FP_ERR_ENROLL_INTERNAL); - templ_dirty |= (1 << templ_valid); + templ_dirty |= BIT(templ_valid); if (percent == 100) { res = fp_enrollment_finish(fp_template[templ_valid]); if (res) @@ -694,7 +694,7 @@ static int fp_command_frame(struct host_cmd_handler_args *args) CPRINTS("fgr%d: Failed to encrypt template", fgr); return EC_RES_UNAVAILABLE; } - templ_dirty &= ~(1 << fgr); + templ_dirty &= ~BIT(fgr); } memcpy(out, fp_enc_buffer + offset, size); args->response_size = size; diff --git a/common/i2c_master.c b/common/i2c_master.c index bda3561d34..cfc1a9108a 100644 --- a/common/i2c_master.c +++ b/common/i2c_master.c @@ -178,7 +178,7 @@ void i2c_lock(int port, int lock) } else { interrupt_disable(); - i2c_port_active_list &= ~(1 << port); + i2c_port_active_list &= ~BIT(port); /* Once there is no i2c port active, enable sleep bit of i2c. */ if (!i2c_port_active_list) enable_sleep(SLEEP_MASK_I2C_MASTER); diff --git a/common/keyboard_mkbp.c b/common/keyboard_mkbp.c index 186475b4dd..bca1385391 100644 --- a/common/keyboard_mkbp.c +++ b/common/keyboard_mkbp.c @@ -50,7 +50,7 @@ */ #define BATTERY_KEY_COL 0 #define BATTERY_KEY_ROW 7 -#define BATTERY_KEY_ROW_MASK (1 << BATTERY_KEY_ROW) +#define BATTERY_KEY_ROW_MASK BIT(BATTERY_KEY_ROW) static uint32_t fifo_start; /* first entry */ static uint32_t fifo_end; /* last entry */ @@ -238,7 +238,7 @@ test_mockable int mkbp_fifo_add(uint8_t event_type, const uint8_t *buffp) void mkbp_update_switches(uint32_t sw, int state) { - mkbp_switch_state &= ~(1 << sw); + mkbp_switch_state &= ~BIT(sw); mkbp_switch_state |= (!!state << sw); mkbp_fifo_add(EC_MKBP_EVENT_SWITCH, @@ -280,22 +280,22 @@ void keyboard_update_button(enum keyboard_button_type button, int is_pressed) { switch (button) { case KEYBOARD_BUTTON_POWER: - mkbp_button_state &= ~(1 << EC_MKBP_POWER_BUTTON); + mkbp_button_state &= ~BIT(EC_MKBP_POWER_BUTTON); mkbp_button_state |= (is_pressed << EC_MKBP_POWER_BUTTON); break; case KEYBOARD_BUTTON_VOLUME_UP: - mkbp_button_state &= ~(1 << EC_MKBP_VOL_UP); + mkbp_button_state &= ~BIT(EC_MKBP_VOL_UP); mkbp_button_state |= (is_pressed << EC_MKBP_VOL_UP); break; case KEYBOARD_BUTTON_VOLUME_DOWN: - mkbp_button_state &= ~(1 << EC_MKBP_VOL_DOWN); + mkbp_button_state &= ~BIT(EC_MKBP_VOL_DOWN); mkbp_button_state |= (is_pressed << EC_MKBP_VOL_DOWN); break; case KEYBOARD_BUTTON_RECOVERY: - mkbp_button_state &= ~(1 << EC_MKBP_RECOVERY); + mkbp_button_state &= ~BIT(EC_MKBP_RECOVERY); mkbp_button_state |= (is_pressed << EC_MKBP_RECOVERY); break; @@ -418,15 +418,15 @@ static uint32_t get_supported_buttons(void) uint32_t val = 0; #ifdef CONFIG_VOLUME_BUTTONS - val |= (1 << EC_MKBP_VOL_UP) | (1 << EC_MKBP_VOL_DOWN); + val |= BIT(EC_MKBP_VOL_UP) | BIT(EC_MKBP_VOL_DOWN); #endif /* defined(CONFIG_VOLUME_BUTTONS) */ #ifdef CONFIG_DEDICATED_RECOVERY_BUTTON - val |= (1 << EC_MKBP_RECOVERY); + val |= BIT(EC_MKBP_RECOVERY); #endif /* defined(CONFIG_DEDICATED_RECOVERY_BUTTON) */ #ifdef CONFIG_POWER_BUTTON - val |= (1 << EC_MKBP_POWER_BUTTON); + val |= BIT(EC_MKBP_POWER_BUTTON); #endif /* defined(CONFIG_POWER_BUTTON) */ return val; @@ -437,13 +437,13 @@ static uint32_t get_supported_switches(void) uint32_t val = 0; #ifdef CONFIG_LID_SWITCH - val |= (1 << EC_MKBP_LID_OPEN); + val |= BIT(EC_MKBP_LID_OPEN); #endif #ifdef CONFIG_TABLET_MODE_SWITCH - val |= (1 << EC_MKBP_TABLET_MODE); + val |= BIT(EC_MKBP_TABLET_MODE); #endif #ifdef CONFIG_BASE_ATTACHED_SWITCH - val |= (1 << EC_MKBP_BASE_ATTACHED); + val |= BIT(EC_MKBP_BASE_ATTACHED); #endif return val; } @@ -536,12 +536,12 @@ DECLARE_HOST_COMMAND(EC_CMD_MKBP_INFO, mkbp_get_info, /* For boards without a keyscan task, try and simulate keyboard presses. */ static void simulate_key(int row, int col, int pressed) { - if ((simulated_key[col] & (1 << row)) == ((pressed ? 1 : 0) << row)) + if ((simulated_key[col] & BIT(row)) == ((pressed ? 1 : 0) << row)) return; /* No change */ - simulated_key[col] &= ~(1 << row); + simulated_key[col] &= ~BIT(row); if (pressed) - simulated_key[col] |= (1 << row); + simulated_key[col] |= BIT(row); keyboard_fifo_add(simulated_key); } @@ -556,7 +556,7 @@ static int command_mkbp_keyboard_press(int argc, char **argv) if (simulated_key[i] == 0) continue; for (j = 0; j < KEYBOARD_ROWS; ++j) - if (simulated_key[i] & (1 << j)) + if (simulated_key[i] & BIT(j)) ccprintf("\t%d %d\n", i, j); } diff --git a/common/keyboard_scan.c b/common/keyboard_scan.c index 24fc7bc73c..a8f843e0a2 100644 --- a/common/keyboard_scan.c +++ b/common/keyboard_scan.c @@ -197,10 +197,10 @@ static void simulate_key(int row, int col, int pressed) { int old_polls; - if ((simulated_key[col] & (1 << row)) == ((pressed ? 1 : 0) << row)) + if ((simulated_key[col] & BIT(row)) == ((pressed ? 1 : 0) << row)) return; /* No change */ - simulated_key[col] ^= (1 << row); + simulated_key[col] ^= BIT(row); /* Keep track of polls now that we've got keys simulated */ old_polls = kbd_polls; @@ -481,7 +481,7 @@ static int check_keys_changed(uint8_t *state) continue; for (i = 0; i < KEYBOARD_ROWS; i++) { - if (diff & (1 << i)) + if (diff & BIT(i)) scan_edge_index[c][i] = scan_time_index; } @@ -601,7 +601,7 @@ static uint32_t check_key_list(const uint8_t *state) k = boot_key_list; for (c = 0; c < ARRAY_SIZE(boot_key_list); c++, k++) { if (curr_state[k->mask_index] & k->mask_value) { - boot_key_mask |= (1 << c); + boot_key_mask |= BIT(c); curr_state[k->mask_index] &= ~k->mask_value; } } @@ -1005,7 +1005,7 @@ static int command_keyboard_press(int argc, char **argv) if (simulated_key[i] == 0) continue; for (j = 0; j < KEYBOARD_ROWS; ++j) - if (simulated_key[i] & (1 << j)) + if (simulated_key[i] & BIT(j)) ccprintf("\t%d %d\n", i, j); } diff --git a/common/lightbar.c b/common/lightbar.c index c7fed67e7e..c0dd35e56b 100644 --- a/common/lightbar.c +++ b/common/lightbar.c @@ -1322,7 +1322,7 @@ static uint32_t lightbyte_SET_COLOR_SINGLE(void) return EC_RES_INVALID_PARAM; for (i = 0; i < NUM_LEDS; i++) - if (led & (1 << i)) + if (led & BIT(i)) led_desc[i][control][color] = value; return EC_SUCCESS; @@ -1350,7 +1350,7 @@ static uint32_t lightbyte_SET_COLOR_RGB(void) return EC_RES_INVALID_PARAM; for (i = 0; i < NUM_LEDS; i++) - if (led & (1 << i)) { + if (led & BIT(i)) { led_desc[i][control][LB_COL_RED] = r; led_desc[i][control][LB_COL_GREEN] = g; led_desc[i][control][LB_COL_BLUE] = b; diff --git a/common/mkbp_event.c b/common/mkbp_event.c index d604600a0f..fc70035a10 100644 --- a/common/mkbp_event.c +++ b/common/mkbp_event.c @@ -31,7 +31,7 @@ static void clear_event(uint8_t event_type) static int event_is_set(uint8_t event_type) { - return events & (1 << event_type); + return events & BIT(event_type); } #ifdef CONFIG_MKBP_USE_GPIO diff --git a/common/motion_sense.c b/common/motion_sense.c index e0332ae073..9601970f7b 100644 --- a/common/motion_sense.c +++ b/common/motion_sense.c @@ -557,7 +557,7 @@ static void motion_sense_shutdown(void) sensor->drv->list_activities(sensor, &enabled, &disabled); /* exclude double tap, it is used internally. */ - enabled &= ~(1 << MOTIONSENSE_ACTIVITY_DOUBLE_TAP); + enabled &= ~BIT(MOTIONSENSE_ACTIVITY_DOUBLE_TAP); while (enabled) { int activity = get_next_bit(&enabled); sensor->drv->manage_activity(sensor, activity, 0, NULL); @@ -927,8 +927,8 @@ void motion_sense_task(void *u) uint16_t ready_status; struct motion_sensor_t *sensor; #ifdef CONFIG_LID_ANGLE - const uint16_t lid_angle_sensors = ((1 << CONFIG_LID_ANGLE_SENSOR_BASE)| - (1 << CONFIG_LID_ANGLE_SENSOR_LID)); + const uint16_t lid_angle_sensors = (BIT(CONFIG_LID_ANGLE_SENSOR_BASE)| + BIT(CONFIG_LID_ANGLE_SENSOR_LID)); #endif #ifdef CONFIG_ACCEL_FIFO timestamp_t ts_last_int; @@ -961,7 +961,7 @@ void motion_sense_task(void *u) &ts_begin_task); if (ret != EC_SUCCESS) continue; - ready_status |= (1 << i); + ready_status |= BIT(i); } } #ifdef CONFIG_GESTURE_DETECTION diff --git a/common/switch.c b/common/switch.c index 93650c2629..f7f07ad99a 100644 --- a/common/switch.c +++ b/common/switch.c @@ -122,7 +122,7 @@ static int command_mmapinfo(int argc, char **argv) }; ccprintf("memmap switches = 0x%x\n", val); for (i = 0; i < ARRAY_SIZE(explanation); i++) - if (val & (1 << i)) + if (val & BIT(i)) ccprintf(" %s\n", explanation[i]); return EC_SUCCESS; diff --git a/common/system.c b/common/system.c index 467218560a..d956787e74 100644 --- a/common/system.c +++ b/common/system.c @@ -285,7 +285,7 @@ void system_print_reset_flags(void) } for (i = 0; i < ARRAY_SIZE(reset_flag_descs); i++) { - if (reset_flags & (1 << i)) { + if (reset_flags & BIT(i)) { if (count++) CPUTS(" "); diff --git a/common/throttle_ap.c b/common/throttle_ap.c index 209948a482..d82d5429e5 100644 --- a/common/throttle_ap.c +++ b/common/throttle_ap.c @@ -30,7 +30,7 @@ void throttle_ap(enum throttle_level level, mutex_lock(&throttle_mutex); - bitmask = (1 << source); + bitmask = BIT(source); switch (level) { case THROTTLE_ON: diff --git a/common/timer.c b/common/timer.c index 117cea4b71..776d1b8a62 100644 --- a/common/timer.c +++ b/common/timer.c @@ -77,7 +77,7 @@ void process_timers(int overflow) next.le.lo)) next.val = timer_deadline[tskid].val; - check_timer &= ~(1 << tskid); + check_timer &= ~BIT(tskid); } /* if there is a new timer, let's retry */ } while (timer_running & ~running_t0); diff --git a/common/usb_pd_protocol.c b/common/usb_pd_protocol.c index ebac69b209..730281c9b5 100644 --- a/common/usb_pd_protocol.c +++ b/common/usb_pd_protocol.c @@ -477,7 +477,7 @@ static int reset_device_and_notify(int port) /* Wake up all waiting tasks. */ while (waiting_tasks) { task = __fls(waiting_tasks); - waiting_tasks &= ~(1 << task); + waiting_tasks &= ~BIT(task); task_set_event(task, TASK_EVENT_PD_AWAKE, 0); } @@ -4366,7 +4366,7 @@ static void resume_pd_port(void) while (suspended_ports) { port = __builtin_ctz(suspended_ports); - suspended_ports &= ~(1 << port); + suspended_ports &= ~BIT(port); pd_set_suspend(port, 0); } } @@ -4574,7 +4574,7 @@ static void re_enable_ports(void) while (ports) { int port = __fls(ports); - ports &= ~(1 << port); + ports &= ~BIT(port); /* * Let the board know that the overcurrent is @@ -4605,7 +4605,7 @@ void pd_handle_overcurrent(int port) board_overcurrent_event(port, 1); /* Wait 1s before trying to re-enable the port. */ - atomic_or(&port_oc_reset_req, (1 << port)); + atomic_or(&port_oc_reset_req, BIT(port)); hook_call_deferred(&re_enable_ports_data, SECOND); } #endif /* defined(CONFIG_USBC_PPC) */ diff --git a/common/usbc_ppc.c b/common/usbc_ppc.c index 54da1f22b4..2904c00ded 100644 --- a/common/usbc_ppc.c +++ b/common/usbc_ppc.c @@ -69,7 +69,7 @@ static void clear_oc_tbl(void) * Only clear the table if the port partner is no longer * attached after debouncing. */ - if ((!((1 << port) & connected_ports)) && + if ((!(BIT(port) & connected_ports)) && oc_event_cnt_tbl[port]) { oc_event_cnt_tbl[port] = 0; CPRINTS("C%d: OC events cleared", port); diff --git a/common/util.c b/common/util.c index 1261def58f..8005e0bfdb 100644 --- a/common/util.c +++ b/common/util.c @@ -506,7 +506,7 @@ int uint64divmod(uint64_t *n, int d) int get_next_bit(uint32_t *mask) { int bit = 31 - __builtin_clz(*mask); - *mask &= ~(1 << bit); + *mask &= ~BIT(bit); return bit; } diff --git a/core/cortex-m/mpu.c b/core/cortex-m/mpu.c index 795f809eca..8376a00b32 100644 --- a/core/cortex-m/mpu.c +++ b/core/cortex-m/mpu.c @@ -95,7 +95,7 @@ static int mpu_config_region(uint8_t region, uint32_t addr, uint32_t size, blocks = size >> (size_bit - 2); /* Represent occupied blocks of two regions with srd mask. */ - srd1 = (1 << blocks) - 1; + srd1 = BIT(blocks) - 1; srd2 = (1 << ((size >> (size_bit - 5)) & 0x7)) - 1; /* diff --git a/core/cortex-m/panic.c b/core/cortex-m/panic.c index f5a8f23c5c..219920463f 100644 --- a/core/cortex-m/panic.c +++ b/core/cortex-m/panic.c @@ -156,7 +156,7 @@ static void show_fault(uint32_t mmfs, uint32_t hfsr, uint32_t dfsr) int count = 0; for (upto = 0; upto < 32; upto++) { - if ((mmfs & (1 << upto)) && mmfs_name[upto]) { + if ((mmfs & BIT(upto)) && mmfs_name[upto]) { do_separate(&count); panic_puts(mmfs_name[upto]); } @@ -176,7 +176,7 @@ static void show_fault(uint32_t mmfs, uint32_t hfsr, uint32_t dfsr) } for (upto = 0; upto < 5; upto++) { - if ((dfsr & (1 << upto))) { + if ((dfsr & BIT(upto))) { do_separate(&count); panic_puts(dfsr_name[upto]); } diff --git a/core/cortex-m/task.c b/core/cortex-m/task.c index 5ab3272141..91d0d56d90 100644 --- a/core/cortex-m/task.c +++ b/core/cortex-m/task.c @@ -164,7 +164,7 @@ static uint32_t task_reset_state[TASK_ID_COUNT] = { /* Sanity checks about static task invariants */ BUILD_ASSERT(TASK_ID_COUNT <= sizeof(unsigned) * 8); BUILD_ASSERT(TASK_ID_COUNT < (1 << (sizeof(task_id_t) * 8))); -BUILD_ASSERT((1 << TASK_ID_COUNT) < TASK_RESET_LOCK); +BUILD_ASSERT(BIT(TASK_ID_COUNT) < TASK_RESET_LOCK); /* Stacks for all tasks */ #define TASK(n, r, d, s) + s @@ -202,13 +202,13 @@ static int need_resched_or_profiling; * can do their init within a task switching context. The hooks task will then * make a call to enable all tasks. */ -static uint32_t tasks_ready = (1 << TASK_ID_HOOKS); +static uint32_t tasks_ready = BIT(TASK_ID_HOOKS); /* * Initially allow only the HOOKS and IDLE task to run, regardless of ready * status, in order for HOOK_INIT to complete before other tasks. * task_enable_all_tasks() will open the flood gates. */ -static uint32_t tasks_enabled = (1 << TASK_ID_HOOKS) | (1 << TASK_ID_IDLE); +static uint32_t tasks_enabled = BIT(TASK_ID_HOOKS) | BIT(TASK_ID_IDLE); static int start_called; /* Has task swapping started */ @@ -486,7 +486,7 @@ uint32_t task_wait_event_mask(uint32_t event_mask, int timeout_us) void task_enable_all_tasks(void) { /* Mark all tasks as ready and able to run. */ - tasks_ready = tasks_enabled = (1 << TASK_ID_COUNT) - 1; + tasks_ready = tasks_enabled = BIT(TASK_ID_COUNT) - 1; /* Reschedule the highest priority task. */ __schedule(0, 0); } @@ -891,7 +891,7 @@ void mutex_unlock(struct mutex *mtx) while (waiters) { task_id_t id = __fls(waiters); - waiters &= ~(1 << id); + waiters &= ~BIT(id); /* Somebody is waiting on the mutex */ task_set_event(id, TASK_EVENT_MUTEX, 0); diff --git a/core/cortex-m0/task.c b/core/cortex-m0/task.c index 9b3f8ce0ed..e13cd39a58 100644 --- a/core/cortex-m0/task.c +++ b/core/cortex-m0/task.c @@ -136,13 +136,13 @@ task_ *current_task = (task_ *)scratchpad; * can do their init within a task switching context. The hooks task will then * make a call to enable all tasks. */ -static uint32_t tasks_ready = (1 << TASK_ID_HOOKS); +static uint32_t tasks_ready = BIT(TASK_ID_HOOKS); /* * Initially allow only the HOOKS and IDLE task to run, regardless of ready * status, in order for HOOK_INIT to complete before other tasks. * task_enable_all_tasks() will open the flood gates. */ -static uint32_t tasks_enabled = (1 << TASK_ID_HOOKS) | (1 << TASK_ID_IDLE); +static uint32_t tasks_enabled = BIT(TASK_ID_HOOKS) | BIT(TASK_ID_IDLE); static int start_called; /* Has task swapping started */ @@ -428,7 +428,7 @@ uint32_t task_wait_event_mask(uint32_t event_mask, int timeout_us) void task_enable_all_tasks(void) { /* Mark all tasks as ready and able to run. */ - tasks_ready = tasks_enabled = (1 << TASK_ID_COUNT) - 1; + tasks_ready = tasks_enabled = BIT(TASK_ID_COUNT) - 1; /* Reschedule the highest priority task. */ __schedule(0, 0); } @@ -526,7 +526,7 @@ void mutex_unlock(struct mutex *mtx) while (waiters) { task_id_t id = __fls(waiters); - waiters &= ~(1 << id); + waiters &= ~BIT(id); /* Somebody is waiting on the mutex */ task_set_event(id, TASK_EVENT_MUTEX, 0); diff --git a/core/minute-ia/interrupts.c b/core/minute-ia/interrupts.c index 96e5626d47..98c6c3509d 100644 --- a/core/minute-ia/interrupts.c +++ b/core/minute-ia/interrupts.c @@ -215,7 +215,7 @@ static inline unsigned int lapic_get_vector(uint32_t reg_base, uint32_t vector) uint32_t reg_pos = (vector >> 5) << 4; uint32_t vec_pos = vector & (32 - 1); - return REG32(reg_base + reg_pos) & (1 << vec_pos); + return REG32(reg_base + reg_pos) & BIT(vec_pos); } /* diff --git a/core/minute-ia/task.c b/core/minute-ia/task.c index 62481d96f0..601451d6df 100644 --- a/core/minute-ia/task.c +++ b/core/minute-ia/task.c @@ -136,13 +136,13 @@ task_ *current_task, *next_task; * can do their init within a task switching context. The hooks task will then * make a call to enable all tasks. */ -static uint32_t tasks_ready = (1 << TASK_ID_HOOKS); +static uint32_t tasks_ready = BIT(TASK_ID_HOOKS); /* * Initially allow only the HOOKS and IDLE task to run, regardless of ready * status, in order for HOOK_INIT to complete before other tasks. * task_enable_all_tasks() will open the flood gates. */ -static uint32_t tasks_enabled = (1 << TASK_ID_HOOKS) | (1 << TASK_ID_IDLE); +static uint32_t tasks_enabled = BIT(TASK_ID_HOOKS) | BIT(TASK_ID_IDLE); static int start_called; /* Has task swapping started */ @@ -393,7 +393,7 @@ uint32_t task_wait_event_mask(uint32_t event_mask, int timeout_us) void task_enable_all_tasks(void) { /* Mark all tasks as ready and table to run. */ - tasks_ready = tasks_enabled = (1 << TASK_ID_COUNT) - 1; + tasks_ready = tasks_enabled = BIT(TASK_ID_COUNT) - 1; /* Reschedule the highest priority task. */ __schedule(0, 0); @@ -464,7 +464,7 @@ void mutex_unlock(struct mutex *mtx) while (waiters) { task_id_t id = __fls(waiters); - waiters &= ~(1 << id); + waiters &= ~BIT(id); /* Somebody is waiting on the mutex */ task_set_event(id, TASK_EVENT_MUTEX, 0); diff --git a/core/nds32/task.c b/core/nds32/task.c index 7cd9049733..ac3fcb0b0c 100644 --- a/core/nds32/task.c +++ b/core/nds32/task.c @@ -158,13 +158,13 @@ int need_resched; * can do their init within a task switching context. The hooks task will then * make a call to enable all tasks. */ -static uint32_t tasks_ready = (1 << TASK_ID_HOOKS); +static uint32_t tasks_ready = BIT(TASK_ID_HOOKS); /* * Initially allow only the HOOKS and IDLE task to run, regardless of ready * status, in order for HOOK_INIT to complete before other tasks. * task_enable_all_tasks() will open the flood gates. */ -static uint32_t tasks_enabled = (1 << TASK_ID_HOOKS) | (1 << TASK_ID_IDLE); +static uint32_t tasks_enabled = BIT(TASK_ID_HOOKS) | BIT(TASK_ID_IDLE); int start_called; /* Has task swapping started */ @@ -544,7 +544,7 @@ void set_int_ctrl(uint32_t val) void task_enable_all_tasks(void) { /* Mark all tasks as ready and able to run. */ - tasks_ready = tasks_enabled = (1 << TASK_ID_COUNT) - 1; + tasks_ready = tasks_enabled = BIT(TASK_ID_COUNT) - 1; /* Reschedule the highest priority task. */ __schedule(0, 0, 0); } @@ -656,7 +656,7 @@ void __ram_code mutex_unlock(struct mutex *mtx) while (waiters) { task_id_t id = __fls(waiters); - waiters &= ~(1 << id); + waiters &= ~BIT(id); /* Somebody is waiting on the mutex */ task_set_event(id, TASK_EVENT_MUTEX, 0); diff --git a/driver/accelgyro_bmi160.c b/driver/accelgyro_bmi160.c index b2a59cb17c..d441ee3c9e 100644 --- a/driver/accelgyro_bmi160.c +++ b/driver/accelgyro_bmi160.c @@ -763,9 +763,9 @@ int manage_activity(const struct motion_sensor_t *s, if (ret == EC_RES_SUCCESS) { if (enable) { data->enabled_activities |= 1 << activity; - data->disabled_activities &= ~(1 << activity); + data->disabled_activities &= ~BIT(activity); } else { - data->enabled_activities &= ~(1 << activity); + data->enabled_activities &= ~BIT(activity); data->disabled_activities |= 1 << activity; } } diff --git a/driver/baro_bmp280.h b/driver/baro_bmp280.h index be2611289c..a3cb919a7c 100644 --- a/driver/baro_bmp280.h +++ b/driver/baro_bmp280.h @@ -144,8 +144,8 @@ */ #define BMP280_COMPUTE_TIME \ ((T_INIT_MAX + T_MEASURE_PER_OSRS_MAX * \ - (((1 << BMP280_OVERSAMP_TEMP) >> 1) + \ - ((1 << BMP280_OVERSAMP_PRES) >> 1)) + \ + ((BIT(BMP280_OVERSAMP_TEMP) >> 1) + \ + (BIT(BMP280_OVERSAMP_PRES) >> 1)) + \ (BMP280_OVERSAMP_PRES ? T_SETUP_PRESSURE_MAX : 0) + 15) / 16) /* diff --git a/driver/charger/bd9995x.c b/driver/charger/bd9995x.c index 9ab69a7c38..1eba3e9aa6 100644 --- a/driver/charger/bd9995x.c +++ b/driver/charger/bd9995x.c @@ -1507,7 +1507,7 @@ static int bd9995x_psys_charger_adc(void) * Calculate power in mW * PSYS = VACP×IACP+VBAT×IBAT = IPMON / GPMON */ - return (int) ((ipmon * 1000) / ((1 << BD9995X_PSYS_GAIN_SELECT) * + return (int) ((ipmon * 1000) / (BIT(BD9995X_PSYS_GAIN_SELECT) * BD9995X_PMON_IOUT_ADC_READ_COUNT)); } diff --git a/driver/charger/rt946x.h b/driver/charger/rt946x.h index b28a87f3f5..0f7bcb2426 100644 --- a/driver/charger/rt946x.h +++ b/driver/charger/rt946x.h @@ -246,14 +246,14 @@ #define RT946X_SHIFT_DB_RST 1 #define RT946X_SHIFT_REG_RST 0 -#define RT946X_MASK_RST (1 << RT946X_SHIFT_RST) -#define RT946X_MASK_CHG_RST (1 << RT946X_SHIFT_CHG_RST) -#define RT946X_MASK_FLED_RST (1 << RT946X_SHIFT_FLED_RST) -#define RT946X_MASK_LDO_RST (1 << RT946X_SHIFT_LDO_RST) -#define RT946X_MASK_RGB_RST (1 << RT946X_SHIFT_RGB_RST) -#define RT946X_MASK_BL_RST (1 << RT946X_SHIFT_BL_RST) -#define RT946X_MASK_DB_RST (1 << RT946X_SHIFT_DB_RST) -#define RT946X_MASK_REG_RST (1 << RT946X_SHIFT_REG_RST) +#define RT946X_MASK_RST BIT(RT946X_SHIFT_RST) +#define RT946X_MASK_CHG_RST BIT(RT946X_SHIFT_CHG_RST) +#define RT946X_MASK_FLED_RST BIT(RT946X_SHIFT_FLED_RST) +#define RT946X_MASK_LDO_RST BIT(RT946X_SHIFT_LDO_RST) +#define RT946X_MASK_RGB_RST BIT(RT946X_SHIFT_RGB_RST) +#define RT946X_MASK_BL_RST BIT(RT946X_SHIFT_BL_RST) +#define RT946X_MASK_DB_RST BIT(RT946X_SHIFT_DB_RST) +#define RT946X_MASK_REG_RST BIT(RT946X_SHIFT_REG_RST) #define RT946X_MASK_SOFT_RST \ (RT946X_MASK_CHG_RST | RT946X_MASK_FLED_RST | RT946X_MASK_LDO_RST | \ RT946X_MASK_RGB_RST | RT946X_MASK_BL_RST | RT946X_MASK_DB_RST | \ @@ -263,8 +263,8 @@ #define RT946X_SHIFT_OPA_MODE 0 #define RT946X_SHIFT_HZ_EN 2 -#define RT946X_MASK_OPA_MODE (1 << RT946X_SHIFT_OPA_MODE) -#define RT946X_MASK_HZ_EN (1 << RT946X_SHIFT_HZ_EN) +#define RT946X_MASK_OPA_MODE BIT(RT946X_SHIFT_OPA_MODE) +#define RT946X_MASK_HZ_EN BIT(RT946X_SHIFT_HZ_EN) /* ========== CHGCTRL2 0x02 ============ */ #define RT946X_SHIFT_SHIP_MODE 7 @@ -273,11 +273,11 @@ #define RT946X_SHIFT_CFO_EN 1 #define RT946X_SHIFT_CHG_EN 0 -#define RT946X_MASK_SHIP_MODE (1 << RT946X_SHIFT_SHIP_MODE) -#define RT946X_MASK_TE (1 << RT946X_SHIFT_TE) +#define RT946X_MASK_SHIP_MODE BIT(RT946X_SHIFT_SHIP_MODE) +#define RT946X_MASK_TE BIT(RT946X_SHIFT_TE) #define RT946X_MASK_ILMTSEL (0x3 << RT946X_SHIFT_ILMTSEL) -#define RT946X_MASK_CFO_EN (1 << RT946X_SHIFT_CFO_EN) -#define RT946X_MASK_CHG_EN (1 << RT946X_SHIFT_CHG_EN) +#define RT946X_MASK_CFO_EN BIT(RT946X_SHIFT_CFO_EN) +#define RT946X_MASK_CHG_EN BIT(RT946X_SHIFT_CHG_EN) /* ========== RSTPASCODE1 0x03 (mt6370) ============ */ #define MT6370_MASK_RSTPASCODE1 0xA9 @@ -287,7 +287,7 @@ #define RT946X_SHIFT_ILIMEN 0 #define RT946X_MASK_AICR (0x3F << RT946X_SHIFT_AICR) -#define RT946X_MASK_ILIMEN (1 << RT946X_SHIFT_ILIMEN) +#define RT946X_MASK_ILIMEN BIT(RT946X_SHIFT_ILIMEN) /* ========== RSTPASCODE2 0x04 (mt6370) ============ */ #define MT6370_MASK_RSTPASCODE2 0x96 @@ -332,31 +332,31 @@ /* ========== CHGCTRL12 0x0C ============ */ #define RT946X_SHIFT_TMR_EN 1 -#define RT946X_MASK_TMR_EN (1 << RT946X_SHIFT_TMR_EN) +#define RT946X_MASK_TMR_EN BIT(RT946X_SHIFT_TMR_EN) /* ========== CHGCTRL13 0x0D ============ */ #define RT946X_SHIFT_WDT_EN 7 -#define RT946X_MASK_WDT_EN (1 << RT946X_SHIFT_WDT_EN) +#define RT946X_MASK_WDT_EN BIT(RT946X_SHIFT_WDT_EN) /* ========== CHGCTRL14 0x0E ============ */ #define RT946X_SHIFT_AICLMEAS 7 #define RT946X_SHIFT_AICLVTH 0 -#define RT946X_MASK_AICLMEAS (1 << RT946X_SHIFT_AICLMEAS) +#define RT946X_MASK_AICLMEAS BIT(RT946X_SHIFT_AICLMEAS) #define RT946X_MASK_AICLVTH 0x07 /* ========== CHGCTRL16 0x10 ============ */ #define RT946X_SHIFT_JEITA_EN 4 -#define RT946X_MASK_JEITA_EN (1 << RT946X_SHIFT_JEITA_EN) +#define RT946X_MASK_JEITA_EN BIT(RT946X_SHIFT_JEITA_EN) /* ========== CHGADC 0x11 ============ */ #define RT946X_SHIFT_ADC_IN_SEL 4 #define RT946X_SHIFT_ADC_START 0 #define RT946X_MASK_ADC_IN_SEL (0xF << RT946X_SHIFT_ADC_IN_SEL) -#define RT946X_MASK_ADC_START (1 << RT946X_SHIFT_ADC_START) +#define RT946X_MASK_ADC_START BIT(RT946X_SHIFT_ADC_START) /* ========== CHGDPDM1 0x12 (rt946x) DEVICETYPE 0x22 (mt6370) ============ */ #define RT946X_SHIFT_USBCHGEN 7 @@ -364,10 +364,10 @@ #define RT946X_SHIFT_CDP 1 #define RT946X_SHIFT_SDP 0 -#define RT946X_MASK_USBCHGEN (1 << RT946X_SHIFT_USBCHGEN) -#define RT946X_MASK_DCP (1 << RT946X_SHIFT_DCP) -#define RT946X_MASK_CDP (1 << RT946X_SHIFT_CDP) -#define RT946X_MASK_SDP (1 << RT946X_SHIFT_SDP) +#define RT946X_MASK_USBCHGEN BIT(RT946X_SHIFT_USBCHGEN) +#define RT946X_MASK_DCP BIT(RT946X_SHIFT_DCP) +#define RT946X_MASK_CDP BIT(RT946X_SHIFT_CDP) +#define RT946X_MASK_SDP BIT(RT946X_SHIFT_SDP) #define RT946X_MASK_BC12_TYPE (RT946X_MASK_DCP | \ RT946X_MASK_CDP | \ @@ -401,7 +401,7 @@ #define RT946X_SHIFT_ADC_STAT 0 #define RT946X_MASK_CHG_STAT (0x3 << RT946X_SHIFT_CHG_STAT) -#define RT946X_MASK_ADC_STAT (1 << RT946X_SHIFT_ADC_STAT) +#define RT946X_MASK_ADC_STAT BIT(RT946X_SHIFT_ADC_STAT) /* ========== CHGNTC 0x43 ============ */ #define RT946X_SHIFT_BATNTC_FAULT 4 @@ -411,7 +411,7 @@ /* ========== CHGSTATC 0x50 (rt946x) ============ */ #define RT946X_SHIFT_PWR_RDY 7 -#define RT946X_MASK_PWR_RDY (1 << RT946X_SHIFT_PWR_RDY) +#define RT946X_MASK_PWR_RDY BIT(RT946X_SHIFT_PWR_RDY) /* ========== CHGFAULT 0x51 (rt946x) ============ */ #if defined(CONFIG_CHARGER_RT9466) || defined(CONFIG_CHARGER_RT9467) @@ -420,10 +420,10 @@ #define RT946X_SHIFT_CHG_VBATOV 6 #define RT946X_SHIFT_CHG_VBUSOV 7 -#define RT946X_MASK_CHG_VSYSUV (1 << RT946X_SHIFT_CHG_VSYSUV) -#define RT946X_MASK_CHG_VSYSOV (1 << RT946X_SHIFT_CHG_VSYSOV) -#define RT946X_MASK_CHG_VBATOV (1 << RT946X_SHIFT_CHG_VBATOV) -#define RT946X_MASK_CHG_VBUSOV (1 << RT946X_SHIFT_CHG_VBUSOV) +#define RT946X_MASK_CHG_VSYSUV BIT(RT946X_SHIFT_CHG_VSYSUV) +#define RT946X_MASK_CHG_VSYSOV BIT(RT946X_SHIFT_CHG_VSYSOV) +#define RT946X_MASK_CHG_VBATOV BIT(RT946X_SHIFT_CHG_VBATOV) +#define RT946X_MASK_CHG_VBUSOV BIT(RT946X_SHIFT_CHG_VBUSOV) #endif /* ========== DPDMIRQ 0x56 ============ */ @@ -431,21 +431,21 @@ #define RT946X_SHIFT_DPDMIRQ_DETACH 1 #define RT946X_SHIFT_DPDMIRQ_ATTACH 0 -#define RT946X_MASK_DPDMIRQ_DETACH (1 << RT946X_SHIFT_DPDMIRQ_DETACH) -#define RT946X_MASK_DPDMIRQ_ATTACH (1 << RT946X_SHIFT_DPDMIRQ_ATTACH) +#define RT946X_MASK_DPDMIRQ_DETACH BIT(RT946X_SHIFT_DPDMIRQ_DETACH) +#define RT946X_MASK_DPDMIRQ_ATTACH BIT(RT946X_SHIFT_DPDMIRQ_ATTACH) #endif /* ========== LDOCFG 0x80 (mt6370) ============ */ #define MT6370_SHIFT_LDOCFG_OMS 6 -#define MT6370_MASK_LDOCFG_OMS (1 << MT6370_SHIFT_LDOCFG_OMS) +#define MT6370_MASK_LDOCFG_OMS BIT(MT6370_SHIFT_LDOCFG_OMS) /* ========== LDOVOUT 0x81 (mt6370) ============ */ #define MT6370_SHIFT_LDOVOUT_EN 7 #define MT6370_SHIFT_LDOVOUT_VOUT 0 -#define MT6370_MASK_LDOVOUT_EN (1 << MT6370_SHIFT_LDOVOUT_EN) +#define MT6370_MASK_LDOVOUT_EN BIT(MT6370_SHIFT_LDOVOUT_EN) #define MT6370_MASK_LDOVOUT_VOUT (0xf << MT6370_SHIFT_LDOVOUT_VOUT) /* ========== RGBDIM 0x82/0x83/0x84 (mt6370) ============ */ @@ -464,9 +464,9 @@ #define MT6370_SHIFT_RGB_ISNK3DIM 5 #define MT6370_SHIFT_RGB_ISNKDIM_BASE 8 -#define MT6370_MASK_RGB_ISNK1DIM_EN (1 << MT6370_SHIFT_RGB_ISNK1DIM) -#define MT6370_MASK_RGB_ISNK2DIM_EN (1 << MT6370_SHIFT_RGB_ISNK2DIM) -#define MT6370_MASK_RGB_ISNK3DIM_EN (1 << MT6370_SHIFT_RGB_ISNK3DIM) +#define MT6370_MASK_RGB_ISNK1DIM_EN BIT(MT6370_SHIFT_RGB_ISNK1DIM) +#define MT6370_MASK_RGB_ISNK2DIM_EN BIT(MT6370_SHIFT_RGB_ISNK2DIM) +#define MT6370_MASK_RGB_ISNK3DIM_EN BIT(MT6370_SHIFT_RGB_ISNK3DIM) #define MT6370_MASK_RGB_ISNK_ALL_EN (MT6370_MASK_RGB_ISNK1DIM_EN | \ MT6370_MASK_RGB_ISNK2DIM_EN | \ MT6370_MASK_RGB_ISNK3DIM_EN) @@ -500,8 +500,8 @@ #define RT946X_MASK_CHG_VBATOV MT6370_SHIFT_CHG_VBATOV_STAT -#define MT6370_MASK_CHG_VBUSOV_STAT (1 << MT6370_SHIFT_CHG_VBUSOV_STAT) -#define MT6370_MASK_CHG_VBATOV_STAT (1 << MT6370_SHIFT_CHG_VBATOV_STAT) +#define MT6370_MASK_CHG_VBUSOV_STAT BIT(MT6370_SHIFT_CHG_VBUSOV_STAT) +#define MT6370_MASK_CHG_VBATOV_STAT BIT(MT6370_SHIFT_CHG_VBATOV_STAT) #endif /* ========== Variant-specific configuration ============ */ diff --git a/driver/ioexpander_pca9534.c b/driver/ioexpander_pca9534.c index 1ac9a5164b..1a1015b1f1 100644 --- a/driver/ioexpander_pca9534.c +++ b/driver/ioexpander_pca9534.c @@ -12,7 +12,7 @@ static int pca9534_pin_read(int port, int addr, int reg, int pin, int *val) { int ret; ret = i2c_read8(port, addr, reg, val); - *val = (*val & (1 << pin)) ? 1 : 0; + *val = (*val & BIT(pin)) ? 1 : 0; return ret; } @@ -22,7 +22,7 @@ static int pca9534_pin_write(int port, int addr, int reg, int pin, int val) ret = i2c_read8(port, addr, reg, &v); if (ret != EC_SUCCESS) return ret; - v &= ~(1 << pin); + v &= ~BIT(pin); if (val) v |= 1 << pin; return i2c_write8(port, addr, reg, v); diff --git a/driver/ppc/nx20p348x.c b/driver/ppc/nx20p348x.c index 3423b77f53..aae4e18f56 100644 --- a/driver/ppc/nx20p348x.c +++ b/driver/ppc/nx20p348x.c @@ -376,14 +376,14 @@ static void nx20p348x_irq_deferred(void) uint32_t pending = atomic_read_clear(&irq_pending); for (i = 0; i < CONFIG_USB_PD_PORT_COUNT; i++) - if ((1 << i) & pending) + if (BIT(i) & pending) nx20p348x_handle_interrupt(i); } DECLARE_DEFERRED(nx20p348x_irq_deferred); void nx20p348x_interrupt(int port) { - atomic_or(&irq_pending, (1 << port)); + atomic_or(&irq_pending, BIT(port)); hook_call_deferred(&nx20p348x_irq_deferred_data, 0); } diff --git a/driver/ppc/sn5s330.c b/driver/ppc/sn5s330.c index ef63402b6b..98c2641440 100644 --- a/driver/ppc/sn5s330.c +++ b/driver/ppc/sn5s330.c @@ -707,14 +707,14 @@ static void sn5s330_irq_deferred(void) uint32_t pending = atomic_read_clear(&irq_pending); for (i = 0; i < CONFIG_USB_PD_PORT_COUNT; i++) - if ((1 << i) & pending) + if (BIT(i) & pending) sn5s330_handle_interrupt(i); } DECLARE_DEFERRED(sn5s330_irq_deferred); void sn5s330_interrupt(int port) { - atomic_or(&irq_pending, (1 << port)); + atomic_or(&irq_pending, BIT(port)); hook_call_deferred(&sn5s330_irq_deferred_data, 0); } diff --git a/driver/touchpad_st.c b/driver/touchpad_st.c index 8c4a5cf2dd..e4327a2054 100644 --- a/driver/touchpad_st.c +++ b/driver/touchpad_st.c @@ -196,7 +196,7 @@ static int st_tp_parse_finger(struct usb_hid_touchpad_report *report, if (event->evt_id == ST_TP_EVENT_ID_ENTER_POINTER) touch_slot |= 1 << id; else if (event->evt_id == ST_TP_EVENT_ID_LEAVE_POINTER) - touch_slot &= ~(1 << id); + touch_slot &= ~BIT(id); /* We cannot report more fingers */ if (i >= ARRAY_SIZE(report->finger)) { diff --git a/include/ccd_config.h b/include/ccd_config.h index 41d81697da..23a6ebfa05 100644 --- a/include/ccd_config.h +++ b/include/ccd_config.h @@ -180,7 +180,7 @@ struct ccd_capability_info { /* Macros regarding ccd_capabilities */ #define CCD_CAP_BITS 2 -#define CCD_CAP_BITMASK ((1 << CCD_CAP_BITS) - 1) +#define CCD_CAP_BITMASK (BIT(CCD_CAP_BITS) - 1) #define CCD_CAPS_PER_BYTE (8 / CCD_CAP_BITS) /* diff --git a/include/nvmem.h b/include/nvmem.h index 4a15656ea4..341a7c083d 100644 --- a/include/nvmem.h +++ b/include/nvmem.h @@ -71,7 +71,7 @@ extern uint32_t nvmem_user_sizes[NVMEM_NUM_USERS]; #define NVMEM_NUM_PARTITIONS 2 #define NVMEM_SHA_SIZE CIPHER_SALT_SIZE #define NVMEM_GENERATION_BITS 8 -#define NVMEM_GENERATION_MASK ((1 << NVMEM_GENERATION_BITS) - 1) +#define NVMEM_GENERATION_MASK (BIT(NVMEM_GENERATION_BITS) - 1) #define NVMEM_PADDING_SIZE 16 #define NVMEM_LAYOUT_VERSION 0 diff --git a/util/ectool.c b/util/ectool.c index 35dab22114..522daa572e 100644 --- a/util/ectool.c +++ b/util/ectool.c @@ -661,7 +661,7 @@ int cmd_inventory(int argc, char *argv[]) printf("EC supported features:\n"); for (i = 0, idx = 0; i < 2; i++) { for (j = 0; j < 32; j++, idx++) { - if (r.flags[i] & (1 << j)) { + if (r.flags[i] & BIT(j)) { if (idx >= ARRAY_SIZE(ec_feature_names) || !ec_feature_names[idx] || strlen(ec_feature_names[idx]) == 0) @@ -820,7 +820,7 @@ int cmd_uptimeinfo(int argc, char *argv[]) printf("EC reset flags at last EC boot: "); flag_count = 0; for (flag = 0; flag != ARRAY_SIZE(reset_flag_strings); ++flag) { - if ((r.ec_reset_flags & (1 << flag)) != 0) { + if ((r.ec_reset_flags & BIT(flag)) != 0) { if (flag_count) printf(" | "); printf(reset_flag_strings[flag]); @@ -2413,7 +2413,7 @@ static int get_num_fans(void) * check whether it has fan support enabled. */ rv = ec_command(EC_CMD_GET_FEATURES, 0, NULL, 0, &r, sizeof(r)); - if (rv >= 0 && !(r.flags[0] & (1 << EC_FEATURE_PWM_FAN))) + if (rv >= 0 && !(r.flags[0] & BIT(EC_FEATURE_PWM_FAN))) return 0; for (idx = 0; idx < EC_FAN_SPEED_ENTRIES; idx++) { @@ -4142,10 +4142,10 @@ static int ms_help(const char *cmd) static void motionsense_display_activities(uint32_t activities) { - if (activities & (1 << MOTIONSENSE_ACTIVITY_SIG_MOTION)) + if (activities & BIT(MOTIONSENSE_ACTIVITY_SIG_MOTION)) printf("%d: Significant motion\n", MOTIONSENSE_ACTIVITY_SIG_MOTION); - if (activities & (1 << MOTIONSENSE_ACTIVITY_DOUBLE_TAP)) + if (activities & BIT(MOTIONSENSE_ACTIVITY_DOUBLE_TAP)) printf("%d: Double tap\n", MOTIONSENSE_ACTIVITY_DOUBLE_TAP); } @@ -7029,7 +7029,7 @@ int cmd_proto_info(int argc, char *argv[]) printf(" protocol versions:"); for (i = 0; i < 32; i++) { - if (info.protocol_versions & (1 << i)) + if (info.protocol_versions & BIT(i)) printf(" %d", i); } printf("\n"); @@ -7388,7 +7388,7 @@ static int show_fields(struct ec_mkbp_config *config, int argc, char *argv[]) param = keyconfig_params; for (i = 0; i < ARRAY_SIZE(keyconfig_params); i++, param++) { - if (mask & (1 << i)) { + if (mask & BIT(i)) { fprintf(stderr, "%-12s %u\n", param->name, get_value(param, (char *)config)); } diff --git a/util/lbcc.c b/util/lbcc.c index 3d705f68ca..3199733952 100644 --- a/util/lbcc.c +++ b/util/lbcc.c @@ -137,7 +137,7 @@ static void print_led_set(FILE *fp, uint8_t led) fprintf(fp, "{"); for (i = 0; i < NUM_LEDS; i++) - if (led & (1 << i)) { + if (led & BIT(i)) { if (!first) fprintf(fp, ","); fprintf(fp, "%d", i); |