Update enums and covert functions for UWB support 91/260391/2
authorAbhay Agarwal <ay.agarwal@samsung.com>
Thu, 18 Mar 2021 06:17:41 +0000 (11:47 +0530)
committerAbhay Agarwal <ay.agarwal@samsung.com>
Fri, 25 Jun 2021 11:59:22 +0000 (17:29 +0530)
Change-Id: Icb17664cee768c8cff02d5578ef7102531caeda7
Signed-off-by: Abhay Agarwal <ay.agarwal@samsung.com>
include/user-awareness-private.h
include/user-awareness-util.h
src/user-awareness-monitors.c
src/user-awareness-util.c

index 15ec17453d531d57777cc5a00a1780ce52bd8652..081cbfac90bb2f5b9a6efe05fe65d202b8b8bbd7 100755 (executable)
@@ -215,6 +215,18 @@ do { \
  */
 #define UA_MAC_TYPE_WIFI_LOCATION 0x10
 
+/**
+ * @brief UWB sensor.
+ * @since_tizen 6.5
+ */
+#define UA_SENSOR_UWB 0x00000080
+
+/**
+ * @brief UWB mac type.
+ * @since_tizen 6.5
+ */
+#define UA_MAC_TYPE_UWB 0x20
+
 /**
  * @brief The handle of payload information.
  * @since_tizen 6.5
index 9c319f68379f24e22a1fef1f4ca152da4f242653..506adbcaae3507c87f938379012ec060c234e17b 100755 (executable)
@@ -162,6 +162,7 @@ uam_tech_type_e _ua_to_uam_tech_type(ua_mac_type_e type);
  * @retval #UA_SENSOR_BLE Bluetooth Low Energy
  * @retval #UA_SENSOR_WIFI Wi-Fi
  * @retval #UA_SENSOR_WIFI_LOCATION Wi-Fi Location
+ * @retval #UA_SENSOR_UWB UWB
  * @retval #UA_SENSOR_MAX Invalid
  *
  * @exception
index 429b3843714d5e7642f2d3b8a28e632438a198ef..2648da565dd9026e4f0ca617abf612814d5766bc 100755 (executable)
@@ -139,6 +139,9 @@ static unsigned int __ua_sensor_type_to_bitmask(int sensor_type)
        case UA_SENSOR_WIFI_LOCATION:
                bitmask = UAM_SENSOR_BITMASK_WIFI_LOCATION;
                break;
+       case UA_SENSOR_UWB:
+               bitmask = UAM_SENSOR_BITMASK_UWB;
+               break;
        case UA_SENSOR_ALL:
                bitmask = UAM_SENSOR_ALL;
                break;
index ba313bb21055ec864d0f60e097786e29540b0a4e..6629cc2d51de19b9d142492a84b149f53c9e1965 100755 (executable)
@@ -68,6 +68,8 @@ ua_mac_type_e _to_ua_mac_type(int tech_type)
                return UA_MAC_TYPE_P2P;
        case UAM_TECH_TYPE_WIFI_LOCATION:
                return UA_MAC_TYPE_WIFI_LOCATION;
+       case UAM_TECH_TYPE_UWB:
+               return UA_MAC_TYPE_UWB;
        default:
                return UA_MAC_TYPE_INVALID;
        }
@@ -204,6 +206,8 @@ uam_tech_type_e _ua_to_uam_tech_type(int type)
                return UAM_TECH_TYPE_P2P;
        case UA_MAC_TYPE_WIFI_LOCATION:
                return UAM_TECH_TYPE_WIFI_LOCATION;
+       case UA_MAC_TYPE_UWB:
+               return UAM_TECH_TYPE_UWB;
        default:
                return UA_MAC_TYPE_INVALID;
        }
@@ -222,6 +226,8 @@ ua_sensor_type_e _ua_dev_type_to_sensor(int type)
                return UA_SENSOR_WIFI;
        case UA_MAC_TYPE_WIFI_LOCATION:
                return UA_SENSOR_WIFI_LOCATION;
+       case UA_MAC_TYPE_UWB:
+               return UA_SENSOR_UWB;
        default:
                UA_WARN("Uncompatible to convert. Mac type [%u]", type);
                return UA_SENSOR_MAX;
@@ -242,6 +248,8 @@ ua_mac_type_e _ua_sensor_to_dev_type(int type)
                return UA_MAC_TYPE_WIFI;
        case UA_SENSOR_WIFI_LOCATION:
                return UA_MAC_TYPE_WIFI_LOCATION;
+       case UA_SENSOR_UWB:
+               return UA_MAC_TYPE_UWB;
        default:
                UA_WARN("Uncompatible to convert. sensor [%u]", type);
                return UA_MAC_TYPE_INVALID;
@@ -268,6 +276,8 @@ ua_sensor_type_e _uam_to_ua_sensor(int bitmask)
                return UA_SENSOR_AUDIO;
        case UAM_SENSOR_BITMASK_WIFI_LOCATION:
                return UA_SENSOR_WIFI_LOCATION;
+       case UAM_SENSOR_BITMASK_UWB:
+               return UA_SENSOR_UWB;
        default:
                UA_WARN("Unknown sensor bitmask [0x%8.8X]", bitmask);
                return UA_SENSOR_MAX;