From: Jinhyung Choi Date: Wed, 13 Nov 2013 06:43:39 +0000 (+0900) Subject: sync: updated the lastest code. see under description X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c95f746400ca52cb63a7923f1b7d77c6dfd7f476;p=platform%2Fadaptation%2Femulator%2Femulator-plugin-accel-filter.git sync: updated the lastest code. see under description - jinhyung choi is added into AUTHORS - -Werror option is added into CMakeLists.txt - changed path of accel name and xyz node - removed warnings - fixed build error Change-Id: If7e9ef41582b825d5bcec0a0875d965754ff742d Signed-off-by: Jinhyung Choi --- diff --git a/AUTHORS b/AUTHORS index 1722483..4d332cc 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,5 +1,6 @@ YeongKyoon Lee DaiYoung Kim +Jinhyung Choi SeokYeon Hwang SangJin Kim KiTae Kim diff --git a/CMakeLists.txt b/CMakeLists.txt index ccaa3cc..38bcb75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,7 +31,7 @@ ADD_DEFINITIONS("-DTARGET") #add_definitions(-D_ESTIMATE_PERFORMANCE) #add_definitions(-D_DEFAULT_FONT_NAME="Vera") -add_definitions(-Wall -O3 -omit-frame-pointer) +add_definitions(-Werror -Wall -O3 -omit-frame-pointer) #add_definitions(-Wall -g -D_DEBUG) add_definitions(-Iinclude) diff --git a/include/accel_sim_filter.h b/include/accel_sim_filter.h index ac54798..f1a358c 100644 --- a/include/accel_sim_filter.h +++ b/include/accel_sim_filter.h @@ -1,10 +1,11 @@ /* * emulator-plugin-accel-filter * - * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved. * * Contact: - * SooYoung Ha + * Jinhyung Choi + * SooYoung Ha * Sungmin Ha * * This library is free software; you can redistribute it and/or modify it under diff --git a/packaging/sf-plugin-filter-accel-emul.spec b/packaging/sf-plugin-filter-accel-emul.spec index 0bb389e..386e30c 100644 --- a/packaging/sf-plugin-filter-accel-emul.spec +++ b/packaging/sf-plugin-filter-accel-emul.spec @@ -1,16 +1,16 @@ -#git:/slp/pkgs/e/emulator-plugin-accel-filter Name: sf-plugin-filter-accel-emul -Version: 0.2.11 +Version: 0.3.0 Release: 1 -Summary: Accel simulator filter plugin for sensor framework -Group: System Environment/Libraries -License: GNU2 +Summary: Accel filter plugin for sensor framework +Group: System/Sensor Framework +License: LGPL-2.1 Source0: %{name}-%{version}.tar.gz Source1001: packaging/sf-plugin-filter-accel-emul.manifest BuildRequires: cmake BuildRequires: pkgconfig(sf_common) %description +Accelerometer filter emulator plugin library for sensor framework %prep %setup -q @@ -24,6 +24,10 @@ make %install rm -rf %{buildroot} + +mkdir -p %{buildroot}/usr/share/license +cp LICENSE.LGPLv2.1 %{buildroot}/usr/share/license/%{name} + %make_install %clean @@ -42,5 +46,6 @@ rm -rf *.so %files %defattr(-,root,root,-) %{_prefix}/lib/sensor_framework/*.so* +/usr/share/license/%{name} %changelog diff --git a/src/accel_sim_filter.cpp b/src/accel_sim_filter.cpp index c61f146..69c0419 100644 --- a/src/accel_sim_filter.cpp +++ b/src/accel_sim_filter.cpp @@ -1,10 +1,11 @@ /* * emulator-plugin-accel-filter * - * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved. * * Contact: - * SooYoung Ha + * Jinhyung Choi + * SooYoung Ha * Sungmin Ha * DongKyun Yun * @@ -55,6 +56,8 @@ #include #include +#define SENSOR_NAME_NODE "/sys/devices/virtual/sensor/accel/name" + accel_sim_filter::accel_sim_filter() : m_sensor(NULL) , m_id(11) @@ -371,7 +374,7 @@ int accel_sim_filter::check_hw_node(void) for(i=0;i<10;i++) { find_node = 0; - snprintf(name_node,sizeof(name_node),"/opt/sensor/accel/name"); + snprintf(name_node,sizeof(name_node), SENSOR_NAME_NODE); fp = fopen(name_node, "r"); if (!fp) {