summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-10-24 08:06:55 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-10-24 08:06:55 +0000
commit69b7529dc27fa9a18c02f4212bd14b9957505e61 (patch)
treed752c64f7726e04f07ad5f059f8cacfaa452f0e4
parent6d08398e3fabf6cb69fdc3ee7bae0735d69e4ef4 (diff)
parent8ebc063a656d6f3192f50880784b27422ace441f (diff)
downloaddevice_google_contexthub-69b7529dc27fa9a18c02f4212bd14b9957505e61.tar.gz
device_google_contexthub-69b7529dc27fa9a18c02f4212bd14b9957505e61.tar.bz2
device_google_contexthub-69b7529dc27fa9a18c02f4212bd14b9957505e61.zip
Snap for 4413317 from 8ebc063a656d6f3192f50880784b27422ace441f to pi-release
Change-Id: I039cb20f40614e2b592b147ef6cd642afeb29eb6
-rw-r--r--firmware/os/core/sensors.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/firmware/os/core/sensors.c b/firmware/os/core/sensors.c
index dfc89dca..e91b0656 100644
--- a/firmware/os/core/sensors.c
+++ b/firmware/os/core/sensors.c
@@ -587,15 +587,13 @@ static bool sensorAddRequestor(uint32_t sensorHandle, uint32_t clientTid, uint32
return true;
}
-static bool sensorGetCurRequestorRate(uint32_t sensorHandle, uint32_t clientTid, uint32_t *rateP, uint64_t *latencyP)
+static bool sensorGetCurRequestorRate(uint32_t sensorHandle, uint32_t clientTid, uint32_t *rateP)
{
struct SensorsClientRequest *req = sensorClientRequestFind(sensorHandle, clientTid);
if (req) {
if (rateP)
*rateP = req->rate;
- if (*latencyP)
- *latencyP = req->latency;
return true;
} else {
return false;
@@ -673,7 +671,7 @@ bool sensorRequestRateChange(uint32_t unusedTid, uint32_t sensorHandle, uint32_t
{
struct Sensor* s = sensorFindByHandle(sensorHandle);
uint32_t oldRate, newSensorRate;
- uint64_t oldLatency, samplingPeriod;
+ uint64_t samplingPeriod;
uint32_t clientTid;
(void)unusedTid;
@@ -683,7 +681,7 @@ bool sensorRequestRateChange(uint32_t unusedTid, uint32_t sensorHandle, uint32_t
clientTid = osGetCurrentTid();
/* get current rate */
- if (!sensorGetCurRequestorRate(sensorHandle, clientTid, &oldRate, &oldLatency))
+ if (!sensorGetCurRequestorRate(sensorHandle, clientTid, &oldRate))
return false;
/* verify the new rate is possible given all other ongoing requests */