Skip to content

Commit

Permalink
Bluetooth: Move power on HCI command updates to their own function
Browse files Browse the repository at this point in the history
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: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
  • Loading branch information
Johan Hedberg authored and Gustavo Padovan committed Mar 18, 2013
1 parent 5ae327f commit 70da624
Showing 1 changed file with 42 additions and 36 deletions.
78 changes: 42 additions & 36 deletions net/bluetooth/mgmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

int mgmt_powered(struct hci_dev *hdev, u8 powered)
static int powered_update_hci(struct hci_dev *hdev)
{
struct cmd_lookup match = { NULL, hdev };
int err;
u8 link_sec;

if (!test_bit(HCI_MGMT, &hdev->dev_flags))
return 0;
if (test_bit(HCI_SSP_ENABLED, &hdev->dev_flags) &&
!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) {
u8 link_sec;
if (test_bit(HCI_LE_ENABLED, &hdev->dev_flags)) {
struct hci_cp_write_le_host_supported cp;

if (test_bit(HCI_SSP_ENABLED, &hdev->dev_flags) &&
!lmp_host_ssp_capable(hdev)) {
u8 ssp = 1;
cp.le = 1;
cp.simul = lmp_le_br_capable(hdev);

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)) {
struct hci_cp_write_le_host_supported cp;
link_sec = test_bit(HCI_LINK_SECURITY, &hdev->dev_flags);
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;
cp.simul = lmp_le_br_capable(hdev);
if (lmp_bredr_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
* 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);
}
return 0;
}

link_sec = test_bit(HCI_LINK_SECURITY, &hdev->dev_flags);
if (link_sec != test_bit(HCI_AUTH, &hdev->flags))
hci_send_cmd(hdev, HCI_OP_WRITE_AUTH_ENABLE,
sizeof(link_sec), &link_sec);
int mgmt_powered(struct hci_dev *hdev, u8 powered)
{
struct cmd_lookup match = { NULL, hdev };
int err;

if (lmp_bredr_capable(hdev)) {
set_bredr_scan(hdev);
update_class(hdev);
update_name(hdev, hdev->dev_name);
update_eir(hdev);
}
if (!test_bit(HCI_MGMT, &hdev->dev_flags))
return 0;

mgmt_pending_foreach(MGMT_OP_SET_POWERED, hdev, settings_rsp, &match);

if (powered) {
powered_update_hci(hdev);
} else {
u8 status = MGMT_STATUS_NOT_POWERED;
u8 zero_cod[] = { 0, 0, 0 };
Expand Down

0 comments on commit 70da624

Please sign in to comment.