michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: L2CAP: Use sys_slist_t for server channels

Browse source 
Change-Id: I1de0ed8fe82426d9a2049ab5f8c476863f3ea591
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
Luiz Augusto von Dentz 2017-03-23 15:03:58 +02:00
commit 194c4b9af6
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/bluetooth/l2cap.h
View file

@ -232,7 +232,7 @@ struct bt_l2cap_server {
*/
int (*accept)(struct bt_conn *conn, struct bt_l2cap_chan **chan);
struct bt_l2cap_server *_next;
sys_snode_t node;
};
/** @brief Register L2CAP server.

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

@ -55,7 +55,7 @@
static struct bt_l2cap_fixed_chan *le_channels;
#if defined(CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL)
static struct bt_l2cap_server *servers;
static sys_slist_t servers;
#endif /* CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL */
#if defined(CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL)
@ -578,7 +578,7 @@ static struct bt_l2cap_server *l2cap_server_lookup_psm(uint16_t psm)
{
struct bt_l2cap_server *server;
for (server = servers; server; server = server->_next) {
SYS_SLIST_FOR_EACH_CONTAINER(&servers, server, node) {
if (server->psm == psm) {
return server;
}
@ -609,8 +609,7 @@ int bt_l2cap_server_register(struct bt_l2cap_server *server)
BT_DBG("PSM 0x%04x", server->psm);
server->_next = servers;
servers = server;
sys_slist_append(&servers, &server->node);
return 0;
}

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

@ -75,7 +75,7 @@ enum {
L2CAP_FLAG_FIXED_CONNECTED, /* fixed connected */
};
static struct bt_l2cap_server *br_servers;
static sys_slist_t br_servers;
static struct bt_l2cap_fixed_chan *br_fixed_channels;
/* Pool for outgoing BR/EDR signaling packets, min MTU is 48 */
@ -490,7 +490,7 @@ static struct bt_l2cap_server *l2cap_br_server_lookup_psm(uint16_t psm)
{
struct bt_l2cap_server *server;
for (server = br_servers; server; server = server->_next) {
SYS_SLIST_FOR_EACH_CONTAINER(&br_servers, server, node) {
if (server->psm == psm) {
return server;
}
@ -858,8 +858,7 @@ int bt_l2cap_br_server_register(struct bt_l2cap_server *server)
BT_DBG("PSM 0x%04x", server->psm);
server->_next = br_servers;
br_servers = server;
sys_slist_append(&br_servers, &server->node);
return 0;
}
@ -1563,6 +1562,8 @@ void bt_l2cap_br_init(void)
.accept = l2cap_br_accept,
};
sys_slist_init(&br_servers);
bt_l2cap_br_fixed_chan_register(&chan_br);
if (IS_ENABLED(CONFIG_BLUETOOTH_RFCOMM)) {