aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrei Emeltchenko <andrei.emeltchenko@intel.com>2011-12-07 08:56:51 -0500
committerGustavo F. Padovan <padovan@profusion.mobi>2011-12-18 18:34:56 -0500
commit350ee4cfc0ea620bd1126ad4daa295586d6aa3a9 (patch)
tree61088ecc044fea570c635cf5429f53b2be385d2d
parentc9c2659f1ea84f860af82cac504cc58f17067523 (diff)
Bluetooth: Add HCI Read Data Block Size function
Implement block size read function. Use different variables for packet-based and block-based flow control. Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
-rw-r--r--include/net/bluetooth/hci.h8
-rw-r--r--include/net/bluetooth/hci_core.h5
-rw-r--r--net/bluetooth/hci_event.c26
3 files changed, 39 insertions, 0 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index c9ad56fe58f4..2e48d326e365 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -746,6 +746,14 @@ struct hci_rp_read_bd_addr {
746 bdaddr_t bdaddr; 746 bdaddr_t bdaddr;
747} __packed; 747} __packed;
748 748
749#define HCI_OP_READ_DATA_BLOCK_SIZE 0x100a
750struct hci_rp_read_data_block_size {
751 __u8 status;
752 __le16 max_acl_len;
753 __le16 block_len;
754 __le16 num_blocks;
755} __packed;
756
749#define HCI_OP_WRITE_PAGE_SCAN_ACTIVITY 0x0c1c 757#define HCI_OP_WRITE_PAGE_SCAN_ACTIVITY 0x0c1c
750struct hci_cp_write_page_scan_activity { 758struct hci_cp_write_page_scan_activity {
751 __le16 interval; 759 __le16 interval;
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 105eaa251034..74f8356b9ff1 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -181,6 +181,11 @@ struct hci_dev {
181 unsigned int sco_pkts; 181 unsigned int sco_pkts;
182 unsigned int le_pkts; 182 unsigned int le_pkts;
183 183
184 __u16 block_len;
185 __u16 block_mtu;
186 __u16 num_blocks;
187 __u16 block_cnt;
188
184 unsigned long acl_last_tx; 189 unsigned long acl_last_tx;
185 unsigned long sco_last_tx; 190 unsigned long sco_last_tx;
186 unsigned long le_last_tx; 191 unsigned long le_last_tx;
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 74f758363c2d..48796832fdf0 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -767,6 +767,28 @@ static void hci_cc_read_bd_addr(struct hci_dev *hdev, struct sk_buff *skb)
767 hci_req_complete(hdev, HCI_OP_READ_BD_ADDR, rp->status); 767 hci_req_complete(hdev, HCI_OP_READ_BD_ADDR, rp->status);
768} 768}
769 769
770static void hci_cc_read_data_block_size(struct hci_dev *hdev,
771 struct sk_buff *skb)
772{
773 struct hci_rp_read_data_block_size *rp = (void *) skb->data;
774
775 BT_DBG("%s status 0x%x", hdev->name, rp->status);
776
777 if (rp->status)
778 return;
779
780 hdev->block_mtu = __le16_to_cpu(rp->max_acl_len);
781 hdev->block_len = __le16_to_cpu(rp->block_len);
782 hdev->num_blocks = __le16_to_cpu(rp->num_blocks);
783
784 hdev->block_cnt = hdev->num_blocks;
785
786 BT_DBG("%s blk mtu %d cnt %d len %d", hdev->name, hdev->block_mtu,
787 hdev->block_cnt, hdev->block_len);
788
789 hci_req_complete(hdev, HCI_OP_READ_DATA_BLOCK_SIZE, rp->status);
790}
791
770static void hci_cc_write_ca_timeout(struct hci_dev *hdev, struct sk_buff *skb) 792static void hci_cc_write_ca_timeout(struct hci_dev *hdev, struct sk_buff *skb)
771{ 793{
772 __u8 status = *((__u8 *) skb->data); 794 __u8 status = *((__u8 *) skb->data);
@@ -2018,6 +2040,10 @@ static inline void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *sk
2018 hci_cc_read_bd_addr(hdev, skb); 2040 hci_cc_read_bd_addr(hdev, skb);
2019 break; 2041 break;
2020 2042
2043 case HCI_OP_READ_DATA_BLOCK_SIZE:
2044 hci_cc_read_data_block_size(hdev, skb);
2045 break;
2046
2021 case HCI_OP_WRITE_CA_TIMEOUT: 2047 case HCI_OP_WRITE_CA_TIMEOUT:
2022 hci_cc_write_ca_timeout(hdev, skb); 2048 hci_cc_write_ca_timeout(hdev, skb);
2023 break; 2049 break;