Bluetooth: Host: Rename callback_list -> conn_cbs

rugeGerritsen · nashif · commit 3eb975deb265 · 2024-06-13T08:03:28.000-04:00
This improves consistency with other callback lists like
scan_cbs and pa_sync_cbs.

Signed-off-by: Rubin Gerritsen &lt;rubin.gerritsen@nordicsemi.no&gt;
diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
@@ -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 */
 
 
-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];
 
@@ -1575,7 +1575,7 @@ static void notify_recycled_conn_slot(void)
 #if defined(CONFIG_BT_CONN)
 	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) {
 			callback->recycled();
 		}
@@ -1684,7 +1684,8 @@ static void notify_connected(struct bt_conn *conn)
 {
 	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) {
 			callback->connected(conn, conn->err);
 		}
@@ -1701,7 +1702,7 @@ static void notify_disconnected(struct bt_conn *conn)
 {
 	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) {
 			callback->disconnected(conn, conn->err);
 		}
@@ -1728,7 +1729,7 @@ void notify_remote_info(struct bt_conn *conn)
 
 	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) {
 			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;
 
-	SYS_SLIST_FOR_EACH_CONTAINER(&callback_list, callback, _node) {
+	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
 		if (callback->le_param_updated) {
 			callback->le_param_updated(conn, conn->le.interval,
 						   conn->le.latency,
@@ -1779,7 +1780,7 @@ void notify_le_data_len_updated(struct bt_conn *conn)
 {
 	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) {
 			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;
 
-	SYS_SLIST_FOR_EACH_CONTAINER(&callback_list, callback, _node) {
+	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
 		if (callback->le_phy_updated) {
 			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;
 
-	SYS_SLIST_FOR_EACH_CONTAINER(&callback_list, callback, _node) {
+	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
 		if (!callback->le_param_req) {
 			continue;
 		}
@@ -2305,7 +2306,7 @@ void bt_conn_identity_resolved(struct bt_conn *conn)
 
 	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) {
 			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;
 
-	SYS_SLIST_FOR_EACH_CONTAINER(&callback_list, callback, _node) {
+	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
 		if (callback->security_changed) {
 			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)
 {
-	if (!sys_slist_find(&callback_list, &cb->_node, NULL)) {
-		sys_slist_append(&callback_list, &cb->_node);
+	if (!sys_slist_find(&conn_cbs, &cb->_node, NULL)) {
+		sys_slist_append(&conn_cbs, &cb->_node);
 	}
 }
 
@@ -2520,7 +2521,7 @@ int bt_conn_cb_unregister(struct bt_conn_cb *cb)
 		return -EINVAL;
 	}
 
-	if (!sys_slist_find_and_remove(&callback_list, &cb->_node)) {
+	if (!sys_slist_find_and_remove(&conn_cbs, &cb->_node)) {
 		return -ENOENT;
 	}
 
@@ -2817,7 +2818,7 @@ void notify_tx_power_report(struct bt_conn *conn,
 {
 	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) {
 			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;
 
-	SYS_SLIST_FOR_EACH_CONTAINER(&callback_list, callback, _node) {
+	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
 		if (callback->cte_report_cb) {
 			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;
 
-	SYS_SLIST_FOR_EACH_CONTAINER(&callback_list, callback, _node) {
+	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
 		if (callback->cte_report_cb) {
 			callback->cte_report_cb(conn, &iq_report);
 		}

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ sys_slist_t bt_auth_info_cbs = SYS_SLIST_STATIC_INIT(&bt_auth_info_cbs);`
`99`	`99`	`#endif /* CONFIG_BT_SMP \|\| CONFIG_BT_CLASSIC */`
`100`	`100`
`101`	`101`
`102`		`-static sys_slist_t callback_list = SYS_SLIST_STATIC_INIT(&callback_list);`
	`102`	`+static sys_slist_t conn_cbs = SYS_SLIST_STATIC_INIT(&conn_cbs);`
`103`	`103`
`104`	`104`	`static struct bt_conn_tx conn_tx[CONFIG_BT_CONN_TX_MAX];`
`105`	`105`
`@@ -1575,7 +1575,7 @@ static void notify_recycled_conn_slot(void)`
`1575`	`1575`	`#if defined(CONFIG_BT_CONN)`
`1576`	`1576`	`struct bt_conn_cb *callback;`
`1577`	`1577`
`1578`		`- SYS_SLIST_FOR_EACH_CONTAINER(&callback_list, callback, _node) {`
	`1578`	`+ SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {`
`1579`	`1579`	`if (callback->recycled) {`
`1580`	`1580`	`callback->recycled();`
`1581`	`1581`	`}`
`@@ -1684,7 +1684,8 @@ static void notify_connected(struct bt_conn *conn)`
`1684`	`1684`	`{`
`1685`	`1685`	`struct bt_conn_cb *callback;`
`1686`	`1686`
`1687`		`- SYS_SLIST_FOR_EACH_CONTAINER(&callback_list, callback, _node) {`
	`1687`	`+ SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {`
	`1688`	`+`
`1688`	`1689`	`if (callback->connected) {`
`1689`	`1690`	`callback->connected(conn, conn->err);`
`1690`	`1691`	`}`
`@@ -1701,7 +1702,7 @@ static void notify_disconnected(struct bt_conn *conn)`
`1701`	`1702`	`{`
`1702`	`1703`	`struct bt_conn_cb *callback;`
`1703`	`1704`
`1704`		`- SYS_SLIST_FOR_EACH_CONTAINER(&callback_list, callback, _node) {`
	`1705`	`+ SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {`
`1705`	`1706`	`if (callback->disconnected) {`
`1706`	`1707`	`callback->disconnected(conn, conn->err);`
`1707`	`1708`	`}`
`@@ -1728,7 +1729,7 @@ void notify_remote_info(struct bt_conn *conn)`
`1728`	`1729`
`1729`	`1730`	`struct bt_conn_cb *callback;`
`1730`	`1731`
`1731`		`- SYS_SLIST_FOR_EACH_CONTAINER(&callback_list, callback, _node) {`
	`1732`	`+ SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {`
`1732`	`1733`	`if (callback->remote_info_available) {`
`1733`	`1734`	`callback->remote_info_available(conn, &remote_info);`
`1734`	`1735`	`}`
`@@ -1757,7 +1758,7 @@ void notify_le_param_updated(struct bt_conn *conn)`
`1757`	`1758`
`1758`	`1759`	`struct bt_conn_cb *callback;`
`1759`	`1760`
`1760`		`- SYS_SLIST_FOR_EACH_CONTAINER(&callback_list, callback, _node) {`
	`1761`	`+ SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {`
`1761`	`1762`	`if (callback->le_param_updated) {`
`1762`	`1763`	`callback->le_param_updated(conn, conn->le.interval,`
`1763`	`1764`	`conn->le.latency,`
`@@ -1779,7 +1780,7 @@ void notify_le_data_len_updated(struct bt_conn *conn)`
`1779`	`1780`	`{`
`1780`	`1781`	`struct bt_conn_cb *callback;`
`1781`	`1782`
`1782`		`- SYS_SLIST_FOR_EACH_CONTAINER(&callback_list, callback, _node) {`
	`1783`	`+ SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {`
`1783`	`1784`	`if (callback->le_data_len_updated) {`
`1784`	`1785`	`callback->le_data_len_updated(conn, &conn->le.data_len);`
`1785`	`1786`	`}`
`@@ -1798,7 +1799,7 @@ void notify_le_phy_updated(struct bt_conn *conn)`
`1798`	`1799`	`{`
`1799`	`1800`	`struct bt_conn_cb *callback;`
`1800`	`1801`
`1801`		`- SYS_SLIST_FOR_EACH_CONTAINER(&callback_list, callback, _node) {`
	`1802`	`+ SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {`
`1802`	`1803`	`if (callback->le_phy_updated) {`
`1803`	`1804`	`callback->le_phy_updated(conn, &conn->le.phy);`
`1804`	`1805`	`}`
`@@ -1820,7 +1821,7 @@ bool le_param_req(struct bt_conn conn, struct bt_le_conn_param param)`
`1820`	`1821`
`1821`	`1822`	`struct bt_conn_cb *callback;`
`1822`	`1823`
`1823`		`- SYS_SLIST_FOR_EACH_CONTAINER(&callback_list, callback, _node) {`
	`1824`	`+ SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {`
`1824`	`1825`	`if (!callback->le_param_req) {`
`1825`	`1826`	`continue;`
`1826`	`1827`	`}`
`@@ -2305,7 +2306,7 @@ void bt_conn_identity_resolved(struct bt_conn *conn)`
`2305`	`2306`
`2306`	`2307`	`struct bt_conn_cb *callback;`
`2307`	`2308`
`2308`		`- SYS_SLIST_FOR_EACH_CONTAINER(&callback_list, callback, _node) {`
	`2309`	`+ SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {`
`2309`	`2310`	`if (callback->identity_resolved) {`
`2310`	`2311`	`callback->identity_resolved(conn, rpa, &conn->le.dst);`
`2311`	`2312`	`}`
`@@ -2417,7 +2418,7 @@ void bt_conn_security_changed(struct bt_conn *conn, uint8_t hci_err,`
`2417`	`2418`
`2418`	`2419`	`struct bt_conn_cb *callback;`
`2419`	`2420`
`2420`		`- SYS_SLIST_FOR_EACH_CONTAINER(&callback_list, callback, _node) {`
	`2421`	`+ SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {`
`2421`	`2422`	`if (callback->security_changed) {`
`2422`	`2423`	`callback->security_changed(conn, conn->sec_level, err);`
`2423`	`2424`	`}`
`@@ -2509,8 +2510,8 @@ bt_security_t bt_conn_get_security(const struct bt_conn *conn)`
`2509`	`2510`
`2510`	`2511`	`void bt_conn_cb_register(struct bt_conn_cb *cb)`
`2511`	`2512`	`{`
`2512`		`- if (!sys_slist_find(&callback_list, &cb->_node, NULL)) {`
`2513`		`- sys_slist_append(&callback_list, &cb->_node);`
	`2513`	`+ if (!sys_slist_find(&conn_cbs, &cb->_node, NULL)) {`
	`2514`	`+ sys_slist_append(&conn_cbs, &cb->_node);`
`2514`	`2515`	`}`
`2515`	`2516`	`}`
`2516`	`2517`
`@@ -2520,7 +2521,7 @@ int bt_conn_cb_unregister(struct bt_conn_cb *cb)`
`2520`	`2521`	`return -EINVAL;`
`2521`	`2522`	`}`
`2522`	`2523`
`2523`		`- if (!sys_slist_find_and_remove(&callback_list, &cb->_node)) {`
	`2524`	`+ if (!sys_slist_find_and_remove(&conn_cbs, &cb->_node)) {`
`2524`	`2525`	`return -ENOENT;`
`2525`	`2526`	`}`
`2526`	`2527`
`@@ -2817,7 +2818,7 @@ void notify_tx_power_report(struct bt_conn *conn,`
`2817`	`2818`	`{`
`2818`	`2819`	`struct bt_conn_cb *callback;`
`2819`	`2820`
`2820`		`- SYS_SLIST_FOR_EACH_CONTAINER(&callback_list, callback, _node) {`
	`2821`	`+ SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {`
`2821`	`2822`	`if (callback->tx_power_report) {`
`2822`	`2823`	`callback->tx_power_report(conn, &report);`
`2823`	`2824`	`}`
`@@ -3684,7 +3685,7 @@ void bt_hci_le_df_connection_iq_report_common(uint8_t event, struct net_buf *buf`
`3684`	`3685`
`3685`	`3686`	`struct bt_conn_cb *callback;`
`3686`	`3687`
`3687`		`- SYS_SLIST_FOR_EACH_CONTAINER(&callback_list, callback, _node) {`
	`3688`	`+ SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {`
`3688`	`3689`	`if (callback->cte_report_cb) {`
`3689`	`3690`	`callback->cte_report_cb(conn, &iq_report);`
`3690`	`3691`	`}`
`@@ -3728,7 +3729,7 @@ void bt_hci_le_df_cte_req_failed(struct net_buf *buf)`
`3728`	`3729`
`3729`	`3730`	`struct bt_conn_cb *callback;`
`3730`	`3731`
`3731`		`- SYS_SLIST_FOR_EACH_CONTAINER(&callback_list, callback, _node) {`
	`3732`	`+ SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {`
`3732`	`3733`	`if (callback->cte_report_cb) {`
`3733`	`3734`	`callback->cte_report_cb(conn, &iq_report);`
`3734`	`3735`	`}`