Bluetooth: ISO: Move bt_iso_accept and make static

Move the function and make it static as it is only
used in iso.c and for unicast only.

Signed-off-by: Emil Gydesen <[email protected]>

Author: Thalley

subsys/bluetooth/host/iso.c

@@ -706,6 +706,40 @@ static bool valid_chan_io_qos(const struct bt_iso_chan_io_qos *io_qos,
 }
 
 #if defined(CONFIG_BT_ISO_UNICAST)
+static int iso_accept(struct bt_conn *acl, struct bt_conn *iso)
+{
+	struct bt_iso_accept_info accept_info;
+	struct bt_iso_chan *chan;
+	int err;
+
+	CHECKIF(!iso || iso->type != BT_CONN_TYPE_ISO) {
+		BT_DBG("Invalid parameters: iso %p iso->type %u", iso,
+		       iso ? iso->type : 0);
+		return -EINVAL;
+	}
+
+	BT_DBG("%p", iso);
+
+	if (!iso_server) {
+		return -ENOMEM;
+	}
+
+	accept_info.acl = acl;
+	accept_info.cig_id = iso->iso.cig_id;
+	accept_info.cis_id = iso->iso.cis_id;
+
+	err = iso_server->accept(&accept_info, &chan);
+	if (err < 0) {
+		BT_ERR("Server failed to accept: %d", err);
+		return err;
+	}
+
+	bt_iso_chan_add(iso, chan);
+	bt_iso_chan_set_state(chan, BT_ISO_CONNECT);
+
+	return 0;
+}
+
 static bool valid_chan_qos(const struct bt_iso_chan_qos *qos)
 {
 	if (qos->rx != NULL) {
@@ -859,7 +893,7 @@ void hci_le_cis_req(struct net_buf *buf)
 	iso->iso.cis_id = evt->cis_id;
 
 	/* Request application to accept */
-	err = bt_iso_accept(acl, iso);
+	err = iso_accept(acl, iso);
 	if (err) {
 		BT_DBG("App rejected ISO %d", err);
 		bt_conn_unref(iso);
@@ -1237,40 +1271,6 @@ static int hci_le_create_cis(const struct bt_iso_connect_param *param,
 	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CREATE_CIS, buf, NULL);
 }
 
-int bt_iso_accept(struct bt_conn *acl, struct bt_conn *iso)
-{
-	struct bt_iso_accept_info accept_info;
-	struct bt_iso_chan *chan;
-	int err;
-
-	CHECKIF(!iso || iso->type != BT_CONN_TYPE_ISO) {
-		BT_DBG("Invalid parameters: iso %p iso->type %u", iso,
-		       iso ? iso->type : 0);
-		return -EINVAL;
-	}
-
-	BT_DBG("%p", iso);
-
-	if (!iso_server) {
-		return -ENOMEM;
-	}
-
-	accept_info.acl = acl;
-	accept_info.cig_id = iso->iso.cig_id;
-	accept_info.cis_id = iso->iso.cis_id;
-
-	err = iso_server->accept(&accept_info, &chan);
-	if (err < 0) {
-		BT_ERR("Server failed to accept: %d", err);
-		return err;
-	}
-
-	bt_iso_chan_add(iso, chan);
-	bt_iso_chan_set_state(chan, BT_ISO_CONNECT);
-
-	return 0;
-}
-
 int bt_iso_chan_connect(const struct bt_iso_connect_param *param, size_t count)
 {
 	int err;

subsys/bluetooth/host/iso_internal.h

@@ -94,9 +94,6 @@ void hci_le_big_sync_established(struct net_buf *buf);
 /** Process BIG sync lost event */
 void hci_le_big_sync_lost(struct net_buf *buf);
 
-/* Notify ISO channels of a new connection */
-int bt_iso_accept(struct bt_conn *acl, struct bt_conn *iso);
-
 /* Notify ISO channels of a new connection */
 void bt_iso_connected(struct bt_conn *iso);