Reduce the predefined logic (PredefinedPreprocessor)

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

diff --git a/bt-api/bt-device.c b/bt-api/bt-device.c
index 5016d2c..857c51d 100644 (file)
--- a/bt-api/bt-device.c
+++ b/bt-api/bt-device.c
@@ -21,10 +21,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_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);