diff options
author | Johan Hedberg <johan.hedberg@nokia.com> | 2011-02-15 19:46:02 +0200 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@nokia.com> | 2011-02-15 19:46:02 +0200 |
commit | 073c798c8f77c9d63aa4008c2c56cd645f68c7af (patch) | |
tree | 5b41c9b34b78c9d4a85343eb3961b981b8d99e53 /src | |
parent | 2c8df748ac1a5268de7ba3211b7be57feb950b86 (diff) | |
download | bluez-073c798c8f77c9d63aa4008c2c56cd645f68c7af.tar.gz |
Remove unused scan_enable code
Several functions aren't needed anymore since we don't do a
HCI_Write_Scan_Enable(NO_SCAN) upon adapter power off.
Diffstat (limited to 'src')
-rw-r--r-- | src/adapter.c | 5 | ||||
-rw-r--r-- | src/adapter.h | 3 | ||||
-rw-r--r-- | src/event.c | 16 | ||||
-rw-r--r-- | src/event.h | 1 |
4 files changed, 0 insertions, 25 deletions
diff --git a/src/adapter.c b/src/adapter.c index f55cd271..f63d9e45 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -3620,11 +3620,6 @@ int btd_adapter_passkey_reply(struct btd_adapter *adapter, bdaddr_t *bdaddr, return adapter_ops->passkey_reply(adapter->dev_id, bdaddr, passkey); } -int btd_adapter_read_scan_enable(struct btd_adapter *adapter) -{ - return adapter_ops->read_scan_enable(adapter->dev_id); -} - void btd_adapter_update_local_ext_features(struct btd_adapter *adapter, const uint8_t *features) { diff --git a/src/adapter.h b/src/adapter.h index 39dd9051..8bc687d7 100644 --- a/src/adapter.h +++ b/src/adapter.h @@ -224,7 +224,6 @@ struct btd_adapter_ops { int (*pincode_reply) (int index, bdaddr_t *bdaddr, const char *pin); int (*confirm_reply) (int index, bdaddr_t *bdaddr, gboolean success); int (*passkey_reply) (int index, bdaddr_t *bdaddr, uint32_t passkey); - int (*read_scan_enable) (int index); int (*enable_le) (int index); int (*encrypt_link) (int index, bdaddr_t *bdaddr, bt_hci_result_t cb, gpointer user_data); @@ -276,8 +275,6 @@ int btd_adapter_confirm_reply(struct btd_adapter *adapter, bdaddr_t *bdaddr, int btd_adapter_passkey_reply(struct btd_adapter *adapter, bdaddr_t *bdaddr, uint32_t passkey); -int btd_adapter_read_scan_enable(struct btd_adapter *adapter); - void btd_adapter_update_local_ext_features(struct btd_adapter *adapter, const uint8_t *features); diff --git a/src/event.c b/src/event.c index f3f8fe65..b979a8ec 100644 --- a/src/event.c +++ b/src/event.c @@ -705,22 +705,6 @@ void btd_event_disconn_complete(bdaddr_t *local, bdaddr_t *peer) /* Section reserved to device HCI callbacks */ -void btd_event_setscan_enable_complete(bdaddr_t *local) -{ - struct btd_adapter *adapter; - - adapter = manager_find_adapter(local); - if (!adapter) { - error("No matching adapter found"); - return; - } - - if (adapter_powering_down(adapter)) - return; - - btd_adapter_read_scan_enable(adapter); -} - void btd_event_le_set_scan_enable_complete(bdaddr_t *local, uint8_t status) { struct btd_adapter *adapter; diff --git a/src/event.h b/src/event.h index b82c5b7e..80048e22 100644 --- a/src/event.h +++ b/src/event.h @@ -35,7 +35,6 @@ void btd_event_disconn_complete(bdaddr_t *local, bdaddr_t *peer); void btd_event_bonding_complete(bdaddr_t *local, bdaddr_t *peer, uint8_t status); void btd_event_simple_pairing_complete(bdaddr_t *local, bdaddr_t *peer, uint8_t status); -void btd_event_setscan_enable_complete(bdaddr_t *local); void btd_event_le_set_scan_enable_complete(bdaddr_t *local, uint8_t status); void btd_event_returned_link_key(bdaddr_t *local, bdaddr_t *peer); int btd_event_user_confirm(bdaddr_t *sba, bdaddr_t *dba, uint32_t passkey, |