[sensorfw] power up/down proximity sensor

...don't use dbus call to mce to do that
sailfishos · Jan 12, 2015 · 86394e6 · 86394e6
1 parent ed5cb17
commit 86394e6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 26 deletions.
diff --git a/adaptors/proximityadaptor/proximityadaptor.cpp b/adaptors/proximityadaptor/proximityadaptor.cpp
@@ -53,41 +53,23 @@ struct apds990x_data {
 ProximityAdaptor::ProximityAdaptor(const QString& id) :
     SysfsAdaptor(id, SysfsAdaptor::SelectMode, false)
 {
-
-#ifdef SENSORFW_MCE_WATCHER
-    dbusIfc_ = new QDBusInterface(MCE_SERVICE, MCE_REQUEST_PATH, MCE_REQUEST_IF,
-                                                 QDBusConnection::systemBus(), this);
-#endif
-
     deviceType_ = (DeviceType)Config::configuration()->value<int>("proximity/driver_type", 0);
     threshold_ = Config::configuration()->value<int>("proximity/threshold", 35);
     powerStatePath_ = Config::configuration()->value("proximity/powerstate_path").toByteArray();
-    if (deviceType_ == RM696)
-    {
-#ifdef SENSORFW_MCE_WATCHER
-        dbusIfc_->call(QDBus::NoBlock, "req_proximity_sensor_enable");
-#endif
-    }
     proximityBuffer_ = new DeviceAdaptorRingBuffer<ProximityData>(1);
     setAdaptedSensor("proximity", "Proximity state", proximityBuffer_);
     setDescription("Proximity sensor readings (Dipro sensor)");
 }
 
 ProximityAdaptor::~ProximityAdaptor()
 {
-#ifdef SENSORFW_MCE_WATCHER
-    if(dbusIfc_)
-    {
-        dbusIfc_->call(QDBus::NoBlock, "req_proximity_sensor_disable");
-        delete dbusIfc_;
-    }
-#endif
+    stopSensor();
     delete proximityBuffer_;
 }
 
 bool ProximityAdaptor::startSensor()
 {
-    if(deviceType_ == NCDK && !powerStatePath_.isEmpty())
+    if(!powerStatePath_.isEmpty())
     {
         writeToFile(powerStatePath_, "1");
     }
@@ -96,7 +78,7 @@ bool ProximityAdaptor::startSensor()
 
 void ProximityAdaptor::stopSensor()
 {
-    if(deviceType_ == NCDK && !powerStatePath_.isEmpty())
+    if(!powerStatePath_.isEmpty())
     {
         writeToFile(powerStatePath_, "0");
     }

diff --git a/adaptors/proximityadaptor/proximityadaptor.h b/adaptors/proximityadaptor/proximityadaptor.h
@@ -98,11 +98,6 @@ class ProximityAdaptor : public SysfsAdaptor
     int threshold_;
     ProximityAdaptor::DeviceType deviceType_;
     QByteArray powerStatePath_;
-
-#ifdef SENSORFW_MCE_WATCHER
-    QDBusInterface *dbusIfc_;
-#endif
-
 };
 
 #endif
diff --git a/config/sensord-rm_696.conf b/config/sensord-rm_696.conf
@@ -17,6 +17,7 @@ intervals = 0
 [proximity]
 driver_type = 2
 path = /dev/apds990x0
+powerstate_path = /sys/devices/platform/i2c_omap.2/i2c-2/2-0039/prox_enable
 dataranges = "0=>1"
 intervals = 0