Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2c5d77f authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo Padovan
Browse files

Bluetooth: Add reading of all local feature pages 



With the introduction of CSA4 there is now also a features page number 2
available. This patch increments the maximum supported page number to 2
and adds code for reading all available pages (as long as we have
support for them - indicated by HCI_MAX_PAGES).

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent cad718ed

include/net/bluetooth/hci_core.h

+2 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ struct amp_assoc { 
	__u8	data[HCI_MAX_AMP_ASSOC_SIZE];

};



#define HCI_MAX_PAGES	2

#define HCI_MAX_PAGES	3



#define NUM_REASSEMBLY 4

struct hci_dev {
@@ -153,6 +153,7 @@ struct hci_dev { 
	__u8		dev_class[3];

	__u8		major_class;

	__u8		minor_class;

	__u8		max_page;

	__u8		features[HCI_MAX_PAGES][8];

	__u8		le_features[8];

	__u8		le_white_list_size;

net/bluetooth/hci_core.c

+10 −0
Original line number Diff line number Diff line
@@ -589,6 +589,7 @@ static void hci_set_le_support(struct hci_request *req) 
static void hci_init3_req(struct hci_request *req, unsigned long opt)

{

	struct hci_dev *hdev = req->hdev;

	u8 p;



	if (hdev->commands[5] & 0x10)

		hci_setup_link_policy(req);
@@ -597,6 +598,15 @@ static void hci_init3_req(struct hci_request *req, unsigned long opt) 
		hci_set_le_support(req);

		hci_update_ad(req);

	}



	/* Read features beyond page 1 if available */

	for (p = 2; p < HCI_MAX_PAGES && p <= hdev->max_page; p++) {

		struct hci_cp_read_local_ext_features cp;



		cp.page = p;

		hci_req_add(req, HCI_OP_READ_LOCAL_EXT_FEATURES,

			    sizeof(cp), &cp);

	}

}



static int __hci_init(struct hci_dev *hdev)

net/bluetooth/hci_event.c

+2 −0
Original line number Diff line number Diff line
@@ -544,6 +544,8 @@ static void hci_cc_read_local_ext_features(struct hci_dev *hdev, 
	if (rp->status)

		return;



	hdev->max_page = rp->max_page;



	if (rp->page < HCI_MAX_PAGES)

		memcpy(hdev->features[rp->page], rp->features, 8);

}