From 5c7d2f6e73ce0571baf9a44f73fa463d1f84286f Mon Sep 17 00:00:00 2001 From: "kibak.yoon" Date: Fri, 12 Feb 2016 15:46:04 +0900 Subject: [PATCH] sensord: change the interface of set_attribute_* Change-Id: I60871bfa07a0acd87f231b425259e7c842958410 Signed-off-by: kibak.yoon --- src/server/command_worker.cpp | 2 +- src/server/physical_sensor.cpp | 4 ++-- src/server/physical_sensor.h | 2 +- src/server/sensor_base.cpp | 2 +- src/server/sensor_base.h | 2 +- src/shared/sensor_hal.h | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/server/command_worker.cpp b/src/server/command_worker.cpp index 2b8c1db..3a0faee 100644 --- 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 7de0f64..6410dd2 100644 --- 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 cc2305f..c59ce89 100644 --- 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 e097358..cee362f 100644 --- 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 816dc40..fcf5751 100644 --- 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 0102868..1882d39 100644 --- 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; -- 2.7.4