summaryrefslogtreecommitdiff
path: root/chip/mec1322/lfw/ec_lfw.c
diff options
context:
space:
mode:
authorGwendal Grignou <gwendal@chromium.org>2019-03-11 15:57:52 -0700
committerchrome-bot <chrome-bot@chromium.org>2019-03-26 04:42:55 -0700
commitbb266fc26fc05d4ab22de6ad7bce5b477c9f9140 (patch)
treef6ada087f62246c3a9547e649ac8846b0ed6d5ab /chip/mec1322/lfw/ec_lfw.c
parent0bfc511527cf2aebfa163c63a1d028419ca0b0c3 (diff)
downloadchrome-ec-bb266fc26fc05d4ab22de6ad7bce5b477c9f9140.tar.gz
common: replace 1 << digits, with BIT(digits)
Requested for linux integration, use BIT instead of 1 << First step replace bit operation with operand containing only digits. Fix an error in motion_lid try to set bit 31 of a signed integer. BUG=None BRANCH=None TEST=compile Change-Id: Ie843611f2f68e241f0f40d4067f7ade726951d29 Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1518659 Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'chip/mec1322/lfw/ec_lfw.c')
-rw-r--r--chip/mec1322/lfw/ec_lfw.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/chip/mec1322/lfw/ec_lfw.c b/chip/mec1322/lfw/ec_lfw.c
index 86a4949e17..7dacfc3077 100644
--- a/chip/mec1322/lfw/ec_lfw.c
+++ b/chip/mec1322/lfw/ec_lfw.c
@@ -48,10 +48,10 @@ void timer_init()
uint32_t val = 0;
/* Ensure timer is not running */
- MEC1322_TMR32_CTL(0) &= ~(1 << 5);
+ MEC1322_TMR32_CTL(0) &= ~BIT(5);
/* Enable timer */
- MEC1322_TMR32_CTL(0) |= (1 << 0);
+ MEC1322_TMR32_CTL(0) |= BIT(0);
val = MEC1322_TMR32_CTL(0);
@@ -67,10 +67,10 @@ void timer_init()
MEC1322_TMR32_CNT(0) = 0xffffffff;
/* Auto restart */
- MEC1322_TMR32_CTL(0) |= (1 << 3);
+ MEC1322_TMR32_CTL(0) |= BIT(3);
/* Start counting in timer 0 */
- MEC1322_TMR32_CTL(0) |= (1 << 5);
+ MEC1322_TMR32_CTL(0) |= BIT(5);
}
@@ -146,7 +146,7 @@ void uart_write_c(char c)
uart_write_c('\r');
/* Wait for space in transmit FIFO. */
- while (!(MEC1322_UART_LSR & (1 << 5)))
+ while (!(MEC1322_UART_LSR & BIT(5)))
;
MEC1322_UART_TB = c;
}
@@ -181,31 +181,31 @@ void jump_to_image(uintptr_t init_addr)
void uart_init(void)
{
/* Set UART to reset on VCC1_RESET instaed of nSIO_RESET */
- MEC1322_UART_CFG &= ~(1 << 1);
+ MEC1322_UART_CFG &= ~BIT(1);
/* Baud rate = 115200. 1.8432MHz clock. Divisor = 1 */
/* Set CLK_SRC = 0 */
- MEC1322_UART_CFG &= ~(1 << 0);
+ MEC1322_UART_CFG &= ~BIT(0);
/* Set DLAB = 1 */
- MEC1322_UART_LCR |= (1 << 7);
+ MEC1322_UART_LCR |= BIT(7);
/* PBRG0/PBRG1 */
MEC1322_UART_PBRG0 = 1;
MEC1322_UART_PBRG1 = 0;
/* Set DLAB = 0 */
- MEC1322_UART_LCR &= ~(1 << 7);
+ MEC1322_UART_LCR &= ~BIT(7);
/* Set word length to 8-bit */
- MEC1322_UART_LCR |= (1 << 0) | (1 << 1);
+ MEC1322_UART_LCR |= BIT(0) | BIT(1);
/* Enable FIFO */
- MEC1322_UART_FCR = (1 << 0);
+ MEC1322_UART_FCR = BIT(0);
/* Activate UART */
- MEC1322_UART_ACT |= (1 << 0);
+ MEC1322_UART_ACT |= BIT(0);
gpio_config_module(MODULE_UART, 1);
}