X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bt-core%2Fbt-core-adapter.c;h=10ea862460d98e56c824cb897cd5aaf955cf2d05;hb=9c4f5a830815e5dba0184a2ef3ecfe4bb7bdd40f;hp=7582638c175a01e8b5a25429eec7cedda41b0554;hpb=8b4d2b7d7c0bdbc50534b1cb6e2963b55375180a;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git

diff --git a/bt-core/bt-core-adapter.c b/bt-core/bt-core-adapter.c
index 7582638..10ea862 100644
--- a/bt-core/bt-core-adapter.c
+++ b/bt-core/bt-core-adapter.c
@@ -31,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
 
@@ -184,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);
@@ -219,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)
@@ -262,6 +267,11 @@ int _bt_enable_adapter(void)
 
 	__bt_core_set_status(BT_ACTIVATING);
 	if (TIZEN_FEATURE_BT_USB_DONGLE) {
+		/* 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");
@@ -348,6 +358,7 @@ int _bt_disable_adapter(void)
 			__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;
@@ -391,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();
@@ -402,9 +414,7 @@ int _bt_enable_adapter_le(void)
 			if (ret < 0)
 				BT_ERR("Failed to call systemact service");
 		} else {
-			ret = __bt_call_systemact_service(BT_SYSTEMACT_STACK_UP);
-			if (ret < 0)
-				BT_ERR("Failed to call systemact service");
+			ret = __bt_stack_up();
 		}
 		if (ret < 0) {
 			BT_ERR("running script failed");
@@ -643,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)
@@ -792,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";
@@ -825,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;
 }
@@ -832,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)
@@ -864,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);