Reduce the predefined logic (PredefinedPreprocessor) 43/240843/1 accepted/tizen/unified/20200813.122623 submit/tizen/20200813.001605
authorDoHyun Pyun <dh79.pyun@samsung.com>
Wed, 12 Aug 2020 05:37:18 +0000 (14:37 +0900)
committerDoHyun Pyun <dh79.pyun@samsung.com>
Wed, 12 Aug 2020 05:37:18 +0000 (14:37 +0900)
Change-Id: Idc1db93b8ab86ca21fd8b2a1f5d324646e057f0b
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>
63 files changed:
bt-api/CMakeLists.txt
bt-api/bt-adapter.c
bt-api/bt-audio.c
bt-api/bt-avrcp.c
bt-api/bt-common.c
bt-api/bt-device.c
bt-api/bt-dpm.c
bt-api/bt-event-handler.c
bt-api/bt-gatt-client.c
bt-api/bt-gatt-service.c
bt-api/bt-hid.c
bt-api/bt-network.c
bt-api/bt-opp-client.c
bt-api/bt-request-sender.c
bt-api/bt-rfcomm-client.c
bt-api/bt-rfcomm-server.c
bt-api/bt-telephony.c
bt-api/include/bt-common.h
bt-api/include/bt-dpm.h
bt-core/bt-core-adapter.c
bt-core/bt-core-main.c
bt-core/bt-core-noti-handler.c
bt-core/include/bt-core-adapter.h
bt-core/include/bt-core-noti-handler.h
bt-oal/bluez_hal/inc/bt-hal-msg.h
bt-oal/bluez_hal/src/bt-hal-agent.c
bt-oal/bluez_hal/src/bt-hal-avrcp-tg-dbus-handler.c
bt-oal/bluez_hal/src/bt-hal-device-dbus-handler.c
bt-oal/bluez_hal/src/bt-hal-gatt-client.c
bt-oal/bluez_hal/src/bt-hal-gatt-server.c
bt-oal/oal-avrcp-tg.c
bt-oal/oal-gatt.c
bt-service/CMakeLists.txt
bt-service/services/adapter/bt-service-core-adapter.c
bt-service/services/audio/a2dp_sink/bt-service-a2dp-sink.c
bt-service/services/audio/a2dp_src/bt-service-a2dp-src.c
bt-service/services/audio/avrcp/bt-service-avrcp-tg.c
bt-service/services/audio/bt-service-absolute-volume.c
bt-service/services/bt-request-handler.c
bt-service/services/bt-service-common.c
bt-service/services/bt-service-dpm.c
bt-service/services/bt-service-event-receiver.c
bt-service/services/bt-service-event-sender.c
bt-service/services/bt-service-main.c
bt-service/services/device/bt-service-core-device.c
bt-service/services/gatt/bt-service-gatt.c
bt-service/services/include/bt-service-audio-common.h
bt-service/services/include/bt-service-avrcp-tg.h
bt-service/services/include/bt-service-common.h
bt-service/services/include/bt-service-core-device.h
bt-service/services/include/bt-service-dpm.h
bt-service/services/include/bt-service-gatt.h
bt-service/services/include/stacktrim.h
bt-service/services/ipsp/bt-service-ipsp-event-receiver.c
bt-service/services/obex/bt-service-obex-event-receiver.c
bt-service/services/obex/bt-service-obex-server.c
bt-service/services/obex/bt-service-pbap.c
include/bluetooth-api.h
include/bt-internal-types.h
include/plugin.h
packaging/bluetooth-frwk.spec
plugin/headed.c
test/bluetooth-frwk-test.c

index 19d9cb0..0dc3d73 100644 (file)
@@ -91,7 +91,6 @@ ENDIF("${ARCH}" STREQUAL "arm")
 
 #ADD_DEFINITIONS("-DTIZEN_FEATURE_BT_HPS")
 ADD_DEFINITIONS("-DTIZEN_FEATURE_BT_OTP")
-ADD_DEFINITIONS("-DTIZEN_FEATURE_BT_DPM")
 ADD_DEFINITIONS("-DTIZEN_GATT_CLIENT")
 
 ADD_LIBRARY(bluetooth-api SHARED ${SRCS})
index 4fa9b51..64f4cfa 100644 (file)
@@ -74,15 +74,12 @@ static int __bt_fill_device_list(GArray *out_param2, GPtrArray **dev_list)
 BT_EXPORT_API int bluetooth_check_adapter(void)
 {
        int value = VCONFKEY_BT_STATUS_OFF;
-
-#ifndef TIZEN_TEST_EMUL
        int ret;
 
        ret = _bt_get_adapter_path(_bt_get_system_private_conn(), NULL);
 
        if (ret != BLUETOOTH_ERROR_NONE)
                return BLUETOOTH_ADAPTER_DISABLED;
-#endif
 
        /* check VCONFKEY_BT_STATUS */
        if (vconf_get_int(VCONFKEY_BT_STATUS, &value) != 0) {
@@ -102,11 +99,8 @@ BT_EXPORT_API int bluetooth_enable_adapter(void)
        _bt_print_api_caller_name();
        retv_if(bluetooth_check_adapter() == BLUETOOTH_ADAPTER_ENABLED,
                                BLUETOOTH_ERROR_DEVICE_ALREADY_ENABLED);
-
-#ifdef TIZEN_FEATURE_BT_DPM
        retv_if(bluetooth_dpm_is_mode_allowed() == BLUETOOTH_ERROR_PERMISSION_DEINED,
                                BLUETOOTH_ERROR_PERMISSION_DEINED);
-#endif
 
        BT_INIT_PARAMS();
        BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
@@ -193,10 +187,8 @@ BT_EXPORT_API int bluetooth_read_battery_data(bt_battery_data *data)
        retv_if(bluetooth_get_battery_monitor_state() == FALSE,
                                BLUETOOTH_ERROR_NOT_SUPPORT);
 
-#ifdef TIZEN_FEATURE_BT_DPM
        retv_if(bluetooth_dpm_is_mode_allowed() == BLUETOOTH_ERROR_PERMISSION_DEINED,
                                BLUETOOTH_ERROR_PERMISSION_DEINED);
-#endif
 
        BT_INIT_PARAMS();
        BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
index eb1523d..bed8e2c 100644 (file)
@@ -24,9 +24,7 @@
 #include "bt-common.h"
 #include "bt-request-sender.h"
 #include "bt-event-handler.h"
-#ifdef TIZEN_FEATURE_BT_DPM
 #include "bt-dpm.h"
-#endif
 
 BT_EXPORT_API int bluetooth_audio_init(bt_audio_func_ptr cb, void *user_data)
 {
@@ -88,7 +86,6 @@ BT_EXPORT_API int bluetooth_audio_connect(bluetooth_device_address_t *remote_add
                return BLUETOOTH_ERROR_PERMISSION_DEINED;
        }
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_ADDRESS, (void *)remote_address) == BT_DPM_RESTRICTED) {
                BT_ERR("Blacklist device");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
@@ -118,7 +115,6 @@ BT_EXPORT_API int bluetooth_audio_connect(bluetooth_device_address_t *remote_add
                        return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
                }
        }
-#endif
 
        user_info = _bt_get_user_data(BT_AUDIO);
        retv_if(user_info->cb == NULL, BLUETOOTH_ERROR_INTERNAL);
@@ -128,7 +124,6 @@ BT_EXPORT_API int bluetooth_audio_connect(bluetooth_device_address_t *remote_add
 
        g_array_append_vals(in_param1, remote_address, sizeof(bluetooth_device_address_t));
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (service_function == BT_AV_CONNECT)
                result = _bt_send_request_async(BT_BLUEZ_SERVICE, BT_AV_CONNECT,
                                in_param1, in_param2, in_param3, in_param4,
@@ -138,7 +133,7 @@ BT_EXPORT_API int bluetooth_audio_connect(bluetooth_device_address_t *remote_add
                                in_param1, in_param2, in_param3, in_param4,
                                user_info->cb, user_info->user_data);
        else /* default case - with or without DPM enabled */
-#endif
+
                result = _bt_send_request_async(BT_BLUEZ_SERVICE, BT_AUDIO_CONNECT,
                                in_param1, in_param2, in_param3, in_param4,
                                user_info->cb, user_info->user_data);
@@ -193,7 +188,6 @@ BT_EXPORT_API int bluetooth_ag_connect(bluetooth_device_address_t *remote_addres
                return BLUETOOTH_ERROR_PERMISSION_DEINED;
        }
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_ADDRESS, (void *)remote_address) == BT_DPM_RESTRICTED) {
                BT_ERR("Blacklist device");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
@@ -216,7 +210,6 @@ BT_EXPORT_API int bluetooth_ag_connect(bluetooth_device_address_t *remote_addres
                        return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
                }
        }
-#endif
 
        user_info = _bt_get_user_data(BT_AUDIO);
        retv_if(user_info->cb == NULL, BLUETOOTH_ERROR_INTERNAL);
@@ -282,7 +275,6 @@ BT_EXPORT_API int bluetooth_av_connect(bluetooth_device_address_t *remote_addres
                return BLUETOOTH_ERROR_PERMISSION_DEINED;
        }
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_ADDRESS, (void *)remote_address) == BT_DPM_RESTRICTED) {
                BT_ERR("Blacklist device");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
@@ -305,7 +297,6 @@ BT_EXPORT_API int bluetooth_av_connect(bluetooth_device_address_t *remote_addres
                        return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
                }
        }
-#endif
 
        user_info = _bt_get_user_data(BT_AUDIO);
        retv_if(user_info->cb == NULL, BLUETOOTH_ERROR_INTERNAL);
@@ -339,7 +330,6 @@ BT_EXPORT_API int bluetooth_av_source_connect(bluetooth_device_address_t *remote
                return BLUETOOTH_ERROR_PERMISSION_DEINED;
        }
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_ADDRESS, (void *)remote_address) == BT_DPM_RESTRICTED) {
                BT_ERR("Blacklist device");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
@@ -349,7 +339,6 @@ BT_EXPORT_API int bluetooth_av_source_connect(bluetooth_device_address_t *remote
                BT_ERR("Not allow to use A2DP profile");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
        }
-#endif
 
        user_info = _bt_get_user_data(BT_AUDIO);
        retv_if(user_info->cb == NULL, BLUETOOTH_ERROR_INTERNAL);
@@ -549,12 +538,10 @@ BT_EXPORT_API int bluetooth_ag_set_speaker_gain(unsigned int speaker_gain)
 
        BT_CHECK_ENABLED(return);
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_HSP, NULL) == BT_DPM_RESTRICTED) {
                BT_ERR("Not allow to use HSP profile");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
        }
-#endif
 
        BT_INIT_PARAMS();
        BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
index 9c6ba9a..4c0e1b8 100644 (file)
@@ -24,9 +24,7 @@
 #include "bt-common.h"
 #include "bt-request-sender.h"
 #include "bt-event-handler.h"
-#ifdef TIZEN_FEATURE_BT_DPM
 #include "bt-dpm.h"
-#endif
 
 BT_EXPORT_API int bluetooth_media_player_init(media_cb_func_ptr callback_ptr,
                                                void *user_data)
@@ -71,12 +69,10 @@ BT_EXPORT_API int bluetooth_media_player_change_property(
 
        BT_CHECK_ENABLED(return);
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_AVRCP, NULL) == BT_DPM_RESTRICTED) {
                BT_ERR("Not allow to use AVRCP profile");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
        }
-#endif
 
        BT_INIT_PARAMS();
        BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
@@ -100,12 +96,10 @@ BT_EXPORT_API int bluetooth_media_player_set_properties(
        BT_CHECK_PARAMETER(setting, return);
        BT_CHECK_ENABLED(return);
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_AVRCP, NULL) == BT_DPM_RESTRICTED) {
                BT_ERR("Not allow to use AVRCP profile");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
        }
-#endif
 
        BT_INIT_PARAMS();
        BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
@@ -129,12 +123,10 @@ BT_EXPORT_API int bluetooth_media_player_change_track(
        BT_CHECK_PARAMETER(metadata, return);
        BT_CHECK_ENABLED(return);
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_AVRCP, NULL) == BT_DPM_RESTRICTED) {
                BT_ERR("Not allow to use AVRCP profile");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
        }
-#endif
 
        BT_INIT_PARAMS();
        BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
@@ -227,7 +219,6 @@ BT_EXPORT_API int bluetooth_media_control_connect(
                return BLUETOOTH_ERROR_PERMISSION_DEINED;
        }
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_ADDRESS, remote_address) == BT_DPM_RESTRICTED) {
                BT_ERR("Blacklist device");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
@@ -237,7 +228,6 @@ BT_EXPORT_API int bluetooth_media_control_connect(
                BT_ERR("Not allow to use AVRCP profile");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
        }
-#endif
 
        user_info = _bt_get_user_data(BT_AVRCP);
        retv_if(user_info->cb == NULL, BLUETOOTH_ERROR_INTERNAL);
@@ -307,12 +297,11 @@ BT_EXPORT_API int bluetooth_media_target_connect(
                return BLUETOOTH_ERROR_PERMISSION_DEINED;
        }
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_AVRCP, NULL) == BT_DPM_RESTRICTED) {
                BT_ERR("Not allow to use AVRCP profile");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
        }
-#endif
+
        user_info = _bt_get_user_data(BT_AVRCP);
        retv_if(user_info->cb == NULL, BLUETOOTH_ERROR_INTERNAL);
 
@@ -373,12 +362,11 @@ BT_EXPORT_API int bluetooth_media_control_command(
 
        BT_CHECK_ENABLED(return);
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_AVRCP, NULL) == BT_DPM_RESTRICTED) {
                BT_ERR("Not allow to use AVRCP profile");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
        }
-#endif
+
        BT_INIT_PARAMS();
        BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
 
@@ -400,12 +388,11 @@ BT_EXPORT_API int bluetooth_media_control_command_to_dest(
 
        BT_CHECK_ENABLED(return);
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_AVRCP, NULL) == BT_DPM_RESTRICTED) {
                BT_ERR("Not allow to use AVRCP profile");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
        }
-#endif
+
        BT_INIT_PARAMS();
        BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
 
@@ -429,12 +416,10 @@ BT_EXPORT_API int bluetooth_media_control_set_property(
 
        BT_CHECK_ENABLED(return);
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_AVRCP, NULL) == BT_DPM_RESTRICTED) {
                BT_ERR("Not allow to use AVRCP profile");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
        }
-#endif
 
        BT_INIT_PARAMS();
        BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
@@ -461,12 +446,10 @@ BT_EXPORT_API int bluetooth_media_control_get_property(
        BT_CHECK_PARAMETER(value, return);
        BT_CHECK_ENABLED(return);
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_AVRCP, NULL) == BT_DPM_RESTRICTED) {
                BT_ERR("Not allow to use AVRCP profile");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
        }
-#endif
 
        BT_INIT_PARAMS();
        BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
@@ -493,12 +476,10 @@ BT_EXPORT_API int bluetooth_media_transport_set_property(
 
        BT_CHECK_ENABLED(return);
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_AVRCP, NULL) == BT_DPM_RESTRICTED) {
                BT_ERR("Not allow to use AVRCP profile");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
        }
-#endif
 
        BT_INIT_PARAMS();
        BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
@@ -525,12 +506,10 @@ BT_EXPORT_API int bluetooth_media_control_get_track_info(
        BT_CHECK_PARAMETER(metadata, return);
        BT_CHECK_ENABLED(return);
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_AVRCP, NULL) == BT_DPM_RESTRICTED) {
                BT_ERR("Not allow to use AVRCP profile");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
        }
-#endif
 
        BT_INIT_PARAMS();
        BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
index 53f13d5..bf7446b 100644 (file)
 #include "bluetooth-gatt-server-api.h"
 #endif
 
-#ifdef TIZEN_GATT_CLIENT
 #include "bluetooth-gatt-client-api.h"
-#endif
-
 #include "bluetooth-mesh-api.h"
 
 #include "bt-common.h"
 #include "bt-request-sender.h"
 #include "bt-event-handler.h"
-
-#ifdef TIZEN_FEATURE_BT_DPM
 #include "bt-dpm.h"
-#endif
 
 static bt_user_info_t user_info[BT_MAX_USER_INFO];
 static GDBusConnection *system_shared_conn = NULL;
@@ -285,7 +279,6 @@ void _bt_avrcp_event_cb(int event, int result, void *param,
                                        user_data);
 }
 
-#ifdef TIZEN_GATT_CLIENT
 void _bt_gatt_client_event_cb(int event, int result, void *param,
                void *callback, void *user_data)
 {
@@ -302,7 +295,6 @@ void _bt_gatt_client_event_cb(int event, int result, void *param,
                BT_ERR("GATT Client event callback is not registered!!!");
        }
 }
-#endif
 
 #ifndef GATT_DIRECT
 void _bt_gatt_server_event_cb(int event, int result, void *param,
index 5016d2c..857c51d 100644 (file)
 #include "bt-common.h"
 #include "bt-request-sender.h"
 #include "bt-event-handler.h"
-
-#ifdef TIZEN_FEATURE_BT_DPM
 #include "bt-dpm.h"
-#endif
 
 BT_EXPORT_API int bluetooth_disconnect_device(const bluetooth_device_address_t *remote_address)
 {
@@ -60,7 +57,6 @@ BT_EXPORT_API int bluetooth_bond_device(const bluetooth_device_address_t *device
                return BLUETOOTH_ERROR_PERMISSION_DEINED;
        }
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_PAIRING, NULL) == BT_DPM_RESTRICTED) {
                        BT_ERR("Not allow to pair the device");
                        return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
@@ -70,7 +66,6 @@ BT_EXPORT_API int bluetooth_bond_device(const bluetooth_device_address_t *device
                BT_ERR("Blacklist device");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
        }
-#endif
 
        user_info = _bt_get_user_data(BT_COMMON);
        retv_if(user_info->cb == NULL, BLUETOOTH_ERROR_INTERNAL);
@@ -364,12 +359,8 @@ BT_EXPORT_API int bluetooth_is_device_connected(const bluetooth_device_address_t
        return result;
 }
 
-#ifdef TIZEN_GATT_CLIENT
 BT_EXPORT_API int bluetooth_connect_le(const bluetooth_device_address_t *device_address,
                                        gboolean auto_connect, int client_id)
-#else
-BT_EXPORT_API int bluetooth_connect_le(const bluetooth_device_address_t *device_address, gboolean auto_connect)
-#endif
 {
        int result;
        bt_user_info_t *user_info;
@@ -388,10 +379,7 @@ BT_EXPORT_API int bluetooth_connect_le(const bluetooth_device_address_t *device_
 
        g_array_append_vals(in_param1, device_address, sizeof(bluetooth_device_address_t));
        g_array_append_vals(in_param2, &auto_connect, sizeof(gboolean));
-
-#ifdef TIZEN_GATT_CLIENT
        g_array_append_vals(in_param3, &client_id, sizeof(int));
-#endif
 
        user_info = _bt_get_user_data(BT_COMMON);
        retv_if(user_info == NULL, BLUETOOTH_ERROR_INTERNAL);
@@ -406,12 +394,8 @@ BT_EXPORT_API int bluetooth_connect_le(const bluetooth_device_address_t *device_
        return result;
 }
 
-#ifdef TIZEN_GATT_CLIENT
 BT_EXPORT_API int bluetooth_disconnect_le(const bluetooth_device_address_t *device_address,
                int client_id)
-#else
-BT_EXPORT_API int bluetooth_disconnect_le(const bluetooth_device_address_t *device_address)
-#endif
 {
        int result;
        bt_user_info_t *user_info;
@@ -429,10 +413,10 @@ BT_EXPORT_API int bluetooth_disconnect_le(const bluetooth_device_address_t *devi
        BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
 
        g_array_append_vals(in_param1, device_address, sizeof(bluetooth_device_address_t));
-#ifdef TIZEN_GATT_CLIENT
-       BT_DBG("Send GATT disconnect using Client Interface [%d]", client_id);
        g_array_append_vals(in_param2, &client_id, sizeof(int));
-#endif
+
+       BT_DBG("Send GATT disconnect using Client Interface [%d]", client_id);
+
        user_info = _bt_get_user_data(BT_COMMON);
        retv_if(user_info == NULL, BLUETOOTH_ERROR_INTERNAL);
 
index b7767b2..580778b 100644 (file)
@@ -15,7 +15,6 @@
  *
  */
 
-#ifdef TIZEN_FEATURE_BT_DPM
 #include <vconf.h>
 
 #include "bluetooth-api.h"
@@ -26,7 +25,6 @@
 #include "bt-event-handler.h"
 #include "bt-dpm.h"
 
-#ifdef TIZEN_FEATURE_BT_DPM
 BT_EXPORT_API int bluetooth_dpm_is_mode_allowed(void)
 {
        int value;
@@ -40,18 +38,6 @@ BT_EXPORT_API int bluetooth_dpm_is_mode_allowed(void)
        else
                return BLUETOOTH_ERROR_PERMISSION_DEINED;
 }
-#endif
-
-#if 0
-static bt_dpm_status_e _bt_check_dpm_allow_restriction(void)
-{
-       bt_dpm_allow_t mode;
-
-       bluetooth_dpm_get_allow_mode(&mode);
-
-       return (mode == BLUETOOTH_DPM_BT_RESTRICTED) ? BT_DPM_RESTRICTED : BT_DPM_ALLOWED;
-}
-#endif
 
 static bt_dpm_status_e _bt_check_dpm_handsfree_only(void)
 {
@@ -80,26 +66,6 @@ static bt_dpm_status_e _bt_check_dpm_desktop_connectivity_restriction(void)
        return (dpm_status == BLUETOOTH_DPM_RESTRICTED ? BT_DPM_RESTRICTED : BT_DPM_ALLOWED);
 }
 
-#if 0
-static bt_dpm_status_e _bt_check_dpm_visible_restriction(void)
-{
-       bt_dpm_status_t dpm_status = BLUETOOTH_DPM_ALLOWED;
-
-       bluetooth_dpm_get_desktop_connectivity_state(&dpm_status);
-
-       return (dpm_status == BLUETOOTH_DPM_RESTRICTED ? BT_DPM_RESTRICTED : BT_DPM_ALLOWED);
-}
-
-static bt_dpm_status_e _bt_check_dpm_limited_discoverable_mode(void)
-{
-       bt_dpm_status_t dpm_status = BLUETOOTH_DPM_ALLOWED;
-
-       bluetooth_dpm_get_limited_discoverable_state(&dpm_status);
-
-       return (dpm_status == BLUETOOTH_DPM_RESTRICTED ? BT_DPM_RESTRICTED : BT_DPM_ALLOWED);
-}
-#endif
-
 static bt_dpm_status_e _bt_check_dpm_blacklist_device(bluetooth_device_address_t *address)
 {
        int ret = BLUETOOTH_DPM_RESULT_SUCCESS;
@@ -296,11 +262,8 @@ int _bt_check_dpm(int service, void *param)
 BT_EXPORT_API int bluetooth_dpm_set_allow_mode(bt_dpm_allow_t value)
 {
        int result =  BLUETOOTH_ERROR_NONE;
-#ifdef TIZEN_FEATURE_BT_DPM
        int bt_status;
-#endif
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (value >= BLUETOOTH_DPM_BT_ALLOWED &&
                value <= BLUETOOTH_DPM_BT_RESTRICTED) {
                if (vconf_set_int(VCONFKEY_BT_DPM_STATUS, value) != 0) {
@@ -330,17 +293,6 @@ BT_EXPORT_API int bluetooth_dpm_set_allow_mode(bt_dpm_allow_t value)
                        result = bluetooth_disable_adapter();
                }
        }
-#else
-       BT_INIT_PARAMS();
-       BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
-
-       g_array_append_vals(in_param1, &value, sizeof(int));
-
-       result = _bt_send_request(BT_BLUEZ_SERVICE, BT_DPM_SET_ALLOW_BT_MODE,
-               in_param1, in_param2, in_param3, in_param4, &out_param);
-
-       BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
-#endif
 
        return result;
 
@@ -350,32 +302,11 @@ BT_EXPORT_API int bluetooth_dpm_get_allow_mode(bt_dpm_allow_t *value)
 {
        int result;
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (vconf_get_int(VCONFKEY_BT_DPM_STATUS, value) != 0) {
                BT_ERR("fail to get vconf key!");
                return BLUETOOTH_ERROR_INTERNAL;
        }
        result = BLUETOOTH_ERROR_NONE;
-#else
-       BT_CHECK_ENABLED_ANY(return);
-
-       BT_INIT_PARAMS();
-       BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
-
-       result = _bt_send_request(BT_BLUEZ_SERVICE, BT_DPM_GET_ALLOW_BT_MODE,
-               in_param1, in_param2, in_param3, in_param4, &out_param);
-
-       if (result == BLUETOOTH_ERROR_NONE) {
-               if (out_param->len > 0) {
-                       *value = g_array_index(out_param,
-                                       int, 0);
-               } else {
-                       BT_ERR("out_param length is 0!!");
-               }
-       }
-
-       BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
-#endif
 
        return result;
 }
@@ -1217,4 +1148,3 @@ BT_EXPORT_API int bluetooth_dpm_get_data_transfer_state(bt_dpm_status_t *value)
 
        return result;
 }
-#endif /* #ifdef TIZEN_FEATURE_BT_DPM */
index 492ec8c..79ce01a 100644 (file)
@@ -1244,7 +1244,7 @@ void __bt_device_event_filter(GDBusConnection *connection,
 #endif
 
        ret_if(signal_name == NULL);
-#ifdef TIZEN_GATT_CLIENT
+
        if (strcasecmp(signal_name, BT_GATT_SERVER_CONNECTED) == 0) {
                const char *address = NULL;
                bluetooth_device_address_t dev_address = { {0} };
@@ -1285,28 +1285,6 @@ void __bt_device_event_filter(GDBusConnection *connection,
                _bt_common_event_cb(BLUETOOTH_EVENT_GATT_CLIENT_DISCONNECTED,
                                result, &dev_address,
                                event_info->cb, event_info->user_data);
-#else
-       if (strcasecmp(signal_name, BT_GATT_CONNECTED) == 0) {
-               const char *address = NULL;
-               bluetooth_device_address_t dev_address = { {0} };
-               BT_DBG("BT_GATT_CONNECTED");
-               g_variant_get(parameters, "(i&s)", &result, &address);
-
-               _bt_convert_addr_string_to_type(dev_address.addr, address);
-               _bt_common_event_cb(BLUETOOTH_EVENT_GATT_CONNECTED,
-                               result, &dev_address,
-                               event_info->cb, event_info->user_data);
-       } else if (strcasecmp(signal_name, BT_GATT_DISCONNECTED) == 0) {
-               const char *address = NULL;
-               bluetooth_device_address_t dev_address = { {0} };
-               BT_DBG("BT_GATT_DISCONNECTED");
-               g_variant_get(parameters, "(i&s)", &result, &address);
-
-               _bt_convert_addr_string_to_type(dev_address.addr, address);
-               _bt_common_event_cb(BLUETOOTH_EVENT_GATT_DISCONNECTED,
-                               result, &dev_address,
-                               event_info->cb, event_info->user_data);
-#endif
        } else if (strcasecmp(signal_name, BT_GATT_REQ_ATT_MTU_CHANGED) == 0) {
                const char *address = NULL;
                bluetooth_device_address_t dev_address = { {0} };
@@ -1755,7 +1733,6 @@ void __bt_headset_event_filter(GDBusConnection *connection,
                _bt_headset_event_cb(BLUETOOTH_EVENT_AG_MIC_GAIN,
                                result, &gain,
                                event_info->cb, event_info->user_data);
-#ifdef TIZEN_FEATURE_BT_AVC_TARGET
        } else if (strcasecmp(signal_name, BT_AUDIO_AVC_MODE_CHANGED) == 0) {
                bool mode;
 
@@ -1772,7 +1749,6 @@ void __bt_headset_event_filter(GDBusConnection *connection,
                                result, &volume,
                                event_info->cb, event_info->user_data);
        }
-#endif
 }
 
 void __bt_hid_device_event_filter(GDBusConnection *connection,
@@ -3937,7 +3913,6 @@ static void __bt_event_data_free(void *data)
        g_free(cb_data);
 }
 
-#ifdef TIZEN_GATT_CLIENT
 static void __bt_gatt_client_event_filter(GDBusConnection *connection,
                const gchar *sender_name,
                const gchar *object_path,
@@ -4229,9 +4204,6 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection,
        }
 }
 
-#endif
-
-
 #ifndef GATT_DIRECT
 static void __bt_gatt_server_event_filter(GDBusConnection *connection,
                const gchar *sender_name,
@@ -4248,31 +4220,8 @@ static void __bt_gatt_server_event_filter(GDBusConnection *connection,
 
        event_info = (bt_event_info_t *)user_data;
        ret_if(event_info == NULL);
-#ifdef TIZEN_GATT_CLIENT
-       if (strcasecmp(signal_name, BT_GATT_VALUE_CHANGED) == 0) {
-#else
-       if (strcasecmp(signal_name, BT_GATT_CONNECTED) == 0) {
-               const char *address = NULL;
-               bluetooth_device_address_t dev_address = { {0} };
-               BT_DBG("BT_GATT_CONNECTED");
-               g_variant_get(parameters, "(i&s)", &result, &address);
-
-               _bt_convert_addr_string_to_type(dev_address.addr, address);
-               _bt_gatt_server_event_cb(BLUETOOTH_EVENT_GATT_CONNECTED,
-                               result, &dev_address,
-                               event_info->cb, event_info->user_data);
-       } else if (strcasecmp(signal_name, BT_GATT_DISCONNECTED) == 0) {
-               const char *address = NULL;
-               bluetooth_device_address_t dev_address = { {0} };
-               BT_DBG("BT_GATT_DISCONNECTED");
-               g_variant_get(parameters, "(i&s)", &result, &address);
 
-               _bt_convert_addr_string_to_type(dev_address.addr, address);
-               _bt_gatt_server_event_cb(BLUETOOTH_EVENT_GATT_DISCONNECTED,
-                               result, &dev_address,
-                               event_info->cb, event_info->user_data);
-       } else if (strcasecmp(signal_name, BT_GATT_VALUE_CHANGED) == 0) {
-#endif
+       if (strcasecmp(signal_name, BT_GATT_VALUE_CHANGED) == 0) {
                const char *address = NULL;
                GVariant *data_var = NULL;
                bluetooth_device_address_t dev_address = { {0} };
@@ -4537,13 +4486,10 @@ int _bt_register_event(int event_type, void *event_cb, void *user_data)
                path = BT_GATT_SERVER_PATH;
                break;
 #endif
-
-#ifdef TIZEN_GATT_CLIENT
        case BT_GATT_CLIENT_EVENT:
                event_func = __bt_gatt_client_event_filter;
                path = BT_GATT_CLIENT_PATH;
                break;
-#endif
        case BT_MESH_EVENT:
                event_func = __bt_mesh_event_filter;
                path = BT_MESH_PATH;
index 13eea3c..539f543 100644 (file)
 #include "bt-internal-types.h"
 #include "bt-request-sender.h"
 
-#ifdef TIZEN_GATT_CLIENT
 #include "bluetooth-gatt-client-api.h"
 #include <arpa/inet.h>
 static GSList *gatt_characteristic_notify_list;
 static GSList *gatt_characteristic_write_list = NULL;;
-#endif
 
 #define GATT_DEFAULT_TIMEOUT  (6 * 1000) // Dependent on supervision timeout 6 sec
 
@@ -52,14 +50,7 @@ BT_EXPORT_API int bluetooth_gatt_free_service_property(bt_gatt_service_property_
 {
        BT_CHECK_PARAMETER(svc_pty, return);
 
-#ifdef TIZEN_GATT_CLIENT
-       g_free(svc_pty->uuid);
-#else
        g_free(svc_pty->uuid);
-       g_free(svc_pty->handle);
-       g_strfreev(svc_pty->include_handles.handle);
-       g_strfreev(svc_pty->char_handle.handle);
-#endif
 
        memset(svc_pty, 0, sizeof(bt_gatt_service_property_t));
 
@@ -74,10 +65,6 @@ BT_EXPORT_API int bluetooth_gatt_free_char_property(bt_gatt_char_property_t *cha
        g_free(char_pty->name);
        g_free(char_pty->description);
        g_free(char_pty->val);
-#ifndef TIZEN_GATT_CLIENT
-       g_free(char_pty->handle);
-       g_strfreev(char_pty->char_desc_handle.handle);
-#endif
 
        memset(char_pty, 0, sizeof(bt_gatt_char_property_t));
 
@@ -90,9 +77,6 @@ BT_EXPORT_API int bluetooth_gatt_free_desc_property(bt_gatt_char_descriptor_prop
 
        g_free(desc_pty->uuid);
        g_free(desc_pty->val);
-#ifndef TIZEN_GATT_CLIENT
-       g_free(desc_pty->handle);
-#endif
 
        memset(desc_pty, 0, sizeof(bt_gatt_char_descriptor_property_t));
 
@@ -1803,7 +1787,6 @@ BT_EXPORT_API int bluetooth_gatt_unwatch_characteristics(const char *char_handle
        return ret;
 }
 
-#ifdef TIZEN_GATT_CLIENT
 void __bt_uuid_hex_to_string(unsigned char *uuid, char *str)
 {
        uint32_t uuid0, uuid4;
@@ -2812,5 +2795,3 @@ BT_EXPORT_API int bluetooth_gatt_client_deinit(
        BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
        return result;
 }
-
-#endif
index 4b13102..9ba2742 100644 (file)
@@ -2689,41 +2689,6 @@ BT_EXPORT_API int bluetooth_gatt_server_set_notification(const char *char_path,
        return err;
 }
 
-
-#if 0
-BT_EXPORT_API int bluetooth_gatt_register_application(int instance_id)
-{
-       BT_INIT_PARAMS();
-
-       if (!is_server_started) {
-
-               if (_bt_check_privilege(BT_CHECK_PRIVILEGE, BT_GATT_REGISTER_APPLICATION)
-                               == BLUETOOTH_ERROR_PERMISSION_DEINED) {
-                       BT_ERR("Don't have aprivilege to use this API");
-                       return BLUETOOTH_ERROR_PERMISSION_DEINED;
-               }
-
-               BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
-               g_array_append_vals(in_param1, &instance_id, sizeof(int));
-
-               ret = _bt_send_request(BT_BLUEZ_SERVICE, BT_GATT_REGISTER_APPLICATION,
-                               in_param1, in_param2, in_param3, in_param4, &out_param);
-               BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
-
-               if (ret != BLUETOOTH_ERROR_NONE) {
-                       BT_ERR("Register application failed");
-                       return ret;
-               }
-               is_server_started = true;
-
-               return BLUETOOTH_ERROR_NONE;
-       }
-
-       BT_INFO("Already RegisterApplication");
-       return BLUETOOTH_ERROR_NONE;
-}
-#endif
-
 BT_EXPORT_API int bluetooth_gatt_server_init(int *instance_id, gatt_server_cb_func_ptr callback_ptr,
                                                void *user_data)
 {
index 0657cc6..19e8e2f 100644 (file)
 #include "bt-common.h"
 #include "bt-request-sender.h"
 #include "bt-event-handler.h"
-
-#ifdef TIZEN_FEATURE_BT_DPM
 #include "bt-dpm.h"
-#endif
 
 BT_EXPORT_API int bluetooth_hid_init(hid_cb_func_ptr callback_ptr, void *user_data)
 {
@@ -74,7 +71,7 @@ BT_EXPORT_API int bluetooth_hid_connect(hid_device_address_t *device_address)
                BT_ERR("Don't have a privilege to use this API");
                return BLUETOOTH_ERROR_PERMISSION_DEINED;
        }
-#ifdef TIZEN_FEATURE_BT_DPM
+
        if (_bt_check_dpm(BT_DPM_ADDRESS, device_address) == BT_DPM_RESTRICTED) {
                BT_ERR("Blacklist device");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
@@ -84,7 +81,6 @@ BT_EXPORT_API int bluetooth_hid_connect(hid_device_address_t *device_address)
                BT_ERR("Blacklist uuid");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
        }
-#endif
 
        user_info = _bt_get_user_data(BT_HID);
        retv_if(user_info->cb == NULL, BLUETOOTH_ERROR_INTERNAL);
index 43453cd..e84a862 100644 (file)
 #include "bt-common.h"
 #include "bt-request-sender.h"
 #include "bt-event-handler.h"
-
-#ifdef TIZEN_FEATURE_BT_DPM
 #include "bt-dpm.h"
-#endif
 
 BT_EXPORT_API int bluetooth_network_activate_server()
 {
@@ -76,7 +73,6 @@ BT_EXPORT_API int bluetooth_network_connect(const bluetooth_device_address_t *de
                return BLUETOOTH_ERROR_PERMISSION_DEINED;
        }
 
-#ifdef TIZEN_FEATURE_BT_DPM
        char *uuid = NULL;
        if (_bt_check_dpm(BT_DPM_ADDRESS, (void *)device_address) == BT_DPM_RESTRICTED) {
                BT_ERR("Blacklist device");
@@ -117,7 +113,6 @@ BT_EXPORT_API int bluetooth_network_connect(const bluetooth_device_address_t *de
                }
        }
        g_free(uuid);
-#endif
 
        user_info = _bt_get_user_data(BT_COMMON);
        retv_if(user_info->cb == NULL, BLUETOOTH_ERROR_INTERNAL);
index b69d2bd..5d2a53d 100644 (file)
 #include "bt-common.h"
 #include "bt-request-sender.h"
 #include "bt-event-handler.h"
-
-#ifdef TIZEN_FEATURE_BT_DPM
 #include "bt-dpm.h"
-#endif
 
 static void __bt_get_file_size(char **files, unsigned long *file_size, int *count)
 {
@@ -77,7 +74,6 @@ BT_EXPORT_API int bluetooth_opc_push_files(bluetooth_device_address_t *remote_ad
                return BLUETOOTH_ERROR_PERMISSION_DEINED;
        }
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_ADDRESS, remote_address) == BT_DPM_RESTRICTED) {
                BT_ERR("Blacklist device");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
@@ -100,7 +96,6 @@ BT_EXPORT_API int bluetooth_opc_push_files(bluetooth_device_address_t *remote_ad
                        return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
                }
        }
-#endif
 
        __bt_get_file_size(file_name_array, &size, &file_count);
        retv_if(file_count == 0, BLUETOOTH_ERROR_INVALID_PARAM);
index 207dcda..a8f1334 100644 (file)
 #include "bt-request-sender.h"
 #include "bt-event-handler.h"
 #include "bluetooth-media-control.h"
-
-#ifdef TIZEN_GATT_CLIENT
 #include "bluetooth-gatt-client-api.h"
-#endif
-
 #include "bluetooth-mesh-api.h"
 
 static GSList *sending_requests;
@@ -231,7 +227,6 @@ static void __bt_get_event_info(int service_function, GArray *output,
                *param_data = &g_array_index(output,
                                bluetooth_device_address_t, 0);
                break;
-#ifdef TIZEN_GATT_CLIENT
        case BT_CONNECT_LE:
                *event_type = BT_DEVICE_EVENT;
                *event = BLUETOOTH_EVENT_GATT_CLIENT_CONNECTED;
@@ -246,23 +241,6 @@ static void __bt_get_event_info(int service_function, GArray *output,
                *param_data = &g_array_index(output,
                                bluetooth_device_address_t, 0);
                break;
-#else
-       case BT_CONNECT_LE:
-               *event_type = BT_DEVICE_EVENT;
-               *event = BLUETOOTH_EVENT_GATT_CONNECTED;
-               ret_if(output == NULL);
-               *param_data = &g_array_index(output,
-                               bluetooth_device_address_t, 0);
-               break;
-       case BT_DISCONNECT_LE:
-               *event_type = BT_DEVICE_EVENT;
-               *event = BLUETOOTH_EVENT_GATT_DISCONNECTED;
-               ret_if(output == NULL);
-               *param_data = &g_array_index(output,
-                               bluetooth_device_address_t, 0);
-               break;
-#endif
-#ifdef TIZEN_GATT_CLIENT
        case BT_GATT_READ_CHARACTERISTIC:
                BT_INFO("BT_GATT_READ_CHARACTERISTIC");
                *event_type = BT_GATT_CLIENT_EVENT;
@@ -295,7 +273,6 @@ static void __bt_get_event_info(int service_function, GArray *output,
                *param_data = &g_array_index(output,
                                bluetooth_gatt_client_desc_prop_info_t, 0);
                break;
-#endif
        case BT_TDS_READ_TRANSPORT_DATA:
                *event_type = BT_TDS_EVENT;
                *event = BLUETOOTH_EVENT_TDS_TRANSPORT_DATA_RECEIVED;
@@ -585,11 +562,9 @@ static void __send_request_cb(GDBusProxy *proxy,
        } else if (event_type == BT_AVRCP_EVENT) {
                ((bluetooth_cb_func_ptr)cb_data->cb)(bt_event.event,
                                &bt_event, cb_data->user_data);
-#ifdef TIZEN_GATT_CLIENT
        } else if (event_type == BT_GATT_CLIENT_EVENT) {
                ((gatt_client_cb_func_ptr)cb_data->cb)(bt_event.event,
                                (gatt_client_event_param_t*)&bt_event, cb_data->user_data);
-#endif
        } else if (event_type == BT_MESH_EVENT) {
                ((mesh_cb_func_ptr)cb_data->cb)(bt_event.event,
                                (mesh_event_param_t*)&bt_event, cb_data->user_data);
index eb95987..c362fd0 100644 (file)
 #include "bt-common.h"
 #include "bt-request-sender.h"
 #include "bt-event-handler.h"
-
-#ifdef TIZEN_FEATURE_BT_DPM
 #include "bt-dpm.h"
-#endif
 
 /* Variable for privilege, only for write API,
   before we should reduce time to bt-service dbus calling
@@ -1069,7 +1066,6 @@ BT_EXPORT_API int bluetooth_rfcomm_connect(
        BT_CHECK_PARAMETER(remote_uuid, return);
        BT_CHECK_ENABLED(return);
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_ADDRESS, (void *)remote_bt_address) == BT_DPM_RESTRICTED) {
                BT_ERR("Blacklist device");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
@@ -1093,7 +1089,6 @@ BT_EXPORT_API int bluetooth_rfcomm_connect(
                        return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
                }
        }
-#endif
 
 #ifdef TIZEN_FEATURE_BT_RFCOMM_DIRECT
        BT_INFO_C("### Connect RFCOMM");
index 55c6425..c549308 100644 (file)
 #include "bt-common.h"
 #include "bt-request-sender.h"
 #include "bt-event-handler.h"
-
-#ifdef TIZEN_FEATURE_BT_DPM
 #include "bt-dpm.h"
-#endif
 
 #define BLUETOOTH_SOCK_CONNECT_INFO_LEN 16
 #define BATTERY_MONITOR_RFCOMM_INTERVAL 5
@@ -400,7 +397,6 @@ int new_server_connection(const char *path, int fd, bluetooth_device_address_t *
                return -1;
        }
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_SPP, NULL) == BT_DPM_RESTRICTED) {
                char addr_str[20];
 
@@ -412,7 +408,6 @@ int new_server_connection(const char *path, int fd, bluetooth_device_address_t *
 
                return -1;
        }
-#endif
 
        conn = g_new0(rfcomm_conn_t, 1);
        conn->fd = fd;
@@ -1175,12 +1170,10 @@ BT_EXPORT_API int bluetooth_rfcomm_create_socket(const char *uuid)
                return BLUETOOTH_ERROR_PERMISSION_DEINED;
        }
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_SPP, NULL) == BT_DPM_RESTRICTED) {
                BT_ERR("Not allow to use SPP profile");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
        }
-#endif
 
 #ifdef TIZEN_FEATURE_BT_RFCOMM_DIRECT
        BT_INFO("<<<<<<<<< RFCOMM Create socket from app >>>>>>>>>");
@@ -1223,12 +1216,10 @@ BT_EXPORT_API int bluetooth_rfcomm_create_socket_ex(const char *uuid, const char
                return BLUETOOTH_ERROR_PERMISSION_DEINED;
        }
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_SPP, NULL) == BT_DPM_RESTRICTED) {
                BT_ERR("Not allow to use SPP profile");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
        }
-#endif
 
        BT_INFO("<<<<<<<<< RFCOMM Create socket from app >>>>>>>>>");
        info = __register_method_2(path, bus_name);
@@ -1483,12 +1474,10 @@ BT_EXPORT_API int bluetooth_rfcomm_listen_and_accept(int id, int max_pending_con
                return BLUETOOTH_ERROR_INVALID_PARAM;
        }
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_SPP, NULL) == BT_DPM_RESTRICTED) {
                BT_ERR("Not allow to use SPP profile");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
        }
-#endif
 
 #ifdef TIZEN_FEATURE_BT_RFCOMM_DIRECT
        BT_INFO("RFCOMM Listen & accept from app");
@@ -1541,12 +1530,10 @@ BT_EXPORT_API int bluetooth_rfcomm_listen_and_accept_ex(const char *uuid,
 
        BT_CHECK_ENABLED(return);
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_SPP, NULL) == BT_DPM_RESTRICTED) {
                BT_ERR("Not allow to use SPP profile");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
        }
-#endif
 
        BT_INFO("RFCOMM Listen & accept from app");
 
@@ -1587,12 +1574,10 @@ BT_EXPORT_API int bluetooth_rfcomm_listen(int id, int max_pending_connection)
                return BLUETOOTH_ERROR_INVALID_PARAM;
        }
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_SPP, NULL) == BT_DPM_RESTRICTED) {
                BT_ERR("Not allow to use SPP profile");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
        }
-#endif
 
 #ifdef TIZEN_FEATURE_BT_RFCOMM_DIRECT
        BT_INFO("RFCOMM Listen");
@@ -1649,12 +1634,10 @@ BT_EXPORT_API int bluetooth_rfcomm_accept_connection(int server_fd)
 
        BT_CHECK_ENABLED(return);
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_SPP, NULL) == BT_DPM_RESTRICTED) {
                BT_ERR("Not allow to use SPP profile");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
        }
-#endif
 
        if (server_fd < 0) {
                BT_ERR("Invalid FD");
index 4c50132..9274cd9 100644 (file)
@@ -2265,7 +2265,6 @@ BT_EXPORT_API int bluetooth_telephony_is_connected(gboolean *ag_connected)
 
 BT_EXPORT_API int bluetooth_telephony_set_active_headset(const char *remote_addr)
 {
-#ifdef TIZEN_BT_DUAL_HEADSET_CONNECT
        GVariant *reply;
        GVariant *param;
        GError *err = NULL;
@@ -2294,9 +2293,6 @@ BT_EXPORT_API int bluetooth_telephony_set_active_headset(const char *remote_addr
 
        g_variant_unref(reply);
        return BLUETOOTH_TELEPHONY_ERROR_NONE;
-#else
-       return BLUETOOTH_ERROR_NOT_SUPPORT;
-#endif
 }
 
 static void __bt_telephony_adapter_filter(GDBusConnection *connection,
index 0f652b2..13b4b3c 100644 (file)
@@ -259,10 +259,7 @@ typedef enum {
 #ifndef GATT_DIRECT
        BT_GATT_SERVER,
 #endif
-
-#ifdef TIZEN_GATT_CLIENT
        BT_GATT_CLIENT,
-#endif
        BT_MESH,
        BT_MAX_USER_INFO
 } bt_user_info_type_t;
@@ -307,10 +304,8 @@ void _bt_gatt_server_event_cb(int event, int result, void *param,
                void *callback, void *user_data);
 #endif
 
-#ifdef TIZEN_GATT_CLIENT
 void _bt_gatt_client_event_cb(int event, int result, void *param,
                void *callback, void *user_data);
-#endif
 
 /*Mesh*/
 void _bt_mesh_event_cb(int event, int result, void *param,
index 6750506..b0ba002 100644 (file)
@@ -15,8 +15,6 @@
  *
  */
 
-#ifdef TIZEN_FEATURE_BT_DPM
-
 #ifndef _BT_DPM_H_
 #define _BT_DPM_H_
 
@@ -54,4 +52,3 @@ int _bt_check_dpm(int service, void *param);
 }
 #endif /* __cplusplus */
 #endif /*_BT_SERVICE_DPM_H_*/
-#endif /* #ifdef TIZEN_FEATURE_BT_DPM */
index 10ea862..7c2ea5c 100644 (file)
@@ -21,9 +21,7 @@
 #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"
@@ -121,7 +119,6 @@ gboolean _bt_core_is_flight_mode_enabled(void)
        }
 }
 
-#ifdef TIZEN_FEATURE_ACTD
 static int __bt_call_systemact_service(const char *service_name)
 {
        int ret;
@@ -138,35 +135,6 @@ static int __bt_call_systemact_service(const char *service_name)
 
        return 0;
 }
-#else
-static int __bt_call_systemact_service(const char *file_path)
-{
-       BT_DBG("+");
-       FILE *fp;
-
-       if (!file_path) {
-               BT_ERR("service file path is NULL");
-               return -1;
-       }
-
-       if (!access(file_path, F_OK)) {
-               remove(file_path);
-               usleep(100);
-       }
-
-       fp = fopen(file_path, "w");
-       if (!fp) {
-               BT_ERR("Failed to fopen service file");
-               return -1;
-       }
-
-
-       fclose(fp);
-       BT_DBG("-");
-       return 0;
-
-}
-#endif
 
 static int __execute_command(const char *cmd, char *const arg_list[])
 {
@@ -241,9 +209,7 @@ int _bt_enable_adapter(void)
 {
        int ret;
        bt_status_t status;
-#if 0
-       bt_le_status_t le_status;
-#endif
+
        BT_INFO("");
 
        status = _bt_core_get_status();
@@ -253,17 +219,21 @@ int _bt_enable_adapter(void)
                return -1;
        }
 
-#if 0 /* only the concept of private */
+/* only the concept of private
+#if 0
+       bt_le_status_t le_status;
+
        le_status = _bt_core_get_le_status();
        if (le_status == BT_LE_ACTIVATED) {
-               /* Turn on PSCAN, (ISCAN if needed) */
-               /* Return with 0 for the Enabled response. */
+               // Turn on PSCAN, (ISCAN if needed)
+               // Return with 0 for the Enabled response.
                __bt_core_set_status(BT_ACTIVATED);
                BT_INFO("BR/EDR is enabled.");
                g_timeout_add(BT_CORE_IDLE_TERM_TIME, __bt_core_idle_terminate, NULL);
                return 0;
        }
 #endif
+*/
 
        __bt_core_set_status(BT_ACTIVATING);
        if (TIZEN_FEATURE_BT_USB_DONGLE) {
@@ -297,24 +267,25 @@ int _bt_enable_adapter(void)
 int _bt_disable_adapter(void)
 {
        bt_status_t status;
-#if 0
-       bt_le_status_t le_status;
-#endif
 
        BT_INFO_C("Disable adapter");
 
-#if 0 /* only the concept of private */
+/* only the concept of private
+#if 0
+       bt_le_status_t le_status;
+
        le_status = _bt_core_get_le_status();
        BT_DBG("le_status : %d", le_status);
        if (le_status == BT_LE_ACTIVATED) {
-               /* Turn off PSCAN, (ISCAN if needed) */
-               /* Return with 0 for the Disabled response. */
+               // Turn off PSCAN, (ISCAN if needed)
+               // Return with 0 for the Disabled response.
                __bt_core_set_status(BT_DEACTIVATED);
                BT_INFO("BR/EDR is disabled. now LE only mode");
                g_timeout_add(BT_CORE_IDLE_TERM_TIME, __bt_core_idle_terminate, NULL);
                return 0;
        }
 #endif
+*/
 
        status = _bt_core_get_status();
        if (status == BT_ACTIVATING) {
@@ -323,7 +294,6 @@ int _bt_disable_adapter(void)
                        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;
 
                        /* Check if radio status on or off */
@@ -339,10 +309,6 @@ int _bt_disable_adapter(void)
                                if (__bt_call_systemact_service(BT_SYSTEMACT_STACK_DOWN) < 0)
                                        BT_ERR("running script failed");
                        }
-#else
-                       if (__bt_call_systemact_service(BT_SYSTEMACT_STACK_DOWN) < 0)
-                               BT_ERR("running script failed");
-#endif
                }
                _bt_core_terminate();
                return 0;
@@ -360,7 +326,6 @@ int _bt_disable_adapter(void)
                }
                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;
 
                /* Check if radio status on or off */
@@ -382,13 +347,6 @@ int _bt_disable_adapter(void)
                                return -1;
                        }
                }
-#else
-               if (__bt_call_systemact_service(BT_SYSTEMACT_STACK_DOWN) < 0) {
-                               BT_ERR("running script failed");
-                               __bt_core_set_status(BT_ACTIVATED);
-                               return -1;
-               }
-#endif
        }
 
        return 0;
@@ -674,9 +632,7 @@ gboolean _bt_core_disable_adapter(void)
 gboolean _bt_core_recover_adapter(void)
 {
        int ret;
-#if 0
-       int ret_le;
-#endif
+
        BT_INFO_C("Recover bt adapter");
 
        _bt_set_flightmode_request(FALSE);
@@ -689,27 +645,26 @@ gboolean _bt_core_recover_adapter(void)
 
        if (_bt_core_get_status() == BT_ACTIVATED) {
                _bt_core_set_bt_status(BT_RECOVERY_MODE, 1);
-#ifdef TIZEN_FEATURE_BUSACT
                _bt_core_service_request_adapter(BT_DISABLE_ADAPTER);
-#endif
        }
        if (_bt_core_get_le_status() == BT_LE_ACTIVATED) {
                _bt_core_set_bt_le_status(BT_RECOVERY_MODE, 1);
-#ifdef TIZEN_FEATURE_BUSACT
                _bt_core_service_request_adapter(BT_DISABLE_ADAPTER_LE);
-#endif
        }
 
        ret = _bt_disable_adapter();
        if (ret < 0)
                BT_ERR("_bt_disable_adapter() failed");
 
-/* In platform, don't seperate BR/EDR and LE status */
+/* In platform, don't seperate BR/EDR and LE status
 #if 0
+       int ret_le;
+
        ret_le = _bt_disable_adapter_le();
        if (ret_le < 0)
                BT_ERR("_bt_disable_adapter_le() failed");
 #endif
+*/
        return TRUE;
 }
 
@@ -803,7 +758,6 @@ 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)
@@ -817,38 +771,6 @@ gboolean _bt_core_factory_test_mode(const char *type, const char *arg)
                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 };
-
-       if (g_strcmp0(type, "Enable_RF_Test") == 0) {
-               cmd = "/usr/etc/bluetooth/bt-edutm-on.sh";
-               arg_list[0] = "bt-edutm-on.sh";
-       } else if (g_strcmp0(type, "Disable_RF_Test") == 0) {
-               cmd = "/usr/etc/bluetooth/bt-edutm-off.sh";
-               arg_list[0] = "bt-edutm-off.sh";
-       } else if (g_strcmp0(type, "Slave_Mode") == 0) {
-               cmd = "/usr/etc/bluetooth/bt-mode-slave.sh";
-               arg_list[0] = "bt-mode-slave.sh";
-       } else if (g_strcmp0(type, "Master_Mode") == 0) {
-               cmd = "/usr/etc/bluetooth/bt-mode-master.sh";
-               arg_list[0] = "bt-mode-master.sh";
-       } else if (g_strcmp0(type, "SSP_Debug_Mode") == 0) {
-               cmd = "/usr/etc/bluetooth/bt-set-ssp-debug-mode.sh";
-               arg_list[0] = "bt-set-ssp-debug-mode.sh";
-               arg_list[1] = (char *)arg;
-       } else if (g_strcmp0(type, "RF_Channel") == 0) {
-               cmd = "/usr/etc/bluetooth/bt-enable-rf-channel.sh";
-               arg_list[0] = "bt-enable-rf-channel.sh";
-               arg_list[1] = (char *)arg;
-       } else {
-               return FALSE;
-       }
-
-       BT_DBG("Run %s", cmd);
-       if (__execute_command(cmd, arg_list) < 0)
-               BT_ERR("running script failed");
-#endif
 
        return TRUE;
 }
@@ -893,14 +815,6 @@ static gboolean __bt_core_recovery_cb(gpointer data)
                        BT_ERR("_bt_enable_adapter() failed");
        }
 
-#if 0
-       if (_bt_core_get_bt_le_status(BT_RECOVERY_MODE) == 1) {
-               _bt_core_set_bt_le_status(BT_RECOVERY_MODE, 0);
-               ret = _bt_enable_adapter_le();
-               if (ret < 0)
-                       BT_ERR("_bt_enable_adapter_le() failed");
-       }
-#endif
        is_recovery_mode = FALSE;
 
        BT_DBG("-");
@@ -957,9 +871,7 @@ static gboolean __bt_core_disable_timeout_cb(gpointer data)
                if (vconf_get_int(VCONFKEY_BT_STATUS, &bt_status_before_mode) == 0)
                        _bt_core_set_bt_status(BT_FLIGHT_MODE, bt_status_before_mode);
 
-#ifdef TIZEN_FEATURE_BUSACT
                _bt_core_service_request_adapter(BT_DISABLE_ADAPTER);
-#endif
                _bt_disable_adapter();
        }
 
@@ -969,9 +881,7 @@ static gboolean __bt_core_disable_timeout_cb(gpointer data)
                if (vconf_get_int(VCONFKEY_BT_LE_STATUS, &bt_le_status_before_mode) == 0)
                        _bt_core_set_bt_le_status(BT_FLIGHT_MODE, bt_le_status_before_mode);
 
-#ifdef TIZEN_FEATURE_BUSACT
                _bt_core_service_request_adapter(BT_DISABLE_ADAPTER_LE);
-#endif
                _bt_disable_adapter_le();
        }
 
index ea8748a..53472e8 100644 (file)
@@ -88,11 +88,12 @@ static gboolean __bt_check_bt_core(void *data)
        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)
                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)
                BT_ERR("Fail to get the flight_mode_deactivation value");
 
@@ -105,16 +106,9 @@ static gboolean __bt_check_bt_core(void *data)
        if ((bt_status != VCONFKEY_BT_STATUS_OFF || bt_off_due_to_timeout) &&
                (status == BT_DEACTIVATED)) {
                BT_DBG("Previous session was enabled.");
-#if 0
-               /* Enable the BT */
-               _bt_core_service_request_adapter(BT_ENABLE_ADAPTER);
-               if (!TIZEN_FEATURE_BT_USB_DONGLE)
-                       _bt_enable_adapter();
-#endif
        } else if (bt_status == VCONFKEY_BT_STATUS_OFF &&
                        (flight_mode_deactivation == 1 || ps_mode_deactivation > 0)) {
                //_bt_core_handle_flight_mode_noti();
-               _bt_core_handle_power_saving_mode_noti();
 
                _bt_core_set_bt_status(BT_FLIGHT_MODE, flight_mode_deactivation);
                _bt_core_set_bt_status(BT_POWER_SAVING_MODE, ps_mode_deactivation);
@@ -122,12 +116,6 @@ static gboolean __bt_check_bt_core(void *data)
 
        if ((bt_le_status == VCONFKEY_BT_LE_STATUS_ON) && (le_status == BT_LE_DEACTIVATED)) {
                BT_DBG("Previous session was le enabled. Turn BT LE on automatically.");
-#if 0
-               /* Enable the BT LE */
-               _bt_core_service_request_adapter(BT_ENABLE_ADAPTER_LE);
-               if (!TIZEN_FEATURE_BT_USB_DONGLE)
-                       _bt_enable_adapter_le();
-#endif
        } else {
                status = _bt_core_get_status();
                le_status = _bt_core_get_le_status();
index 9fdca7f..03086bb 100644 (file)
@@ -71,9 +71,8 @@ static void __bt_core_handle_adapter_with_power_saving_mode(int power_saving_mod
                        if (vconf_get_int(VCONFKEY_BT_STATUS, &bt_status_before_mode) == 0)
                                _bt_core_set_bt_status(BT_POWER_SAVING_MODE, bt_status_before_mode);
 
-#ifdef TIZEN_FEATURE_BUSACT
                        _bt_core_service_request_adapter(BT_DISABLE_ADAPTER);
-#endif
+
                        if (!TIZEN_FEATURE_BT_USB_DONGLE)
                                _bt_disable_adapter();
                }
@@ -83,10 +82,9 @@ static void __bt_core_handle_adapter_with_power_saving_mode(int power_saving_mod
                        if (vconf_get_int(VCONFKEY_BT_LE_STATUS, &bt_le_status_before_mode) == 0)
                                _bt_core_set_bt_le_status(BT_POWER_SAVING_MODE, bt_le_status_before_mode);
 
-#ifdef TIZEN_FEATURE_BUSACT
                        /* Disable the BT LE */
                        _bt_core_service_request_adapter(BT_DISABLE_ADAPTER_LE);
-#endif
+
                        if (!TIZEN_FEATURE_BT_USB_DONGLE)
                                _bt_disable_adapter_le();
                }
@@ -125,47 +123,22 @@ static void __bt_core_handle_adapter_with_power_saving_mode(int power_saving_mod
        }
 }
 
-#ifdef ENABLE_TIZEN_2_4
-static void __bt_core_power_saving_mode_cb(keynode_t *node, void *data)
-{
-       int power_saving_mode = 0;
-
-       DBG_SECURE("key=%s", vconf_keynode_get_name(node));
-
-       if (vconf_keynode_get_type(node) != VCONF_TYPE_INT) {
-               BT_ERR("Wrong vconf type");
-               return;
-       }
-
-       power_saving_mode = vconf_keynode_get_int(node);
-
-       BT_DBG("value=%d", power_saving_mode);
-
-       __bt_core_handle_adapter_with_power_saving_mode(power_saving_mode);
-}
-#endif
-
 void _bt_core_init_vconf_value(void)
 {
        gboolean flight_mode = FALSE;
-#ifndef ENABLE_TIZEN_2_4
        int power_saving_mode = 0;
-#endif
        int bt_flight_mode = 0;
        int bt_ps_mode = 0;
 
        //_bt_core_handle_flight_mode_noti();
-       _bt_core_handle_power_saving_mode_noti();
-
        flight_mode = _bt_core_is_flight_mode_enabled();
 
-#ifndef ENABLE_TIZEN_2_4
        if (!TIZEN_PROFILE_WEARABLE) {
                if (vconf_get_int(VCONFKEY_SETAPPL_PSMODE, &power_saving_mode) != 0)
                        BT_ERR("Fail to get the power_saving_mode status value");
                BT_DBG("flight_mode = %d, power_saving_mode = %d", flight_mode, power_saving_mode);
        }
-#endif
+
        BT_DBG("flight_mode = %d, power_saving_mode = %d", flight_mode, power_saving_mode);
 
        if (vconf_get_int(BT_OFF_DUE_TO_FLIGHT_MODE, &bt_flight_mode))
@@ -175,37 +148,15 @@ void _bt_core_init_vconf_value(void)
        if (vconf_get_int(BT_OFF_DUE_TO_POWER_SAVING_MODE, &bt_ps_mode))
                BT_ERR("Fail get power saving mode value");
        _bt_core_set_bt_status(BT_POWER_SAVING_MODE, bt_ps_mode);
-#ifndef ENABLE_TIZEN_2_4
+
        if (power_saving_mode > 0)
                __bt_core_handle_adapter_with_power_saving_mode(power_saving_mode);
        else
                BT_ERR("");
-#endif
-}
-
-void _bt_core_handle_power_saving_mode_noti(void)
-{
-       if (TIZEN_PROFILE_WEARABLE)
-               return;
-
-       BT_DBG("+");
-#ifdef ENABLE_TIZEN_2_4
-       int ret = 0;
-
-       ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_PSMODE,
-                       (vconf_callback_fn)__bt_core_power_saving_mode_cb, NULL);
-       if (ret < 0)
-               BT_ERR("Unable to register key handler");
-#endif
 }
 
 void _bt_core_unregister_vconf_handler(void)
 {
-#ifdef ENABLE_TIZEN_2_4
-       if (!TIZEN_PROFILE_WEARABLE) {
-               vconf_ignore_key_changed(VCONFKEY_SETAPPL_PSMODE,
-                               (vconf_callback_fn)__bt_core_power_saving_mode_cb);
-       }
-#endif
+
 }
 
index 72dd672..b96f546 100755 (executable)
@@ -34,7 +34,6 @@ extern "C" {
 #define BT_CORE_NAME "org.projectx.bt_core"
 #define BT_CORE_PATH "/org/projectx/bt_core"
 
-#ifdef TIZEN_FEATURE_ACTD
 #define BT_SYSTEMACT_HCI_LOGGER_START "bluetooth-hci-logger.service"
 #define BT_SYSTEMACT_HCI_LOGGER_STOP "bluetooth-hci-logger-stop.service"
 #define BT_SYSTEMACT_HCI_UP "bluetooth-hci-up.service"
@@ -48,19 +47,6 @@ extern "C" {
 #define BT_SYSTEMACT_STACK_DOWN_WITH_RADIO "bluetooth-stack-down-with-radio.service"
 #define BT_SYSTEMACT_EDUTM_ON "bluetooth-edutm-on.service"
 #define BT_SYSTEMACT_EDUTM_OFF "bluetooth-edutm-off.service"
-#else
-#define BT_SYSTEMACT_HCI_LOGGER_START "/run/.hci_logger_start"
-#define BT_SYSTEMACT_HCI_LOGGER_STOP "/run/.hci_logger_stop"
-#define BT_SYSTEMACT_HCI_UP "/run/.hci_up"
-#define BT_SYSTEMACT_HCI_DOWN "/run/.hci_down"
-#define BT_SYSTEMACT_BLUEZ_START "/run/.bluez_start"
-#define BT_SYSTEMACT_BLUETOOTH_SHARE_START "/run/.bluetooth_share_start"
-#define BT_SYSTEMACT_RFKILL_UNBLOCK "/run/.rfkill_unblock"
-#define BT_SYSTEMACT_RFKILL_BLOCK "/run/.rfkill_block"
-#define BT_SYSTEMACT_STACK_UP "/run/.bt_stack_up"
-#define BT_SYSTEMACT_STACK_DOWN "/run/.bt_stack_down"
-#define BT_SYSTEMACT_STACK_DOWN_WITH_RADIO "/run/.bt_stack_down_with_radio"
-#endif
 
 #define BT_CORE_TYPE (bt_core_get_type())
 
index d456bfb..30d0134 100755 (executable)
@@ -29,7 +29,6 @@ gboolean _bt_is_flightmode_request(void);
 
 void _bt_core_init_vconf_value(void);
 
-void _bt_core_handle_power_saving_mode_noti(void);
 void _bt_core_unregister_vconf_handler(void);
 
 #ifdef __cplusplus
index 4872314..95724ea 100644 (file)
@@ -856,13 +856,13 @@ struct hal_ev_mesh_scan_state_changed {
        uint8_t net_uuid[16];
 } __attribute__((packed));
 
-#if 0
+/*
 #define HAL_EV_MESH_SCAN_FINISHED      0xD4
 struct hal_ev_mesh_scan_finished {
        uint8_t status;
        uint8_t net_uuid[16];
 } __attribute__((packed));
-#endif
+*/
 
 #define HAL_EV_MESH_SCAN_RESULT                0xD5
 struct hal_ev_mesh_scan_result {
index 0390f87..79e7310 100644 (file)
@@ -1212,6 +1212,7 @@ static void __bt_hal_agent_release_memory(void)
 
 static inline void stack_trim(void)
 {
+/*
 #ifdef STACK_FLUSH
        unsigned int sp;
        char buf[BUF_SIZE];
@@ -1238,4 +1239,5 @@ static inline void stack_trim(void)
                        perror("stack madvise fail");
        }
 #endif
+*/
 }
index 5989b83..8e0330d 100644 (file)
@@ -82,23 +82,6 @@ static const char *__repeat_val_to_str(btrc_player_repeat_val_t repeat_val)
        }
 }
 
-#if 0
-static const char *__shuffle_val_to_str(btrc_player_shuffle_val_t shuffle_val)
-{
-       switch (shuffle_val) {
-       case BTRC_PLAYER_VAL_OFF_SHUFFLE:
-               return "off";
-       case BTRC_PLAYER_VAL_ALL_SHUFFLE:
-               return "alltracks";
-       case BTRC_PLAYER_VAL_GROUP_SHUFFLE:
-               return "group";
-       default:
-               ERR("Invalid shuffle value: %d", shuffle_val);
-               return "";
-       }
-}
-#endif
-
 static const char *__play_status_to_str(btrc_play_status_t play_status)
 {
        switch (play_status) {
index a71a887..32fb468 100644 (file)
@@ -721,11 +721,13 @@ static void __bt_hal_bond_device_cb(GDBusProxy *proxy, GAsyncResult *res,
        memset(&ev, 0, sizeof(ev));
        char dev_address[18];
 
-#if TODO_40
+/* #if TODO_40 */
        /* Terminate ALL system popup */
+/*
        if (headed_plugin_info->plugin_headed_enabled)
                headed_plugin_info->headed_plugin->bt_destroy_popup_all();
 #endif
+*/
 
        g_dbus_proxy_call_finish(proxy, res, &err);
        device_path = g_dbus_proxy_get_object_path(proxy);
index 4b677cc..af10eb2 100644 (file)
@@ -878,9 +878,9 @@ static bt_status_t _gattc_client_search_service(int conn_id)
                return BT_STATUS_FAIL;
        }
 
-#if 0
+/*
        // TODO: This logic is not able to handle in case service-added event is coming unexpectedly.
-       /* Check the service info is stored */
+       // Check the service info is stored
        if (g_slist_length(conn_info->gatt_list_services) > 0) {
                GSList *l = NULL;
                hal_gattc_service_t *svc_info = NULL;
@@ -899,8 +899,7 @@ static bt_status_t _gattc_client_search_service(int conn_id)
        } else {
                DBG("No stored service, request to bluez");
        }
-#endif
-
+*/
        _bt_hal_convert_addr_type_to_string(device_address,
                        (unsigned char *)conn_info->bd_addr.address);
 
index 1b36b19..3b267f1 100644 (file)
@@ -2664,14 +2664,8 @@ static bt_status_t gatt_server_add_descriptor(int slot, int service_handle, bt_u
        char *desc_flags[NUMBER_OF_FLAGS];
        int flag_count = 0;
        int *app_id;
-
        hal_gatt_desc_added *user_data = NULL;
-#if 0
-       if (new_char) {
-               desc_id = 1;
-               new_char = FALSE;
-       }
-#endif
+
        /* Fetch service data for the GATT server */
        serv_info = __bt_gatt_find_gatt_service_info(slot, service_handle);
        if (serv_info == NULL)
index 31e0795..7cf9274 100644 (file)
@@ -221,12 +221,12 @@ oal_status_t avrcp_enable(void)
        API_TRACE();
 
        /*TODO: Need to check below logic */
-#if 0
+       /*
        if (a2dp_sink_enable_state() == TRUE || avrcp_ct_enable_state() == TRUE) {
                BT_ERR("AVRCP_CT Role Enabled, cannot enable AVRCP_TG Role");
                return OAL_STATUS_BUSY;
        }
-#endif
+       */
 
        blued_api = adapter_get_stack_interface();
        if (blued_api == NULL) {
index 4fd1513..f5c11c2 100644 (file)
@@ -421,50 +421,6 @@ oal_status_t gatts_stop_advertising(int instance_id)
        return OAL_STATUS_SUCCESS;
 }
 
-#if 0
-/* Below API's need to be removed as they are hardcoded API's.
-   If at all, product specific API's are required to set specific data, then new naming should
-   be adopted for these API's */
-oal_status_t gatts_set_advertising_params(int instance_id, float min_intv, float max_intv)
-{
-       int ret = OAL_STATUS_SUCCESS;
-
-       API_TRACE("Set advertising params min_int:%f, max_int:%f", min_intv, max_intv);
-       CHECK_OAL_GATT_ENABLED();
-       CHECK_SERVER_INSTANCE(instance_id);
-       CHECK_SERVER_REGISTRATION(instance_id);
-
-       /* Historically used for Legacy Advertising */
-       return OAL_STATUS_NOT_SUPPORT;
-}
-
-oal_status_t gatts_set_advertising_data(int instance_id, uint16_t manufac_len, char* manufac_data)
-{
-       int ret = OAL_STATUS_SUCCESS;
-
-       API_TRACE("Set advertising data");
-       CHECK_OAL_GATT_ENABLED();
-       CHECK_SERVER_INSTANCE(instance_id);
-       CHECK_SERVER_REGISTRATION(instance_id);
-
-       /* Historically used for Legacy Advertising */
-       return OAL_STATUS_NOT_SUPPORT;
-}
-
-oal_status_t gatts_set_scan_response(int instance_id, uint16_t manufac_len, char* manufac_data)
-{
-       int ret = OAL_STATUS_SUCCESS;
-
-       API_TRACE("Set Scan Response data");
-       CHECK_OAL_GATT_ENABLED();
-       CHECK_SERVER_INSTANCE(instance_id);
-       CHECK_SERVER_REGISTRATION(instance_id);
-
-       /* Historically used for Legacy Advertising */
-       return OAL_STATUS_NOT_SUPPORT;
-}
-#endif
-
 oal_status_t gatts_multi_adv_enable(int instance_id)
 {
        int ret = OAL_STATUS_SUCCESS;
index 71abba0..8a8e64f 100644 (file)
@@ -29,6 +29,7 @@ SET(SRCS
 ./services/health/bt-service-hdp.c
 ./services/audio/avrcp/bt-service-avrcp-tg.c
 ./services/audio/avrcp/bt-service-avrcp-ctrl.c
+./services/audio/bt-service-absolute-volume.c
 ./services/gatt/bt-service-gatt.c
 ./services/audio/hf/bt-service-hf-client.c
 ./services/mesh/bt-service-mesh-util.c
@@ -61,10 +62,6 @@ LIST(APPEND SRCS ./services/ipsp/bt-service-ipsp.c)
 LIST(APPEND SRCS ./services/ipsp/bt-service-ipsp-event-receiver.c)
 ENDIF()
 
-IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_FEATURE_BT_AVC_TARGET")
-LIST(APPEND SRCS ./services/audio/bt-service-absolute-volume.c)
-ENDIF()
-
 IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
         SET(CMAKE_BUILD_TYPE "Release")
 ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "")
@@ -154,7 +151,6 @@ ADD_DEFINITIONS("-DAPP_DIR=\"${APP_DIR}\"")
 ADD_DEFINITIONS("-DAPP_LOCALEDIR=\"${APP_LOCALEDIR}\"")
 ADD_DEFINITIONS("-DAPP_SYSCONFDIR=\"${APP_SYSCONFDIR}\"")
 ADD_DEFINITIONS("-DHPS_FEATURE")
-ADD_DEFINITIONS("-DTIZEN_FEATURE_BT_DPM")
 
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
 
index be37d45..65613f7 100644 (file)
 #include "bt-service-audio-common.h"
 #include "bt-service-core-adapter-le.h"
 #include "bt-service-gatt.h"
-
-#ifdef TIZEN_FEATURE_BT_DPM
 #include "bt-service-dpm.h"
-#endif
 #include "bt-service-hidhost.h"
 #include "bt-service-hiddevice.h"
 #include "bt-service-socket.h"
@@ -712,23 +709,17 @@ static void __bt_visibility_alarm_create()
 int _bt_start_visibility_timer(int timeout)
 {
        int result;
-#ifdef TIZEN_FEATURE_BT_DPM
        int discoverable_state = DPM_BT_ERROR;
-#endif
 
        __bt_visibility_alarm_remove();
 
        visible_timer.timeout = timeout;
 
-#ifdef TIZEN_FEATURE_BT_DPM
        _bt_dpm_get_bluetooth_limited_discoverable_state(&discoverable_state);
        if (discoverable_state != DPM_RESTRICTED) {
-#endif
                if (vconf_set_int(BT_FILE_VISIBLE_TIME, timeout) != 0)
                        BT_ERR("Set vconf failed");
-#ifdef TIZEN_FEATURE_BT_DPM
        }
-#endif
 
        if (timeout <= 0)
                return BLUETOOTH_ERROR_NONE;
@@ -781,15 +772,12 @@ int _bt_set_discoverable_mode(int discoverable_mode, int timeout)
 {
        int result;
        int ret = BLUETOOTH_ERROR_NONE;;
-#ifdef TIZEN_FEATURE_BT_DPM
        int discoverable_state = DPM_BT_ERROR;
-#endif
 
        BT_DBG("+");
 
        BT_INFO("discoverable_mode: %d, timeout: %d", discoverable_mode, timeout);
 
-#ifdef TIZEN_FEATURE_BT_DPM
        _bt_dpm_get_bluetooth_limited_discoverable_state(&discoverable_state);
        if (discoverable_mode != BLUETOOTH_DISCOVERABLE_MODE_CONNECTABLE &&
                 discoverable_state == DPM_RESTRICTED) {
@@ -803,7 +791,6 @@ int _bt_set_discoverable_mode(int discoverable_mode, int timeout)
                        headed_plugin_info->headed_plugin->bt_launch_dpmpopup("DPM_POLICY_DISABLE_BT");
                return BLUETOOTH_ERROR_ACCESS_DENIED;
        }
-#endif
 
        switch (discoverable_mode) {
        case BLUETOOTH_DISCOVERABLE_MODE_CONNECTABLE:
@@ -1316,8 +1303,8 @@ int _bt_cleanup_profiles(void)
        /* TODO: Cleanup bluetooth profiles */
        _bt_hidhost_deinitialize();
        _bt_socket_deinit();
-#if 0
-       /* TODO: Cleanup bluetooth audio profiles */
+
+       /* TODO: Cleanup bluetooth audio profiles
        //_bt_audio_deinitialize(BT_A2DP_SOURCE_MODULE);
        //_bt_audio_deinitialize(BT_AVRCP_MODULE);
        //_bt_audio_deinitialize(BT_A2DP_SINK_MODULE);
@@ -1326,7 +1313,7 @@ int _bt_cleanup_profiles(void)
        //_bt_audio_deinitialize(BT_AUDIO_ALL_MODULE);
 
        a2dp_init_pending = TRUE;
-#endif
+       */
        _bt_hdp_deinit();
        _bt_gatt_deinit();
 
@@ -1343,12 +1330,6 @@ static void __bt_post_oal_init(void)
        if (vconf_get_int(VCONFKEY_BT_STATUS, &status) != 0)
                BT_ERR("Fail to get the enabled value");
 
-#if 0
-       /* Update Bluetooth Status to OFF */
-       if (vconf_set_int(VCONFKEY_BT_STATUS, VCONFKEY_BT_STATUS_OFF) != 0)
-               BT_ERR("Set vconf failed\n");
-#endif
-
        if (status & VCONFKEY_BT_STATUS_ON) {
                ret = _bt_enable_adapter();
                if (ret != BLUETOOTH_ERROR_NONE)
@@ -1596,10 +1577,8 @@ static void __bt_adapter_update_bt_disabled(void)
 
        _bt_device_handle_adapter_state(FALSE);
 
-#ifdef TIZEN_FEATURE_BT_AVC_TARGET
        /* Send the information to Absolute Volume Controller */
        _bt_audio_handle_adapter_disabled();
-#endif
 
        /* Update the vconf BT status in normal Deactivation case only */
        ret = vconf_get_int(VCONFKEY_SYSMAN_POWER_OFF_STATUS, &power_off_status);
@@ -1856,14 +1835,11 @@ static void __bt_adapter_discovery_state_change_callback(int bt_discovery_status
 static void __bt_set_visible_mode(void)
 {
        int timeout = 0;
-#ifdef TIZEN_FEATURE_BT_DPM
        int discoverable_state = DPM_BT_ERROR;
-#endif
 
        if (vconf_get_int(BT_FILE_VISIBLE_TIME, &timeout) != 0)
                BT_ERR("Fail to get the timeout value");
 
-#ifdef TIZEN_FEATURE_BT_DPM
        _bt_dpm_get_bluetooth_limited_discoverable_state(&discoverable_state);
        if (timeout == -1 || discoverable_state == DPM_RESTRICTED) {
                if (_bt_set_discoverable_mode(
@@ -1873,16 +1849,6 @@ static void __bt_set_visible_mode(void)
                                BT_ERR("Set vconf failed");
                }
        }
-#else
-       if (timeout == -1) {
-               if (_bt_set_discoverable_mode(
-                                       BLUETOOTH_DISCOVERABLE_MODE_GENERAL_DISCOVERABLE,
-                                       timeout) != BLUETOOTH_ERROR_NONE) {
-                       if (vconf_set_int(BT_FILE_VISIBLE_TIME, 0) != 0)
-                               BT_ERR("Set vconf failed");
-               }
-       }
-#endif
 }
 
 static void __bt_set_local_name(void)
index dc7638a..1f7c57c 100644 (file)
@@ -148,7 +148,7 @@ static void __bt_handle_av_source_disconnected_state(bluetooth_device_address_t
                         * But if Tizen supports a device with A2DP Sink and HFP both profiles (BT_AUDIO_HFP_SOURCE)
                         * then below logic will be required for corresponding connect/disconnect function
                         */
-#if 0
+/*
                        req_info = _bt_get_request_info_data(BT_AUDIO_CONNECT, addr);
                        if (req_info == NULL) {
                                BT_INFO("Audio Connect All request is also Not found..");
@@ -170,7 +170,7 @@ static void __bt_handle_av_source_disconnected_state(bluetooth_device_address_t
                                        BT_INFO("Pending connect is Not found..");
                                }
                        }
-#endif
+*/
                        goto check_wait_device;
                } else {
                        BT_ERR("AV Connect request has failed.."); /* DBUS return needed */
index 68e3342..4a99dc9 100644 (file)
@@ -111,10 +111,8 @@ static void __bt_handle_av_connected_state(bluetooth_device_address_t *address)
        /* Add data from the connected list */
        _bt_add_headset_to_list(BT_AUDIO_A2DP, BT_STATE_CONNECTED, addr);
 
-#ifdef TIZEN_FEATURE_BT_AVC_TARGET
        /* Send the information to Absolute Volume Controller */
        _bt_audio_handle_a2dp_state_changed(addr, true);
-#endif
 
        /* Delete waiting device data if present */
        wait_device = _bt_get_audio_wait_data();
@@ -199,10 +197,8 @@ static void __bt_handle_av_disconnected_state(bluetooth_device_address_t *addres
        /* Remove data from the connected list */
        _bt_remove_headset_from_list(BT_AUDIO_A2DP, addr);
 
-#ifdef TIZEN_FEATURE_BT_AVC_TARGET
        /* Send the information to Absolute Volume Controller */
        _bt_audio_handle_a2dp_state_changed(addr, false);
-#endif
 
        _bt_connection_manager_set_state(addr, BLUETOOTH_EVENT_AV_DISCONNECTED);
 
index 2ea7f0c..f38836e 100644 (file)
@@ -531,9 +531,7 @@ static void __handle_transport_property_delay(unsigned int *value)
 
 static void __handle_transport_property_volume(unsigned int avrcp_volume)
 {
-#ifdef TIZEN_FEATURE_BT_AVC_TARGET
        _bt_audio_handle_transport_volume_changed(avrcp_volume);
-#endif
 }
 
 static void __handle_avrcp_connection_event(int event, bt_address_t *bdaddr)
index 631f3b1..63b5b1b 100644 (file)
@@ -31,9 +31,6 @@
 #include "bt-service-event.h"
 #include "bt-service-avrcp-tg.h"
 
-/* We will remove this flag after stabilizing the functionality */
-#define AVC_DEBUG 1
-
 /* Avoid the build error related to vconf.h's dependency */
 #ifndef VCONFKEY_BT_AVC_MODE
 #define VCONFKEY_BT_AVC_MODE "db/bluetooth/avc_mode"
@@ -65,9 +62,7 @@ static void __bt_audio_covert_system_to_bt_volume(unsigned int sys_vol, unsigned
        if (*bt_vol > 0 && *bt_vol < 127)
                *bt_vol = *bt_vol + 1;
 
-#ifdef AVC_DEBUG
        BT_DBG("System volume [%d], BT volume [%d]", sys_vol, *bt_vol);
-#endif
 }
 
 static void __bt_audio_covert_bt_to_system_volume(unsigned int bt_vol, unsigned int *sys_vol)
@@ -85,9 +80,7 @@ static void __bt_audio_covert_bt_to_system_volume(unsigned int bt_vol, unsigned
        if (*sys_vol > 0 && *sys_vol < 150)
                *sys_vol = *sys_vol + 1;
 
-#ifdef AVC_DEBUG
        BT_DBG("System volume [%d], BT volume [%d]", *sys_vol, bt_vol);
-#endif
 }
 
 static int __bt_audio_get_active_headset_volume(void)
@@ -98,10 +91,6 @@ static int __bt_audio_get_active_headset_volume(void)
        gboolean connected = FALSE;
        unsigned int volume = BT_VOLUME_MAX + 1;
 
-#ifdef AVC_DEBUG
-       BT_DBG("+");
-#endif
-
        /* 1. Get active A2DP headset path */
 
        /* We should modify this function to get the active headset in later */
@@ -258,10 +247,6 @@ static void __bt_audio_user_avc_mode_cb(keynode_t *node, void *data)
 
 int _bt_audio_init_absolute_volume_control(void)
 {
-#ifdef AVC_DEBUG
-       BT_DBG("+");
-#endif
-
        absolute_volume = ABSOLUTE_VOLUME_MAX + 1;
        bt_volume = BT_VOLUME_MAX + 1;
        avc_mode = BT_AVC_OFF;
@@ -277,10 +262,6 @@ int _bt_audio_init_absolute_volume_control(void)
 
 void _bt_audio_deinit_absolute_volume_control(void)
 {
-#ifdef AVC_DEBUG
-       BT_DBG("+");
-#endif
-
        absolute_volume = ABSOLUTE_VOLUME_MAX + 1;
        bt_volume = BT_VOLUME_MAX + 1;
        avc_mode = BT_AVC_OFF;
@@ -356,9 +337,7 @@ int _bt_audio_get_absolute_volume(unsigned int *volume)
 
        *volume = absolute_volume;
 
-#ifdef AVC_DEBUG
        BT_DBG("volume: %d", *volume);
-#endif
 
        return BLUETOOTH_ERROR_NONE;
 }
@@ -372,9 +351,7 @@ int _bt_audio_is_avc_activated(bool *activated)
 
        *activated = (mode == BT_AVC_OFF) ? false : true;
 
-#ifdef AVC_DEBUG
        BT_DBG("avc_mode: %d", avc_mode);
-#endif
 
        return BLUETOOTH_ERROR_NONE;
 }
@@ -384,10 +361,6 @@ int _bt_audio_get_avc_mode(unsigned int *mode)
        int state = 0;
        int volume = 0;
 
-#ifdef AVC_DEBUG
-       BT_DBG("+");
-#endif
-
        /* 1. Get AVC mode in the vconf value */
        if (vconf_get_bool(VCONFKEY_BT_AVC_MODE, &state) != 0) {
                BT_ERR("vconf_get_bool failed");
@@ -435,10 +408,6 @@ void _bt_audio_handle_a2dp_state_changed(const char *address, bool connected)
 {
        unsigned int mode = 0;
 
-#ifdef AVC_DEBUG
-       BT_DBG("+");
-#endif
-
        /* In later, we can check the event for the active headset or not in here */
 
        if (connected == false) {
@@ -471,10 +440,6 @@ void _bt_audio_handle_transport_volume_changed(unsigned int bt_vol)
        int mode = BT_AVC_OFF;
        unsigned int prev_vol = absolute_volume;
 
-#ifdef AVC_DEBUG
-       BT_DBG("+");
-#endif
-
        if (bt_vol > BT_VOLUME_MAX) {
                /* BT AVC mode off, because bluez transport initiate the volue as MAX */
                absolute_volume = ABSOLUTE_VOLUME_MAX + 1;
index 25de426..8d0fdbc 100644 (file)
 #include "bt-service-mesh-network.h"
 #include "bt-service-mesh-config-client.h"
 #include "bt-service-mesh-model.h"
-
-#ifdef TIZEN_FEATURE_BT_DPM
 #include "bt-service-dpm.h"
-#endif
 #include "bt-service-hidhost.h"
 #include "bt-service-rfcomm.h"
 #include "bt-service-hdp.h"
@@ -100,12 +97,10 @@ static const gchar bt_service_introspection_xml[] =
 "                      <arg type='i' name='output_param1' direction='out' />"
 "                      <arg type='v' name='output_param2' direction='out' />"
 "              </method>"
-#ifdef TIZEN_FEATURE_BT_AVC_TARGET
 "              <method name='get_avc_mode'>"
                        /* Out Parameters */
 "                      <arg type='u' name='avc_mode' direction='out' />"
 "              </method>"
-#endif
 "      </interface>"
 "</node>";
 
@@ -224,7 +219,6 @@ static gboolean __bt_is_sync_function(int service_function)
                        || service_function == BT_START_LE_DISCOVERY
                        || service_function == BT_STOP_LE_DISCOVERY
                        || service_function == BT_GET_CONNECTABLE
-#ifdef TIZEN_GATT_CLIENT
                        || service_function == BT_GATT_CLIENT_REGISTER
                        || service_function == BT_GATT_GET_PRIMARY_SERVICES
                        || service_function == BT_GATT_GET_SERVICE_PROPERTIES
@@ -232,7 +226,6 @@ static gboolean __bt_is_sync_function(int service_function)
                        || service_function == BT_GATT_GET_CHARACTERISTIC_PROPERTIES
                        || service_function == BT_GATT_WATCH_CHARACTERISTIC
                        || service_function == BT_GATT_ACQUIRE_WRITE
-#endif
                        || service_function == BT_AUDIO_SELECT_ROLE
                        /* Mesh API's */
                        || service_function == BT_MESH_NETWORK_CREATE
@@ -441,7 +434,6 @@ fail:
                g_variant_unref(param4);
                g_variant_unref(param5);
        }
-#ifdef TIZEN_FEATURE_BT_AVC_TARGET
        else if (g_strcmp0(method_name, "get_avc_mode") == 0) {
                unsigned int mode = 0;
 
@@ -453,7 +445,6 @@ fail:
                g_dbus_method_invocation_return_value(invocation,
                        g_variant_new("(u)", mode));
        }
-#endif
 
        FN_END;
        return;
@@ -1156,7 +1147,6 @@ int __bt_bluez_request(int function_name,
                }
                break;
        }
-#ifdef TIZEN_FEATURE_BT_DPM
        case BT_DPM_SET_ALLOW_BT_MODE: {
                dpm_bt_allow_t value = DPM_BT_ERROR;
 
@@ -1432,7 +1422,6 @@ int __bt_bluez_request(int function_name,
                g_array_append_vals(*out_param1, &value, sizeof(int));
                break;
        }
-#endif
        case BT_RFCOMM_CLIENT_CONNECT: {
                bluetooth_device_address_t address = { {0} };
                char *input_string;
@@ -1602,7 +1591,6 @@ int __bt_bluez_request(int function_name,
                }
                break;
        }
-#ifdef TIZEN_FEATURE_BT_AVC_TARGET
        case BT_AUDIO_SET_ABSOLUTE_VOLUME: {
                unsigned int volume = 0;
 
@@ -1626,7 +1614,6 @@ int __bt_bluez_request(int function_name,
                g_array_append_vals(*out_param1, &activated, sizeof(bool));
                break;
        }
-#endif
        case BT_AV_CONNECT: {
                bluetooth_device_address_t address = { {0} };
                __bt_service_get_parameters(in_param1,
@@ -2756,7 +2743,6 @@ int __bt_bluez_request(int function_name,
 
                break;
        }
-#ifdef TIZEN_GATT_CLIENT
        /* Local Async */
        case BT_GATT_CLIENT_REGISTER: {
                bluetooth_device_address_t address = { {0} };
@@ -3177,7 +3163,6 @@ normal:
                                        parameters.timeout);
                break;
        }
-#endif
        case BT_START_LE_DISCOVERY: {
                uid_t uid = 0;
                pid_t pid = 0;
@@ -4888,11 +4873,9 @@ gboolean __bt_service_check_privilege(int function_name,
        case BT_AVRCP_SET_PROPERTIES:
        case BT_AVRCP_CONTROL_SET_PROPERTY:
 
-#ifdef TIZEN_FEATURE_BT_AVC_TARGET
        case BT_AUDIO_SET_ABSOLUTE_VOLUME:
        case BT_AUDIO_GET_ABSOLUTE_VOLUME:
        case BT_AUDIO_IS_AVC_ACTIVATED:
-#endif
 
        case BT_HF_CONNECT:
        case BT_HF_DISCONNECT:
@@ -4966,15 +4949,12 @@ gboolean __bt_service_check_privilege(int function_name,
        case BT_NETWORK_SERVER_DISCONNECT:
 
        case BT_GATT_GET_PRIMARY_SERVICES:
-#ifdef TIZEN_GATT_CLIENT
        case BT_GATT_GET_SERVICE_PROPERTIES:             /* GATT Client */
        case BT_GATT_GET_CHARACTERISTIC_PROPERTIES:      /* GATT Client */
        case BT_GATT_WATCH_SERVICE_CHANGED_INDICATION:   /* GATT Client */
-#endif
        case BT_GATT_DISCOVER_CHARACTERISTICS:
        case BT_GATT_SET_PROPERTY_REQUEST:
        case BT_GATT_READ_CHARACTERISTIC:
-#ifdef TIZEN_GATT_CLIENT
        case BT_GATT_READ_DESCRIPTOR_VALUE:              /* GATT Client */
        case BT_GATT_WRITE_CHARACTERISTIC_VALUE_BY_TYPE: /* GATT Client */
        case BT_GATT_ACQUIRE_WRITE:
@@ -4982,7 +4962,6 @@ gboolean __bt_service_check_privilege(int function_name,
        case BT_GATT_WATCH_CHARACTERISTIC:               /* GATT Client */
        case BT_GATT_CLIENT_REGISTER:                    /* GATT Client */
        case BT_GATT_CLIENT_UNREGISTER:                   /* GATT Client */
-#endif
        case BT_GATT_DISCOVER_CHARACTERISTICS_DESCRIPTOR:
        case BT_GATT_REGISTER_APPLICATION:
        case BT_GATT_REGISTER_SERVICE:
index 0b60679..7a8b870 100644 (file)
@@ -1524,7 +1524,6 @@ invocation_info_t* _bt_get_request_info_data(int service_function, char *address
        return NULL;
 }
 
-#ifdef TIZEN_GATT_CLIENT
 invocation_info_t* _bt_get_request_info_data_from_function_name(int service_function)
 {
        GSList *l;
@@ -1541,7 +1540,6 @@ invocation_info_t* _bt_get_request_info_data_from_function_name(int service_func
        BT_DBG("Not existed");
        return NULL;
 }
-#endif
 
 void _bt_set_device_values(gboolean connected, int state)
 {
index a0c354d..64a5ce1 100644 (file)
@@ -14,8 +14,6 @@
  * limitations under the License.
  *
  */
-#ifdef TIZEN_FEATURE_BT_DPM
-
 #include <glib.h>
 #include <gio/gio.h>
 #include <dlog.h>
@@ -68,19 +66,6 @@ int _bt_dpm_set_allow_bluetooth_mode(dpm_bt_allow_t value)
 {
        BT_INFO("_bt_dpm_set_allow_bluetooth_mode");
 
-#if 0
-       if (value == DPM_BT_ALLOWED && value == DPM_BT_HANDSFREE_ONLY) {
-               /* Update Bluetooth DPM Status to notify other modules */
-               if (vconf_set_int(VCONFKEY_BT_DPM_STATUS, value) != 0)
-                       BT_ERR("Set vconf failed\n");
-                       return DPM_RESULT_FAIL;
-       } else {
-               /* Update Bluetooth DPM Status to notify other modules */
-               if (vconf_set_int(VCONFKEY_BT_DPM_STATUS, VCONFKEY_BT_DPM_STATUS_RESTRICTED) != 0)
-                       BT_ERR("Set vconf failed\n");
-                       return DPM_RESULT_FAIL;
-       }
-#endif
        policy_table[DPM_POLICY_ALLOW_BLUETOOTH].value  = value;
 
        return BLUETOOTH_ERROR_NONE;
@@ -287,8 +272,9 @@ int _bt_dpm_add_bluetooth_uuids_to_blacklist(const char *uuid)
 
        policy_table[DPM_POLICY_BLUETOOTH_UUIDS_BLACKLIST].list  = g_slist_append(policy_table[DPM_POLICY_BLUETOOTH_UUIDS_BLACKLIST].list, l_uuid);
 
-#if 0 /* Use device functions if this logic required in later */
+       /* Use device functions if this logic required in later */
        /* Disconnect if connected blacklist uuid is existing */
+       /*
        addr_list = g_array_new(FALSE, FALSE, sizeof(gchar));
        _bt_get_profile_connected_devices((char *)uuid, &addr_list);
        for (i = 0; i < (addr_list->len / sizeof(bluetooth_device_address_t)); i++) {
@@ -300,7 +286,7 @@ int _bt_dpm_add_bluetooth_uuids_to_blacklist(const char *uuid)
                // TODO: need to implement disconnect logic
        }
        g_array_free(addr_list, TRUE);
-#endif
+       */
 
        return BLUETOOTH_ERROR_NONE;
 }
@@ -562,8 +548,9 @@ int _bt_dpm_set_bluetooth_profile_state(dpm_profile_t profile, dpm_status_t valu
        dpm_profile_state[profile].value = value;
 
 
-#if 0 /* Use other functions if this logic required in later */
+       /* Use other functions if this logic required in later */
        /* In case of restriction, disconnect if connected profile is existing */
+       /*
        if (value == DPM_RESTRICTED) {
                char *uuid = NULL;
                GArray *addr_list = NULL;
@@ -617,7 +604,7 @@ int _bt_dpm_set_bluetooth_profile_state(dpm_profile_t profile, dpm_status_t valu
                }
                g_array_free(addr_list, TRUE);
        }
-#endif
+       */
 
        return BLUETOOTH_ERROR_NONE;
 }
@@ -897,4 +884,3 @@ int _bt_dpm_clear_bluetooth_devices_from_list(void)
 
        return err;
 }
-#endif /* #ifdef TIZEN_FEATURE_BT_DPM */
index 8289a3e..3305136 100644 (file)
@@ -251,10 +251,6 @@ static gboolean __bt_handle_oal_events(gpointer data)
                        BT_INFO("Device properties received, Audio callback registered, call it...");
                        audio_event_cb(event_type, event_data);
                }
-#if 0
-               if (hid_cb)
-                       hid_cb(event_type, event_data);
-#endif
                if (device_cb)
                        device_cb(event_type, event_data);
                break;
@@ -375,7 +371,6 @@ static gboolean __bt_handle_oal_events(gpointer data)
                if (adapter_le_cb)
                        adapter_le_cb(event_type, event_data);
                break;
-#ifdef TIZEN_GATT_CLIENT
        case OAL_EVENT_GATTC_DISCONNECTION_COMPLETED:
        case OAL_EVENT_GATTC_SERVICE_SEARCH_RESULT:
        case OAL_EVENT_GATTC_SERVICE_SEARCH_DONE:
@@ -399,7 +394,6 @@ static gboolean __bt_handle_oal_events(gpointer data)
                if (adapter_le_cb)
                        adapter_le_cb(event_type, event_data);
                break;
-#endif
        case OAL_EVENT_BLE_DISCOVERY_STARTED:
        case OAL_EVENT_BLE_DISCOVERY_STOPPED:
        case OAL_EVENT_BLE_DISCOVERY_FINISHED:
index 97aaf88..63961f1 100644 (file)
@@ -121,17 +121,14 @@ int _bt_send_event(int event_type, int event, GVariant *param)
                path = BT_GATT_SERVER_PATH;
                break;
 #endif
-#ifdef TIZEN_GATT_CLIENT
        case BT_GATT_CLIENT_EVENT:
                path = BT_GATT_CLIENT_PATH;
                break;
-#endif
 
-#ifdef TIZEN_FEATURE_BT_AVC_TARGET
        case BT_AUDIO_AVC_EVENT:
                path = BT_AUDIO_AVC_PATH;
                break;
-#endif
+
        case BT_MESH_EVENT:
                path = BT_MESH_PATH;
                break;
@@ -456,7 +453,6 @@ int _bt_send_event(int event_type, int event, GVariant *param)
        case BLUETOOTH_EVENT_AVRCP_VOLUME_CHANGED:
                signal = BT_MEDIA_VOLUME_CHANGE;
                break;
-#ifdef TIZEN_GATT_CLIENT
        case BLUETOOTH_EVENT_GATT_SERVER_CONNECTED: /* GATT Server and Client */
                signal = BT_GATT_SERVER_CONNECTED;
                BT_INFO_C("### Connected [GATT server]");
@@ -473,16 +469,6 @@ int _bt_send_event(int event_type, int event, GVariant *param)
                signal = BT_GATT_CLIENT_DISCONNECTED;
                BT_INFO_C("### Disconnected [GATT client]");
                break;
-#else
-       case BLUETOOTH_EVENT_GATT_CONNECTED:
-               signal = BT_GATT_CONNECTED;
-               BT_INFO_C("### Connected [GATT]");
-               break;
-       case BLUETOOTH_EVENT_GATT_DISCONNECTED:
-               signal = BT_GATT_DISCONNECTED;
-               BT_INFO_C("### Disconnected [GATT]");
-               break;
-#endif
        case BLUETOOTH_EVENT_GATT_ATT_MTU_CHANGED:
                signal = BT_GATT_REQ_ATT_MTU_CHANGED;
                break;
@@ -509,12 +495,9 @@ int _bt_send_event(int event_type, int event, GVariant *param)
                signal = BT_GATT_SERVER_ACQUIRE_NOTIFICATION;
                break;
 #endif
-#ifdef TIZEN_GATT_CLIENT
        case BLUETOOTH_EVENT_GATT_CLIENT_SERVICE_CHANGED: /* GATT Client */
                signal = BT_GATT_CLIENT_SERVICE_CHANGED;
                break;
-#endif
-
        case BLUETOOTH_EVENT_IPSP_INIT_STATE_CHANGED:
                signal = BT_IPSP_INITIALIZED;
                break;
@@ -539,11 +522,9 @@ int _bt_send_event(int event_type, int event, GVariant *param)
        case BLUETOOTH_EVENT_OTC_STATE_CHANGED:
                signal = BT_OTC_STATE_CHANGED;
                break;
-#ifdef TIZEN_FEATURE_BT_AVC_TARGET
        case BLUETOOTH_EVENT_AUDIO_AVC_MODE_CHANGED:
                signal = BT_AUDIO_AVC_MODE_CHANGED;
                break;
-#endif
        /* Mesh events */
        case BLUETOOTH_EVENT_MESH_SCAN_STARTED:
                signal = BT_MESH_SCAN_STARTED;
@@ -648,11 +629,9 @@ int _bt_send_event_to_dest(const char* dest, int event_type,
        case BT_HDP_EVENT:
                path = BT_HDP_DEVICE_PATH;
                break;
-#ifdef TIZEN_GATT_CLIENT
        case BT_GATT_CLIENT_EVENT:
                path = BT_GATT_CLIENT_PATH;
                break;
-#endif
        default:
                BT_ERR("Unknown event");
                return BLUETOOTH_ERROR_INTERNAL;
@@ -713,7 +692,6 @@ int _bt_send_event_to_dest(const char* dest, int event_type,
        case BLUETOOTH_EVENT_HDP_DISCONNECTED:
                signal = BT_HDP_DISCONNECTED;
                break;
-#ifdef TIZEN_GATT_CLIENT
        case BLUETOOTH_EVENT_GATT_READ_CHAR:       /* GATT Client */
                signal = BT_GATT_CLIENT_READ_CHAR;
                break;
@@ -726,8 +704,6 @@ int _bt_send_event_to_dest(const char* dest, int event_type,
        case BLUETOOTH_EVENT_GATT_WRITE_DESC:      /* GATT Client */
                signal = BT_GATT_CLIENT_WRITE_DESC;
                break;
-#endif
-
        default:
                BT_ERR("Unknown event");
                return BLUETOOTH_ERROR_INTERNAL;
index fa2d3fb..7ee8782 100644 (file)
@@ -87,9 +87,7 @@ static void __on_log_glib(const gchar *log_domain, GLogLevelFlags log_level,
 
 static void __bt_release_service(void)
 {
-#ifdef TIZEN_FEATURE_BT_AVC_TARGET
        _bt_audio_deinit_absolute_volume_control();
-#endif
 
        _bt_service_le_deinit();
        _bt_deinit_hf_local_term_event_sender();
@@ -203,9 +201,6 @@ static gboolean __bt_check_bt_service(void *data)
        int bt_le_status = VCONFKEY_BT_LE_STATUS_OFF;
        int flight_mode_deactivation = 0;
        int bt_off_due_to_timeout = 0;
-#if 0
-       int ps_mode_deactivation = 0;
-#endif
 
        if (_is_name_acquired() == FALSE) {
                BT_ERR("dbus name is NOT acquired yet");
@@ -227,9 +222,11 @@ static gboolean __bt_check_bt_service(void *data)
        }
 
        if (TIZEN_PROFILE_TV) {
-#if TODO_40 /* Need to add this function */
+/*
+#if TODO_40
                if (_bt_get_enable_timer_id() == 0)
 #endif
+*/
                        _bt_enable_adapter();
        } else if (!headed_plugin_info->plugin_headed_enabled) {
                BT_DBG("Enable adapter if headless device");
@@ -244,11 +241,6 @@ static gboolean __bt_check_bt_service(void *data)
                if (vconf_get_int(BT_OFF_DUE_TO_FLIGHT_MODE, &flight_mode_deactivation) != 0)
                        BT_ERR("Fail to get the flight_mode_deactivation value");
 
-#if 0
-       if (vconf_get_int(BT_OFF_DUE_TO_POWER_SAVING_MODE, &ps_mode_deactivation) != 0)
-               BT_ERR("Fail to get the ps_mode_deactivation value");
-#endif
-
                if (vconf_get_int(BT_OFF_DUE_TO_TIMEOUT, &bt_off_due_to_timeout) != 0)
                        BT_ERR("Fail to get BT_OFF_DUE_TO_TIMEOUT");
 
@@ -364,11 +356,9 @@ int _bt_service_initialize(void)
 
        _bt_init_request_list();
 
-#ifdef TIZEN_FEATURE_BT_AVC_TARGET
        ret = _bt_audio_init_absolute_volume_control();
        if (ret != BLUETOOTH_ERROR_NONE)
                BT_ERR("Fail to init AVC");
-#endif
 
        is_initialized = TRUE;
 
index 32b43c7..50f2731 100644 (file)
@@ -41,9 +41,7 @@
 #include "bt-service-device-internal.h"
 #include "bt-service-event.h"
 #include "bt-service-event-receiver.h"
-#ifdef TIZEN_GATT_CLIENT
 #include "bt-service-gatt.h"
-#endif
 #include "bt-service-headset-connection.h"
 #include "bt-service-main.h"
 #ifdef TIZEN_MDM_ENABLE
@@ -159,7 +157,6 @@ typedef enum {
 
 static int dbfw_rssi;
 
-#ifdef TIZEN_GATT_CLIENT
 typedef struct {
        char *address;
        float interval_min;
@@ -187,7 +184,6 @@ static GSList *le_connected_dev_list = NULL;
 #define BT_LE_CONN_INTERVAL_SPLIT 1.25 /* msec */
 
 static void _bt_handle_le_connected_dev_info(const char *address, gboolean connected);
-#endif
 
 /* Forward declaration */
 static void __bt_device_event_handler(int event_type, gpointer event_data);
@@ -1511,12 +1507,9 @@ static void __bt_device_acl_state_changed_callback(event_dev_conn_status_t *acl_
        /* Update local cache */
        _bt_update_remote_dev_property(address, DEV_PROP_CONNECTED, (void *)&conn_info);
 
-#ifdef TIZEN_GATT_CLIENT
        /*handle LE connected device info*/
        if (type)
                _bt_handle_le_connected_dev_info(address, connected);
-#endif
-
 }
 
 static void __bt_device_remote_device_found_callback(gpointer event_data, gboolean is_ble)
@@ -2091,10 +2084,8 @@ gboolean _bt_is_device_connected(bluetooth_device_address_t *device_address, int
        case BT_PROFILE_CONN_HFG:
                svc_id = HFP_SERVICE_ID; /* Remote is HFP AG Unit */
                break;
-#ifdef TIZEN_GATT_CLIENT
        case BT_PROFILE_CONN_GATT:
                return _bt_is_remote_gatt_device_connected(device_address); /* Remote is GATT client or Server */
-#endif
        default:
                BT_DBG("Unknown svc_type: %d", svc_type);
                return FALSE;
@@ -2299,7 +2290,6 @@ int _bt_device_get_ida(bluetooth_device_address_t *device_address, bluetooth_dev
        return result;
 }
 
-#ifdef TIZEN_GATT_CLIENT
 static bt_connected_le_dev_t *__bt_get_le_connected_dev_info(const char *address)
 {
        GSList *l = NULL;
@@ -2716,4 +2706,3 @@ static gboolean __bt_ignore_auto_pairing_request(const char *address)
 
        return FALSE;
 }
-#endif
index 9ed8518..6f87e6f 100644 (file)
@@ -37,9 +37,7 @@
 #include "bt-service-gatt.h"
 #include "bt-service-core-device.h"
 #include "bt-service-core-adapter-le.h"
-#ifdef TIZEN_GATT_CLIENT
 #include "bluetooth-gatt-client-api.h"
-#endif
 
 #include <oal-hardware.h>
 #include <oal-manager.h>
 #define BT_SENDER_MAX_LENGTH 50
 #define MAX_APPS_SUPPORTED 11 /* Slot 0 is not used */
 #define BT_DEFAULT_ATT_MTU 23
-
-#ifdef TIZEN_GATT_CLIENT
 #define NUM_UUID 20
-#else
-#define NUM_UUID 10
-#endif
-
-
 #define UUID_MAX_LEN 50
 
-
 #define BDADDR_ANY   (&(bluetooth_device_address_t) {{0, 0, 0, 0, 0, 0} })
 
-#ifdef TIZEN_GATT_CLIENT
 static char uuid_list[NUM_UUID][BT_UUID_STRING_MAX] = {"0000b00b-0000-0000-f065-080080fa49b5", /* Used by BLEAPP */
        "0000b00b-1111-1111-0123-456789ab0cd2", /* Used by BLEAPP */
        "0000b00b-2222-1111-0123-456789ab0cd2",
@@ -89,20 +78,7 @@ static char uuid_list[NUM_UUID][BT_UUID_STRING_MAX] = {"0000b00b-0000-0000-f065-
        "0000b00c-1111-1111-0123-456789ab0cd2",
        "0000b00c-2222-1111-0123-456789ab0cd2",
        "0000b00c-3333-1111-0123-456789ab0cd2"};
-#else
-static char uuid_list[NUM_UUID][BT_UUID_STRING_MAX] = {"0000b00b-0000-0000-f065-080080fa49b5", /* Used by BLEAPP */
-       "0000b00b-1111-1111-0123-456789ab0cd2", /* Used by BLEAPP */
-       "0000b00b-2222-1111-0123-456789ab0cd2",
-       "0000b00b-3333-1111-0123-456789ab0cd2",
-       "0000b00b-4444-1111-0123-456789ab0cd2",
-       "0000b00b-5555-1111-0123-456789ab0cd2",
-       "0000b00b-6666-1111-0123-456789ab0cd2",
-       "0000b00b-7777-1111-0123-456789ab0cd2",
-       "0000b00b-8888-1111-0123-456789ab0cd2",
-       "0000b00b-9999-1111-0123-456789ab0cd2"};
-#endif
 
-#ifdef TIZEN_GATT_CLIENT
 /* Reserved GATT client Instance UUID. This is used only internally by bt-service */
 #define DEFAULT_GATT_CLIENT_UUID "0000a00a-1111-1111-0123-456789abcdef"
 
@@ -212,7 +188,6 @@ typedef struct {
 } bt_gatt_included_service_info_t;
 
 static GSList *list_gatt_info = NULL;
-#endif
 
 /* App Information structure */
 typedef struct {
@@ -227,11 +202,9 @@ typedef struct {
        int scan_rsp_len;
        gboolean is_initialized;
        GSList *service_handles;
-#ifdef TIZEN_GATT_CLIENT
        int client_id;                      /* GATT Client instance ID */
        bluetooth_device_address_t address; /* Remote BLE Device Address */
        gboolean is_watcher_enabled;
-#endif
 } bt_service_app_info_t;
 
 /* GATT Server Request Info Structure */
@@ -267,7 +240,6 @@ static int __bt_unregister_gatt_client_instance(int client_if);
 
 static void __bt_service_reset_gatt_data(void);
 
-#ifdef TIZEN_GATT_CLIENT
 static void __bt_handle_client_instance_registered(event_gattc_register_t *data);
 static void __bt_handle_client_connected(event_gattc_conn_t *event_data);
 static void __bt_handle_client_disconnected(event_gattc_conn_t *event_data);
@@ -286,7 +258,6 @@ static void __bt_handle_client_notification_registered(event_gattc_regdereg_noti
 static void __bt_handle_client_notification_data(event_gattc_notify_data *event_data);
 static void __bt_handle_client_service_changed_ind(event_gattc_service_changed_data *event_data);
 static void __bt_handle_client_mtu_exchange_completed(event_gattc_mtu_configured_t *event_data);
-#endif
 
 static int __bt_unregister_gatt_server_instance(int server_instance);
 static void __bt_cleanup_remote_services(struct gatt_server_info_t *conn_info);
@@ -462,7 +433,6 @@ void _bt_get_adv_handle_from_instance(int server_inst, int *adv_handle)
        }
 }
 
-#ifdef TIZEN_GATT_CLIENT
 char * _bt_gatt_get_default_gatt_client_uuid(void)
 {
        return g_strdup(DEFAULT_GATT_CLIENT_UUID);
@@ -484,7 +454,6 @@ static void __bt_register_default_gatt_client()
 
        g_free(uuid_str);
 }
-#endif
 
 int _bt_gatt_init(void)
 {
@@ -604,10 +573,10 @@ int _bt_get_allocated_server_instance(const char *sender, int adv_handle, gboole
                /* Exact matching of Adv handle + sender combination */
                if (!g_strcmp0(info->sender, sender) && info->adv_handle == adv_handle)
                        return info->instance_id;
-#if 0
+/*
                if (!g_strcmp0(info->sender, sender) && info->adv_handle == -1)
                        return info->instance_id;
-#endif
+*/
        }
        return -1;
 }
@@ -1000,7 +969,6 @@ static void __bt_gatt_handle_pending_request_info(int result,
 #endif
                case BT_CONNECT_LE:
                case BT_DISCONNECT_LE: {
-#ifdef TIZEN_GATT_CLIENT
                       char *addr = (char*)req_info->user_data;
                       bluetooth_device_address_t address;
 
@@ -1017,20 +985,8 @@ static void __bt_gatt_handle_pending_request_info(int result,
                                _bt_free_info_from_invocation_list(req_info);
                                g_array_free(out_param, TRUE);
                        }
-#else
-                       out_param = g_array_new(FALSE, FALSE, sizeof(gchar));
-
-                       g_array_append_vals(out_param, (bluetooth_device_address_t*)data,
-                                       sizeof(bluetooth_device_address_t));
-                       _bt_service_method_return(req_info->context, out_param, result);
-
-                       _bt_free_info_from_invocation_list(req_info);
-
-                       g_array_free(out_param, TRUE);
-#endif
                        break;
                }
-#ifdef TIZEN_GATT_CLIENT
                case BT_GATT_CLIENT_REGISTER: {
                        bt_service_app_info_t *param = (bt_service_app_info_t*)data;
 
@@ -1198,7 +1154,6 @@ static void __bt_gatt_handle_pending_request_info(int result,
                                g_array_free(out_param, TRUE);
                        }
                }
-#endif
                default:
                        break;
                }
@@ -1482,7 +1437,6 @@ static struct gatt_client_info_t *__bt_find_remote_gatt_client_info_from_conn_id
        return NULL;
 }
 
-#ifdef TIZEN_GATT_CLIENT
 struct gatt_server_info_t *_bt_find_remote_gatt_server_info(char *address)
 {
        GSList *l;
@@ -1516,9 +1470,7 @@ static struct gatt_out_conn_info_t* __bt_find_gatt_outgoing_conn_info(char *addr
        }
        return NULL;
 }
-#endif
 
-#ifdef TIZEN_GATT_CLIENT
 static void __bt_handle_gatt_server_connection_state(event_gatts_conn_t *event)
 {
        int result = BLUETOOTH_ERROR_NONE;
@@ -1675,121 +1627,6 @@ static void __bt_handle_gatt_server_disconnection_state(event_gatts_conn_t *even
 
        __bt_remove_mtu_gatt_device(address);
 }
-#else
-
-static void __bt_handle_gatt_server_connection_state(event_gatts_conn_t *event)
-{
-       int result = BLUETOOTH_ERROR_NONE;
-       struct gatt_client_info_t *conn_info = NULL;
-       bt_service_app_info_t *info = NULL;
-       bluetooth_device_address_t dev_addr;
-       GVariant *param = NULL;
-       int k;
-
-       char *address = g_malloc0(BT_ADDRESS_STRING_SIZE);
-
-       memcpy(dev_addr.addr, event->address.addr, 6);
-
-
-       /* Check if the just registered Instance ID belongs to BLEAPP or GATT Server */
-       for (k = 1; k < MAX_APPS_SUPPORTED; k++) {
-               info = &numapps[k];
-
-               if (info->instance_id == event->server_inst) {
-                       BT_INFO("Found GATT Server.. UUID [%s], sender [%s]", info->uuid, info->sender);
-                       __bt_gatt_handle_pending_request_info(result, BT_CONNECT_LE,
-                                       (bluetooth_device_address_t*)&dev_addr, sizeof(bluetooth_device_address_t));
-
-                       break;
-               }
-       }
-
-       /* Send event to BT-API */
-       _bt_convert_addr_type_to_string(address,
-                       (unsigned char *)dev_addr.addr);
-
-       BT_INFO("GATT Server Connedted: Remote Client addr[%s] Server Instance [%d] Connection ID [%d]",
-                       address, event->server_inst, event->conn_id);
-
-
-       /* Check if device is already in connected list */
-       conn_info = _bt_find_remote_gatt_client_info(address);
-
-       if (!conn_info) {
-               param = g_variant_new("(is)", result, address);
-               /* Send event to application */
-               _bt_send_event(BT_GATT_SERVER_EVENT,
-                               BLUETOOTH_EVENT_GATT_CONNECTED,
-                               param);
-
-               /* Save Connection info */
-               conn_info = g_new0(struct gatt_client_info_t, 1);
-               conn_info->addr = g_strdup(address);
-               BT_INFO("Added GATT client addr[%s]", conn_info->addr);
-               conn_info->connection_id = event->conn_id;
-               conn_info->instance_id = event->server_inst;
-               gatt_client_info_list = g_slist_append(gatt_client_info_list, conn_info);
-               BT_INFO("Total num of connected GATT clients [%d]", g_slist_length(gatt_client_info_list));
-       }
-
-       g_free(address);
-}
-
-/* GATT Server Dis connected */
-static void __bt_handle_gatt_server_disconnection_state(event_gatts_conn_t *event)
-{
-       int result = BLUETOOTH_ERROR_NONE;
-       struct gatt_client_info_t *conn_info = NULL;
-       bluetooth_device_address_t dev_addr;
-       bt_service_app_info_t *info = NULL;
-       GVariant *param = NULL;
-       int k;
-
-       char *address = g_malloc0(BT_ADDRESS_STRING_SIZE);
-
-       memcpy(dev_addr.addr, event->address.addr, 6);
-
-       /* Check if the just registered Instance ID belongs to BLEAPP or GATT Server */
-       for (k = 1; k < MAX_APPS_SUPPORTED; k++) {
-               info = &numapps[k];
-
-               if (info->instance_id == event->server_inst) {
-                       BT_INFO("Found GATT Server.. UUID [%s], sender [%s]", info->uuid, info->sender);
-                       __bt_gatt_handle_pending_request_info(result, BT_DISCONNECT_LE,
-                                       (bluetooth_device_address_t*)&dev_addr, sizeof(bluetooth_device_address_t));
-
-                       break;
-               }
-       }
-
-       /* Send event to BT-API */
-       _bt_convert_addr_type_to_string(address,
-                       (unsigned char *)dev_addr.addr);
-
-       BT_INFO("GATT Server DisConnected: Remote Client addr[%s] Server Instance [%d] Connection ID [%d]",
-                       address, event->server_inst, event->conn_id);
-
-       param = g_variant_new("(is)", result, address);
-       /* Send event to application */
-       _bt_send_event(BT_GATT_SERVER_EVENT,
-                       BLUETOOTH_EVENT_GATT_DISCONNECTED,
-                       param);
-
-       /* Remove Connection info */
-       conn_info = _bt_find_remote_gatt_client_info(address);
-       if (conn_info) {
-               BT_INFO("Remove GATT client info from List..");
-               /* Remove info from List */
-               gatt_client_info_list = g_slist_remove(gatt_client_info_list, conn_info);
-               BT_INFO("Total num of connected GATT clients [%d]", g_slist_length(gatt_client_info_list));
-               g_free(conn_info->addr);
-               g_free(conn_info);
-       }
-
-       g_free(address);
-}
-#endif
-
 
 static void __bt_handle_gatt_server_acquire_write_requested(event_gatts_srvc_acquire_attr_t *event)
 {
@@ -2186,7 +2023,6 @@ static void __bt_gatt_event_handler(int event_type, gpointer event_data)
                __bt_handle_gatt_mtu_changed_event((event_gatts_mtu_changed_t *)event_data);
                break;
        }
-#ifdef TIZEN_GATT_CLIENT
        case OAL_EVENT_GATTC_REGISTRATION: {
                BT_INFO("OAL Event: GATT Client instance Registered");
                __bt_handle_client_instance_registered((event_gattc_register_t *) event_data);
@@ -2272,7 +2108,6 @@ static void __bt_gatt_event_handler(int event_type, gpointer event_data)
                __bt_handle_client_mtu_exchange_completed((event_gattc_mtu_configured_t *) event_data);
                break;
        }
-#endif
        default:
                BT_DBG("Unhandled OAL event = 0x%x", event_type);
                break;
@@ -2680,7 +2515,6 @@ int _bt_get_att_mtu(bluetooth_device_address_t *address,
        return BLUETOOTH_ERROR_NONE;
 }
 
-#ifdef TIZEN_GATT_CLIENT
 /* GATT Client utility static functions */
 static bt_gatt_service_info_list_t *__bt_get_service_info_list(int conn_id)
 {
@@ -3221,13 +3055,13 @@ static void __bt_handle_client_connected(event_gattc_conn_t *event_data)
                        BT_DBG("Total num of connected Remote GATT server devices [%d]",
                                        g_slist_length(gatt_server_info_list));
 
-#if 0
+/*
                        BT_INFO("Do a Internal refresh");
                        if (OAL_STATUS_SUCCESS != gattc_refresh(conn_info->client_id, &event_data->address))
                                BT_ERR("GATT database refresh failed!!");
                        else
                                BT_INFO("GATT database refresh Success!!");
-#endif
+*/
                } else
                        BT_ERR("Local GATT Client connected event for addr[%s], but device is in connected list already", address);
 
@@ -5226,5 +5060,3 @@ int _bt_gatt_disable_data_batching(bluetooth_device_address_t *address)
 
        return BLUETOOTH_ERROR_NONE;
 }
-
-#endif
index e57084c..95a549f 100644 (file)
@@ -132,7 +132,6 @@ void _bt_audio_set_current_role(bluetooth_audio_role_t role);
 
 void _bt_audio_handle_incoming_authorization(char *address, int service_id);
 
-#ifdef TIZEN_FEATURE_BT_AVC_TARGET
 typedef enum {
        BT_AVC_OFF = 0x00,
        BT_AVC_NULL,
@@ -156,7 +155,6 @@ void _bt_audio_handle_adapter_disabled(void);
 void _bt_audio_handle_a2dp_state_changed(const char *address, bool connected);
 
 void _bt_audio_handle_transport_volume_changed(unsigned int bt_vol);
-#endif
 
 int _bt_hf_connect(bluetooth_device_address_t *device_address);
 
index 9ad8239..8509f11 100755 (executable)
 extern "C" {
 #endif
 
-#if 0
-
-#define BT_MEDIA_OBJECT_PATH "/Musicplayer"
-
-#define BT_AVRCP_ERROR (__bt_avrcp_error_quark())
-
-#define BT_ERROR_INTERNAL "InternalError"
-#define BT_ERROR_INVALID_PARAM "InvalidParameters"
-#define BT_ERROR_INVALID_INTERFACE "InvalidInterface"
-
-typedef enum {
-       BT_AVRCP_ERROR_NONE,
-       BT_AVRCP_ERROR_INTERNAL,
-       BT_AVRCP_ERROR_INVALID_PARAM,
-       BT_AVRCP_ERROR_NOT_SUPPORTED,
-       BT_AVRCP_ERROR_INVALID_INTERFACE
-} bt_avrcp_error_t;
-
-int _bt_register_media_player(void);
-
-int _bt_unregister_media_player(void);
-#endif
-
 int _bt_avrcp_connect_remote_ctrl(bluetooth_device_address_t *address);
 
 int _bt_avrcp_disconnect_remote_ctrl(bluetooth_device_address_t *address);
index 3c298c7..ad25eb3 100644 (file)
@@ -318,9 +318,7 @@ typedef struct {
        char *manufacturer_data;
        int manufacturer_data_len;
        guchar addr_type;
-#if 0 /* Should match with bt_dev_info_t in bluetooth-api.h */
-       bt_remote_le_dev_info_t le_dev_info;
-#endif
+
        int vid;
        int pid;
        int device_type;
index f9a6a93..54e3785 100755 (executable)
@@ -35,12 +35,10 @@ typedef struct {
 
 gboolean _bt_is_device_creating(void);
 
-#ifdef TIZEN_GATT_CLIENT
 int _bt_le_connection_update(const char *sender,
                unsigned char *device_address,
                float interval_min, float interval_max,
                guint16 latency, guint16 time_out);
-#endif
 
 #ifdef TIZEN_FEATURE_BT_OBEX
 bluetooth_trusted_profile_t _bt_get_trusted_profile_enum(const char *uuid);
index 81c89fa..05100bd 100644 (file)
@@ -14,8 +14,6 @@
  * limitations under the License.
  *
  */
-#ifdef TIZEN_FEATURE_BT_DPM
-
 #ifndef _BT_SERVICE_DPM_H_
 #define _BT_SERVICE_DPM_H_
 
@@ -161,4 +159,3 @@ int _bt_dpm_remove_bluetooth_uuids_from_blacklist(const char *uuids);
 }
 #endif /* __cplusplus */
 #endif /*_BT_SERVICE_DPM_H_*/
-#endif /* #ifdef TIZEN_FEATURE_BT_DPM */
index b6ef3dc..a7b93ee 100644 (file)
 #include <sys/types.h>
 #include "bluetooth-api.h"
 #include "bluetooth-gatt-server-api.h"
-
-#ifdef TIZEN_GATT_CLIENT
 #include "bluetooth-gatt-client-api.h"
-#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -104,7 +101,6 @@ struct gatt_client_info_t *_bt_find_remote_gatt_client_info(char *address);
 struct gatt_conn_info_t *_bt_find_remote_gatt_client_info(char *address);
 #endif
 
-#ifdef TIZEN_GATT_CLIENT
 char * _bt_gatt_get_default_gatt_client_uuid(void);
 
 int _bt_register_gatt_client_instance(const char *sender,
@@ -172,59 +168,6 @@ struct gatt_server_info_t *_bt_find_remote_gatt_server_info(char *address);
 struct gatt_conn_info_t *_bt_find_remote_gatt_server_info(char *address);
 #endif
 
-#endif
-//int _bt_gatt_server_enable_application(int instance_id);
-#if 0
-int _bt_gatt_server_register(char *sender);
-
-int _bt_gatt_server_unregister(char *sender);
-
-int _bt_gatt_server_update_multi_adv_info(char *name, int instance_id);
-
-int _bt_gatt_server_connect_remote_client(char *sender,
-                               bluetooth_device_address_t *address, int instance_id);
-
-int _bt_gatt_server_disconnect_remote_client(char *sender,
-                               bluetooth_device_address_t *address,
-                               int instance_id);
-
-int _bt_gatt_server_add_service(char *sender, int service_type,
-                               int num_handles, char *svc_uuid, int instance_id);
-
-int _bt_gatt_server_add_included_service(char *sender, int instance_id,
-               int service_handle, int included_svc_handle);
-
-int _bt_gatt_server_add_characteristic(char *sender, char *char_uuid,
-                               bluetooth_gatt_server_attribute_params_t *param);
-
-int _bt_gatt_server_add_descriptor(char *sender, char *desc_uuid,
-                               bt_gatt_permission_t *perm, int service_handle, int instance_id);
-
-int _bt_gatt_server_start_service(char *sender, int service_handle, int instance_id);
-
-int _bt_gatt_server_stop_service(char *sender, int service_handle, int instance_id);
-
-int _bt_gatt_server_delete_service(char *sender, int service_handle, int instance_id);
-
-int _bt_gatt_server_send_indication(char *sender, bluetooth_device_address_t *addr, bluetooth_gatt_att_data_t *data,
-                                       bluetooth_gatt_server_indication_params_t *param);
-
-int _bt_gatt_server_send_response(char *sender, bluetooth_gatt_att_data_t *data,
-                                       bluetooth_gatt_server_response_params_t *param);
-
-void _bt_gatt_server_clear_req_info(void);
-
-void _bt_gatt_server_clear_connection_info(void);
-
-bt_product_gatt_permission_t _bt_gatt_convert_attr_permission_to_stack_specific(
-               bt_gatt_permission_t perm);
-
-void _bt_check_gatt_server_app_termination(const char *name);
-
-int _bt_gatt_server_get_att_mtu(bluetooth_device_address_t *address, unsigned int *mtu);
-
-#endif
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
index df92523..6b0563d 100755 (executable)
@@ -31,6 +31,7 @@
 
 static inline void stack_trim(void)
 {
+/*
 #ifdef STACK_FLUSH
        unsigned int sp;
        char buf[BUF_SIZE];
@@ -57,6 +58,7 @@ static inline void stack_trim(void)
                        perror("stack madvise fail");
        }
 #endif
+*/
 }
 
 #endif                         /* __STACKTRIM_H__ */
index 5a54598..f29ca46 100644 (file)
 #include "bt-service-core-adapter.h"
 #include "bt-service-core-adapter-le.h"
 #include "bt-service-device.h"
-
-#ifdef TIZEN_FEATURE_BT_DPM
 #include "bt-service-dpm.h"
-#endif
 
 #define BT_MEDIA_OBJECT_PATH "/Musicplayer"
 static GDBusConnection *manager_conn;
index d2bbebd..efa24cf 100644 (file)
 #include "bt-service-opp-client.h"
 #include "bt-service-map-client.h"
 #include "bt-service-core-adapter.h"
-
-#ifdef TIZEN_FEATURE_BT_DPM
 #include "bt-service-dpm.h"
-#endif
 
 #define DBUS_TIMEOUT 20 * 1000 /* 20 Sec */
 static GDBusConnection *manager_conn;
@@ -78,21 +75,6 @@ void _bt_map_on_transfer_finished(const char *transfer_object_path, const int er
    This code will be removed and moved to OAL Event Handling part .
 */
 
-#if 0
-static void __bt_get_uuids(GVariant *value, bt_remote_dev_info_t *info)
-{
-       ret_if(value == NULL);
-       ret_if(info == NULL);
-
-       gsize uuid_count = 0;
-
-       info->uuids = g_variant_dup_strv(value, &uuid_count);
-       info->uuid_count = (unsigned int)uuid_count;
-
-       BT_DBG("uuid count : %d", uuid_count);
-}
-#endif
-
 void _bt_convert_addr_string_to_secure_string(char *addr,
                                        const char *address)
 {
index ff5102c..dbb163a 100644 (file)
@@ -20,9 +20,7 @@
 #include <dlog.h>
 #include <string.h>
 #include <dirent.h>
-#ifdef TIZEN_FEATURE_BT_DPM
 #include "bt-service-dpm.h"
-#endif
 
 #include <vconf.h>
 
@@ -619,9 +617,7 @@ static gboolean __bt_authorize_cb(GDBusMethodInvocation *context,
        GVariant *param = NULL;
        GError *err = NULL;
        bt_session_info_t *session_info = NULL;
-#ifdef TIZEN_FEATURE_BT_DPM
        int value = DPM_BT_ERROR;
-#endif
 
        BT_DBG(" path [%s] \n", path);
 
@@ -660,14 +656,13 @@ static gboolean __bt_authorize_cb(GDBusMethodInvocation *context,
 
        agent_info.auth_info->transfer_path = g_strdup(path);
 
-#ifdef TIZEN_FEATURE_BT_DPM
        _bt_dpm_get_allow_bluetooth_mode(&value);
        if (value == DPM_BT_HANDSFREE_ONLY) {
                /* Free auth info in next function */
                _bt_obex_server_reject_authorize();
                return FALSE;
        }
-#endif
+
        if (iter) {
                const gchar *key;
                GVariant *val;
index 97e5f66..2dc2a3f 100644 (file)
@@ -641,13 +641,10 @@ void __bt_pbap_get_vcard_list_cb(GDBusProxy *proxy,
                        g_variant_get(child, "(&s&s)", &elname, &elval);
 
                        memset(list_entry, 0, PBAP_VCARDLIST_MAXLENGTH);
-#if 0
-                       g_snprintf(list_entry, PBAP_VCARDLIST_MAXLENGTH - 1,
-                                       "<card handle = \"%s\" name = \"%s\"/>", elname, elval);
-#else
+
                        g_snprintf(list_entry, PBAP_VCARDLIST_MAXLENGTH - 1,
                                        "%s", elval);
-#endif
+
                        //If possible send as Array of <STRING, STRING>
                        BT_DBG("%s", list_entry);
                        vcard_list[i] = g_strdup(list_entry);
index 80988d1..47aa397 100644 (file)
@@ -62,9 +62,7 @@ extern "C" {
 
 #define BLUETOOTH_PIN_CODE_MAX_LENGTH 16
 
-#ifdef TIZEN_GATT_CLIENT
 #define BLUETOOTH_GATT_ATT_DATA_LENGTH_MAX      610 /**< GATT ATT value max len */
-#endif
 
 /**
  * This is Bluetooth Connected event role
@@ -837,15 +835,10 @@ typedef enum {
        BLUETOOTH_EVENT_GATT_READ_DESC, /**<Gatt Read Characteristic Descriptor Value */
        BLUETOOTH_EVENT_GATT_WRITE_DESC, /**<Gatt Write Characteristic Descriptor Value */
        BLUETOOTH_EVENT_GATT_SVC_CHAR_DESC_DISCOVERED, /**<Gatt Char Descriptors Discovered Event*/
-#ifdef TIZEN_GATT_CLIENT
        BLUETOOTH_EVENT_GATT_SERVER_CONNECTED,/**<Local Gatt Server connected event */
        BLUETOOTH_EVENT_GATT_SERVER_DISCONNECTED, /**<Local Gatt Server Disconnected event */
        BLUETOOTH_EVENT_GATT_CLIENT_CONNECTED,/**<Local Gatt Client connected event */
        BLUETOOTH_EVENT_GATT_CLIENT_DISCONNECTED, /**<Local Gatt Client Disconnected event */
-#else
-       BLUETOOTH_EVENT_GATT_CONNECTED,/**<Gatt connected event */
-       BLUETOOTH_EVENT_GATT_DISCONNECTED, /**<Gatt Disconnected event */
-#endif
        BLUETOOTH_EVENT_GATT_ATT_MTU_CHANGED, /**<Attribute protocol MTU changed event */
        BLUETOOTH_EVENT_GATT_SERVER_ATT_MTU_CHANGED, /**<Attribute protocol Server MTU changed event */
        BLUETOOTH_EVENT_GATT_SERVER_CHARACTERISTIC_VALUE_CHANGED, /**<Gatt Char write callback event */
@@ -1599,13 +1592,10 @@ typedef struct {
 typedef struct {
        int count;
        char **handle;
-#ifdef TIZEN_GATT_CLIENT
        char uuids[BLUETOOTH_MAX_SERVICES_FOR_DEVICE][BLUETOOTH_UUID_STRING_MAX];
        int inst_id[BLUETOOTH_MAX_SERVICES_FOR_DEVICE];
-#endif
 } bt_gatt_handle_info_t;
 
-#ifdef TIZEN_GATT_CLIENT
 /**
  * Structure to a most basic GATT attribute handle data
  */
@@ -1614,7 +1604,6 @@ typedef struct {
        unsigned char uuid[16];
        char address[BLUETOOTH_ADDRESS_STRING_LENGTH];
 } bt_gatt_handle_property_t;
-#endif
 
 /**
  * Structure to GATT Remote service data
@@ -1626,9 +1615,7 @@ typedef struct {
        gboolean primary;
        bt_gatt_handle_info_t include_handles;
        bt_gatt_handle_info_t char_handle;
-#ifdef TIZEN_GATT_CLIENT
        bt_gatt_handle_property_t prop; /* Added Service UUID, instance_id & associated remote device  */
-#endif
 } bt_gatt_service_property_t;
 
 /**
@@ -1667,12 +1654,10 @@ typedef struct {
        unsigned int permission;
        char *representation;
        bt_gatt_handle_info_t char_desc_handle;
-#ifdef TIZEN_GATT_CLIENT
        bt_gatt_handle_property_t prop;      /* Added Char UUID, instance_id */
        bt_gatt_handle_property_t svc_prop;  /* Added Service UUID, instance_id */
        char value[BLUETOOTH_GATT_ATT_DATA_LENGTH_MAX]; /* Added */
        char address[BLUETOOTH_ADDRESS_STRING_LENGTH];         /* Added */
-#endif
 } bt_gatt_char_property_t;
 
 /**
@@ -1684,13 +1669,11 @@ typedef struct {
        char *uuid;
        unsigned char *val;
        unsigned int val_len;
-#ifdef TIZEN_GATT_CLIENT
        bt_gatt_handle_property_t prop;      /* Added Descriptor UUID, instance_id */
        bt_gatt_handle_property_t char_prop; /* Added Char UUID, instance_id */
        bt_gatt_handle_property_t svc_prop;  /* Added Service UUID, instance_id */
        char value[BLUETOOTH_GATT_ATT_DATA_LENGTH_MAX];/* Added */
        char address[BLUETOOTH_ADDRESS_STRING_LENGTH];          /* Added */
-#endif
 } bt_gatt_char_descriptor_property_t;
 
 /**
@@ -1739,10 +1722,8 @@ typedef struct {
        bluetooth_device_address_t device_addr;
        char *svc_path;
        bluetooth_gatt_service_change_type_t change_type;
-#ifdef TIZEN_GATT_CLIENT
        int inst_id;
        char *uuid;
-#endif
 } bt_gatt_service_change_t;
 
 /**
@@ -5694,19 +5675,11 @@ int bluetooth_gatt_free_char_property(bt_gatt_char_property_t *char_pty);
  */
 int bluetooth_gatt_free_desc_property(bt_gatt_char_descriptor_property_t *desc_pty);
 
-#ifdef TIZEN_GATT_CLIENT
 int bluetooth_connect_le(const bluetooth_device_address_t *device_address,
                                gboolean auto_connect, int client_id);
-#else
-int bluetooth_connect_le(const bluetooth_device_address_t *device_address, gboolean auto_connect);
-#endif
 
-#ifdef TIZEN_GATT_CLIENT
 int bluetooth_disconnect_le(const bluetooth_device_address_t *device_address,
                int client_id);
-#else
-int bluetooth_disconnect_le(const bluetooth_device_address_t *device_address);
-#endif
 
 int bluetooth_get_gatt_data_batching_available_packets(
        int *available_packets);
index 442c222..536dd4c 100644 (file)
@@ -87,15 +87,11 @@ typedef enum {
 //#ifndef GATT_DIRECT
        BT_GATT_SERVER_EVENT,
 //#endif
-#ifdef TIZEN_GATT_CLIENT
        BT_GATT_CLIENT_EVENT,
-#endif
        BT_TDS_EVENT,
        BT_OTP_EVENT,
        BT_HDP_EVENT,
-#ifdef TIZEN_FEATURE_BT_AVC_TARGET
        BT_AUDIO_AVC_EVENT,
-#endif
        BT_MESH_EVENT,
        /* Will be added */
 } bt_event_type_t;
@@ -370,23 +366,19 @@ typedef enum {
        BT_HDP_GET_FD,
 
        BT_GATT_GET_PRIMARY_SERVICES = BT_FUNC_GATT_BASE, /* GATT Client */
-#ifdef TIZEN_GATT_CLIENT
        BT_GATT_CLIENT_REGISTER,        /* GATT Client */
        BT_GATT_CLIENT_UNREGISTER,      /* GATT Client */
        BT_GATT_GET_SERVICE_PROPERTIES, /* GATT Client */
        BT_GATT_GET_CHARACTERISTIC_PROPERTIES, /* GATT Client */
        BT_GATT_GET_INCLUDED_SERVICES,          /* GATT Client */
-#endif
        BT_GATT_DISCOVER_CHARACTERISTICS,
        BT_GATT_SET_PROPERTY_REQUEST,
        BT_GATT_READ_CHARACTERISTIC, /* GATT Client*/
-#ifdef TIZEN_GATT_CLIENT
        BT_GATT_READ_DESCRIPTOR_VALUE, /* GATT Client */
        BT_GATT_WRITE_CHARACTERISTIC_VALUE_BY_TYPE, /* GATT Client */
        BT_GATT_WRITE_DESCRIPTOR_VALUE, /* GATT Client */
        BT_GATT_WATCH_SERVICE_CHANGED_INDICATION, /* GATT Client */
        BT_GATT_ACQUIRE_WRITE, /* GATT Client */
-#endif
        BT_GATT_DISCOVER_CHARACTERISTICS_DESCRIPTOR,
 #ifndef GATT_NO_RELAY
        BT_GATT_WATCH_CHARACTERISTIC,
@@ -529,9 +521,7 @@ typedef struct {
 /* Need to convert the design ID */
 #define BT_STR_NOT_SUPPORT "Not support"
 
-#ifdef TIZEN_FEATURE_BT_DPM
 #define BT_DPM_SYSPOPUP "dpm-syspopup"
-#endif
 
 #define BT_FILE_VISIBLE_TIME "file/private/libug-setting-bluetooth-efl/visibility_time"
 
@@ -576,13 +566,9 @@ typedef struct {
 #define BT_GATT_SERVER_PATH "/org/projectx/bt/gatt_server"
 #endif
 
-#ifdef TIZEN_GATT_CLIENT
 #define BT_GATT_CLIENT_PATH "/org/projectx/bt/gatt_client"
-#endif
 
-#ifdef TIZEN_FEATURE_BT_AVC_TARGET
 #define BT_AUDIO_AVC_PATH "/org/projectx/bt/avc_mode"
-#endif
 
 #define BT_MESH_PATH "/org/projectx/bt/mesh"
 
@@ -686,15 +672,10 @@ typedef struct {
 #define BT_MEDIA_VOLUME_CHANGE "MediaVolumeStatus"
 #define BT_NAME_OWNER_CHANGED "NameOwnerChanged"
 
-#ifdef TIZEN_GATT_CLIENT
 #define BT_GATT_SERVER_CONNECTED "GattServerConnected"
 #define BT_GATT_SERVER_DISCONNECTED "GattServerDisconnected"
 #define BT_GATT_CLIENT_CONNECTED "GattClientConnected"
 #define BT_GATT_CLIENT_DISCONNECTED "GattClientDisconnected"
-#else
-#define BT_GATT_CONNECTED "GattConnected"
-#define BT_GATT_DISCONNECTED "GattDisconnected"
-#endif
 
 #ifndef GATT_DIRECT
 #define BT_GATT_VALUE_CHANGED "GattValueChanged"
@@ -705,13 +686,11 @@ typedef struct {
 #define BT_GATT_SERVER_ACQUIRE_NOTIFICATION "GattServerAcquireNotify"
 #endif
 
-#ifdef TIZEN_GATT_CLIENT
 #define BT_GATT_CLIENT_READ_CHAR "GattReadCharValue"
 #define BT_GATT_CLIENT_WRITE_CHAR "GattWriteCharValue"
 #define BT_GATT_CLIENT_READ_DESC "GattReadDescriptor"
 #define BT_GATT_CLIENT_WRITE_DESC "GattWriteDescriptor"
 #define BT_GATT_CLIENT_SERVICE_CHANGED "GattServiceChanged"
-#endif
 
 #define BT_GATT_REQ_ATT_MTU_CHANGED "GattReqAttMtuChanged"
 #define BT_GATT_SERVER_ATT_MTU_CHANGED "GattServerAttMtuChanged"
@@ -747,10 +726,7 @@ typedef struct {
 #define BT_OTP_WRITE_CHAR_VAL "OtpWriteCharVal"
 #define BT_OTP_INDICATION "OtpIndication"
 #define BT_OTC_STATE_CHANGED "OtcStateChanged"
-
-#ifdef TIZEN_FEATURE_BT_AVC_TARGET
 #define BT_AUDIO_AVC_MODE_CHANGED "AvcModeChanged"
-#endif
 
 #define HEADED_PLUGIN_FILEPATH "/usr/lib/bt-plugin-headed.so"
 #define HEADED_PLUGIN_FILEPATH64 "/usr/lib64/bt-plugin-headed.so"
index 93135aa..a9a5014 100644 (file)
@@ -96,10 +96,6 @@ struct bluetooth_headed_plugin_t {
        int (*bt_get_mime_type)(char *file_name, char **mime_type);
 };
 
-#ifdef TIZEN_FEATURE_BT_DPM
 #define BT_DPM_SYSPOPUP "dpm-syspopup"
-#endif
-
-
 
 #endif /* __BLUETOOTH_PLUGIN_H */
index af160ad..2480195 100644 (file)
@@ -23,7 +23,6 @@ Requires: bluetooth-tools
 %define bt_permanent_log DISABLED
 %define bt_http_proxy DISABLED
 %define bt_factory_mode DISABLED
-%define bt_avc_target ENABLED
 %define bt_vendor_operation DISABLED
 
 BuildRequires:  pkgconfig(aul)
@@ -220,8 +219,6 @@ export CFLAGS="$CFLAGS -DTIZEN_FEATURE_BT_PAN_NAP"
 export CFLAGS="$CFLAGS -DTIZEN_FEATURE_BT_IPSP"
 export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
 export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
-export CFLAGS="$CFLAGS -DTIZEN_GATT_CLIENT"
-export CFLAGS="$CFLAGS -DTIZEN_FEATURE_ACTD"
 
 %define _servicefile packaging/bluetooth-frwk-common.service
 %define _servicedir starter.target.wants
@@ -288,21 +285,10 @@ export CFLAGS="$CFLAGS -DTIZEN_FEATURE_BT_HTTP_PROXY"
 export CFLAGS="$CFLAGS -DTIZEN_FEATURE_BT_FACTORY_MODE"
 %endif
 
-%if %{bt_avc_target} == ENABLED
-export CFLAGS="$CFLAGS -DTIZEN_FEATURE_BT_AVC_TARGET"
-%endif
-
 %if %{bt_vendor_operation} == ENABLED
 export CFLAGS="$CFLAGS -DTIZEN_FEATURE_BT_VENDOR_OPERATION"
 %endif
 
-
-%ifarch %{ix86} x86_64
-export CFLAGS+=" -DTIZEN_TEST_EMUL"
-export CXXFLAGS+=" -DTIZEN_TEST_EMUL"
-export FFLAGS+=" -DTIZEN_TEST_EMUL"
-%endif
-
 %if %{bt_bluez_hal} == ENABLED
 export BT_INCLUDE_OAL_BLUEZ=ENABLED
 export CFLAGS="$CFLAGS -DTIZEN_BT_INCLUDE_OAL_BLUEZ"
@@ -317,9 +303,9 @@ export FFLAGS_DEFAULT="$FFLAGS"
 # extension-TM1
 %ifarch %{ix86} || %{arm}
 mkdir -p tm1
-export CFLAGS="$CFLAGS_DEFAULT -DTIZEN_FEATURE_RADIO -DTIZEN_FEATURE_BT_RFCOMM_DIRECT"
-export CXXFLAGS="$CXXFLAGS_DEFAULT -DTIZEN_FEATURE_RADIO -DTIZEN_FEATURE_BT_RFCOMM_DIRECT"
-export FFLAGS="$FFLAGS_DEFAULT -DTIZEN_FEATURE_RADIO -DTIZEN_FEATURE_BT_RFCOMM_DIRECT"
+export CFLAGS="$CFLAGS_DEFAULT -DTIZEN_FEATURE_BT_RFCOMM_DIRECT"
+export CXXFLAGS="$CXXFLAGS_DEFAULT -DTIZEN_FEATURE_BT_RFCOMM_DIRECT"
+export FFLAGS="$FFLAGS_DEFAULT -DTIZEN_FEATURE_BT_RFCOMM_DIRECT"
 
 cmake . -DCMAKE_INSTALL_PREFIX=/usr \
 -DCMAKE_LIB_DIR=%{_libdir} \
@@ -337,9 +323,9 @@ cp %{buildroot}%{_bindir}/bt-core tm1/bt-core.tm1
 
 # extension-emulator
 %ifarch %{ix86} x86_64
-export CFLAGS="${CFLAGS} -DTIZEN_TEST_EMUL -DTIZEN_FEATURE_BT_RFCOMM_DIRECT"
-export CXXFLAGS="${CXXFLAGS} -DTIZEN_TEST_EMUL -DTIZEN_FEATURE_BT_RFCOMM_DIRECT"
-export FFLAGS="${FFLAGS} -DTIZEN_TEST_EMUL -DTIZEN_FEATURE_BT_RFCOMM_DIRECT"
+export CFLAGS="${CFLAGS} -DTIZEN_FEATURE_BT_RFCOMM_DIRECT"
+export CXXFLAGS="${CXXFLAGS} -DTIZEN_FEATURE_BT_RFCOMM_DIRECT"
+export FFLAGS="${FFLAGS} -DTIZEN_FEATURE_BT_RFCOMM_DIRECT"
 
 mkdir -p build_emulator
 
index ce3e261..96d35b7 100644 (file)
@@ -34,7 +34,6 @@
 #define BT_MAX_EVENT_STR_LENGTH        50
 #define BT_AGENT_SYSPOPUP_TIMEOUT_FOR_MULTIPLE_POPUPS 200
 
-#ifdef TIZEN_FEATURE_BT_DPM
 int bt_launch_dpm_popup(char *mode)
 {
        int ret = 0;
@@ -54,7 +53,6 @@ int bt_launch_dpm_popup(char *mode)
 
        return ret;
 }
-#endif
 
 static gboolean _bt_syspopup_timer_cb(gpointer user_data)
 {
@@ -319,11 +317,7 @@ int bt_app_control_send_launch_request(char *absolute_path)
 extern struct bluetooth_headed_plugin_t headed_plugin
 __attribute__ ((visibility("default")));
 struct bluetooth_headed_plugin_t headed_plugin = {
-#ifdef TIZEN_FEATURE_BT_DPM
        bt_launch_dpm_popup,
-#else
-               NULL,
-#endif
        bt_launch_system_popup,
        bt_destroy_popup_all,
        bt_launch_unable_to_pairing_syspopup,
index 9e6359d..31d934b 100644 (file)
@@ -189,55 +189,13 @@ tc_table_t tc_table[] = {
        {"bluetooth_gatt_unregister_service", 99},
        {"bluetooth_gatt_delete_services", 100},
 
-#if 0
-       {"bluetooth_rfcomm_is_server_uuid_available"    , 26},
-
-       {"bluetooth_hdp_activate"       , 30},
-       {"bluetooth_hdp_deactivate"     , 31},
-       {"bluetooth_hdp_connect"        , 32},
-       {"bluetooth_hdp_disconnect"     , 33},
-       {"bluetooth_hdp_send_data"      , 34},
-
-       {"bluetooth_opc_init"           , 35},
-       {"bluetooth_opc_push_file"      , 36},
-       {"bluetooth_opc_cancel_push"    , 37},
-       {"bluetooth_opc_deinit"         , 38},
-       {"bluetooth_obex_server_init"   , 39},
-       {"bluetooth_obex_server_deinit" , 40},
-       {"bluetooth_obex_server_accept_authorize"       , 41},
-       {"bluetooth_obex_server_reject_authorize"       , 42},
-       {"bluetooth_is_supported"       , 43},
-       {"bluetooth_opc_session_is_exist"       , 46},
-       {"bluetooth_obex_server_is_activated"   , 47},
-       {"bluetooth_obex_server_cancel_transfer"        , 48},
-
-       {"bluetooth_oob_read_local_data"        , 50},
-       {"bluetooth_oob_add_remote_data"        , 51},
-       {"bluetooth_oob_remove_remote_data"     , 52},
-
-       {"bluetooth_network_activate_server"    , 60},
-       {"bluetooth_network_deactivate_server"  , 61},
-       {"bluetooth_network_connect"    , 62},
-       {"bluetooth_network_disconnect" , 63},
-
-       {"bluetooth_gatt_discover_primary_services", 64},
-       {"bluetooth_gatt_discover_service_characteristics",     65},
-       {"bluetooth_gatt_get_service_property",         66},
-       {"bluetooth_gatt_get_characteristics_value",    67},
-       {"bluetooth_gatt_set_characteristics_value",    68},
-#endif
        /* -----------------------------------------*/
        {"Finish"                                                       , 0x00ff},
        {NULL                                                           , 0x0000},
 
 };
 
-#if 0
-#define tc_result(success, tc_index) \
-       TC_PRT("Test case [%d - %s] %s", tc_table[tc_index].tc_code, tc_table[tc_index].tc_name, ((success == TC_PASS) ? "Success" : "Failed"));
-#else
 #define tc_result(success, tc_index)
-#endif
 
 bluetooth_device_info_t bond_dev;
 int is_bond_device = FALSE;
@@ -1144,26 +1102,31 @@ int test_input_callback(void *data)
 
        case 92:
        {
+/*
 #if TODO_40
                ret = bluetooth_gatt_init();
                if (ret < 0)
                        TC_PRT("gatt init failed with [0x%04x]", ret);
 #endif
+*/
                break;
        }
 
        case 93:
        {
+/*
 #if TODO_40
                ret = bluetooth_gatt_deinit();
                if (ret < 0)
                        TC_PRT("gatt deinit failed with [0x%04x]", ret);
 #endif
+*/
                break;
        }
 
        case 94:
        {
+/*
 #if TODO_40
                char *service_uuid = g_strdup("00001802-0000-1000-8000-00805f9b34fb");
 
@@ -1172,13 +1135,15 @@ int test_input_callback(void *data)
 
                TC_PRT("service obj_path is %s", svc_obj_path);
 #endif
+*/
                break;
        }
 
        case 95:
        {
-#if TODO_40
+/* #if TODO_40 */
                /* testing with dummy values*/
+/*
                char *char_uuid = g_strdup("00002a06-0000-1000-8000-00805f9b34fb");
                bt_gatt_permission_t perms = 0;
                bt_gatt_characteristic_property_t props = BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_READ |
@@ -1192,10 +1157,12 @@ int test_input_callback(void *data)
 
                TC_PRT("characteristic obj_path is %s", char_obj_path);
 #endif
+*/
                break;
        }
 
        case 96: {
+/*
 #if TODO_40
                char *desc_uuid = g_strdup("000026ff-0000-1000-8000-00805f9b34fb");
                bt_gatt_permission_t perms = BLUETOOTH_GATT_PERMISSION_READ |
@@ -1205,27 +1172,33 @@ int test_input_callback(void *data)
                        desc_uuid, perms, &desc_obj_path);
                TC_PRT("add descriptor error is %d", ret);
 #endif
+*/
                break;
        }
 
        case 97: {
+/*
 #if TODO_40
                ret = bluetooth_gatt_register_service(svc_obj_path);
                TC_PRT("register service error is %d", ret);
 #endif
+*/
                break;
        }
 
        case 98: {
+/*
 #if TODO_40
                ret = bluetooth_gatt_register_application();
 
                TC_PRT("register service error is %d", ret);
 #endif
+*/
                break;
        }
 
        case 99: {
+/*
 #if TODO_40
                char char_data[4] = {10, 20, 30, 40};
                int char_length = 4;
@@ -1234,22 +1207,27 @@ int test_input_callback(void *data)
 
                TC_PRT("update_characteristic error is %d", ret);
 #endif
+*/
                break;
        }
 
        case 100: {
+/*
 #if TODO_40
                ret = bluetooth_gatt_unregister_service(svc_obj_path);
                TC_PRT("service removed with error is %d", ret);
 #endif
+*/
                break;
        }
 
        case 101:
+/*
 #if TODO_40
                ret = bluetooth_gatt_delete_services();
                TC_PRT("services deleted with error is %d", ret);
 #endif
+*/
                break;
 
        default:
@@ -1402,25 +1380,6 @@ void bt_event_callback(int event, bluetooth_event_param_t* param, void *user_dat
        {
                // bluetooth_get_bonded_device_list is changed as synchronous API. This event is not used any more.
                // 2011.01.06
-#if 0
-//             int i = 0;
-               TC_PRT("BLUETOOTH_EVENT_BONDED_DEVICE_FOUND, result [0x%04x]", param->result);
-               if (param->result >= BLUETOOTH_ERROR_NONE) {
-                       ///tc_result(TC_PASS, 15);
-                       bluetooth_device_info_t * bt_dev_info = (bluetooth_device_info_t*)param->param_data;
-                               TC_PRT("Dev Name = %s, Dev add = %2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X, COD (major,minor,service)= 0x%x:%x:%x\n", bt_dev_info->device_name.name,
-                               bt_dev_info->device_address.addr[0], bt_dev_info->device_address.addr[1], bt_dev_info->device_address.addr[2], \
-                               bt_dev_info->device_address.addr[3], bt_dev_info->device_address.addr[4], bt_dev_info->device_address.addr[5], \
-                               bt_dev_info->device_class.major_class, bt_dev_info->device_class.minor_class, bt_dev_info->device_class.service_class);
-
-               } else if (param->result == BLUETOOTH_ERROR_END_OF_DEVICE_LIST) /*End of the Device found indication*/ {
-                       tc_result(TC_PASS, 15);
-                       TC_PRT("*****<<No more BLUETOOTH_EVENT_BONDED_DEVICE_FOUND indication>>***** ");
-               } else {
-                       tc_result(TC_FAIL, 15);
-                       TC_PRT("*****API failed ***** ");
-               }
-#endif
                break;
        }
 
@@ -1604,100 +1563,6 @@ void bt_event_callback(int event, bluetooth_event_param_t* param, void *user_dat
        {       TC_PRT("BLUETOOTH_EVENT_MANUFACTURER_DATA_CHANGED");
                break;
        }
-#if 0
-       case BLUETOOTH_EVENT_GATT_PRIM_SVC_DISCOVERED:
-       {
-               TC_PRT("BLUETOOTH_EVENT_GATT_PRIM_SVC_DISCOVERED");
-               bt_gatt_handle_info_t *prim_svc = param->param_data;
-               int i;
-
-               if (prim_svc == NULL) {
-                       TC_PRT("prim_svc is NULL");
-                       break;
-               }
-
-               for (i = 0; i < prim_svc->count; i++)
-                       TC_PRT("prim_svc[%d] = %s\n", i, prim_svc->handle[i]);
-
-               break;
-       }
-
-       case BLUETOOTH_EVENT_GATT_SVC_CHAR_DISCOVERED:
-       {
-               TC_PRT("BLUETOOTH_EVENT_GATT_SVC_CHAR_DISCOVERED");
-               bt_gatt_discovered_char_t *svc_char = param->param_data;
-               int i = 0;
-
-               if (svc_char == NULL) {
-                       TC_PRT("svc_char is NULL");
-                       break;
-               }
-
-               if (svc_char->service_handle != NULL)
-                       TC_PRT("svc_char->service_handle %s \n", svc_char->service_handle);
-
-               for (i = 0; i < svc_char->handle_info.count; i++)
-                       TC_PRT("svc_char.handle_info.handle[%d] = %s\n", i, svc_char->handle_info.handle[i]);
-
-               break;
-       }
-
-       case BLUETOOTH_EVENT_GATT_SVC_PROP_RECEIVED:
-       {
-               TC_PRT("BLUETOOTH_EVENT_GATT_SVC_PROP_RECEIVED");
-               bt_gatt_service_property_t *svc_pty = param->param_data;
-               int i;
-
-               if (svc_pty == NULL) {
-                       TC_PRT("char_pty is NULL \n");
-                       break;
-               }
-
-               if (svc_pty->service_handle != NULL)
-                       TC_PRT("svc_pty->service_handle %s \n", svc_pty->service_handle);
-
-               if (svc_pty->uuid != NULL)
-                       TC_PRT("svc_pty->uuid %s \n", svc_pty->uuid);
-
-               for (i = 0; i < svc_pty->handle_info.count; i++)
-                       TC_PRT("svc_char[%d] = %s\n", i, svc_pty->handle_info.handle[i]);
-
-               break;
-       }
-
-       case BLUETOOTH_EVENT_GATT_CHAR_PROP_RECEIVED:
-       {
-               TC_PRT("BLUETOOTH_EVENT_GATT_CHAR_PROP_RECEIVED");
-               bt_gatt_char_property_t *char_pty = param->param_data;
-               int i = 0;
-
-               if (char_pty->char_handle != NULL)
-                       TC_PRT("char_pty->char_handle %s \n", char_pty->char_handle);
-
-               if (char_pty->uuid != NULL)
-                       TC_PRT("char_pty->uuid %s \n", char_pty->uuid);
-
-               if (char_pty == NULL) {
-                       TC_PRT("char_pty is NULL \n");
-                       break;
-               }
-
-               if (char_pty->name != NULL)
-                       TC_PRT("char_pty->name %s \n", char_pty->name);
-
-               if (char_pty->description != NULL)
-                       TC_PRT("char_pty->description %s \n", char_pty->description);
-
-               if (char_pty->val != NULL) {
-                       TC_PRT("char_pty->val_len %d \n", char_pty->val_len);
-
-                       for (i = 0; i < char_pty->val_len; i++)
-                               TC_PRT("char_pty->val %02x \n", char_pty->val[i]);
-               }
-
-               break;
-       }
-#endif
        case BLUETOOTH_EVENT_KEYBOARD_PASSKEY_DISPLAY:
        {
                bluetooth_authentication_request_info_t *auth_info = param->param_data;