Bluetooth: Rename bt_driver to bt_hci_driver

The bt_driver API was created when Zephyr only had a Bluetooth host
stack, but no controller-side functionality. The only "driver" that
was needed for the host was the HCI driver, and hence "HCI" was
omitted from the name.

With support both for host and controller Zephyr will be getting more
Bluetooth driver types, in particular radio drivers. To prepare for
this, move all HCI drivers to drivers/bluetooth/hci/ and rename the
bt_driver API bt_hci_driver.

Change-Id: I82829da80aa61f26c2bb2005380f1e88d069ac7d
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

6 files changed, 9 insertions, 9 deletions

diff --git a/tests/bluetooth/init/prj_17.conf b/tests/bluetooth/init/prj_17.conf
index 6ff1170af..8aaffb22f 100644
--- a/tests/bluetooth/init/prj_17.conf
+++ b/tests/bluetooth/init/prj_17.conf
@@ -16,7 +16,7 @@ CONFIG_BLUETOOTH_DEBUG_CONN=y
 CONFIG_BLUETOOTH_DEBUG_KEYS=y
 CONFIG_BLUETOOTH_DEBUG_L2CAP=y
 CONFIG_BLUETOOTH_DEBUG_SMP=y
-CONFIG_BLUETOOTH_DEBUG_DRIVER=y
+CONFIG_BLUETOOTH_DEBUG_HCI_DRIVER=y
 CONFIG_BLUETOOTH_SMP_SELFTEST=y
 CONFIG_BLUETOOTH_DEBUG_ATT=y
 CONFIG_BLUETOOTH_DEBUG_GATT=y
diff --git a/tests/bluetooth/init/prj_20.conf b/tests/bluetooth/init/prj_20.conf
index 1b785fdfa..fc68dd0ba 100644
--- a/tests/bluetooth/init/prj_20.conf
+++ b/tests/bluetooth/init/prj_20.conf
@@ -17,7 +17,7 @@ CONFIG_BLUETOOTH_DEBUG_CONN=y
 CONFIG_BLUETOOTH_DEBUG_KEYS=y
 CONFIG_BLUETOOTH_DEBUG_L2CAP=y
 CONFIG_BLUETOOTH_DEBUG_SMP=y
-CONFIG_BLUETOOTH_DEBUG_DRIVER=y
+CONFIG_BLUETOOTH_DEBUG_HCI_DRIVER=y
 CONFIG_BLUETOOTH_SMP_SELFTEST=y
 CONFIG_BLUETOOTH_DEBUG_ATT=y
 CONFIG_BLUETOOTH_DEBUG_GATT=y
diff --git a/tests/bluetooth/init/prj_21.conf b/tests/bluetooth/init/prj_21.conf
index c58a47b2d..783b82825 100644
--- a/tests/bluetooth/init/prj_21.conf
+++ b/tests/bluetooth/init/prj_21.conf
@@ -16,7 +16,7 @@ CONFIG_BLUETOOTH_DEBUG_CONN=y
 CONFIG_BLUETOOTH_DEBUG_KEYS=y
 CONFIG_BLUETOOTH_DEBUG_L2CAP=y
 CONFIG_BLUETOOTH_DEBUG_SMP=y
-CONFIG_BLUETOOTH_DEBUG_DRIVER=y
+CONFIG_BLUETOOTH_DEBUG_HCI_DRIVER=y
 CONFIG_BLUETOOTH_SMP_SELFTEST=y
 CONFIG_BLUETOOTH_DEBUG_ATT=y
 CONFIG_BLUETOOTH_DEBUG_GATT=y
diff --git a/tests/bluetooth/init/prj_controller_dbg.conf b/tests/bluetooth/init/prj_controller_dbg.conf
index 4b1728c3b..cb6005d12 100644
--- a/tests/bluetooth/init/prj_controller_dbg.conf
+++ b/tests/bluetooth/init/prj_controller_dbg.conf
@@ -17,7 +17,7 @@ CONFIG_BLUETOOTH_DEBUG_CONN=y
 CONFIG_BLUETOOTH_DEBUG_KEYS=y
 CONFIG_BLUETOOTH_DEBUG_L2CAP=y
 CONFIG_BLUETOOTH_DEBUG_SMP=y
-CONFIG_BLUETOOTH_DEBUG_DRIVER=y
+CONFIG_BLUETOOTH_DEBUG_HCI_DRIVER=y
 CONFIG_BLUETOOTH_SMP_SELFTEST=y
 CONFIG_BLUETOOTH_DEBUG_ATT=y
 CONFIG_BLUETOOTH_DEBUG_GATT=y
diff --git a/tests/bluetooth/init/prj_h5_dbg.conf b/tests/bluetooth/init/prj_h5_dbg.conf
index 555be0c1f..f1ddecd69 100644
--- a/tests/bluetooth/init/prj_h5_dbg.conf
+++ b/tests/bluetooth/init/prj_h5_dbg.conf
@@ -2,4 +2,4 @@ CONFIG_BLUETOOTH=y
 CONFIG_BLUETOOTH_H5=y
 CONFIG_BLUETOOTH_LE=y
 CONFIG_BLUETOOTH_DEBUG_LOG=y
-CONFIG_BLUETOOTH_DEBUG_DRIVER=y
+CONFIG_BLUETOOTH_DEBUG_HCI_DRIVER=y
diff --git a/tests/bluetooth/test_bluetooth/src/bluetooth.c b/tests/bluetooth/test_bluetooth/src/bluetooth.c
index ce2cb9c16..f214a2a15 100644
--- a/tests/bluetooth/test_bluetooth/src/bluetooth.c
+++ b/tests/bluetooth/test_bluetooth/src/bluetooth.c
@@ -22,7 +22,7 @@
 #include <tc_util.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/driver.h>
+#include <bluetooth/hci_driver.h>
 
 #define EXPECTED_ERROR -ENOSYS
 
@@ -39,16 +39,16 @@ static int driver_send(struct net_buf *buf)
 	return 0;
 }
 
-static struct bt_driver drv = {
+static struct bt_hci_driver drv = {
 	.name         = "test",
-	.bus          = BT_DRIVER_BUS_VIRTUAL,
+	.bus          = BT_HCI_DRIVER_BUS_VIRTUAL,
 	.open         = driver_open,
 	.send         = driver_send,
 };
 
 static void driver_init(void)
 {
-	bt_driver_register(&drv);
+	bt_hci_driver_register(&drv);
 }
 
 void main(void)