Merge branch 'tizen' into tizen_5.5

[platform/core/connectivity/bluetooth-frwk.git] / bt-core / bt-core-adapter.c

diff --git a/bt-core/bt-core-adapter.c b/bt-core/bt-core-adapter.c
index 9c68257..f89fda5 100644 (file)
--- a/bt-core/bt-core-adapter.c
+++ b/bt-core/bt-core-adapter.c
@@ -21,6 +21,9 @@
 #include <bundle.h>
 #include <eventsystem.h>
 #include <stdio.h>
+#ifdef TIZEN_FEATURE_ACTD
+#include <actd/unit_control.h>
+#endif
 
 #include "bt-core-main.h"
 #include "bt-core-adapter.h"
@@ -116,6 +119,24 @@ gboolean _bt_core_is_flight_mode_enabled(void)
        }
 }
 
+#ifdef TIZEN_FEATURE_ACTD
+static int __bt_call_systemact_service(const char *service_name)
+{
+       int ret;
+
+       BT_DBG("Use System Activated : %s", service_name);
+
+       ret = actd_start_unit(UNIT_CONTROL_BUS_TYPE_SYSTEM, service_name, 5000);
+
+       if (ret != UNIT_CONTROL_OK) {
+               BT_ERR("Failed to activate the %s: %d", service_name, ret);
+               /* Return Success even if the activating result is fail */
+               return 0;
+       }
+
+       return 0;
+}
+#else
 static int __bt_call_systemact_service(const char *file_path)
 {
        BT_DBG("+");
@@ -143,6 +164,7 @@ static int __bt_call_systemact_service(const char *file_path)
        return 0;
 
 }
+#endif
 
 static int __execute_command(const char *cmd, char *const arg_list[])
 {
@@ -189,13 +211,6 @@ static int __bt_stack_up(void)
                return -1;
        }
 
-       ret = __execute_command("/usr/etc/bluetooth/bt-stack-up.sh", NULL);
-       if (ret < 0) {
-               BT_ERR("Failed to run script");
-               __bt_call_systemact_service(BT_SYSTEMACT_HCI_LOGGER_STOP);
-               return -1;
-       }
-
        /* activate Bluez */
        ret = __bt_call_systemact_service(BT_SYSTEMACT_BLUEZ_START);
        if (ret < 0) {
@@ -247,16 +262,18 @@ int _bt_enable_adapter(void)
 
        __bt_core_set_status(BT_ACTIVATING);
        if (TIZEN_FEATURE_BT_USB_DONGLE) {
-               char *argv_up[] = {"/usr/bin/hciconfig", "/usr/bin/hciconfig", "hci0", "up", NULL};
-               ret = __execute_command("/usr/bin/hciconfig", argv_up);
+               ret = __bt_call_systemact_service(BT_SYSTEMACT_HCI_UP);
+               if (ret < 0)
+                       BT_ERR("Failed to call systemact service");
        } else {
                ret = __bt_stack_up();
        }
        if (ret < 0) {
                BT_ERR("running script failed");
                if (TIZEN_FEATURE_BT_USB_DONGLE) {
-                       char *argv_down[] = {"/usr/bin/hciconfig", "/usr/bin/hciconfig", "hci0", "down", NULL};
-                       ret = __execute_command("/usr/bin/hciconfig", argv_down);
+                       ret = __bt_call_systemact_service(BT_SYSTEMACT_HCI_DOWN);
+                       if (ret < 0)
+                               BT_ERR("Failed to call systemact service");
                } else {
                        ret = __execute_command("/usr/etc/bluetooth/bt-dev-end.sh", NULL);
                }
@@ -293,11 +310,9 @@ int _bt_disable_adapter(void)
        if (status == BT_ACTIVATING) {
                /* Forcely terminate */
                if (TIZEN_FEATURE_BT_USB_DONGLE) {
-                       char *argv_down[] = {"/usr/bin/hciconfig", "/usr/bin/hciconfig", "hci0", "down", NULL};
-                       if (__execute_command("/usr/bin/hciconfig", argv_down) < 0)
-                               BT_ERR("running script failed");
+                       if (__bt_call_systemact_service(BT_SYSTEMACT_HCI_DOWN) < 0)
+                               BT_ERR("Failed to call systemact service");
                } else {
-
 #ifdef TIZEN_FEATURE_RADIO
                        int radio_status = VCONFKEY_RADIO_STATUS_OFF;
 
@@ -308,14 +323,14 @@ int _bt_disable_adapter(void)
                        BT_DBG("Radio status: %d", radio_status);
 
                        if (radio_status == VCONFKEY_RADIO_STATUS_ON) {
-                               if (__execute_command("/usr/etc/bluetooth/bt-stack-down-with-radio.sh", NULL) < 0)
+                               if (__bt_call_systemact_service(BT_SYSTEMACT_STACK_DOWN_WITH_RADIO) < 0)
                                        BT_ERR("running script failed");
                        } else {
-                               if (__execute_command("/usr/etc/bluetooth/bt-stack-down.sh", NULL) < 0)
+                               if (__bt_call_systemact_service(BT_SYSTEMACT_STACK_DOWN) < 0)
                                        BT_ERR("running script failed");
                        }
 #else
-                       if (__execute_command("/usr/etc/bluetooth/bt-stack-down.sh", NULL) < 0)
+                       if (__bt_call_systemact_service(BT_SYSTEMACT_STACK_DOWN) < 0)
                                BT_ERR("running script failed");
 #endif
                }
@@ -328,9 +343,8 @@ int _bt_disable_adapter(void)
 
        __bt_core_set_status(BT_DEACTIVATING);
        if (TIZEN_FEATURE_BT_USB_DONGLE) {
-               char *argv_down[] = {"/usr/bin/hciconfig", "/usr/bin/hciconfig", "hci0", "down", NULL};
-               if (__execute_command("/usr/bin/hciconfig", argv_down) < 0) {
-                       BT_ERR("running script failed");
+               if (__bt_call_systemact_service(BT_SYSTEMACT_HCI_DOWN) < 0) {
+                       BT_ERR("Failed to call systemact service");
                        __bt_core_set_status(BT_ACTIVATED);
                        return -1;
                }
@@ -345,20 +359,20 @@ int _bt_disable_adapter(void)
                BT_DBG("Radio status: %d", radio_status);
 
                if (radio_status == VCONFKEY_RADIO_STATUS_ON) {
-                       if (__execute_command("/usr/etc/bluetooth/bt-stack-down-with-radio.sh", NULL) < 0) {
+                       if (__bt_call_systemact_service(BT_SYSTEMACT_STACK_DOWN_WITH_RADIO) < 0) {
                                BT_ERR("running script failed");
                                __bt_core_set_status(BT_ACTIVATED);
                                return -1;
                        }
                } else {
-                       if (__execute_command("/usr/etc/bluetooth/bt-stack-down.sh", NULL) < 0) {
+                       if (__bt_call_systemact_service(BT_SYSTEMACT_STACK_DOWN) < 0) {
                                BT_ERR("running script failed");
                                __bt_core_set_status(BT_ACTIVATED);
                                return -1;
                        }
                }
 #else
-               if (__execute_command("/usr/etc/bluetooth/bt-stack-down.sh", NULL) < 0) {
+               if (__bt_call_systemact_service(BT_SYSTEMACT_STACK_DOWN) < 0) {
                                BT_ERR("running script failed");
                                __bt_core_set_status(BT_ACTIVATED);
                                return -1;
@@ -377,6 +391,7 @@ int _bt_enable_adapter_le(void)
        bt_status_t status;
        bt_le_status_t le_status;
        le_status = _bt_core_get_le_status();
+       retv_if(le_status == BT_LE_ACTIVATED, 0);
        retv_if(le_status != BT_LE_DEACTIVATED, -1);
 
        status = _bt_core_get_status();
@@ -384,16 +399,20 @@ int _bt_enable_adapter_le(void)
                __bt_core_set_le_status(BT_LE_ACTIVATING);
                BT_DBG("Activate BT");
                if (TIZEN_FEATURE_BT_USB_DONGLE) {
-                       char *argv_up[] = {"/usr/bin/hciconfig", "/usr/bin/hciconfig", "hci0", "up", NULL};
-                       ret = __execute_command("/usr/bin/hciconfig", argv_up);
+                       ret = __bt_call_systemact_service(BT_SYSTEMACT_HCI_UP);
+                       if (ret < 0)
+                               BT_ERR("Failed to call systemact service");
                } else {
-                       ret = __execute_command("/usr/etc/bluetooth/bt-stack-up.sh", NULL);
+                       ret = __bt_call_systemact_service(BT_SYSTEMACT_STACK_UP);
+                       if (ret < 0)
+                               BT_ERR("Failed to call systemact service");
                }
                if (ret < 0) {
                        BT_ERR("running script failed");
                        if (TIZEN_FEATURE_BT_USB_DONGLE) {
-                               char *argv_down[] = {"/usr/bin/hciconfig", "/usr/bin/hciconfig", "hci0", "down", NULL};
-                               ret = __execute_command("/usr/bin/hciconfig", argv_down);
+                               ret = __bt_call_systemact_service(BT_SYSTEMACT_HCI_DOWN);
+                               if (ret < 0)
+                                       BT_ERR("Failed to call systemact service");
                        } else {
                                ret = __execute_command("/usr/etc/bluetooth/bt-dev-end.sh &", NULL);
                        }
@@ -458,8 +477,9 @@ int _bt_disable_adapter_le(void)
                __bt_core_set_le_status(BT_LE_DEACTIVATING);
                int ret;
                if (TIZEN_FEATURE_BT_USB_DONGLE) {
-                       char *argv_down[] = {"/usr/bin/hciconfig", "/usr/bin/hciconfig", "hci0", "down", NULL};
-                       ret = __execute_command("/usr/bin/hciconfig", argv_down);
+                       ret = __bt_call_systemact_service(BT_SYSTEMACT_HCI_DOWN);
+                       if (ret < 0)
+                               BT_ERR("Failed to call systemact service");
                } else {
                        ret = __execute_command("/usr/etc/bluetooth/bt-stack-down.sh", NULL);
                }
@@ -813,14 +833,11 @@ gboolean _bt_core_factory_test_mode(const char *type, const char *arg)
 static gboolean __bt_core_recovery_cb(gpointer data)
 {
        int ret = 0;
-#ifdef TIZEN_FEATURE_BUSACT
        gboolean is_request_failed = FALSE;
        static gboolean is_first_failure = TRUE;
-#endif
 
        BT_DBG("+");
 
-#ifdef TIZEN_FEATURE_BUSACT
        if (_bt_core_get_bt_status(BT_RECOVERY_MODE) == 1) {
                ret = _bt_core_service_request_adapter(BT_ENABLE_ADAPTER);
                if (ret < 0)
@@ -845,7 +862,6 @@ static gboolean __bt_core_recovery_cb(gpointer data)
                }
        } else
                is_first_failure = TRUE;
-#endif
 
        if (_bt_core_get_bt_status(BT_RECOVERY_MODE) == 1) {
                _bt_core_set_bt_status(BT_RECOVERY_MODE, 0);