Commit 0e91493a authored by Johan Hedberg's avatar Johan Hedberg Committed by Johan Hedberg
Browse files

Bluetooth: L2CAP: Make channel ops const 



Make the channel ops struct const since there really isn't anything
there that needs to change at runtime. The only exception is the L2CAP
shell which was playing with the recv callback, however that can be
fixed by introducing a simple bool variable.

With tests/bluetooth/shell this reduces RAM consumption by 112 bytes
while adding only 16 bytes to flash consumption.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent bc444ec6

include/bluetooth/l2cap.h

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ struct bt_l2cap_chan { 
	/** Channel connection reference */

	struct bt_conn			*conn;

	/** Channel operations reference */

	struct bt_l2cap_chan_ops	*ops;

	const struct bt_l2cap_chan_ops	*ops;

	sys_snode_t			node;

	bt_l2cap_chan_destroy_t		destroy;

	/* Response Timeout eXpired (RTX) timer */

subsys/bluetooth/host/att.c

+1 −1
Original line number Diff line number Diff line
@@ -2208,7 +2208,7 @@ static void bt_att_encrypt_change(struct bt_l2cap_chan *chan, 
static int bt_att_accept(struct bt_conn *conn, struct bt_l2cap_chan **chan)

{

	int i;

	static struct bt_l2cap_chan_ops ops = {

	static const struct bt_l2cap_chan_ops ops = {

		.connected = bt_att_connected,

		.disconnected = bt_att_disconnected,

		.recv = bt_att_recv,

subsys/bluetooth/host/avdtp.c

+2 −2
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ int bt_avdtp_l2cap_recv(struct bt_l2cap_chan *chan, struct net_buf *buf) 
/*A2DP Layer interface */

int bt_avdtp_connect(struct bt_conn *conn, struct bt_avdtp *session)

{

	static struct bt_l2cap_chan_ops ops = {

	static const struct bt_l2cap_chan_ops ops = {

		.connected = bt_avdtp_l2cap_connected,

		.disconnected = bt_avdtp_l2cap_disconnected,

		.encrypt_change = bt_avdtp_l2cap_encrypt_changed,
@@ -224,7 +224,7 @@ int bt_avdtp_l2cap_accept(struct bt_conn *conn, struct bt_l2cap_chan **chan) 
{

	struct bt_avdtp *session = NULL;

	int result;

	static struct bt_l2cap_chan_ops ops = {

	static const struct bt_l2cap_chan_ops ops = {

		.connected = bt_avdtp_l2cap_connected,

		.disconnected = bt_avdtp_l2cap_disconnected,

		.recv = bt_avdtp_l2cap_recv,

subsys/bluetooth/host/l2cap.c

+1 −1
Original line number Diff line number Diff line
@@ -1880,7 +1880,7 @@ static void l2cap_disconnected(struct bt_l2cap_chan *chan) 
static int l2cap_accept(struct bt_conn *conn, struct bt_l2cap_chan **chan)

{

	int i;

	static struct bt_l2cap_chan_ops ops = {

	static const struct bt_l2cap_chan_ops ops = {

		.connected = l2cap_connected,

		.disconnected = l2cap_disconnected,

		.recv = l2cap_recv,

subsys/bluetooth/host/l2cap_br.c

+1 −1
Original line number Diff line number Diff line
@@ -1515,7 +1515,7 @@ void bt_l2cap_br_recv(struct bt_conn *conn, struct net_buf *buf) 
static int l2cap_br_accept(struct bt_conn *conn, struct bt_l2cap_chan **chan)

{

	int i;

	static struct bt_l2cap_chan_ops ops = {

	static const struct bt_l2cap_chan_ops ops = {

		.connected = l2cap_br_connected,

		.disconnected = l2cap_br_disconnected,

		.recv = l2cap_br_recv,

CRA Git | Maintained and supported by SUSTech CRA and CCSE