summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkibak.yoon <kibak.yoon@samsung.com>2016-12-13 18:39:07 +0900
committerkibak.yoon <kibak.yoon@samsung.com>2017-03-08 15:42:19 +0900
commitd984fa14ec2e2d4b590f0939a7d36b522cd88007 (patch)
treed60db7ea03ccccd5c6064c01efbf3c8d5c423b0e
parent6d4080e3537e72dbe0565a6d635ed1871868a985 (diff)
downloadsensor-hal-emulator-d984fa14ec2e2d4b590f0939a7d36b522cd88007.tar.gz
sensor-hal-emulator-d984fa14ec2e2d4b590f0939a7d36b522cd88007.tar.bz2
sensor-hal-emulator-d984fa14ec2e2d4b590f0939a7d36b522cd88007.zip
Change-Id: I7fc17769f3ee7ef259115f48868400621c3811c8 Signed-off-by: kibak.yoon <kibak.yoon@samsung.com>
-rw-r--r--CMakeLists.txt3
-rw-r--r--packaging/99-sensorhub.rules9
-rw-r--r--packaging/sensor-hal-emulator.spec13
-rw-r--r--src/sensorhub/CMakeLists.txt8
-rwxr-xr-xsrc/sensorhub/libsensorhub-hal.i586.sobin0 -> 109764 bytes
-rwxr-xr-xsrc/sensorhub/libsensorhub-hal.x86_64.sobin0 -> 112240 bytes
6 files changed, 31 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 81fdd9a..67ac67d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ SET(TEMP_HUMIDITY "OFF")
SET(ULTRAVIOLET "ON")
SET(DUST "OFF")
SET(GSR "OFF")
-SET(SENSORHUB "OFF")
+SET(SENSORHUB "ON")
# Common Options
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O2 -omit-frame-pointer -std=gnu++0x")
@@ -148,6 +148,7 @@ ENDIF()
IF("${SENSORHUB}" STREQUAL "ON")
FILE(GLOB_RECURSE SRCS ${SRCS} src/sensorhub/*.cpp)
ADD_DEFINITIONS(-DENABLE_SENSORHUB)
+ADD_SUBDIRECTORY(src/sensorhub)
ENDIF()
MESSAGE("Sources: ${SRCS}")
diff --git a/packaging/99-sensorhub.rules b/packaging/99-sensorhub.rules
new file mode 100644
index 0000000..0a6d476
--- /dev/null
+++ b/packaging/99-sensorhub.rules
@@ -0,0 +1,9 @@
+SUBSYSTEMS=="sensors", DEVPATH=="*ssp_sensor*", \
+RUN+="/bin/sh -c '/bin/chown :input %S/%p/enable %S/%p/set_cal_data %S/%p/*_poll_delay'"
+
+SUBSYSTEMS=="sensors", DEVPATH=="*ssp_sensor*", \
+RUN+="/bin/sh -c '/bin/chsmack -a \* %S/%p/enable %S/%p/set_cal_data %S/%p/*_poll_delay'"
+
+DEVPATH=="/devices/virtual/ssp_sensorhub/ssp_sensorhub", \
+ENV{DEVNAME}=="/dev/ssp_sensorhub", GROUP="input", SECLABEL{smack}="*"
+
diff --git a/packaging/sensor-hal-emulator.spec b/packaging/sensor-hal-emulator.spec
index 53cb2a6..3651ce0 100644
--- a/packaging/sensor-hal-emulator.spec
+++ b/packaging/sensor-hal-emulator.spec
@@ -6,6 +6,7 @@ Group: Service/Sensor
License: Apache-2.0
Source0: %{name}-%{version}.tar.gz
Source1: 99-sensor.rules
+Source2: 99-sensorhub.rules
ExcludeArch: %{arm} aarch64
@@ -13,6 +14,14 @@ BuildRequires: cmake
BuildRequires: pkgconfig(dlog)
BuildRequires: sensor-hal-devel
+%ifarch %ix86
+%define _arch x86
+%endif
+
+%ifarch %ix86_64
+%define _arch x86_64
+%endif
+
%description
Emulator Sensor HAL
@@ -24,7 +33,7 @@ export CXXFLAGS+=" -Wextra -Wcast-align -Wcast-qual -Wshadow -Wwrite-strings -Ws
export CXXFLAGS+=" -Wnon-virtual-dtor -Wno-c++0x-compat -Wno-unused-parameter -Wno-empty-body"
export CXXFLAGS+=" -fno-omit-frame-pointer -fno-optimize-sibling-calls -fno-strict-aliasing"
export CXXFLAGS+=" -fno-unroll-loops -fsigned-char -fstrict-overflow"
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DBUILD_ARCH=%{_arch}
make %{?jobs:-j%jobs}
%install
@@ -34,6 +43,7 @@ rm -rf %{buildroot}
mkdir -p %{buildroot}/usr/lib/udev/rules.d
install -m 0644 %SOURCE1 %{buildroot}/usr/lib/udev/rules.d
+install -m 0644 %SOURCE2 %{buildroot}/usr/lib/udev/rules.d
%post
/sbin/ldconfig
@@ -44,5 +54,6 @@ install -m 0644 %SOURCE1 %{buildroot}/usr/lib/udev/rules.d
%files
%manifest packaging/%{name}.manifest
/usr/lib/udev/rules.d/99-sensor.rules
+/usr/lib/udev/rules.d/99-sensorhub.rules
%{_libdir}/sensor/*.so
%{_datadir}/license/sensor-hal-emulator
diff --git a/src/sensorhub/CMakeLists.txt b/src/sensorhub/CMakeLists.txt
new file mode 100644
index 0000000..01c0254
--- /dev/null
+++ b/src/sensorhub/CMakeLists.txt
@@ -0,0 +1,8 @@
+IF("${BUILD_ARCH}" STREQUAL "x86")
+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libsensorhub-hal.i586.so DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensor)
+ENDIF()
+
+IF("${BUILD_ARCH}" STREQUAL "x86_64")
+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libsensorhub-hal.x86_64.so DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensor)
+ENDIF()
+
diff --git a/src/sensorhub/libsensorhub-hal.i586.so b/src/sensorhub/libsensorhub-hal.i586.so
new file mode 100755
index 0000000..d053f64
--- /dev/null
+++ b/src/sensorhub/libsensorhub-hal.i586.so
Binary files differ
diff --git a/src/sensorhub/libsensorhub-hal.x86_64.so b/src/sensorhub/libsensorhub-hal.x86_64.so
new file mode 100755
index 0000000..b3dac4e
--- /dev/null
+++ b/src/sensorhub/libsensorhub-hal.x86_64.so
Binary files differ