adapter: Add btd_ prefix to has_kernel_feature

APIs exposed to plugins shall have btd_ prefix.

Signed-off-by: Anuj Jain <anuj01.jain@samsung.com>
Signed-off-by: Ayush Garg <ayush.garg@samsung.com>

diff --git a/plugins/policy.c b/plugins/policy.c
index 73d896e..0e127ac 100755 (executable)
--- a/plugins/policy.c
+++ b/plugins/policy.c
@@ -828,7 +828,7 @@ static void disconnect_cb(struct btd_device *dev, uint8_t reason)
                         * preferable to set the reconnect timer there as it is
                         * a more predictable delay.
                         */
-                       if (!has_kernel_features(KERNEL_HAS_RESUME_EVT))
+                       if (!btd_has_kernel_features(KERNEL_HAS_RESUME_EVT))
                                reconnect_set_timer(reconnect, resume_delay);
                }
                break;

diff --git a/src/adapter.c b/src/adapter.c
index ba96f46..39cd8e9 100644 (file)
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -1110,7 +1110,7 @@ static bool set_discoverable(struct btd_adapter *adapter, uint8_t mode,
 
        DBG("sending set mode command for index %u", adapter->dev_id);
 
-       if (has_kernel_features(KERNEL_CONN_CONTROL)) {
+       if (btd_has_kernel_features(KERNEL_CONN_CONTROL)) {
                if (mode)
                        set_mode(adapter, MGMT_OP_SET_CONNECTABLE, mode);
                else
@@ -1846,7 +1846,7 @@ static void trigger_passive_scanning(struct btd_adapter *adapter)
         * no need to start any discovery. The kernel will keep scanning
         * as long as devices are in its auto-connection list.
         */
-       if (has_kernel_features(KERNEL_CONN_CONTROL))
+       if (btd_has_kernel_features(KERNEL_CONN_CONTROL))
                return;
 
        /*
@@ -1902,7 +1902,7 @@ static void stop_passive_scanning_complete(uint8_t status, uint16_t length,
         * no need to stop any discovery. The kernel will handle the
         * auto-connection by itself.
         */
-       if (has_kernel_features(KERNEL_CONN_CONTROL))
+       if (btd_has_kernel_features(KERNEL_CONN_CONTROL))
                return;
 
        /*
@@ -6947,7 +6947,7 @@ static void property_set_mode_complete(uint8_t status, uint16_t length,
 
 static void clear_discoverable(struct btd_adapter *adapter)
 {
-       if (!has_kernel_features(KERNEL_CONN_CONTROL))
+       if (!btd_has_kernel_features(KERNEL_CONN_CONTROL))
                return;
 
        if (!(adapter->current_settings & MGMT_SETTING_DISCOVERABLE))
@@ -7008,7 +7008,7 @@ static void property_set_mode(struct btd_adapter *adapter, uint32_t setting,
                break;
        case MGMT_SETTING_DISCOVERABLE:
 #ifndef TIZEN_FEATURE_BLUEZ_MODIFY
-               if (has_kernel_features(KERNEL_CONN_CONTROL)) {
+               if (btd_has_kernel_features(KERNEL_CONN_CONTROL)) {
                        if (mode) {
                                set_mode(adapter, MGMT_OP_SET_CONNECTABLE,
                                                                        mode);
@@ -8975,7 +8975,7 @@ static void load_default_system_params(struct btd_adapter *adapter)
        unsigned int err;
 
        if (!main_opts.default_params.num_entries ||
-                       !has_kernel_features(KERNEL_SET_SYSTEM_CONFIG))
+                       !btd_has_kernel_features(KERNEL_SET_SYSTEM_CONFIG))
                return;
 
        params = malloc0(sizeof(*params) *
@@ -9741,7 +9741,7 @@ int adapter_connect_list_add(struct btd_adapter *adapter,
         * adapter_auto_connect_add() function is used to maintain what to
         * connect.
         */
-       if (has_kernel_features(KERNEL_CONN_CONTROL))
+       if (btd_has_kernel_features(KERNEL_CONN_CONTROL))
                return 0;
 
        if (g_slist_find(adapter->connect_list, device)) {
@@ -9781,7 +9781,7 @@ void adapter_connect_list_remove(struct btd_adapter *adapter,
        if (device == adapter->connect_le)
                adapter->connect_le = NULL;
 
-       if (has_kernel_features(KERNEL_CONN_CONTROL))
+       if (btd_has_kernel_features(KERNEL_CONN_CONTROL))
                return;
 
        if (!g_slist_find(adapter->connect_list, device)) {
@@ -9843,7 +9843,7 @@ void adapter_whitelist_add(struct btd_adapter *adapter, struct btd_device *dev)
 {
        struct mgmt_cp_add_device cp;
 
-       if (!has_kernel_features(KERNEL_CONN_CONTROL))
+       if (!btd_has_kernel_features(KERNEL_CONN_CONTROL))
                return;
 
        memset(&cp, 0, sizeof(cp));
@@ -9882,7 +9882,7 @@ void adapter_whitelist_remove(struct btd_adapter *adapter, struct btd_device *de
 {
        struct mgmt_cp_remove_device cp;
 
-       if (!has_kernel_features(KERNEL_CONN_CONTROL))
+       if (!btd_has_kernel_features(KERNEL_CONN_CONTROL))
                return;
 
        memset(&cp, 0, sizeof(cp));
@@ -9938,7 +9938,7 @@ void adapter_auto_connect_add(struct btd_adapter *adapter,
        uint8_t bdaddr_type;
        unsigned int id;
 
-       if (!has_kernel_features(KERNEL_CONN_CONTROL))
+       if (!btd_has_kernel_features(KERNEL_CONN_CONTROL))
                return;
 
        if (g_slist_find(adapter->connect_list, device)) {
@@ -10010,7 +10010,7 @@ void adapter_set_device_wakeable(struct btd_adapter *adapter,
        const bdaddr_t *bdaddr;
        uint8_t bdaddr_type;
 
-       if (!has_kernel_features(KERNEL_CONN_CONTROL))
+       if (!btd_has_kernel_features(KERNEL_CONN_CONTROL))
                return;
 
        bdaddr = device_get_address(device);
@@ -10087,7 +10087,7 @@ void adapter_auto_connect_remove(struct btd_adapter *adapter,
        uint8_t bdaddr_type;
        unsigned int id;
 
-       if (!has_kernel_features(KERNEL_CONN_CONTROL))
+       if (!btd_has_kernel_features(KERNEL_CONN_CONTROL))
                return;
 
        if (!g_slist_find(adapter->connect_list, device)) {
@@ -11983,7 +11983,7 @@ connect_le:
         * If kernel background scan is used then the kernel is
         * responsible for connecting.
         */
-       if (has_kernel_features(KERNEL_CONN_CONTROL))
+       if (btd_has_kernel_features(KERNEL_CONN_CONTROL))
                return;
 
        /*
@@ -15006,7 +15006,7 @@ static int clear_devices(struct btd_adapter *adapter)
 {
        struct mgmt_cp_remove_device cp;
 
-       if (!has_kernel_features(KERNEL_CONN_CONTROL))
+       if (!btd_has_kernel_features(KERNEL_CONN_CONTROL))
                return 0;
 
        memset(&cp, 0, sizeof(cp));
@@ -15625,7 +15625,7 @@ static void read_info_complete(uint8_t status, uint16_t length,
                adapter->central_rpa_res_support = 0x01;
 #endif
 
-       if (has_kernel_features(KERNEL_EXP_FEATURES))
+       if (btd_has_kernel_features(KERNEL_EXP_FEATURES))
                read_exp_features(adapter);
 
        err = adapter_register(adapter);
@@ -15820,7 +15820,7 @@ static void read_info_complete(uint8_t status, uint16_t length,
 
        set_name(adapter, btd_adapter_get_name(adapter));
 
-       if (has_kernel_features(KERNEL_BLOCKED_KEYS_SUPPORTED) &&
+       if (btd_has_kernel_features(KERNEL_BLOCKED_KEYS_SUPPORTED) &&
                        !set_blocked_keys(adapter)) {
                btd_error(adapter->dev_id,
                                "Failed to set blocked keys for index %u",
@@ -15832,7 +15832,7 @@ static void read_info_complete(uint8_t status, uint16_t length,
                        !(adapter->current_settings & MGMT_SETTING_BONDABLE))
                set_mode(adapter, MGMT_OP_SET_BONDABLE, 0x01);
 
-       if (!has_kernel_features(KERNEL_CONN_CONTROL))
+       if (!btd_has_kernel_features(KERNEL_CONN_CONTROL))
                set_mode(adapter, MGMT_OP_SET_CONNECTABLE, 0x01);
        else if (adapter->current_settings & MGMT_SETTING_CONNECTABLE)
                set_mode(adapter, MGMT_OP_SET_CONNECTABLE, 0x00);
@@ -16210,7 +16210,7 @@ bool btd_le_connect_before_pairing(void)
        return false;
 }
 
-bool has_kernel_features(uint32_t features)
+bool btd_has_kernel_features(uint32_t features)
 {
        return !!(kernel_features & features);
 }

diff --git a/src/adapter.h b/src/adapter.h
index efe6133..f81ee64 100644 (file)
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -341,7 +341,7 @@ enum kernel_features {
        KERNEL_HAS_RESUME_EVT           = 1 << 4,
 };
 
-bool has_kernel_features(uint32_t feature);
+bool bts_has_kernel_features(uint32_t feature);
 
 #ifdef TIZEN_FEATURE_BLUEZ_MODIFY
 void adapter_send_event(const char *event);