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.
diff --git a/plugins/hciops.c b/plugins/hciops.c
index 9354bbe..ae2e4cc 100644
--- a/plugins/hciops.c
+++ b/plugins/hciops.c
@@ -1799,7 +1799,8 @@
OCF_READ_LOCAL_NAME, 0, 0);
break;
case cmd_opcode_pack(OGF_HOST_CTL, OCF_WRITE_SCAN_ENABLE):
- btd_event_setscan_enable_complete(&dev->bdaddr);
+ hci_send_cmd(dev->sk, OGF_HOST_CTL, OCF_READ_SCAN_ENABLE,
+ 0, NULL);
break;
case cmd_opcode_pack(OGF_HOST_CTL, OCF_READ_SCAN_ENABLE):
ptr += sizeof(evt_cmd_complete);
@@ -3279,19 +3280,6 @@
return err;
}
-static int hciops_read_scan_enable(int index)
-{
- struct dev_info *dev = &devs[index];
-
- DBG("hci%d", index);
-
- if (hci_send_cmd(dev->sk, OGF_HOST_CTL, OCF_READ_SCAN_ENABLE,
- 0, NULL) < 0)
- return -errno;
-
- return 0;
-}
-
static int hciops_enable_le(int index)
{
struct dev_info *dev = &devs[index];
@@ -3587,7 +3575,6 @@
.pincode_reply = hciops_pincode_reply,
.confirm_reply = hciops_confirm_reply,
.passkey_reply = hciops_passkey_reply,
- .read_scan_enable = hciops_read_scan_enable,
.enable_le = hciops_enable_le,
.encrypt_link = hciops_encrypt_link,
.set_did = hciops_set_did,
diff --git a/plugins/mgmtops.c b/plugins/mgmtops.c
index 0e5fe61..8ac88c1 100644
--- a/plugins/mgmtops.c
+++ b/plugins/mgmtops.c
@@ -1490,12 +1490,6 @@
return -ENOSYS;
}
-static int mgmt_read_scan_enable(int index)
-{
- DBG("index %d", index);
- return -ENOSYS;
-}
-
static int mgmt_enable_le(int index)
{
DBG("index %d", index);
@@ -1666,7 +1660,6 @@
.pincode_reply = mgmt_pincode_reply,
.confirm_reply = mgmt_confirm_reply,
.passkey_reply = mgmt_passkey_reply,
- .read_scan_enable = mgmt_read_scan_enable,
.enable_le = mgmt_enable_le,
.encrypt_link = mgmt_encrypt_link,
.set_did = mgmt_set_did,
diff --git a/src/adapter.c b/src/adapter.c
index f55cd27..f63d9e4 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -3620,11 +3620,6 @@
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 39dd905..8bc687d 100644
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -224,7 +224,6 @@
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_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 f3f8fe6..b979a8e 100644
--- a/src/event.c
+++ b/src/event.c
@@ -705,22 +705,6 @@
/* 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 b82c5b7..80048e2 100644
--- a/src/event.h
+++ b/src/event.h
@@ -35,7 +35,6 @@
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,
