patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

Bluetooth: L2CAP: Make use of bt_l2cap_chan_set_state on BR/EDR

Browse source 
This makes use of the same code used by LE to print the state transitions.

Change-Id: I90a04f3c3f426fde1e0987acb572f7371c483c1c
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
Luiz Augusto von Dentz 2016-11-03 15:31:44 +02:00 committed by Johan Hedberg
parent 5fecf98c8e
commit 1b7c219f8a
1 changed files with 11 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
subsys/bluetooth/host/l2cap_br.c
View file

@ -118,82 +118,6 @@ struct bt_l2cap_br {
static struct bt_l2cap_br bt_l2cap_br_pool[CONFIG_BLUETOOTH_MAX_CONN];
#if defined(CONFIG_BLUETOOTH_DEBUG_L2CAP)
static const char *state2str(bt_l2cap_chan_state_t state)
{
switch (state) {
case BT_L2CAP_DISCONNECTED:
return "disconnected";
case BT_L2CAP_CONNECT:
return "connect";
case BT_L2CAP_CONFIG:
return "config";
case BT_L2CAP_CONNECTED:
return "connected";
case BT_L2CAP_DISCONNECT:
return "disconnect";
default:
return "unknown";
}
}
#endif /* CONFIG_BLUETOOTH_DEBUG_L2CAP */
static void l2cap_br_state_set(struct bt_l2cap_chan *ch,
bt_l2cap_chan_state_t state)
{
bt_l2cap_chan_state_t old_state = ch->state;
BT_DBG("scid 0x%04x %s -> %s", BR_CHAN(ch)->rx.cid,
state2str(old_state), state2str(state));
if (old_state == state) {
BT_WARN("no transition");
return;
}
/* check transitions validness */
switch (state) {
case BT_L2CAP_DISCONNECTED:
/* regardless of old state always allows this state */
break;
case BT_L2CAP_CONNECT:
if (old_state == BT_L2CAP_DISCONNECTED) {
break;
}
BT_WARN("no valid transition");
return;
case BT_L2CAP_CONFIG:
if (old_state == BT_L2CAP_CONNECT) {
break;
}
BT_WARN("no valid transition");
return;
case BT_L2CAP_CONNECTED:
if (old_state == BT_L2CAP_CONFIG) {
break;
}
BT_WARN("no valid transition");
return;
case BT_L2CAP_DISCONNECT:
if (old_state == BT_L2CAP_CONFIG ||
old_state == BT_L2CAP_CONNECTED) {
break;
}
BT_WARN("no valid transition");
return;
default:
BT_WARN("no valid (%u) state was set", state);
return;
}
/* apply new valid channel state */
ch->state = state;
}
struct bt_l2cap_chan *bt_l2cap_br_lookup_rx_cid(struct bt_conn *conn,
uint16_t cid)
{
@ -309,7 +233,8 @@ static void l2cap_br_rtx_timeout(struct nano_work *work)
return;
}
BT_DBG("chan %p %s scid 0x%04x", chan, state2str(chan->chan.state),
BT_DBG("chan %p %s scid 0x%04x", chan,
bt_l2cap_chan_state_str(chan->chan.state),
chan->rx.cid);
switch (chan->chan.state) {
@ -868,7 +793,7 @@ static void l2cap_br_conn_req(struct bt_l2cap_br *l2cap, uint8_t ident,
BR_CHAN(chan)->tx.cid = scid;
dcid = BR_CHAN(chan)->rx.cid;
chan->ident = ident;
l2cap_br_state_set(chan, BT_L2CAP_CONNECT);
bt_l2cap_chan_set_state(chan, BT_L2CAP_CONNECT);
atomic_set_bit(BR_CHAN(chan)->flags, L2CAP_FLAG_CONN_ACCEPTOR);
/* Disable fragmentation of l2cap rx pdu */
@ -898,7 +823,7 @@ done:
}
if (result == BT_L2CAP_SUCCESS) {
l2cap_br_state_set(chan, BT_L2CAP_CONFIG);
bt_l2cap_chan_set_state(chan, BT_L2CAP_CONFIG);
l2cap_br_conf(chan);
}
}
@ -948,7 +873,7 @@ static void l2cap_br_conf_rsp(struct bt_l2cap_br *l2cap, uint8_t ident,
BR_CHAN(chan)->rx.cid, BR_CHAN(chan)->rx.mtu,
BR_CHAN(chan)->tx.cid, BR_CHAN(chan)->tx.mtu);
l2cap_br_state_set(chan, BT_L2CAP_CONNECTED);
bt_l2cap_chan_set_state(chan, BT_L2CAP_CONNECTED);
if (chan->ops && chan->ops->connected) {
chan->ops->connected(chan);
}
@ -1174,7 +1099,7 @@ send_rsp:
BR_CHAN(chan)->rx.cid, BR_CHAN(chan)->rx.mtu,
BR_CHAN(chan)->tx.cid, BR_CHAN(chan)->tx.mtu);
l2cap_br_state_set(chan, BT_L2CAP_CONNECTED);
bt_l2cap_chan_set_state(chan, BT_L2CAP_CONNECTED);
if (chan->ops && chan->ops->connected) {
chan->ops->connected(chan);
}
@ -1315,7 +1240,7 @@ int bt_l2cap_br_chan_disconnect(struct bt_l2cap_chan *chan)
req->scid = sys_cpu_to_le16(ch->rx.cid);
l2cap_br_chan_send_req(ch, buf, L2CAP_BR_DISCONN_TIMEOUT);
l2cap_br_state_set(chan, BT_L2CAP_DISCONNECT);
bt_l2cap_chan_set_state(chan, BT_L2CAP_DISCONNECT);
return 0;
}
@ -1393,7 +1318,7 @@ int bt_l2cap_br_chan_connect(struct bt_conn *conn, struct bt_l2cap_chan *chan,
}
chan->psm = psm;
l2cap_br_state_set(chan, BT_L2CAP_CONNECT);
bt_l2cap_chan_set_state(chan, BT_L2CAP_CONNECT);
atomic_set_bit(BR_CHAN(chan)->flags, L2CAP_FLAG_CONN_PENDING);
switch (l2cap_br_conn_security(chan, psm)) {
@ -1463,7 +1388,7 @@ static void l2cap_br_conn_rsp(struct bt_l2cap_br *l2cap, uint8_t ident,
if (chan->state != BT_L2CAP_CONNECT) {
BT_DBG("Invalid channel %p state %s", chan,
state2str(chan->state));
bt_l2cap_chan_state_str(chan->state));
return;
}
@ -1472,7 +1397,7 @@ static void l2cap_br_conn_rsp(struct bt_l2cap_br *l2cap, uint8_t ident,
chan->ident = 0;
BR_CHAN(chan)->tx.cid = dcid;
l2cap_br_conf(chan);
l2cap_br_state_set(chan, BT_L2CAP_CONFIG);
bt_l2cap_chan_set_state(chan, BT_L2CAP_CONFIG);
atomic_clear_bit(BR_CHAN(chan)->flags, L2CAP_FLAG_CONN_PENDING);
break;
case BT_L2CAP_BR_PENDING:
@ -1596,7 +1521,7 @@ static void l2cap_br_conn_pend(struct bt_l2cap_chan *chan, uint8_t status)
* response and initiate configuration request.
*/
if (l2cap_br_conn_req_reply(chan, BT_L2CAP_SUCCESS) == 0) {
l2cap_br_state_set(chan, BT_L2CAP_CONFIG);
bt_l2cap_chan_set_state(chan, BT_L2CAP_CONFIG);
/*
* Initialize config request since remote needs to know
* local MTU segmentation.