X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bt-core%2Fbt-core-adapter.c;h=10ea862460d98e56c824cb897cd5aaf955cf2d05;hb=9c4f5a830815e5dba0184a2ef3ecfe4bb7bdd40f;hp=ad4222a15ff0a3766c12f65df5d9d1f56bc0a48b;hpb=c0fd298f13109ff55ac281f1cb61b6a4ee131c79;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git diff --git a/bt-core/bt-core-adapter.c b/bt-core/bt-core-adapter.c index ad4222a..10ea862 100644 --- a/bt-core/bt-core-adapter.c +++ b/bt-core/bt-core-adapter.c @@ -21,6 +21,9 @@ #include #include #include +#ifdef TIZEN_FEATURE_ACTD +#include +#endif #include "bt-core-main.h" #include "bt-core-adapter.h" @@ -28,6 +31,8 @@ #include "bt-core-dbus-handler.h" #include "bt-core-noti-handler.h" +#include "bt-internal-types.h" + #define BT_CORE_IDLE_TERM_TIME 200 /* 200ms */ #define BT_CORE_CHECK_ADAPTER_OBJECT_PATH_MAX 50 @@ -116,6 +121,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 +166,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[]) { @@ -162,7 +186,12 @@ static int __execute_command(const char *cmd, char *const arg_list[]) if (pid2 == -1) { BT_ERR("fork failed"); } else if (pid2 == 0) { - execv(cmd, arg_list); + if (arg_list != NULL) { + execv(cmd, arg_list); + } else { + char *argv[] = { NULL }; + execv(cmd, argv); + } exit(256); } exit(0); @@ -189,20 +218,6 @@ static int __bt_stack_up(void) return -1; } - /* unblock rfkill */ - ret = __bt_call_systemact_service(BT_SYSTEMACT_RFKILL_UNBLOCK); - if (ret < 0) { - BT_ERR("Failed to call systemact service"); - 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) { @@ -211,17 +226,15 @@ static int __bt_stack_up(void) } /* activate bluetooth-share */ - ret = __bt_call_systemact_service(BT_SYSTEMACT_BLUETOOTH_SHARE_START); - if (ret < 0) { - BT_ERR("Failed to call systemact service"); - return -1; + if (!TIZEN_PROFILE_WEARABLE) { + ret = __bt_call_systemact_service(BT_SYSTEMACT_BLUETOOTH_SHARE_START); + if (ret < 0) { + BT_ERR("Failed to call systemact service"); + return -1; + } } - return 0; - - - } int _bt_enable_adapter(void) @@ -254,16 +267,23 @@ 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); + /* activate Bluez */ + ret = __bt_call_systemact_service(BT_SYSTEMACT_BLUEZ_START); + if (ret < 0) + BT_ERR("If bluez already exist, skip this error"); + + 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); } @@ -277,7 +297,6 @@ int _bt_enable_adapter(void) int _bt_disable_adapter(void) { bt_status_t status; - int ret; #if 0 bt_le_status_t le_status; #endif @@ -301,11 +320,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; @@ -316,14 +333,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 } @@ -336,12 +353,12 @@ 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; } + g_timeout_add(BT_CORE_IDLE_TERM_TIME, __bt_core_idle_terminate, NULL); } else { #ifdef TIZEN_FEATURE_RADIO int radio_status = VCONFKEY_RADIO_STATUS_OFF; @@ -353,20 +370,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; @@ -374,14 +391,6 @@ int _bt_disable_adapter(void) #endif } - /* block rfkill */ - ret = __bt_call_systemact_service(BT_SYSTEMACT_RFKILL_BLOCK); - if (ret < 0) { - BT_ERR("Failed to call systemact service"); - return -1; - } - - return 0; } @@ -393,6 +402,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(); @@ -400,16 +410,18 @@ 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_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); } @@ -474,8 +486,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); } @@ -640,8 +653,6 @@ gboolean _bt_core_disable_adapter(void) gboolean adapter_state; _bt_set_flightmode_request(FALSE); - if (vconf_set_int(BT_OFF_DUE_TO_FLIGHT_MODE, 0) != 0) - BT_ERR("Set vconf failed"); adapter_state = __bt_core_check_the_adapter_path(); if (adapter_state == FALSE) @@ -789,12 +800,27 @@ gboolean _bt_core_set_transfer_value(gboolean value) gboolean _bt_core_factory_test_mode(const char *type, const char *arg) { + int ret; + BT_DBG("Test item : %s", type); +#ifdef TIZEN_FEATURE_ACTD + if (g_strcmp0(type, "Enable_RF_Test") == 0) { + ret = __bt_call_systemact_service(BT_SYSTEMACT_EDUTM_ON); + if (ret < 0) + BT_ERR("Failed to call systemact service"); + } else if (g_strcmp0(type, "Disable_RF_Test") == 0) { + ret = __bt_call_systemact_service(BT_SYSTEMACT_EDUTM_OFF); + if (ret < 0) + BT_ERR("Failed to call systemact service"); + } else { + BT_DBG("Terminate bt-core process"); + g_timeout_add(BT_CORE_IDLE_TERM_TIME, __bt_core_idle_terminate, NULL); + return FALSE; + } +#else char *cmd = NULL; char *arg_list[3] = { NULL, NULL, NULL }; - BT_DBG("Test item : %s", type); - if (g_strcmp0(type, "Enable_RF_Test") == 0) { cmd = "/usr/etc/bluetooth/bt-edutm-on.sh"; arg_list[0] = "bt-edutm-on.sh"; @@ -822,6 +848,7 @@ gboolean _bt_core_factory_test_mode(const char *type, const char *arg) BT_DBG("Run %s", cmd); if (__execute_command(cmd, arg_list) < 0) BT_ERR("running script failed"); +#endif return TRUE; } @@ -829,14 +856,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) @@ -861,7 +885,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);