bluetooth: host: Add CONFIG_BT_CHANNEL_SOUNDING_TEST

Makes it easier to make sure the CS test code is removed if desired.
It should hopefully allow for a clean split in general.

Signed-off-by: Olivier Lesage <[email protected]>

Author: olivier-le-sage

include/zephyr/bluetooth/cs.h

@@ -595,6 +595,8 @@ int bt_le_cs_read_remote_fae_table(struct bt_conn *conn);
  * Existing callbacks can be unregistered by providing NULL function
  * pointers.
  *
+ * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING_TEST} must be set.
+ *
  * @param cs_test_cb Set of callbacks to be used with CS Test
  *
  * @return Zero on success or (negative) error code on failure.
@@ -615,7 +617,7 @@ int bt_le_cs_test_cb_register(struct bt_le_cs_test_cb cs_test_cb);
  * parameters of this command describe the required transmit and receive behavior
  * for the CS test.
  *
- * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
+ * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING_TEST} must be set.
  *
  * @param params CS Test parameters
  *
@@ -661,7 +663,7 @@ int bt_le_cs_remove_config(struct bt_conn *conn, uint8_t config_id);
  * The controller is expected to finish reporting any subevent results
  * before completing this termination.
  *
- * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
+ * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING_TEST} must be set.
  *
  * @return Zero on success or (negative) error code on failure.
  */

subsys/bluetooth/Kconfig

@@ -196,6 +196,13 @@ config BT_CHANNEL_SOUNDING
 	help
 	  Enable support for Bluetooth 6.0 Channel Sounding feature.
 
+config BT_CHANNEL_SOUNDING_TEST
+	bool "Channel Sounding Test [EXPERIMENTAL]"
+	select EXPERIMENTAL
+	depends on BT_CHANNEL_SOUNDING
+	help
+	  Enable support for Channel Sounding test mode.
+
 endif # BT_CONN
 
 rsource "Kconfig.iso"

subsys/bluetooth/host/cs.c

@@ -18,7 +18,9 @@
 LOG_MODULE_REGISTER(bt_cs);
 
 #if defined(CONFIG_BT_CHANNEL_SOUNDING)
+#if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
 static struct bt_le_cs_test_cb cs_test_callbacks;
+#endif
 
 void bt_le_cs_set_valid_chmap_bits(uint8_t channel_map[10])
 {
@@ -242,6 +244,7 @@ void bt_hci_le_cs_read_remote_fae_table_complete(struct net_buf *buf)
 	bt_conn_unref(conn);
 }
 
+#if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
 int bt_le_cs_test_cb_register(struct bt_le_cs_test_cb cb)
 {
 	cs_test_callbacks = cb;
@@ -350,6 +353,7 @@ int bt_le_cs_start_test(const struct bt_le_cs_test_param *params)
 
 	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_TEST, buf, NULL);
 }
+#endif /* CONFIG_BT_CHANNEL_SOUNDING_TEST */
 
 void bt_hci_le_cs_subevent_result(struct net_buf *buf)
 {
@@ -370,12 +374,15 @@ void bt_hci_le_cs_subevent_result(struct net_buf *buf)
 		return;
 	}
 
+#if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
 	if (sys_le16_to_cpu(evt->conn_handle) == BT_HCI_LE_CS_TEST_CONN_HANDLE) {
 		if (!cs_test_callbacks.le_cs_test_subevent_data_available) {
 			LOG_WRN("No callback registered. Discarded subevent results from CS Test.");
 			return;
 		}
-	} else {
+	} else
+#endif /* CONFIG_BT_CHANNEL_SOUNDING_TEST */
+	{
 		conn = bt_conn_lookup_handle(sys_le16_to_cpu(evt->conn_handle), BT_CONN_TYPE_LE);
 		if (!conn) {
 			LOG_ERR("Unknown connection handle when processing subevent results");
@@ -402,13 +409,16 @@ void bt_hci_le_cs_subevent_result(struct net_buf *buf)
 		result.step_data_buf = NULL;
 	}
 
+#if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
 	if (sys_le16_to_cpu(evt->conn_handle) == BT_HCI_LE_CS_TEST_CONN_HANDLE) {
 		result.header.config_id = 0;
 		result.header.start_acl_conn_event = 0;
 
 		cs_test_callbacks.le_cs_test_subevent_data_available(&result);
 
-	} else {
+	} else
+#endif /* CONFIG_BT_CHANNEL_SOUNDING_TEST */
+	{
 		result.header.config_id = evt->config_id;
 		result.header.start_acl_conn_event =
 			sys_le16_to_cpu(evt->start_acl_conn_event_counter);
@@ -523,6 +533,7 @@ int bt_le_cs_remove_config(struct bt_conn *conn, uint8_t config_id)
 	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_REMOVE_CONFIG, buf, NULL);
 }
 
+#if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
 int bt_le_cs_stop_test(void)
 {
 	struct net_buf *buf;
@@ -554,6 +565,7 @@ void bt_hci_le_cs_test_end_complete(struct net_buf *buf)
 		cs_test_callbacks.le_cs_test_end_complete();
 	}
 }
+#endif /* CONFIG_BT_CHANNEL_SOUNDING_TEST */
 
 void bt_le_cs_step_data_parse(struct net_buf_simple *step_data_buf,
 			      bool (*func)(struct bt_le_cs_subevent_step *step, void *user_data),

subsys/bluetooth/host/hci_core.c

@@ -2833,9 +2833,11 @@ static const struct event_handler meta_events[] = {
 	EVENT_HANDLER(BT_HCI_EVT_LE_CS_SUBEVENT_RESULT,
 		      bt_hci_le_cs_subevent_result,
 		      sizeof(struct bt_hci_evt_le_cs_subevent_result)),
+#if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
 	EVENT_HANDLER(BT_HCI_EVT_LE_CS_TEST_END_COMPLETE,
 		      bt_hci_le_cs_test_end_complete,
 		      sizeof(struct bt_hci_evt_le_cs_test_end_complete)),
+#endif /* CONFIG_BT_CHANNEL_SOUNDING_TEST */
 #endif /* CONFIG_BT_CHANNEL_SOUNDING */
 
 };

tests/bluetooth/shell/testcase.yaml

@@ -37,6 +37,7 @@ tests:
   bluetooth.shell.channel_sounding:
     extra_configs:
       - CONFIG_BT_CHANNEL_SOUNDING=y
+      - CONFIG_BT_CHANNEL_SOUNDING_TEST=y
       - CONFIG_BT_CTLR=n
     build_only: true
   bluetooth.shell.cdc_acm: