michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Revert "Bluetooth: Rotate outgoing ACL packets via a pending queue"

Browse source 
This reverts commit ce981a0f51f94a3f23c43b947a2ce62a1ef08623.

Now that we're back to using an ACL buffer semaphore the rotation of
outgoing ACL packets via a pending queue is no-longer necessary.

Change-Id: I0da42992bed2abba1544b1a82c31bc71342ecf70
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2015-05-12 14:59:16 +03:00 • committed by Anas Nashif
commit 9b1e7a935b
3 changed files with 2 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
net/bluetooth/conn.c
View file

@ -251,7 +251,7 @@ static void conn_tx_fiber(int arg1, int arg2)
}
dev->drv->send(buf);
nano_fiber_fifo_put(&dev->acl_pend, buf);
bt_buf_put(buf);
}
BT_DBG("handle %u disconnected - cleaning up\n", conn->handle);

13
net/bluetooth/hci_core.c
View file

@ -318,22 +318,14 @@ static void hci_num_completed_packets(struct bt_buf *buf)
for (i = 0; i < num_handles; i++) {
uint16_t handle, count;
struct bt_buf *buf;
handle = sys_le16_to_cpu(evt->h[i].handle);
count = sys_le16_to_cpu(evt->h[i].count);
BT_DBG("handle %u count %u\n", handle, count);
while (count--) {
while (count--)
nano_fiber_sem_give(&dev.le_pkts_sem);
buf = nano_fiber_fifo_get(&dev.acl_pend);
if (!buf) {
BT_ERR("Mismatch with pending ACL buffers\n");
continue;
}
bt_buf_put(buf);
}
}
}
@ -752,9 +744,6 @@ int bt_init(void)
return err;
}
/* Initialize pending ACL packets FIFO */
nano_fifo_init(&dev.acl_pend);
/* Re-initialize buffers now that we know the ACL counts */
if (dev.le_pkts > ACL_OUT_MAX) {
acl_out = ACL_OUT_MAX;

3
net/bluetooth/hci_core.h
View file

@ -71,9 +71,6 @@ struct bt_dev {
/* Queue for outgoing HCI commands */
struct nano_fifo cmd_queue;
/* Pending outgoing ACL packets */
struct nano_fifo acl_pend;
/* Registered HCI driver */
struct bt_driver *drv;
};