[usb][bluetooth] Convert USB bluetooth drivers to new banjo USB protocol
This must be submitted with a similar change to the bt-transport-usb
driver in zircon.
TEST: bt-cli start-discovery works on Pixelbook.
Change-Id: I1241f644a03c32c6d2f3536975243a829d4d2a6a
diff --git a/drivers/bluetooth/hci/atheros/BUILD.gn b/drivers/bluetooth/hci/atheros/BUILD.gn
index cb86f6e..0994e33 100644
--- a/drivers/bluetooth/hci/atheros/BUILD.gn
+++ b/drivers/bluetooth/hci/atheros/BUILD.gn
@@ -20,11 +20,12 @@
deps = [
"//garnet/drivers/bluetooth/lib/gap",
"//garnet/drivers/bluetooth/lib/hci",
+ "//zircon/public/banjo/ddk-protocol-usb",
"//zircon/public/lib/ddk",
"//zircon/public/lib/driver",
"//zircon/public/lib/fbl",
"//zircon/public/lib/sync",
- "//zircon/public/lib/usb-old",
+ "//zircon/public/lib/usb",
"//zircon/public/lib/zx",
]
diff --git a/drivers/bluetooth/hci/atheros/device.cpp b/drivers/bluetooth/hci/atheros/device.cpp
index 57fa0e1..c313195 100644
--- a/drivers/bluetooth/hci/atheros/device.cpp
+++ b/drivers/bluetooth/hci/atheros/device.cpp
@@ -4,7 +4,7 @@
#include "device.h"
-#include <ddk/protocol/usb-old.h>
+#include <ddk/protocol/usb.h>
#include <ddk/usb/usb.h>
#include <usb/usb-request.h>
#include <fbl/auto_lock.h>
diff --git a/drivers/bluetooth/hci/atheros/device.h b/drivers/bluetooth/hci/atheros/device.h
index 5a54095..a004998 100644
--- a/drivers/bluetooth/hci/atheros/device.h
+++ b/drivers/bluetooth/hci/atheros/device.h
@@ -8,7 +8,7 @@
#include <ddk/device.h>
#include <ddk/driver.h>
#include <ddk/protocol/bt/hci.h>
-#include <ddk/protocol/usb-old.h>
+#include <ddk/protocol/usb.h>
#include <fbl/mutex.h>
#include <lib/sync/completion.h>
#include "garnet/drivers/bluetooth/lib/common/byte_buffer.h"
diff --git a/drivers/bluetooth/hci/atheros/driver.cpp b/drivers/bluetooth/hci/atheros/driver.cpp
index 2d34b6a..b49efbb 100644
--- a/drivers/bluetooth/hci/atheros/driver.cpp
+++ b/drivers/bluetooth/hci/atheros/driver.cpp
@@ -5,7 +5,7 @@
#include <ddk/device.h>
#include <ddk/driver.h>
#include <ddk/protocol/bt/hci.h>
-#include <ddk/protocol/usb-old.h>
+#include <ddk/protocol/usb.h>
#include <ddk/usb/usb.h>
#include <zircon/status.h>
@@ -27,7 +27,7 @@
extern "C" zx_status_t bt_atheros_bind(void* ctx, zx_device_t* device) {
usb_protocol_t usb;
- zx_status_t result = device_get_protocol(device, ZX_PROTOCOL_USB_OLD, &usb);
+ zx_status_t result = device_get_protocol(device, ZX_PROTOCOL_USB, &usb);
if (result != ZX_OK) {
errorf("couldn't get USB protocol: %s\n", zx_status_get_string(result));
return result;
diff --git a/drivers/bluetooth/hci/intel/BUILD.gn b/drivers/bluetooth/hci/intel/BUILD.gn
index ef0ee2e..7486469 100644
--- a/drivers/bluetooth/hci/intel/BUILD.gn
+++ b/drivers/bluetooth/hci/intel/BUILD.gn
@@ -24,6 +24,7 @@
deps = [
"//garnet/drivers/bluetooth/lib/gap",
"//garnet/drivers/bluetooth/lib/hci",
+ "//zircon/public/banjo/ddk-protocol-usb",
"//zircon/public/lib/ddk",
"//zircon/public/lib/ddktl",
"//zircon/public/lib/driver",
diff --git a/drivers/bluetooth/hci/intel/driver.cpp b/drivers/bluetooth/hci/intel/driver.cpp
index 6657777..b3324c0 100644
--- a/drivers/bluetooth/hci/intel/driver.cpp
+++ b/drivers/bluetooth/hci/intel/driver.cpp
@@ -5,7 +5,7 @@
#include <ddk/device.h>
#include <ddk/driver.h>
#include <ddk/protocol/bt/hci.h>
-#include <ddk/protocol/usb-old.h>
+#include <ddk/protocol/usb.h>
#include <zircon/status.h>
#include <cstdint>
@@ -23,7 +23,7 @@
tracef("bind\n");
usb_protocol_t usb;
- zx_status_t result = device_get_protocol(device, ZX_PROTOCOL_USB_OLD, &usb);
+ zx_status_t result = device_get_protocol(device, ZX_PROTOCOL_USB, &usb);
if (result != ZX_OK) {
errorf("couldn't get USB protocol: %s\n", zx_status_get_string(result));
return result;
