commit 415416d5230f768b26e2c9d814f6609dae0969d9
author Dan Albert <danalbert@google.com> Fri Nov 21 21:40:08 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 21 21:40:09 2014 +0000
tree 8ee724a6cebf7e6782a723f024cf2a2fdb3cf004
parent 10de2bebb7bc9793483858824143cfe21a5dff85
parent c58774e02eb7a6658248622f1a7ff482c80a9a6d

Merge "Fix mako build."

60xx/libsensors/MPLSensor.cpp

diff --git a/60xx/libsensors/MPLSensor.cpp b/60xx/libsensors/MPLSensor.cpp
index fa5385b..e64dfeb 100644
--- a/60xx/libsensors/MPLSensor.cpp
+++ b/60xx/libsensors/MPLSensor.cpp
@@ -152,8 +152,7 @@
             mEnabled(0), mPendingMask(0)
 {
     FUNC_LOG;
-    inv_error_t rv;
-    int mpu_int_fd, i;
+    int mpu_int_fd;
     char *port = NULL;
 
     ALOGV_IF(EXTRA_VERBOSE, "MPLSensor constructor: numSensors = %d", numSensors);
@@ -167,7 +166,7 @@
     /* sensor list will be changed based on this variable               */
     mNineAxisEnabled = false;
 
-    for (i = 0; i < ARRAY_SIZE(mPollFds); i++) {
+    for (size_t i = 0; i < ARRAY_SIZE(mPollFds); i++) {
         mPollFds[i].fd = -1;
         mPollFds[i].events = 0;
     }
@@ -308,7 +307,6 @@
 
     for (i = 0; i < ARRAY_SIZE(mPollFds); i++) {
         int cur_fd = mPollFds[i].fd;
-        int j = 0;
         if (mPollFds[i].revents & POLLIN) {
             nread = read(cur_fd, &irqdata, sizeof(irqdata));
             if (nread > 0) {
@@ -366,7 +364,7 @@
     //record the new sensor state
     inv_error_t rv;
 
-    long sen_mask = mLocalSensorMask & mMasterSensorMask;
+    unsigned long sen_mask = mLocalSensorMask & mMasterSensorMask;
 
     bool changing_sensors = ((inv_get_dl_config()->requested_sensors
             != sen_mask) && (sen_mask != 0));
@@ -636,10 +634,7 @@
                                 int index)
 {
     VFUNC_LOG;
-    inv_error_t res, res2;
-    float bias_error[3];
-    float total_be;
-    static int bias_error_settled = 0;
+    inv_error_t res;
 
     res = inv_get_float_array(INV_MAGNETOMETER, s->magnetic.v);
 
@@ -661,7 +656,6 @@
     VFUNC_LOG;
     float quat[4];
     float norm = 0;
-    float ang = 0;
     inv_error_t r;
 
     r = inv_get_float_array(INV_QUATERNION, quat);
@@ -771,8 +765,6 @@
 {
     VFUNC_LOG;
     inv_error_t res;
-    float euler[3];
-    float heading[1];
     float rot_mat[9];
 
     res = inv_get_float_array(INV_ROTATION_MATRIX, rot_mat);
@@ -833,7 +825,6 @@
 
     pthread_mutex_lock(&mMplMutex);
     if ((uint32_t(newState) << what) != (mEnabled & (1 << what))) {
-        uint32_t sensor_type;
         short flags = newState;
         mEnabled &= ~(1 << what);
         mEnabled |= (uint32_t(flags) << what);
@@ -971,7 +962,6 @@
 int MPLSensor::readEvents(sensors_event_t* data, int count)
 {
     //VFUNC_LOG;
-    int i;
     bool irq_set[5] = { false, false, false, false, false };
     inv_error_t rv;
     if (count < 1)
@@ -1111,7 +1101,7 @@
  *  parameter len gives the length of the buffer pointed to by list
  */
 
-int MPLSensor::populateSensorList(struct sensor_t *list, int len)
+int MPLSensor::populateSensorList(struct sensor_t *list, size_t len)
 {
     int numsensors;
 

60xx/libsensors/MPLSensor.h

diff --git a/60xx/libsensors/MPLSensor.h b/60xx/libsensors/MPLSensor.h
index 5b5d121..f580732 100644
--- a/60xx/libsensors/MPLSensor.h
+++ b/60xx/libsensors/MPLSensor.h
@@ -66,7 +66,7 @@
     virtual void handlePowerEvent();
     virtual void sleepEvent();
     virtual void wakeEvent();
-    int populateSensorList(struct sensor_t *list, int len);
+    int populateSensorList(struct sensor_t *list, size_t len);
     void cbOnMotion(uint16_t);
     void cbProcData();