diff options
| author | Atul Rai <a.rai@samsung.com> | 2018-05-18 12:14:46 +0530 |
|---|---|---|
| committer | Atul Rai <a.rai@samsung.com> | 2018-05-22 17:25:10 +0530 |
| commit | 17e655eb3a39910d9f9e6cf1302f6fa5e005947e (patch) | |
| tree | 5e004ca5b8c18f64456d933c871382144df94491 | |
| parent | 67cdef697ae481675b84ebbc50247763ff732b52 (diff) | |
| download | bluez-17e655eb3a39910d9f9e6cf1302f6fa5e005947e.tar.gz bluez-17e655eb3a39910d9f9e6cf1302f6fa5e005947e.tar.bz2 bluez-17e655eb3a39910d9f9e6cf1302f6fa5e005947e.zip | |
Removed unnecessary compilation flags
Change-Id: I2af88a3f6bd6645857826c58eefee97d5dbb46b5
Signed-off-by: Atul Rai <a.rai@samsung.com>
| -rw-r--r-- | src/adapter.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/adapter.c b/src/adapter.c index 9c91a4fe..656f91d0 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -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) |