michaelh/zephyr
1
0
Fork 0
Code Releases Activity

bluetooth: host: expand l2cap CID abbreviation

Browse source 
Reduces some user confusion regarding whether it is related
to "Connection ID", "Channel ID", or "Company ID" for the
uninitiated.

Signed-off-by: Emil Hammarstrom <emil.hammarstrom@assaabloy.com>
This commit is contained in:
Emil Hammarstrom 2021-02-04 11:07:02 +01:00 • committed by Anas Nashif
commit 3cf64b17c3
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/bluetooth/l2cap.h
View file

@ -113,7 +113,7 @@ struct bt_l2cap_chan {
/** @brief LE L2CAP Endpoint structure. */ /** @brief LE L2CAP Endpoint structure. */
struct bt_l2cap_le_endpoint { struct bt_l2cap_le_endpoint {
/** Endpoint CID */ /** Endpoint Channel Identifier (CID) */
uint16_t cid; uint16_t cid;
/** Endpoint Maximum Transmission Unit */ /** Endpoint Maximum Transmission Unit */
uint16_t mtu; uint16_t mtu;
@ -160,7 +160,7 @@ struct bt_l2cap_le_chan {
/** @brief BREDR L2CAP Endpoint structure. */ /** @brief BREDR L2CAP Endpoint structure. */
struct bt_l2cap_br_endpoint { struct bt_l2cap_br_endpoint {
/** Endpoint CID */ /** Endpoint Channel Identifier (CID) */
uint16_t cid; uint16_t cid;
/** Endpoint Maximum Transmission Unit */ /** Endpoint Maximum Transmission Unit */
uint16_t mtu; uint16_t mtu;

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

@ -326,7 +326,7 @@ static bool l2cap_chan_add(struct bt_conn *conn, struct bt_l2cap_chan *chan,
#endif #endif
if (!ch) { if (!ch) {
BT_ERR("Unable to allocate L2CAP CID"); BT_ERR("Unable to allocate L2CAP channel ID");
return false; return false;
} }
@ -2292,7 +2292,7 @@ void bt_l2cap_recv(struct bt_conn *conn, struct net_buf *buf)
chan = bt_l2cap_le_lookup_rx_cid(conn, cid); chan = bt_l2cap_le_lookup_rx_cid(conn, cid);
if (!chan) { if (!chan) {
BT_WARN("Ignoring data for unknown CID 0x%04x", cid); BT_WARN("Ignoring data for unknown channel ID 0x%04x", cid);
net_buf_unref(buf); net_buf_unref(buf);
return; return;
} }

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

@ -1489,7 +1489,7 @@ void bt_l2cap_br_recv(struct bt_conn *conn, struct net_buf *buf)
chan = bt_l2cap_br_lookup_rx_cid(conn, cid); chan = bt_l2cap_br_lookup_rx_cid(conn, cid);
if (!chan) { if (!chan) {
BT_WARN("Ignoring data for unknown CID 0x%04x", cid); BT_WARN("Ignoring data for unknown channel ID 0x%04x", cid);
net_buf_unref(buf); net_buf_unref(buf);
return; return;
} }