Bluetooth: tests: Convert to new HCI driver API

Convert all Bluetooth tests that define dummy HCI driver instances to use the new HCI driver API. This requires both a custom DTS binding as well as an app-specific overlay file. Signed-off-by: Johan Hedberg <[email protected]>
zephyrproject-rtos · May 13, 2024 · 0ae93c5 · 0ae93c5
1 parent dc09f71
commit 0ae93c5
Show file tree

Hide file tree

Showing 96 changed files with 491 additions and 74 deletions.
diff --git a/tests/bluetooth/addr/boards/native_posix.overlay b/tests/bluetooth/addr/boards/native_posix.overlay
@@ -0,0 +1,3 @@
+&bt_hci_userchan {
+	status = "disabled";
+};
diff --git a/tests/bluetooth/addr/boards/native_posix_64.overlay b/tests/bluetooth/addr/boards/native_posix_64.overlay
@@ -0,0 +1,3 @@
+&bt_hci_userchan {
+	status = "disabled";
+};
diff --git a/tests/bluetooth/addr/boards/native_posix_native_64.overlay b/tests/bluetooth/addr/boards/native_posix_native_64.overlay
@@ -0,0 +1,3 @@
+&bt_hci_userchan {
+	status = "disabled";
+};
diff --git a/tests/bluetooth/addr/boards/native_sim.overlay b/tests/bluetooth/addr/boards/native_sim.overlay
@@ -0,0 +1,3 @@
+&bt_hci_userchan {
+	status = "disabled";
+};
diff --git a/tests/bluetooth/addr/boards/native_sim_64.overlay b/tests/bluetooth/addr/boards/native_sim_64.overlay
@@ -0,0 +1,3 @@
+&bt_hci_userchan {
+	status = "disabled";
+};
diff --git a/tests/bluetooth/addr/prj.conf b/tests/bluetooth/addr/prj.conf
@@ -3,4 +3,3 @@ CONFIG_ZTEST=y
 
 CONFIG_BT=y
 CONFIG_BT_CTLR=n
-CONFIG_BT_NO_DRIVER=y
diff --git a/tests/bluetooth/addr/test.overlay b/tests/bluetooth/addr/test.overlay
@@ -0,0 +1,5 @@
+/ {
+	chosen {
+		/delete-property/ zephyr,bt-hci;
+	};
+};
diff --git a/tests/bluetooth/addr/testcase.yaml b/tests/bluetooth/addr/testcase.yaml
@@ -1,5 +1,7 @@
 tests:
   bluetooth.addr:
+    extra_args:
+      - EXTRA_DTC_OVERLAY_FILE="test.overlay"
     platform_allow:
       - native_posix
       - native_posix/native/64

diff --git a/tests/bluetooth/bluetooth/boards/native_posix.overlay b/tests/bluetooth/bluetooth/boards/native_posix.overlay
@@ -0,0 +1,3 @@
+&bt_hci_userchan {
+	status = "disabled";
+};
diff --git a/tests/bluetooth/bluetooth/boards/native_posix_64.overlay b/tests/bluetooth/bluetooth/boards/native_posix_64.overlay
@@ -0,0 +1,3 @@
+&bt_hci_userchan {
+	status = "disabled";
+};
diff --git a/tests/bluetooth/bluetooth/boards/native_posix_native_64.overlay b/tests/bluetooth/bluetooth/boards/native_posix_native_64.overlay
@@ -0,0 +1,3 @@
+&bt_hci_userchan {
+	status = "disabled";
+};
diff --git a/tests/bluetooth/bluetooth/boards/native_sim.overlay b/tests/bluetooth/bluetooth/boards/native_sim.overlay
@@ -0,0 +1,3 @@
+&bt_hci_userchan {
+	status = "disabled";
+};
diff --git a/tests/bluetooth/bluetooth/boards/native_sim_64.overlay b/tests/bluetooth/bluetooth/boards/native_sim_64.overlay
@@ -0,0 +1,3 @@
+&bt_hci_userchan {
+	status = "disabled";
+};
diff --git a/tests/bluetooth/bluetooth/dts/bindings/zephyr,bt-hci-test.yaml b/tests/bluetooth/bluetooth/dts/bindings/zephyr,bt-hci-test.yaml
@@ -0,0 +1,11 @@
+description: Bluetooth HCI for test purposes
+
+compatible: "zephyr,bt-hci-test"
+
+include: bt-hci.yaml
+
+properties:
+  bt-hci-name:
+    default: "test"
+  bt-hci-bus:
+    default: "BT_HCI_BUS_VIRTUAL"
diff --git a/tests/bluetooth/bluetooth/prj.conf b/tests/bluetooth/bluetooth/prj.conf
@@ -1,6 +1,5 @@
 CONFIG_BT=y
 CONFIG_BT_CTLR=n
-CONFIG_BT_NO_DRIVER=y
 CONFIG_LOG=y
 CONFIG_UART_INTERRUPT_DRIVEN=n
 CONFIG_ZTEST=y
diff --git a/tests/bluetooth/bluetooth/src/bluetooth.c b/tests/bluetooth/bluetooth/src/bluetooth.c
@@ -13,41 +13,60 @@
 #include <zephyr/ztest.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/drivers/bluetooth/hci_driver.h>
+#include <zephyr/drivers/bluetooth.h>
+
+#define DT_DRV_COMPAT zephyr_bt_hci_test
+
+struct driver_data {
+};
+
+struct driver_config {
+	struct bt_hci_info info;
+};
 
 #define EXPECTED_ERROR -ENOSYS
 
-static int driver_open(void)
+static int driver_open(const struct device *dev, bt_hci_recv_t recv)
 {
 	TC_PRINT("driver: %s\n", __func__);
 
 	/* Indicate that there is no real Bluetooth device */
 	return EXPECTED_ERROR;
 }
 
-static int driver_send(struct net_buf *buf)
+static int driver_send(const struct device *dev, struct net_buf *buf)
 {
 	return 0;
 }
 
-static const struct bt_hci_driver drv = {
-	.name         = "test",
-	.bus          = BT_HCI_DRIVER_BUS_VIRTUAL,
-	.open         = driver_open,
-	.send         = driver_send,
-};
-
-static void driver_init(void)
+static void driver_get_info(const struct device *dev, struct bt_hci_info *info)
 {
-	bt_hci_driver_register(&drv);
+	const struct driver_config *config = dev->config;
+
+	*info = config->info;
 }
 
+static const struct bt_hci_driver_api driver_api = {
+	.get_info = driver_get_info,
+	.open = driver_open,
+	.send = driver_send,
+};
+
+#define TEST_DEVICE_INIT(inst) \
+	static const struct driver_config driver_config_##inst = { \
+		.info = BT_DT_HCI_INFO_INST_GET(inst), \
+	}; \
+	static struct driver_data driver_data_##inst = { \
+	}; \
+	DEVICE_DT_INST_DEFINE(inst, NULL, NULL, &driver_data_##inst, &driver_config_##inst, \
+			      POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &driver_api)
+
+DT_INST_FOREACH_STATUS_OKAY(TEST_DEVICE_INIT)
+
 ZTEST_SUITE(test_bluetooth, NULL, NULL, NULL, NULL, NULL);
 
 ZTEST(test_bluetooth, test_bluetooth_entry)
 {
-	driver_init();
-
 	zassert_true((bt_enable(NULL) == EXPECTED_ERROR),
 			"bt_enable failed");
 }
diff --git a/tests/bluetooth/bluetooth/test.overlay b/tests/bluetooth/bluetooth/test.overlay
@@ -0,0 +1,14 @@
+/ {
+	chosen {
+		zephyr,bt-hci = &bt_hci_test;
+	};
+
+	bt_hci_test: bt_hci_test {
+		compatible = "zephyr,bt-hci-test";
+		status = "okay";
+	};
+};
+
+&bt_hci_userchan {
+	status = "disabled";
+};
diff --git a/tests/bluetooth/bluetooth/testcase.yaml b/tests/bluetooth/bluetooth/testcase.yaml
@@ -1,5 +1,7 @@
 tests:
   bluetooth.general:
+    extra_args:
+      - EXTRA_DTC_OVERLAY_FILE="test.overlay"
     platform_allow:
       - qemu_x86
       - qemu_cortex_m3

diff --git a/tests/bluetooth/bt_crypto/boards/native_posix.overlay b/tests/bluetooth/bt_crypto/boards/native_posix.overlay
@@ -0,0 +1,3 @@
+&bt_hci_userchan {
+	status = "disabled";
+};
diff --git a/tests/bluetooth/bt_crypto/boards/native_posix_64.overlay b/tests/bluetooth/bt_crypto/boards/native_posix_64.overlay
@@ -0,0 +1,3 @@
+&bt_hci_userchan {
+	status = "disabled";
+};
diff --git a/tests/bluetooth/bt_crypto/boards/native_posix_native_64.overlay b/tests/bluetooth/bt_crypto/boards/native_posix_native_64.overlay
@@ -0,0 +1,3 @@
+&bt_hci_userchan {
+	status = "disabled";
+};
diff --git a/tests/bluetooth/bt_crypto/boards/native_sim.overlay b/tests/bluetooth/bt_crypto/boards/native_sim.overlay
@@ -0,0 +1,3 @@
+&bt_hci_userchan {
+	status = "disabled";
+};
diff --git a/tests/bluetooth/bt_crypto/boards/native_sim_64.overlay b/tests/bluetooth/bt_crypto/boards/native_sim_64.overlay
@@ -0,0 +1,3 @@
+&bt_hci_userchan {
+	status = "disabled";
+};
diff --git a/tests/bluetooth/bt_crypto/prj.conf b/tests/bluetooth/bt_crypto/prj.conf
@@ -3,4 +3,3 @@ CONFIG_ZTEST=y
 
 CONFIG_BT=y
 CONFIG_BT_CTLR=n
-CONFIG_BT_NO_DRIVER=y
diff --git a/tests/bluetooth/bt_crypto/test.overlay b/tests/bluetooth/bt_crypto/test.overlay
@@ -0,0 +1,5 @@
+/ {
+	chosen {
+		/delete-property/ zephyr,bt-hci;
+	};
+};
diff --git a/tests/bluetooth/bt_crypto/testcase.yaml b/tests/bluetooth/bt_crypto/testcase.yaml
@@ -1,5 +1,7 @@
 tests:
   bluetooth.bt_crypto:
+    extra_args:
+      - EXTRA_DTC_OVERLAY_FILE="test.overlay"
     platform_allow:
       - native_posix
       - native_posix/native/64

diff --git a/tests/bluetooth/bt_crypto_ccm/boards/native_posix.overlay b/tests/bluetooth/bt_crypto_ccm/boards/native_posix.overlay
@@ -0,0 +1,3 @@
+&bt_hci_userchan {
+	status = "disabled";
+};
diff --git a/tests/bluetooth/bt_crypto_ccm/boards/native_posix_64.overlay b/tests/bluetooth/bt_crypto_ccm/boards/native_posix_64.overlay
@@ -0,0 +1,3 @@
+&bt_hci_userchan {
+	status = "disabled";
+};
diff --git a/tests/bluetooth/bt_crypto_ccm/boards/native_posix_native_64.overlay b/tests/bluetooth/bt_crypto_ccm/boards/native_posix_native_64.overlay
@@ -0,0 +1,3 @@
+&bt_hci_userchan {
+	status = "disabled";
+};
diff --git a/tests/bluetooth/bt_crypto_ccm/boards/native_sim.overlay b/tests/bluetooth/bt_crypto_ccm/boards/native_sim.overlay
@@ -0,0 +1,3 @@
+&bt_hci_userchan {
+	status = "disabled";
+};
diff --git a/tests/bluetooth/bt_crypto_ccm/boards/native_sim_64.overlay b/tests/bluetooth/bt_crypto_ccm/boards/native_sim_64.overlay
@@ -0,0 +1,3 @@
+&bt_hci_userchan {
+	status = "disabled";
+};
diff --git a/tests/bluetooth/bt_crypto_ccm/prj.conf b/tests/bluetooth/bt_crypto_ccm/prj.conf
@@ -3,6 +3,5 @@ CONFIG_ZTEST=y
 
 CONFIG_BT=y
 CONFIG_BT_CTLR=n
-CONFIG_BT_NO_DRIVER=y
 
 CONFIG_LOG=y
diff --git a/tests/bluetooth/bt_crypto_ccm/test.overlay b/tests/bluetooth/bt_crypto_ccm/test.overlay
@@ -0,0 +1,5 @@
+/ {
+	chosen {
+		/delete-property/ zephyr,bt-hci;
+	};
+};
diff --git a/tests/bluetooth/bt_crypto_ccm/testcase.yaml b/tests/bluetooth/bt_crypto_ccm/testcase.yaml
@@ -1,5 +1,7 @@
 tests:
   bluetooth.bt_crypto_ccm:
+    extra_args:
+      - EXTRA_DTC_OVERLAY_FILE="test.overlay"
     platform_allow:
       - native_posix
       - native_posix/native/64

diff --git a/tests/bluetooth/gatt/boards/native_posix.overlay b/tests/bluetooth/gatt/boards/native_posix.overlay
@@ -0,0 +1,3 @@
+&bt_hci_userchan {
+	status = "disabled";
+};
diff --git a/tests/bluetooth/gatt/boards/native_posix_64.overlay b/tests/bluetooth/gatt/boards/native_posix_64.overlay
@@ -0,0 +1,3 @@
+&bt_hci_userchan {
+	status = "disabled";
+};
diff --git a/tests/bluetooth/gatt/boards/native_posix_native_64.overlay b/tests/bluetooth/gatt/boards/native_posix_native_64.overlay
@@ -0,0 +1,3 @@
+&bt_hci_userchan {
+	status = "disabled";
+};
diff --git a/tests/bluetooth/gatt/boards/native_sim.overlay b/tests/bluetooth/gatt/boards/native_sim.overlay
@@ -0,0 +1,3 @@
+&bt_hci_userchan {
+	status = "disabled";
+};
diff --git a/tests/bluetooth/gatt/boards/native_sim_64.overlay b/tests/bluetooth/gatt/boards/native_sim_64.overlay
@@ -0,0 +1,3 @@
+&bt_hci_userchan {
+	status = "disabled";
+};
diff --git a/tests/bluetooth/gatt/prj.conf b/tests/bluetooth/gatt/prj.conf
@@ -3,7 +3,6 @@ CONFIG_ZTEST=y
 
 CONFIG_BT=y
 CONFIG_BT_CTLR=n
-CONFIG_BT_NO_DRIVER=y
 
 CONFIG_LOG=y
 CONFIG_BT_PERIPHERAL=y

diff --git a/tests/bluetooth/gatt/test.overlay b/tests/bluetooth/gatt/test.overlay
@@ -0,0 +1,5 @@
+/ {
+	chosen {
+		/delete-property/ zephyr,bt-hci;
+	};
+};
diff --git a/tests/bluetooth/gatt/testcase.yaml b/tests/bluetooth/gatt/testcase.yaml
@@ -1,5 +1,7 @@
 tests:
   bluetooth.gatt:
+    extra_args:
+      - EXTRA_DTC_OVERLAY_FILE="test.overlay"
     platform_allow:
       - native_posix
       - native_posix/native/64

diff --git a/tests/bluetooth/hci_prop_evt/boards/native_posix.overlay b/tests/bluetooth/hci_prop_evt/boards/native_posix.overlay
@@ -0,0 +1,3 @@
+&bt_hci_userchan {
+	status = "disabled";
+};
diff --git a/tests/bluetooth/hci_prop_evt/boards/native_posix_64.overlay b/tests/bluetooth/hci_prop_evt/boards/native_posix_64.overlay
@@ -0,0 +1,3 @@
+&bt_hci_userchan {
+	status = "disabled";
+};
diff --git a/tests/bluetooth/hci_prop_evt/boards/native_posix_native_64.overlay b/tests/bluetooth/hci_prop_evt/boards/native_posix_native_64.overlay
@@ -0,0 +1,3 @@
+&bt_hci_userchan {
+	status = "disabled";
+};
diff --git a/tests/bluetooth/hci_prop_evt/boards/native_sim.overlay b/tests/bluetooth/hci_prop_evt/boards/native_sim.overlay
@@ -0,0 +1,3 @@
+&bt_hci_userchan {
+	status = "disabled";
+};
diff --git a/tests/bluetooth/hci_prop_evt/boards/native_sim_64.overlay b/tests/bluetooth/hci_prop_evt/boards/native_sim_64.overlay
@@ -0,0 +1,3 @@
+&bt_hci_userchan {
+	status = "disabled";
+};
diff --git a/tests/bluetooth/hci_prop_evt/dts/bindings/zephyr,bt-hci-test.yaml b/tests/bluetooth/hci_prop_evt/dts/bindings/zephyr,bt-hci-test.yaml
@@ -0,0 +1,13 @@
+description: Bluetooth HCI for test purposes
+
+compatible: "zephyr,bt-hci-test"
+
+include: bt-hci.yaml
+
+properties:
+  bt-hci-name:
+    default: "test"
+  bt-hci-bus:
+    default: "BT_HCI_BUS_VIRTUAL"
+  bt-hci-quirks:
+    default: ["BT_HCI_QUIRK_NO_RESET"]
diff --git a/tests/bluetooth/hci_prop_evt/prj.conf b/tests/bluetooth/hci_prop_evt/prj.conf
@@ -3,7 +3,6 @@ CONFIG_ZTEST=y
 
 CONFIG_BT=y
 CONFIG_BT_CTLR=n
-CONFIG_BT_NO_DRIVER=y
 
 CONFIG_BT_HCI_VS_EVT_USER=y
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,3 @@ CONFIG_ZTEST=y

		CONFIG_BT=y
		CONFIG_BT_CTLR=n
		CONFIG_BT_NO_DRIVER=y