michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: L2CAP: Add helper for BR channel conversion

Browse source 
Change-Id: I796489d5d85bb3ba945c12a08a98243092006fde
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2016-06-13 15:10:55 +03:00
commit 5793b145d0
1 changed files with 14 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

44
net/bluetooth/l2cap_br.c
View file

@ -40,6 +40,8 @@
#define BT_DBG(fmt, ...) #define BT_DBG(fmt, ...)
#endif #endif
#define BR_CHAN(_ch) CONTAINER_OF(_ch, struct bt_l2cap_br_chan, chan)
#define L2CAP_BR_PSM_START 0x0001 #define L2CAP_BR_PSM_START 0x0001
#define L2CAP_BR_PSM_END 0xffff #define L2CAP_BR_PSM_END 0xffff
@ -87,8 +89,7 @@ struct bt_l2cap_chan *bt_l2cap_br_lookup_rx_cid(struct bt_conn *conn,
struct bt_l2cap_chan *chan; struct bt_l2cap_chan *chan;
for (chan = conn->channels; chan; chan = chan->_next) { for (chan = conn->channels; chan; chan = chan->_next) {
struct bt_l2cap_br_chan *ch = struct bt_l2cap_br_chan *ch = BR_CHAN(chan);
CONTAINER_OF(chan, struct bt_l2cap_br_chan, chan);
if (ch->rx.cid == cid) { if (ch->rx.cid == cid) {
return chan; return chan;
@ -101,10 +102,8 @@ struct bt_l2cap_chan *bt_l2cap_br_lookup_rx_cid(struct bt_conn *conn,
static struct bt_l2cap_br_chan* static struct bt_l2cap_br_chan*
l2cap_br_chan_alloc_cid(struct bt_conn *conn, struct bt_l2cap_chan *chan) l2cap_br_chan_alloc_cid(struct bt_conn *conn, struct bt_l2cap_chan *chan)
{ {
struct bt_l2cap_br_chan *ch = BR_CHAN(chan);
uint16_t cid; uint16_t cid;
struct bt_l2cap_br_chan *ch = CONTAINER_OF(chan,
struct bt_l2cap_br_chan,
chan);
/* /*
* No action needed if there's already a CID allocated, e.g. in * No action needed if there's already a CID allocated, e.g. in
@ -322,10 +321,13 @@ void bt_l2cap_br_connected(struct bt_conn *conn)
{ {
struct bt_l2cap_fixed_chan *fchan; struct bt_l2cap_fixed_chan *fchan;
struct bt_l2cap_chan *chan; struct bt_l2cap_chan *chan;
struct bt_l2cap_br *l2cap;
fchan = br_channels; fchan = br_channels;
for (; fchan; fchan = fchan->_next) { for (; fchan; fchan = fchan->_next) {
struct bt_l2cap_br_chan *ch;
if (!fchan->accept) { if (!fchan->accept) {
continue; continue;
} }
@ -334,8 +336,7 @@ void bt_l2cap_br_connected(struct bt_conn *conn)
continue; continue;
} }
struct bt_l2cap_br_chan *ch = ch = BR_CHAN(chan);
CONTAINER_OF(chan, struct bt_l2cap_br_chan, chan);
ch->rx.cid = fchan->cid; ch->rx.cid = fchan->cid;
ch->tx.cid = fchan->cid; ch->tx.cid = fchan->cid;
@ -349,9 +350,7 @@ void bt_l2cap_br_connected(struct bt_conn *conn)
} }
} }
struct bt_l2cap_br *l2cap = CONTAINER_OF(chan, struct bt_l2cap_br, l2cap = CONTAINER_OF(chan, struct bt_l2cap_br, chan.chan);
chan.chan);
l2cap_br_get_info(l2cap, BT_L2CAP_INFO_FEAT_MASK); l2cap_br_get_info(l2cap, BT_L2CAP_INFO_FEAT_MASK);
} }
@ -427,12 +426,8 @@ static void l2cap_br_send_reject(struct bt_conn *conn, uint8_t ident,
static void l2cap_br_chan_del(struct bt_l2cap_chan *chan) static void l2cap_br_chan_del(struct bt_l2cap_chan *chan)
{ {
struct bt_l2cap_br_chan *ch = CONTAINER_OF(chan, BT_DBG("conn %p chan %p cid 0x%04x", chan->conn, BR_CHAN(chan),
struct bt_l2cap_br_chan, BR_CHAN(chan)->rx.cid);
chan);
ARG_UNUSED(ch);
BT_DBG("conn %p chan %p cid 0x%04x", chan->conn, ch, ch->rx.cid);
chan->conn = NULL; chan->conn = NULL;
@ -449,8 +444,7 @@ static struct bt_l2cap_br_chan *l2cap_br_remove_tx_cid(struct bt_conn *conn,
for (chan = conn->channels, prev = NULL; chan; for (chan = conn->channels, prev = NULL; chan;
prev = chan, chan = chan->_next) { prev = chan, chan = chan->_next) {
/* get the app's l2cap object wherein this chan is contained */ /* get the app's l2cap object wherein this chan is contained */
struct bt_l2cap_br_chan *ch = struct bt_l2cap_br_chan *ch = BR_CHAN(chan);
CONTAINER_OF(chan, struct bt_l2cap_br_chan, chan);
if (ch->tx.cid != cid) { if (ch->tx.cid != cid) {
continue; continue;
@ -520,22 +514,12 @@ static void l2cap_br_disconn_req(struct bt_l2cap_br *l2cap, uint8_t ident,
static void l2cap_br_connected(struct bt_l2cap_chan *chan) static void l2cap_br_connected(struct bt_l2cap_chan *chan)
{ {
struct bt_l2cap_br_chan *ch = CONTAINER_OF(chan, BT_DBG("ch %p cid 0x%04x", BR_CHAN(chan), BR_CHAN(chan)->rx.cid);
struct bt_l2cap_br_chan,
chan);
ARG_UNUSED(ch);
BT_DBG("ch %p cid 0x%04x", ch, ch->rx.cid);
} }
static void l2cap_br_disconnected(struct bt_l2cap_chan *chan) static void l2cap_br_disconnected(struct bt_l2cap_chan *chan)
{ {
struct bt_l2cap_br_chan *ch = CONTAINER_OF(chan, BT_DBG("ch %p cid 0x%04x", BR_CHAN(chan), BR_CHAN(chan)->rx.cid);
struct bt_l2cap_br_chan,
chan);
ARG_UNUSED(ch);
BT_DBG("ch %p cid 0x%04x", ch, ch->rx.cid);
} }
int bt_l2cap_br_chan_disconnect(struct bt_l2cap_chan *chan) int bt_l2cap_br_chan_disconnect(struct bt_l2cap_chan *chan)