Removed all the early IOCTL except for lightsensor where it makes sense.

Hopefully no more bootloops...

4 files changed, 1 insertions, 54 deletions

diff --git a/aries/libsensors/CompassSensor.cpp b/aries/libsensors/CompassSensor.cpp
index 7dcd0fd..e49dd16 100644
--- a/aries/libsensors/CompassSensor.cpp
+++ b/aries/libsensors/CompassSensor.cpp
@@ -64,31 +64,6 @@ CompassSensor::~CompassSensor() {
 }

 

 

-int CompassSensor::setInitialState() {

-    

-    LOGD("CompassSensor::~setInitialState()");

-    struct input_absinfo absinfo_x;

-    struct input_absinfo absinfo_y;

-    struct input_absinfo absinfo_z;

-    float value;

-    if (!ioctl(data_fd, EVIOCGABS(EVENT_TYPE_MAGV_X), &absinfo_x) &&

-        !ioctl(data_fd, EVIOCGABS(EVENT_TYPE_MAGV_Y), &absinfo_y) &&

-        !ioctl(data_fd, EVIOCGABS(EVENT_TYPE_MAGV_Z), &absinfo_z)) {

-        value = absinfo_x.value;

-        mPendingEvent.magnetic.x = value * CONVERT_M_X;

-        value = absinfo_y.value;

-        mPendingEvent.magnetic.y = value * CONVERT_M_Y;

-        value = absinfo_z.value;

-        mPendingEvent.magnetic.z = value * CONVERT_M_Z;

-        mHasPendingEvent = true;

-    }

-    else

-    {

-        LOGD("CompassSensor::~setInitialState() ioctl failed");

-    }

-    return 0;

-}

-

 

 int CompassSensor::enable(int32_t, int en) {

 

@@ -113,7 +88,6 @@ int CompassSensor::enable(int32_t, int en) {
             err = write(fd, buf, sizeof(buf));

             close(fd);

             mEnabled = flags;

-            setInitialState();

             return 0;

         }

         return -1;        

diff --git a/aries/libsensors/CompassSensor.h b/aries/libsensors/CompassSensor.h
index 9df0d29..0270431 100644
--- a/aries/libsensors/CompassSensor.h
+++ b/aries/libsensors/CompassSensor.h
@@ -39,7 +39,6 @@ class CompassSensor : public SensorBase {
     char input_sysfs_path[PATH_MAX];

     int input_sysfs_path_len;

 

-    int setInitialState();

 

 public:

             CompassSensor();

diff --git a/aries/libsensors/Smb380Sensor.cpp b/aries/libsensors/Smb380Sensor.cpp
index 0d277b5..30a1660 100644
--- a/aries/libsensors/Smb380Sensor.cpp
+++ b/aries/libsensors/Smb380Sensor.cpp
@@ -62,31 +62,6 @@ Smb380Sensor::~Smb380Sensor() {
 }

 

 

-int Smb380Sensor::setInitialState() {

-    

-    LOGD("Smb380Sensor::~setInitialState()");

-    struct input_absinfo absinfo_x;

-    struct input_absinfo absinfo_y;

-    struct input_absinfo absinfo_z;

-    float value;

-    if (!ioctl(data_fd, EVIOCGABS(EVENT_TYPE_ACCEL_X), &absinfo_x) &&

-        !ioctl(data_fd, EVIOCGABS(EVENT_TYPE_ACCEL_Y), &absinfo_y) &&

-        !ioctl(data_fd, EVIOCGABS(EVENT_TYPE_ACCEL_Z), &absinfo_z)) {

-        value = absinfo_x.value;

-        mPendingEvent.acceleration.x = value * CONVERT_A_X;

-        value = absinfo_y.value;

-        mPendingEvent.acceleration.y = value * CONVERT_A_Y;

-        value = absinfo_z.value;

-        mPendingEvent.acceleration.z = value * CONVERT_A_Z;

-        mHasPendingEvent = true;

-    }

-    else

-    {

-        LOGD("Smb380Sensor::~setInitialState() ioctl failed");

-    }

-    return 0;

-}

-

 

 int Smb380Sensor::enable(int32_t, int en) {

 

@@ -111,7 +86,7 @@ int Smb380Sensor::enable(int32_t, int en) {
             err = write(fd, buf, sizeof(buf));

             close(fd);

             mEnabled = flags;

-            setInitialState();

+            //setInitialState();

             return 0;

         }

         return -1;        

diff --git a/aries/libsensors/Smb380Sensor.h b/aries/libsensors/Smb380Sensor.h
index 8490f24..5e55e9b 100644
--- a/aries/libsensors/Smb380Sensor.h
+++ b/aries/libsensors/Smb380Sensor.h
@@ -54,7 +54,6 @@ class Smb380Sensor : public SensorBase {
     char input_sysfs_path[PATH_MAX];

     int input_sysfs_path_len;

 

-    int setInitialState();

 

 public:

             Smb380Sensor();