upload tizen1.0 source

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e59ad71..3c35ab1 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ add_definitions(${rpkgs_CFLAGS})
 
 #add_definitions(-Wall -O3 -omit-frame-pointer -lm) 
 #add_definitions(-Wall -g -lma -DUSE_FILE_DEBUG)
-add_definitions(-Wall -g -lma -D_DEBUG)
+#add_definitions(-Wall -g -lma -D_DEBUG)
 #add_definitions(-fvisibility=hidden -lm -DUSE_DLOG_LOG)
 #add_definitions(-fvisibility=hidden -lm)
 

diff --git a/debian/changelog b/debian/changelog
index 4583faa..0bac025 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libslp-sensor (0.5.6-42) unstable; urgency=low
+
+  * version sync
+  * Git:165.213.180.234:public/pkgs/l/libslp-sensor
+  * Tag:libslp-sensor_0.5.6-42
+
+ -- JuHyun Kim <jh8212.kim@samsung.com>  Fri, 30 Mar 2012 09:52:15 +0900
+
 libslp-sensor (0.5.6-41) unstable; urgency=low
 
   * version sync

diff --git a/debian/control b/debian/control
index aebabc1..fc85411 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: libslp-sensor
 Section: libs
 Priority: extra
-Maintainer: Jonghoon Han <jonghoon.han@samsung.com>, Juhyun Kim <jh8212.kim@samsung.com>, Taesoo Jun <steve.jun@samsung.com> 
+Maintainer: Juhyun Kim <jh8212.kim@samsung.com>, Taesoo Jun <steve.jun@samsung.com> 
 Build-Depends: debhelper (>= 5), autotools-dev, libsf-common-dev, libslp-setting-dev, libglib2.0-dev
 Standards-Version: 0.1.0
 Homepage: N/A

diff --git a/include/sensor_geomag.h b/include/sensor_geomag.h
index b96e026..c936d4c 100755 (executable)
--- a/include/sensor_geomag.h
+++ b/include/sensor_geomag.h
@@ -53,14 +53,15 @@ extern "C"
 
 enum geomag_data_id {
        GEOMAGNETIC_BASE_DATA_SET       = (GEOMAGNETIC_SENSOR<<16) | 0x0001,
-       GEOMAGNETIC_RAW_DATA_SET        = (GEOMAGNETIC_SENSOR<<16) | 0x0002,
+       GEOMAGNETIC_RAW_DATA_SET        = (GEOMAGNETIC_SENSOR<<16) | 0x0001,
+       GEOMAGNETIC_ATITUDE_DATA_SET    = (GEOMAGNETIC_SENSOR<<16) | 0x0002,
 };
 
 
 enum geomag_evet_type {                        
        GEOMAGNETIC_EVENT_CALIBRATION_NEEDED                    = (GEOMAGNETIC_SENSOR<<16) |0x0001,
-       GEOMAGNETIC_EVENT_ATTITUDE_DATA_REPORT_ON_TIME          = (GEOMAGNETIC_SENSOR<<16) |0x0002,
-       GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME               = (GEOMAGNETIC_SENSOR<<16) |0x0004,
+       GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME       = (GEOMAGNETIC_SENSOR<<16) |0x0002,
+       GEOMAGNETIC_EVENT_ATTITUDE_DATA_REPORT_ON_TIME          = (GEOMAGNETIC_SENSOR<<16) |0x0004,
 };
 
 enum geomag_property_id {

diff --git a/packaging/libslp-sensor.spec b/packaging/sensor.spec
similarity index 78%
rename from packaging/libslp-sensor.spec
rename to packaging/sensor.spec
index 60f9fa1..e7a8100 100644 (file)
--- a/packaging/libslp-sensor.spec
+++ b/packaging/sensor.spec
@@ -1,15 +1,15 @@
 
-Name:       libslp-sensor
+Name:       sensor
 Summary:    Sensor framework client library
 Version:    0.5.6
 Release:    1
-Group:      System/Libraries
-License:    Apache-2.0
-Source0:    libslp-sensor-%{version}.tar.gz
+Group:      TO_BE/FILLED_IN
+License:    TO BE FILLED IN
+Source0:    sensor-%{version}.tar.gz
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 BuildRequires:  cmake
-BuildRequires:  vconf-keys-devel
+BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(sf_common)
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(glib-2.0)
@@ -40,24 +40,23 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
 make %{?jobs:-j%jobs}
 
 %install
+rm -rf %{buildroot}
 %make_install
 
 
-
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 
-
-
-
 %files
+%defattr(-,root,root,-)
+#%doc COPYING
 %{_libdir}/libsensor.so.*
 
 
 %files devel
+%defattr(-,root,root,-)
 %{_includedir}/sensor/*.h
 %{_libdir}/libsensor.so
 %{_libdir}/pkgconfig/sensor.pc

diff --git a/src/client.cpp b/src/client.cpp
index fb1d825..caeab15 100755 (executable)
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -859,7 +859,8 @@ EXTAPI int sf_disconnect(int handle)
 {
        cpacket packet(sizeof(cmd_byebye_t)+4);
        cmd_byebye_t *payload;
-               
+
+       retvm_if( handle > MAX_BIND_SLOT , -1 , "Incorrect handle");
        retvm_if( (g_bind_table[handle].ipc == NULL) ||(handle < 0) , -1 , "sensor_detach_channel fail , invalid handle value : %d",handle);
 
        INFO("Detach, so remove %d from the table\n", handle);
@@ -906,6 +907,7 @@ EXTAPI int sf_start(int handle , int option)
        cpacket packet(sizeof(cmd_start_t)+4);
        cmd_start_t *payload;
 
+       retvm_if( handle > MAX_BIND_SLOT , -1 , "Incorrect handle");
        retvm_if( (g_bind_table[handle].ipc == NULL) ||(handle < 0) , -1 , "sensor_start fail , invalid handle value : %d",handle);
        retvm_if( option != 0 , -1 , "sensor_start fail , invalid option value : %d",option);
 
@@ -973,6 +975,7 @@ EXTAPI int sf_stop(int handle)
        cpacket packet(sizeof(cmd_stop_t)+4);
        cmd_stop_t *payload;
 
+       retvm_if( handle > MAX_BIND_SLOT , -1 , "Incorrect handle");
        retvm_if( (g_bind_table[handle].ipc == NULL) ||(handle < 0) , -1 , "sensor_stop fail , invalid handle value : %d",handle);
 
 
@@ -1011,6 +1014,7 @@ EXTAPI int sf_register_event(int handle , unsigned int event_type ,  event_condi
 
        int collect_data_flag = 0;
 
+       retvm_if( handle > MAX_BIND_SLOT , -1 , "Incorrect handle");
        retvm_if( (g_bind_table[handle].ipc == NULL) ||(handle < 0) , -1 , "sensor_register_cb fail , invalid handle value : %d",handle);
 
        payload = (cmd_reg_t*)packet.data();
@@ -1118,7 +1122,7 @@ EXTAPI int sf_register_event(int handle , unsigned int event_type ,  event_condi
        switch (event_type ) {
                        case ACCELEROMETER_EVENT_RAW_DATA_REPORT_ON_TIME:
                                /* fall through */
-                       case GEOMAGNETIC_EVENT_ATTITUDE_DATA_REPORT_ON_TIME:
+                       case GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME:
                                /* fall through */
                        case PROXIMITY_EVENT_STATE_REPORT_ON_TIME:
                                /* fall through */
@@ -1130,7 +1134,7 @@ EXTAPI int sf_register_event(int handle , unsigned int event_type ,  event_condi
                                break;
                        case LIGHT_EVENT_LUX_DATA_REPORT_ON_TIME:
                                /* fall through */
-                       case GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME:
+                       case GEOMAGNETIC_EVENT_ATTITUDE_DATA_REPORT_ON_TIME:
                                /* fall through */
                        case ACCELEROMETER_EVENT_ORIENTATION_DATA_REPORT_ON_TIME:
                                /* fall through */
@@ -1207,6 +1211,7 @@ EXTAPI int sf_unregister_event(int handle, unsigned int event_type)
 
        int collect_data_flag = 0;
 
+       retvm_if( handle > MAX_BIND_SLOT , -1 , "Incorrect handle");
        retvm_if( (g_bind_table[handle].ipc == NULL) ||(handle < 0) , -1 , "sensor_unregister_cb fail , invalid handle value : %d",handle);
 
        payload = (cmd_reg_t*)packet.data();
@@ -1322,6 +1327,7 @@ EXTAPI int sf_get_data(int handle , unsigned int data_id ,  sensor_data_t* value
        
        retvm_if( (!values) , -1 , "sf_get_data fail , invalid get_values pointer %p", values);
        retvm_if( ( (data_id & 0xFFFF) < 1) || ( (data_id & 0xFFFF) > 0xFFF), -1 , "sf_get_data fail , invalid data_id %d", data_id);
+       retvm_if( handle > MAX_BIND_SLOT , -1 , "Incorrect handle");
        retvm_if( (g_bind_table[handle].ipc == NULL) ||(handle < 0) , -1 , "sf_get_data fail , invalid handle value : %d",handle);
  
        if(g_bind_table[handle].sensor_state != SENSOR_STATE_STARTED)