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

Commit 971e3a4b authored by Andre Guedes's avatar Andre Guedes Committed by Gustavo Padovan
Browse files

Bluetooth: Add extfeatures to struct hci_dev 



This new field holds the extended LMP features value. Some LE
mechanism such as discovery procedure needs to read the extended
LMP features to work properly.

Signed-off-by: default avatarAndre Guedes <andre.guedes@openbossa.org>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 02f1b641

include/net/bluetooth/hci.h

+4 −0
Original line number Diff line number Diff line
@@ -216,6 +216,7 @@ enum { 


#define LMP_LSTO	0x01

#define LMP_INQ_TX_PWR	0x02

#define LMP_EXTFEATURES	0x80



/* Connection modes */

#define HCI_CM_ACTIVE	0x0000
@@ -676,6 +677,9 @@ struct hci_rp_read_local_features { 
} __packed;



#define HCI_OP_READ_LOCAL_EXT_FEATURES	0x1004

struct hci_cp_read_local_ext_features {

	__u8     page;

} __packed;

struct hci_rp_read_local_ext_features {

	__u8     status;

	__u8     page;

include/net/bluetooth/hci_core.h

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ struct hci_dev { 
	__u8		major_class;

	__u8		minor_class;

	__u8		features[8];

	__u8		extfeatures[8];

	__u8		commands[64];

	__u8		ssp_mode;

	__u8		hci_ver;

net/bluetooth/hci_event.c

+27 −0
Original line number Diff line number Diff line
@@ -542,6 +542,14 @@ static void hci_setup(struct hci_dev *hdev) 


	if (hdev->features[7] & LMP_INQ_TX_PWR)

		hci_send_cmd(hdev, HCI_OP_READ_INQ_RSP_TX_POWER, 0, NULL);



	if (hdev->features[7] & LMP_EXTFEATURES) {

		struct hci_cp_read_local_ext_features cp;



		cp.page = 0x01;

		hci_send_cmd(hdev, HCI_OP_READ_LOCAL_EXT_FEATURES,

							sizeof(cp), &cp);

	}

}



static void hci_cc_read_local_version(struct hci_dev *hdev, struct sk_buff *skb)
@@ -658,6 +666,21 @@ static void hci_cc_read_local_features(struct hci_dev *hdev, struct sk_buff *skb 
					hdev->features[6], hdev->features[7]);

}



static void hci_cc_read_local_ext_features(struct hci_dev *hdev,

							struct sk_buff *skb)

{

	struct hci_rp_read_local_ext_features *rp = (void *) skb->data;



	BT_DBG("%s status 0x%x", hdev->name, rp->status);



	if (rp->status)

		return;



	memcpy(hdev->extfeatures, rp->features, 8);



	hci_req_complete(hdev, HCI_OP_READ_LOCAL_EXT_FEATURES, rp->status);

}



static void hci_cc_read_buffer_size(struct hci_dev *hdev, struct sk_buff *skb)

{

	struct hci_rp_read_buffer_size *rp = (void *) skb->data;
@@ -1826,6 +1849,10 @@ static inline void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *sk 
		hci_cc_read_local_features(hdev, skb);

		break;



	case HCI_OP_READ_LOCAL_EXT_FEATURES:

		hci_cc_read_local_ext_features(hdev, skb);

		break;



	case HCI_OP_READ_BUFFER_SIZE:

		hci_cc_read_buffer_size(hdev, skb);

		break;