michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: L2CAP: Implement bt_l2cap_br_connected() notifier

Browse source 
Adds implementation of the BR/EDR connection L2CAP notifier. It makes,
for each registered BR/EDR fixed channel, basic validation and channel
initialization using two local helper functions.

Change-Id: I6393a43b25ff0d9f23deaf93562add08861ea1d2
Signed-off-by: Arkadiusz Lichwa <arkadiusz.lichwa@tieto.com>
This commit is contained in:
Arkadiusz Lichwa 2016-05-10 18:18:40 +02:00 • committed by Johan Hedberg
commit bc6a2cd7d6
2 changed files with 68 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
net/bluetooth/l2cap.c
View file

@ -46,8 +46,6 @@
#define L2CAP_LE_DYN_CID_START 0x0040
#define L2CAP_LE_DYN_CID_END 0x007f
#define L2CAP_BR_DYN_CID_START 0x0040
#define L2CAP_BR_DYN_CID_END 0xffff
#define L2CAP_LE_PSM_START 0x0001
#define L2CAP_LE_PSM_END 0x00ff
@ -148,7 +146,7 @@ void bt_l2cap_le_fixed_chan_register(struct bt_l2cap_fixed_chan *chan)
static void l2cap_chan_alloc_cid(struct bt_conn *conn,
struct bt_l2cap_chan *chan)
{
uint16_t cid, cid_min, cid_max;
uint16_t cid;
/*
* No action needed if there's already a CID allocated, e.g. in
@ -158,17 +156,7 @@ static void l2cap_chan_alloc_cid(struct bt_conn *conn,
return;
}
cid_min = L2CAP_LE_DYN_CID_START;
cid_max = L2CAP_LE_DYN_CID_END;
#if defined(CONFIG_BLUETOOTH_BREDR)
if (conn->type == BT_CONN_TYPE_BR) {
cid_min = L2CAP_BR_DYN_CID_START;
cid_max = L2CAP_BR_DYN_CID_END;
}
#endif /* CONFIG_BLUETOOTH_BREDR */
for (cid = cid_min; cid <= cid_max; cid++) {
for (cid = L2CAP_LE_DYN_CID_START; cid <= L2CAP_LE_DYN_CID_END; cid++) {
if (!bt_l2cap_lookup_rx_cid(conn, cid)) {
chan->rx.cid = cid;
return;

67
net/bluetooth/l2cap_br.c
View file

@ -43,6 +43,9 @@
#define L2CAP_BR_PSM_START 0x0001
#define L2CAP_BR_PSM_END 0xffff
#define L2CAP_BR_DYN_CID_START 0x0040
#define L2CAP_BR_DYN_CID_END 0xffff
#define L2CAP_BR_MIN_MTU 48
static struct bt_l2cap_server *br_servers;
@ -54,9 +57,71 @@ static NET_BUF_POOL(br_sig_pool, CONFIG_BLUETOOTH_MAX_CONN,
BT_L2CAP_BUF_SIZE(L2CAP_BR_MIN_MTU), &br_sig, NULL,
BT_BUF_USER_DATA_MIN);
static void l2cap_br_chan_alloc_cid(struct bt_conn *conn,
struct bt_l2cap_chan *chan)
{
uint16_t cid;
/*
* No action needed if there's already a CID allocated, e.g. in
* the case of a fixed channel.
*/
if (chan->rx.cid > 0) {
return;
}
for (cid = L2CAP_BR_DYN_CID_START; cid <= L2CAP_BR_DYN_CID_END; cid++) {
if (!bt_l2cap_lookup_rx_cid(conn, cid)) {
chan->rx.cid = cid;
return;
}
}
}
static int l2cap_br_chan_add(struct bt_conn *conn, struct bt_l2cap_chan *chan)
{
l2cap_br_chan_alloc_cid(conn, chan);
if (!chan->rx.cid) {
BT_ERR("Unable to allocate L2CAP CID");
return -ENOMEM;
}
/* Attach channel to the connection */
chan->_next = conn->channels;
conn->channels = chan;
chan->conn = conn;
BT_DBG("conn %p chan %p cid 0x%04x", conn, chan, chan->rx.cid);
return 0;
}
void bt_l2cap_br_connected(struct bt_conn *conn)
{
BT_WARN("Not yet implemented");
struct bt_l2cap_fixed_chan *fchan;
struct bt_l2cap_chan *chan;
fchan = br_channels;
for (; fchan; fchan = fchan->_next) {
if (!fchan->accept) {
continue;
}
if (fchan->accept(conn, &chan) < 0) {
continue;
}
chan->rx.cid = fchan->cid;
chan->tx.cid = fchan->cid;
l2cap_br_chan_add(conn, chan);
if (chan->ops->connected) {
chan->ops->connected(chan);
}
}
}
static struct bt_l2cap_server *l2cap_br_server_lookup_psm(uint16_t psm)