michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: L2CAP: Add sent callback

Browse source 
This adds a new callback to bt_l2cap_chan_ops which is called whenever a
SDU is completely sent.

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
Luiz Augusto von Dentz 2019-05-21 15:07:43 +03:00 • committed by Johan Hedberg
commit d8f20fe1e0
2 changed files with 33 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
include/bluetooth/l2cap.h
View file

@ -211,6 +211,15 @@ struct bt_l2cap_chan_ops {
* number of segments/credits used by the packet. * number of segments/credits used by the packet.
*/ */
int (*recv)(struct bt_l2cap_chan *chan, struct net_buf *buf); int (*recv)(struct bt_l2cap_chan *chan, struct net_buf *buf);
/* Channel sent callback
*
* If this callback is provided it will be called whenever a SDU has
* been completely sent.
*
* @param chan The channel which has sent data.
*/
void (*sent)(struct bt_l2cap_chan *chan);
}; };
/** @def BT_L2CAP_CHAN_SEND_RESERVE /** @def BT_L2CAP_CHAN_SEND_RESERVE

28
subsys/bluetooth/host/l2cap.c
View file

@ -1097,9 +1097,21 @@ segment:
return seg; return seg;
} }
static void l2cap_chan_sdu_sent(struct bt_conn *conn, void *user_data)
{
struct bt_l2cap_chan *chan = user_data;
BT_DBG("conn %p chan %p", conn, chan);
if (chan->ops->sent) {
chan->ops->sent(chan);
}
}
static int l2cap_chan_le_send(struct bt_l2cap_le_chan *ch, struct net_buf *buf, static int l2cap_chan_le_send(struct bt_l2cap_le_chan *ch, struct net_buf *buf,
u16_t sdu_hdr_len) u16_t sdu_hdr_len)
{ {
struct net_buf *seg;
int len; int len;
/* Wait for credits */ /* Wait for credits */
@ -1108,7 +1120,7 @@ static int l2cap_chan_le_send(struct bt_l2cap_le_chan *ch, struct net_buf *buf,
return -EAGAIN; return -EAGAIN;
} }
buf = l2cap_chan_create_seg(ch, buf, sdu_hdr_len); seg = l2cap_chan_create_seg(ch, buf, sdu_hdr_len);
/* Channel may have been disconnected while waiting for a buffer */ /* Channel may have been disconnected while waiting for a buffer */
if (!ch->chan.conn) { if (!ch->chan.conn) {
@ -1117,11 +1129,19 @@ static int l2cap_chan_le_send(struct bt_l2cap_le_chan *ch, struct net_buf *buf,
} }
BT_DBG("ch %p cid 0x%04x len %u credits %u", ch, ch->tx.cid, BT_DBG("ch %p cid 0x%04x len %u credits %u", ch, ch->tx.cid,
buf->len, k_sem_count_get(&ch->tx.credits)); seg->len, k_sem_count_get(&ch->tx.credits));
len = buf->len - sdu_hdr_len; len = seg->len - sdu_hdr_len;
bt_l2cap_send(ch->chan.conn, ch->tx.cid, buf); /* Set a callback if there is no data left in the buffer and sent
* callback has been set.
*/
if ((buf == seg || !buf->len) && ch->chan.ops->sent) {
bt_l2cap_send_cb(ch->chan.conn, ch->tx.cid, seg,
l2cap_chan_sdu_sent, &ch->chan);
} else {
bt_l2cap_send(ch->chan.conn, ch->tx.cid, seg);
}
return len; return len;
} }