sensord: change the interface of set_attribute_*

Change-Id: I60871bfa07a0acd87f231b425259e7c842958410
Signed-off-by: kibak.yoon <kibak.yoon@samsung.com>

diff --git a/src/server/command_worker.cpp b/src/server/command_worker.cpp
index 2b8c1dbc42db406ecc1c92ad47d57261974f87bb..3a0faeeba47172641e2fad065363f877eea43b2d 100644 (file)
--- a/src/server/command_worker.cpp
+++ b/src/server/command_worker.cpp
@@ -833,7 +833,7 @@ bool command_worker::cmd_send_sensorhub_data(void *payload)
                goto out;
        }
 
-       ret_value = m_module->set_attribute(cmd->data, cmd->data, cmd->data_len);
+       ret_value = m_module->set_attribute(0, cmd->data, cmd->data_len);
 
 out:
        if (!send_cmd_done(ret_value))

diff --git a/src/server/physical_sensor.cpp b/src/server/physical_sensor.cpp
index 7de0f64fe5fc6bd525943b9018764a73fae96851..6410dd24a2253b9136a5ef455ba80b80fe4b47dd 100644 (file)
--- a/src/server/physical_sensor.cpp
+++ b/src/server/physical_sensor.cpp
@@ -163,10 +163,10 @@ int physical_sensor::set_attribute(int32_t attribute, int32_t value)
        if (!m_sensor_device)
                return false;
 
-       return m_sensor_device->set_attribute(m_handle.id, attribute, value);
+       return m_sensor_device->set_attribute_int(m_handle.id, attribute, value);
 }
 
-int physical_sensor::set_attribute(char *attribute, char *value, int value_len)
+int physical_sensor::set_attribute(int32_t attribute, char *value, int value_len)
 {
        AUTOLOCK(m_mutex);
 

diff --git a/src/server/physical_sensor.h b/src/server/physical_sensor.h
index cc2305f392f7176ab8a2f5af02ee1ff3bb35d00b..c59ce896e08ce75af122c3e8b0eca37e63eedafa 100644 (file)
--- a/src/server/physical_sensor.h
+++ b/src/server/physical_sensor.h
@@ -54,7 +54,7 @@ private:
        virtual bool set_interval(unsigned long interval);
        virtual bool set_batch_latency(unsigned long latency);
        virtual int set_attribute(int32_t attribute, int32_t value);
-       virtual int set_attribute(char *attribute, char *value, int value_len);
+       virtual int set_attribute(int32_t attribute, char *value, int value_len);
        virtual bool set_wakeup(int wakeup);
        virtual bool on_start(void);
        virtual bool on_stop(void);

diff --git a/src/server/sensor_base.cpp b/src/server/sensor_base.cpp
index e097358563ad2d3b03ec3f1f3847a12a5f531b04..cee362f46f1b5743fe5ddd701de5ca8086d996cf 100644 (file)
--- a/src/server/sensor_base.cpp
+++ b/src/server/sensor_base.cpp
@@ -93,7 +93,7 @@ int sensor_base::set_attribute(int32_t cmd, int32_t value)
        return -1;
 }
 
-int sensor_base::set_attribute(char *attribute, char *value, int value_size)
+int sensor_base::set_attribute(int32_t attribute, char *value, int value_size)
 {
        return -1;
 }

diff --git a/src/server/sensor_base.h b/src/server/sensor_base.h
index 816dc40c8bd4747e97ae8046c1859cd18817ffd3..fcf57512122faa8bbbc53c9ee23ac63ac63e00ff 100644 (file)
--- a/src/server/sensor_base.h
+++ b/src/server/sensor_base.h
@@ -53,7 +53,7 @@ public:
 
        virtual bool flush(void);
        virtual int set_attribute(int32_t attribute, int32_t value);
-       virtual int set_attribute(char *attribute, char *value, int value_size);
+       virtual int set_attribute(int32_t attribute, char *value, int value_size);
 
        /* start/stop */
        bool start(void);

diff --git a/src/shared/sensor_hal.h b/src/shared/sensor_hal.h
index 01028682d46c245d6e5f162682725a75e92db24d..1882d39d5a00b7cfa2aeac8b351faba96a28b96b 100644 (file)
--- a/src/shared/sensor_hal.h
+++ b/src/shared/sensor_hal.h
@@ -179,8 +179,8 @@ public:
 
        virtual bool set_interval(uint32_t id, unsigned long val) = 0;
        virtual bool set_batch_latency(uint32_t id, unsigned long val) = 0;
-       virtual bool set_attribute(uint32_t id, int32_t attribute, int32_t value) = 0;
-       virtual bool set_attribute_str(uint32_t id, char *attribute, char *value, int value_len) = 0;
+       virtual bool set_attribute_int(uint32_t id, int32_t attribute, int32_t value) = 0;
+       virtual bool set_attribute_str(uint32_t id, int32_t attribute, char *value, int value_len) = 0;
 
        virtual int read_fd(uint32_t **ids) = 0;
        virtual int get_data(uint32_t id, sensor_data_t **data, int *length) = 0;