Commit e2571e3a authored by Arnaud Mandy's avatar Arnaud Mandy Committed by Commit Bot

Accelerometer: remove toggle from EnableAccelometerReading

Remove flag for EnableAccelerometerReading(bool) and split into
EnableAccelerometerReading() and DisableAccelerometerReading().

Bug: 1018705
Change-Id: Ie385fe627b0969d0fbdb01f28423300acce66f8c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1883573Reviewed-by: default avatarMitsuru Oshima <oshima@chromium.org>
Reviewed-by: default avatarRaphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
Commit-Queue: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
Cr-Commit-Position: refs/heads/master@{#711344}
parent 8938085c
...@@ -168,8 +168,9 @@ class AccelerometerFileReader ...@@ -168,8 +168,9 @@ class AccelerometerFileReader
// read at the current sampling rate. // read at the current sampling rate.
void Read(); void Read();
// Controls accelerometer reading via read_switch flag. // Controls accelerometer reading.
void EnableAccelerometerReading(bool read_switch); void EnableAccelerometerReading();
void DisableAccelerometerReading();
// Tracks if accelerometer initialization is completed. // Tracks if accelerometer initialization is completed.
void CheckInitStatus(); void CheckInitStatus();
...@@ -446,7 +447,7 @@ void AccelerometerFileReader::InitializeInternal() { ...@@ -446,7 +447,7 @@ void AccelerometerFileReader::InitializeInternal() {
// If ChromeOS lid angle driver is not present, start accelerometer read and // If ChromeOS lid angle driver is not present, start accelerometer read and
// read is always on. // read is always on.
if (ec_lid_angle_driver_state_ == ABSENT) if (ec_lid_angle_driver_state_ == ABSENT)
EnableAccelerometerReading(/*read_switch=*/true); EnableAccelerometerReading();
} }
void AccelerometerFileReader::Read() { void AccelerometerFileReader::Read() {
...@@ -460,21 +461,28 @@ void AccelerometerFileReader::Read() { ...@@ -460,21 +461,28 @@ void AccelerometerFileReader::Read() {
kDelayBetweenReads); kDelayBetweenReads);
} }
void AccelerometerFileReader::EnableAccelerometerReading(bool read_switch) { void AccelerometerFileReader::EnableAccelerometerReading() {
DCHECK(base::SequencedTaskRunnerHandle::IsSet()); DCHECK(base::SequencedTaskRunnerHandle::IsSet());
if (accelerometer_read_on_ == read_switch) if (accelerometer_read_on_)
return; return;
accelerometer_read_on_ = read_switch; accelerometer_read_on_ = true;
if (accelerometer_read_on_) Read();
Read(); }
void AccelerometerFileReader::DisableAccelerometerReading() {
DCHECK(base::SequencedTaskRunnerHandle::IsSet());
if (!accelerometer_read_on_)
return;
accelerometer_read_on_ = false;
} }
void AccelerometerFileReader::CheckInitStatus() { void AccelerometerFileReader::CheckInitStatus() {
DCHECK(base::SequencedTaskRunnerHandle::IsSet()); DCHECK(base::SequencedTaskRunnerHandle::IsSet());
switch (initialization_state_) { switch (initialization_state_) {
case SUCCESS: case SUCCESS:
EnableAccelerometerReading(/*read_switch=*/true); EnableAccelerometerReading();
break; break;
case FAILED: case FAILED:
LOG(ERROR) << "Failed to initialize for accelerometer read.\n"; LOG(ERROR) << "Failed to initialize for accelerometer read.\n";
...@@ -493,7 +501,7 @@ void AccelerometerFileReader::TriggerRead() { ...@@ -493,7 +501,7 @@ void AccelerometerFileReader::TriggerRead() {
switch (initialization_state_) { switch (initialization_state_) {
case SUCCESS: case SUCCESS:
if (ec_lid_angle_driver_state_ == EXISTED) if (ec_lid_angle_driver_state_ == EXISTED)
EnableAccelerometerReading(/*read_switch=*/true); EnableAccelerometerReading();
break; break;
case FAILED: case FAILED:
LOG(ERROR) << "Failed to initialize for accelerometer read.\n"; LOG(ERROR) << "Failed to initialize for accelerometer read.\n";
...@@ -510,7 +518,7 @@ void AccelerometerFileReader::CancelRead() { ...@@ -510,7 +518,7 @@ void AccelerometerFileReader::CancelRead() {
DCHECK(base::SequencedTaskRunnerHandle::IsSet()); DCHECK(base::SequencedTaskRunnerHandle::IsSet());
if (initialization_state_ == SUCCESS && if (initialization_state_ == SUCCESS &&
ec_lid_angle_driver_state_ == EXISTED) { ec_lid_angle_driver_state_ == EXISTED) {
EnableAccelerometerReading(/*read_switch=*/false); DisableAccelerometerReading();
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment