diff options
| author | Gwendal Grignou <gwendal@chromium.org> | 2019-03-11 15:57:52 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-03-26 04:42:55 -0700 |
| commit | bb266fc26fc05d4ab22de6ad7bce5b477c9f9140 (patch) | |
| tree | f6ada087f62246c3a9547e649ac8846b0ed6d5ab /util | |
| parent | 0bfc511527cf2aebfa163c63a1d028419ca0b0c3 (diff) | |
| download | chrome-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 'util')
| -rw-r--r-- | util/cbi-util.c | 10 | ||||
| -rw-r--r-- | util/comm-host.h | 8 | ||||
| -rw-r--r-- | util/ec_panicinfo.c | 1 | ||||
| -rw-r--r-- | util/iteflash.c | 5 |
4 files changed, 13 insertions, 11 deletions
diff --git a/util/cbi-util.c b/util/cbi-util.c index f8abb4e64a..fbf0a6068b 100644 --- a/util/cbi-util.c +++ b/util/cbi-util.c @@ -20,11 +20,11 @@ #include "cros_board_info.h" #include "crc8.h" -#define ARGS_MASK_BOARD_VERSION (1 << 0) -#define ARGS_MASK_FILENAME (1 << 1) -#define ARGS_MASK_OEM_ID (1 << 2) -#define ARGS_MASK_SIZE (1 << 3) -#define ARGS_MASK_SKU_ID (1 << 4) +#define ARGS_MASK_BOARD_VERSION BIT(0) +#define ARGS_MASK_FILENAME BIT(1) +#define ARGS_MASK_OEM_ID BIT(2) +#define ARGS_MASK_SIZE BIT(3) +#define ARGS_MASK_SKU_ID BIT(4) /* TODO: Set it by macro */ const char cmd_name[] = "cbi-util"; diff --git a/util/comm-host.h b/util/comm-host.h index 11f81b4950..0bcd5cc7af 100644 --- a/util/comm-host.h +++ b/util/comm-host.h @@ -27,10 +27,10 @@ extern void *ec_inbuf; /* Interfaces to allow for comm_init() */ enum comm_interface { - COMM_DEV = (1 << 0), - COMM_LPC = (1 << 1), - COMM_I2C = (1 << 2), - COMM_SERVO = (1 << 3), + COMM_DEV = BIT(0), + COMM_LPC = BIT(1), + COMM_I2C = BIT(2), + COMM_SERVO = BIT(3), COMM_ALL = -1 }; diff --git a/util/ec_panicinfo.c b/util/ec_panicinfo.c index 47de4b2a4c..f614770619 100644 --- a/util/ec_panicinfo.c +++ b/util/ec_panicinfo.c @@ -5,6 +5,7 @@ #include <stdint.h> #include <stdio.h> +#include "compile_time_macros.h" #include "ec_panicinfo.h" static void print_panic_reg(int regnum, const uint32_t *regs, int index) diff --git a/util/iteflash.c b/util/iteflash.c index cc275d630c..d96464ccda 100644 --- a/util/iteflash.c +++ b/util/iteflash.c @@ -20,6 +20,7 @@ #include <time.h> #include <unistd.h> +#include "compile_time_macros.h" #include "usb_if.h" /* Default FTDI device : Servo v2. */ @@ -46,8 +47,8 @@ #define FTDI_I2C_FREQ 400000 /* I2C pins on the FTDI interface */ -#define SCL_BIT (1 << 0) -#define SDA_BIT (1 << 1) +#define SCL_BIT BIT(0) +#define SDA_BIT BIT(1) /* Chip ID register value */ #define CHIP_ID 0x8380 |