[banjo] Rename ddk.protocol to fuchsia.hardware
Also switch to new include scheme from ddk/protocol/foo.h to
fuchsia/hardware/foo/c/banjo.h and from ddktl/protocol/foo.h to
fuchsia/hardware/foo/cpp/banjo.h
Old targets under //sdk/banjo are left as dummies to allow soft
transition of out of repo drivers. Legacy banjo headers are also
still generated for this same reason.
Bug: 67203
Change-Id: I64be41201900ecb1407e3928721b9e4a2b55e41c
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/465435
Commit-Queue: Auto-Submit <auto-submit@fuchsia-infra.iam.gserviceaccount.com>
Reviewed-by: Jocelyn Dang <jocelyndang@google.com>
Reviewed-by: P.Y. Laligand <pylaligand@google.com>
Reviewed-by: Alex Legg <alexlegg@google.com>
API-Review: Jocelyn Dang <jocelyndang@google.com>
Fuchsia-Auto-Submit: Suraj Malhotra <surajmalhotra@google.com>
diff --git a/pw_bluetooth_sapphire/host/BUILD.gn b/pw_bluetooth_sapphire/host/BUILD.gn
index 97ad752..e86f8ad 100644
--- a/pw_bluetooth_sapphire/host/BUILD.gn
+++ b/pw_bluetooth_sapphire/host/BUILD.gn
@@ -82,8 +82,8 @@
public_deps = [
":fidl_helpers",
":stack",
- "//sdk/banjo/ddk.protocol.bt.gattsvc",
- "//sdk/banjo/ddk.protocol.bt.vendor",
+ "//sdk/banjo/fuchsia.hardware.bt.gattsvc",
+ "//sdk/banjo/fuchsia.hardware.bt.vendor",
"//sdk/fidl/fuchsia.bluetooth",
"//sdk/fidl/fuchsia.bluetooth.gatt",
"//sdk/fidl/fuchsia.bluetooth.le",
diff --git a/pw_bluetooth_sapphire/host/gap/adapter_state.h b/pw_bluetooth_sapphire/host/gap/adapter_state.h
index 8f6be90..b0f2e2c 100644
--- a/pw_bluetooth_sapphire/host/gap/adapter_state.h
+++ b/pw_bluetooth_sapphire/host/gap/adapter_state.h
@@ -5,12 +5,11 @@
#ifndef SRC_CONNECTIVITY_BLUETOOTH_CORE_BT_HOST_GAP_ADAPTER_STATE_H_
#define SRC_CONNECTIVITY_BLUETOOTH_CORE_BT_HOST_GAP_ADAPTER_STATE_H_
+#include <fuchsia/hardware/bt/vendor/c/banjo.h>
#include <zircon/assert.h>
#include <cstdint>
-#include <ddk/protocol/bt/vendor.h>
-
#include "src/connectivity/bluetooth/core/bt-host/common/device_address.h"
#include "src/connectivity/bluetooth/core/bt-host/gap/gap.h"
#include "src/connectivity/bluetooth/core/bt-host/gap/low_energy_state.h"
diff --git a/pw_bluetooth_sapphire/host/gatt_remote_service_device.h b/pw_bluetooth_sapphire/host/gatt_remote_service_device.h
index f4742fd..c066072 100644
--- a/pw_bluetooth_sapphire/host/gatt_remote_service_device.h
+++ b/pw_bluetooth_sapphire/host/gatt_remote_service_device.h
@@ -5,6 +5,7 @@
#ifndef SRC_CONNECTIVITY_BLUETOOTH_CORE_BT_HOST_GATT_REMOTE_SERVICE_DEVICE_H_
#define SRC_CONNECTIVITY_BLUETOOTH_CORE_BT_HOST_GATT_REMOTE_SERVICE_DEVICE_H_
+#include <fuchsia/hardware/bt/gattsvc/cpp/banjo.h>
#include <lib/async-loop/cpp/loop.h>
#include <lib/async-loop/default.h>
#include <lib/async/cpp/task.h>
@@ -14,7 +15,6 @@
#include <ddk/driver.h>
#include <ddktl/device.h>
-#include <ddktl/protocol/bt/gattsvc.h>
#include <fbl/macros.h>
#include "src/connectivity/bluetooth/core/bt-host/gatt/gatt.h"
diff --git a/pw_bluetooth_sapphire/host/hci/BUILD.gn b/pw_bluetooth_sapphire/host/hci/BUILD.gn
index 1fbc7f8..67bbfcb 100644
--- a/pw_bluetooth_sapphire/host/hci/BUILD.gn
+++ b/pw_bluetooth_sapphire/host/hci/BUILD.gn
@@ -62,8 +62,8 @@
public_deps = [
":definitions",
- "//sdk/banjo/ddk.protocol.bt.hci",
- "//sdk/banjo/ddk.protocol.bt.vendor",
+ "//sdk/banjo/fuchsia.hardware.bt.hci",
+ "//sdk/banjo/fuchsia.hardware.bt.vendor",
"//sdk/fidl/fuchsia.hardware.bluetooth:fuchsia.hardware.bluetooth_c",
"//sdk/fidl/fuchsia.hardware.bluetooth:fuchsia.hardware.bluetooth_c_client",
"//sdk/lib/fdio",
diff --git a/pw_bluetooth_sapphire/host/hci/device_wrapper.h b/pw_bluetooth_sapphire/host/hci/device_wrapper.h
index def08e1..da640b6 100644
--- a/pw_bluetooth_sapphire/host/hci/device_wrapper.h
+++ b/pw_bluetooth_sapphire/host/hci/device_wrapper.h
@@ -6,6 +6,8 @@
#define SRC_CONNECTIVITY_BLUETOOTH_CORE_BT_HOST_HCI_DEVICE_WRAPPER_H_
#include <fuchsia/hardware/bluetooth/c/fidl.h>
+#include <fuchsia/hardware/bt/hci/c/banjo.h>
+#include <fuchsia/hardware/bt/vendor/c/banjo.h>
#include <lib/fit/function.h>
#include <lib/fit/result.h>
#include <lib/zx/channel.h>
@@ -14,8 +16,6 @@
#include <optional>
-#include <ddk/protocol/bt/hci.h>
-#include <ddk/protocol/bt/vendor.h>
#include <fbl/macros.h>
#include <fbl/unique_fd.h>
diff --git a/pw_bluetooth_sapphire/host/hci/transport.h b/pw_bluetooth_sapphire/host/hci/transport.h
index ef1e5ec..2e4aea7 100644
--- a/pw_bluetooth_sapphire/host/hci/transport.h
+++ b/pw_bluetooth_sapphire/host/hci/transport.h
@@ -5,6 +5,7 @@
#ifndef SRC_CONNECTIVITY_BLUETOOTH_CORE_BT_HOST_HCI_TRANSPORT_H_
#define SRC_CONNECTIVITY_BLUETOOTH_CORE_BT_HOST_HCI_TRANSPORT_H_
+#include <fuchsia/hardware/bt/vendor/c/banjo.h>
#include <lib/async-loop/cpp/loop.h>
#include <lib/async-loop/default.h>
#include <lib/async/cpp/wait.h>
@@ -16,7 +17,6 @@
#include <memory>
#include <thread>
-#include <ddk/protocol/bt/vendor.h>
#include <fbl/macros.h>
#include "src/connectivity/bluetooth/core/bt-host/hci/acl_data_channel.h"
diff --git a/pw_bluetooth_sapphire/host/host.h b/pw_bluetooth_sapphire/host/host.h
index 19dc5ad..ccdd79e 100644
--- a/pw_bluetooth_sapphire/host/host.h
+++ b/pw_bluetooth_sapphire/host/host.h
@@ -5,15 +5,14 @@
#ifndef SRC_CONNECTIVITY_BLUETOOTH_CORE_BT_HOST_HOST_H_
#define SRC_CONNECTIVITY_BLUETOOTH_CORE_BT_HOST_HOST_H_
+#include <fuchsia/hardware/bt/hci/c/banjo.h>
+#include <fuchsia/hardware/bt/vendor/c/banjo.h>
#include <lib/fit/function.h>
#include <lib/fit/thread_checker.h>
#include <zircon/types.h>
#include <memory>
-#include <ddk/protocol/bt/hci.h>
-#include <ddk/protocol/bt/vendor.h>
-
#include "src/connectivity/bluetooth/core/bt-host/gap/adapter.h"
#include "src/connectivity/bluetooth/core/bt-host/gatt/gatt.h"
#include "src/connectivity/bluetooth/core/bt-host/gatt_host.h"
diff --git a/pw_bluetooth_sapphire/host/host_device.h b/pw_bluetooth_sapphire/host/host_device.h
index 409488c..d4cbe46 100644
--- a/pw_bluetooth_sapphire/host/host_device.h
+++ b/pw_bluetooth_sapphire/host/host_device.h
@@ -6,6 +6,7 @@
#define SRC_CONNECTIVITY_BLUETOOTH_CORE_BT_HOST_HOST_DEVICE_H_
#include <fuchsia/hardware/bluetooth/c/fidl.h>
+#include <fuchsia/hardware/bt/vendor/c/banjo.h>
#include <lib/async-loop/cpp/loop.h>
#include <lib/async-loop/default.h>
#include <lib/async/cpp/task.h>
@@ -13,7 +14,6 @@
#include <mutex>
-#include <ddk/protocol/bt/vendor.h>
#include <ddktl/device.h>
#include <fbl/macros.h>
