[bluetooth-frwk] API defines

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

diff --git a/bt-core/bt-core-main.c b/bt-core/bt-core-main.c
index b5c37f0..e5e7197 100755 (executable)
--- a/bt-core/bt-core-main.c
+++ b/bt-core/bt-core-main.c
@@ -80,20 +80,17 @@ static gboolean __bt_check_bt_core(void *data)
        int flight_mode_deactivation = 0;
        int bt_off_due_to_timeout = 0;
        int ps_mode_deactivation = 0;
-       int ret;
 
        status = _bt_core_get_status();
        le_status = _bt_core_get_le_status();
        BT_DBG("State: %d, LE State: %d", status, le_status);
 
-       if (vconf_get_int(VCONFKEY_BT_STATUS, &bt_status) < 0) {
+       if (vconf_get_int(VCONFKEY_BT_STATUS, &bt_status) < 0)
                BT_DBG("no bluetooth device info, so BT was disabled at previous session");
-       }
 
 #ifdef ENABLE_TIZEN_2_4
-       if (vconf_get_int(VCONFKEY_BT_LE_STATUS, &bt_le_status) < 0) {
+       if (vconf_get_int(VCONFKEY_BT_LE_STATUS, &bt_le_status) < 0)
                BT_ERR("no bluetooth le info, so BT LE was disabled at previous session");
-       }
 #endif
 
        if (vconf_get_int(BT_OFF_DUE_TO_FLIGHT_MODE, &flight_mode_deactivation) != 0)
@@ -111,7 +108,7 @@ static gboolean __bt_check_bt_core(void *data)
 
                /* Enable the BT */
                _bt_core_service_request_adapter(BT_ENABLE_ADAPTER);
-#ifndef USB_BLUETOOTH
+#ifndef TIZEN_FEATURE_BT_USB_DONGLE
                _bt_enable_adapter();
 #endif
        } else if (bt_status == VCONFKEY_BT_STATUS_OFF &&
@@ -128,7 +125,7 @@ static gboolean __bt_check_bt_core(void *data)
 
                /* Enable the BT LE */
                _bt_core_service_request_adapter(BT_ENABLE_ADAPTER_LE);
-#ifndef USB_BLUETOOTH
+#ifndef TIZEN_FEATURE_BT_USB_DONGLE
                _bt_enable_adapter_le();
 #endif
        } else {
@@ -149,7 +146,6 @@ int main(void)
        gboolean ret;
        struct sigaction sa;
 
-       g_type_init();
        BT_INFO_C("Starting bt-core daemeon");
 
        _bt_core_update_status();