From 385bcd82a1f3d0334214cea98b0c8c50b57f0c30 Mon Sep 17 00:00:00 2001 From: Jack Rosenthal Date: Mon, 27 Jun 2022 14:46:14 -0600 Subject: driver/accel_lis2ds.h: Format with clang-format BUG=b:236386294 BRANCH=none TEST=none Change-Id: Ife41874d42e095562794460e455d02687def9284 Signed-off-by: Jack Rosenthal Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3729911 Reviewed-by: Jeremy Bettis --- driver/accel_lis2ds.h | 152 +++++++++++++++++++++++++------------------------- 1 file changed, 75 insertions(+), 77 deletions(-) (limited to 'driver/accel_lis2ds.h') diff --git a/driver/accel_lis2ds.h b/driver/accel_lis2ds.h index e25bc5954f..bc10a10849 100644 --- a/driver/accel_lis2ds.h +++ b/driver/accel_lis2ds.h @@ -14,95 +14,93 @@ * 7-bit address is 110101Xb. Where 'X' is determined * by the voltage on the ADDR pin. */ -#define LIS2DS_ADDR0_FLAGS 0x1a -#define LIS2DS_ADDR1_FLAGS 0x1e +#define LIS2DS_ADDR0_FLAGS 0x1a +#define LIS2DS_ADDR1_FLAGS 0x1e /* who am I */ -#define LIS2DS_WHO_AM_I_REG 0x0f -#define LIS2DS_WHO_AM_I 0x43 +#define LIS2DS_WHO_AM_I_REG 0x0f +#define LIS2DS_WHO_AM_I 0x43 /* X, Y, Z axis data len */ -#define LIS2DS_OUT_XYZ_SIZE 6 +#define LIS2DS_OUT_XYZ_SIZE 6 /* COMMON DEFINE FOR ACCEL SENSOR */ -#define LIS2DS_EN_BIT 0x01 -#define LIS2DS_DIS_BIT 0x00 - -#define LIS2DS_CTRL1_ADDR 0x20 -#define LIS2DS_CTRL2_ADDR 0x21 -#define LIS2DS_CTRL3_ADDR 0x22 -#define LIS2DS_TAP_X_EN 0x20 -#define LIS2DS_TAP_Y_EN 0x10 -#define LIS2DS_TAP_Z_EN 0x08 -#define LIS2DS_TAP_EN_MASK (LIS2DS_TAP_X_EN | \ - LIS2DS_TAP_Y_EN | \ - LIS2DS_TAP_Z_EN) -#define LIS2DS_TAP_EN_ALL 0x07 - -#define LIS2DS_CTRL4_ADDR 0x23 -#define LIS2DS_INT1_FTH 0x02 -#define LIS2DS_INT1_D_TAP 0x08 -#define LIS2DS_INT1_S_TAP 0x40 - -#define LIS2DS_CTRL5_ADDR 0x24 -#define LIS2DS_FIFO_CTRL_ADDR 0x25 -#define LIS2DS_FIFO_MODE_MASK 0xe0 -#define LIS2DS_FIFO_BYPASS_MODE 0 -#define LIS2DS_FIFO_MODE 1 -#define LIS2DS_FIFO_CONT_MODE 6 - -#define LIS2DS_STATUS_REG 0x27 -#define LIS2DS_STS_XLDA_UP 0x01 -#define LIS2DS_SINGLE_TAP_UP 0x08 -#define LIS2DS_DOUBLE_TAP_UP 0x10 -#define LIS2DS_FIFO_THS_UP 0x80 - -#define LIS2DS_OUT_X_L_ADDR 0x28 -#define LIS2DS_FIFO_THS_ADDR 0x2e - -#define LIS2DS_FIFO_SRC_ADDR 0x2f -#define LIS2DS_FIFO_DIFF_MASK 0xff -#define LIS2DS_FIFO_DIFF8_MASK 0x20 -#define LIS2DS_FIFO_OVR_MASK 0x40 -#define LIS2DS_FIFO_FTH_MASK 0x80 +#define LIS2DS_EN_BIT 0x01 +#define LIS2DS_DIS_BIT 0x00 + +#define LIS2DS_CTRL1_ADDR 0x20 +#define LIS2DS_CTRL2_ADDR 0x21 +#define LIS2DS_CTRL3_ADDR 0x22 +#define LIS2DS_TAP_X_EN 0x20 +#define LIS2DS_TAP_Y_EN 0x10 +#define LIS2DS_TAP_Z_EN 0x08 +#define LIS2DS_TAP_EN_MASK (LIS2DS_TAP_X_EN | LIS2DS_TAP_Y_EN | LIS2DS_TAP_Z_EN) +#define LIS2DS_TAP_EN_ALL 0x07 + +#define LIS2DS_CTRL4_ADDR 0x23 +#define LIS2DS_INT1_FTH 0x02 +#define LIS2DS_INT1_D_TAP 0x08 +#define LIS2DS_INT1_S_TAP 0x40 + +#define LIS2DS_CTRL5_ADDR 0x24 +#define LIS2DS_FIFO_CTRL_ADDR 0x25 +#define LIS2DS_FIFO_MODE_MASK 0xe0 +#define LIS2DS_FIFO_BYPASS_MODE 0 +#define LIS2DS_FIFO_MODE 1 +#define LIS2DS_FIFO_CONT_MODE 6 + +#define LIS2DS_STATUS_REG 0x27 +#define LIS2DS_STS_XLDA_UP 0x01 +#define LIS2DS_SINGLE_TAP_UP 0x08 +#define LIS2DS_DOUBLE_TAP_UP 0x10 +#define LIS2DS_FIFO_THS_UP 0x80 + +#define LIS2DS_OUT_X_L_ADDR 0x28 +#define LIS2DS_FIFO_THS_ADDR 0x2e + +#define LIS2DS_FIFO_SRC_ADDR 0x2f +#define LIS2DS_FIFO_DIFF_MASK 0xff +#define LIS2DS_FIFO_DIFF8_MASK 0x20 +#define LIS2DS_FIFO_OVR_MASK 0x40 +#define LIS2DS_FIFO_FTH_MASK 0x80 /* * Concatenated with DIFF8 bit in FIFO_SRC (2Fh) register, it represents the * number of unread samples stored in FIFO. (000000000 = FIFO empty; * 100000000 = FIFO full, 256 unread samples). */ -#define LIS2DS_FIFO_SAMPLES_ADDR 0x30 -#define LIS2DS_TAP_6D_THS_ADDR 0x31 -#define LIS2DS_INT_DUR_ADDR 0x32 -#define LIS2DS_WAKE_UP_THS_ADDR 0x33 +#define LIS2DS_FIFO_SAMPLES_ADDR 0x30 +#define LIS2DS_TAP_6D_THS_ADDR 0x31 +#define LIS2DS_INT_DUR_ADDR 0x32 +#define LIS2DS_WAKE_UP_THS_ADDR 0x33 -#define LIS2DS_TAP_SRC_ADDR 0x38 -#define LIS2DS_TAP_EVENT_DETECT 0x40 +#define LIS2DS_TAP_SRC_ADDR 0x38 +#define LIS2DS_TAP_EVENT_DETECT 0x40 /* Alias Register/Mask */ -#define LIS2DS_ACC_ODR_ADDR LIS2DS_CTRL1_ADDR -#define LIS2DS_ACC_ODR_MASK 0xf0 +#define LIS2DS_ACC_ODR_ADDR LIS2DS_CTRL1_ADDR +#define LIS2DS_ACC_ODR_MASK 0xf0 -#define LIS2DS_BDU_ADDR LIS2DS_CTRL1_ADDR -#define LIS2DS_BDU_MASK 0x01 +#define LIS2DS_BDU_ADDR LIS2DS_CTRL1_ADDR +#define LIS2DS_BDU_MASK 0x01 -#define LIS2DS_SOFT_RESET_ADDR LIS2DS_CTRL2_ADDR -#define LIS2DS_SOFT_RESET_MASK 0x40 +#define LIS2DS_SOFT_RESET_ADDR LIS2DS_CTRL2_ADDR +#define LIS2DS_SOFT_RESET_MASK 0x40 -#define LIS2DS_LIR_ADDR LIS2DS_CTRL3_ADDR -#define LIS2DS_LIR_MASK 0x04 +#define LIS2DS_LIR_ADDR LIS2DS_CTRL3_ADDR +#define LIS2DS_LIR_MASK 0x04 -#define LIS2DS_H_ACTIVE_ADDR LIS2DS_CTRL3_ADDR -#define LIS2DS_H_ACTIVE_MASK 0x02 +#define LIS2DS_H_ACTIVE_ADDR LIS2DS_CTRL3_ADDR +#define LIS2DS_H_ACTIVE_MASK 0x02 -#define LIS2DS_INT1_FTH_ADDR LIS2DS_CTRL4_ADDR -#define LIS2DS_INT1_FTH_MASK 0x02 +#define LIS2DS_INT1_FTH_ADDR LIS2DS_CTRL4_ADDR +#define LIS2DS_INT1_FTH_MASK 0x02 -#define LIS2DS_INT2_ON_INT1_ADDR LIS2DS_CTRL5_ADDR -#define LIS2DS_INT2_ON_INT1_MASK 0x20 +#define LIS2DS_INT2_ON_INT1_ADDR LIS2DS_CTRL5_ADDR +#define LIS2DS_INT2_ON_INT1_MASK 0x20 -#define LIS2DS_DRDY_PULSED_ADDR LIS2DS_CTRL5_ADDR -#define LIS2DS_DRDY_PULSED_MASK 0x80 +#define LIS2DS_DRDY_PULSED_ADDR LIS2DS_CTRL5_ADDR +#define LIS2DS_DRDY_PULSED_MASK 0x80 /* Acc data rate for HR mode */ enum lis2ds_odr { @@ -118,7 +116,7 @@ enum lis2ds_odr { }; /* Absolute Acc rate */ -#define LIS2DS_ODR_MIN_VAL 12500 +#define LIS2DS_ODR_MIN_VAL 12500 #define LIS2DS_ODR_MAX_VAL \ MOTION_MAX_SENSOR_FREQUENCY(800000, LIS2DS_ODR_MIN_VAL) @@ -130,8 +128,8 @@ enum lis2ds_odr { (LIS2DS_ODR_MIN_VAL << (_reg - LIS2DS_ODR_12HZ_VAL)) /* Full scale range registers */ -#define LIS2DS_FS_ADDR LIS2DS_CTRL1_ADDR -#define LIS2DS_FS_MASK 0x0c +#define LIS2DS_FS_ADDR LIS2DS_CTRL1_ADDR +#define LIS2DS_FS_MASK 0x0c /* Acc FS value */ enum lis2ds_fs { @@ -142,20 +140,20 @@ enum lis2ds_fs { LIS2DS_FS_LIST_NUM }; -#define LIS2DS_ACCEL_FS_MAX_VAL 16 -#define LIS2DS_ACCEL_FS_MIN_VAL 2 +#define LIS2DS_ACCEL_FS_MAX_VAL 16 +#define LIS2DS_ACCEL_FS_MIN_VAL 2 /* Reg value from Full Scale */ -#define LIS2DS_FS_REG(_fs) \ - (_fs == 2 ? LIS2DS_FS_2G_VAL : \ - _fs == 16 ? LIS2DS_FS_16G_VAL : \ - __fls(_fs)) +#define LIS2DS_FS_REG(_fs) \ + (_fs == 2 ? LIS2DS_FS_2G_VAL : \ + _fs == 16 ? LIS2DS_FS_16G_VAL : \ + __fls(_fs)) /* * Sensor resolution in number of bits. Sensor has two resolution: * 10 and 14 bit for LP and HR mode resp. */ -#define LIS2DS_RESOLUTION 16 +#define LIS2DS_RESOLUTION 16 extern const struct accelgyro_drv lis2ds_drv; -- cgit v1.2.1 From 71b2ef709dcb14260f5fdaa3ab4ced005a29fb46 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 12 Sep 2022 14:54:36 -0400 Subject: Update license boilerplate text in source code files Normally we don't do this, but enough changes have accumulated that we're doing a tree-wide one-off update of the name & style. BRANCH=none BUG=chromium:1098010 TEST=`repo upload` works Change-Id: Icd3a1723c20595356af83d190b2c6a9078b3013b Signed-off-by: Mike Frysinger Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3891203 Reviewed-by: Jeremy Bettis Reviewed-by: Jack Rosenthal --- driver/accel_lis2ds.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'driver/accel_lis2ds.h') diff --git a/driver/accel_lis2ds.h b/driver/accel_lis2ds.h index bc10a10849..3f821b3514 100644 --- a/driver/accel_lis2ds.h +++ b/driver/accel_lis2ds.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ -- cgit v1.2.1