diff options
Diffstat (limited to 'driver/accel_lis2dh.c')
| -rw-r--r-- | driver/accel_lis2dh.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/driver/accel_lis2dh.c b/driver/accel_lis2dh.c index 35d275b379..eaedb216d7 100644 --- a/driver/accel_lis2dh.c +++ b/driver/accel_lis2dh.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -21,8 +21,8 @@ #include "driver/stm_mems_common.h" #define CPUTS(outstr) cputs(CC_ACCEL, outstr) -#define CPRINTS(format, args...) cprints(CC_ACCEL, format, ## args) -#define CPRINTF(format, args...) cprintf(CC_ACCEL, format, ## args) +#define CPRINTS(format, args...) cprints(CC_ACCEL, format, ##args) +#define CPRINTF(format, args...) cprintf(CC_ACCEL, format, ##args) /** * set_range - set full scale range @@ -78,9 +78,9 @@ static int set_data_rate(const struct motion_sensor_t *s, int rate, int rnd) if (rate == 0) { /* Power Off device */ - ret = st_write_data_with_mask( - s, LIS2DH_CTRL1_ADDR, - LIS2DH_ACC_ODR_MASK, LIS2DH_ODR_0HZ_VAL); + ret = st_write_data_with_mask(s, LIS2DH_CTRL1_ADDR, + LIS2DH_ACC_ODR_MASK, + LIS2DH_ODR_0HZ_VAL); goto unlock_rate; } @@ -101,7 +101,7 @@ static int set_data_rate(const struct motion_sensor_t *s, int rate, int rnd) * to write accel parameters until we are done */ ret = st_write_data_with_mask(s, LIS2DH_CTRL1_ADDR, LIS2DH_ACC_ODR_MASK, - reg_val); + reg_val); if (ret == EC_SUCCESS) data->base.odr = normalized_rate; @@ -114,8 +114,8 @@ static int is_data_ready(const struct motion_sensor_t *s, int *ready) { int ret, tmp; - ret = st_raw_read8(s->port, s->i2c_spi_addr_flags, - LIS2DH_STATUS_REG, &tmp); + ret = st_raw_read8(s->port, s->i2c_spi_addr_flags, LIS2DH_STATUS_REG, + &tmp); if (ret != EC_SUCCESS) { CPRINTS("%s type:0x%X RS Error", s->name, s->type); return ret; @@ -147,8 +147,8 @@ static int read(const struct motion_sensor_t *s, intv3_t v) } /* Read output data bytes starting at LIS2DH_OUT_X_L_ADDR */ - ret = st_raw_read_n(s->port, s->i2c_spi_addr_flags, - LIS2DH_OUT_X_L_ADDR, raw, OUT_XYZ_SIZE); + ret = st_raw_read_n(s->port, s->i2c_spi_addr_flags, LIS2DH_OUT_X_L_ADDR, + raw, OUT_XYZ_SIZE); if (ret != EC_SUCCESS) { CPRINTS("%s type:0x%X RD XYZ Error", s->name, s->type); return ret; @@ -195,34 +195,34 @@ static int init(struct motion_sensor_t *s) * register must be restored to it's default. */ /* Enable all accel axes data and clear old settings */ - ret = st_raw_write8(s->port, s->i2c_spi_addr_flags, - LIS2DH_CTRL1_ADDR, LIS2DH_ENABLE_ALL_AXES); + ret = st_raw_write8(s->port, s->i2c_spi_addr_flags, LIS2DH_CTRL1_ADDR, + LIS2DH_ENABLE_ALL_AXES); if (ret != EC_SUCCESS) goto err_unlock; - ret = st_raw_write8(s->port, s->i2c_spi_addr_flags, - LIS2DH_CTRL2_ADDR, LIS2DH_CTRL2_RESET_VAL); + ret = st_raw_write8(s->port, s->i2c_spi_addr_flags, LIS2DH_CTRL2_ADDR, + LIS2DH_CTRL2_RESET_VAL); if (ret != EC_SUCCESS) goto err_unlock; - ret = st_raw_write8(s->port, s->i2c_spi_addr_flags, - LIS2DH_CTRL3_ADDR, LIS2DH_CTRL3_RESET_VAL); + ret = st_raw_write8(s->port, s->i2c_spi_addr_flags, LIS2DH_CTRL3_ADDR, + LIS2DH_CTRL3_RESET_VAL); if (ret != EC_SUCCESS) goto err_unlock; /* Enable BDU */ - ret = st_raw_write8(s->port, s->i2c_spi_addr_flags, - LIS2DH_CTRL4_ADDR, LIS2DH_BDU_MASK); + ret = st_raw_write8(s->port, s->i2c_spi_addr_flags, LIS2DH_CTRL4_ADDR, + LIS2DH_BDU_MASK); if (ret != EC_SUCCESS) goto err_unlock; - ret = st_raw_write8(s->port, s->i2c_spi_addr_flags, - LIS2DH_CTRL5_ADDR, LIS2DH_CTRL5_RESET_VAL); + ret = st_raw_write8(s->port, s->i2c_spi_addr_flags, LIS2DH_CTRL5_ADDR, + LIS2DH_CTRL5_RESET_VAL); if (ret != EC_SUCCESS) goto err_unlock; - ret = st_raw_write8(s->port, s->i2c_spi_addr_flags, - LIS2DH_CTRL6_ADDR, LIS2DH_CTRL6_RESET_VAL); + ret = st_raw_write8(s->port, s->i2c_spi_addr_flags, LIS2DH_CTRL6_ADDR, + LIS2DH_CTRL6_RESET_VAL); if (ret != EC_SUCCESS) goto err_unlock; |