Rename utility functions of sensor

Change-Id: I54eb9172bc119a0fbcc103cf7096bd82f0cf0e64
Signed-off-by: Abhay Agarwal <ay.agarwal@samsung.com>

diff --git a/include/user-awareness-private.h b/include/user-awareness-private.h
index 0cff4689a77da5d67e8a05b6a759247a4b96bdc0..966d847645ead6243e98ce5441a1eca3b046717d 100755 (executable)
--- a/include/user-awareness-private.h
+++ b/include/user-awareness-private.h
@@ -239,7 +239,7 @@ typedef struct {
        ua_sensor_h handle; /**< Sensor handle */
        ua_sensor_e bitmask; /**< Sensor bitmask */
        unsigned long long timestamp; /**< Timestamp */
-       int accuracy; /**< Accuracty from sensor device */
+       int accuracy; /**< Accuracy from sensor device */
        int count; /**< How many sensor data included */
        double *values; /**< Sensor data */
 } ua_sensor_info_s;

diff --git a/include/user-awareness-util.h b/include/user-awareness-util.h
index effe1d0da09d98d96186530dd69d3fc14819a5d6..79281cd4cbab4a0c898fcc326e2c3e7337b6c726 100755 (executable)
--- a/include/user-awareness-util.h
+++ b/include/user-awareness-util.h
@@ -237,7 +237,7 @@ ua_sensor_info_s* _uam_to_ua_sensor_info(uam_sensor_info_s *info);
  * @post
  *
  */
-int ua_sensor_get_by_sensor_info(
+int _ua_sensor_get_by_sensor_info(
                ua_sensor_info_s *sensor_info,
                ua_sensor_h * sensor_handle);
 
@@ -262,7 +262,7 @@ int ua_sensor_get_by_sensor_info(
  * @post
  *
  */
-GSList *ua_sensor_get_sensor_handle_list(
+GSList *_ua_sensor_get_sensor_handle_list(
                unsigned int sensor_bitmask);
 
 /**

diff --git a/include/user-awareness.h b/include/user-awareness.h
index 30654a29cf99cb7845b40f8db1aeeb20641805a4..fee1e7bdb42910126d651156a141607dfab77dd8 100755 (executable)
--- a/include/user-awareness.h
+++ b/include/user-awareness.h
@@ -2174,11 +2174,11 @@ int ua_sensor_get_timestamp(
 
 /**
  * @ingroup CAPI_NETWORK_UA_MODULE
- * @brief Gets sensor's bitmask.
+ * @brief Gets sensor's type.
  * @since_tizen 6.5
  *
  * @param[in] sensor_handle The sensor handle
- * @param[out] bitmask The sensor's bitmask.
+ * @param[out] type The sensor's type.
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
@@ -2191,51 +2191,7 @@ int ua_sensor_get_timestamp(
  */
 int ua_sensor_get_type(
                ua_sensor_h sensor_handle,
-               ua_sensor_e *bitmask);
-
-/**
- * @ingroup CAPI_NETWORK_UA_MODULE
- * @brief Gets sensor's information values count.
- * @since_tizen 6.5
- *
- * @param[in] sensor_handle The sensor handle
- * @param[out] info_count The sensor's information count.
- *
- * @return 0 on success, otherwise a negative error value
- * @retval #UA_ERROR_NONE Successful
- * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
- *
- * @exception
- * @pre
- * @post
- *
- */
-int ua_sensor_get_info_count(
-               ua_sensor_h sensor_handle,
-               int *info_count);
-
-/**
- * @ingroup CAPI_NETWORK_UA_MODULE
- * @brief Gets sensor's information values.
- * @since_tizen 6.5
- *
- * @remarks The @a info_values should not be released.
- * @remarks The returned value is available until sensor_handle is released.
- *
- * @param[in] sensor_handle The sensor handle
- * @param[out] info_values The sensor's information values.
- *
- * @return 0 on success, otherwise a negative error value
- * @retval #UA_ERROR_NONE Successful
- * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
- *
- * @exception
- * @pre
- * @post
- *
- */
-int ua_sensor_get_info_values(
-               ua_sensor_h sensor_handle, GSList **info_values);
+               ua_sensor_e *type);
 
 /**
  * @}

diff --git a/src/user-awareness-monitors.c b/src/user-awareness-monitors.c
index fcdd6ef815af7d47209fb53cdbe7dd3ee9564749..24ada08e9390e02ab5341bcecb78123eb1398161 100755 (executable)
--- a/src/user-awareness-monitors.c
+++ b/src/user-awareness-monitors.c
@@ -338,7 +338,7 @@ static void __ua_monitor_send_user_presence_cb(ua_monitor_s *monitor,
        }
 
        /** Get sensor list*/
-       sensors = ua_sensor_get_sensor_handle_list(
+       sensors = _ua_sensor_get_sensor_handle_list(
                monitor->presence_detected_bitmask & (user_state->sensor_bitmask | env_bitmask)
                & filter_bitmask);
 
@@ -381,7 +381,7 @@ static void __ua_monitor_send_env_user_presence_cb(ua_monitor_s *monitor)
        /** Get sensor list*/
        filter_bitmask =
                        monitor->presence_bitmask_and | monitor->presence_bitmask_or;
-       sensors = ua_sensor_get_sensor_handle_list(monitor->presence_detected_bitmask
+       sensors = _ua_sensor_get_sensor_handle_list(monitor->presence_detected_bitmask
                & filter_bitmask);
 
        if (monitor->presence_user_cb.callback) {
@@ -465,9 +465,9 @@ static void __ua_monitor_send_sensor_presence_cb(ua_monitor_s *monitor,
        ua_service_h service_handle = NULL;
        int ret;
 
-       ret = ua_sensor_get_by_sensor_info(sensor_info, &sensor_handle);
+       ret = _ua_sensor_get_by_sensor_info(sensor_info, &sensor_handle);
        if (UA_ERROR_NONE != ret) {
-               UA_INFO("ua_sensor_get_by_sensor_info returned %s",
+               UA_INFO("_ua_sensor_get_by_sensor_info returned %s",
                                _ua_get_error_string(ret));
        }
 
@@ -665,7 +665,7 @@ static void __ua_monitor_send_user_absence_cb(ua_monitor_s *monitor,
        /** Get sensor list*/
        filter_bitmask =
                        monitor->absence_bitmask_and | monitor->absence_bitmask_or;
-       sensors = ua_sensor_get_sensor_handle_list(
+       sensors = _ua_sensor_get_sensor_handle_list(
                monitor->absence_detected_bitmask & (user_sensor_bitmask | env_absence_bitmask)
                & filter_bitmask);
 
@@ -778,9 +778,9 @@ static void __ua_sensor_absence_detected(ua_monitor_s *monitor,
                monitor->absence_detected_bitmask |= bitmask;
        }
 
-       ret = ua_sensor_get_by_sensor_info(sensor_info, &sensor_handle);
+       ret = _ua_sensor_get_by_sensor_info(sensor_info, &sensor_handle);
        if (UA_ERROR_NONE != ret) {
-               UA_INFO("ua_sensor_get_by_sensor_info returned %s",
+               UA_INFO("_ua_sensor_get_by_sensor_info returned %s",
                                _ua_get_error_string(ret));
        }
 
@@ -970,9 +970,9 @@ void _ua_monitor_handle_sensor_status_changed(uam_sensor_info_s *info)
        sensor_info = _uam_to_ua_sensor_info(info);
        ret_if(NULL == sensor_info);
 
-       ret = ua_sensor_get_by_sensor_info(sensor_info, &dummy);
+       ret = _ua_sensor_get_by_sensor_info(sensor_info, &dummy);
        if (UA_ERROR_NONE != ret) {
-               UA_INFO("ua_sensor_get_by_sensor_info returned %s",
+               UA_INFO("_ua_sensor_get_by_sensor_info returned %s",
                                _ua_get_error_string(ret));
        }
 

diff --git a/src/user-awareness-util.c b/src/user-awareness-util.c
index 53e46d200a40f53dcfa619ec5a4c38ffaa3b00c3..fde09f266c05d14870efb758bb5f3c2615c4f8d3 100755 (executable)
--- a/src/user-awareness-util.c
+++ b/src/user-awareness-util.c
@@ -320,7 +320,7 @@ ua_sensor_info_s* _uam_to_ua_sensor_info(uam_sensor_info_s *info)
        FUNC_EXIT;
 }
 
-int ua_sensor_get_by_sensor_info(
+int _ua_sensor_get_by_sensor_info(
                ua_sensor_info_s *info,
                ua_sensor_h *sensor_handle)
 {
@@ -356,7 +356,7 @@ done:
        return ret;
 }
 
-GSList *ua_sensor_get_sensor_handle_list(
+GSList *_ua_sensor_get_sensor_handle_list(
                unsigned int bitmask)
 {
        FUNC_ENTRY;
@@ -384,6 +384,7 @@ int ua_sensor_get_status(
        FUNC_ENTRY;
        ua_sensor_info_s *sensor;
 
+       UA_CHECK_INIT_STATUS();
        UA_VALIDATE_INPUT_PARAMETER(sensor_handle);
        UA_INFO("Sensor Handle [%p]", sensor_handle);
        sensor = (ua_sensor_info_s *)sensor_handle;
@@ -401,6 +402,7 @@ int ua_sensor_get_timestamp(
        FUNC_ENTRY;
        ua_sensor_info_s *sensor;
 
+       UA_CHECK_INIT_STATUS();
        UA_VALIDATE_INPUT_PARAMETER(sensor_handle);
        UA_INFO("Sensor Handle [%p]", sensor_handle);
        sensor = (ua_sensor_info_s *)sensor_handle;
@@ -413,16 +415,17 @@ int ua_sensor_get_timestamp(
 
 int ua_sensor_get_type(
                ua_sensor_h sensor_handle,
-               ua_sensor_e *bitmask)
+               ua_sensor_e *type)
 {
        FUNC_ENTRY;
        ua_sensor_info_s *sensor;
 
+       UA_CHECK_INIT_STATUS();
        UA_VALIDATE_INPUT_PARAMETER(sensor_handle);
        UA_INFO("Sensor Handle [%p]", sensor_handle);
        sensor = (ua_sensor_info_s *)sensor_handle;
 
-       *bitmask = sensor->bitmask;
+       *type = sensor->bitmask;
 
        FUNC_EXIT;
        return UA_ERROR_NONE;