Removed unnecessary compilation flags 85/179485/3
authorAtul Rai <a.rai@samsung.com>
Fri, 18 May 2018 06:44:46 +0000 (12:14 +0530)
committerAtul Rai <a.rai@samsung.com>
Tue, 22 May 2018 11:55:10 +0000 (17:25 +0530)
Change-Id: I2af88a3f6bd6645857826c58eefee97d5dbb46b5
Signed-off-by: Atul Rai <a.rai@samsung.com>
src/adapter.c

index 9c91a4f..656f91d 100644 (file)
@@ -4222,11 +4222,7 @@ static DBusMessage *adapter_start_le_discovery(DBusConnection *conn,
         * discovery in idle phase exists, it will be restarted right
         * away.
         */
-#ifndef TIZEN_FEATURE_BLUEZ_MODIFY
-       trigger_start_discovery(adapter, 0);
-#else
        trigger_start_le_discovery(adapter, 0);
-#endif
 
        return dbus_message_new_method_return(msg);
 }
@@ -4242,13 +4238,12 @@ static DBusMessage *adapter_stop_le_discovery(DBusConnection *conn,
 
        DBG("sender %s", sender);
 
-#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
        if (adapter->le_discovery_idle_timeout > 0) {
                DBG("Remove LE scan trigger");
                g_source_remove(adapter->le_discovery_idle_timeout);
                adapter->le_discovery_idle_timeout = 0;
        }
-#endif
+
        if (!(adapter->current_settings & MGMT_SETTING_POWERED))
                return btd_error_not_ready(msg);
 
@@ -4287,9 +4282,7 @@ static DBusMessage *adapter_stop_le_discovery(DBusConnection *conn,
        DBG("cp.type %d", cp.type);
        DBG("adapter->discovery_enable %d", adapter->discovery_enable);
        if (adapter->discovery_enable == 0x00) {
-#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
                g_dbus_remove_watch(dbus_conn, client->watch);
-#endif
                adapter->le_discovering = false;
                g_dbus_emit_property_changed(dbus_conn, adapter->path,
                                        ADAPTER_INTERFACE, "LEDiscovering");
@@ -5385,7 +5378,6 @@ static DBusMessage *set_nb_parameters(DBusConnection *conn,
        return dbus_message_new_method_return(msg);
 }
 
-#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
 void btd_adapter_set_read_le_data_length_handler(
                        struct btd_adapter *adapter,
                        struct le_data_length_read_handler *handler)
@@ -5761,7 +5753,6 @@ int btd_adapter_le_set_data_length(struct btd_adapter *adapter, bdaddr_t *bdaddr
 
        return -EIO;
 }
-#endif
 
 static DBusMessage *adapter_set_manufacturer_data(DBusConnection *conn,
                                                DBusMessage *msg, void *data)