sensord: add internal API to get URI of sensor

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

diff --git a/include/sensor_internal.h b/include/sensor_internal.h
index 991194967c2795fe996169a38525fabc5484c47f..49609b600a21fe2bcdcc0b8471213805f117482f 100644 (file)
--- a/include/sensor_internal.h
+++ b/include/sensor_internal.h
@@ -94,6 +94,14 @@ int sensord_get_default_sensor(sensor_type_t type, sensor_t *sensor);
  */
 bool sensord_get_type(sensor_t sensor, sensor_type_t *type);
 
+/**
+ * @brief Get the URI string of this sensor.
+ *
+ * @param[in] sensor a sensor to get uri.
+ * @return the name string of this sensor on success, otherwise NULL.
+ */
+const char* sensord_get_uri(sensor_t sensor);
+
 /**
  * @brief Get the name string of this sensor.
  *

diff --git a/src/client-dummy/client_dummy.cpp b/src/client-dummy/client_dummy.cpp
index ee2de11095ad788203a24c05ed51be90b8eb4df3..63ae2ead54417eca4abb0acd3192413b2982e6ca 100644 (file)
--- a/src/client-dummy/client_dummy.cpp
+++ b/src/client-dummy/client_dummy.cpp
@@ -48,6 +48,11 @@ API bool sensord_get_type(sensor_t sensor, sensor_type_t *type)
        return false;
 }
 
+API const char* sensord_get_uri(sensor_t sensor)
+{
+       return NULL;
+}
+
 API const char* sensord_get_name(sensor_t sensor)
 {
        return NULL;

diff --git a/src/client/sensor_internal.cpp b/src/client/sensor_internal.cpp
index da21e1cb23096a51cf138baa69a725dd896f03d9..1a5b0b72398c0a411fbffe9660d1de7f75734db1 100644 (file)
--- a/src/client/sensor_internal.cpp
+++ b/src/client/sensor_internal.cpp
@@ -123,7 +123,7 @@ API bool sensord_get_type(sensor_t sensor, sensor_type_t *type)
        return true;
 }
 
-API const char* sensord_get_name(sensor_t sensor)
+API const char* sensord_get_uri(sensor_t sensor)
 {
        retvm_if(!manager.connect(), NULL, "Failed to connect");
        retvm_if(!manager.is_supported(sensor), NULL,
@@ -132,6 +132,15 @@ API const char* sensord_get_name(sensor_t sensor)
        return static_cast<sensor_info *>(sensor)->get_uri().c_str();
 }
 
+API const char* sensord_get_name(sensor_t sensor)
+{
+       retvm_if(!manager.connect(), NULL, "Failed to connect");
+       retvm_if(!manager.is_supported(sensor), NULL,
+                       "Invalid sensor[%#x]", sensor);
+
+       return static_cast<sensor_info *>(sensor)->get_model().c_str();
+}
+
 API const char* sensord_get_vendor(sensor_t sensor)
 {
        retvm_if(!manager.connect(), NULL, "Failed to connect");