sensor-hal: change the interface of set_attribute_*

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

diff --git a/src/accel/accel.cpp b/src/accel/accel.cpp
index ea8b84b..f01b7fe 100644 (file)
--- a/src/accel/accel.cpp
+++ b/src/accel/accel.cpp
@@ -157,12 +157,12 @@ bool accel_device::set_batch_latency(uint32_t id, unsigned long val)
        return false;
 }
 
-bool accel_device::set_attribute(uint32_t id, int32_t attribute, int32_t value)
+bool accel_device::set_attribute_int(uint32_t id, int32_t attribute, int32_t value)
 {
        return false;
 }
 
-bool accel_device::set_attribute_str(uint32_t id, char *attribute, char *value, int value_len)
+bool accel_device::set_attribute_str(uint32_t id, int32_t attribute, char *value, int value_len)
 {
        return false;
 }

diff --git a/src/accel/accel.h b/src/accel/accel.h
index 58cbbef..da27f02 100644 (file)
--- a/src/accel/accel.h
+++ b/src/accel/accel.h
@@ -35,8 +35,8 @@ public:
 
        bool set_interval(uint32_t id, unsigned long val);
        bool set_batch_latency(uint32_t id, unsigned long val);
-       bool set_attribute(uint32_t id, int32_t attribute, int32_t value);
-       bool set_attribute_str(uint32_t id, char *attribute, char *value, int value_len);
+       bool set_attribute_int(uint32_t id, int32_t attribute, int32_t value);
+       bool set_attribute_str(uint32_t id, int32_t attribute, char *value, int value_len);
 
        int read_fd(uint32_t **ids);
        int get_data(uint32_t id, sensor_data_t **data, int *length);

diff --git a/src/proxi/proxi.cpp b/src/proxi/proxi.cpp
index 06521ff..6ee63eb 100644 (file)
--- a/src/proxi/proxi.cpp
+++ b/src/proxi/proxi.cpp
@@ -134,12 +134,12 @@ bool proxi_device::set_batch_latency(uint32_t id, unsigned long val)
        return false;
 }
 
-bool proxi_device::set_attribute(uint32_t id, int32_t attribute, int32_t value)
+bool proxi_device::set_attribute_int(uint32_t id, int32_t attribute, int32_t value)
 {
        return false;
 }
 
-bool proxi_device::set_attribute_str(uint32_t id, char *attribute, char *value, int value_len)
+bool proxi_device::set_attribute_str(uint32_t id, int32_t attribute, char *value, int value_len)
 {
        return false;
 }

diff --git a/src/proxi/proxi.h b/src/proxi/proxi.h
index 001a6ff..49fcff0 100644 (file)
--- a/src/proxi/proxi.h
+++ b/src/proxi/proxi.h
@@ -36,8 +36,8 @@ public:
 
        bool set_interval(uint32_t id, unsigned long val);
        bool set_batch_latency(uint32_t id, unsigned long val);
-       bool set_attribute(uint32_t id, int32_t attribute, int32_t value);
-       bool set_attribute_str(uint32_t id, char *attribute, char *value, int value_len);
+       bool set_attribute_int(uint32_t id, int32_t attribute, int32_t value);
+       bool set_attribute_str(uint32_t id, int32_t attribute, char *value, int value_len);
 
        int read_fd(uint32_t **ids);
        int get_data(uint32_t id, sensor_data_t **data, int *length);

diff --git a/src/sensor_hal.h b/src/sensor_hal.h
index 2b10c3e..ded1a90 100644 (file)
--- a/src/sensor_hal.h
+++ b/src/sensor_hal.h
@@ -177,8 +177,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;

diff --git a/src/sensorhub/sensorhub.cpp b/src/sensorhub/sensorhub.cpp
index 14c0fbe..4e2faeb 100644 (file)
--- a/src/sensorhub/sensorhub.cpp
+++ b/src/sensorhub/sensorhub.cpp
@@ -114,7 +114,7 @@ bool sensorhub_device::set_batch_latency(uint32_t id, unsigned long val)
        return sensor->set_batch_latency(val);
 }
 
-bool sensorhub_device::set_attribute(uint32_t id, int32_t attribute, int32_t value)
+bool sensorhub_device::set_attribute_int(uint32_t id, int32_t attribute, int32_t value)
 {
        int ret;
 
@@ -125,7 +125,7 @@ bool sensorhub_device::set_attribute(uint32_t id, int32_t attribute, int32_t val
                return false;
        }
 
-       ret = sensor->set_attribute(attribute, value);
+       ret = sensor->set_attribute_int(attribute, value);
 
        if ((ret < 0) && (ret != -EBUSY)) {
                ERR("Failed to send sensorhub data");
@@ -140,7 +140,7 @@ bool sensorhub_device::set_attribute(uint32_t id, int32_t attribute, int32_t val
        return true;
 }
 
-bool sensorhub_device::set_attribute_str(uint32_t id, char *attribute, char *value, int value_len)
+bool sensorhub_device::set_attribute_str(uint32_t id, int32_t attribute, char *value, int value_len)
 {
        int ret;
 

diff --git a/src/sensorhub/sensorhub.h b/src/sensorhub/sensorhub.h
index 4748bbc..dc59974 100644 (file)
--- a/src/sensorhub/sensorhub.h
+++ b/src/sensorhub/sensorhub.h
@@ -37,8 +37,8 @@ public:
 
        bool set_interval(uint32_t id, unsigned long val);
        bool set_batch_latency(uint32_t id, unsigned long val);
-       bool set_attribute(uint32_t id, int32_t attribute, int32_t value);
-       bool set_attribute_str(uint32_t id, char *key, char *value, int value_len);
+       bool set_attribute_int(uint32_t id, int32_t attribute, int32_t value);
+       bool set_attribute_str(uint32_t id, int32_t attribute, char *value, int value_len);
 
        int read_fd(uint32_t **ids);
        int get_data(uint32_t id, sensor_data_t **data, int *length);

diff --git a/src/sensorhub/sensorhub_sensor.cpp b/src/sensorhub/sensorhub_sensor.cpp
index b1b9963..56656b5 100644 (file)
--- a/src/sensorhub/sensorhub_sensor.cpp
+++ b/src/sensorhub/sensorhub_sensor.cpp
@@ -35,12 +35,12 @@ bool sensorhub_sensor::set_batch_latency(unsigned long val)
        return false;
 }
 
-bool sensorhub_sensor::set_attribute(int32_t attribute, int32_t value)
+bool sensorhub_sensor::set_attribute_int(int32_t attribute, int32_t value)
 {
        return false;
 }
 
-bool sensorhub_sensor::set_attribute_str(char *attribute, char *value, int value_len)
+bool sensorhub_sensor::set_attribute_str(int32_t attribute, char *value, int value_len)
 {
        return false;
 }

diff --git a/src/sensorhub/sensorhub_sensor.h b/src/sensorhub/sensorhub_sensor.h
index c3c7918..aa500b5 100644 (file)
--- a/src/sensorhub/sensorhub_sensor.h
+++ b/src/sensorhub/sensorhub_sensor.h
@@ -34,8 +34,8 @@ public:
 
        virtual bool set_interval(unsigned long val);
        virtual bool set_batch_latency(unsigned long val);
-       virtual bool set_attribute(int32_t attribute, int32_t value);
-       virtual bool set_attribute_str(char *key, char *value, int value_len);
+       virtual bool set_attribute_int(int32_t attribute, int32_t value);
+       virtual bool set_attribute_str(int32_t key, char *value, int value_len);
 
        virtual bool flush(void);
 protected:

diff --git a/src/sensorhub/wristup.cpp b/src/sensorhub/wristup.cpp
index f673471..4a8e5aa 100644 (file)
--- a/src/sensorhub/wristup.cpp
+++ b/src/sensorhub/wristup.cpp
@@ -76,12 +76,12 @@ int wristup_sensor::get_data(sensor_data_t **data, int *length)
        return -1;
 }
 
-bool wristup_sensor::set_attribute(int32_t attribute, int32_t value)
+bool wristup_sensor::set_attribute_int(int32_t attribute, int32_t value)
 {
        return false;
 }
 
-bool wristup_sensor::set_attribute_str(char *key, char *value, int value_len)
+bool wristup_sensor::set_attribute_str(int32_t attribute, char *value, int value_len)
 {
        return false;
 }

diff --git a/src/sensorhub/wristup.h b/src/sensorhub/wristup.h
index 4d1036f..42dbdc5 100644 (file)
--- a/src/sensorhub/wristup.h
+++ b/src/sensorhub/wristup.h
@@ -33,8 +33,8 @@ public:
        int parse(const char *data, int data_len);
        int get_data(sensor_data_t **data, int *length);
 
-       bool set_attribute(int32_t attribute, int32_t value);
-       bool set_attribute_str(char *attribute, char *value, int value_len);
+       bool set_attribute_int(int32_t attribute, int32_t value);
+       bool set_attribute_str(int32_t attribute, char *value, int value_len);
 
 private:
        sensorhub_data_t m_data;