summaryrefslogtreecommitdiff
path: root/driver/als_opt3001.c
diff options
context:
space:
mode:
authorGwendal Grignou <gwendal@chromium.org>2020-05-17 16:43:02 -0700
committerCommit Bot <commit-bot@chromium.org>2020-11-12 03:23:26 +0000
commitd28c10498cdbf007b97b5c0a9a951373574d4eea (patch)
tree3d66ca06837aae98ff747fff85b439976e563045 /driver/als_opt3001.c
parent9676f9291f60efdfb31373aeb77385ebb6e9f6e5 (diff)
downloadchrome-ec-d28c10498cdbf007b97b5c0a9a951373574d4eea.tar.gz
motion_sense: Make change in range permanent
When AP changes range, unlike offset or ODR, it was not surviving init() call. If the sensor is powered off in S3, at resume the range would be back to the default. To make it consistent with other attributes, remember range change until EC powers down. - remove get_range - add current_range to store the range currently used. This is modifiable by the AP - when the AP shutdown, revert current_range to default_range - Remove const attribute for sensor structure when init and set_range is called. BUG=chromium:1083791 BRANCH=none TEST=One eve branch, check range is preserved even after 'shutdown -h 0' Change-Id: Ia7126ac0cc9c3fef60b4464d95d6dd15e64b0fc4 Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2215751 Reviewed-by: Yuval Peress <peress@chromium.org>
Diffstat (limited to 'driver/als_opt3001.c')
-rw-r--r--driver/als_opt3001.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/driver/als_opt3001.c b/driver/als_opt3001.c
index 8f1e2bc775..53f2b7df89 100644
--- a/driver/als_opt3001.c
+++ b/driver/als_opt3001.c
@@ -177,23 +177,17 @@ int opt3001_read_lux(const struct motion_sensor_t *s, intv3_t v)
}
}
-static int opt3001_set_range(const struct motion_sensor_t *s, int range,
+static int opt3001_set_range(struct motion_sensor_t *s, int range,
int rnd)
{
struct opt3001_drv_data_t *drv_data = OPT3001_GET_DATA(s);
drv_data->scale = range >> 16;
drv_data->uscale = range & 0xffff;
+ s->current_range = range;
return EC_SUCCESS;
}
-static int opt3001_get_range(const struct motion_sensor_t *s)
-{
- struct opt3001_drv_data_t *drv_data = OPT3001_GET_DATA(s);
-
- return (drv_data->scale << 16) | (drv_data->uscale);
-}
-
static int opt3001_set_data_rate(const struct motion_sensor_t *s,
int rate, int roundup)
{
@@ -265,7 +259,7 @@ static int opt3001_get_offset(const struct motion_sensor_t *s,
/**
* Initialise OPT3001 light sensor.
*/
-static int opt3001_init(const struct motion_sensor_t *s)
+static int opt3001_init(struct motion_sensor_t *s)
{
int data;
int ret;
@@ -301,7 +295,6 @@ const struct accelgyro_drv opt3001_drv = {
.init = opt3001_init,
.read = opt3001_read_lux,
.set_range = opt3001_set_range,
- .get_range = opt3001_get_range,
.set_offset = opt3001_set_offset,
.get_offset = opt3001_get_offset,
.set_data_rate = opt3001_set_data_rate,