michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Host: Rename callback_list -> conn_cbs

Browse source 
This improves consistency with other callback lists like
scan_cbs and pa_sync_cbs.

Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
This commit is contained in:
Rubin Gerritsen 2024-06-10 14:34:44 +02:00 • committed by Anas Nashif
commit 3eb975deb2
1 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

35
subsys/bluetooth/host/conn.c
View file

@ -99,7 +99,7 @@ sys_slist_t bt_auth_info_cbs = SYS_SLIST_STATIC_INIT(&bt_auth_info_cbs);
#endif /* CONFIG_BT_SMP || CONFIG_BT_CLASSIC */ #endif /* CONFIG_BT_SMP || CONFIG_BT_CLASSIC */
static sys_slist_t callback_list = SYS_SLIST_STATIC_INIT(&callback_list); static sys_slist_t conn_cbs = SYS_SLIST_STATIC_INIT(&conn_cbs);
static struct bt_conn_tx conn_tx[CONFIG_BT_CONN_TX_MAX]; static struct bt_conn_tx conn_tx[CONFIG_BT_CONN_TX_MAX];
@ -1575,7 +1575,7 @@ static void notify_recycled_conn_slot(void)
#if defined(CONFIG_BT_CONN) #if defined(CONFIG_BT_CONN)
struct bt_conn_cb *callback; struct bt_conn_cb *callback;
SYS_SLIST_FOR_EACH_CONTAINER(&callback_list, callback, _node) { SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
if (callback->recycled) { if (callback->recycled) {
callback->recycled(); callback->recycled();
} }
@ -1684,7 +1684,8 @@ static void notify_connected(struct bt_conn *conn)
{ {
struct bt_conn_cb *callback; struct bt_conn_cb *callback;
SYS_SLIST_FOR_EACH_CONTAINER(&callback_list, callback, _node) { SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
if (callback->connected) { if (callback->connected) {
callback->connected(conn, conn->err); callback->connected(conn, conn->err);
} }
@ -1701,7 +1702,7 @@ static void notify_disconnected(struct bt_conn *conn)
{ {
struct bt_conn_cb *callback; struct bt_conn_cb *callback;
SYS_SLIST_FOR_EACH_CONTAINER(&callback_list, callback, _node) { SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
if (callback->disconnected) { if (callback->disconnected) {
callback->disconnected(conn, conn->err); callback->disconnected(conn, conn->err);
} }
@ -1728,7 +1729,7 @@ void notify_remote_info(struct bt_conn *conn)
struct bt_conn_cb *callback; struct bt_conn_cb *callback;
SYS_SLIST_FOR_EACH_CONTAINER(&callback_list, callback, _node) { SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
if (callback->remote_info_available) { if (callback->remote_info_available) {
callback->remote_info_available(conn, &remote_info); callback->remote_info_available(conn, &remote_info);
} }
@ -1757,7 +1758,7 @@ void notify_le_param_updated(struct bt_conn *conn)
struct bt_conn_cb *callback; struct bt_conn_cb *callback;
SYS_SLIST_FOR_EACH_CONTAINER(&callback_list, callback, _node) { SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
if (callback->le_param_updated) { if (callback->le_param_updated) {
callback->le_param_updated(conn, conn->le.interval, callback->le_param_updated(conn, conn->le.interval,
conn->le.latency, conn->le.latency,
@ -1779,7 +1780,7 @@ void notify_le_data_len_updated(struct bt_conn *conn)
{ {
struct bt_conn_cb *callback; struct bt_conn_cb *callback;
SYS_SLIST_FOR_EACH_CONTAINER(&callback_list, callback, _node) { SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
if (callback->le_data_len_updated) { if (callback->le_data_len_updated) {
callback->le_data_len_updated(conn, &conn->le.data_len); callback->le_data_len_updated(conn, &conn->le.data_len);
} }
@ -1798,7 +1799,7 @@ void notify_le_phy_updated(struct bt_conn *conn)
{ {
struct bt_conn_cb *callback; struct bt_conn_cb *callback;
SYS_SLIST_FOR_EACH_CONTAINER(&callback_list, callback, _node) { SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
if (callback->le_phy_updated) { if (callback->le_phy_updated) {
callback->le_phy_updated(conn, &conn->le.phy); callback->le_phy_updated(conn, &conn->le.phy);
} }
@ -1820,7 +1821,7 @@ bool le_param_req(struct bt_conn *conn, struct bt_le_conn_param *param)
struct bt_conn_cb *callback; struct bt_conn_cb *callback;
SYS_SLIST_FOR_EACH_CONTAINER(&callback_list, callback, _node) { SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
if (!callback->le_param_req) { if (!callback->le_param_req) {
continue; continue;
} }
@ -2305,7 +2306,7 @@ void bt_conn_identity_resolved(struct bt_conn *conn)
struct bt_conn_cb *callback; struct bt_conn_cb *callback;
SYS_SLIST_FOR_EACH_CONTAINER(&callback_list, callback, _node) { SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
if (callback->identity_resolved) { if (callback->identity_resolved) {
callback->identity_resolved(conn, rpa, &conn->le.dst); callback->identity_resolved(conn, rpa, &conn->le.dst);
} }
@ -2417,7 +2418,7 @@ void bt_conn_security_changed(struct bt_conn *conn, uint8_t hci_err,
struct bt_conn_cb *callback; struct bt_conn_cb *callback;
SYS_SLIST_FOR_EACH_CONTAINER(&callback_list, callback, _node) { SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
if (callback->security_changed) { if (callback->security_changed) {
callback->security_changed(conn, conn->sec_level, err); callback->security_changed(conn, conn->sec_level, err);
} }
@ -2509,8 +2510,8 @@ bt_security_t bt_conn_get_security(const struct bt_conn *conn)
void bt_conn_cb_register(struct bt_conn_cb *cb) void bt_conn_cb_register(struct bt_conn_cb *cb)
{ {
if (!sys_slist_find(&callback_list, &cb->_node, NULL)) { if (!sys_slist_find(&conn_cbs, &cb->_node, NULL)) {
sys_slist_append(&callback_list, &cb->_node); sys_slist_append(&conn_cbs, &cb->_node);
} }
} }
@ -2520,7 +2521,7 @@ int bt_conn_cb_unregister(struct bt_conn_cb *cb)
return -EINVAL; return -EINVAL;
} }
if (!sys_slist_find_and_remove(&callback_list, &cb->_node)) { if (!sys_slist_find_and_remove(&conn_cbs, &cb->_node)) {
return -ENOENT; return -ENOENT;
} }
@ -2817,7 +2818,7 @@ void notify_tx_power_report(struct bt_conn *conn,
{ {
struct bt_conn_cb *callback; struct bt_conn_cb *callback;
SYS_SLIST_FOR_EACH_CONTAINER(&callback_list, callback, _node) { SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
if (callback->tx_power_report) { if (callback->tx_power_report) {
callback->tx_power_report(conn, &report); callback->tx_power_report(conn, &report);
} }
@ -3684,7 +3685,7 @@ void bt_hci_le_df_connection_iq_report_common(uint8_t event, struct net_buf *buf
struct bt_conn_cb *callback; struct bt_conn_cb *callback;
SYS_SLIST_FOR_EACH_CONTAINER(&callback_list, callback, _node) { SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
if (callback->cte_report_cb) { if (callback->cte_report_cb) {
callback->cte_report_cb(conn, &iq_report); callback->cte_report_cb(conn, &iq_report);
} }
@ -3728,7 +3729,7 @@ void bt_hci_le_df_cte_req_failed(struct net_buf *buf)
struct bt_conn_cb *callback; struct bt_conn_cb *callback;
SYS_SLIST_FOR_EACH_CONTAINER(&callback_list, callback, _node) { SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
if (callback->cte_report_cb) { if (callback->cte_report_cb) {
callback->cte_report_cb(conn, &iq_report); callback->cte_report_cb(conn, &iq_report);
} }