Seperate the old sensor daemon folder to a new light weight daemon an…

…d a share library
sailfishos · Jan 12, 2011 · 5944562 · 5944562
1 parent a8a5fd1
commit 5944562
Show file tree

Hide file tree

Showing 136 changed files with 256 additions and 377 deletions.
diff --git a/adaptors/accelerometeradaptor/accelerometeradaptor.h b/adaptors/accelerometeradaptor/accelerometeradaptor.h
@@ -28,7 +28,7 @@
 #define ACCELEROMETERADAPTOR_H
 
 #include "inputdevadaptor.h"
-#include "sensord/deviceadaptorringbuffer.h"
+#include "deviceadaptorringbuffer.h"
 #include "datatypes/orientationdata.h"
 #include <QTime>
 

diff --git a/adaptors/adaptor-config.pri b/adaptors/adaptor-config.pri
@@ -5,7 +5,7 @@ include( ../common-config.pri )
 
 SENSORFW_INCLUDEPATHS = ../.. \
                         ../../include \
-                        ../../sensord \
+                        ../../core \
                         ../../datatypes
 
 DEPENDPATH  += $$SENSORFW_INCLUDEPATHS

diff --git a/adaptors/alsadaptor-ascii/alsadaptor-ascii.h b/adaptors/alsadaptor-ascii/alsadaptor-ascii.h
@@ -34,7 +34,7 @@
 #include <QObject>
 #include <QString>
 #include "sysfsadaptor.h"
-#include "sensord/deviceadaptorringbuffer.h"
+#include "deviceadaptorringbuffer.h"
 #include "datatypes/timedunsigned.h"
 
 class ALSAdaptorAscii : public SysfsAdaptor

diff --git a/adaptors/alsadaptor-sysfs/alsadaptor-sysfs.h b/adaptors/alsadaptor-sysfs/alsadaptor-sysfs.h
@@ -29,7 +29,7 @@
 #define ALSADAPTOR_SYSFS_H
 
 #include "sysfsadaptor.h"
-#include "sensord/deviceadaptorringbuffer.h"
+#include "deviceadaptorringbuffer.h"
 #include "datatypes/timedunsigned.h"
 #include <QTime>
 

diff --git a/adaptors/alsadaptor/alsadaptor.h b/adaptors/alsadaptor/alsadaptor.h
@@ -29,7 +29,7 @@
 #define ALSADAPTOR_H
 
 #include "sysfsadaptor.h"
-#include "sensord/deviceadaptorringbuffer.h"
+#include "deviceadaptorringbuffer.h"
 #include "datatypes/timedunsigned.h"
 #include <QTime>
 

diff --git a/adaptors/gyroscopeadaptor/gyroscopeadaptor.h b/adaptors/gyroscopeadaptor/gyroscopeadaptor.h
@@ -27,7 +27,7 @@
 #ifndef GYROSCOPEADAPTOR_H
 #define GYROSCOPEADAPTOR_H
 
-#include "sensord/sysfsadaptor.h"
+#include "sysfsadaptor.h"
 #include "datatypes/orientationdata.h"
 
 /**

diff --git a/adaptors/kbslideradaptor/kbslideradaptor.cpp b/adaptors/kbslideradaptor/kbslideradaptor.cpp
@@ -29,7 +29,7 @@
 #include <fcntl.h>
 #include <linux/input.h>
 #include <string.h>
-#include <sensord/logging.h>
+#include "logging.h"
 
 #include "kbslideradaptor.h"
 

diff --git a/adaptors/kbslideradaptor/kbslideradaptor.h b/adaptors/kbslideradaptor/kbslideradaptor.h
@@ -28,7 +28,7 @@
 #define KBSLIDERADAPTOR_H
 
 #include "inputdevadaptor.h"
-#include "sensord/deviceadaptorringbuffer.h"
+#include "deviceadaptorringbuffer.h"
 
 /**
  * @brief Adaptor for device keyboard slider state.

diff --git a/adaptors/magnetometeradaptor-ascii/magnetometeradaptor-ascii.h b/adaptors/magnetometeradaptor-ascii/magnetometeradaptor-ascii.h
@@ -32,7 +32,7 @@
 #define MAGNETOMETERADAPTOR_ASCII_H
 
 #include "sysfsadaptor.h"
-#include "sensord/deviceadaptorringbuffer.h"
+#include "deviceadaptorringbuffer.h"
 #include "datatypes/timedunsigned.h"
 
 class MagnetometerAdaptorAscii : public SysfsAdaptor

diff --git a/adaptors/magnetometeradaptor/magnetometeradaptor.h b/adaptors/magnetometeradaptor/magnetometeradaptor.h
@@ -27,8 +27,8 @@
 #ifndef MAGNETOMETERADAPTOR_H
 #define MAGNETOMETERADAPTOR_H
 
-#include "sensord/sysfsadaptor.h"
-#include "sensord/deviceadaptorringbuffer.h"
+#include "sysfsadaptor.h"
+#include "deviceadaptorringbuffer.h"
 #include "datatypes/genericdata.h"
 #include <QTime>
 #include <QString>

diff --git a/adaptors/mrstaccelerometer/mrstaccelerometeradaptor.h b/adaptors/mrstaccelerometer/mrstaccelerometeradaptor.h
@@ -1,11 +1,11 @@
 #ifndef MRSTACCELEROMETERADPTOR_H
 #define MRSTACCELEROMETERADPTOR_H
-#include "sensord/sysfsadaptor.h"
+#include "sysfsadaptor.h"
 #include <QString>
 #include <QStringList>
 #include <linux/input.h>
-#include <sensord/filterproperty.h>
-#include "sensord/deviceadaptorringbuffer.h"
+#include <filterproperty.h>
+#include "deviceadaptorringbuffer.h"
 #include "datatypes/orientationdata.h"
 #include <QTime>
 

diff --git a/adaptors/proximityadaptor-ascii/proximityadaptor-ascii.h b/adaptors/proximityadaptor-ascii/proximityadaptor-ascii.h
@@ -32,7 +32,7 @@
 #define PROXIMITYADAPTOR_ASCII_H
 
 #include "sysfsadaptor.h"
-#include "sensord/deviceadaptorringbuffer.h"
+#include "deviceadaptorringbuffer.h"
 #include "datatypes/timedunsigned.h"
 
 class ProximityAdaptorAscii : public SysfsAdaptor

diff --git a/adaptors/proximityadaptor-evdev/proximityadaptor-evdev.cpp b/adaptors/proximityadaptor-evdev/proximityadaptor-evdev.cpp
@@ -30,7 +30,7 @@
 #include <fcntl.h>
 #include <linux/input.h>
 #include <string.h>
-#include <sensord/logging.h>
+#include <logging.h>
 #include "datatypes/utils.h"
 #include "config.h"
 

diff --git a/adaptors/proximityadaptor-evdev/proximityadaptor-evdev.h b/adaptors/proximityadaptor-evdev/proximityadaptor-evdev.h
@@ -29,7 +29,7 @@
 #define PROXIMITYADAPTOR_EVDEV_H
 
 #include "inputdevadaptor.h"
-#include "sensord/deviceadaptorringbuffer.h"
+#include "deviceadaptorringbuffer.h"
 #include "datatypes/timedunsigned.h"
 #include <QTime>
 

diff --git a/adaptors/proximityadaptor/proximityadaptor.cpp b/adaptors/proximityadaptor/proximityadaptor.cpp
@@ -28,8 +28,8 @@
 #include "proximityadaptor.h"
 #include <errno.h>
 #include "datatypes/utils.h"
-#include "sensord/logging.h"
-#include "sensord/config.h"
+#include "logging.h"
+#include "config.h"
 #include <QFile>
 #include <linux/types.h>
 

diff --git a/adaptors/proximityadaptor/proximityadaptor.h b/adaptors/proximityadaptor/proximityadaptor.h
@@ -30,7 +30,7 @@
 
 #include <QDBusInterface>
 #include "sysfsadaptor.h"
-#include "sensord/deviceadaptorringbuffer.h"
+#include "deviceadaptorringbuffer.h"
 #include "datatypes/timedunsigned.h"
 
 #ifdef SENSORFW_MCE_WATCHER

diff --git a/adaptors/tapadaptor/tapadaptor.h b/adaptors/tapadaptor/tapadaptor.h
@@ -29,7 +29,7 @@
 #define TAPADAPTOR_H
 
 #include "inputdevadaptor.h"
-#include "sensord/deviceadaptorringbuffer.h"
+#include "deviceadaptorringbuffer.h"
 #include "datatypes/tapdata.h"
 
 /**

diff --git a/adaptors/touchadaptor/touchadaptor.h b/adaptors/touchadaptor/touchadaptor.h
@@ -28,8 +28,8 @@
 #define TOUCHADAPTOR_H
 
 #include "inputdevadaptor.h"
-#include "sensord/deviceadaptorringbuffer.h"
-#include <sensord/filterproperty.h>
+#include "deviceadaptorringbuffer.h"
+#include "filterproperty.h"
 #include <QObject>
 #include "touchdata.h"
 

diff --git a/chains/accelerometerchain/accelerometerchain.cpp b/chains/accelerometerchain/accelerometerchain.cpp
@@ -27,11 +27,11 @@
 #include "accelerometerchain.h"
 #include <QVariant>
 #include <QStringList>
-#include "sensord/sensormanager.h"
-#include "sensord/bin.h"
-#include "sensord/bufferreader.h"
-#include "sensord/config.h"
-#include "sensord/logging.h"
+#include "sensormanager.h"
+#include "bin.h"
+#include "bufferreader.h"
+#include "config.h"
+#include "logging.h"
 
 #include "coordinatealignfilter/coordinatealignfilter.h"
 

diff --git a/chains/chain-config.pri b/chains/chain-config.pri
@@ -5,7 +5,7 @@ include( ../common-config.pri )
 
 SENSORFW_INCLUDEPATHS = ../..           \
                         ../../include \
-                        ../../sensord   \
+                        ../../core   \
                         ../../datatypes \
                         ../../adaptors \
                         ../../filters

diff --git a/chains/orientationchain/orientationchain.cpp b/chains/orientationchain/orientationchain.cpp
@@ -24,9 +24,9 @@
  */
 
 #include "orientationchain.h"
-#include "sensord/sensormanager.h"
-#include "sensord/bin.h"
-#include "sensord/bufferreader.h"
+#include "sensormanager.h"
+#include "bin.h"
+#include "bufferreader.h"
 
 OrientationChain::OrientationChain(const QString& id) :
     AbstractChain(id)

diff --git a/chains/orientationchain/orientationchain.h b/chains/orientationchain/orientationchain.h
@@ -29,9 +29,9 @@
 #include "abstractsensor.h"
 #include "abstractchain.h"
 #include "deviceadaptor.h"
-#include "sensord/bufferreader.h"
-#include "sensord/filter.h"
-#include "sensord/bin.h"
+#include "bufferreader.h"
+#include "filter.h"
+#include "bin.h"
 #include "orientationdata.h"
 #include "posedata.h"
 #include "datatypes/unsigned.h"

diff --git a/chains/orientationchain/orientationchainplugin.cpp b/chains/orientationchain/orientationchainplugin.cpp
@@ -27,7 +27,7 @@
 #include "orientationchainplugin.h"
 #include "orientationchain.h"
 #include "sensormanager.h"
-#include "sensord/logging.h"
+#include "logging.h"
 
 void OrientationChainPlugin::Register(class Loader&)
 {

diff --git a/sensord/abstractchain.h → core/abstractchain.h b/sensord/abstractchain.h → core/abstractchain.h
diff --git a/sensord/abstractsensor.cpp → core/abstractsensor.cpp b/sensord/abstractsensor.cpp → core/abstractsensor.cpp
diff --git a/sensord/abstractsensor.h → core/abstractsensor.h b/sensord/abstractsensor.h → core/abstractsensor.h
diff --git a/sensord/abstractsensor_a.cpp → core/abstractsensor_a.cpp b/sensord/abstractsensor_a.cpp → core/abstractsensor_a.cpp
diff --git a/sensord/abstractsensor_a.h → core/abstractsensor_a.h b/sensord/abstractsensor_a.h → core/abstractsensor_a.h
diff --git a/sensord/bin.cpp → core/bin.cpp b/sensord/bin.cpp → core/bin.cpp
diff --git a/sensord/bin.h → core/bin.h b/sensord/bin.h → core/bin.h
diff --git a/sensord/bufferreader.h → core/bufferreader.h b/sensord/bufferreader.h → core/bufferreader.h
diff --git a/sensord/calibrationhandler.cpp → core/calibrationhandler.cpp b/sensord/calibrationhandler.cpp → core/calibrationhandler.cpp
@@ -29,7 +29,7 @@
 #include "sensormanager.h"
 #include "logging.h"
 #include "abstractsensor.h"
-#include "sensord/config.h"
+#include "config.h"
 
 CalibrationHandler::CalibrationHandler(QObject* parent) : QObject(parent),
     m_sensor(NULL),

diff --git a/sensord/calibrationhandler.h → core/calibrationhandler.h b/sensord/calibrationhandler.h → core/calibrationhandler.h
diff --git a/sensord/callback.h → core/callback.h b/sensord/callback.h → core/callback.h
diff --git a/sensord/config.cpp → core/config.cpp b/sensord/config.cpp → core/config.cpp
@@ -26,7 +26,7 @@
 
 #include "config.h"
 
-#include <sensord/logging.h>
+#include "logging.h"
 #include <QSettings>
 #include <QVariant>
 #include <QFile>

diff --git a/sensord/config.h → core/config.h b/sensord/config.h → core/config.h
diff --git a/sensord/consumer.cpp → core/consumer.cpp b/sensord/consumer.cpp → core/consumer.cpp
diff --git a/sensord/consumer.h → core/consumer.h b/sensord/consumer.h → core/consumer.h
diff --git a/core/core.pro b/core/core.pro
@@ -0,0 +1,92 @@
+QT += network
+
+TEMPLATE = lib
+TARGET = sensorfw
+
+include( ../common-config.pri )
+
+CONFIG += console \
+          link_pkgconfig
+
+SENSORFW_INCLUDEPATHS = .. \
+                        ../include \
+                        ../filters \
+                        ../datatypes
+DEPENDPATH += $$SENSORFW_INCLUDEPATHS
+INCLUDEPATH += $$SENSORFW_INCLUDEPATHS
+
+LIBS += -Wl,-rpath,/usr/lib/sensord
+LIBS += -Wl,-E
+LIBS += -L../datatypes -lsensordatatypes
+
+SOURCES += sensormanager.cpp \
+    sensormanager_a.cpp \
+    ringbuffer.cpp \
+    producer.cpp \
+    source.cpp \
+    consumer.cpp \
+    bin.cpp \
+    filter.cpp \
+    deviceadaptor.cpp \
+    loader.cpp \
+    plugin.cpp \
+    filterproperty.cpp \
+    abstractsensor_a.cpp \
+    abstractsensor.cpp \
+    logging.cpp \
+    parameterparser.cpp \
+    sysfsadaptor.cpp \
+    sockethandler.cpp \
+    inputdevadaptor.cpp \
+    config.cpp \
+    calibrationhandler.cpp \
+    nodebase.cpp
+
+HEADERS += sensormanager.h \
+    sensormanager_a.h \
+    dbusemitter.h \
+    pusher.h \
+    ringbuffer.h \
+    producer.h \
+    callback.h \
+    source.h \
+    consumer.h \
+    sink.h \
+    bin.h \
+    filter.h \
+    deviceadaptor.h \
+    deviceadaptorringbuffer.h \
+    bufferreader.h \
+    loader.h \
+    plugin.h \
+    filterproperty.h \
+    abstractsensor_a.h \
+    abstractsensor.h \
+    logging.h \
+    parameterparser.h \
+    abstractchain.h \
+    sysfsadaptor.h \
+    sockethandler.h \
+    inputdevadaptor.h \
+    config.h \
+    calibrationhandler.h \
+    nodebase.h
+
+!mce_disable {
+    SOURCES += mcewatcher.cpp
+    HEADERS += mcewatcher.h
+    DEFINES += SENSORFW_MCE_WATCHER
+}
+
+contextprovider {
+    DEFINES += PROVIDE_CONTEXT_INFO
+    PKGCONFIG += contextprovider-1.0
+}
+
+
+publicheaders.path  = $${publicheaders.path}/core
+publicheaders.files = $$HEADERS
+
+include(../common-install.pri)
+target.path = $$SHAREDLIBPATH
+INSTALLS += target
diff --git a/sensord/dbusemitter.h → core/dbusemitter.h b/sensord/dbusemitter.h → core/dbusemitter.h
diff --git a/sensord/deviceadaptor.cpp → core/deviceadaptor.cpp b/sensord/deviceadaptor.cpp → core/deviceadaptor.cpp
diff --git a/sensord/deviceadaptor.h → core/deviceadaptor.h b/sensord/deviceadaptor.h → core/deviceadaptor.h
diff --git a/sensord/deviceadaptorringbuffer.h → core/deviceadaptorringbuffer.h b/sensord/deviceadaptorringbuffer.h → core/deviceadaptorringbuffer.h
diff --git a/sensord/filter.cpp → core/filter.cpp b/sensord/filter.cpp → core/filter.cpp
diff --git a/sensord/filter.h → core/filter.h b/sensord/filter.h → core/filter.h
diff --git a/sensord/filterproperty.cpp → core/filterproperty.cpp b/sensord/filterproperty.cpp → core/filterproperty.cpp
diff --git a/sensord/filterproperty.h → core/filterproperty.h b/sensord/filterproperty.h → core/filterproperty.h
diff --git a/sensord/inputdevadaptor.cpp → core/inputdevadaptor.cpp b/sensord/inputdevadaptor.cpp → core/inputdevadaptor.cpp
diff --git a/sensord/inputdevadaptor.h → core/inputdevadaptor.h b/sensord/inputdevadaptor.h → core/inputdevadaptor.h
@@ -28,12 +28,12 @@
 #ifndef INPUTDEVADAPTOR_H
 #define INPUTDEVADAPTOR_H
 
-#include "sensord/sysfsadaptor.h"
+#include "sysfsadaptor.h"
 #include <QString>
 #include <QStringList>
 #include <QFile>
 #include <linux/input.h>
-#include <sensord/filterproperty.h>
+#include "filterproperty.h"
 
 /**
  * @brief Base class for adaptors accessing device drivers through Linux Input

diff --git a/sensord/loader.cpp → core/loader.cpp b/sensord/loader.cpp → core/loader.cpp
diff --git a/sensord/loader.h → core/loader.h b/sensord/loader.h → core/loader.h
diff --git a/sensord/logging.cpp → core/logging.cpp b/sensord/logging.cpp → core/logging.cpp
diff --git a/sensord/logging.h → core/logging.h b/sensord/logging.h → core/logging.h
diff --git a/sensord/mcewatcher.cpp → core/mcewatcher.cpp b/sensord/mcewatcher.cpp → core/mcewatcher.cpp
diff --git a/sensord/mcewatcher.h → core/mcewatcher.h b/sensord/mcewatcher.h → core/mcewatcher.h
diff --git a/sensord/nodebase.cpp → core/nodebase.cpp b/sensord/nodebase.cpp → core/nodebase.cpp
diff --git a/sensord/nodebase.h → core/nodebase.h b/sensord/nodebase.h → core/nodebase.h
diff --git a/sensord/parameterparser.cpp → core/parameterparser.cpp b/sensord/parameterparser.cpp → core/parameterparser.cpp
diff --git a/sensord/parameterparser.h → core/parameterparser.h b/sensord/parameterparser.h → core/parameterparser.h
diff --git a/sensord/plugin.cpp → core/plugin.cpp b/sensord/plugin.cpp → core/plugin.cpp
diff --git a/sensord/plugin.h → core/plugin.h b/sensord/plugin.h → core/plugin.h
diff --git a/sensord/producer.cpp → core/producer.cpp b/sensord/producer.cpp → core/producer.cpp
diff --git a/sensord/producer.h → core/producer.h b/sensord/producer.h → core/producer.h
diff --git a/sensord/pusher.h → core/pusher.h b/sensord/pusher.h → core/pusher.h
diff --git a/sensord/ringbuffer.cpp → core/ringbuffer.cpp b/sensord/ringbuffer.cpp → core/ringbuffer.cpp
diff --git a/sensord/ringbuffer.h → core/ringbuffer.h b/sensord/ringbuffer.h → core/ringbuffer.h
diff --git a/sensord/sensormanager.cpp → core/sensormanager.cpp b/sensord/sensormanager.cpp → core/sensormanager.cpp
diff --git a/sensord/sensormanager.h → core/sensormanager.h b/sensord/sensormanager.h → core/sensormanager.h
diff --git a/sensord/sensormanager_a.cpp → core/sensormanager_a.cpp b/sensord/sensormanager_a.cpp → core/sensormanager_a.cpp
diff --git a/sensord/sensormanager_a.h → core/sensormanager_a.h b/sensord/sensormanager_a.h → core/sensormanager_a.h
diff --git a/sensord/sink.h → core/sink.h b/sensord/sink.h → core/sink.h
diff --git a/sensord/sockethandler.cpp → core/sockethandler.cpp b/sensord/sockethandler.cpp → core/sockethandler.cpp
diff --git a/sensord/sockethandler.h → core/sockethandler.h b/sensord/sockethandler.h → core/sockethandler.h
diff --git a/sensord/source.cpp → core/source.cpp b/sensord/source.cpp → core/source.cpp
diff --git a/sensord/source.h → core/source.h b/sensord/source.h → core/source.h
diff --git a/sensord/sysfsadaptor.cpp → core/sysfsadaptor.cpp b/sensord/sysfsadaptor.cpp → core/sysfsadaptor.cpp
@@ -31,7 +31,7 @@
 #include <fcntl.h>
 #include <sys/epoll.h>
 #include <QFile>
-#include "sensord/logging.h"
+#include "logging.h"
 
 SysfsAdaptor::SysfsAdaptor(const QString& id,
                            PollMode mode,

diff --git a/sensord/sysfsadaptor.h → core/sysfsadaptor.h b/sensord/sysfsadaptor.h → core/sysfsadaptor.h
@@ -27,12 +27,12 @@
 #ifndef SYSFSADAPTOR_H
 #define SYSFSADAPTOR_H
 
-#include "sensord/deviceadaptor.h"
-#include "sensord/deviceadaptorringbuffer.h"
+#include "deviceadaptor.h"
+#include "deviceadaptorringbuffer.h"
 #include <QString>
 #include <QStringList>
 #include <QThread>
-#include <sensord/filterproperty.h>
+#include "filterproperty.h"
 #include <QMutex>
 
 class SysfsAdaptor;

diff --git a/debian/sensord.install b/debian/sensord.install
@@ -1,6 +1,7 @@
 #/usr/lib/libfilters.so*
 /usr/lib/libsensorclient.so*
 /usr/lib/libsensordatatypes.so*
+/usr/lib/libsensorfw.so*
 /usr/lib/sensord/*so
 /usr/sbin/sensord
 /usr/share/contextkit/providers/*