Commit 70da6243 authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo Padovan

Bluetooth: Move power on HCI command updates to their own function

These commands will in a subsequent patch be performed in their own
asynchronous request, so it's more readable (not just from a resulting
code perspective but also the way the patches look like) to have them
performed in their own function.
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 5ae327f0
...@@ -3058,53 +3058,59 @@ static int set_bredr_scan(struct hci_dev *hdev) ...@@ -3058,53 +3058,59 @@ static int set_bredr_scan(struct hci_dev *hdev)
return hci_send_cmd(hdev, HCI_OP_WRITE_SCAN_ENABLE, 1, &scan); return hci_send_cmd(hdev, HCI_OP_WRITE_SCAN_ENABLE, 1, &scan);
} }
int mgmt_powered(struct hci_dev *hdev, u8 powered) static int powered_update_hci(struct hci_dev *hdev)
{ {
struct cmd_lookup match = { NULL, hdev }; u8 link_sec;
int err;
if (!test_bit(HCI_MGMT, &hdev->dev_flags)) if (test_bit(HCI_SSP_ENABLED, &hdev->dev_flags) &&
return 0; !lmp_host_ssp_capable(hdev)) {
u8 ssp = 1;
mgmt_pending_foreach(MGMT_OP_SET_POWERED, hdev, settings_rsp, &match); hci_send_cmd(hdev, HCI_OP_WRITE_SSP_MODE, 1, &ssp);
}
if (powered) { if (test_bit(HCI_LE_ENABLED, &hdev->dev_flags)) {
u8 link_sec; struct hci_cp_write_le_host_supported cp;
if (test_bit(HCI_SSP_ENABLED, &hdev->dev_flags) && cp.le = 1;
!lmp_host_ssp_capable(hdev)) { cp.simul = lmp_le_br_capable(hdev);
u8 ssp = 1;
hci_send_cmd(hdev, HCI_OP_WRITE_SSP_MODE, 1, &ssp); /* Check first if we already have the right
} * host state (host features set)
*/
if (cp.le != lmp_host_le_capable(hdev) ||
cp.simul != lmp_host_le_br_capable(hdev))
hci_send_cmd(hdev, HCI_OP_WRITE_LE_HOST_SUPPORTED,
sizeof(cp), &cp);
}
if (test_bit(HCI_LE_ENABLED, &hdev->dev_flags)) { link_sec = test_bit(HCI_LINK_SECURITY, &hdev->dev_flags);
struct hci_cp_write_le_host_supported cp; if (link_sec != test_bit(HCI_AUTH, &hdev->flags))
hci_send_cmd(hdev, HCI_OP_WRITE_AUTH_ENABLE,
sizeof(link_sec), &link_sec);
cp.le = 1; if (lmp_bredr_capable(hdev)) {
cp.simul = lmp_le_br_capable(hdev); set_bredr_scan(hdev);
update_class(hdev);
update_name(hdev, hdev->dev_name);
update_eir(hdev);
}
/* Check first if we already have the right return 0;
* host state (host features set) }
*/
if (cp.le != lmp_host_le_capable(hdev) ||
cp.simul != lmp_host_le_br_capable(hdev))
hci_send_cmd(hdev,
HCI_OP_WRITE_LE_HOST_SUPPORTED,
sizeof(cp), &cp);
}
link_sec = test_bit(HCI_LINK_SECURITY, &hdev->dev_flags); int mgmt_powered(struct hci_dev *hdev, u8 powered)
if (link_sec != test_bit(HCI_AUTH, &hdev->flags)) {
hci_send_cmd(hdev, HCI_OP_WRITE_AUTH_ENABLE, struct cmd_lookup match = { NULL, hdev };
sizeof(link_sec), &link_sec); int err;
if (lmp_bredr_capable(hdev)) { if (!test_bit(HCI_MGMT, &hdev->dev_flags))
set_bredr_scan(hdev); return 0;
update_class(hdev);
update_name(hdev, hdev->dev_name); mgmt_pending_foreach(MGMT_OP_SET_POWERED, hdev, settings_rsp, &match);
update_eir(hdev);
} if (powered) {
powered_update_hci(hdev);
} else { } else {
u8 status = MGMT_STATUS_NOT_POWERED; u8 status = MGMT_STATUS_NOT_POWERED;
u8 zero_cod[] = { 0, 0, 0 }; u8 zero_cod[] = { 0, 0, 0 };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment