Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-28 07:01:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bluetooth: Add reading of all local feature pages

Browse Source 
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: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
This commit is contained in:
Johan Hedberg 2013-04-17 15:00:52 +03:00 committed by Gustavo Padovan
parent cad718ed2f
commit d2c5d77fff
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/net/bluetooth/hci_core.h
View File

@ -134,7 +134,7 @@ struct amp_assoc {
__u8 data[HCI_MAX_AMP_ASSOC_SIZE]; __u8 data[HCI_MAX_AMP_ASSOC_SIZE];
}; };
#define HCI_MAX_PAGES 2 #define HCI_MAX_PAGES 3
#define NUM_REASSEMBLY 4 #define NUM_REASSEMBLY 4
struct hci_dev { struct hci_dev {
@ -153,6 +153,7 @@ struct hci_dev {
__u8 dev_class[3]; __u8 dev_class[3];
__u8 major_class; __u8 major_class;
__u8 minor_class; __u8 minor_class;
__u8 max_page;
__u8 features[HCI_MAX_PAGES][8]; __u8 features[HCI_MAX_PAGES][8];
__u8 le_features[8]; __u8 le_features[8];
__u8 le_white_list_size; __u8 le_white_list_size;

10
net/bluetooth/hci_core.c
View File

@ -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) static void hci_init3_req(struct hci_request *req, unsigned long opt)
{ {
struct hci_dev *hdev = req->hdev; struct hci_dev *hdev = req->hdev;
u8 p;
if (hdev->commands[5] & 0x10) if (hdev->commands[5] & 0x10)
hci_setup_link_policy(req); 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_set_le_support(req);
hci_update_ad(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) static int __hci_init(struct hci_dev *hdev)

2
net/bluetooth/hci_event.c
View File

@ -544,6 +544,8 @@ static void hci_cc_read_local_ext_features(struct hci_dev *hdev,
if (rp->status) if (rp->status)
return; return;
hdev->max_page = rp->max_page;
if (rp->page < HCI_MAX_PAGES) if (rp->page < HCI_MAX_PAGES)
memcpy(hdev->features[rp->page], rp->features, 8); memcpy(hdev->features[rp->page], rp->features, 8);
} }