diff options
| author | Abhay Agarwal <ay.agarwal@samsung.com> | 2019-10-01 13:17:26 +0900 |
|---|---|---|
| committer | saerome.kim <saerome.kim@samsung.com> | 2019-10-01 21:38:19 +0900 |
| commit | 7ac44ef05bdbb750c55e590ad31df3e71185807c (patch) | |
| tree | 6d56578bb212f66e79cb04b443be7103d29f7947 /src | |
| parent | c7b6910a4cfdff3523e55a0be896744f13bc844d (diff) | |
| download | user-awareness-7ac44ef05bdbb750c55e590ad31df3e71185807c.tar.gz user-awareness-7ac44ef05bdbb750c55e590ad31df3e71185807c.tar.bz2 user-awareness-7ac44ef05bdbb750c55e590ad31df3e71185807c.zip | |
Modify callback signature for sensor_presence_cb
This patch modify callback sensor_presence_cb to not provide sensor information
using user data and add a seprate field for this parameter.
Change-Id: Ia0c6159225be99595516f9dc10ecf58f2e16fa16
Signed-off-by: Abhay Agarwal <ay.agarwal@samsung.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/user-awareness-monitors.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/user-awareness-monitors.c b/src/user-awareness-monitors.c index 1235bda..9c61945 100644 --- a/src/user-awareness-monitors.c +++ b/src/user-awareness-monitors.c @@ -206,7 +206,7 @@ static void __ua_send_presence_detection() if (monitor->sensor_bitmask == monitor->presence_detected_bitmask) { if (monitor->presence_cb) monitor->presence_cb(UA_ERROR_NONE, monitor, - monitor->presence_detected_bitmask, NULL, monitor->user_data); + monitor->presence_detected_bitmask, NULL, NULL, monitor->user_data); } monitor->presence_detected_bitmask = 0; @@ -330,9 +330,10 @@ static void __ua_monitor_send_user_presence_cb(ua_monitor_s *monitor, } static void __ua_monitor_send_sensor_presence_cb(ua_monitor_s *monitor, - ua_device_h device_handle, ua_sensor_e bitmask) + ua_device_h device_handle, ua_sensor_info_s *sensor_info) { FUNC_ENTRY; + ua_sensor_e bitmask = sensor_info->bitmask; switch (monitor->presence_mode) { case UA_DETECT_MODE_ALL_SENSOR: /* @@ -356,7 +357,7 @@ static void __ua_monitor_send_sensor_presence_cb(ua_monitor_s *monitor, if ((monitor->presence_detected_bitmask & bitmask) == 0) if (monitor->presence_cb) monitor->presence_cb(UA_ERROR_NONE, monitor, - bitmask, device_handle, monitor->user_data); + bitmask, device_handle, sensor_info, monitor->user_data); monitor->presence_detected_bitmask |= bitmask; @@ -373,8 +374,8 @@ static void __ua_monitor_send_sensor_presence_cb(ua_monitor_s *monitor, return; } -static void __ua_sensor_presence_detected(ua_monitor_s *monitor, - ua_sensor_e bitmask, char *account, long timestamp, char *device_id) +static void __ua_sensor_presence_detected(ua_monitor_s *monitor, ua_sensor_info_s *sensor_info, + char *account, long timestamp, char *device_id) { FUNC_ENTRY; @@ -384,6 +385,7 @@ static void __ua_sensor_presence_detected(ua_monitor_s *monitor, int ret = UA_ERROR_NONE; ua_user_state_info_s *user_state = NULL; ua_device_h device_handle = NULL; + ua_sensor_e bitmask = sensor_info->bitmask; ret_if(NULL == monitor); @@ -427,7 +429,7 @@ static void __ua_sensor_presence_detected(ua_monitor_s *monitor, return; } - __ua_monitor_send_sensor_presence_cb(monitor, device_handle, bitmask); + __ua_monitor_send_sensor_presence_cb(monitor, device_handle, sensor_info); if (account && user_state) { __ua_monitor_send_user_presence_cb(monitor, user_state); @@ -711,8 +713,7 @@ void _ua_monitor_handle_user_presence_detected(uam_sensor_info_s *info, if (!service || !g_strcmp0(service, monitor->service)) { /* Presence detection ongoing */ - monitor->user_data = sensor_info; - __ua_sensor_presence_detected(monitor, bitmask, account, + __ua_sensor_presence_detected(monitor, sensor_info, account, timestamp, device_id); } } |