diff --git a/garnet/bin/scpi/BUILD.gn b/garnet/bin/scpi/BUILD.gn
index c8d787eecef815d212dc15f06d404fc5ba6d5bdb..b03adea12a843abaa2d4d2292ddac36fad0ceca8 100644
--- a/garnet/bin/scpi/BUILD.gn
+++ b/garnet/bin/scpi/BUILD.gn
@@ -16,7 +16,7 @@ source_set("lib") {
"//sdk/lib/fidl/cpp",
"//sdk/lib/sys/cpp",
"//src/lib/fxl",
- "//zircon/public/banjo/ddk-protocol-scpi",
+ "//zircon/public/banjo/ddk.protocol.scpi",
"//zircon/public/fidl/fuchsia-hardware-thermal:fuchsia-hardware-thermal_c",
"//zircon/public/fidl/fuchsia-sysinfo:fuchsia-sysinfo_c",
"//zircon/public/lib/ddk",
diff --git a/garnet/bin/thermd/BUILD.gn b/garnet/bin/thermd/BUILD.gn
index 4cfe320911a3ce0a1e251ccca37c486e852610a3..749693606e1f5a37ba5ee71e04282e76ab04485f 100644
--- a/garnet/bin/thermd/BUILD.gn
+++ b/garnet/bin/thermd/BUILD.gn
@@ -19,7 +19,7 @@ executable("bin") {
}
deps = [
- "//zircon/public/banjo/ddk-protocol-scpi",
+ "//zircon/public/banjo/ddk.protocol.scpi",
"//zircon/public/fidl/fuchsia-hardware-gpu-clock:fuchsia-hardware-gpu-clock_c_client",
"//zircon/public/fidl/fuchsia-hardware-thermal:fuchsia-hardware-thermal_c",
"//zircon/public/fidl/fuchsia-sysinfo:fuchsia-sysinfo_c",
diff --git a/garnet/drivers/gpu/msd-img-rgx/mtk/BUILD.gn b/garnet/drivers/gpu/msd-img-rgx/mtk/BUILD.gn
index e84ea248bac492a1bbed3ecbaa618d02e4d7f60a..6e8bff4c744f94608d19c82a118ac722e77a7cca 100644
--- a/garnet/drivers/gpu/msd-img-rgx/mtk/BUILD.gn
+++ b/garnet/drivers/gpu/msd-img-rgx/mtk/BUILD.gn
@@ -17,8 +17,8 @@ driver_module("msd_img_rgx_mtk") {
"//garnet/lib/magma/src/sys_driver",
"//sdk/fidl/fuchsia.gpu.magma:fuchsia.gpu.magma_c",
"//third_party/imgtec-pvr-rgx-km:src",
- "//zircon/public/banjo/ddk-protocol-clock",
- "//zircon/public/banjo/ddk-protocol-platform-device",
+ "//zircon/public/banjo/ddk.protocol.clock",
+ "//zircon/public/banjo/ddk.protocol.platform.device",
"//zircon/public/lib/ddk",
"//zircon/public/lib/ddktl",
"//zircon/public/lib/driver",
diff --git a/garnet/drivers/gpu/msd-intel-gen/src/BUILD.gn b/garnet/drivers/gpu/msd-intel-gen/src/BUILD.gn
index 8b944081ff929da1f4e2977380af88c99de52b4e..7b54c210541b92aea29c28047db41c0ff9ee64a1 100644
--- a/garnet/drivers/gpu/msd-intel-gen/src/BUILD.gn
+++ b/garnet/drivers/gpu/msd-intel-gen/src/BUILD.gn
@@ -75,7 +75,7 @@ source_set("src") {
]
public_deps = [
- "//zircon/public/banjo/ddk-protocol-intelgpucore",
+ "//zircon/public/banjo/ddk.protocol.intelgpucore",
]
defines = []
diff --git a/garnet/drivers/usb_video/BUILD.gn b/garnet/drivers/usb_video/BUILD.gn
index 8e7a60a5a137305978c8bb3dc972853d39d9d696..5e0121dbae7ec051deb179790b7b2f7c46c57d83 100644
--- a/garnet/drivers/usb_video/BUILD.gn
+++ b/garnet/drivers/usb_video/BUILD.gn
@@ -26,7 +26,7 @@ driver_module("usb_video_driver") {
"//garnet/public/lib/fxl",
"//sdk/fidl/fuchsia.camera",
"//sdk/lib/fidl/cpp",
- "//zircon/public/banjo/ddk-protocol-usb",
+ "//zircon/public/banjo/ddk.protocol.usb",
"//zircon/public/fidl/fuchsia-hardware-camera:fuchsia-hardware-camera_c",
"//zircon/public/lib/async-cpp",
"//zircon/public/lib/async-default",
diff --git a/garnet/drivers/video/amlogic-decoder/BUILD.gn b/garnet/drivers/video/amlogic-decoder/BUILD.gn
index 5d599e7e85cc5a32a55d1d0e9abe2f8e36972e16..36f4b2204368de4b975c2495b95583809100668d 100644
--- a/garnet/drivers/video/amlogic-decoder/BUILD.gn
+++ b/garnet/drivers/video/amlogic-decoder/BUILD.gn
@@ -109,8 +109,8 @@ if (target_cpu == "arm64") {
"local_codec_factory.h",
]
public_deps = [
- "//zircon/public/banjo/ddk-protocol-amlogiccanvas",
- "//zircon/public/banjo/ddk-protocol-sysmem",
+ "//zircon/public/banjo/ddk.protocol.amlogiccanvas",
+ "//zircon/public/banjo/ddk.protocol.sysmem",
"//zircon/public/lib/async-cpp",
"//zircon/public/lib/async-loop-cpp",
"//zircon/public/lib/ddk",
diff --git a/garnet/drivers/virtual_camera/BUILD.gn b/garnet/drivers/virtual_camera/BUILD.gn
index 5ccb68891f3080054318f7629646f88af532db61..1c9fefdc5f0ae5dbf1f963efa8a988d66456438c 100644
--- a/garnet/drivers/virtual_camera/BUILD.gn
+++ b/garnet/drivers/virtual_camera/BUILD.gn
@@ -20,7 +20,8 @@ driver_module("virtual_camera_driver") {
"//garnet/public/lib/media/timeline:timeline",
"//sdk/fidl/fuchsia.camera",
"//sdk/lib/fidl/cpp",
- "//zircon/public/banjo/ddk-protocol-usb",
+ "//src/lib/fxl",
+ "//zircon/public/banjo/ddk.protocol.usb",
"//zircon/public/fidl/fuchsia-hardware-camera:fuchsia-hardware-camera_c",
"//zircon/public/lib/async-cpp",
"//zircon/public/lib/async-default",
@@ -32,7 +33,6 @@ driver_module("virtual_camera_driver") {
"//zircon/public/lib/fzl",
"//zircon/public/lib/sync",
"//zircon/public/lib/zx",
- "//src/lib/fxl",
]
configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
diff --git a/garnet/lib/magma/src/magma_util/platform/zircon/BUILD.gn b/garnet/lib/magma/src/magma_util/platform/zircon/BUILD.gn
index 923dcb0f5f87eb78a73a0476c825201597d52790..759c56b1997ddf570c54ff91c333c7565eaa2c8e 100644
--- a/garnet/lib/magma/src/magma_util/platform/zircon/BUILD.gn
+++ b/garnet/lib/magma/src/magma_util/platform/zircon/BUILD.gn
@@ -104,8 +104,8 @@ source_set("device") {
"$zircon_build_root/public/lib/ddk",
"$zircon_build_root/public/lib/driver",
"$zircon_build_root/public/lib/zx",
- "//zircon/public/banjo/ddk-protocol-pci",
- "//zircon/public/banjo/ddk-protocol-platform-device",
+ "//zircon/public/banjo/ddk.protocol.pci",
+ "//zircon/public/banjo/ddk.protocol.platform.device",
]
}
diff --git a/garnet/lib/magma/src/sys_driver/BUILD.gn b/garnet/lib/magma/src/sys_driver/BUILD.gn
index 91a5f97246a920ee2a46ec7395e2e99db5fda416..c854cc013b3c824f3e63949564ffeba66bf87be1 100644
--- a/garnet/lib/magma/src/sys_driver/BUILD.gn
+++ b/garnet/lib/magma/src/sys_driver/BUILD.gn
@@ -48,7 +48,7 @@ source_set("entry") {
"//garnet/lib/magma/src/magma_util/platform:trace",
"//garnet/lib/magma/src/sys_driver",
"//sdk/fidl/fuchsia.gpu.magma:fuchsia.gpu.magma_c",
- "//zircon/public/banjo/ddk-protocol-platform-device",
+ "//zircon/public/banjo/ddk.protocol.platform.device",
"//zircon/public/lib/ddk",
"//zircon/public/lib/driver",
"//zircon/public/lib/zx",
@@ -120,7 +120,7 @@ source_set("test_entry_pdev") {
"//garnet/lib/magma/src/sys_driver",
"//garnet/lib/magma/tests/helper:platform_device_helper",
"//sdk/fidl/fuchsia.gpu.magma:fuchsia.gpu.magma_c",
- "//zircon/public/banjo/ddk-protocol-platform-device",
+ "//zircon/public/banjo/ddk.protocol.platform.device",
"//zircon/public/lib/zx",
]
diff --git a/garnet/lib/wlan/protocol/BUILD.gn b/garnet/lib/wlan/protocol/BUILD.gn
index e35ffe2fac0eff71c8c69780e28d23f332fcc212..9b4f08e8c1c9c07dd3f452584745ecb0e8599ec7 100644
--- a/garnet/lib/wlan/protocol/BUILD.gn
+++ b/garnet/lib/wlan/protocol/BUILD.gn
@@ -16,7 +16,7 @@ source_set("protocol") {
public_configs = [ ":wlan_protocol_config" ]
public_deps = [
- "//zircon/public/banjo/ddk-protocol-ethernet",
+ "//zircon/public/banjo/ddk.protocol.ethernet",
"//zircon/public/lib/ddk",
]
}
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index a48407ace885a91ca726febcdadc42d5637a2eaf..c9577cf54ee7663d50be9d095609276ef790a109 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -60,41 +60,41 @@ sdk("ddk") {
deps = [
"tools:banjo_sdk($host_toolchain)",
- "//zircon/public/banjo/ddk-driver:ddk-driver_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-acpi:ddk-protocol-acpi_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-amlogiccanvas:ddk-protocol-amlogiccanvas_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-badblock:ddk-protocol-badblock_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-block:ddk-protocol-block_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-bt-gattsvc:ddk-protocol-bt-gattsvc_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-bt-hci:ddk-protocol-bt-hci_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-clock:ddk-protocol-clock_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-display-controller:ddk-protocol-display-controller_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-ethernet:ddk-protocol-ethernet_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-ethernet-board:ddk-protocol-ethernet-board_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-ethernet-mac:ddk-protocol-ethernet-mac_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-gpio:ddk-protocol-gpio_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-gpioimpl:ddk-protocol-gpioimpl_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-hidbus:ddk-protocol-hidbus_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-i2c:ddk-protocol-i2c_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-i2cimpl:ddk-protocol-i2cimpl_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-intelgpucore:ddk-protocol-intelgpucore_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-intelhda-codec:ddk-protocol-intelhda-codec_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-iommu:ddk-protocol-iommu_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-mailbox:ddk-protocol-mailbox_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-mipicsi:ddk-protocol-mipicsi_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-nand:ddk-protocol-nand_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-pci:ddk-protocol-pci_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-pciroot:ddk-protocol-pciroot_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-platform-bus:ddk-protocol-platform-bus_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-platform-device:ddk-protocol-platform-device_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-rawnand:ddk-protocol-rawnand_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-scpi:ddk-protocol-scpi_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-sdhci:ddk-protocol-sdhci_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-sdio:ddk-protocol-sdio_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-sdmmc:ddk-protocol-sdmmc_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-serial:ddk-protocol-serial_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-serialimpl:ddk-protocol-serialimpl_sdk($banjo_toolchain)",
- "//zircon/public/banjo/ddk-protocol-test:ddk-protocol-test_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.driver:ddk.driver_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.acpi:ddk.protocol.acpi_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.amlogiccanvas:ddk.protocol.amlogiccanvas_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.badblock:ddk.protocol.badblock_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.block:ddk.protocol.block_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.bt.gattsvc:ddk.protocol.bt.gattsvc_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.bt.hci:ddk.protocol.bt.hci_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.clock:ddk.protocol.clock_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.display.controller:ddk.protocol.display.controller_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.ethernet:ddk.protocol.ethernet_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.ethernet.board:ddk.protocol.ethernet.board_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.ethernet.mac:ddk.protocol.ethernet.mac_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.gpio:ddk.protocol.gpio_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.gpioimpl:ddk.protocol.gpioimpl_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.hidbus:ddk.protocol.hidbus_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.i2c:ddk.protocol.i2c_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.i2cimpl:ddk.protocol.i2cimpl_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.intelgpucore:ddk.protocol.intelgpucore_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.intelhda.codec:ddk.protocol.intelhda.codec_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.iommu:ddk.protocol.iommu_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.mailbox:ddk.protocol.mailbox_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.mipicsi:ddk.protocol.mipicsi_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.nand:ddk.protocol.nand_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.pci:ddk.protocol.pci_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.pciroot:ddk.protocol.pciroot_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.platform.bus:ddk.protocol.platform.bus_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.platform.device:ddk.protocol.platform.device_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.rawnand:ddk.protocol.rawnand_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.scpi:ddk.protocol.scpi_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.sdhci:ddk.protocol.sdhci_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.sdio:ddk.protocol.sdio_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.sdmmc:ddk.protocol.sdmmc_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.serial:ddk.protocol.serial_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.serialimpl:ddk.protocol.serialimpl_sdk($banjo_toolchain)",
+ "//zircon/public/banjo/ddk.protocol.test:ddk.protocol.test_sdk($banjo_toolchain)",
"//zircon/public/lib/ddk:ddk_sdk",
"//zircon/public/lib/ddktl:ddktl_sdk",
"//zircon/public/lib/driver:driver_sdk",
diff --git a/src/connectivity/bluetooth/core/bt-host/BUILD.gn b/src/connectivity/bluetooth/core/bt-host/BUILD.gn
index 5c025b2efebfe5f20a73ba43bb8c083afe89ef17..231929d336c70535f7ca3b70c9c4ca26e241b486 100644
--- a/src/connectivity/bluetooth/core/bt-host/BUILD.gn
+++ b/src/connectivity/bluetooth/core/bt-host/BUILD.gn
@@ -56,7 +56,7 @@ source_set("sources") {
"//sdk/fidl/fuchsia.bluetooth.host:fuchsia.bluetooth.host",
"//sdk/fidl/fuchsia.bluetooth.le",
"//src/lib/fxl",
- "//zircon/public/banjo/ddk-protocol-bt-gattsvc",
+ "//zircon/public/banjo/ddk.protocol.bt.gattsvc",
"//zircon/public/fidl/fuchsia-hardware-bluetooth:fuchsia-hardware-bluetooth_c",
"//zircon/public/lib/ddk",
"//zircon/public/lib/driver",
diff --git a/src/connectivity/bluetooth/core/bt-host/hci/BUILD.gn b/src/connectivity/bluetooth/core/bt-host/hci/BUILD.gn
index 5007a40b5eb88013282ac6a625cff612e0d73466..64949bbedc67c6f364dabe241a83e49a2f63e109 100644
--- a/src/connectivity/bluetooth/core/bt-host/hci/BUILD.gn
+++ b/src/connectivity/bluetooth/core/bt-host/hci/BUILD.gn
@@ -64,7 +64,7 @@ static_library("hci") {
":definitions",
"//src/lib/files",
"//src/lib/fxl",
- "//zircon/public/banjo/ddk-protocol-bt-hci",
+ "//zircon/public/banjo/ddk.protocol.bt.hci",
"//zircon/public/fidl/fuchsia-hardware-bluetooth:fuchsia-hardware-bluetooth_c",
"//zircon/public/fidl/fuchsia-hardware-bluetooth:fuchsia-hardware-bluetooth_c_client",
"//zircon/public/lib/async-loop-cpp",
diff --git a/src/connectivity/bluetooth/hci/atheros/BUILD.gn b/src/connectivity/bluetooth/hci/atheros/BUILD.gn
index a4474e54d2e4deae4d572f677a2c8393cad579eb..8f6a1b0c8a7b222baa60c4beaacf264c1626975f 100644
--- a/src/connectivity/bluetooth/hci/atheros/BUILD.gn
+++ b/src/connectivity/bluetooth/hci/atheros/BUILD.gn
@@ -19,7 +19,7 @@ driver_module("driver") {
deps = [
"//src/connectivity/bluetooth/core/bt-host/gap",
"//src/connectivity/bluetooth/core/bt-host/hci",
- "//zircon/public/banjo/ddk-protocol-usb",
+ "//zircon/public/banjo/ddk.protocol.usb",
"//zircon/public/fidl/fuchsia-hardware-bluetooth:fuchsia-hardware-bluetooth_c",
"//zircon/public/lib/ddk",
"//zircon/public/lib/ddktl",
diff --git a/src/connectivity/bluetooth/hci/fake/BUILD.gn b/src/connectivity/bluetooth/hci/fake/BUILD.gn
index ec09653136767e9eb2c57e409650372f572fdf05..5918b8ec0d8f63e4231bc46830c1ca41312ac8d2 100644
--- a/src/connectivity/bluetooth/hci/fake/BUILD.gn
+++ b/src/connectivity/bluetooth/hci/fake/BUILD.gn
@@ -18,7 +18,7 @@ driver_module("driver") {
deps = [
"//src/connectivity/bluetooth/core/bt-host/hci",
"//src/connectivity/bluetooth/core/bt-host/testing:fake_controller",
- "//zircon/public/banjo/ddk-protocol-test",
+ "//zircon/public/banjo/ddk.protocol.test",
"//zircon/public/fidl/fuchsia-hardware-bluetooth:fuchsia-hardware-bluetooth_c_client",
"//zircon/public/lib/async-cpp",
"//zircon/public/lib/async-default",
diff --git a/src/connectivity/bluetooth/hci/intel/BUILD.gn b/src/connectivity/bluetooth/hci/intel/BUILD.gn
index ab674f34d3ac1ad84994c1efd882ee29671f185d..644c8d98e2a7caaec3ba9718197ed31d38b0c8f1 100644
--- a/src/connectivity/bluetooth/hci/intel/BUILD.gn
+++ b/src/connectivity/bluetooth/hci/intel/BUILD.gn
@@ -23,7 +23,7 @@ driver_module("driver") {
deps = [
"//src/connectivity/bluetooth/core/bt-host/gap",
"//src/connectivity/bluetooth/core/bt-host/hci",
- "//zircon/public/banjo/ddk-protocol-usb",
+ "//zircon/public/banjo/ddk.protocol.usb",
"//zircon/public/fidl/fuchsia-hardware-bluetooth:fuchsia-hardware-bluetooth_c",
"//zircon/public/lib/ddk",
"//zircon/public/lib/ddktl",
diff --git a/src/connectivity/bluetooth/hci/passthrough/BUILD.gn b/src/connectivity/bluetooth/hci/passthrough/BUILD.gn
index 34590195672beaf0c19d4f55c926a120accb36af..ad567fec807804b544a98bdfa3773d977b0e46bc 100644
--- a/src/connectivity/bluetooth/hci/passthrough/BUILD.gn
+++ b/src/connectivity/bluetooth/hci/passthrough/BUILD.gn
@@ -13,7 +13,7 @@ driver_module("driver") {
]
deps = [
- "//zircon/public/banjo/ddk-protocol-bt-hci",
+ "//zircon/public/banjo/ddk.protocol.bt.hci",
"//zircon/public/fidl/fuchsia-hardware-bluetooth:fuchsia-hardware-bluetooth_c",
"//zircon/public/lib/ddk",
"//zircon/public/lib/driver",
diff --git a/src/connectivity/bluetooth/profiles/bt-hog/BUILD.gn b/src/connectivity/bluetooth/profiles/bt-hog/BUILD.gn
index b86a41165cb059804705b6d705311a6bfa9a44e5..20c77607acf1c0e4efb115ac88c6ed90cc90d6fe 100644
--- a/src/connectivity/bluetooth/profiles/bt-hog/BUILD.gn
+++ b/src/connectivity/bluetooth/profiles/bt-hog/BUILD.gn
@@ -15,8 +15,8 @@ driver_module("driver") {
]
deps = [
- "//zircon/public/banjo/ddk-protocol-bt-gattsvc",
- "//zircon/public/banjo/ddk-protocol-hidbus",
+ "//zircon/public/banjo/ddk.protocol.bt.gattsvc",
+ "//zircon/public/banjo/ddk.protocol.hidbus",
"//zircon/public/lib/ddk",
"//zircon/public/lib/driver",
"//zircon/public/lib/zx",
diff --git a/src/connectivity/telephony/drivers/qmi-fake-transport/BUILD.gn b/src/connectivity/telephony/drivers/qmi-fake-transport/BUILD.gn
index db0fa9567c756c468436cd0babe6781e7569f448..77d42c329b49213b8920c2c4e5505bbbe0da79df 100644
--- a/src/connectivity/telephony/drivers/qmi-fake-transport/BUILD.gn
+++ b/src/connectivity/telephony/drivers/qmi-fake-transport/BUILD.gn
@@ -31,7 +31,7 @@ driver_module("fake_driver") {
]
deps = [
- "//zircon/public/banjo/ddk-protocol-test",
+ "//zircon/public/banjo/ddk.protocol.test",
"//zircon/public/lib/async-cpp",
"//zircon/public/lib/async-default",
"//zircon/public/lib/ddk",
diff --git a/src/connectivity/telephony/drivers/qmi-usb-transport/BUILD.gn b/src/connectivity/telephony/drivers/qmi-usb-transport/BUILD.gn
index ff0c802b1f92f02179504b16ac5138af0cd8dca1..0c9e91f3fffff50c1c8dd223d31badf1fc01f2d4 100644
--- a/src/connectivity/telephony/drivers/qmi-usb-transport/BUILD.gn
+++ b/src/connectivity/telephony/drivers/qmi-usb-transport/BUILD.gn
@@ -29,8 +29,8 @@ driver_module("qmi_driver") {
deps = [
"//garnet/public/lib/fsl",
- "//zircon/public/banjo/ddk-protocol-ethernet",
- "//zircon/public/banjo/ddk-protocol-usb",
+ "//zircon/public/banjo/ddk.protocol.ethernet",
+ "//zircon/public/banjo/ddk.protocol.usb",
"//zircon/public/lib/ddk",
"//zircon/public/lib/driver",
"//zircon/public/lib/fit",
diff --git a/src/connectivity/wlan/drivers/mediatek/ralink/BUILD.gn b/src/connectivity/wlan/drivers/mediatek/ralink/BUILD.gn
index 895efe83e64e6e8adfc2f408bbdf3d2d306289e9..c3bb646cfb4aa9e4bc1ef7de5453ee7fa1061f24 100644
--- a/src/connectivity/wlan/drivers/mediatek/ralink/BUILD.gn
+++ b/src/connectivity/wlan/drivers/mediatek/ralink/BUILD.gn
@@ -22,7 +22,7 @@ driver_module("ralink_driver") {
"//garnet/lib/wlan/protocol",
"//src/connectivity/wlan/lib/common/cpp:common",
"//src/connectivity/wlan/lib/mlme/cpp:mlme",
- "//zircon/public/banjo/ddk-protocol-usb",
+ "//zircon/public/banjo/ddk.protocol.usb",
"//zircon/public/lib/async-cpp",
"//zircon/public/lib/async-loop-cpp",
"//zircon/public/lib/bitmap",
diff --git a/src/connectivity/wlan/drivers/realtek/rtl88xx/BUILD.gn b/src/connectivity/wlan/drivers/realtek/rtl88xx/BUILD.gn
index dbf31bb123bf38a7dc7c13676e80f732c66f3c5a..76d8075981a2fcfa42c540f39be399a86df4f173 100644
--- a/src/connectivity/wlan/drivers/realtek/rtl88xx/BUILD.gn
+++ b/src/connectivity/wlan/drivers/realtek/rtl88xx/BUILD.gn
@@ -29,7 +29,7 @@ driver_module("rtl88xx_driver") {
deps = [
"//garnet/lib/wlan/protocol",
"//src/connectivity/wlan/lib/common/cpp:common",
- "//zircon/public/banjo/ddk-protocol-usb",
+ "//zircon/public/banjo/ddk.protocol.usb",
"//zircon/public/lib/ddk",
"//zircon/public/lib/driver",
"//zircon/public/lib/fbl",
diff --git a/src/connectivity/wlan/drivers/testing/BUILD.gn b/src/connectivity/wlan/drivers/testing/BUILD.gn
index 7043649f7443345fa1cbd90068966e2155d38349..e50d88d3577c3fae6afa59fabae538a517e2a8e4 100644
--- a/src/connectivity/wlan/drivers/testing/BUILD.gn
+++ b/src/connectivity/wlan/drivers/testing/BUILD.gn
@@ -25,7 +25,7 @@ driver_module("wlanphy-testdev") {
"//garnet/lib/wlan/protocol",
"//src/connectivity/wlan/drivers/lib",
"//src/connectivity/wlan/lib/common/cpp:common",
- "//zircon/public/banjo/ddk-protocol-sdio",
+ "//zircon/public/banjo/ddk.protocol.sdio",
"//zircon/public/lib/async-cpp",
"//zircon/public/lib/async-loop-cpp",
"//zircon/public/lib/ddk",
diff --git a/src/connectivity/wlan/drivers/third_party/atheros/ath10k/BUILD.gn b/src/connectivity/wlan/drivers/third_party/atheros/ath10k/BUILD.gn
index 67f67dc2f2f4acdaa3f962bbb48381f9fdb96c00..b263358e9d77050232b75e82a33688a00f19ef4d 100644
--- a/src/connectivity/wlan/drivers/third_party/atheros/ath10k/BUILD.gn
+++ b/src/connectivity/wlan/drivers/third_party/atheros/ath10k/BUILD.gn
@@ -70,7 +70,7 @@ driver_module("ath10k_driver") {
deps = [
"//garnet/lib/wlan/protocol",
- "//zircon/public/banjo/ddk-protocol-pci",
+ "//zircon/public/banjo/ddk.protocol.pci",
"//zircon/public/lib/ddk",
"//zircon/public/lib/driver",
"//zircon/public/lib/sync",
diff --git a/src/connectivity/wlan/drivers/third_party/broadcom/brcmfmac/BUILD.gn b/src/connectivity/wlan/drivers/third_party/broadcom/brcmfmac/BUILD.gn
index c28ee86adf11845989b1804b7273012c26d8055c..6f20cebd0d38b7262266613a84bc24bd4de08c94 100644
--- a/src/connectivity/wlan/drivers/third_party/broadcom/brcmfmac/BUILD.gn
+++ b/src/connectivity/wlan/drivers/third_party/broadcom/brcmfmac/BUILD.gn
@@ -89,12 +89,12 @@ source_set("brcmfmac_srcs") {
deps = [
"//garnet/lib/wlan/protocol",
- "//zircon/public/banjo/ddk-protocol-composite",
- "//zircon/public/banjo/ddk-protocol-ethernet",
- "//zircon/public/banjo/ddk-protocol-gpio",
- "//zircon/public/banjo/ddk-protocol-pci",
- "//zircon/public/banjo/ddk-protocol-sdio",
- "//zircon/public/banjo/ddk-protocol-usb",
+ "//zircon/public/banjo/ddk.protocol.composite",
+ "//zircon/public/banjo/ddk.protocol.ethernet",
+ "//zircon/public/banjo/ddk.protocol.gpio",
+ "//zircon/public/banjo/ddk.protocol.pci",
+ "//zircon/public/banjo/ddk.protocol.sdio",
+ "//zircon/public/banjo/ddk.protocol.usb",
"//zircon/public/lib/async-loop",
"//zircon/public/lib/broadcom",
"//zircon/public/lib/ddk",
diff --git a/src/connectivity/wlan/drivers/wlan/BUILD.gn b/src/connectivity/wlan/drivers/wlan/BUILD.gn
index f68e9e32df89d1ed15a0b24d243d19891890e615..195124feb9728c4db2194d97f7c00f22e303e5dc 100644
--- a/src/connectivity/wlan/drivers/wlan/BUILD.gn
+++ b/src/connectivity/wlan/drivers/wlan/BUILD.gn
@@ -29,7 +29,7 @@ driver_module("wlan_driver") {
"//garnet/public/lib/component/cpp:environment_services",
"//garnet/public/lib/svc/cpp",
"//src/connectivity/wlan/lib/mlme/cpp:mlme",
- "//zircon/public/banjo/ddk-protocol-ethernet",
+ "//zircon/public/banjo/ddk.protocol.ethernet",
"//zircon/public/lib/ddk",
"//zircon/public/lib/ddktl",
"//zircon/public/lib/driver",
@@ -65,7 +65,8 @@ executable("wlan_minstrel_unittest") {
"//zircon/public/lib/fbl",
]
- configs += [ "//src/connectivity/wlan/lib/mlme/cpp/tests:wlan_mlme_tests_config" ]
+ configs +=
+ [ "//src/connectivity/wlan/lib/mlme/cpp/tests:wlan_mlme_tests_config" ]
}
test_package("wlan_drivers_tests") {
diff --git a/zircon/public/gn/BUILDCONFIG.gn b/zircon/public/gn/BUILDCONFIG.gn
index 4184d885165297885b0e6d8ebcc615e52e75c5d0..b5503478d314e9b9501f4e342b3cfeba910ab1c2 100644
--- a/zircon/public/gn/BUILDCONFIG.gn
+++ b/zircon/public/gn/BUILDCONFIG.gn
@@ -449,7 +449,7 @@ template("library") {
} else {
if (get_path_info(get_label_info(dep, "dir"), "dir") ==
"$zx/system/banjo") {
- dep = get_path_info(get_label_info(dep, "dir"), "name")
+ dep = get_path_info(get_label_info(dep, "dir"), "file")
deps += [ "//zircon/public/banjo/$dep" ]
} else if (get_label_info(dep, "name") == "static" ||
get_label_info(dep, "name") == "shared") {
diff --git a/zircon/public/gn/banjo.gni b/zircon/public/gn/banjo.gni
index 1589297e7c47e03ba53b0637156ada84b6654faf..b883471fc456f7a60bdb6abf818d544c309e61e4 100644
--- a/zircon/public/gn/banjo.gni
+++ b/zircon/public/gn/banjo.gni
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-# TODO(mcgrathr): This is heavily based on banjo.gni though they don't
+# TODO(mcgrathr): This is heavily based on fidl.gni though they don't
# share much code. Try to converge these more in the future.
import("$zx/public/gn/fidl/fidlc.gni")
@@ -93,10 +93,7 @@ template("banjo_library") {
banjo_target = target_name
- # TODO(mcgrathr): temporary until everything is renamed with . names
- banjo_library_name = string_replace(banjo_target, "-", ".")
-
- banjo_path = string_replace(banjo_library_name, ".", "/")
+ banjo_path = string_replace(banjo_target, ".", "/")
banjo_name = string_replace(banjo_path, "ddk/protocol/", "")
# Collect the dependencies on other Banjo libraries, and canonicalize them.
@@ -139,7 +136,7 @@ template("banjo_library") {
# TODO(BLD-353): temporary hack
assert(banjo_target ==
- get_path_info(get_label_info(":$banjo_target", "dir"), "name"))
+ get_path_info(get_label_info(":$banjo_target", "dir"), "file"))
legacy_barrier = []
legacy_dirs = [ "banjo/$banjo_target" ]
legacy_targets = [
@@ -147,9 +144,9 @@ template("banjo_library") {
import = "//build/banjo/banjo.gni"
target_name = banjo_target
- # The ddk-protocol prefix is magic: without it, you're a
+ # The ddk.protocol. prefix is magic: without it, you're a
# banjo_dummy() target; with it, you're a banjo() target.
- if (string_replace(banjo_target, "ddk-protocol-", "") ==
+ if (string_replace(banjo_target, "ddk.protocol.", "") ==
banjo_target) {
target_type = "banjo_dummy"
} else {
@@ -157,7 +154,7 @@ template("banjo_library") {
}
# These all become the parameters to banjo() or banjo_dummy().
- name = banjo_library_name
+ name = banjo_target
sdk_category = "partner"
sources = []
foreach(file, invoker.sources) {
@@ -169,7 +166,7 @@ template("banjo_library") {
if (defined(invoker.public_deps)) {
foreach(label, invoker.public_deps) {
assert(get_label_info(label, "name") ==
- get_path_info(get_label_info(label, "dir"), "name"),
+ get_path_info(get_label_info(label, "dir"), "file"),
"banjo_library(\"$banjo_target\") deps " +
get_label_info(label, "label_no_toolchain"))
deps +=
diff --git a/zircon/system/banjo/BUILD.gn b/zircon/system/banjo/BUILD.gn
index ee44729486fff611e8b8cb9ae568bc37341455e9..9dee731221e285c0c001a8f245fbd5a3e22a0073 100644
--- a/zircon/system/banjo/BUILD.gn
+++ b/zircon/system/banjo/BUILD.gn
@@ -7,68 +7,68 @@
group("banjo") {
deps = [
- "ddk-driver",
- "ddk-physiter",
- "ddk-protocol-acpi",
- "ddk-protocol-amlogiccanvas",
- "ddk-protocol-badblock",
- "ddk-protocol-block",
- "ddk-protocol-block-partition",
- "ddk-protocol-block-volume",
- "ddk-protocol-bt-gattsvc",
- "ddk-protocol-bt-hci",
- "ddk-protocol-camerasensor",
- "ddk-protocol-clock",
- "ddk-protocol-clockimpl",
- "ddk-protocol-composite",
- "ddk-protocol-display-controller",
- "ddk-protocol-dsiimpl",
- "ddk-protocol-ethernet",
- "ddk-protocol-ethernet-board",
- "ddk-protocol-ethernet-mac",
- "ddk-protocol-goldfish-pipe",
- "ddk-protocol-gpio",
- "ddk-protocol-gpioimpl",
- "ddk-protocol-hidbus",
- "ddk-protocol-i2c",
- "ddk-protocol-i2cimpl",
- "ddk-protocol-intelgpucore",
- "ddk-protocol-intelhda-codec",
- "ddk-protocol-iommu",
- "ddk-protocol-mailbox",
- "ddk-protocol-mipicsi",
- "ddk-protocol-nand",
- "ddk-protocol-pci",
- "ddk-protocol-pciroot",
- "ddk-protocol-platform-bus",
- "ddk-protocol-platform-device",
- "ddk-protocol-power",
- "ddk-protocol-powerimpl",
- "ddk-protocol-rawnand",
- "ddk-protocol-scpi",
- "ddk-protocol-sdhci",
- "ddk-protocol-sdio",
- "ddk-protocol-sdmmc",
- "ddk-protocol-serial",
- "ddk-protocol-serialimpl",
- "ddk-protocol-sysmem",
- "ddk-protocol-test",
- "ddk-protocol-usb",
- "ddk-protocol-usb-bus",
- "ddk-protocol-usb-composite",
- "ddk-protocol-usb-dci",
- "ddk-protocol-usb-function",
- "ddk-protocol-usb-hci",
- "ddk-protocol-usb-hub",
- "ddk-protocol-usb-modeswitch",
- "ddk-protocol-usb-request",
- "zircon-device-audio",
- "zircon-device-block",
- "zircon-device-nand",
- "zircon-device-scpi",
- "zircon-hw-pci",
- "zircon-hw-usb",
- "zircon-hw-usb-hub",
- "zircon-syscalls-pci",
+ "ddk.driver",
+ "ddk.physiter",
+ "ddk.protocol.acpi",
+ "ddk.protocol.amlogiccanvas",
+ "ddk.protocol.badblock",
+ "ddk.protocol.block",
+ "ddk.protocol.block.partition",
+ "ddk.protocol.block.volume",
+ "ddk.protocol.bt.gattsvc",
+ "ddk.protocol.bt.hci",
+ "ddk.protocol.camerasensor",
+ "ddk.protocol.clock",
+ "ddk.protocol.clockimpl",
+ "ddk.protocol.composite",
+ "ddk.protocol.display.controller",
+ "ddk.protocol.dsiimpl",
+ "ddk.protocol.ethernet",
+ "ddk.protocol.ethernet.board",
+ "ddk.protocol.ethernet.mac",
+ "ddk.protocol.goldfish.pipe",
+ "ddk.protocol.gpio",
+ "ddk.protocol.gpioimpl",
+ "ddk.protocol.hidbus",
+ "ddk.protocol.i2c",
+ "ddk.protocol.i2cimpl",
+ "ddk.protocol.intelgpucore",
+ "ddk.protocol.intelhda.codec",
+ "ddk.protocol.iommu",
+ "ddk.protocol.mailbox",
+ "ddk.protocol.mipicsi",
+ "ddk.protocol.nand",
+ "ddk.protocol.pci",
+ "ddk.protocol.pciroot",
+ "ddk.protocol.platform.bus",
+ "ddk.protocol.platform.device",
+ "ddk.protocol.power",
+ "ddk.protocol.powerimpl",
+ "ddk.protocol.rawnand",
+ "ddk.protocol.scpi",
+ "ddk.protocol.sdhci",
+ "ddk.protocol.sdio",
+ "ddk.protocol.sdmmc",
+ "ddk.protocol.serial",
+ "ddk.protocol.serialimpl",
+ "ddk.protocol.sysmem",
+ "ddk.protocol.test",
+ "ddk.protocol.usb",
+ "ddk.protocol.usb.bus",
+ "ddk.protocol.usb.composite",
+ "ddk.protocol.usb.dci",
+ "ddk.protocol.usb.function",
+ "ddk.protocol.usb.hci",
+ "ddk.protocol.usb.hub",
+ "ddk.protocol.usb.modeswitch",
+ "ddk.protocol.usb.request",
+ "zircon.device.audio",
+ "zircon.device.block",
+ "zircon.device.nand",
+ "zircon.device.scpi",
+ "zircon.hw.pci",
+ "zircon.hw.usb",
+ "zircon.hw.usb.hub",
+ "zircon.syscalls.pci",
]
}
diff --git a/zircon/system/banjo/ddk-protocol-usb-hci/BUILD.gn b/zircon/system/banjo/ddk-protocol-usb-hci/BUILD.gn
deleted file mode 100644
index c9e78f6bc7cbe8150de6ede4720df7837c703853..0000000000000000000000000000000000000000
--- a/zircon/system/banjo/ddk-protocol-usb-hci/BUILD.gn
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2019 The Fuchsia Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("$zx/public/gn/banjo.gni")
-
-banjo_library("ddk-protocol-usb-hci") {
- sources = [
- "usb-hci.banjo",
- ]
- public_deps = [
- "$zx/system/banjo/ddk-physiter",
- "$zx/system/banjo/ddk-protocol-usb-bus",
- "$zx/system/banjo/ddk-protocol-usb-hub",
- "$zx/system/banjo/ddk-protocol-usb-request",
- "$zx/system/banjo/zircon-hw-usb",
- "$zx/system/banjo/zircon-hw-usb-hub",
- ]
-}
diff --git a/zircon/system/banjo/ddk-driver/BUILD.gn b/zircon/system/banjo/ddk.driver/BUILD.gn
similarity index 88%
rename from zircon/system/banjo/ddk-driver/BUILD.gn
rename to zircon/system/banjo/ddk.driver/BUILD.gn
index e2a9c0fd2d22ede7a97578640686f727fe264246..c26d9f685ef25ac47e25ee2012ac314b34089d27 100644
--- a/zircon/system/banjo/ddk-driver/BUILD.gn
+++ b/zircon/system/banjo/ddk.driver/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-driver") {
+banjo_library("ddk.driver") {
sources = [
"driver.banjo",
]
diff --git a/zircon/system/banjo/ddk-driver/driver.banjo b/zircon/system/banjo/ddk.driver/driver.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-driver/driver.banjo
rename to zircon/system/banjo/ddk.driver/driver.banjo
diff --git a/zircon/system/banjo/ddk-physiter/BUILD.gn b/zircon/system/banjo/ddk.physiter/BUILD.gn
similarity index 88%
rename from zircon/system/banjo/ddk-physiter/BUILD.gn
rename to zircon/system/banjo/ddk.physiter/BUILD.gn
index 5a805c57de156724adcbd9981fa1f9f6ff5e970d..8682a7fa9f850ea1ec62d485b228c2d81a5f16fb 100644
--- a/zircon/system/banjo/ddk-physiter/BUILD.gn
+++ b/zircon/system/banjo/ddk.physiter/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-physiter") {
+banjo_library("ddk.physiter") {
sources = [
"phys-iter.banjo",
]
diff --git a/zircon/system/banjo/ddk-physiter/phys-iter.banjo b/zircon/system/banjo/ddk.physiter/phys-iter.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-physiter/phys-iter.banjo
rename to zircon/system/banjo/ddk.physiter/phys-iter.banjo
diff --git a/zircon/system/banjo/ddk-protocol-acpi/BUILD.gn b/zircon/system/banjo/ddk.protocol.acpi/BUILD.gn
similarity index 86%
rename from zircon/system/banjo/ddk-protocol-acpi/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.acpi/BUILD.gn
index 13912f273d4be21c3edfc055187e6605587b3794..f0c85609543cbda75f6ea982e5110c3a89a84328 100644
--- a/zircon/system/banjo/ddk-protocol-acpi/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.acpi/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-acpi") {
+banjo_library("ddk.protocol.acpi") {
sources = [
"acpi.banjo",
]
diff --git a/zircon/system/banjo/ddk-protocol-acpi/acpi.banjo b/zircon/system/banjo/ddk.protocol.acpi/acpi.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-acpi/acpi.banjo
rename to zircon/system/banjo/ddk.protocol.acpi/acpi.banjo
diff --git a/zircon/system/banjo/ddk-protocol-amlogiccanvas/BUILD.gn b/zircon/system/banjo/ddk.protocol.amlogiccanvas/BUILD.gn
similarity index 84%
rename from zircon/system/banjo/ddk-protocol-amlogiccanvas/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.amlogiccanvas/BUILD.gn
index df4494b2029f1b32895b90e28ffdeb2d7ca51b99..106af37e0d294ecdbabbbf3a21ab67fa01a11c60 100644
--- a/zircon/system/banjo/ddk-protocol-amlogiccanvas/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.amlogiccanvas/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-amlogiccanvas") {
+banjo_library("ddk.protocol.amlogiccanvas") {
sources = [
"amlogic-canvas.banjo",
]
diff --git a/zircon/system/banjo/ddk-protocol-amlogiccanvas/amlogic-canvas.banjo b/zircon/system/banjo/ddk.protocol.amlogiccanvas/amlogic-canvas.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-amlogiccanvas/amlogic-canvas.banjo
rename to zircon/system/banjo/ddk.protocol.amlogiccanvas/amlogic-canvas.banjo
diff --git a/zircon/system/banjo/ddk-protocol-badblock/BUILD.gn b/zircon/system/banjo/ddk.protocol.badblock/BUILD.gn
similarity index 85%
rename from zircon/system/banjo/ddk-protocol-badblock/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.badblock/BUILD.gn
index a79eed49430b2ef93ec4d03cc1bada3cb8382158..1fea127583191c8864023c4bf06364966516585d 100644
--- a/zircon/system/banjo/ddk-protocol-badblock/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.badblock/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-badblock") {
+banjo_library("ddk.protocol.badblock") {
sources = [
"bad-block.banjo",
]
diff --git a/zircon/system/banjo/ddk-protocol-badblock/bad-block.banjo b/zircon/system/banjo/ddk.protocol.badblock/bad-block.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-badblock/bad-block.banjo
rename to zircon/system/banjo/ddk.protocol.badblock/bad-block.banjo
diff --git a/zircon/system/banjo/ddk-protocol-block-partition/BUILD.gn b/zircon/system/banjo/ddk.protocol.block.partition/BUILD.gn
similarity index 74%
rename from zircon/system/banjo/ddk-protocol-block-partition/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.block.partition/BUILD.gn
index 42eb07b74d9950c1edf358201bc533b22ce0d41f..ff7d637ae35871f75224771d16f88a4906db6023 100644
--- a/zircon/system/banjo/ddk-protocol-block-partition/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.block.partition/BUILD.gn
@@ -4,11 +4,11 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-block-partition") {
+banjo_library("ddk.protocol.block.partition") {
sources = [
"partition.banjo",
]
public_deps = [
- "$zx/system/banjo/zircon-device-block",
+ "$zx/system/banjo/zircon.device.block",
]
}
diff --git a/zircon/system/banjo/ddk-protocol-block-partition/partition.banjo b/zircon/system/banjo/ddk.protocol.block.partition/partition.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-block-partition/partition.banjo
rename to zircon/system/banjo/ddk.protocol.block.partition/partition.banjo
diff --git a/zircon/system/banjo/ddk-protocol-block-volume/BUILD.gn b/zircon/system/banjo/ddk.protocol.block.volume/BUILD.gn
similarity index 74%
rename from zircon/system/banjo/ddk-protocol-block-volume/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.block.volume/BUILD.gn
index 7e3c327dcea59941205fb809568e73e89bb616c1..688e63b394307b75e020204d0f74aacfd5e93111 100644
--- a/zircon/system/banjo/ddk-protocol-block-volume/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.block.volume/BUILD.gn
@@ -4,11 +4,11 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-block-volume") {
+banjo_library("ddk.protocol.block.volume") {
sources = [
"volume.banjo",
]
public_deps = [
- "$zx/system/banjo/zircon-device-block",
+ "$zx/system/banjo/zircon.device.block",
]
}
diff --git a/zircon/system/banjo/ddk-protocol-block-volume/volume.banjo b/zircon/system/banjo/ddk.protocol.block.volume/volume.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-block-volume/volume.banjo
rename to zircon/system/banjo/ddk.protocol.block.volume/volume.banjo
diff --git a/zircon/system/banjo/ddk-protocol-block/BUILD.gn b/zircon/system/banjo/ddk.protocol.block/BUILD.gn
similarity index 75%
rename from zircon/system/banjo/ddk-protocol-block/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.block/BUILD.gn
index 10dc54bdb2c555f03032c751357c46eaa54f856e..31f384fa3c134d5291a72c7b1a2d97e8a767e6cc 100644
--- a/zircon/system/banjo/ddk-protocol-block/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.block/BUILD.gn
@@ -4,11 +4,11 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-block") {
+banjo_library("ddk.protocol.block") {
sources = [
"block.banjo",
]
public_deps = [
- "$zx/system/banjo/zircon-device-block",
+ "$zx/system/banjo/zircon.device.block",
]
}
diff --git a/zircon/system/banjo/ddk-protocol-block/block.banjo b/zircon/system/banjo/ddk.protocol.block/block.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-block/block.banjo
rename to zircon/system/banjo/ddk.protocol.block/block.banjo
diff --git a/zircon/system/banjo/ddk-protocol-bt-gattsvc/BUILD.gn b/zircon/system/banjo/ddk.protocol.bt.gattsvc/BUILD.gn
similarity index 84%
rename from zircon/system/banjo/ddk-protocol-bt-gattsvc/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.bt.gattsvc/BUILD.gn
index 42a31907458c03342d8dda958c4555ac67e477ff..b83bb6e1968cee181bf59c83757bb3d07b386182 100644
--- a/zircon/system/banjo/ddk-protocol-bt-gattsvc/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.bt.gattsvc/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-bt-gattsvc") {
+banjo_library("ddk.protocol.bt.gattsvc") {
sources = [
"bt-gatt-svc.banjo",
]
diff --git a/zircon/system/banjo/ddk-protocol-bt-gattsvc/bt-gatt-svc.banjo b/zircon/system/banjo/ddk.protocol.bt.gattsvc/bt-gatt-svc.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-bt-gattsvc/bt-gatt-svc.banjo
rename to zircon/system/banjo/ddk.protocol.bt.gattsvc/bt-gatt-svc.banjo
diff --git a/zircon/system/banjo/ddk-protocol-bt-hci/BUILD.gn b/zircon/system/banjo/ddk.protocol.bt.hci/BUILD.gn
similarity index 85%
rename from zircon/system/banjo/ddk-protocol-bt-hci/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.bt.hci/BUILD.gn
index 988eba4b5f6bc97242112b34a1373c43fa007712..f9078290883690923dd33348ade3d5cfee0b8392 100644
--- a/zircon/system/banjo/ddk-protocol-bt-hci/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.bt.hci/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-bt-hci") {
+banjo_library("ddk.protocol.bt.hci") {
sources = [
"bt-hci.banjo",
]
diff --git a/zircon/system/banjo/ddk-protocol-bt-hci/bt-hci.banjo b/zircon/system/banjo/ddk.protocol.bt.hci/bt-hci.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-bt-hci/bt-hci.banjo
rename to zircon/system/banjo/ddk.protocol.bt.hci/bt-hci.banjo
diff --git a/zircon/system/banjo/ddk-protocol-camerasensor/BUILD.gn b/zircon/system/banjo/ddk.protocol.camerasensor/BUILD.gn
similarity index 84%
rename from zircon/system/banjo/ddk-protocol-camerasensor/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.camerasensor/BUILD.gn
index 4465f24662e9e3e9c6b4baf02150941c9c093756..2982333671da51aadf9c1ab0992e6257845d6149 100644
--- a/zircon/system/banjo/ddk-protocol-camerasensor/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.camerasensor/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-camerasensor") {
+banjo_library("ddk.protocol.camerasensor") {
sources = [
"camerasensor.banjo",
]
diff --git a/zircon/system/banjo/ddk-protocol-camerasensor/camerasensor.banjo b/zircon/system/banjo/ddk.protocol.camerasensor/camerasensor.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-camerasensor/camerasensor.banjo
rename to zircon/system/banjo/ddk.protocol.camerasensor/camerasensor.banjo
diff --git a/zircon/system/banjo/ddk-protocol-clock/BUILD.gn b/zircon/system/banjo/ddk.protocol.clock/BUILD.gn
similarity index 86%
rename from zircon/system/banjo/ddk-protocol-clock/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.clock/BUILD.gn
index d66a288661af70bfdf59ab17744ddd8bd31f5aa5..f1fe683e378623de4f5600cb6eceb2e7f40e2c22 100644
--- a/zircon/system/banjo/ddk-protocol-clock/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.clock/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-clock") {
+banjo_library("ddk.protocol.clock") {
sources = [
"clock.banjo",
]
diff --git a/zircon/system/banjo/ddk-protocol-clock/clock.banjo b/zircon/system/banjo/ddk.protocol.clock/clock.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-clock/clock.banjo
rename to zircon/system/banjo/ddk.protocol.clock/clock.banjo
diff --git a/zircon/system/banjo/ddk-protocol-clockimpl/BUILD.gn b/zircon/system/banjo/ddk.protocol.clockimpl/BUILD.gn
similarity index 85%
rename from zircon/system/banjo/ddk-protocol-clockimpl/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.clockimpl/BUILD.gn
index fd4b9af8626bd1eeb5796b03a24c7f96cdce1410..81b6299571cc309b607159219e9988e6b33bddd9 100644
--- a/zircon/system/banjo/ddk-protocol-clockimpl/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.clockimpl/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-clockimpl") {
+banjo_library("ddk.protocol.clockimpl") {
sources = [
"clock-impl.banjo",
]
diff --git a/zircon/system/banjo/ddk-protocol-clockimpl/clock-impl.banjo b/zircon/system/banjo/ddk.protocol.clockimpl/clock-impl.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-clockimpl/clock-impl.banjo
rename to zircon/system/banjo/ddk.protocol.clockimpl/clock-impl.banjo
diff --git a/zircon/system/banjo/ddk-protocol-composite/BUILD.gn b/zircon/system/banjo/ddk.protocol.composite/BUILD.gn
similarity index 77%
rename from zircon/system/banjo/ddk-protocol-composite/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.composite/BUILD.gn
index 4f0f86319afe85953a47b8d8f4e0c826e8b4aa08..002c2618d6674a9963008a05b1babf0725cef9f8 100644
--- a/zircon/system/banjo/ddk-protocol-composite/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.composite/BUILD.gn
@@ -4,12 +4,12 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-composite") {
+banjo_library("ddk.protocol.composite") {
sources = [
"composite.banjo",
]
public_deps = [
- "$zx/system/banjo/ddk-driver",
+ "$zx/system/banjo/ddk.driver",
]
}
diff --git a/zircon/system/banjo/ddk-protocol-composite/composite.banjo b/zircon/system/banjo/ddk.protocol.composite/composite.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-composite/composite.banjo
rename to zircon/system/banjo/ddk.protocol.composite/composite.banjo
diff --git a/zircon/system/banjo/ddk-protocol-display-controller/BUILD.gn b/zircon/system/banjo/ddk.protocol.display.controller/BUILD.gn
similarity index 74%
rename from zircon/system/banjo/ddk-protocol-display-controller/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.display.controller/BUILD.gn
index e24a79e7bf5f087068206423cb80a1ec6e68e9ac..1d20a7af98dd8ec6a6057415c7f7ec52d5a0c0da 100644
--- a/zircon/system/banjo/ddk-protocol-display-controller/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.display.controller/BUILD.gn
@@ -4,11 +4,11 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-display-controller") {
+banjo_library("ddk.protocol.display.controller") {
sources = [
"display-controller.banjo",
]
public_deps = [
- "$zx/system/banjo/zircon-device-audio",
+ "$zx/system/banjo/zircon.device.audio",
]
}
diff --git a/zircon/system/banjo/ddk-protocol-display-controller/display-controller.banjo b/zircon/system/banjo/ddk.protocol.display.controller/display-controller.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-display-controller/display-controller.banjo
rename to zircon/system/banjo/ddk.protocol.display.controller/display-controller.banjo
diff --git a/zircon/system/banjo/ddk-protocol-dsiimpl/BUILD.gn b/zircon/system/banjo/ddk.protocol.dsiimpl/BUILD.gn
similarity index 85%
rename from zircon/system/banjo/ddk-protocol-dsiimpl/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.dsiimpl/BUILD.gn
index af7d886b7786b3c51af235ca22d4fe5e3d0bda78..e051d94dcee05edb223d3b40d7a4cd0a4c6ee742 100644
--- a/zircon/system/banjo/ddk-protocol-dsiimpl/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.dsiimpl/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-dsiimpl") {
+banjo_library("ddk.protocol.dsiimpl") {
sources = [
"dsiimpl.banjo",
]
diff --git a/zircon/system/banjo/ddk-protocol-dsiimpl/dsiimpl.banjo b/zircon/system/banjo/ddk.protocol.dsiimpl/dsiimpl.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-dsiimpl/dsiimpl.banjo
rename to zircon/system/banjo/ddk.protocol.dsiimpl/dsiimpl.banjo
diff --git a/zircon/system/banjo/ddk-protocol-ethernet-board/BUILD.gn b/zircon/system/banjo/ddk.protocol.ethernet.board/BUILD.gn
similarity index 83%
rename from zircon/system/banjo/ddk-protocol-ethernet-board/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.ethernet.board/BUILD.gn
index 238cacd07db72f912d9eeb57e2234c1fa8f65339..1be502b3d799990d6a8a046f5f574decef38332d 100644
--- a/zircon/system/banjo/ddk-protocol-ethernet-board/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.ethernet.board/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-ethernet-board") {
+banjo_library("ddk.protocol.ethernet.board") {
sources = [
"ethernet-board.banjo",
]
diff --git a/zircon/system/banjo/ddk-protocol-ethernet-board/ethernet-board.banjo b/zircon/system/banjo/ddk.protocol.ethernet.board/ethernet-board.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-ethernet-board/ethernet-board.banjo
rename to zircon/system/banjo/ddk.protocol.ethernet.board/ethernet-board.banjo
diff --git a/zircon/system/banjo/ddk-protocol-ethernet-mac/BUILD.gn b/zircon/system/banjo/ddk.protocol.ethernet.mac/BUILD.gn
similarity index 84%
rename from zircon/system/banjo/ddk-protocol-ethernet-mac/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.ethernet.mac/BUILD.gn
index f12a191d0aeafc85beb6f98ab88544a6290dbe53..64957f04cd9a44fbe4483737a93ae92d0b932c24 100644
--- a/zircon/system/banjo/ddk-protocol-ethernet-mac/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.ethernet.mac/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-ethernet-mac") {
+banjo_library("ddk.protocol.ethernet.mac") {
sources = [
"ethernet-mac.banjo",
]
diff --git a/zircon/system/banjo/ddk-protocol-ethernet-mac/ethernet-mac.banjo b/zircon/system/banjo/ddk.protocol.ethernet.mac/ethernet-mac.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-ethernet-mac/ethernet-mac.banjo
rename to zircon/system/banjo/ddk.protocol.ethernet.mac/ethernet-mac.banjo
diff --git a/zircon/system/banjo/ddk-protocol-ethernet/BUILD.gn b/zircon/system/banjo/ddk.protocol.ethernet/BUILD.gn
similarity index 85%
rename from zircon/system/banjo/ddk-protocol-ethernet/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.ethernet/BUILD.gn
index 560b58cc7c277191253a7b36476744d24dc6e965..8270ec70e97ea6850009b02ab9a473a1e0fc7a51 100644
--- a/zircon/system/banjo/ddk-protocol-ethernet/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.ethernet/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-ethernet") {
+banjo_library("ddk.protocol.ethernet") {
sources = [
"ethernet.banjo",
]
diff --git a/zircon/system/banjo/ddk-protocol-ethernet/ethernet.banjo b/zircon/system/banjo/ddk.protocol.ethernet/ethernet.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-ethernet/ethernet.banjo
rename to zircon/system/banjo/ddk.protocol.ethernet/ethernet.banjo
diff --git a/zircon/system/banjo/ddk-protocol-goldfish-pipe/BUILD.gn b/zircon/system/banjo/ddk.protocol.goldfish.pipe/BUILD.gn
similarity index 84%
rename from zircon/system/banjo/ddk-protocol-goldfish-pipe/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.goldfish.pipe/BUILD.gn
index 0027066d5f161de48c9a77fdfa936aaca2bf7691..c5142919b8e6fc154b60a8ebafe7eba61b3d2133 100644
--- a/zircon/system/banjo/ddk-protocol-goldfish-pipe/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.goldfish.pipe/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-goldfish-pipe") {
+banjo_library("ddk.protocol.goldfish.pipe") {
sources = [
"goldfish-pipe.banjo",
]
diff --git a/zircon/system/banjo/ddk-protocol-goldfish-pipe/goldfish-pipe.banjo b/zircon/system/banjo/ddk.protocol.goldfish.pipe/goldfish-pipe.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-goldfish-pipe/goldfish-pipe.banjo
rename to zircon/system/banjo/ddk.protocol.goldfish.pipe/goldfish-pipe.banjo
diff --git a/zircon/system/banjo/ddk-protocol-gpio/BUILD.gn b/zircon/system/banjo/ddk.protocol.gpio/BUILD.gn
similarity index 86%
rename from zircon/system/banjo/ddk-protocol-gpio/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.gpio/BUILD.gn
index c2199ae5ea475e438ca28430665068d9b1a80361..bf91a33b4610d5b7bf7924175ce56ece49fb6c94 100644
--- a/zircon/system/banjo/ddk-protocol-gpio/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.gpio/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-gpio") {
+banjo_library("ddk.protocol.gpio") {
sources = [
"gpio.banjo",
]
diff --git a/zircon/system/banjo/ddk-protocol-gpio/gpio.banjo b/zircon/system/banjo/ddk.protocol.gpio/gpio.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-gpio/gpio.banjo
rename to zircon/system/banjo/ddk.protocol.gpio/gpio.banjo
diff --git a/zircon/system/banjo/ddk-protocol-gpioimpl/BUILD.gn b/zircon/system/banjo/ddk.protocol.gpioimpl/BUILD.gn
similarity index 75%
rename from zircon/system/banjo/ddk-protocol-gpioimpl/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.gpioimpl/BUILD.gn
index 7e5f888e7a68f461527e409a818eee214717a755..edc8b25773c6b92b7f87e6cda8bd6fab40c5bc4f 100644
--- a/zircon/system/banjo/ddk-protocol-gpioimpl/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.gpioimpl/BUILD.gn
@@ -4,11 +4,11 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-gpioimpl") {
+banjo_library("ddk.protocol.gpioimpl") {
sources = [
"gpio-impl.banjo",
]
public_deps = [
- "$zx/system/banjo/ddk-protocol-gpio",
+ "$zx/system/banjo/ddk.protocol.gpio",
]
}
diff --git a/zircon/system/banjo/ddk-protocol-gpioimpl/gpio-impl.banjo b/zircon/system/banjo/ddk.protocol.gpioimpl/gpio-impl.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-gpioimpl/gpio-impl.banjo
rename to zircon/system/banjo/ddk.protocol.gpioimpl/gpio-impl.banjo
diff --git a/zircon/system/banjo/ddk-protocol-hidbus/BUILD.gn b/zircon/system/banjo/ddk.protocol.hidbus/BUILD.gn
similarity index 85%
rename from zircon/system/banjo/ddk-protocol-hidbus/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.hidbus/BUILD.gn
index 55bb89ef486b6b51348bb2bdd2ac1904a0b85f20..5636e868c57ef0511ab65431b690071aa43e993d 100644
--- a/zircon/system/banjo/ddk-protocol-hidbus/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.hidbus/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-hidbus") {
+banjo_library("ddk.protocol.hidbus") {
sources = [
"hidbus.banjo",
]
diff --git a/zircon/system/banjo/ddk-protocol-hidbus/hidbus.banjo b/zircon/system/banjo/ddk.protocol.hidbus/hidbus.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-hidbus/hidbus.banjo
rename to zircon/system/banjo/ddk.protocol.hidbus/hidbus.banjo
diff --git a/zircon/system/banjo/ddk-protocol-i2c/BUILD.gn b/zircon/system/banjo/ddk.protocol.i2c/BUILD.gn
similarity index 86%
rename from zircon/system/banjo/ddk-protocol-i2c/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.i2c/BUILD.gn
index cdc9b0fd136c4c34bdf826368734b31e8f75d714..6a0166efed78947a14359928de1f71bde290243e 100644
--- a/zircon/system/banjo/ddk-protocol-i2c/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.i2c/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-i2c") {
+banjo_library("ddk.protocol.i2c") {
sources = [
"i2c.banjo",
]
diff --git a/zircon/system/banjo/ddk-protocol-i2c/i2c.banjo b/zircon/system/banjo/ddk.protocol.i2c/i2c.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-i2c/i2c.banjo
rename to zircon/system/banjo/ddk.protocol.i2c/i2c.banjo
diff --git a/zircon/system/banjo/ddk-protocol-i2cimpl/BUILD.gn b/zircon/system/banjo/ddk.protocol.i2cimpl/BUILD.gn
similarity index 85%
rename from zircon/system/banjo/ddk-protocol-i2cimpl/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.i2cimpl/BUILD.gn
index 15df57f6ad882e2d4dad1b91aa2ffa5ba87e541a..da67876efe80ba98538efe4a8adcdbf2c7dc1e1f 100644
--- a/zircon/system/banjo/ddk-protocol-i2cimpl/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.i2cimpl/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-i2cimpl") {
+banjo_library("ddk.protocol.i2cimpl") {
sources = [
"i2c-impl.banjo",
]
diff --git a/zircon/system/banjo/ddk-protocol-i2cimpl/i2c-impl.banjo b/zircon/system/banjo/ddk.protocol.i2cimpl/i2c-impl.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-i2cimpl/i2c-impl.banjo
rename to zircon/system/banjo/ddk.protocol.i2cimpl/i2c-impl.banjo
diff --git a/zircon/system/banjo/ddk-protocol-intelgpucore/BUILD.gn b/zircon/system/banjo/ddk.protocol.intelgpucore/BUILD.gn
similarity index 84%
rename from zircon/system/banjo/ddk-protocol-intelgpucore/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.intelgpucore/BUILD.gn
index d4ff6ffba2003cac4994f30160c2743cfd85b4cb..aafb9affdc070adbb9ac2e937e3587587a28812d 100644
--- a/zircon/system/banjo/ddk-protocol-intelgpucore/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.intelgpucore/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-intelgpucore") {
+banjo_library("ddk.protocol.intelgpucore") {
sources = [
"intel-gpu-core.banjo",
]
diff --git a/zircon/system/banjo/ddk-protocol-intelgpucore/intel-gpu-core.banjo b/zircon/system/banjo/ddk.protocol.intelgpucore/intel-gpu-core.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-intelgpucore/intel-gpu-core.banjo
rename to zircon/system/banjo/ddk.protocol.intelgpucore/intel-gpu-core.banjo
diff --git a/zircon/system/banjo/ddk-protocol-intelhda-codec/BUILD.gn b/zircon/system/banjo/ddk.protocol.intelhda.codec/BUILD.gn
similarity index 83%
rename from zircon/system/banjo/ddk-protocol-intelhda-codec/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.intelhda.codec/BUILD.gn
index 5e9abdf4c2f6318dc151e839aa8a6ab85b54f062..0e8371fb80ad93fece459aeb3af77f7614dc644e 100644
--- a/zircon/system/banjo/ddk-protocol-intelhda-codec/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.intelhda.codec/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-intelhda-codec") {
+banjo_library("ddk.protocol.intelhda.codec") {
sources = [
"intel-hda-codec.banjo",
]
diff --git a/zircon/system/banjo/ddk-protocol-intelhda-codec/intel-hda-codec.banjo b/zircon/system/banjo/ddk.protocol.intelhda.codec/intel-hda-codec.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-intelhda-codec/intel-hda-codec.banjo
rename to zircon/system/banjo/ddk.protocol.intelhda.codec/intel-hda-codec.banjo
diff --git a/zircon/system/banjo/ddk-protocol-iommu/BUILD.gn b/zircon/system/banjo/ddk.protocol.iommu/BUILD.gn
similarity index 86%
rename from zircon/system/banjo/ddk-protocol-iommu/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.iommu/BUILD.gn
index d5a93fc97f112cce70c1a4fcb88a85fdb4e248e0..2876f47906d410ae65f778e3fdd07eb635f054ef 100644
--- a/zircon/system/banjo/ddk-protocol-iommu/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.iommu/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-iommu") {
+banjo_library("ddk.protocol.iommu") {
sources = [
"iommu.banjo",
]
diff --git a/zircon/system/banjo/ddk-protocol-iommu/iommu.banjo b/zircon/system/banjo/ddk.protocol.iommu/iommu.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-iommu/iommu.banjo
rename to zircon/system/banjo/ddk.protocol.iommu/iommu.banjo
diff --git a/zircon/system/banjo/ddk-protocol-mailbox/BUILD.gn b/zircon/system/banjo/ddk.protocol.mailbox/BUILD.gn
similarity index 85%
rename from zircon/system/banjo/ddk-protocol-mailbox/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.mailbox/BUILD.gn
index 460bc623ad36f451a4a33479809d9719748f87ed..b16230aaa8ee2a196cc9fa83f5a69e0346c69fde 100644
--- a/zircon/system/banjo/ddk-protocol-mailbox/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.mailbox/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-mailbox") {
+banjo_library("ddk.protocol.mailbox") {
sources = [
"mailbox.banjo",
]
diff --git a/zircon/system/banjo/ddk-protocol-mailbox/mailbox.banjo b/zircon/system/banjo/ddk.protocol.mailbox/mailbox.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-mailbox/mailbox.banjo
rename to zircon/system/banjo/ddk.protocol.mailbox/mailbox.banjo
diff --git a/zircon/system/banjo/ddk-protocol-mipicsi/BUILD.gn b/zircon/system/banjo/ddk.protocol.mipicsi/BUILD.gn
similarity index 74%
rename from zircon/system/banjo/ddk-protocol-mipicsi/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.mipicsi/BUILD.gn
index e8c591f0a1eda7bd04d60b1ba265a08a7ebb3653..0ba175f8c58227022d431c00b975f7f80a42472e 100644
--- a/zircon/system/banjo/ddk-protocol-mipicsi/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.mipicsi/BUILD.gn
@@ -4,11 +4,11 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-mipicsi") {
+banjo_library("ddk.protocol.mipicsi") {
sources = [
"mipicsi.banjo",
]
public_deps = [
- "$zx/system/banjo/ddk-protocol-camerasensor",
+ "$zx/system/banjo/ddk.protocol.camerasensor",
]
}
diff --git a/zircon/system/banjo/ddk-protocol-mipicsi/mipicsi.banjo b/zircon/system/banjo/ddk.protocol.mipicsi/mipicsi.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-mipicsi/mipicsi.banjo
rename to zircon/system/banjo/ddk.protocol.mipicsi/mipicsi.banjo
diff --git a/zircon/system/banjo/ddk-protocol-nand/BUILD.gn b/zircon/system/banjo/ddk.protocol.nand/BUILD.gn
similarity index 76%
rename from zircon/system/banjo/ddk-protocol-nand/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.nand/BUILD.gn
index 8ff1307799b500670baf4e7522e808c136444fc7..2fa7087dcfce61930404feee9566e7668584844b 100644
--- a/zircon/system/banjo/ddk-protocol-nand/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.nand/BUILD.gn
@@ -4,11 +4,11 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-nand") {
+banjo_library("ddk.protocol.nand") {
sources = [
"nand.banjo",
]
public_deps = [
- "$zx/system/banjo/zircon-device-nand",
+ "$zx/system/banjo/zircon.device.nand",
]
}
diff --git a/zircon/system/banjo/ddk-protocol-nand/nand.banjo b/zircon/system/banjo/ddk.protocol.nand/nand.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-nand/nand.banjo
rename to zircon/system/banjo/ddk.protocol.nand/nand.banjo
diff --git a/zircon/system/banjo/ddk-protocol-pci/BUILD.gn b/zircon/system/banjo/ddk.protocol.pci/BUILD.gn
similarity index 76%
rename from zircon/system/banjo/ddk-protocol-pci/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.pci/BUILD.gn
index 105bafd9a92888571a39b9c6b22482dc31600599..5cb829e473e800952144462f00eccf9dde0e2958 100644
--- a/zircon/system/banjo/ddk-protocol-pci/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.pci/BUILD.gn
@@ -4,11 +4,11 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-pci") {
+banjo_library("ddk.protocol.pci") {
sources = [
"pci.banjo",
]
public_deps = [
- "$zx/system/banjo/zircon-syscalls-pci",
+ "$zx/system/banjo/zircon.syscalls.pci",
]
}
diff --git a/zircon/system/banjo/ddk-protocol-pci/pci.banjo b/zircon/system/banjo/ddk.protocol.pci/pci.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-pci/pci.banjo
rename to zircon/system/banjo/ddk.protocol.pci/pci.banjo
diff --git a/zircon/system/banjo/ddk-protocol-pciroot/BUILD.gn b/zircon/system/banjo/ddk.protocol.pciroot/BUILD.gn
similarity index 76%
rename from zircon/system/banjo/ddk-protocol-pciroot/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.pciroot/BUILD.gn
index 30123f6246092e09062f323c4c226af7cb818939..13bfb44b5263e0720ec9210ae6591395e8dc93d6 100644
--- a/zircon/system/banjo/ddk-protocol-pciroot/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.pciroot/BUILD.gn
@@ -4,11 +4,11 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-pciroot") {
+banjo_library("ddk.protocol.pciroot") {
sources = [
"pciroot.banjo",
]
public_deps = [
- "$zx/system/banjo/zircon-hw-pci",
+ "$zx/system/banjo/zircon.hw.pci",
]
}
diff --git a/zircon/system/banjo/ddk-protocol-pciroot/pciroot.banjo b/zircon/system/banjo/ddk.protocol.pciroot/pciroot.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-pciroot/pciroot.banjo
rename to zircon/system/banjo/ddk.protocol.pciroot/pciroot.banjo
diff --git a/zircon/system/banjo/ddk-protocol-platform-bus/BUILD.gn b/zircon/system/banjo/ddk.protocol.platform.bus/BUILD.gn
similarity index 66%
rename from zircon/system/banjo/ddk-protocol-platform-bus/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.platform.bus/BUILD.gn
index 0a0ea4d2dfe3e16ccef1d7e6fd5fc907a6a15747..8247624d58c81e7c994fcb15f8efb135885db949 100644
--- a/zircon/system/banjo/ddk-protocol-platform-bus/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.platform.bus/BUILD.gn
@@ -4,12 +4,12 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-platform-bus") {
+banjo_library("ddk.protocol.platform.bus") {
sources = [
"platform-bus.banjo",
]
public_deps = [
- "$zx/system/banjo/ddk-driver",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.driver",
+ "$zx/system/banjo/ddk.protocol.platform.device",
]
}
diff --git a/zircon/system/banjo/ddk-protocol-platform-bus/platform-bus.banjo b/zircon/system/banjo/ddk.protocol.platform.bus/platform-bus.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-platform-bus/platform-bus.banjo
rename to zircon/system/banjo/ddk.protocol.platform.bus/platform-bus.banjo
diff --git a/zircon/system/banjo/ddk-protocol-platform-device/BUILD.gn b/zircon/system/banjo/ddk.protocol.platform.device/BUILD.gn
similarity index 76%
rename from zircon/system/banjo/ddk-protocol-platform-device/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.platform.device/BUILD.gn
index f82ca331ef9f4ca430d13a37613a2394cb833734..abf121a24017e96e852f3ad99049208aca599b35 100644
--- a/zircon/system/banjo/ddk-protocol-platform-device/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.platform.device/BUILD.gn
@@ -4,11 +4,11 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-platform-device") {
+banjo_library("ddk.protocol.platform.device") {
sources = [
"platform-device.banjo",
]
public_deps = [
- "$zx/system/banjo/ddk-driver",
+ "$zx/system/banjo/ddk.driver",
]
}
diff --git a/zircon/system/banjo/ddk-protocol-platform-device/platform-device.banjo b/zircon/system/banjo/ddk.protocol.platform.device/platform-device.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-platform-device/platform-device.banjo
rename to zircon/system/banjo/ddk.protocol.platform.device/platform-device.banjo
diff --git a/zircon/system/banjo/ddk-protocol-power/BUILD.gn b/zircon/system/banjo/ddk.protocol.power/BUILD.gn
similarity index 86%
rename from zircon/system/banjo/ddk-protocol-power/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.power/BUILD.gn
index 6a78090082e740ad47ca4bed3994433eef09f3c4..858b2b68405521f562b605026b1d995a986a0135 100644
--- a/zircon/system/banjo/ddk-protocol-power/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.power/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-power") {
+banjo_library("ddk.protocol.power") {
sources = [
"power.banjo",
]
diff --git a/zircon/system/banjo/ddk-protocol-power/power.banjo b/zircon/system/banjo/ddk.protocol.power/power.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-power/power.banjo
rename to zircon/system/banjo/ddk.protocol.power/power.banjo
diff --git a/zircon/system/banjo/ddk-protocol-powerimpl/BUILD.gn b/zircon/system/banjo/ddk.protocol.powerimpl/BUILD.gn
similarity index 75%
rename from zircon/system/banjo/ddk-protocol-powerimpl/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.powerimpl/BUILD.gn
index df29ce515c7ae3aadc90466eff85686f92cf8246..e5ef53ebea568469f1bed386938bafdaff4cba06 100644
--- a/zircon/system/banjo/ddk-protocol-powerimpl/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.powerimpl/BUILD.gn
@@ -4,11 +4,11 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-powerimpl") {
+banjo_library("ddk.protocol.powerimpl") {
sources = [
"power-impl.banjo",
]
public_deps = [
- "$zx/system/banjo/ddk-protocol-power",
+ "$zx/system/banjo/ddk.protocol.power",
]
}
diff --git a/zircon/system/banjo/ddk-protocol-powerimpl/power-impl.banjo b/zircon/system/banjo/ddk.protocol.powerimpl/power-impl.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-powerimpl/power-impl.banjo
rename to zircon/system/banjo/ddk.protocol.powerimpl/power-impl.banjo
diff --git a/zircon/system/banjo/ddk-protocol-rawnand/BUILD.gn b/zircon/system/banjo/ddk.protocol.rawnand/BUILD.gn
similarity index 75%
rename from zircon/system/banjo/ddk-protocol-rawnand/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.rawnand/BUILD.gn
index e69f2ae451651e16c7f1abeb197961789c8e2562..c2d50bf3c39bced64dcc27f3a37f3ce9108c570e 100644
--- a/zircon/system/banjo/ddk-protocol-rawnand/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.rawnand/BUILD.gn
@@ -4,11 +4,11 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-rawnand") {
+banjo_library("ddk.protocol.rawnand") {
sources = [
"rawnand.banjo",
]
public_deps = [
- "$zx/system/banjo/zircon-device-nand",
+ "$zx/system/banjo/zircon.device.nand",
]
}
diff --git a/zircon/system/banjo/ddk-protocol-rawnand/rawnand.banjo b/zircon/system/banjo/ddk.protocol.rawnand/rawnand.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-rawnand/rawnand.banjo
rename to zircon/system/banjo/ddk.protocol.rawnand/rawnand.banjo
diff --git a/zircon/system/banjo/ddk-protocol-scpi/BUILD.gn b/zircon/system/banjo/ddk.protocol.scpi/BUILD.gn
similarity index 76%
rename from zircon/system/banjo/ddk-protocol-scpi/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.scpi/BUILD.gn
index 285efb598bb9a57380f8343992add125552ef566..8705842b2a12a74342866c3890ef9d359fef2378 100644
--- a/zircon/system/banjo/ddk-protocol-scpi/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.scpi/BUILD.gn
@@ -4,11 +4,11 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-scpi") {
+banjo_library("ddk.protocol.scpi") {
sources = [
"scpi.banjo",
]
public_deps = [
- "$zx/system/banjo/zircon-device-scpi",
+ "$zx/system/banjo/zircon.device.scpi",
]
}
diff --git a/zircon/system/banjo/ddk-protocol-scpi/scpi.banjo b/zircon/system/banjo/ddk.protocol.scpi/scpi.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-scpi/scpi.banjo
rename to zircon/system/banjo/ddk.protocol.scpi/scpi.banjo
diff --git a/zircon/system/banjo/ddk-protocol-sdhci/BUILD.gn b/zircon/system/banjo/ddk.protocol.sdhci/BUILD.gn
similarity index 86%
rename from zircon/system/banjo/ddk-protocol-sdhci/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.sdhci/BUILD.gn
index 04f2920f40bca4a8af89461255fe8570e137b0b5..61e91024d5f93f90ca9bc59b1a0794e409ae4dca 100644
--- a/zircon/system/banjo/ddk-protocol-sdhci/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.sdhci/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-sdhci") {
+banjo_library("ddk.protocol.sdhci") {
sources = [
"sdhci.banjo",
]
diff --git a/zircon/system/banjo/ddk-protocol-sdhci/sdhci.banjo b/zircon/system/banjo/ddk.protocol.sdhci/sdhci.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-sdhci/sdhci.banjo
rename to zircon/system/banjo/ddk.protocol.sdhci/sdhci.banjo
diff --git a/zircon/system/banjo/ddk-protocol-sdio/BUILD.gn b/zircon/system/banjo/ddk.protocol.sdio/BUILD.gn
similarity index 86%
rename from zircon/system/banjo/ddk-protocol-sdio/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.sdio/BUILD.gn
index 4923cdd7ffb404272ee36a0f1a4777fb8dc6bb5e..1c35e690e37303b3f4e5c4519c9a514d0dce97b1 100644
--- a/zircon/system/banjo/ddk-protocol-sdio/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.sdio/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-sdio") {
+banjo_library("ddk.protocol.sdio") {
sources = [
"sdio.banjo",
]
diff --git a/zircon/system/banjo/ddk-protocol-sdio/sdio.banjo b/zircon/system/banjo/ddk.protocol.sdio/sdio.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-sdio/sdio.banjo
rename to zircon/system/banjo/ddk.protocol.sdio/sdio.banjo
diff --git a/zircon/system/banjo/ddk-protocol-sdmmc/BUILD.gn b/zircon/system/banjo/ddk.protocol.sdmmc/BUILD.gn
similarity index 86%
rename from zircon/system/banjo/ddk-protocol-sdmmc/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.sdmmc/BUILD.gn
index 0957cc4a691485c37e80ed03c0a06a808c077bf4..d26f51d726110e32be4a583d63d5a79f04c2e6b1 100644
--- a/zircon/system/banjo/ddk-protocol-sdmmc/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.sdmmc/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-sdmmc") {
+banjo_library("ddk.protocol.sdmmc") {
sources = [
"sdmmc.banjo",
]
diff --git a/zircon/system/banjo/ddk-protocol-sdmmc/sdmmc.banjo b/zircon/system/banjo/ddk.protocol.sdmmc/sdmmc.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-sdmmc/sdmmc.banjo
rename to zircon/system/banjo/ddk.protocol.sdmmc/sdmmc.banjo
diff --git a/zircon/system/banjo/ddk-protocol-serial/BUILD.gn b/zircon/system/banjo/ddk.protocol.serial/BUILD.gn
similarity index 85%
rename from zircon/system/banjo/ddk-protocol-serial/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.serial/BUILD.gn
index 1b6ecd480924067bf44c710142eb41770e1970a9..92d77ac76409326df2d4a5614bc7da73981b4b14 100644
--- a/zircon/system/banjo/ddk-protocol-serial/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.serial/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-serial") {
+banjo_library("ddk.protocol.serial") {
sources = [
"serial.banjo",
]
diff --git a/zircon/system/banjo/ddk-protocol-serial/serial.banjo b/zircon/system/banjo/ddk.protocol.serial/serial.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-serial/serial.banjo
rename to zircon/system/banjo/ddk.protocol.serial/serial.banjo
diff --git a/zircon/system/banjo/ddk-protocol-serialimpl/BUILD.gn b/zircon/system/banjo/ddk.protocol.serialimpl/BUILD.gn
similarity index 75%
rename from zircon/system/banjo/ddk-protocol-serialimpl/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.serialimpl/BUILD.gn
index b8ba656d0d8b27f2602253cf4b3798aa2dc42814..ab0c503064a487f40c5d466a98b3993145683308 100644
--- a/zircon/system/banjo/ddk-protocol-serialimpl/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.serialimpl/BUILD.gn
@@ -4,11 +4,11 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-serialimpl") {
+banjo_library("ddk.protocol.serialimpl") {
sources = [
"serial-impl.banjo",
]
public_deps = [
- "$zx/system/banjo/ddk-protocol-serial",
+ "$zx/system/banjo/ddk.protocol.serial",
]
}
diff --git a/zircon/system/banjo/ddk-protocol-serialimpl/serial-impl.banjo b/zircon/system/banjo/ddk.protocol.serialimpl/serial-impl.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-serialimpl/serial-impl.banjo
rename to zircon/system/banjo/ddk.protocol.serialimpl/serial-impl.banjo
diff --git a/zircon/system/banjo/ddk-protocol-sysmem/BUILD.gn b/zircon/system/banjo/ddk.protocol.sysmem/BUILD.gn
similarity index 85%
rename from zircon/system/banjo/ddk-protocol-sysmem/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.sysmem/BUILD.gn
index 8a4f798d768812d1f28c08791e79aa57277f455a..1b0f9d90ab6659b09494c4c8937fb44f219de425 100644
--- a/zircon/system/banjo/ddk-protocol-sysmem/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.sysmem/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-sysmem") {
+banjo_library("ddk.protocol.sysmem") {
sources = [
"sysmem.banjo",
]
diff --git a/zircon/system/banjo/ddk-protocol-sysmem/sysmem.banjo b/zircon/system/banjo/ddk.protocol.sysmem/sysmem.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-sysmem/sysmem.banjo
rename to zircon/system/banjo/ddk.protocol.sysmem/sysmem.banjo
diff --git a/zircon/system/banjo/ddk-protocol-test/BUILD.gn b/zircon/system/banjo/ddk.protocol.test/BUILD.gn
similarity index 86%
rename from zircon/system/banjo/ddk-protocol-test/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.test/BUILD.gn
index 36f9785108cc143afb6ed1a5d8933550eed888c7..7b56486d07da3470bb4643336186770d379377fe 100644
--- a/zircon/system/banjo/ddk-protocol-test/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.test/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-test") {
+banjo_library("ddk.protocol.test") {
sources = [
"test.banjo",
]
diff --git a/zircon/system/banjo/ddk-protocol-test/test.banjo b/zircon/system/banjo/ddk.protocol.test/test.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-test/test.banjo
rename to zircon/system/banjo/ddk.protocol.test/test.banjo
diff --git a/zircon/system/banjo/ddk-protocol-usb-bus/BUILD.gn b/zircon/system/banjo/ddk.protocol.usb.bus/BUILD.gn
similarity index 56%
rename from zircon/system/banjo/ddk-protocol-usb-bus/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.usb.bus/BUILD.gn
index 1433ee85e06c9bc7cdaafa27e6a4907bc6ffdfc3..8147848c339c6bda1fc64fe6fb0490e082257346 100644
--- a/zircon/system/banjo/ddk-protocol-usb-bus/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.usb.bus/BUILD.gn
@@ -4,14 +4,14 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-usb-bus") {
+banjo_library("ddk.protocol.usb.bus") {
sources = [
"usb-bus.banjo",
]
public_deps = [
- "$zx/system/banjo/ddk-driver",
- "$zx/system/banjo/ddk-protocol-usb-hub",
- "$zx/system/banjo/zircon-hw-usb",
- "$zx/system/banjo/zircon-hw-usb-hub",
+ "$zx/system/banjo/ddk.driver",
+ "$zx/system/banjo/ddk.protocol.usb.hub",
+ "$zx/system/banjo/zircon.hw.usb",
+ "$zx/system/banjo/zircon.hw.usb.hub",
]
}
diff --git a/zircon/system/banjo/ddk-protocol-usb-bus/usb-bus.banjo b/zircon/system/banjo/ddk.protocol.usb.bus/usb-bus.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-usb-bus/usb-bus.banjo
rename to zircon/system/banjo/ddk.protocol.usb.bus/usb-bus.banjo
diff --git a/zircon/system/banjo/ddk-protocol-usb-composite/BUILD.gn b/zircon/system/banjo/ddk.protocol.usb.composite/BUILD.gn
similarity index 76%
rename from zircon/system/banjo/ddk-protocol-usb-composite/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.usb.composite/BUILD.gn
index bc201bdecb418bdcecdfb077676e6c1b5f15ad1b..b1570cb6a864647ec233dd367779d41736e59895 100644
--- a/zircon/system/banjo/ddk-protocol-usb-composite/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.usb.composite/BUILD.gn
@@ -4,11 +4,11 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-usb-composite") {
+banjo_library("ddk.protocol.usb.composite") {
sources = [
"usb-composite.banjo",
]
public_deps = [
- "$zx/system/banjo/zircon-hw-usb",
+ "$zx/system/banjo/zircon.hw.usb",
]
}
diff --git a/zircon/system/banjo/ddk-protocol-usb-composite/usb-composite.banjo b/zircon/system/banjo/ddk.protocol.usb.composite/usb-composite.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-usb-composite/usb-composite.banjo
rename to zircon/system/banjo/ddk.protocol.usb.composite/usb-composite.banjo
diff --git a/zircon/system/banjo/ddk-protocol-usb-dci/BUILD.gn b/zircon/system/banjo/ddk.protocol.usb.dci/BUILD.gn
similarity index 61%
rename from zircon/system/banjo/ddk-protocol-usb-dci/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.usb.dci/BUILD.gn
index 2d317bad2e26fc51e8a054e03ea68224e9d2cf03..dd481fa4ad0cdda52d28871ddc1100f2f9dfbf89 100644
--- a/zircon/system/banjo/ddk-protocol-usb-dci/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.usb.dci/BUILD.gn
@@ -4,13 +4,13 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-usb-dci") {
+banjo_library("ddk.protocol.usb.dci") {
sources = [
"usb-dci.banjo",
]
public_deps = [
- "$zx/system/banjo/ddk-physiter",
- "$zx/system/banjo/ddk-protocol-usb-request",
- "$zx/system/banjo/zircon-hw-usb",
+ "$zx/system/banjo/ddk.physiter",
+ "$zx/system/banjo/ddk.protocol.usb.request",
+ "$zx/system/banjo/zircon.hw.usb",
]
}
diff --git a/zircon/system/banjo/ddk-protocol-usb-dci/usb-dci.banjo b/zircon/system/banjo/ddk.protocol.usb.dci/usb-dci.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-usb-dci/usb-dci.banjo
rename to zircon/system/banjo/ddk.protocol.usb.dci/usb-dci.banjo
diff --git a/zircon/system/banjo/ddk-protocol-usb-function/BUILD.gn b/zircon/system/banjo/ddk.protocol.usb.function/BUILD.gn
similarity index 61%
rename from zircon/system/banjo/ddk-protocol-usb-function/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.usb.function/BUILD.gn
index eeec664a9aaa52627ba8febf698c12e2de45149c..90315995a964e4ef0960ea5213d00e3b0afed757 100644
--- a/zircon/system/banjo/ddk-protocol-usb-function/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.usb.function/BUILD.gn
@@ -4,13 +4,13 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-usb-function") {
+banjo_library("ddk.protocol.usb.function") {
sources = [
"usb-function.banjo",
]
public_deps = [
- "$zx/system/banjo/ddk-physiter",
- "$zx/system/banjo/ddk-protocol-usb-request",
- "$zx/system/banjo/zircon-hw-usb",
+ "$zx/system/banjo/ddk.physiter",
+ "$zx/system/banjo/ddk.protocol.usb.request",
+ "$zx/system/banjo/zircon.hw.usb",
]
}
diff --git a/zircon/system/banjo/ddk-protocol-usb-function/usb-function.banjo b/zircon/system/banjo/ddk.protocol.usb.function/usb-function.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-usb-function/usb-function.banjo
rename to zircon/system/banjo/ddk.protocol.usb.function/usb-function.banjo
diff --git a/zircon/system/banjo/ddk.protocol.usb.hci/BUILD.gn b/zircon/system/banjo/ddk.protocol.usb.hci/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..f4308f5f8b227d413b515db6c93a2310bc096a43
--- /dev/null
+++ b/zircon/system/banjo/ddk.protocol.usb.hci/BUILD.gn
@@ -0,0 +1,19 @@
+# Copyright 2019 The Fuchsia Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("$zx/public/gn/banjo.gni")
+
+banjo_library("ddk.protocol.usb.hci") {
+ sources = [
+ "usb-hci.banjo",
+ ]
+ public_deps = [
+ "$zx/system/banjo/ddk.physiter",
+ "$zx/system/banjo/ddk.protocol.usb.bus",
+ "$zx/system/banjo/ddk.protocol.usb.hub",
+ "$zx/system/banjo/ddk.protocol.usb.request",
+ "$zx/system/banjo/zircon.hw.usb",
+ "$zx/system/banjo/zircon.hw.usb.hub",
+ ]
+}
diff --git a/zircon/system/banjo/ddk-protocol-usb-hci/usb-hci.banjo b/zircon/system/banjo/ddk.protocol.usb.hci/usb-hci.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-usb-hci/usb-hci.banjo
rename to zircon/system/banjo/ddk.protocol.usb.hci/usb-hci.banjo
diff --git a/zircon/system/banjo/ddk-protocol-usb-hub/BUILD.gn b/zircon/system/banjo/ddk.protocol.usb.hub/BUILD.gn
similarity index 85%
rename from zircon/system/banjo/ddk-protocol-usb-hub/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.usb.hub/BUILD.gn
index d162379562fa4b4bd9be7a4536b9466c10e900fd..41b173ef13a478918825bfb8e2fe20c119136a52 100644
--- a/zircon/system/banjo/ddk-protocol-usb-hub/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.usb.hub/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-usb-hub") {
+banjo_library("ddk.protocol.usb.hub") {
sources = [
"usb-hub.banjo",
]
diff --git a/zircon/system/banjo/ddk-protocol-usb-hub/usb-hub.banjo b/zircon/system/banjo/ddk.protocol.usb.hub/usb-hub.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-usb-hub/usb-hub.banjo
rename to zircon/system/banjo/ddk.protocol.usb.hub/usb-hub.banjo
diff --git a/zircon/system/banjo/ddk-protocol-usb-modeswitch/BUILD.gn b/zircon/system/banjo/ddk.protocol.usb.modeswitch/BUILD.gn
similarity index 83%
rename from zircon/system/banjo/ddk-protocol-usb-modeswitch/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.usb.modeswitch/BUILD.gn
index e35706d0686bf96c293f7e6aac939e175b6a8640..f463136bd8480d71ad2d19dcfbdcc11074bd7c14 100644
--- a/zircon/system/banjo/ddk-protocol-usb-modeswitch/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.usb.modeswitch/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-usb-modeswitch") {
+banjo_library("ddk.protocol.usb.modeswitch") {
sources = [
"usb-mode-switch.banjo",
]
diff --git a/zircon/system/banjo/ddk-protocol-usb-modeswitch/usb-mode-switch.banjo b/zircon/system/banjo/ddk.protocol.usb.modeswitch/usb-mode-switch.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-usb-modeswitch/usb-mode-switch.banjo
rename to zircon/system/banjo/ddk.protocol.usb.modeswitch/usb-mode-switch.banjo
diff --git a/zircon/system/banjo/ddk-protocol-usb-request/BUILD.gn b/zircon/system/banjo/ddk.protocol.usb.request/BUILD.gn
similarity index 68%
rename from zircon/system/banjo/ddk-protocol-usb-request/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.usb.request/BUILD.gn
index c70b8f4e77f566292efafa9d7ce3445a1613687d..da8600036ce7c27dc529c8c3528428b302b997b6 100644
--- a/zircon/system/banjo/ddk-protocol-usb-request/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.usb.request/BUILD.gn
@@ -4,12 +4,12 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-usb-request") {
+banjo_library("ddk.protocol.usb.request") {
sources = [
"usb-request.banjo",
]
public_deps = [
- "$zx/system/banjo/ddk-physiter",
- "$zx/system/banjo/zircon-hw-usb",
+ "$zx/system/banjo/ddk.physiter",
+ "$zx/system/banjo/zircon.hw.usb",
]
}
diff --git a/zircon/system/banjo/ddk-protocol-usb-request/usb-request.banjo b/zircon/system/banjo/ddk.protocol.usb.request/usb-request.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-usb-request/usb-request.banjo
rename to zircon/system/banjo/ddk.protocol.usb.request/usb-request.banjo
diff --git a/zircon/system/banjo/ddk-protocol-usb/BUILD.gn b/zircon/system/banjo/ddk.protocol.usb/BUILD.gn
similarity index 61%
rename from zircon/system/banjo/ddk-protocol-usb/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.usb/BUILD.gn
index 6ac6af6657009cc8b8aa141ccbd5f9bc8e2ee817..3fa1af50cc88e63d08ddf1e363854cd4bef1ee35 100644
--- a/zircon/system/banjo/ddk-protocol-usb/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.usb/BUILD.gn
@@ -4,13 +4,13 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("ddk-protocol-usb") {
+banjo_library("ddk.protocol.usb") {
sources = [
"usb.banjo",
]
public_deps = [
- "$zx/system/banjo/ddk-physiter",
- "$zx/system/banjo/ddk-protocol-usb-request",
- "$zx/system/banjo/zircon-hw-usb",
+ "$zx/system/banjo/ddk.physiter",
+ "$zx/system/banjo/ddk.protocol.usb.request",
+ "$zx/system/banjo/zircon.hw.usb",
]
}
diff --git a/zircon/system/banjo/ddk-protocol-usb/usb.banjo b/zircon/system/banjo/ddk.protocol.usb/usb.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-usb/usb.banjo
rename to zircon/system/banjo/ddk.protocol.usb/usb.banjo
diff --git a/zircon/system/banjo/zircon-device-audio/BUILD.gn b/zircon/system/banjo/zircon.device.audio/BUILD.gn
similarity index 85%
rename from zircon/system/banjo/zircon-device-audio/BUILD.gn
rename to zircon/system/banjo/zircon.device.audio/BUILD.gn
index 4a8e59061a5f25f57be62e9c6ebb415ec2ba6d00..c3c4daa8d4f8589f4b0e7ad859b7b828b1518e08 100644
--- a/zircon/system/banjo/zircon-device-audio/BUILD.gn
+++ b/zircon/system/banjo/zircon.device.audio/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("zircon-device-audio") {
+banjo_library("zircon.device.audio") {
sources = [
"audio.banjo",
]
diff --git a/zircon/system/banjo/zircon-device-audio/audio.banjo b/zircon/system/banjo/zircon.device.audio/audio.banjo
similarity index 100%
rename from zircon/system/banjo/zircon-device-audio/audio.banjo
rename to zircon/system/banjo/zircon.device.audio/audio.banjo
diff --git a/zircon/system/banjo/zircon-device-block/BUILD.gn b/zircon/system/banjo/zircon.device.block/BUILD.gn
similarity index 85%
rename from zircon/system/banjo/zircon-device-block/BUILD.gn
rename to zircon/system/banjo/zircon.device.block/BUILD.gn
index 458befc9321167a84398a7e5a64f8c402dbdc2bc..f6c94d5824b83e2dd591c221d300a28e7f7af268 100644
--- a/zircon/system/banjo/zircon-device-block/BUILD.gn
+++ b/zircon/system/banjo/zircon.device.block/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("zircon-device-block") {
+banjo_library("zircon.device.block") {
sources = [
"block.banjo",
]
diff --git a/zircon/system/banjo/zircon-device-block/block.banjo b/zircon/system/banjo/zircon.device.block/block.banjo
similarity index 100%
rename from zircon/system/banjo/zircon-device-block/block.banjo
rename to zircon/system/banjo/zircon.device.block/block.banjo
diff --git a/zircon/system/banjo/zircon-device-nand/BUILD.gn b/zircon/system/banjo/zircon.device.nand/BUILD.gn
similarity index 86%
rename from zircon/system/banjo/zircon-device-nand/BUILD.gn
rename to zircon/system/banjo/zircon.device.nand/BUILD.gn
index 9fe2b8cd8cd08f408a3721b5a7925247e735e426..8dbfa020f360d04f72a9e80b22fac5df69b579d6 100644
--- a/zircon/system/banjo/zircon-device-nand/BUILD.gn
+++ b/zircon/system/banjo/zircon.device.nand/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("zircon-device-nand") {
+banjo_library("zircon.device.nand") {
sources = [
"nand.banjo",
]
diff --git a/zircon/system/banjo/zircon-device-nand/nand.banjo b/zircon/system/banjo/zircon.device.nand/nand.banjo
similarity index 100%
rename from zircon/system/banjo/zircon-device-nand/nand.banjo
rename to zircon/system/banjo/zircon.device.nand/nand.banjo
diff --git a/zircon/system/banjo/zircon-device-scpi/BUILD.gn b/zircon/system/banjo/zircon.device.scpi/BUILD.gn
similarity index 86%
rename from zircon/system/banjo/zircon-device-scpi/BUILD.gn
rename to zircon/system/banjo/zircon.device.scpi/BUILD.gn
index 77763142a76bb3babf320949d6e7a7f538d60ef0..611ececf68a9bd66d25d53b5c7724660ed3c48ce 100644
--- a/zircon/system/banjo/zircon-device-scpi/BUILD.gn
+++ b/zircon/system/banjo/zircon.device.scpi/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("zircon-device-scpi") {
+banjo_library("zircon.device.scpi") {
sources = [
"scpi.banjo",
]
diff --git a/zircon/system/banjo/zircon-device-scpi/scpi.banjo b/zircon/system/banjo/zircon.device.scpi/scpi.banjo
similarity index 100%
rename from zircon/system/banjo/zircon-device-scpi/scpi.banjo
rename to zircon/system/banjo/zircon.device.scpi/scpi.banjo
diff --git a/zircon/system/banjo/zircon-hw-pci/BUILD.gn b/zircon/system/banjo/zircon.hw.pci/BUILD.gn
similarity index 87%
rename from zircon/system/banjo/zircon-hw-pci/BUILD.gn
rename to zircon/system/banjo/zircon.hw.pci/BUILD.gn
index 526b507ae28d7325eae6140ad2a7b0a2600c8ff9..c70efc2ab599881d27b7b7338f881fd68457dca3 100644
--- a/zircon/system/banjo/zircon-hw-pci/BUILD.gn
+++ b/zircon/system/banjo/zircon.hw.pci/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("zircon-hw-pci") {
+banjo_library("zircon.hw.pci") {
sources = [
"hwpci.banjo",
]
diff --git a/zircon/system/banjo/zircon-hw-pci/hwpci.banjo b/zircon/system/banjo/zircon.hw.pci/hwpci.banjo
similarity index 100%
rename from zircon/system/banjo/zircon-hw-pci/hwpci.banjo
rename to zircon/system/banjo/zircon.hw.pci/hwpci.banjo
diff --git a/zircon/system/banjo/zircon-hw-usb-hub/BUILD.gn b/zircon/system/banjo/zircon.hw.usb.hub/BUILD.gn
similarity index 86%
rename from zircon/system/banjo/zircon-hw-usb-hub/BUILD.gn
rename to zircon/system/banjo/zircon.hw.usb.hub/BUILD.gn
index 59cc515e42d5c177aaa8baec26575ad46387da14..d6164cc53927b5ed71d56ec1569ceaf83d70343e 100644
--- a/zircon/system/banjo/zircon-hw-usb-hub/BUILD.gn
+++ b/zircon/system/banjo/zircon.hw.usb.hub/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("zircon-hw-usb-hub") {
+banjo_library("zircon.hw.usb.hub") {
sources = [
"usb-hub.banjo",
]
diff --git a/zircon/system/banjo/zircon-hw-usb-hub/usb-hub.banjo b/zircon/system/banjo/zircon.hw.usb.hub/usb-hub.banjo
similarity index 100%
rename from zircon/system/banjo/zircon-hw-usb-hub/usb-hub.banjo
rename to zircon/system/banjo/zircon.hw.usb.hub/usb-hub.banjo
diff --git a/zircon/system/banjo/zircon-hw-usb/BUILD.gn b/zircon/system/banjo/zircon.hw.usb/BUILD.gn
similarity index 87%
rename from zircon/system/banjo/zircon-hw-usb/BUILD.gn
rename to zircon/system/banjo/zircon.hw.usb/BUILD.gn
index 73e78e4b9a77eda834bc378174b14795475a6879..26c8eb3cb34e551f271a293041879ea87ee744ee 100644
--- a/zircon/system/banjo/zircon-hw-usb/BUILD.gn
+++ b/zircon/system/banjo/zircon.hw.usb/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("zircon-hw-usb") {
+banjo_library("zircon.hw.usb") {
sources = [
"usb.banjo",
]
diff --git a/zircon/system/banjo/zircon-hw-usb/usb.banjo b/zircon/system/banjo/zircon.hw.usb/usb.banjo
similarity index 100%
rename from zircon/system/banjo/zircon-hw-usb/usb.banjo
rename to zircon/system/banjo/zircon.hw.usb/usb.banjo
diff --git a/zircon/system/banjo/zircon-syscalls-pci/BUILD.gn b/zircon/system/banjo/zircon.syscalls.pci/BUILD.gn
similarity index 85%
rename from zircon/system/banjo/zircon-syscalls-pci/BUILD.gn
rename to zircon/system/banjo/zircon.syscalls.pci/BUILD.gn
index b576bf7ca03ac9a6944a298e0eada9eaa814cf22..2ce6a7de47827bf0a4653a8398f20e85207c552f 100644
--- a/zircon/system/banjo/zircon-syscalls-pci/BUILD.gn
+++ b/zircon/system/banjo/zircon.syscalls.pci/BUILD.gn
@@ -4,7 +4,7 @@
import("$zx/public/gn/banjo.gni")
-banjo_library("zircon-syscalls-pci") {
+banjo_library("zircon.syscalls.pci") {
sources = [
"pci.banjo",
]
diff --git a/zircon/system/banjo/zircon-syscalls-pci/pci.banjo b/zircon/system/banjo/zircon.syscalls.pci/pci.banjo
similarity index 100%
rename from zircon/system/banjo/zircon-syscalls-pci/pci.banjo
rename to zircon/system/banjo/zircon.syscalls.pci/pci.banjo
diff --git a/zircon/system/core/devmgr/component/BUILD.gn b/zircon/system/core/devmgr/component/BUILD.gn
index 6fab0fc661a394ea122cfb5e71889e08e2795b05..fbd09bba645f962129804ce9b29c41588927f99f 100644
--- a/zircon/system/core/devmgr/component/BUILD.gn
+++ b/zircon/system/core/devmgr/component/BUILD.gn
@@ -10,16 +10,16 @@ driver("component") {
":component.proxy",
]
deps = [
- "$zx/system/banjo/ddk-protocol-amlogiccanvas",
- "$zx/system/banjo/ddk-protocol-clock",
- "$zx/system/banjo/ddk-protocol-ethernet-board",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-mipicsi",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-power",
- "$zx/system/banjo/ddk-protocol-sysmem",
- "$zx/system/banjo/ddk-protocol-usb-modeswitch",
+ "$zx/system/banjo/ddk.protocol.amlogiccanvas",
+ "$zx/system/banjo/ddk.protocol.clock",
+ "$zx/system/banjo/ddk.protocol.ethernet.board",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.mipicsi",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.power",
+ "$zx/system/banjo/ddk.protocol.sysmem",
+ "$zx/system/banjo/ddk.protocol.usb.modeswitch",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
"$zx/system/ulib/fbl",
@@ -35,16 +35,16 @@ driver("component.proxy") {
"component-proxy.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-amlogiccanvas",
- "$zx/system/banjo/ddk-protocol-clock",
- "$zx/system/banjo/ddk-protocol-ethernet-board",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-mipicsi",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-power",
- "$zx/system/banjo/ddk-protocol-sysmem",
- "$zx/system/banjo/ddk-protocol-usb-modeswitch",
+ "$zx/system/banjo/ddk.protocol.amlogiccanvas",
+ "$zx/system/banjo/ddk.protocol.clock",
+ "$zx/system/banjo/ddk.protocol.ethernet.board",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.mipicsi",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.power",
+ "$zx/system/banjo/ddk.protocol.sysmem",
+ "$zx/system/banjo/ddk.protocol.usb.modeswitch",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
"$zx/system/ulib/fbl",
diff --git a/zircon/system/core/devmgr/devhost/BUILD.gn b/zircon/system/core/devmgr/devhost/BUILD.gn
index e04dc350c4bdfcbc39b943a87dfeb0c98c4dcf10..3660c41556874430ecce483f2cda29322f6b1876 100644
--- a/zircon/system/core/devmgr/devhost/BUILD.gn
+++ b/zircon/system/core/devmgr/devhost/BUILD.gn
@@ -29,7 +29,7 @@ library("driver") {
]
configs += [ "$zx/public/gn/config:visibility_hidden" ]
deps = [
- "$zx/system/banjo/ddk-protocol-composite",
+ "$zx/system/banjo/ddk.protocol.composite",
"$zx/system/fidl/fuchsia-device:c",
"$zx/system/fidl/fuchsia-device-manager:c",
"$zx/system/fidl/fuchsia-io:c",
diff --git a/zircon/system/dev/audio/astro-pdm-input/BUILD.gn b/zircon/system/dev/audio/astro-pdm-input/BUILD.gn
index 23c12b78aa7443ad378b0476c10ade5525ff109f..a5ac4a1b3ce8e35398e995bf3e575551ab0c1032 100644
--- a/zircon/system/dev/audio/astro-pdm-input/BUILD.gn
+++ b/zircon/system/dev/audio/astro-pdm-input/BUILD.gn
@@ -7,10 +7,10 @@ driver("astro-pdm-input") {
"audio-stream-in.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-clock",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.clock",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/dev/audio/lib/simple-audio-stream",
"$zx/system/dev/lib/amlogic",
"$zx/system/dev/lib/mmio",
diff --git a/zircon/system/dev/audio/astro-tdm-output/BUILD.gn b/zircon/system/dev/audio/astro-tdm-output/BUILD.gn
index a20f01646c726ef73eca8182e54e529c16d6c9d0..4dca6d2cc5d2d5956d6e5e184e067e4beaf8583d 100644
--- a/zircon/system/dev/audio/astro-tdm-output/BUILD.gn
+++ b/zircon/system/dev/audio/astro-tdm-output/BUILD.gn
@@ -8,10 +8,10 @@ driver("astro-tdm-output") {
"tas27xx.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-composite",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.composite",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/dev/audio/lib/simple-audio-stream",
"$zx/system/dev/lib/amlogic",
"$zx/system/dev/lib/mmio",
diff --git a/zircon/system/dev/audio/gauss-pdm-input/BUILD.gn b/zircon/system/dev/audio/gauss-pdm-input/BUILD.gn
index 3996098923bb5b5fdb3f95d139b91db4ad2bb133..471fca438d25ae08f24be9c18d12374b00b538fd 100644
--- a/zircon/system/dev/audio/gauss-pdm-input/BUILD.gn
+++ b/zircon/system/dev/audio/gauss-pdm-input/BUILD.gn
@@ -12,7 +12,7 @@ driver("gauss-pdm-input") {
"vmo_helper.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/fidl/fuchsia-hardware-audio:c",
"$zx/system/ulib/audio-driver-proto",
"$zx/system/ulib/audio-proto-utils",
diff --git a/zircon/system/dev/audio/gauss-tdm/BUILD.gn b/zircon/system/dev/audio/gauss-tdm/BUILD.gn
index ea3490ca5ee590f95d4a303738142459a253f6fd..c40366e09332129a98f9827a1ffee33767f74c7f 100644
--- a/zircon/system/dev/audio/gauss-tdm/BUILD.gn
+++ b/zircon/system/dev/audio/gauss-tdm/BUILD.gn
@@ -9,9 +9,9 @@ driver("gauss-tdm") {
"tas57xx.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-composite",
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.composite",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/dev/lib/amlogic",
"$zx/system/dev/lib/mmio",
"$zx/system/fidl/fuchsia-hardware-audio:c",
diff --git a/zircon/system/dev/audio/intel-hda/codecs/qemu/BUILD.gn b/zircon/system/dev/audio/intel-hda/codecs/qemu/BUILD.gn
index 78250ff467b3899f09ddf88b6914646b424875f6..b6e4aaaeb90a7186ad622b1bbfc35e99c16cd01c 100644
--- a/zircon/system/dev/audio/intel-hda/codecs/qemu/BUILD.gn
+++ b/zircon/system/dev/audio/intel-hda/codecs/qemu/BUILD.gn
@@ -15,8 +15,8 @@ driver("qemu-audio") {
"qemu-stream.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-intelhda-codec",
- "$zx/system/banjo/ddk-protocol-pci",
+ "$zx/system/banjo/ddk.protocol.intelhda.codec",
+ "$zx/system/banjo/ddk.protocol.pci",
"$zx/system/ulib/audio-driver-proto",
"$zx/system/ulib/audio-proto-utils",
"$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/audio/intel-hda/codecs/realtek/BUILD.gn b/zircon/system/dev/audio/intel-hda/codecs/realtek/BUILD.gn
index c6550e32d1d2ebd660adab98e43a72cfe1c7a30f..87f044096c8add7001be5dc81fece66795ef2804 100644
--- a/zircon/system/dev/audio/intel-hda/codecs/realtek/BUILD.gn
+++ b/zircon/system/dev/audio/intel-hda/codecs/realtek/BUILD.gn
@@ -9,7 +9,7 @@ driver("realtek") {
"realtek-stream.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-pci",
+ "$zx/system/banjo/ddk.protocol.pci",
"$zx/system/ulib/audio-driver-proto",
"$zx/system/ulib/audio-proto-utils",
"$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/audio/intel-hda/controller/BUILD.gn b/zircon/system/dev/audio/intel-hda/controller/BUILD.gn
index 611be395b70b6e655943cc51c7b2d2579ba81f72..e51309b8ef4a9b11d5cd8ef335482c0750d96192 100644
--- a/zircon/system/dev/audio/intel-hda/controller/BUILD.gn
+++ b/zircon/system/dev/audio/intel-hda/controller/BUILD.gn
@@ -35,8 +35,8 @@ driver("controller") {
"utils.h",
]
deps = [
- "$zx/system/banjo/ddk-protocol-intelhda-codec",
- "$zx/system/banjo/ddk-protocol-pci",
+ "$zx/system/banjo/ddk.protocol.intelhda.codec",
+ "$zx/system/banjo/ddk.protocol.pci",
"$zx/system/fidl/fuchsia-hardware-intel-hda:c",
"$zx/system/ulib/audio-driver-proto",
"$zx/system/ulib/audio-proto-utils",
diff --git a/zircon/system/dev/audio/mt8167-tdm-input/BUILD.gn b/zircon/system/dev/audio/mt8167-tdm-input/BUILD.gn
index 944167e11b81a6428bf2dfbaa5b6b362370af93a..107130dd2155a5acf6fe91a2d63c054f2e36db37 100644
--- a/zircon/system/dev/audio/mt8167-tdm-input/BUILD.gn
+++ b/zircon/system/dev/audio/mt8167-tdm-input/BUILD.gn
@@ -8,10 +8,10 @@ driver("mt8167-tdm-input") {
"tlv320adc.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-composite",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.composite",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/dev/audio/lib/simple-audio-stream",
"$zx/system/dev/lib/mmio",
"$zx/system/dev/lib/mt8167",
diff --git a/zircon/system/dev/audio/mt8167-tdm-output/BUILD.gn b/zircon/system/dev/audio/mt8167-tdm-output/BUILD.gn
index fbcf042e54d4afdfaec622ec4879cbd90d9614db..d30cec8332d4b5388e192884f62241937ffb1c00 100644
--- a/zircon/system/dev/audio/mt8167-tdm-output/BUILD.gn
+++ b/zircon/system/dev/audio/mt8167-tdm-output/BUILD.gn
@@ -9,10 +9,10 @@ driver("mt8167-tdm-output") {
"tas5805.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-composite",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.composite",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/dev/audio/lib/simple-audio-stream",
"$zx/system/dev/lib/mmio",
"$zx/system/dev/lib/mt8167",
diff --git a/zircon/system/dev/audio/sherlock-pdm-input/BUILD.gn b/zircon/system/dev/audio/sherlock-pdm-input/BUILD.gn
index 62b56a371835234f5d508e9d51d9e9aadff7bfde..62a82068b2058badcbab8e1a044d622a4e097df4 100644
--- a/zircon/system/dev/audio/sherlock-pdm-input/BUILD.gn
+++ b/zircon/system/dev/audio/sherlock-pdm-input/BUILD.gn
@@ -8,10 +8,10 @@ driver("sherlock-pdm-input") {
"binding.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-clock",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.clock",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/dev/audio/lib/simple-audio-stream",
"$zx/system/dev/lib/amlogic",
"$zx/system/dev/lib/mmio",
diff --git a/zircon/system/dev/audio/sherlock-tdm-output/BUILD.gn b/zircon/system/dev/audio/sherlock-tdm-output/BUILD.gn
index 8e7191ab5d71c73b08d9668ff8d11438a185de71..bff7bfd7424b271c8836fab5ce00ca2f68ae53d3 100644
--- a/zircon/system/dev/audio/sherlock-tdm-output/BUILD.gn
+++ b/zircon/system/dev/audio/sherlock-tdm-output/BUILD.gn
@@ -9,11 +9,11 @@ driver("sherlock-tdm-output") {
"tas5760.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-composite",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.composite",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/dev/audio/lib/codec-interface",
"$zx/system/dev/audio/lib/simple-audio-stream",
"$zx/system/dev/lib/amlogic",
diff --git a/zircon/system/dev/audio/usb-audio/BUILD.gn b/zircon/system/dev/audio/usb-audio/BUILD.gn
index f8bc101b4a91ae6908681633f5b0633cdc0bb359..04ca93ed687e20666985ccd69e4c08de6f24c673 100644
--- a/zircon/system/dev/audio/usb-audio/BUILD.gn
+++ b/zircon/system/dev/audio/usb-audio/BUILD.gn
@@ -17,9 +17,9 @@ driver("usb-audio") {
"usb-midi-source.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-usb",
- "$zx/system/banjo/ddk-protocol-usb-composite",
- "$zx/system/banjo/ddk-protocol-usb-request",
+ "$zx/system/banjo/ddk.protocol.usb",
+ "$zx/system/banjo/ddk.protocol.usb.composite",
+ "$zx/system/banjo/ddk.protocol.usb.request",
"$zx/system/dev/lib/usb",
"$zx/system/fidl/fuchsia-hardware-audio:c",
"$zx/system/ulib/audio-driver-proto",
diff --git a/zircon/system/dev/backlight/sg-micro/BUILD.gn b/zircon/system/dev/backlight/sg-micro/BUILD.gn
index f3ce1a014d6795806352c9f5481b974d46368fff..57a8cff77c4f0df2c84fddc4d5bb2fd2e0014972 100644
--- a/zircon/system/dev/backlight/sg-micro/BUILD.gn
+++ b/zircon/system/dev/backlight/sg-micro/BUILD.gn
@@ -7,9 +7,9 @@ driver("sg-micro") {
"sgm37603a.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-composite",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-i2c",
+ "$zx/system/banjo/ddk.protocol.composite",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.i2c",
"$zx/system/dev/lib/mmio",
"$zx/system/fidl/fuchsia-hardware-backlight:c",
"$zx/system/ulib/ddk",
@@ -30,7 +30,7 @@ test("sgm37603a-test") {
"sgm37603a.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-composite",
+ "$zx/system/banjo/ddk.protocol.composite",
"$zx/system/dev/lib/mock-i2c",
"$zx/system/fidl/fuchsia-hardware-backlight:c",
"$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/backlight/ti-lp8556/BUILD.gn b/zircon/system/dev/backlight/ti-lp8556/BUILD.gn
index b855728584c490b888d16d99e17fd6f88db0be66..e5e8799e4aa865c479913a8888d3831caa99a472 100644
--- a/zircon/system/dev/backlight/ti-lp8556/BUILD.gn
+++ b/zircon/system/dev/backlight/ti-lp8556/BUILD.gn
@@ -7,9 +7,9 @@ driver("ti-lp8556") {
"ti-lp8556.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/fidl/fuchsia-hardware-backlight:c",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/block/ahci/BUILD.gn b/zircon/system/dev/block/ahci/BUILD.gn
index 9d5bcfcb91508996b279f32f1581827990412690..43e510b9b8accf602af43989c51ad0c34aab4dc5 100644
--- a/zircon/system/dev/block/ahci/BUILD.gn
+++ b/zircon/system/dev/block/ahci/BUILD.gn
@@ -8,8 +8,8 @@ driver("ahci") {
"sata.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-block",
- "$zx/system/banjo/ddk-protocol-pci",
+ "$zx/system/banjo/ddk.protocol.block",
+ "$zx/system/banjo/ddk.protocol.pci",
"$zx/system/ulib/ddk",
"$zx/system/ulib/pretty",
"$zx/system/ulib/sync",
diff --git a/zircon/system/dev/block/aml-sd-emmc/BUILD.gn b/zircon/system/dev/block/aml-sd-emmc/BUILD.gn
index 0ed61270bc9a3ae394d671ff00aebb20d5e0e754..3470c2b348b4992bc984a126506b98959c9f7e88 100644
--- a/zircon/system/dev/block/aml-sd-emmc/BUILD.gn
+++ b/zircon/system/dev/block/aml-sd-emmc/BUILD.gn
@@ -7,11 +7,11 @@ driver("aml-sd-emmc") {
"aml-sd-emmc.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-block",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-sdmmc",
+ "$zx/system/banjo/ddk.protocol.block",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.sdmmc",
"$zx/system/dev/lib/amlogic",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/block/bootpart/BUILD.gn b/zircon/system/dev/block/bootpart/BUILD.gn
index e783429fd00a9c71c86efb3a76f5fde99e010ff1..c5ee354e36c43f395d5f5f7a24dd124668ef4ef1 100644
--- a/zircon/system/dev/block/bootpart/BUILD.gn
+++ b/zircon/system/dev/block/bootpart/BUILD.gn
@@ -7,8 +7,8 @@ driver("bootpart") {
"bootpart.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-block",
- "$zx/system/banjo/ddk-protocol-block-partition",
+ "$zx/system/banjo/ddk.protocol.block",
+ "$zx/system/banjo/ddk.protocol.block.partition",
"$zx/system/ulib/ddk",
"$zx/system/ulib/sync",
"$zx/system/ulib/zircon",
diff --git a/zircon/system/dev/block/core/BUILD.gn b/zircon/system/dev/block/core/BUILD.gn
index 2f3c80aec6cfde4a56a2bdc8a5f26e5976f8cc3c..4e44a937d083b4641cf32dffeb7532d8f8d4b48b 100644
--- a/zircon/system/dev/block/core/BUILD.gn
+++ b/zircon/system/dev/block/core/BUILD.gn
@@ -11,9 +11,9 @@ driver("core") {
"txn-group.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-block",
- "$zx/system/banjo/ddk-protocol-block-partition",
- "$zx/system/banjo/ddk-protocol-block-volume",
+ "$zx/system/banjo/ddk.protocol.block",
+ "$zx/system/banjo/ddk.protocol.block.partition",
+ "$zx/system/banjo/ddk.protocol.block.volume",
"$zx/system/fidl/fuchsia-hardware-block:c",
"$zx/system/fidl/fuchsia-hardware-block-partition:c",
"$zx/system/fidl/fuchsia-hardware-block-volume:c",
diff --git a/zircon/system/dev/block/ftl/BUILD.gn b/zircon/system/dev/block/ftl/BUILD.gn
index 6e1e03cb401ab33f70f4f65a3ba372a04465b715..1ffe7fd08d0940171ee55f0210b633ba548a5dfd 100644
--- a/zircon/system/dev/block/ftl/BUILD.gn
+++ b/zircon/system/dev/block/ftl/BUILD.gn
@@ -24,10 +24,10 @@ source_set("common") {
"oob_doubler.cpp",
]
public_deps = [
- "$zx/system/banjo/ddk-protocol-badblock",
- "$zx/system/banjo/ddk-protocol-block",
- "$zx/system/banjo/ddk-protocol-block-partition",
- "$zx/system/banjo/ddk-protocol-nand",
+ "$zx/system/banjo/ddk.protocol.badblock",
+ "$zx/system/banjo/ddk.protocol.block",
+ "$zx/system/banjo/ddk.protocol.block.partition",
+ "$zx/system/banjo/ddk.protocol.nand",
"$zx/system/fidl/fuchsia-hardware-block:c",
"$zx/system/fidl/fuchsia-hardware-nand:c",
"$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/block/fvm/BUILD.gn b/zircon/system/dev/block/fvm/BUILD.gn
index ca2ccc41183fc08d1b62c9b45e06575a909c5b83..0e8abd8ec483d38a64f63f6d45de677385c91e17 100644
--- a/zircon/system/dev/block/fvm/BUILD.gn
+++ b/zircon/system/dev/block/fvm/BUILD.gn
@@ -18,9 +18,9 @@ source_set("shared") {
"vpartition.cpp",
]
public_deps = [
- "$zx/system/banjo/ddk-protocol-block",
- "$zx/system/banjo/ddk-protocol-block-partition",
- "$zx/system/banjo/ddk-protocol-block-volume",
+ "$zx/system/banjo/ddk.protocol.block",
+ "$zx/system/banjo/ddk.protocol.block.partition",
+ "$zx/system/banjo/ddk.protocol.block.volume",
"$zx/system/fidl/fuchsia-hardware-block:c",
"$zx/system/fidl/fuchsia-hardware-block-partition:c",
"$zx/system/fidl/fuchsia-hardware-block-volume:c",
diff --git a/zircon/system/dev/block/gpt/BUILD.gn b/zircon/system/dev/block/gpt/BUILD.gn
index 6f4026c1426aece9fa12b227fdaf0c72deb7936c..eec80ca09fbcb38e1a90d2fac4c8f25c3af4cb9f 100644
--- a/zircon/system/dev/block/gpt/BUILD.gn
+++ b/zircon/system/dev/block/gpt/BUILD.gn
@@ -7,8 +7,8 @@ driver("gpt") {
"gpt.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-block",
- "$zx/system/banjo/ddk-protocol-block-partition",
+ "$zx/system/banjo/ddk.protocol.block",
+ "$zx/system/banjo/ddk.protocol.block.partition",
"$zx/system/ulib/ddk",
"$zx/system/ulib/sync",
"$zx/system/ulib/zircon",
diff --git a/zircon/system/dev/block/hisi-ufs/BUILD.gn b/zircon/system/dev/block/hisi-ufs/BUILD.gn
index 4b7fddec28e7c08c83997564179645b35dd9e08e..547a6c2f868001cf5c4dad9d6e1604e975fdef42 100644
--- a/zircon/system/dev/block/hisi-ufs/BUILD.gn
+++ b/zircon/system/dev/block/hisi-ufs/BUILD.gn
@@ -8,9 +8,9 @@ driver("hisi-ufs") {
"ufs-common.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-block",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.block",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/ulib/ddk",
"$zx/system/ulib/zircon",
]
diff --git a/zircon/system/dev/block/mbr/BUILD.gn b/zircon/system/dev/block/mbr/BUILD.gn
index 5bc3b7c1107121ba8cc60a91428c5c6724ae6f2f..0e7d3d1e797cc473eb9667b6ac730ddf706d1160 100644
--- a/zircon/system/dev/block/mbr/BUILD.gn
+++ b/zircon/system/dev/block/mbr/BUILD.gn
@@ -7,8 +7,8 @@ driver("mbr") {
"mbr.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-block",
- "$zx/system/banjo/ddk-protocol-block-partition",
+ "$zx/system/banjo/ddk.protocol.block",
+ "$zx/system/banjo/ddk.protocol.block.partition",
"$zx/system/ulib/ddk",
"$zx/system/ulib/gpt",
"$zx/system/ulib/sync",
diff --git a/zircon/system/dev/block/msm8x53-sdhci/BUILD.gn b/zircon/system/dev/block/msm8x53-sdhci/BUILD.gn
index 21d7e682e6daf889b195b1ad26d7b8a0c4bc8f15..09c2dc1c73173379eec19aac20f13d41e7e97e5e 100644
--- a/zircon/system/dev/block/msm8x53-sdhci/BUILD.gn
+++ b/zircon/system/dev/block/msm8x53-sdhci/BUILD.gn
@@ -7,8 +7,8 @@ driver("msm8x53-sdhci") {
"msm8x53-sdhci.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-sdhci",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.sdhci",
"$zx/system/dev/lib/mmio",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/block/mtk-sdmmc/BUILD.gn b/zircon/system/dev/block/mtk-sdmmc/BUILD.gn
index a795102ea5b3dedf4a529e23235e9763682e33f2..c5f2b91724154a4dd0785e842863b79f89c44270 100644
--- a/zircon/system/dev/block/mtk-sdmmc/BUILD.gn
+++ b/zircon/system/dev/block/mtk-sdmmc/BUILD.gn
@@ -7,11 +7,11 @@ driver("mtk-sdmmc") {
"mtk-sdmmc.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-block",
- "$zx/system/banjo/ddk-protocol-clock",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-sdmmc",
+ "$zx/system/banjo/ddk.protocol.block",
+ "$zx/system/banjo/ddk.protocol.clock",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.sdmmc",
"$zx/system/dev/lib/mmio",
"$zx/system/dev/lib/mt8167",
"$zx/system/ulib/ddk",
@@ -33,11 +33,11 @@ test("mtk-sdmmc-test") {
"mtk-sdmmc.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-block",
- "$zx/system/banjo/ddk-protocol-clock",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-sdmmc",
+ "$zx/system/banjo/ddk.protocol.block",
+ "$zx/system/banjo/ddk.protocol.clock",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.sdmmc",
"$zx/system/dev/lib/mock-mmio-reg",
"$zx/system/dev/lib/mt8167",
"$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/block/nvme/BUILD.gn b/zircon/system/dev/block/nvme/BUILD.gn
index 55a069f0efd20decfbaf2d73460b3f6d7057faed..5b91d74290356fdc9a5607a9fe498d655a4e410d 100644
--- a/zircon/system/dev/block/nvme/BUILD.gn
+++ b/zircon/system/dev/block/nvme/BUILD.gn
@@ -7,8 +7,8 @@ driver("nvme") {
"nvme.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-block",
- "$zx/system/banjo/ddk-protocol-pci",
+ "$zx/system/banjo/ddk.protocol.block",
+ "$zx/system/banjo/ddk.protocol.pci",
"$zx/system/ulib/ddk",
"$zx/system/ulib/sync",
"$zx/system/ulib/zircon",
diff --git a/zircon/system/dev/block/pci-sdhci/BUILD.gn b/zircon/system/dev/block/pci-sdhci/BUILD.gn
index 89442cf33d1986aa77aab54548cf66a0ee21f160..af8cf611546ad9d79e807fffe27ef6c2110bdf66 100644
--- a/zircon/system/dev/block/pci-sdhci/BUILD.gn
+++ b/zircon/system/dev/block/pci-sdhci/BUILD.gn
@@ -7,9 +7,9 @@ driver("pci-sdhci") {
"pci-sdhci.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-block",
- "$zx/system/banjo/ddk-protocol-pci",
- "$zx/system/banjo/ddk-protocol-sdhci",
+ "$zx/system/banjo/ddk.protocol.block",
+ "$zx/system/banjo/ddk.protocol.pci",
+ "$zx/system/banjo/ddk.protocol.sdhci",
"$zx/system/ulib/ddk",
"$zx/system/ulib/sync",
"$zx/system/ulib/zircon",
diff --git a/zircon/system/dev/block/ramdisk/BUILD.gn b/zircon/system/dev/block/ramdisk/BUILD.gn
index 2c2095219ebf521b87ad6b454e3910ffa6dcb48d..fc041e7da8d6ddf5467238e52df22af2b3af652f 100644
--- a/zircon/system/dev/block/ramdisk/BUILD.gn
+++ b/zircon/system/dev/block/ramdisk/BUILD.gn
@@ -8,8 +8,8 @@ driver("ramdisk") {
"ramdisk.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-block",
- "$zx/system/banjo/ddk-protocol-block-partition",
+ "$zx/system/banjo/ddk.protocol.block",
+ "$zx/system/banjo/ddk.protocol.block.partition",
"$zx/system/dev/lib/operation",
"$zx/system/fidl/fuchsia-hardware-ramdisk:c",
"$zx/system/fidl/fuchsia-io:c",
diff --git a/zircon/system/dev/block/sdhci/BUILD.gn b/zircon/system/dev/block/sdhci/BUILD.gn
index 29a2638d0ac21c31b9dda4bb46a5cb218d05925c..877459d61b5f323b78d6dedbc4f8c8c0c6959697 100644
--- a/zircon/system/dev/block/sdhci/BUILD.gn
+++ b/zircon/system/dev/block/sdhci/BUILD.gn
@@ -7,9 +7,9 @@ driver("sdhci") {
"sdhci.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-block",
- "$zx/system/banjo/ddk-protocol-sdhci",
- "$zx/system/banjo/ddk-protocol-sdmmc",
+ "$zx/system/banjo/ddk.protocol.block",
+ "$zx/system/banjo/ddk.protocol.sdhci",
+ "$zx/system/banjo/ddk.protocol.sdmmc",
"$zx/system/ulib/ddk",
"$zx/system/ulib/pretty",
"$zx/system/ulib/sync",
diff --git a/zircon/system/dev/block/sdmmc/BUILD.gn b/zircon/system/dev/block/sdmmc/BUILD.gn
index 957e038933b882cf579b30c9aed80a90d9370034..fc236a2c067abda972d21e6a3b92bab49a7c08cd 100644
--- a/zircon/system/dev/block/sdmmc/BUILD.gn
+++ b/zircon/system/dev/block/sdmmc/BUILD.gn
@@ -12,10 +12,10 @@ driver("sdmmc") {
"sdmmc-root-device.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-block",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-sdio",
- "$zx/system/banjo/ddk-protocol-sdmmc",
+ "$zx/system/banjo/ddk.protocol.block",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.sdio",
+ "$zx/system/banjo/ddk.protocol.sdmmc",
"$zx/system/dev/lib/operation",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/block/ums-function/BUILD.gn b/zircon/system/dev/block/ums-function/BUILD.gn
index d33efbc2b9dbe29712cd065756864b70809b57b3..cbaf2231437bf86209b9510f8afc0534590220c4 100644
--- a/zircon/system/dev/block/ums-function/BUILD.gn
+++ b/zircon/system/dev/block/ums-function/BUILD.gn
@@ -7,10 +7,10 @@ driver("ums-function") {
"ums-function.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-block",
- "$zx/system/banjo/ddk-protocol-usb",
- "$zx/system/banjo/ddk-protocol-usb-function",
- "$zx/system/banjo/ddk-protocol-usb-request",
+ "$zx/system/banjo/ddk.protocol.block",
+ "$zx/system/banjo/ddk.protocol.usb",
+ "$zx/system/banjo/ddk.protocol.usb.function",
+ "$zx/system/banjo/ddk.protocol.usb.request",
"$zx/system/dev/lib/usb",
"$zx/system/fidl/fuchsia-hardware-usb-peripheral-block:c",
"$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/block/usb-mass-storage/BUILD.gn b/zircon/system/dev/block/usb-mass-storage/BUILD.gn
index ef5d293523e630cd7751ed54bd5d3851f93b1a57..1e76d83125f5bf034451107ca8f067dd98a2674c 100644
--- a/zircon/system/dev/block/usb-mass-storage/BUILD.gn
+++ b/zircon/system/dev/block/usb-mass-storage/BUILD.gn
@@ -17,10 +17,10 @@ source_set("block") {
"block.cpp",
]
public_deps = [
- "$zx/system/banjo/ddk-protocol-block",
- "$zx/system/banjo/ddk-protocol-usb",
- "$zx/system/banjo/ddk-protocol-usb-composite",
- "$zx/system/banjo/ddk-protocol-usb-request",
+ "$zx/system/banjo/ddk.protocol.block",
+ "$zx/system/banjo/ddk.protocol.usb",
+ "$zx/system/banjo/ddk.protocol.usb.composite",
+ "$zx/system/banjo/ddk.protocol.usb.request",
"$zx/system/dev/lib/usb",
"$zx/system/fidl/fuchsia-hardware-usb-virtual-bus:c",
"$zx/system/ulib/async-loop",
diff --git a/zircon/system/dev/block/zxcrypt/BUILD.gn b/zircon/system/dev/block/zxcrypt/BUILD.gn
index c74f6fedec9a801bce498e9d789d616705e93dd7..50b5d08ab23dd99159f34f5e857122f507dcb95c 100644
--- a/zircon/system/dev/block/zxcrypt/BUILD.gn
+++ b/zircon/system/dev/block/zxcrypt/BUILD.gn
@@ -13,9 +13,9 @@ driver("zxcrypt") {
]
configs += [ "$zx/public/gn/config:integer-paranoia" ]
deps = [
- "$zx/system/banjo/ddk-protocol-block",
- "$zx/system/banjo/ddk-protocol-block-partition",
- "$zx/system/banjo/ddk-protocol-block-volume",
+ "$zx/system/banjo/ddk.protocol.block",
+ "$zx/system/banjo/ddk.protocol.block.partition",
+ "$zx/system/banjo/ddk.protocol.block.volume",
"$zx/system/fidl/fuchsia-hardware-zxcrypt:c",
"$zx/system/ulib/bitmap",
"$zx/system/ulib/crypto",
diff --git a/zircon/system/dev/bluetooth/bt-hci-broadcom/BUILD.gn b/zircon/system/dev/bluetooth/bt-hci-broadcom/BUILD.gn
index dc2a9e713165ae031af2592f358b9af2ba490d3f..f32dba42938ae9478afe4709bc210431ab2d9672 100644
--- a/zircon/system/dev/bluetooth/bt-hci-broadcom/BUILD.gn
+++ b/zircon/system/dev/bluetooth/bt-hci-broadcom/BUILD.gn
@@ -9,8 +9,8 @@ driver("bt-hci-broadcom") {
"bt-hci-broadcom.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-bt-hci",
- "$zx/system/banjo/ddk-protocol-serial",
+ "$zx/system/banjo/ddk.protocol.bt.hci",
+ "$zx/system/banjo/ddk.protocol.serial",
"$zx/system/fidl/fuchsia-hardware-bluetooth:c",
"$zx/system/ulib/ddk",
"$zx/system/ulib/fidl",
diff --git a/zircon/system/dev/bluetooth/bt-hci-mediatek/BUILD.gn b/zircon/system/dev/bluetooth/bt-hci-mediatek/BUILD.gn
index 6d0a6a8f58f27864b25e40170a608cba4ebefd74..c7d4538671ccd8f0d074ce9aed2e9682738ee7eb 100644
--- a/zircon/system/dev/bluetooth/bt-hci-mediatek/BUILD.gn
+++ b/zircon/system/dev/bluetooth/bt-hci-mediatek/BUILD.gn
@@ -9,8 +9,8 @@ driver("bt-hci-mediatek") {
"bt-hci-mediatek.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-bt-hci",
- "$zx/system/banjo/ddk-protocol-sdio",
+ "$zx/system/banjo/ddk.protocol.bt.hci",
+ "$zx/system/banjo/ddk.protocol.sdio",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
"$zx/system/ulib/fbl",
@@ -38,8 +38,8 @@ test("bt-hci-mediatek-test") {
"bt-hci-mediatek.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-bt-hci",
- "$zx/system/banjo/ddk-protocol-sdio",
+ "$zx/system/banjo/ddk.protocol.bt.hci",
+ "$zx/system/banjo/ddk.protocol.sdio",
"$zx/system/dev/lib/mock-sdio",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/bluetooth/bt-transport-uart/BUILD.gn b/zircon/system/dev/bluetooth/bt-transport-uart/BUILD.gn
index 63c490693aafe766577e4a3e27c98add91b9624b..55aeecd6b59771c5f113ac99effe3fb826671203 100644
--- a/zircon/system/dev/bluetooth/bt-transport-uart/BUILD.gn
+++ b/zircon/system/dev/bluetooth/bt-transport-uart/BUILD.gn
@@ -7,8 +7,8 @@ driver("bt-transport-uart") {
"bt-transport-uart.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-bt-hci",
- "$zx/system/banjo/ddk-protocol-serial",
+ "$zx/system/banjo/ddk.protocol.bt.hci",
+ "$zx/system/banjo/ddk.protocol.serial",
"$zx/system/ulib/ddk",
"$zx/system/ulib/sync",
"$zx/system/ulib/zircon",
diff --git a/zircon/system/dev/bluetooth/bt-transport-usb/BUILD.gn b/zircon/system/dev/bluetooth/bt-transport-usb/BUILD.gn
index 74f77e7f7d69e67361b6458c0f9eeede9a9579e9..0e128aed9abfdcfda4b8e002a52a6bfcfd056688 100644
--- a/zircon/system/dev/bluetooth/bt-transport-usb/BUILD.gn
+++ b/zircon/system/dev/bluetooth/bt-transport-usb/BUILD.gn
@@ -7,10 +7,10 @@ driver("bt-transport-usb") {
"bt-transport-usb.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-bt-hci",
- "$zx/system/banjo/ddk-protocol-usb",
- "$zx/system/banjo/ddk-protocol-usb-composite",
- "$zx/system/banjo/ddk-protocol-usb-request",
+ "$zx/system/banjo/ddk.protocol.bt.hci",
+ "$zx/system/banjo/ddk.protocol.usb",
+ "$zx/system/banjo/ddk.protocol.usb.composite",
+ "$zx/system/banjo/ddk.protocol.usb.request",
"$zx/system/dev/lib/usb",
"$zx/system/ulib/ddk",
"$zx/system/ulib/sync",
diff --git a/zircon/system/dev/board/astro/BUILD.gn b/zircon/system/dev/board/astro/BUILD.gn
index 9b2c427e7b0c3979d642dea02f646e22fc49ff39..de7eb78f2d05e168d2378cde26b88d54dea22a9d 100644
--- a/zircon/system/dev/board/astro/BUILD.gn
+++ b/zircon/system/dev/board/astro/BUILD.gn
@@ -24,13 +24,13 @@ driver("astro") {
"astro.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-gpioimpl",
- "$zx/system/banjo/ddk-protocol-iommu",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-scpi",
- "$zx/system/banjo/ddk-protocol-serial",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.gpioimpl",
+ "$zx/system/banjo/ddk.protocol.iommu",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.scpi",
+ "$zx/system/banjo/ddk.protocol.serial",
"$zx/system/dev/lib/amlogic",
"$zx/system/dev/lib/broadcom",
"$zx/system/dev/lib/focaltech",
diff --git a/zircon/system/dev/board/gauss/BUILD.gn b/zircon/system/dev/board/gauss/BUILD.gn
index 0f0f7eb1d4a6d65026488577d86045b80e8491c3..526dc60ab4b6aeb348f912cfd35e035985150b45 100644
--- a/zircon/system/dev/board/gauss/BUILD.gn
+++ b/zircon/system/dev/board/gauss/BUILD.gn
@@ -15,11 +15,11 @@ driver("gauss") {
"gauss.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-gpioimpl",
- "$zx/system/banjo/ddk-protocol-iommu",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.gpioimpl",
+ "$zx/system/banjo/ddk.protocol.iommu",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/dev/lib/amlogic",
"$zx/system/dev/pci/designware",
"$zx/system/ulib/ddk",
@@ -36,8 +36,8 @@ driver("gauss-i2c-test") {
"gauss-i2c-test.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/ulib/ddk",
"$zx/system/ulib/sync",
"$zx/system/ulib/zircon",
diff --git a/zircon/system/dev/board/hikey960/BUILD.gn b/zircon/system/dev/board/hikey960/BUILD.gn
index 993f701352c73a16af242e9e773145dc85545347..39d6648fa232d1b37263c3dae75e9fed3b5ef38a 100644
--- a/zircon/system/dev/board/hikey960/BUILD.gn
+++ b/zircon/system/dev/board/hikey960/BUILD.gn
@@ -14,13 +14,13 @@ driver("hikey960") {
"hikey960.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-gpioimpl",
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-iommu",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-usb-modeswitch",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.gpioimpl",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.iommu",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.usb.modeswitch",
"$zx/system/dev/lib/hi3660",
"$zx/system/ulib/ddk",
"$zx/system/ulib/sync",
@@ -38,8 +38,8 @@ driver("hi3660-i2c-test") {
"hikey960-i2c-test.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/ulib/ddk",
"$zx/system/ulib/sync",
"$zx/system/ulib/zircon",
diff --git a/zircon/system/dev/board/integration-test/BUILD.gn b/zircon/system/dev/board/integration-test/BUILD.gn
index 40b7743f50b46a678f70dd11d9cf4e277566ca6c..1ef1a7fbfee5e8af43d4480fae72cd978b18a06f 100644
--- a/zircon/system/dev/board/integration-test/BUILD.gn
+++ b/zircon/system/dev/board/integration-test/BUILD.gn
@@ -8,8 +8,8 @@ driver("integration-test") {
"test.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
"$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/board/machina/BUILD.gn b/zircon/system/dev/board/machina/BUILD.gn
index 5ef6f3ceb607686b35042381130f333b4c2c10e5..85bea361e150f2ff95c24cd78dd27d527ea799dc 100644
--- a/zircon/system/dev/board/machina/BUILD.gn
+++ b/zircon/system/dev/board/machina/BUILD.gn
@@ -8,8 +8,8 @@ driver("machina") {
"machina.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/ulib/ddk",
"$zx/system/ulib/zircon",
]
diff --git a/zircon/system/dev/board/msm8x53-som/BUILD.gn b/zircon/system/dev/board/msm8x53-som/BUILD.gn
index 903fe5208110f2e71e3035469ce55cc337ab2f24..27de5c1f31d220f4966629d45cc3a720167e840a 100644
--- a/zircon/system/dev/board/msm8x53-som/BUILD.gn
+++ b/zircon/system/dev/board/msm8x53-som/BUILD.gn
@@ -12,7 +12,7 @@ driver("msm8x53-som") {
"msm8x53.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-platform-bus",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
"$zx/system/dev/lib/msm8x53",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/board/mt8167s_ref/BUILD.gn b/zircon/system/dev/board/mt8167s_ref/BUILD.gn
index 669db5a601f9262e5bf0f9c16afdb1be9a816b1f..1961ef3b550dcfd9c3a8ec264e6f2f41c82ba2a0 100644
--- a/zircon/system/dev/board/mt8167s_ref/BUILD.gn
+++ b/zircon/system/dev/board/mt8167s_ref/BUILD.gn
@@ -23,12 +23,12 @@ driver("mt8167s_ref") {
"mt8167.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-clockimpl",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-gpioimpl",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-scpi",
+ "$zx/system/banjo/ddk.protocol.clockimpl",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.gpioimpl",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.scpi",
"$zx/system/dev/lib/focaltech",
"$zx/system/dev/lib/mmio",
"$zx/system/dev/lib/mt8167",
diff --git a/zircon/system/dev/board/qemu/BUILD.gn b/zircon/system/dev/board/qemu/BUILD.gn
index eae72c86977313c423139dd9bcd108d053bd7fd2..6ef24f1363bff8dc5301406b3c995b6037f27ebe 100644
--- a/zircon/system/dev/board/qemu/BUILD.gn
+++ b/zircon/system/dev/board/qemu/BUILD.gn
@@ -8,8 +8,8 @@ driver("qemu") {
"qemu-sysmem.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/ulib/ddk",
"$zx/system/ulib/zircon",
]
diff --git a/zircon/system/dev/board/sherlock/BUILD.gn b/zircon/system/dev/board/sherlock/BUILD.gn
index 307ed52291718b1dd2faa727a1d04dab0bd31099..e8f8dcdfbbebcd28dbbc81ac2daac685e3967e59 100644
--- a/zircon/system/dev/board/sherlock/BUILD.gn
+++ b/zircon/system/dev/board/sherlock/BUILD.gn
@@ -26,15 +26,15 @@ driver("sherlock") {
"sherlock.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-clock",
- "$zx/system/banjo/ddk-protocol-gpioimpl",
- "$zx/system/banjo/ddk-protocol-clockimpl",
- "$zx/system/banjo/ddk-protocol-iommu",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-scpi",
- "$zx/system/banjo/ddk-protocol-serial",
+ "$zx/system/banjo/ddk.protocol.clock",
+ "$zx/system/banjo/ddk.protocol.clockimpl",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.gpioimpl",
+ "$zx/system/banjo/ddk.protocol.iommu",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.scpi",
+ "$zx/system/banjo/ddk.protocol.serial",
"$zx/system/dev/lib/amlogic",
"$zx/system/dev/lib/broadcom",
"$zx/system/dev/lib/focaltech",
diff --git a/zircon/system/dev/board/test/BUILD.gn b/zircon/system/dev/board/test/BUILD.gn
index 3fa7c5b70cda77e8b22ab884fb304bb93e4ae43e..8e26f16ad25a51dce51c80e25d49aec4ad7ef8a9 100644
--- a/zircon/system/dev/board/test/BUILD.gn
+++ b/zircon/system/dev/board/test/BUILD.gn
@@ -35,8 +35,8 @@ driver("test-board") {
"test.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
"$zx/system/ulib/fbl",
@@ -50,10 +50,10 @@ driver("test-gpio") {
"test/gpio.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-gpioimpl",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.gpioimpl",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
"$zx/system/ulib/fbl",
@@ -68,10 +68,10 @@ driver("test-power") {
"test/power.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-power",
- "$zx/system/banjo/ddk-protocol-powerimpl",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.power",
+ "$zx/system/banjo/ddk.protocol.powerimpl",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
"$zx/system/ulib/fbl",
@@ -86,10 +86,10 @@ driver("test-clock") {
"test/clock.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-clock",
- "$zx/system/banjo/ddk-protocol-clockimpl",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.clock",
+ "$zx/system/banjo/ddk.protocol.clockimpl",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
"$zx/system/ulib/fbl",
@@ -104,10 +104,10 @@ driver("test-i2c") {
"test/i2c.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-i2cimpl",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.i2cimpl",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
"$zx/system/ulib/fbl",
@@ -123,11 +123,11 @@ foreach(driver, simple_drivers) {
"test/$driver.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-clock",
- "$zx/system/banjo/ddk-protocol-composite",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-power",
+ "$zx/system/banjo/ddk.protocol.clock",
+ "$zx/system/banjo/ddk.protocol.composite",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.power",
"$zx/system/ulib/ddk",
"$zx/system/ulib/sync",
"$zx/system/ulib/zircon",
diff --git a/zircon/system/dev/board/vim/BUILD.gn b/zircon/system/dev/board/vim/BUILD.gn
index 471a1fc9531d907854d13f22f009460df2d30769..c41be7468f918f70818cb23f0c3fbf5de1232a26 100644
--- a/zircon/system/dev/board/vim/BUILD.gn
+++ b/zircon/system/dev/board/vim/BUILD.gn
@@ -22,14 +22,14 @@ driver("vim") {
"vim.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-ethernet",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-gpioimpl",
- "$zx/system/banjo/ddk-protocol-iommu",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-scpi",
- "$zx/system/banjo/ddk-protocol-serial",
+ "$zx/system/banjo/ddk.protocol.ethernet",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.gpioimpl",
+ "$zx/system/banjo/ddk.protocol.iommu",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.scpi",
+ "$zx/system/banjo/ddk.protocol.serial",
"$zx/system/dev/lib/amlogic",
"$zx/system/dev/lib/broadcom",
"$zx/system/dev/lib/mmio",
diff --git a/zircon/system/dev/board/x86/BUILD.gn b/zircon/system/dev/board/x86/BUILD.gn
index 3174d099a3fe846368000663523cf9894d985701..b107837c99933a2d5a49b391e615054ef98dee5e 100644
--- a/zircon/system/dev/board/x86/BUILD.gn
+++ b/zircon/system/dev/board/x86/BUILD.gn
@@ -61,13 +61,13 @@ driver("platform-bus-x86") {
}
configs += [ ":config" ]
deps = [
- "$zx/system/banjo/ddk-protocol-acpi",
- "$zx/system/banjo/ddk-protocol-hidbus",
- "$zx/system/banjo/ddk-protocol-pciroot",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-scpi",
- "$zx/system/banjo/ddk-protocol-sysmem",
+ "$zx/system/banjo/ddk.protocol.acpi",
+ "$zx/system/banjo/ddk.protocol.hidbus",
+ "$zx/system/banjo/ddk.protocol.pciroot",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.scpi",
+ "$zx/system/banjo/ddk.protocol.sysmem",
"$zx/system/fidl/fuchsia-hardware-power:c",
"$zx/system/fidl/fuchsia-hardware-thermal:c",
"$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/bus/pci/BUILD.gn b/zircon/system/dev/bus/pci/BUILD.gn
index fb8232389e4c6eec680738907b61210a1d98e60a..1bd5d45c3f8fdd5508676c07955878f0b84ca987 100644
--- a/zircon/system/dev/bus/pci/BUILD.gn
+++ b/zircon/system/dev/bus/pci/BUILD.gn
@@ -27,8 +27,8 @@ source_set("user_pci") {
"upstream_node.cpp",
]
public_deps = [
- "$zx/system/banjo/ddk-protocol-pci",
- "$zx/system/banjo/ddk-protocol-pciroot",
+ "$zx/system/banjo/ddk.protocol.pci",
+ "$zx/system/banjo/ddk.protocol.pciroot",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
"$zx/system/ulib/fbl",
@@ -53,10 +53,10 @@ driver("bus-pci") {
"kpci/kpci.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-pci",
- "$zx/system/banjo/ddk-protocol-pciroot",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-sysmem",
+ "$zx/system/banjo/ddk.protocol.pci",
+ "$zx/system/banjo/ddk.protocol.pciroot",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.sysmem",
"$zx/system/ulib/ddk",
"$zx/system/ulib/zircon",
]
@@ -68,10 +68,10 @@ driver("bus-pci.proxy") {
"kpci/proxy.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-pci",
- "$zx/system/banjo/ddk-protocol-pciroot",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-sysmem",
+ "$zx/system/banjo/ddk.protocol.pci",
+ "$zx/system/banjo/ddk.protocol.pciroot",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.sysmem",
"$zx/system/ulib/ddk",
"$zx/system/ulib/zircon",
]
diff --git a/zircon/system/dev/bus/platform/BUILD.gn b/zircon/system/dev/bus/platform/BUILD.gn
index 07b6f392d342d609d0aba6746c94c834dec6c25f..b0c88c08941d457695fcf2baf3e749b831834b43 100644
--- a/zircon/system/dev/bus/platform/BUILD.gn
+++ b/zircon/system/dev/bus/platform/BUILD.gn
@@ -20,18 +20,18 @@ driver("platform-bus") {
"platform-protocol-device.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-amlogiccanvas",
- "$zx/system/banjo/ddk-protocol-clock",
- "$zx/system/banjo/ddk-protocol-clockimpl",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-gpioimpl",
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-i2cimpl",
- "$zx/system/banjo/ddk-protocol-iommu",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-powerimpl",
- "$zx/system/banjo/ddk-protocol-sysmem",
+ "$zx/system/banjo/ddk.protocol.amlogiccanvas",
+ "$zx/system/banjo/ddk.protocol.clock",
+ "$zx/system/banjo/ddk.protocol.clockimpl",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.gpioimpl",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.i2cimpl",
+ "$zx/system/banjo/ddk.protocol.iommu",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.powerimpl",
+ "$zx/system/banjo/ddk.protocol.sysmem",
"$zx/system/fidl/fuchsia-boot:c",
"$zx/system/fidl/fuchsia-sysinfo:c",
"$zx/system/ulib/ddk",
@@ -51,15 +51,15 @@ driver("platform-bus.proxy") {
"platform-proxy.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-amlogiccanvas",
- "$zx/system/banjo/ddk-protocol-clock",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-gpioimpl",
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-i2cimpl",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-sysmem",
+ "$zx/system/banjo/ddk.protocol.amlogiccanvas",
+ "$zx/system/banjo/ddk.protocol.clock",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.gpioimpl",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.i2cimpl",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.sysmem",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
"$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/bus/virtio/BUILD.gn b/zircon/system/dev/bus/virtio/BUILD.gn
index aa00b5e6f9eb0b69f5ce8a6afea1402cf7263be2..b00cb469fc2b82bff3a1df6e70031c71f626edc2 100644
--- a/zircon/system/dev/bus/virtio/BUILD.gn
+++ b/zircon/system/dev/bus/virtio/BUILD.gn
@@ -20,9 +20,9 @@ driver("virtio") {
]
deps = [
":common",
- "$zx/system/banjo/ddk-protocol-display-controller",
- "$zx/system/banjo/ddk-protocol-ethernet",
- "$zx/system/banjo/ddk-protocol-hidbus",
+ "$zx/system/banjo/ddk.protocol.display.controller",
+ "$zx/system/banjo/ddk.protocol.ethernet",
+ "$zx/system/banjo/ddk.protocol.hidbus",
"$zx/system/fidl/fuchsia-hardware-pty:c",
"$zx/system/fidl/fuchsia-hardware-vsock:c",
"$zx/system/ulib/hid",
@@ -37,8 +37,8 @@ source_set("common") {
"scsi.cpp",
]
public_deps = [
- "$zx/system/banjo/ddk-protocol-block",
- "$zx/system/banjo/ddk-protocol-pci",
+ "$zx/system/banjo/ddk.protocol.block",
+ "$zx/system/banjo/ddk.protocol.pci",
"$zx/system/dev/lib/mmio",
"$zx/system/dev/lib/scsi",
"$zx/system/ulib/async:async-cpp",
diff --git a/zircon/system/dev/camera/aml-mipicsi/BUILD.gn b/zircon/system/dev/camera/aml-mipicsi/BUILD.gn
index 440fcbe6c7aa1bb5b26ab580886e05682f7095a6..3c18369587d3c1506069e72b8826e0d18a6a4c3c 100644
--- a/zircon/system/dev/camera/aml-mipicsi/BUILD.gn
+++ b/zircon/system/dev/camera/aml-mipicsi/BUILD.gn
@@ -9,12 +9,12 @@ driver("aml-mipicsi") {
"aml-mipi.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-clock",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-mipicsi",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.clock",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.mipicsi",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/dev/lib/amlogic",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/camera/arm-isp/BUILD.gn b/zircon/system/dev/camera/arm-isp/BUILD.gn
index 0728b21695b258c6aad8e27a33728d5a4f90952c..f28abeb56fe301496da7c52c739121abb28b97ad 100644
--- a/zircon/system/dev/camera/arm-isp/BUILD.gn
+++ b/zircon/system/dev/camera/arm-isp/BUILD.gn
@@ -12,15 +12,15 @@ driver("arm-isp") {
"stats-mgr.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-camerasensor",
- "$zx/system/banjo/ddk-protocol-clock",
- "$zx/system/banjo/ddk-protocol-composite",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-mipicsi",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-sysmem",
+ "$zx/system/banjo/ddk.protocol.camerasensor",
+ "$zx/system/banjo/ddk.protocol.clock",
+ "$zx/system/banjo/ddk.protocol.composite",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.mipicsi",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.sysmem",
"$zx/system/dev/lib/mmio",
"$zx/system/fidl/fuchsia-hardware-camera:c",
"$zx/system/fidl/fuchsia-sysmem:c",
diff --git a/zircon/system/dev/camera/imx227/BUILD.gn b/zircon/system/dev/camera/imx227/BUILD.gn
index ae8c46b111f91bc04019720635910ff7c89cbef3..f87b1cf8f72533fedacb6952fe0e83f3a6395c8d 100644
--- a/zircon/system/dev/camera/imx227/BUILD.gn
+++ b/zircon/system/dev/camera/imx227/BUILD.gn
@@ -7,13 +7,13 @@ driver("imx227") {
"imx227.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-clock",
- "$zx/system/banjo/ddk-protocol-composite",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-mipicsi",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.clock",
+ "$zx/system/banjo/ddk.protocol.composite",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.mipicsi",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/dev/lib/mmio",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/clk/amlogic-clk/BUILD.gn b/zircon/system/dev/clk/amlogic-clk/BUILD.gn
index dd295d8849ba366727e2c16cfa0e823c53b03926..0d48722ea5ab2e712b4948468f3a0e5a5d135789 100644
--- a/zircon/system/dev/clk/amlogic-clk/BUILD.gn
+++ b/zircon/system/dev/clk/amlogic-clk/BUILD.gn
@@ -7,9 +7,9 @@ driver("amlogic-clk") {
"aml-clk.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-clockimpl",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.clockimpl",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/dev/lib/amlogic",
"$zx/system/dev/lib/mmio",
"$zx/system/fidl/fuchsia-hardware-clock:c",
diff --git a/zircon/system/dev/clk/clock/BUILD.gn b/zircon/system/dev/clk/clock/BUILD.gn
index f0d65df2232b80a71fd04961fe20ce3ef879c19d..10eb46f356ffc516f39dadb353eaabd2fc70322e 100644
--- a/zircon/system/dev/clk/clock/BUILD.gn
+++ b/zircon/system/dev/clk/clock/BUILD.gn
@@ -7,8 +7,8 @@ driver("clock") {
"clock.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-clock",
- "$zx/system/banjo/ddk-protocol-clockimpl",
+ "$zx/system/banjo/ddk.protocol.clock",
+ "$zx/system/banjo/ddk.protocol.clockimpl",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
"$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/clk/hisi-lib/BUILD.gn b/zircon/system/dev/clk/hisi-lib/BUILD.gn
index 0de25ed3a9ed346f9f8e7e31595562289f28fce9..7d290e69a9e5c2d8eaac5ea0c2262624046336aa 100644
--- a/zircon/system/dev/clk/hisi-lib/BUILD.gn
+++ b/zircon/system/dev/clk/hisi-lib/BUILD.gn
@@ -12,9 +12,9 @@ library("hisi-lib") {
"hisi-clk.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-clockimpl",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.clockimpl",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
"$zx/system/ulib/driver",
diff --git a/zircon/system/dev/clk/hisi3660/BUILD.gn b/zircon/system/dev/clk/hisi3660/BUILD.gn
index 656a69f940f87e622371a2a36b10fb6e92154edf..0d8faad2327a8a93a25c8c6fc058f5b0b224bbc3 100644
--- a/zircon/system/dev/clk/hisi3660/BUILD.gn
+++ b/zircon/system/dev/clk/hisi3660/BUILD.gn
@@ -7,9 +7,9 @@ driver("hisi3660") {
"hisi3660-clk.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-clockimpl",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.clockimpl",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/dev/clk/hisi-lib",
"$zx/system/dev/lib/hi3660",
"$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/clk/msm8x53-clk/BUILD.gn b/zircon/system/dev/clk/msm8x53-clk/BUILD.gn
index 9e9113f2f1959ea1fcdbe8505ae60519db147677..e4cf2109a0d72acbf25e7b64bef793c32ca04770 100644
--- a/zircon/system/dev/clk/msm8x53-clk/BUILD.gn
+++ b/zircon/system/dev/clk/msm8x53-clk/BUILD.gn
@@ -7,12 +7,12 @@ driver("msm8x53-clk") {
"msm8x53-clk.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-clock",
- "$zx/system/banjo/ddk-protocol-clockimpl",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.clock",
+ "$zx/system/banjo/ddk.protocol.clockimpl",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/dev/lib/mmio",
"$zx/system/dev/lib/msm8x53",
"$zx/system/fidl/fuchsia-hardware-clock:c",
diff --git a/zircon/system/dev/clk/mtk-clk/BUILD.gn b/zircon/system/dev/clk/mtk-clk/BUILD.gn
index e4a8dd866a36836550c0f9eea8433c8261b70256..1aebfc29660b4b6e70ccb4cfbe863229e1f1e160 100644
--- a/zircon/system/dev/clk/mtk-clk/BUILD.gn
+++ b/zircon/system/dev/clk/mtk-clk/BUILD.gn
@@ -7,11 +7,11 @@ driver("mtk-clk") {
"mtk-clk.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-clockimpl",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.clockimpl",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/dev/lib/mmio",
"$zx/system/dev/lib/mt8167",
"$zx/system/fidl/fuchsia-hardware-clock:c",
diff --git a/zircon/system/dev/codec/alc5514/BUILD.gn b/zircon/system/dev/codec/alc5514/BUILD.gn
index 281cd2b0e0b6b7d54ecab16933ce3a59bf5faf7b..e5f5a0d4ae3a36e01b2b79a448cc6f2008371e9c 100644
--- a/zircon/system/dev/codec/alc5514/BUILD.gn
+++ b/zircon/system/dev/codec/alc5514/BUILD.gn
@@ -8,8 +8,8 @@ driver("alc5514") {
"binding.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-pci",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.pci",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
"$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/codec/max98927/BUILD.gn b/zircon/system/dev/codec/max98927/BUILD.gn
index 024cef4ad0cfee9e62e3727140f48ea96ae3038b..a51a80a4d16f7e482be4e717b808dff5fd727aeb 100644
--- a/zircon/system/dev/codec/max98927/BUILD.gn
+++ b/zircon/system/dev/codec/max98927/BUILD.gn
@@ -8,8 +8,8 @@ driver("max98927") {
"max98927.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-pci",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.pci",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
"$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/display/aml-canvas/BUILD.gn b/zircon/system/dev/display/aml-canvas/BUILD.gn
index af810269aa7b14773ce621a72f524a934407cdfb..35b0f9776123ce51d8eb567bc259da45ade3015a 100644
--- a/zircon/system/dev/display/aml-canvas/BUILD.gn
+++ b/zircon/system/dev/display/aml-canvas/BUILD.gn
@@ -7,9 +7,9 @@ driver("aml-canvas") {
"aml-canvas.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-amlogiccanvas",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.amlogiccanvas",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/ulib/ddk",
"$zx/system/ulib/zircon",
]
diff --git a/zircon/system/dev/display/astro-display/BUILD.gn b/zircon/system/dev/display/astro-display/BUILD.gn
index a7f56587d516725265d52ddc4a9b54d8aa44aa1b..a72b1713c7a5c256e0bcbc799c5e0f9eb529b4a3 100644
--- a/zircon/system/dev/display/astro-display/BUILD.gn
+++ b/zircon/system/dev/display/astro-display/BUILD.gn
@@ -13,14 +13,14 @@ driver("astro-display") {
"vpu.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-amlogiccanvas",
- "$zx/system/banjo/ddk-protocol-composite",
- "$zx/system/banjo/ddk-protocol-display-controller",
- "$zx/system/banjo/ddk-protocol-dsiimpl",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-sysmem",
+ "$zx/system/banjo/ddk.protocol.amlogiccanvas",
+ "$zx/system/banjo/ddk.protocol.composite",
+ "$zx/system/banjo/ddk.protocol.display.controller",
+ "$zx/system/banjo/ddk.protocol.dsiimpl",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.sysmem",
"$zx/system/dev/lib/mmio",
"$zx/system/fidl/fuchsia-sysmem:c",
"$zx/system/ulib/bitmap",
diff --git a/zircon/system/dev/display/display/BUILD.gn b/zircon/system/dev/display/display/BUILD.gn
index 5417b8a7b02b0e4e80b87bb76d2235c4c6e8d5eb..7977819c4431a8784a5f1ec8ab034e1fc61ceb20 100644
--- a/zircon/system/dev/display/display/BUILD.gn
+++ b/zircon/system/dev/display/display/BUILD.gn
@@ -10,8 +10,8 @@ driver("display") {
"image.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-display-controller",
- "$zx/system/banjo/ddk-protocol-i2cimpl",
+ "$zx/system/banjo/ddk.protocol.display.controller",
+ "$zx/system/banjo/ddk.protocol.i2cimpl",
"$zx/system/dev/lib/mmio",
"$zx/system/fidl/fuchsia-hardware-display:c",
"$zx/system/fidl/fuchsia-sysmem:c",
diff --git a/zircon/system/dev/display/dsi-dw/BUILD.gn b/zircon/system/dev/display/dsi-dw/BUILD.gn
index 59ddfa5ebc597be12aca5390c60132d5770eddbd..bff2715180c8df84485c31d06efa0c80ae18e0ba 100644
--- a/zircon/system/dev/display/dsi-dw/BUILD.gn
+++ b/zircon/system/dev/display/dsi-dw/BUILD.gn
@@ -7,12 +7,12 @@ driver("dsi-dw") {
"dsi-dw.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-dsiimpl",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-sysmem",
+ "$zx/system/banjo/ddk.protocol.dsiimpl",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.sysmem",
"$zx/system/dev/lib/mmio",
"$zx/system/fidl/fuchsia-sysmem:c",
"$zx/system/ulib/bitmap",
diff --git a/zircon/system/dev/display/dsi-mt/BUILD.gn b/zircon/system/dev/display/dsi-mt/BUILD.gn
index 5eda88090f0c0c402fef795348acb032bdfab808..890bc923ffdccae7b2fa5564fbecc8c04f5da5f0 100644
--- a/zircon/system/dev/display/dsi-mt/BUILD.gn
+++ b/zircon/system/dev/display/dsi-mt/BUILD.gn
@@ -7,12 +7,12 @@ driver("dsi-mt") {
"dsi-mt.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-dsiimpl",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-sysmem",
+ "$zx/system/banjo/ddk.protocol.dsiimpl",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.sysmem",
"$zx/system/dev/lib/mmio",
"$zx/system/fidl/fuchsia-sysmem:c",
"$zx/system/ulib/bitmap",
diff --git a/zircon/system/dev/display/dummy/BUILD.gn b/zircon/system/dev/display/dummy/BUILD.gn
index ef75300fa6b40b344f692fb86de9861022667d20..fe4006e74070480e7520b74ec1f0b154c297e8bd 100644
--- a/zircon/system/dev/display/dummy/BUILD.gn
+++ b/zircon/system/dev/display/dummy/BUILD.gn
@@ -7,8 +7,8 @@ driver("dummy") {
"dummy-display.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-display-controller",
- "$zx/system/banjo/ddk-protocol-sysmem",
+ "$zx/system/banjo/ddk.protocol.display.controller",
+ "$zx/system/banjo/ddk.protocol.sysmem",
"$zx/system/fidl/fuchsia-sysmem:c",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/display/hikey-display/BUILD.gn b/zircon/system/dev/display/hikey-display/BUILD.gn
index 3b450c59347ff7e09eb7e77e97fb2b9a2808acf1..c2c83cb445f8b131803008f1aef7f8631e85175c 100644
--- a/zircon/system/dev/display/hikey-display/BUILD.gn
+++ b/zircon/system/dev/display/hikey-display/BUILD.gn
@@ -4,30 +4,30 @@
driver("hikey-display") {
sources = [
- "ddk-interface.cpp",
- "hi3660-dsi.cpp",
"adv7533.cpp",
+ "ddk-interface.cpp",
"edid.cpp",
+ "hi3660-dsi.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-display-controller",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-dsiimpl",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-sysmem",
+ "$zx/system/banjo/ddk.protocol.display.controller",
+ "$zx/system/banjo/ddk.protocol.dsiimpl",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.sysmem",
+ "$zx/system/dev/lib/mmio",
"$zx/system/fidl/fuchsia-sysmem:c",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
+ "$zx/system/ulib/edid",
"$zx/system/ulib/fbl",
+ "$zx/system/ulib/hwreg",
+ "$zx/system/ulib/mipi-dsi",
"$zx/system/ulib/pretty",
"$zx/system/ulib/sync",
"$zx/system/ulib/zircon",
"$zx/system/ulib/zx",
"$zx/system/ulib/zxcpp",
- "$zx/system/ulib/hwreg",
- "$zx/system/dev/lib/mmio",
- "$zx/system/ulib/mipi-dsi",
- "$zx/system/ulib/edid",
]
}
diff --git a/zircon/system/dev/display/intel-i915/BUILD.gn b/zircon/system/dev/display/intel-i915/BUILD.gn
index 248b32c4cd246db85603c1e6fad7645d12a8bb0c..03823e6720890b3c5425b6c0025969cc18c7d5ed 100644
--- a/zircon/system/dev/display/intel-i915/BUILD.gn
+++ b/zircon/system/dev/display/intel-i915/BUILD.gn
@@ -17,11 +17,11 @@ driver("intel-i915") {
"power.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-display-controller",
- "$zx/system/banjo/ddk-protocol-i2cimpl",
- "$zx/system/banjo/ddk-protocol-intelgpucore",
- "$zx/system/banjo/ddk-protocol-pci",
- "$zx/system/banjo/ddk-protocol-sysmem",
+ "$zx/system/banjo/ddk.protocol.display.controller",
+ "$zx/system/banjo/ddk.protocol.i2cimpl",
+ "$zx/system/banjo/ddk.protocol.intelgpucore",
+ "$zx/system/banjo/ddk.protocol.pci",
+ "$zx/system/banjo/ddk.protocol.sysmem",
"$zx/system/dev/lib/mmio",
"$zx/system/fidl/fuchsia-hardware-backlight:c",
"$zx/system/fidl/fuchsia-sysmem:c",
diff --git a/zircon/system/dev/display/led2472g/BUILD.gn b/zircon/system/dev/display/led2472g/BUILD.gn
index 95904131c59e4c94fc3c66b6ef169066ae750e53..c60024f6afad118f5d3788d598bb5ec7341519e2 100644
--- a/zircon/system/dev/display/led2472g/BUILD.gn
+++ b/zircon/system/dev/display/led2472g/BUILD.gn
@@ -13,7 +13,7 @@ driver("vim-led2472g") {
"led2472g.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-i2c",
+ "$zx/system/banjo/ddk.protocol.i2c",
"$zx/system/ulib/ddk",
"$zx/system/ulib/sync",
"$zx/system/ulib/zircon",
diff --git a/zircon/system/dev/display/mt8167s-display/BUILD.gn b/zircon/system/dev/display/mt8167s-display/BUILD.gn
index 6e065c3523e61d23290abbf7deed6090129a311d..4a94081484c5b12509fe5c353388cd0b9f2c6f12 100644
--- a/zircon/system/dev/display/mt8167s-display/BUILD.gn
+++ b/zircon/system/dev/display/mt8167s-display/BUILD.gn
@@ -17,11 +17,11 @@ driver("mt8167s-display") {
"ovl.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-composite",
- "$zx/system/banjo/ddk-protocol-display-controller",
- "$zx/system/banjo/ddk-protocol-dsiimpl",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-sysmem",
+ "$zx/system/banjo/ddk.protocol.composite",
+ "$zx/system/banjo/ddk.protocol.display.controller",
+ "$zx/system/banjo/ddk.protocol.dsiimpl",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.sysmem",
"$zx/system/dev/lib/mmio",
"$zx/system/fidl/fuchsia-sysmem:c",
"$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/display/simple/BUILD.gn b/zircon/system/dev/display/simple/BUILD.gn
index 0ef4414511553ed29afcdfbcb39cec9451881167..8c0e5bbcdd88b2e1fe41ec277803d0441d2f96fd 100644
--- a/zircon/system/dev/display/simple/BUILD.gn
+++ b/zircon/system/dev/display/simple/BUILD.gn
@@ -8,8 +8,8 @@ source_set("shared") {
"simple-display.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-display-controller",
- "$zx/system/banjo/ddk-protocol-pci",
+ "$zx/system/banjo/ddk.protocol.display.controller",
+ "$zx/system/banjo/ddk.protocol.pci",
"$zx/system/dev/lib/mmio",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
@@ -37,8 +37,8 @@ foreach(driver, simple_drivers) {
]
deps = [
":shared",
- "$zx/system/banjo/ddk-protocol-display-controller",
- "$zx/system/banjo/ddk-protocol-pci",
+ "$zx/system/banjo/ddk.protocol.display.controller",
+ "$zx/system/banjo/ddk.protocol.pci",
"$zx/system/ulib/ddk",
]
}
diff --git a/zircon/system/dev/display/vim-display/BUILD.gn b/zircon/system/dev/display/vim-display/BUILD.gn
index 613f6fd6c95a5da97f577c506efd9598eeced96d..4994bd967398378532228ac3ab48fc8f950e9369 100644
--- a/zircon/system/dev/display/vim-display/BUILD.gn
+++ b/zircon/system/dev/display/vim-display/BUILD.gn
@@ -15,13 +15,13 @@ driver("vim-display") {
"vpp.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-amlogiccanvas",
- "$zx/system/banjo/ddk-protocol-composite",
- "$zx/system/banjo/ddk-protocol-display-controller",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-i2cimpl",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-sysmem",
+ "$zx/system/banjo/ddk.protocol.amlogiccanvas",
+ "$zx/system/banjo/ddk.protocol.composite",
+ "$zx/system/banjo/ddk.protocol.display.controller",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.i2cimpl",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.sysmem",
"$zx/system/dev/audio/lib/simple-audio-stream",
"$zx/system/dev/lib/amlogic",
"$zx/system/dev/lib/mmio",
diff --git a/zircon/system/dev/ethernet/aml-ethernet-s912/BUILD.gn b/zircon/system/dev/ethernet/aml-ethernet-s912/BUILD.gn
index 3446420f36557b1c63030ea65df89caecd4a3763..cbceff1aecbbda75e0e80a49c7dcc91dc1cb42ea 100644
--- a/zircon/system/dev/ethernet/aml-ethernet-s912/BUILD.gn
+++ b/zircon/system/dev/ethernet/aml-ethernet-s912/BUILD.gn
@@ -7,13 +7,13 @@ driver("aml-ethernet-s912") {
"aml-ethernet.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-clock",
- "$zx/system/banjo/ddk-protocol-composite",
- "$zx/system/banjo/ddk-protocol-ethernet",
- "$zx/system/banjo/ddk-protocol-ethernet-board",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.clock",
+ "$zx/system/banjo/ddk.protocol.composite",
+ "$zx/system/banjo/ddk.protocol.ethernet",
+ "$zx/system/banjo/ddk.protocol.ethernet.board",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/dev/lib/amlogic",
"$zx/system/dev/lib/mmio",
"$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/ethernet/asix-88179/BUILD.gn b/zircon/system/dev/ethernet/asix-88179/BUILD.gn
index 77c0f773af6bd930b61691f61af8bd8a7f203767..70ae64dd4c0fec49fde59560e2ea96eb85ae2f03 100644
--- a/zircon/system/dev/ethernet/asix-88179/BUILD.gn
+++ b/zircon/system/dev/ethernet/asix-88179/BUILD.gn
@@ -7,10 +7,10 @@ driver("asix-88179") {
"asix-88179.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-ethernet",
- "$zx/system/banjo/ddk-protocol-usb",
- "$zx/system/banjo/ddk-protocol-usb-composite",
- "$zx/system/banjo/ddk-protocol-usb-request",
+ "$zx/system/banjo/ddk.protocol.ethernet",
+ "$zx/system/banjo/ddk.protocol.usb",
+ "$zx/system/banjo/ddk.protocol.usb.composite",
+ "$zx/system/banjo/ddk.protocol.usb.request",
"$zx/system/dev/lib/usb",
"$zx/system/ulib/ddk",
"$zx/system/ulib/pretty",
diff --git a/zircon/system/dev/ethernet/asix-88772b/BUILD.gn b/zircon/system/dev/ethernet/asix-88772b/BUILD.gn
index a66608255790a664222c375ac6a968f0fad34ded..6cd6a8b3c481b4e78d54b95a2791455603494c44 100644
--- a/zircon/system/dev/ethernet/asix-88772b/BUILD.gn
+++ b/zircon/system/dev/ethernet/asix-88772b/BUILD.gn
@@ -7,10 +7,10 @@ driver("asix-88772b") {
"asix-88772b.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-ethernet",
- "$zx/system/banjo/ddk-protocol-usb",
- "$zx/system/banjo/ddk-protocol-usb-composite",
- "$zx/system/banjo/ddk-protocol-usb-request",
+ "$zx/system/banjo/ddk.protocol.ethernet",
+ "$zx/system/banjo/ddk.protocol.usb",
+ "$zx/system/banjo/ddk.protocol.usb.composite",
+ "$zx/system/banjo/ddk.protocol.usb.request",
"$zx/system/dev/lib/usb",
"$zx/system/ulib/ddk",
"$zx/system/ulib/sync",
diff --git a/zircon/system/dev/ethernet/dwmac/BUILD.gn b/zircon/system/dev/ethernet/dwmac/BUILD.gn
index 6c89eb63607a6cc357160ef2207110afcfc42c4d..73f4037228280db7444d01093f9744b60c9ff5ac 100644
--- a/zircon/system/dev/ethernet/dwmac/BUILD.gn
+++ b/zircon/system/dev/ethernet/dwmac/BUILD.gn
@@ -9,15 +9,15 @@ driver("dwmac") {
"pinned-buffer.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-clock",
- "$zx/system/banjo/ddk-protocol-composite",
- "$zx/system/banjo/ddk-protocol-ethernet",
- "$zx/system/banjo/ddk-protocol-ethernet-board",
- "$zx/system/banjo/ddk-protocol-ethernet-mac",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-test",
+ "$zx/system/banjo/ddk.protocol.clock",
+ "$zx/system/banjo/ddk.protocol.composite",
+ "$zx/system/banjo/ddk.protocol.ethernet",
+ "$zx/system/banjo/ddk.protocol.ethernet.board",
+ "$zx/system/banjo/ddk.protocol.ethernet.mac",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.test",
"$zx/system/dev/lib/mmio",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/ethernet/ethernet/BUILD.gn b/zircon/system/dev/ethernet/ethernet/BUILD.gn
index 7226cd33eada8accb9e5c123e141b761b167ec24..0362ad4dd1be675f3eead7202aebdcb4026cdf04 100644
--- a/zircon/system/dev/ethernet/ethernet/BUILD.gn
+++ b/zircon/system/dev/ethernet/ethernet/BUILD.gn
@@ -11,33 +11,30 @@ declare_args() {
driver("ethernet") {
# TODO(puneetha) This is used to temporarily enable building with the C driver
# before cpp driver is stabilized
- if(ethernet_c) {
+ if (ethernet_c) {
sources = [
- "ethernet.c"
+ "ethernet.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-ethernet",
+ "$zx/system/banjo/ddk.protocol.ethernet",
"$zx/system/fidl/fuchsia-hardware-ethernet:c",
"$zx/system/ulib/ddk",
"$zx/system/ulib/fidl",
"$zx/system/ulib/zircon",
]
- }
- # cpp driver is default unless specified during fx set with
- # --args="zircon_extra_args = { ethernet_c=true }"
- else {
+ } else {
sources = [
- "ethernet.cpp"
+ "ethernet.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-ethernet",
+ "$zx/system/banjo/ddk.protocol.ethernet",
"$zx/system/fidl/fuchsia-hardware-ethernet:c",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
"$zx/system/ulib/fbl",
- "$zx/system/ulib/fzl",
"$zx/system/ulib/fidl",
"$zx/system/ulib/fidl-utils",
+ "$zx/system/ulib/fzl",
"$zx/system/ulib/zircon",
]
}
diff --git a/zircon/system/dev/ethernet/ethertap/BUILD.gn b/zircon/system/dev/ethernet/ethertap/BUILD.gn
index 314a0e8474cc3bd95d93062d09753b12c6926755..06aa5950f5ff56d1c04ffb47e6a710f1267a996f 100644
--- a/zircon/system/dev/ethernet/ethertap/BUILD.gn
+++ b/zircon/system/dev/ethernet/ethertap/BUILD.gn
@@ -8,8 +8,8 @@ driver("ethertap") {
"ethertap.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-ethernet",
- "$zx/system/banjo/ddk-protocol-test",
+ "$zx/system/banjo/ddk.protocol.ethernet",
+ "$zx/system/banjo/ddk.protocol.test",
"$zx/system/fidl/fuchsia-hardware-ethernet:c",
"$zx/system/fidl/fuchsia-hardware-ethertap:c",
"$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/ethernet/intel-ethernet/BUILD.gn b/zircon/system/dev/ethernet/intel-ethernet/BUILD.gn
index 78baf154ed1f788f8b97e05473c7889d1e3b7506..a148df75b1ccbd61f3c7c13d7a615d59b75ba929 100644
--- a/zircon/system/dev/ethernet/intel-ethernet/BUILD.gn
+++ b/zircon/system/dev/ethernet/intel-ethernet/BUILD.gn
@@ -10,8 +10,8 @@ driver("intel-ethernet") {
"ie.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-ethernet",
- "$zx/system/banjo/ddk-protocol-pci",
+ "$zx/system/banjo/ddk.protocol.ethernet",
+ "$zx/system/banjo/ddk.protocol.pci",
"$zx/system/ulib/ddk",
"$zx/system/ulib/zircon",
]
diff --git a/zircon/system/dev/ethernet/realtek-8111/BUILD.gn b/zircon/system/dev/ethernet/realtek-8111/BUILD.gn
index c1cb4cae44052134d7f8c63ee624106045c73fb0..cc2699491695a50934ca3b35a9ff1b37d1bde21e 100644
--- a/zircon/system/dev/ethernet/realtek-8111/BUILD.gn
+++ b/zircon/system/dev/ethernet/realtek-8111/BUILD.gn
@@ -9,8 +9,8 @@ driver("realtek-8111") {
"rtl8111.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-ethernet",
- "$zx/system/banjo/ddk-protocol-pci",
+ "$zx/system/banjo/ddk.protocol.ethernet",
+ "$zx/system/banjo/ddk.protocol.pci",
"$zx/system/ulib/ddk",
"$zx/system/ulib/zircon",
]
diff --git a/zircon/system/dev/ethernet/realtek-8211f/BUILD.gn b/zircon/system/dev/ethernet/realtek-8211f/BUILD.gn
index df11fd55676dc1802592fc6bab18d215cdbda9c6..7f1511e7810480f71a0e5b38f06a72bf7cc72c2d 100644
--- a/zircon/system/dev/ethernet/realtek-8211f/BUILD.gn
+++ b/zircon/system/dev/ethernet/realtek-8211f/BUILD.gn
@@ -8,7 +8,7 @@ driver("realtek-8211f") {
"rtl8211f.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-ethernet-mac",
+ "$zx/system/banjo/ddk.protocol.ethernet.mac",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
"$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/ethernet/rndis/BUILD.gn b/zircon/system/dev/ethernet/rndis/BUILD.gn
index d915127938f3e662e015bc4eb7f8dccdb175306d..1d0073eeee0e238846049b0313e77f7b07c94fb6 100644
--- a/zircon/system/dev/ethernet/rndis/BUILD.gn
+++ b/zircon/system/dev/ethernet/rndis/BUILD.gn
@@ -7,10 +7,10 @@ driver("rndis") {
"rndishost.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-ethernet",
- "$zx/system/banjo/ddk-protocol-usb",
- "$zx/system/banjo/ddk-protocol-usb-composite",
- "$zx/system/banjo/ddk-protocol-usb-request",
+ "$zx/system/banjo/ddk.protocol.ethernet",
+ "$zx/system/banjo/ddk.protocol.usb",
+ "$zx/system/banjo/ddk.protocol.usb.composite",
+ "$zx/system/banjo/ddk.protocol.usb.request",
"$zx/system/dev/lib/usb",
"$zx/system/ulib/ddk",
"$zx/system/ulib/zircon",
diff --git a/zircon/system/dev/ethernet/usb-cdc-ecm/BUILD.gn b/zircon/system/dev/ethernet/usb-cdc-ecm/BUILD.gn
index 8ea8be31232e499fb3df31a48690ce9d957516f9..f40cbb230a3a426a21cbfb88b4d7b818817281a5 100644
--- a/zircon/system/dev/ethernet/usb-cdc-ecm/BUILD.gn
+++ b/zircon/system/dev/ethernet/usb-cdc-ecm/BUILD.gn
@@ -7,10 +7,10 @@ driver("usb-cdc-ecm") {
"usb-cdc-ecm.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-ethernet",
- "$zx/system/banjo/ddk-protocol-usb",
- "$zx/system/banjo/ddk-protocol-usb-composite",
- "$zx/system/banjo/ddk-protocol-usb-request",
+ "$zx/system/banjo/ddk.protocol.ethernet",
+ "$zx/system/banjo/ddk.protocol.usb",
+ "$zx/system/banjo/ddk.protocol.usb.composite",
+ "$zx/system/banjo/ddk.protocol.usb.request",
"$zx/system/dev/lib/usb",
"$zx/system/ulib/ddk",
"$zx/system/ulib/pretty",
diff --git a/zircon/system/dev/ethernet/usb-cdc-function/BUILD.gn b/zircon/system/dev/ethernet/usb-cdc-function/BUILD.gn
index e889f19d5ae8aa0d2b9ed5cccb208cf26ec778e6..2a7ef701ab0ea8e59f76bc3ba1bee533fceb92c3 100644
--- a/zircon/system/dev/ethernet/usb-cdc-function/BUILD.gn
+++ b/zircon/system/dev/ethernet/usb-cdc-function/BUILD.gn
@@ -7,10 +7,10 @@ driver("usb-cdc-function") {
"cdc-eth-function.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-ethernet",
- "$zx/system/banjo/ddk-protocol-usb",
- "$zx/system/banjo/ddk-protocol-usb-function",
- "$zx/system/banjo/ddk-protocol-usb-request",
+ "$zx/system/banjo/ddk.protocol.ethernet",
+ "$zx/system/banjo/ddk.protocol.usb",
+ "$zx/system/banjo/ddk.protocol.usb.function",
+ "$zx/system/banjo/ddk.protocol.usb.request",
"$zx/system/dev/lib/usb",
"$zx/system/ulib/ddk",
"$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/fw/qcom-pil/BUILD.gn b/zircon/system/dev/fw/qcom-pil/BUILD.gn
index 0bbef09c175a2184166cad4b49000802f98ecddf..1b87698598c03ced08246a4f8c2acad3288ccf0a 100644
--- a/zircon/system/dev/fw/qcom-pil/BUILD.gn
+++ b/zircon/system/dev/fw/qcom-pil/BUILD.gn
@@ -10,8 +10,8 @@ driver("qcom-pil") {
"qcom-pil.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/dev/lib/qcom",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/gpio/aml-axg-gpio/BUILD.gn b/zircon/system/dev/gpio/aml-axg-gpio/BUILD.gn
index b5f3f8b7091e8ceb1ca565b13518f70a06f13a84..54c67cfdd2711c7b4d05bbc8d0b4c9608a59f28f 100644
--- a/zircon/system/dev/gpio/aml-axg-gpio/BUILD.gn
+++ b/zircon/system/dev/gpio/aml-axg-gpio/BUILD.gn
@@ -7,10 +7,10 @@ driver("aml-axg-gpio") {
"aml-axg-gpio.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-gpioimpl",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.gpioimpl",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/dev/lib/amlogic",
"$zx/system/ulib/ddk",
"$zx/system/ulib/sync",
diff --git a/zircon/system/dev/gpio/aml-gxl-gpio/BUILD.gn b/zircon/system/dev/gpio/aml-gxl-gpio/BUILD.gn
index c0cd295f3877d1ba08af0c267cfb6b44dc065206..87d48c2ff98f4629eedb578a0e3595046d22d11c 100644
--- a/zircon/system/dev/gpio/aml-gxl-gpio/BUILD.gn
+++ b/zircon/system/dev/gpio/aml-gxl-gpio/BUILD.gn
@@ -7,10 +7,10 @@ driver("aml-gxl-gpio") {
"aml-gxl-gpio.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-gpioimpl",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.gpioimpl",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/dev/lib/amlogic",
"$zx/system/dev/lib/mmio",
"$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/gpio/gpio-test/BUILD.gn b/zircon/system/dev/gpio/gpio-test/BUILD.gn
index 3722bd9ffd9f6461e1bccd16b59b77a692a33dd5..b2de1a1b4ef1e57456380a1e4e0681713af64dd9 100644
--- a/zircon/system/dev/gpio/gpio-test/BUILD.gn
+++ b/zircon/system/dev/gpio/gpio-test/BUILD.gn
@@ -8,9 +8,9 @@ driver("gpio-test") {
"gpio-test.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-gpioimpl",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.gpioimpl",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
"$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/gpio/gpio/BUILD.gn b/zircon/system/dev/gpio/gpio/BUILD.gn
index 904b6975e624efe58abc498669ac3497164aa991..b89f2f75a999a977e85e9e9a414607a57b8ba100 100644
--- a/zircon/system/dev/gpio/gpio/BUILD.gn
+++ b/zircon/system/dev/gpio/gpio/BUILD.gn
@@ -7,8 +7,8 @@ driver("gpio") {
"gpio.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-gpioimpl",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.gpioimpl",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
"$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/gpio/hi3660-gpio/BUILD.gn b/zircon/system/dev/gpio/hi3660-gpio/BUILD.gn
index 4d1459e1bc86606ac01285d7954584f4c089bcd2..07251b6581ed85e43b45c497df69570973c6e328 100644
--- a/zircon/system/dev/gpio/hi3660-gpio/BUILD.gn
+++ b/zircon/system/dev/gpio/hi3660-gpio/BUILD.gn
@@ -7,10 +7,10 @@ driver("hi3660-gpio") {
"hi3660-gpio.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-gpioimpl",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.gpioimpl",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/dev/gpio/pl061",
"$zx/system/dev/lib/hi3660",
"$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/gpio/mt-8167/BUILD.gn b/zircon/system/dev/gpio/mt-8167/BUILD.gn
index 544cb95cf5d33b46a5361ea991b917125bfad2ac..dbfcbd5c5620d019c6a6bc3ac8fea915ae5ca501 100644
--- a/zircon/system/dev/gpio/mt-8167/BUILD.gn
+++ b/zircon/system/dev/gpio/mt-8167/BUILD.gn
@@ -8,10 +8,10 @@ driver("mt-8167") {
"mt8167-gpio.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-gpioimpl",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.gpioimpl",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/dev/lib/mmio",
"$zx/system/dev/lib/mt8167",
"$zx/system/ulib/ddk",
@@ -31,10 +31,10 @@ test("mtk-gpio") {
"mt8167-gpio.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-gpioimpl",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.gpioimpl",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/dev/lib/fake_ddk",
"$zx/system/dev/lib/mock-mmio-reg",
"$zx/system/dev/lib/mt8167",
diff --git a/zircon/system/dev/gpio/pl061/BUILD.gn b/zircon/system/dev/gpio/pl061/BUILD.gn
index 90708a3cc2a59c2a4a12429cf0fb7df42403db14..853c8b3ac3d07fc53e1cc71b2083ade29cb4920b 100644
--- a/zircon/system/dev/gpio/pl061/BUILD.gn
+++ b/zircon/system/dev/gpio/pl061/BUILD.gn
@@ -7,9 +7,9 @@ library("pl061") {
"pl061.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-gpioimpl",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.gpioimpl",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/ulib/ddk",
"$zx/system/ulib/driver",
"$zx/system/ulib/zircon",
diff --git a/zircon/system/dev/gpio/qcom-gpio/BUILD.gn b/zircon/system/dev/gpio/qcom-gpio/BUILD.gn
index 127e9e4214a765468cc6d903036913e4027e93c2..ee010bc78385711a46c2001e82230ce71dc217e2 100644
--- a/zircon/system/dev/gpio/qcom-gpio/BUILD.gn
+++ b/zircon/system/dev/gpio/qcom-gpio/BUILD.gn
@@ -8,9 +8,9 @@ driver("qcom-gpio") {
"qcom-gpio.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-gpioimpl",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.gpioimpl",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/dev/lib/mmio",
"$zx/system/ulib/bitmap",
"$zx/system/ulib/ddk",
@@ -28,9 +28,9 @@ test("qcom-gpio-test") {
"qcom-gpio.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-gpioimpl",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.gpioimpl",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/dev/lib/fake_ddk",
"$zx/system/dev/lib/mock-mmio-reg",
"$zx/system/ulib/bitmap",
diff --git a/zircon/system/dev/gpu/aml-gpu/BUILD.gn b/zircon/system/dev/gpu/aml-gpu/BUILD.gn
index 22b482668590b942ebcb3b224b51c7ceb15c7441..0c3fc659a42e2f743997c1d9bd12046084a43bfa 100644
--- a/zircon/system/dev/gpu/aml-gpu/BUILD.gn
+++ b/zircon/system/dev/gpu/aml-gpu/BUILD.gn
@@ -8,11 +8,11 @@ driver("aml-gpu") {
"aml-s905d2g.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-iommu",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-scpi",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.iommu",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.scpi",
"$zx/system/dev/lib/amlogic",
"$zx/system/fidl/fuchsia-hardware-gpu-clock:c",
"$zx/system/fidl/fuchsia-hardware-thermal:c",
diff --git a/zircon/system/dev/i2c/aml-i2c/BUILD.gn b/zircon/system/dev/i2c/aml-i2c/BUILD.gn
index f1ef3059feb95895f0f487cacb39d7b2833729cb..08cd9dab539bed662cbb03461b5f38c6f7624490 100644
--- a/zircon/system/dev/i2c/aml-i2c/BUILD.gn
+++ b/zircon/system/dev/i2c/aml-i2c/BUILD.gn
@@ -7,10 +7,10 @@ driver("aml-i2c") {
"aml-i2c.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-i2cimpl",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.i2cimpl",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/ulib/ddk",
"$zx/system/ulib/sync",
"$zx/system/ulib/zircon",
diff --git a/zircon/system/dev/i2c/dw-i2c/BUILD.gn b/zircon/system/dev/i2c/dw-i2c/BUILD.gn
index e02842b7ffae3327d3c9490a980cb31e17b9b9ee..ef0a04e2d6daf2fba752be3039ef66ff5c97618f 100644
--- a/zircon/system/dev/i2c/dw-i2c/BUILD.gn
+++ b/zircon/system/dev/i2c/dw-i2c/BUILD.gn
@@ -7,10 +7,10 @@ driver("dw-i2c") {
"dw-i2c.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-i2cimpl",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.i2cimpl",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/ulib/ddk",
"$zx/system/ulib/sync",
"$zx/system/ulib/zircon",
diff --git a/zircon/system/dev/i2c/i2c/BUILD.gn b/zircon/system/dev/i2c/i2c/BUILD.gn
index 32048fd90e3efd6af125b6ddd7d6f0409b411a6e..f8e2ffe7880863dc820a5e96e82eea02cb5390d6 100644
--- a/zircon/system/dev/i2c/i2c/BUILD.gn
+++ b/zircon/system/dev/i2c/i2c/BUILD.gn
@@ -4,13 +4,13 @@
driver("i2c") {
sources = [
- "i2c.cpp",
"i2c-bus.cpp",
"i2c-child.cpp",
+ "i2c.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-i2cimpl",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.i2cimpl",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
"$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/i2c/intel-i2c/BUILD.gn b/zircon/system/dev/i2c/intel-i2c/BUILD.gn
index ef018240af86c937df3a95533e016473db35e360..bfb1beae556fdea8acff9e9d61161dcce994aab9 100644
--- a/zircon/system/dev/i2c/intel-i2c/BUILD.gn
+++ b/zircon/system/dev/i2c/intel-i2c/BUILD.gn
@@ -8,9 +8,9 @@ driver("intel-i2c") {
"intel-i2c-slave.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-i2cimpl",
- "$zx/system/banjo/ddk-protocol-pci",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.i2cimpl",
+ "$zx/system/banjo/ddk.protocol.pci",
"$zx/system/fidl/fuchsia-hardware-i2c:c",
"$zx/system/ulib/ddk",
"$zx/system/ulib/sync",
diff --git a/zircon/system/dev/i2c/mt8167-i2c/BUILD.gn b/zircon/system/dev/i2c/mt8167-i2c/BUILD.gn
index 789986283eae9e6186b7f66eff6c9f47a7ca1aaf..acbf23229aa84d2f446e4bdc75720a8137b8dd6f 100644
--- a/zircon/system/dev/i2c/mt8167-i2c/BUILD.gn
+++ b/zircon/system/dev/i2c/mt8167-i2c/BUILD.gn
@@ -7,10 +7,10 @@ driver("mt8167-i2c") {
"mt8167-i2c.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-i2cimpl",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.i2cimpl",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/dev/lib/mmio",
"$zx/system/dev/lib/mt8167",
"$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/input/bma253/BUILD.gn b/zircon/system/dev/input/bma253/BUILD.gn
index 57e9c0ea6b501c8ad54d1179a08ff5ecd25aceaf..48d62ab5c11914922262152e2d1aea19e38baec5 100644
--- a/zircon/system/dev/input/bma253/BUILD.gn
+++ b/zircon/system/dev/input/bma253/BUILD.gn
@@ -7,10 +7,10 @@ driver("bma253") {
"bma253.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-clock",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-hidbus",
- "$zx/system/banjo/ddk-protocol-i2c",
+ "$zx/system/banjo/ddk.protocol.clock",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.hidbus",
+ "$zx/system/banjo/ddk.protocol.i2c",
"$zx/system/dev/lib/mmio",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/input/focaltech/BUILD.gn b/zircon/system/dev/input/focaltech/BUILD.gn
index 445e729211a735db19b4d83d02f9f209ff6ec9db..8b757f56d3befe0acee4c080bc8a96444a4e7dfc 100644
--- a/zircon/system/dev/input/focaltech/BUILD.gn
+++ b/zircon/system/dev/input/focaltech/BUILD.gn
@@ -7,12 +7,12 @@ driver("focaltech") {
"ft_device.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-composite",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-hidbus",
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-test",
+ "$zx/system/banjo/ddk.protocol.composite",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.hidbus",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.test",
"$zx/system/dev/lib/focaltech",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/input/goodix/BUILD.gn b/zircon/system/dev/input/goodix/BUILD.gn
index 0eb7c07849882196a5d40800a8fa2905e6e08efa..b7623cf55a1750cade5da73d0555b76aab97539c 100644
--- a/zircon/system/dev/input/goodix/BUILD.gn
+++ b/zircon/system/dev/input/goodix/BUILD.gn
@@ -7,12 +7,12 @@ driver("goodix") {
"gt92xx.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-clock",
- "$zx/system/banjo/ddk-protocol-composite",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-hidbus",
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.clock",
+ "$zx/system/banjo/ddk.protocol.composite",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.hidbus",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/dev/lib/mmio",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/input/hid-buttons/BUILD.gn b/zircon/system/dev/input/hid-buttons/BUILD.gn
index 3944e3c246487f835a2a6a70058e67927393c5ff..4d095d0d2af53709033d3736c304632d80326bae 100644
--- a/zircon/system/dev/input/hid-buttons/BUILD.gn
+++ b/zircon/system/dev/input/hid-buttons/BUILD.gn
@@ -8,10 +8,10 @@ driver("hid-buttons") {
"hid-buttons.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-hidbus",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.hidbus",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/fidl/fuchsia-device-manager:c",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/input/hid/BUILD.gn b/zircon/system/dev/input/hid/BUILD.gn
index fe41ff8aa92136488ea09975ec610da84e24fbf8..73115f57c7499ed74c67c041b45e0add9f76d3ae 100644
--- a/zircon/system/dev/input/hid/BUILD.gn
+++ b/zircon/system/dev/input/hid/BUILD.gn
@@ -9,7 +9,7 @@ driver("hid") {
"hid.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-hidbus",
+ "$zx/system/banjo/ddk.protocol.hidbus",
"$zx/system/fidl/fuchsia-hardware-input:c",
"$zx/system/ulib/ddk",
"$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/input/hidctl/BUILD.gn b/zircon/system/dev/input/hidctl/BUILD.gn
index 73ab325cb5d6d589a257e8c5f950ec3c61bb83b1..8bfaa026d696bfd18bbf1ca067502a1e52ca3710 100644
--- a/zircon/system/dev/input/hidctl/BUILD.gn
+++ b/zircon/system/dev/input/hidctl/BUILD.gn
@@ -8,7 +8,7 @@ driver("hidctl") {
"hidctl.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-hidbus",
+ "$zx/system/banjo/ddk.protocol.hidbus",
"$zx/system/fidl/fuchsia-hardware-hidctl:c",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/input/i2c-hid/BUILD.gn b/zircon/system/dev/input/i2c-hid/BUILD.gn
index ac068e9a835054a3bb27f6559d00daa240b99078..3a6bebe6856b24af5428b73ae06092467b278bdf 100644
--- a/zircon/system/dev/input/i2c-hid/BUILD.gn
+++ b/zircon/system/dev/input/i2c-hid/BUILD.gn
@@ -7,8 +7,8 @@ driver("i2c-hid") {
"i2c-hid.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-hidbus",
- "$zx/system/banjo/ddk-protocol-i2c",
+ "$zx/system/banjo/ddk.protocol.hidbus",
+ "$zx/system/banjo/ddk.protocol.i2c",
"$zx/system/ulib/ddk",
"$zx/system/ulib/hid",
"$zx/system/ulib/sync",
diff --git a/zircon/system/dev/input/pc-ps2/BUILD.gn b/zircon/system/dev/input/pc-ps2/BUILD.gn
index 735640946a8f886534c3b90e848d2ae03689bb29..59ae8c36d6093189887a0d6d70d8baf14c9791be 100644
--- a/zircon/system/dev/input/pc-ps2/BUILD.gn
+++ b/zircon/system/dev/input/pc-ps2/BUILD.gn
@@ -9,7 +9,7 @@ driver("pc-ps2") {
"i8042.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-hidbus",
+ "$zx/system/banjo/ddk.protocol.hidbus",
"$zx/system/fidl/fuchsia-hardware-input:c",
"$zx/system/ulib/ddk",
"$zx/system/ulib/hid",
diff --git a/zircon/system/dev/input/usb-hid/BUILD.gn b/zircon/system/dev/input/usb-hid/BUILD.gn
index 76906f69162620d087ccfcb897868e5d7abb3b54..0caaae37a4d49525526ce8b6c9ddfbd05e0b381a 100644
--- a/zircon/system/dev/input/usb-hid/BUILD.gn
+++ b/zircon/system/dev/input/usb-hid/BUILD.gn
@@ -7,10 +7,10 @@ driver("usb-hid") {
"usb-hid.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-hidbus",
- "$zx/system/banjo/ddk-protocol-usb",
- "$zx/system/banjo/ddk-protocol-usb-composite",
- "$zx/system/banjo/ddk-protocol-usb-request",
+ "$zx/system/banjo/ddk.protocol.hidbus",
+ "$zx/system/banjo/ddk.protocol.usb",
+ "$zx/system/banjo/ddk.protocol.usb.composite",
+ "$zx/system/banjo/ddk.protocol.usb.request",
"$zx/system/dev/lib/usb",
"$zx/system/ulib/ddk",
"$zx/system/ulib/pretty",
diff --git a/zircon/system/dev/lib/amlogic/BUILD.gn b/zircon/system/dev/lib/amlogic/BUILD.gn
index 7075bbe9f1b6d3ae996471133a37accd1a6279d4..f02ac6b39c13fa234bd9fe644f83aa5a3a7b2e1f 100644
--- a/zircon/system/dev/lib/amlogic/BUILD.gn
+++ b/zircon/system/dev/lib/amlogic/BUILD.gn
@@ -13,8 +13,8 @@ library("amlogic") {
"s905d2-pll-rates.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/dev/lib/mmio",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/lib/scsi/BUILD.gn b/zircon/system/dev/lib/scsi/BUILD.gn
index f4de6bb7c8313c3fe3f65a67f9c6fbfa14b5e363..e7ee42a03b9266e1d9dea5cdaf1e4ff405a87c52 100644
--- a/zircon/system/dev/lib/scsi/BUILD.gn
+++ b/zircon/system/dev/lib/scsi/BUILD.gn
@@ -5,13 +5,13 @@
library("scsi") {
sdk_headers = [
"scsi/scsilib.h",
- "scsi/scsilib_controller.h"
+ "scsi/scsilib_controller.h",
]
sources = [
- "scsilib.cpp"
+ "scsilib.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-block",
+ "$zx/system/banjo/ddk.protocol.block",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
"$zx/system/ulib/driver",
@@ -29,7 +29,7 @@ test("scsilib-disk-test") {
]
deps = [
":scsi",
- "$zx/system/banjo/ddk-protocol-block",
+ "$zx/system/banjo/ddk.protocol.block",
"$zx/system/dev/lib/fake-bti",
"$zx/system/dev/lib/fake_ddk",
"$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/lib/usb/BUILD.gn b/zircon/system/dev/lib/usb/BUILD.gn
index 18c46e880f79f84307653ef440d9ae9ffb80f0e2..0d05fb2d861689a59df90b8966ed139e2407379e 100644
--- a/zircon/system/dev/lib/usb/BUILD.gn
+++ b/zircon/system/dev/lib/usb/BUILD.gn
@@ -21,9 +21,9 @@ library("usb") {
"$zx/system/dev/lib/operation:headers",
]
deps = [
- "$zx/system/banjo/ddk-protocol-usb",
- "$zx/system/banjo/ddk-protocol-usb-composite",
- "$zx/system/banjo/ddk-protocol-usb-request",
+ "$zx/system/banjo/ddk.protocol.usb",
+ "$zx/system/banjo/ddk.protocol.usb.composite",
+ "$zx/system/banjo/ddk.protocol.usb.request",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
]
@@ -35,8 +35,8 @@ test("usb-wrapper-test") {
]
deps = [
":usb",
- "$zx/system/banjo/ddk-protocol-usb",
- "$zx/system/banjo/ddk-protocol-usb-composite",
+ "$zx/system/banjo/ddk.protocol.usb",
+ "$zx/system/banjo/ddk.protocol.usb.composite",
"$zx/system/dev/lib/fake-bti",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/light-sensor/ams-light/BUILD.gn b/zircon/system/dev/light-sensor/ams-light/BUILD.gn
index 1db4379c59efa4d3ae63b409f00ade3c750d78c0..0b92db5eb7cd601aaaf7b0283b51f36c4d097b97 100644
--- a/zircon/system/dev/light-sensor/ams-light/BUILD.gn
+++ b/zircon/system/dev/light-sensor/ams-light/BUILD.gn
@@ -7,10 +7,10 @@ driver("ams-light") {
"tcs3400.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-composite",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-hidbus",
- "$zx/system/banjo/ddk-protocol-i2c",
+ "$zx/system/banjo/ddk.protocol.composite",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.hidbus",
+ "$zx/system/banjo/ddk.protocol.i2c",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
"$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/light-sensor/lite-on/BUILD.gn b/zircon/system/dev/light-sensor/lite-on/BUILD.gn
index 56eb2ff1ffd836fe98b3ef758cb348e54e3265c0..767891d6517f25f8b21e4c7500f3196cb821619f 100644
--- a/zircon/system/dev/light-sensor/lite-on/BUILD.gn
+++ b/zircon/system/dev/light-sensor/lite-on/BUILD.gn
@@ -8,8 +8,8 @@ driver("lite-on") {
"ltr-578als.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-hidbus",
- "$zx/system/banjo/ddk-protocol-i2c",
+ "$zx/system/banjo/ddk.protocol.hidbus",
+ "$zx/system/banjo/ddk.protocol.i2c",
"$zx/system/dev/lib/mmio",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/light/gpio-light/BUILD.gn b/zircon/system/dev/light/gpio-light/BUILD.gn
index 30739f53199085ea625e0baf4d1adabffb82e009..2622014da2c5fdf61d8805bfc4ac661adc3b15ad 100644
--- a/zircon/system/dev/light/gpio-light/BUILD.gn
+++ b/zircon/system/dev/light/gpio-light/BUILD.gn
@@ -7,9 +7,9 @@ driver("gpio-light") {
"gpio-light.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-gpioimpl",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.gpioimpl",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/fidl/fuchsia-hardware-light:c",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/misc/cpu-trace/BUILD.gn b/zircon/system/dev/misc/cpu-trace/BUILD.gn
index aa91d50488e76b822e07d7330ac62a8b337f86d6..170a712719b88e64da65ae232fd1e99442c2e67a 100644
--- a/zircon/system/dev/misc/cpu-trace/BUILD.gn
+++ b/zircon/system/dev/misc/cpu-trace/BUILD.gn
@@ -18,7 +18,7 @@ driver("cpu-trace") {
}
deps = [
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
"$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/misc/goldfish/BUILD.gn b/zircon/system/dev/misc/goldfish/BUILD.gn
index 979b69aae85e73ffcc3eaee5b55ad3b993b36634..b83a3a548c0b963db251b31b5cd9273fd133a03d 100644
--- a/zircon/system/dev/misc/goldfish/BUILD.gn
+++ b/zircon/system/dev/misc/goldfish/BUILD.gn
@@ -8,8 +8,8 @@ driver("goldfish") {
"pipe-device.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-acpi",
- "$zx/system/banjo/ddk-protocol-goldfish-pipe",
+ "$zx/system/banjo/ddk.protocol.acpi",
+ "$zx/system/banjo/ddk.protocol.goldfish.pipe",
"$zx/system/dev/lib/mmio",
"$zx/system/fidl/fuchsia-hardware-goldfish-pipe:c",
"$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/misc/test/BUILD.gn b/zircon/system/dev/misc/test/BUILD.gn
index 94c201c156fee02bb9d6b4ccf5e3128502dfb6b3..951cb86feb0f0555955474daad96b883bbe5763f 100644
--- a/zircon/system/dev/misc/test/BUILD.gn
+++ b/zircon/system/dev/misc/test/BUILD.gn
@@ -7,7 +7,7 @@ driver("test") {
"test.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-test",
+ "$zx/system/banjo/ddk.protocol.test",
"$zx/system/fidl/fuchsia-device-test:c",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/misc/tpm/BUILD.gn b/zircon/system/dev/misc/tpm/BUILD.gn
index 94e723b70315568b80d6c37bfcced619bbb56074..b72ee0ae1ad09e69adaff2da21fd4f9a1aa7464f 100644
--- a/zircon/system/dev/misc/tpm/BUILD.gn
+++ b/zircon/system/dev/misc/tpm/BUILD.gn
@@ -13,7 +13,7 @@ driver("tpm") {
"tpm.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-i2c",
+ "$zx/system/banjo/ddk.protocol.i2c",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
"$zx/system/ulib/explicit-memory",
diff --git a/zircon/system/dev/mlg/usb-harriet/BUILD.gn b/zircon/system/dev/mlg/usb-harriet/BUILD.gn
index 6ba39a6159c62614470ec98e6e3d3b3705ba395d..d0f2ad49e8ae6483eb7d4e8df2c840e5ba54fd9b 100644
--- a/zircon/system/dev/mlg/usb-harriet/BUILD.gn
+++ b/zircon/system/dev/mlg/usb-harriet/BUILD.gn
@@ -7,9 +7,9 @@ driver("usb-harriet") {
"usb-harriet.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-usb",
- "$zx/system/banjo/ddk-protocol-usb-composite",
- "$zx/system/banjo/ddk-protocol-usb-request",
+ "$zx/system/banjo/ddk.protocol.usb",
+ "$zx/system/banjo/ddk.protocol.usb.composite",
+ "$zx/system/banjo/ddk.protocol.usb.request",
"$zx/system/dev/lib/usb",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/nand/aml-rawnand/BUILD.gn b/zircon/system/dev/nand/aml-rawnand/BUILD.gn
index f71ba61285e46d652f837bd4fd7198e345b4d53c..2c172ce89f27b2917997c867c02c3f885cadb37a 100644
--- a/zircon/system/dev/nand/aml-rawnand/BUILD.gn
+++ b/zircon/system/dev/nand/aml-rawnand/BUILD.gn
@@ -8,8 +8,8 @@ driver("aml-rawnand") {
"onfi.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-rawnand",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.rawnand",
"$zx/system/dev/lib/amlogic",
"$zx/system/fidl/fuchsia-hardware-nand:c",
"$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/nand/broker/BUILD.gn b/zircon/system/dev/nand/broker/BUILD.gn
index 7e385f30a465db6e260de7caa89535c47d2411c5..a747a983e4b1fb7567e5ed541dc07bc2f3a416b4 100644
--- a/zircon/system/dev/nand/broker/BUILD.gn
+++ b/zircon/system/dev/nand/broker/BUILD.gn
@@ -13,7 +13,7 @@ driver("nand-broker") {
"broker.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-nand",
+ "$zx/system/banjo/ddk.protocol.nand",
"$zx/system/fidl/fuchsia-hardware-nand:c",
"$zx/system/fidl/fuchsia-nand:c",
"$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/nand/broker/test/BUILD.gn b/zircon/system/dev/nand/broker/test/BUILD.gn
index 8a298bf930f0e86310f138d2d05d292252a6a9b0..f987c692ca3b5df2a053a0a8da2ecd2b8fe3aa13 100644
--- a/zircon/system/dev/nand/broker/test/BUILD.gn
+++ b/zircon/system/dev/nand/broker/test/BUILD.gn
@@ -19,7 +19,7 @@ source_set("common") {
"parent.cpp",
]
public_deps = [
- "$zx/system/banjo/ddk-protocol-nand",
+ "$zx/system/banjo/ddk.protocol.nand",
"$zx/system/fidl/fuchsia-device:c",
"$zx/system/fidl/fuchsia-hardware-nand:c",
"$zx/system/fidl/fuchsia-nand:c",
diff --git a/zircon/system/dev/nand/nand/BUILD.gn b/zircon/system/dev/nand/nand/BUILD.gn
index 7b4214047c7574acc1006309e325b5c2842436c9..7b246caf7fc386cf07c6347813858d1531ae96ad 100644
--- a/zircon/system/dev/nand/nand/BUILD.gn
+++ b/zircon/system/dev/nand/nand/BUILD.gn
@@ -7,9 +7,9 @@ driver("nand") {
"nand.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-nand",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-rawnand",
+ "$zx/system/banjo/ddk.protocol.nand",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.rawnand",
"$zx/system/dev/lib/operation",
"$zx/system/fidl/fuchsia-hardware-nand:c",
"$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/nand/nand/test/BUILD.gn b/zircon/system/dev/nand/nand/test/BUILD.gn
index d7598f1ed1d4f0bde63640d673905f65a719db4b..fc5f4627e064c4d8aefb7775b2448a6a793e138f 100644
--- a/zircon/system/dev/nand/nand/test/BUILD.gn
+++ b/zircon/system/dev/nand/nand/test/BUILD.gn
@@ -16,8 +16,8 @@ test("nand-unittest") {
include_dirs = [ ".." ]
deps = [
":common",
- "$zx/system/banjo/ddk-protocol-nand",
- "$zx/system/banjo/ddk-protocol-rawnand",
+ "$zx/system/banjo/ddk.protocol.nand",
+ "$zx/system/banjo/ddk.protocol.rawnand",
"$zx/system/dev/lib/fake_ddk",
"$zx/system/dev/lib/operation",
"$zx/system/ulib/ddk",
@@ -38,9 +38,9 @@ source_set("common") {
"../nand.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-nand",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-rawnand",
+ "$zx/system/banjo/ddk.protocol.nand",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.rawnand",
"$zx/system/dev/lib/operation",
"$zx/system/fidl/fuchsia-hardware-nand:c",
"$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/nand/nandpart/BUILD.gn b/zircon/system/dev/nand/nandpart/BUILD.gn
index 7eac876f60bed7ab4aac6d520fadfda64c8f867c..68a802ad6c7f06b4d2ccc4bd79f25344d23e399b 100644
--- a/zircon/system/dev/nand/nandpart/BUILD.gn
+++ b/zircon/system/dev/nand/nandpart/BUILD.gn
@@ -11,8 +11,8 @@ driver("nandpart") {
"nandpart.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-badblock",
- "$zx/system/banjo/ddk-protocol-nand",
+ "$zx/system/banjo/ddk.protocol.badblock",
+ "$zx/system/banjo/ddk.protocol.nand",
"$zx/system/dev/lib/operation",
"$zx/system/fidl/fuchsia-hardware-nand:c",
"$zx/system/ulib/ddk",
@@ -37,7 +37,7 @@ test("nandpart-test") {
include_dirs = [ "." ]
defines = [ "TEST" ]
deps = [
- "$zx/system/banjo/ddk-protocol-nand",
+ "$zx/system/banjo/ddk.protocol.nand",
"$zx/system/fidl/fuchsia-hardware-nand:c",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/nand/ram-nand/BUILD.gn b/zircon/system/dev/nand/ram-nand/BUILD.gn
index 8861cf09b3473ac4f14945998a856ffd11d17300..9979b8fc0f8e468069cab41efa0f55b72b8d25eb 100644
--- a/zircon/system/dev/nand/ram-nand/BUILD.gn
+++ b/zircon/system/dev/nand/ram-nand/BUILD.gn
@@ -9,7 +9,7 @@ driver("ram-nand") {
]
deps = [
":common",
- "$zx/system/banjo/ddk-protocol-nand",
+ "$zx/system/banjo/ddk.protocol.nand",
"$zx/system/fidl/fuchsia-hardware-nand:c",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
@@ -28,7 +28,7 @@ source_set("common") {
"ram-nand.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-nand",
+ "$zx/system/banjo/ddk.protocol.nand",
"$zx/system/fidl/fuchsia-hardware-nand:c",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
@@ -45,7 +45,7 @@ test("ram-nand-test") {
include_dirs = [ "." ]
deps = [
":common",
- "$zx/system/banjo/ddk-protocol-nand",
+ "$zx/system/banjo/ddk.protocol.nand",
"$zx/system/dev/lib/fake_ddk",
"$zx/system/fidl/fuchsia-hardware-nand:c",
"$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/nand/skip-block/BUILD.gn b/zircon/system/dev/nand/skip-block/BUILD.gn
index d4afaf56dbc5600b0fc09b924a8617d6779a7c2a..4ad07bd1e29b96a33937fd8bb6b34033acc059ea 100644
--- a/zircon/system/dev/nand/skip-block/BUILD.gn
+++ b/zircon/system/dev/nand/skip-block/BUILD.gn
@@ -9,8 +9,8 @@ driver("skip-block") {
]
deps = [
":common",
- "$zx/system/banjo/ddk-protocol-badblock",
- "$zx/system/banjo/ddk-protocol-nand",
+ "$zx/system/banjo/ddk.protocol.badblock",
+ "$zx/system/banjo/ddk.protocol.nand",
"$zx/system/dev/lib/operation",
"$zx/system/fidl/fuchsia-hardware-nand:c",
"$zx/system/fidl/fuchsia-hardware-skipblock:c",
diff --git a/zircon/system/dev/pci/amlogic-pcie/BUILD.gn b/zircon/system/dev/pci/amlogic-pcie/BUILD.gn
index 374ca40d39c74b3a5216dd20845bfe43f15d8ec4..1f03b9ddec64d72f06e6b5063833f25d1ced91ea 100644
--- a/zircon/system/dev/pci/amlogic-pcie/BUILD.gn
+++ b/zircon/system/dev/pci/amlogic-pcie/BUILD.gn
@@ -9,9 +9,9 @@ driver("amlogic-pcie") {
"aml-pcie.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-clock",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.clock",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/dev/lib/amlogic",
"$zx/system/dev/lib/mmio",
"$zx/system/dev/pci/designware",
diff --git a/zircon/system/dev/power/msm8x53-power/BUILD.gn b/zircon/system/dev/power/msm8x53-power/BUILD.gn
index 52fe8dbdffd0f21244393e0321d7be4cb1965231..a97f7a7703fe5a4b387d664a8b047e297ee8483c 100644
--- a/zircon/system/dev/power/msm8x53-power/BUILD.gn
+++ b/zircon/system/dev/power/msm8x53-power/BUILD.gn
@@ -7,9 +7,9 @@ driver("msm8x53-power") {
"msm8x53-power.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-powerimpl",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.powerimpl",
"$zx/system/dev/lib/mmio",
"$zx/system/dev/lib/msm8x53",
"$zx/system/ulib/ddk",
@@ -32,9 +32,9 @@ test("msm8x53-power-test") {
"msm8x53-power.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-powerimpl",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.powerimpl",
"$zx/system/dev/lib/mock-mmio-reg",
"$zx/system/dev/lib/msm8x53",
"$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/power/mtk-power/BUILD.gn b/zircon/system/dev/power/mtk-power/BUILD.gn
index 1ada10f68d6a269621e39bba6b930a55162a9263..3a26efa340be4b9da504a18dcbc03656ffe152c0 100644
--- a/zircon/system/dev/power/mtk-power/BUILD.gn
+++ b/zircon/system/dev/power/mtk-power/BUILD.gn
@@ -7,11 +7,11 @@ driver("mtk-power") {
"mtk-power.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-powerimpl",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.powerimpl",
"$zx/system/dev/lib/mmio",
"$zx/system/dev/lib/mt8167",
"$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/power/power/BUILD.gn b/zircon/system/dev/power/power/BUILD.gn
index 42a24f016a428c1678f285f6952ce4f91df4bee1..bf0276ba924ff564fbf2e98a7fe2357aaba9ff5b 100644
--- a/zircon/system/dev/power/power/BUILD.gn
+++ b/zircon/system/dev/power/power/BUILD.gn
@@ -7,8 +7,8 @@ driver("power") {
"power.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-power",
- "$zx/system/banjo/ddk-protocol-powerimpl",
+ "$zx/system/banjo/ddk.protocol.power",
+ "$zx/system/banjo/ddk.protocol.powerimpl",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
"$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/rtc/nxp/BUILD.gn b/zircon/system/dev/rtc/nxp/BUILD.gn
index 3cabff52f9e00c36f44810e949625e63f0954bb9..99fd925d43f0b77d2712ae4a77ba65ccd212c1c9 100644
--- a/zircon/system/dev/rtc/nxp/BUILD.gn
+++ b/zircon/system/dev/rtc/nxp/BUILD.gn
@@ -7,7 +7,7 @@ driver("nxp") {
"pcf8563-rtc.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-i2c",
+ "$zx/system/banjo/ddk.protocol.i2c",
"$zx/system/fidl/fuchsia-hardware-rtc:c",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/rtc/pl031-rtc/BUILD.gn b/zircon/system/dev/rtc/pl031-rtc/BUILD.gn
index a043a86e384068c31209543c7837e5f89dd0239f..9e4776517765f15441bc455422017f195eb1ad92 100644
--- a/zircon/system/dev/rtc/pl031-rtc/BUILD.gn
+++ b/zircon/system/dev/rtc/pl031-rtc/BUILD.gn
@@ -7,7 +7,7 @@ driver("pl031-rtc") {
"pl031-rtc.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/fidl/fuchsia-hardware-rtc:c",
"$zx/system/ulib/ddk",
"$zx/system/ulib/rtc",
diff --git a/zircon/system/dev/scpi/aml-scpi-s912/BUILD.gn b/zircon/system/dev/scpi/aml-scpi-s912/BUILD.gn
index 953451cde4149cb01762a0d00d04f3a8fc1174f2..92d745e2b09430325e3534e99c28dcef57274abb 100644
--- a/zircon/system/dev/scpi/aml-scpi-s912/BUILD.gn
+++ b/zircon/system/dev/scpi/aml-scpi-s912/BUILD.gn
@@ -14,12 +14,12 @@ driver("aml-scpi-s912.mailbox") {
"aml-mailbox.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-clock",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-mailbox",
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.clock",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.mailbox",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/dev/lib/mmio",
"$zx/system/fidl/fuchsia-hardware-thermal:c",
"$zx/system/ulib/ddk",
@@ -36,8 +36,8 @@ driver("scpi") {
"aml-scpi.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-mailbox",
- "$zx/system/banjo/ddk-protocol-scpi",
+ "$zx/system/banjo/ddk.protocol.mailbox",
+ "$zx/system/banjo/ddk.protocol.scpi",
"$zx/system/fidl/fuchsia-hardware-thermal:c",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/serial/aml-uart/BUILD.gn b/zircon/system/dev/serial/aml-uart/BUILD.gn
index bef0835c9dc885a098f10d31eb772792fd4319ec..f421e38ab16b9cc50b2074dce6068be34ab9299f 100644
--- a/zircon/system/dev/serial/aml-uart/BUILD.gn
+++ b/zircon/system/dev/serial/aml-uart/BUILD.gn
@@ -8,10 +8,10 @@ driver("aml-uart") {
"binding.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-serial",
- "$zx/system/banjo/ddk-protocol-serialimpl",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.serial",
+ "$zx/system/banjo/ddk.protocol.serialimpl",
"$zx/system/dev/lib/amlogic",
"$zx/system/dev/lib/mmio",
"$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/serial/ftdi/BUILD.gn b/zircon/system/dev/serial/ftdi/BUILD.gn
index 2aafcc993bf596f482fa09c146dcd4020e511dd6..13917ad57e65407fdfa8e378c0879ec97b1a6ff9 100644
--- a/zircon/system/dev/serial/ftdi/BUILD.gn
+++ b/zircon/system/dev/serial/ftdi/BUILD.gn
@@ -7,11 +7,11 @@ driver("ftdi") {
"ftdi.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-serial",
- "$zx/system/banjo/ddk-protocol-serialimpl",
- "$zx/system/banjo/ddk-protocol-usb",
- "$zx/system/banjo/ddk-protocol-usb-composite",
- "$zx/system/banjo/ddk-protocol-usb-request",
+ "$zx/system/banjo/ddk.protocol.serial",
+ "$zx/system/banjo/ddk.protocol.serialimpl",
+ "$zx/system/banjo/ddk.protocol.usb",
+ "$zx/system/banjo/ddk.protocol.usb.composite",
+ "$zx/system/banjo/ddk.protocol.usb.request",
"$zx/system/dev/lib/usb",
"$zx/system/ulib/ddk",
"$zx/system/ulib/zircon",
diff --git a/zircon/system/dev/serial/intel-serialio/BUILD.gn b/zircon/system/dev/serial/intel-serialio/BUILD.gn
index fba5c3d95ddd46438c4f80d70612546dc43ce12d..a2b28f73f4739503c1ba7e68bb1d119db5f903bf 100644
--- a/zircon/system/dev/serial/intel-serialio/BUILD.gn
+++ b/zircon/system/dev/serial/intel-serialio/BUILD.gn
@@ -12,8 +12,8 @@ driver("intel-serialio") {
]
include_dirs = [ "intel-serialio-include" ]
deps = [
- "$zx/system/banjo/ddk-protocol-pci",
- "$zx/system/banjo/ddk-protocol-serial",
+ "$zx/system/banjo/ddk.protocol.pci",
+ "$zx/system/banjo/ddk.protocol.serial",
"$zx/system/ulib/ddk",
"$zx/system/ulib/zircon",
]
diff --git a/zircon/system/dev/serial/serial/BUILD.gn b/zircon/system/dev/serial/serial/BUILD.gn
index ec489869d7c03f8f67279df69f2e3379e98200a3..7d205be55b9ecb1fac755ed5abcf24834261aabc 100644
--- a/zircon/system/dev/serial/serial/BUILD.gn
+++ b/zircon/system/dev/serial/serial/BUILD.gn
@@ -7,8 +7,8 @@ driver("serial") {
"serial.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-serial",
- "$zx/system/banjo/ddk-protocol-serialimpl",
+ "$zx/system/banjo/ddk.protocol.serial",
+ "$zx/system/banjo/ddk.protocol.serialimpl",
"$zx/system/ulib/ddk",
"$zx/system/ulib/sync",
"$zx/system/ulib/zircon",
diff --git a/zircon/system/dev/sysmem/sysmem/BUILD.gn b/zircon/system/dev/sysmem/sysmem/BUILD.gn
index 4ae7e7a75611918c7b957a64ae21a066699df7c9..95421b29373da34565531ea631944d5107fb3e5a 100644
--- a/zircon/system/dev/sysmem/sysmem/BUILD.gn
+++ b/zircon/system/dev/sysmem/sysmem/BUILD.gn
@@ -17,9 +17,9 @@ driver("sysmem") {
"usage_pixel_format_cost.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-sysmem",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.sysmem",
"$zx/system/fidl/fuchsia-sysmem:c",
"$zx/system/ulib/async:async-cpp",
"$zx/system/ulib/async-loop:async-loop-cpp",
@@ -46,9 +46,9 @@ test("sysmem-unittest") {
]
include_dirs = [ "." ]
deps = [
- "$zx/system/banjo/ddk-protocol-platform-bus",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-sysmem",
+ "$zx/system/banjo/ddk.protocol.platform.bus",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.sysmem",
"$zx/system/dev/lib/fake_ddk",
"$zx/system/fidl/fuchsia-sysmem:c",
"$zx/system/ulib/async:async-cpp",
diff --git a/zircon/system/dev/tee/optee/BUILD.gn b/zircon/system/dev/tee/optee/BUILD.gn
index b5dfd3cf24ae81d4bd8a38d13dbfcbbb5a6f2483..a0316c23c81c574d4f1f4af1a2323b8184fbb6b1 100644
--- a/zircon/system/dev/tee/optee/BUILD.gn
+++ b/zircon/system/dev/tee/optee/BUILD.gn
@@ -12,7 +12,7 @@ driver("optee") {
"util.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/dev/lib/mmio",
"$zx/system/fidl/fuchsia-hardware-tee:c",
"$zx/system/fidl/fuchsia-tee-manager:c",
diff --git a/zircon/system/dev/test/ddk-test/BUILD.gn b/zircon/system/dev/test/ddk-test/BUILD.gn
index d50402fe70bf8e47c617f190ec525cee24b5837f..bba3c1da22b1c40461bb62fbc583915317c6183e 100644
--- a/zircon/system/dev/test/ddk-test/BUILD.gn
+++ b/zircon/system/dev/test/ddk-test/BUILD.gn
@@ -10,9 +10,9 @@ test_driver("ddk-test") {
"usb-request-test.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-test",
- "$zx/system/banjo/ddk-protocol-usb",
- "$zx/system/banjo/ddk-protocol-usb-request",
+ "$zx/system/banjo/ddk.protocol.test",
+ "$zx/system/banjo/ddk.protocol.usb",
+ "$zx/system/banjo/ddk.protocol.usb.request",
"$zx/system/dev/lib/fake-bti",
"$zx/system/dev/lib/usb",
"$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/test/mock-device/BUILD.gn b/zircon/system/dev/test/mock-device/BUILD.gn
index e72b050aad623c8fd7993fcc763450159c0a717a..4702174c2beeab77e40d6cb3e920a44b0cba0d59 100644
--- a/zircon/system/dev/test/mock-device/BUILD.gn
+++ b/zircon/system/dev/test/mock-device/BUILD.gn
@@ -12,7 +12,7 @@ if (current_toolchain != default_toolchain) {
]
deps = [
":fuchsia.device.mock.c",
- "$zx/system/banjo/ddk-protocol-test",
+ "$zx/system/banjo/ddk.protocol.test",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
"$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/test/usb/BUILD.gn b/zircon/system/dev/test/usb/BUILD.gn
index bb77d1938a8a036cfa9fcccfe46b85d7a47a3bb4..3391442e2e65a994fa0d6a64d9952e37540fd2b9 100644
--- a/zircon/system/dev/test/usb/BUILD.gn
+++ b/zircon/system/dev/test/usb/BUILD.gn
@@ -17,8 +17,8 @@ test("usb-unittest") {
"usb-request-test.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-usb",
- "$zx/system/banjo/ddk-protocol-usb-request",
+ "$zx/system/banjo/ddk.protocol.usb",
+ "$zx/system/banjo/ddk.protocol.usb.request",
"$zx/system/dev/lib/fake-bti",
"$zx/system/dev/lib/fake_ddk",
"$zx/system/dev/lib/usb",
diff --git a/zircon/system/dev/thermal/aml-thermal-s905d2g/BUILD.gn b/zircon/system/dev/thermal/aml-thermal-s905d2g/BUILD.gn
index d320c2bd13770c03a039bf27afd0ffc922635203..df01bfba1a0c6f4b5579aaa754bd853a6fe8c9ed 100644
--- a/zircon/system/dev/thermal/aml-thermal-s905d2g/BUILD.gn
+++ b/zircon/system/dev/thermal/aml-thermal-s905d2g/BUILD.gn
@@ -12,11 +12,11 @@ driver("aml-thermal-s905d2g") {
"aml-voltage.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-clock",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-scpi",
+ "$zx/system/banjo/ddk.protocol.clock",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.scpi",
"$zx/system/dev/lib/amlogic",
"$zx/system/dev/lib/mmio",
"$zx/system/fidl/fuchsia-hardware-thermal:c",
diff --git a/zircon/system/dev/thermal/aml-thermal-s912/BUILD.gn b/zircon/system/dev/thermal/aml-thermal-s912/BUILD.gn
index d3f2bda700e85b388f7b2e29f8b13d2371445499..0ca39c15301fefe20a77c058ceb3568b5f6a3c35 100644
--- a/zircon/system/dev/thermal/aml-thermal-s912/BUILD.gn
+++ b/zircon/system/dev/thermal/aml-thermal-s912/BUILD.gn
@@ -7,9 +7,9 @@ driver("aml-thermal-s912") {
"aml-thermal.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-composite",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-scpi",
+ "$zx/system/banjo/ddk.protocol.composite",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.scpi",
"$zx/system/dev/lib/amlogic",
"$zx/system/fidl/fuchsia-hardware-thermal:c",
"$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/thermal/mtk-thermal/BUILD.gn b/zircon/system/dev/thermal/mtk-thermal/BUILD.gn
index 40c60bd3e6baef01a2664c207e6bcb0b7d974b2e..903d8d845052d899df390b36b91be13f24e26140 100644
--- a/zircon/system/dev/thermal/mtk-thermal/BUILD.gn
+++ b/zircon/system/dev/thermal/mtk-thermal/BUILD.gn
@@ -7,11 +7,11 @@ driver("mtk-thermal") {
"mtk-thermal.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-clock",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-scpi",
+ "$zx/system/banjo/ddk.protocol.clock",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.scpi",
"$zx/system/dev/lib/mmio",
"$zx/system/dev/lib/mt8167",
"$zx/system/fidl/fuchsia-hardware-thermal:c",
@@ -34,11 +34,11 @@ test("mtk-thermal-test") {
"mtk-thermal.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-clock",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-scpi",
+ "$zx/system/banjo/ddk.protocol.clock",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.scpi",
"$zx/system/dev/lib/mock-mmio-reg",
"$zx/system/dev/lib/mt8167",
"$zx/system/fidl/fuchsia-hardware-thermal:c",
diff --git a/zircon/system/dev/usb/dwc3/BUILD.gn b/zircon/system/dev/usb/dwc3/BUILD.gn
index aa9ea395eb756952e913333d008a7c54791b4bd3..0a6bc4a08cd87fae30347f9c1d233678f8458be3 100644
--- a/zircon/system/dev/usb/dwc3/BUILD.gn
+++ b/zircon/system/dev/usb/dwc3/BUILD.gn
@@ -11,12 +11,12 @@ driver("dwc3") {
"dwc3.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-composite",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-usb",
- "$zx/system/banjo/ddk-protocol-usb-dci",
- "$zx/system/banjo/ddk-protocol-usb-modeswitch",
- "$zx/system/banjo/ddk-protocol-usb-request",
+ "$zx/system/banjo/ddk.protocol.composite",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.usb",
+ "$zx/system/banjo/ddk.protocol.usb.dci",
+ "$zx/system/banjo/ddk.protocol.usb.modeswitch",
+ "$zx/system/banjo/ddk.protocol.usb.request",
"$zx/system/dev/lib/mmio",
"$zx/system/dev/lib/usb",
"$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/usb/hikey-usb/BUILD.gn b/zircon/system/dev/usb/hikey-usb/BUILD.gn
index e1ddfb212b42a1274b1c5b526296088163126a39..287163376755cafd80b1139187913c01a634fd7f 100644
--- a/zircon/system/dev/usb/hikey-usb/BUILD.gn
+++ b/zircon/system/dev/usb/hikey-usb/BUILD.gn
@@ -7,9 +7,9 @@ driver("hikey-usb") {
"hikey-usb.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-usb-modeswitch",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.usb.modeswitch",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
"$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/usb/mt-musb-host/BUILD.gn b/zircon/system/dev/usb/mt-musb-host/BUILD.gn
index d597aeeb878509377212090baeb228bcf9683726..9a8c3c15b7e2500b27ba9189dc1b7fdb0f45d338 100644
--- a/zircon/system/dev/usb/mt-musb-host/BUILD.gn
+++ b/zircon/system/dev/usb/mt-musb-host/BUILD.gn
@@ -12,8 +12,8 @@ driver("mt-musb-host") {
"usb-transaction.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-usb-bus",
- "$zx/system/banjo/ddk-protocol-usb-hci",
+ "$zx/system/banjo/ddk.protocol.usb.bus",
+ "$zx/system/banjo/ddk.protocol.usb.hci",
"$zx/system/dev/lib/mmio",
"$zx/system/dev/lib/mt8167",
"$zx/system/dev/lib/usb",
diff --git a/zircon/system/dev/usb/mt-musb-peripheral/BUILD.gn b/zircon/system/dev/usb/mt-musb-peripheral/BUILD.gn
index c32000dc7683939d88b64c7fb5d681c6ae15947f..65d0c367c5251ea23c5f361efa4b0d46a38e31ba 100644
--- a/zircon/system/dev/usb/mt-musb-peripheral/BUILD.gn
+++ b/zircon/system/dev/usb/mt-musb-peripheral/BUILD.gn
@@ -7,13 +7,13 @@ driver("mt-musb-peripheral") {
"mt-usb.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-clock",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-usb",
- "$zx/system/banjo/ddk-protocol-usb-dci",
- "$zx/system/banjo/ddk-protocol-usb-request",
+ "$zx/system/banjo/ddk.protocol.clock",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.usb",
+ "$zx/system/banjo/ddk.protocol.usb.dci",
+ "$zx/system/banjo/ddk.protocol.usb.request",
"$zx/system/dev/lib/mmio",
"$zx/system/dev/lib/mt8167",
"$zx/system/dev/lib/operation",
diff --git a/zircon/system/dev/usb/usb-bus/BUILD.gn b/zircon/system/dev/usb/usb-bus/BUILD.gn
index bb4c5bf75b91cd7756d4d51b38f7538fde686844..11bd789af840275657319530d1ae10a9603af0e3 100644
--- a/zircon/system/dev/usb/usb-bus/BUILD.gn
+++ b/zircon/system/dev/usb/usb-bus/BUILD.gn
@@ -8,12 +8,12 @@ driver("usb-bus") {
"usb-device.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-usb",
- "$zx/system/banjo/ddk-protocol-usb-bus",
- "$zx/system/banjo/ddk-protocol-usb-composite",
- "$zx/system/banjo/ddk-protocol-usb-hci",
- "$zx/system/banjo/ddk-protocol-usb-hub",
- "$zx/system/banjo/ddk-protocol-usb-request",
+ "$zx/system/banjo/ddk.protocol.usb",
+ "$zx/system/banjo/ddk.protocol.usb.bus",
+ "$zx/system/banjo/ddk.protocol.usb.composite",
+ "$zx/system/banjo/ddk.protocol.usb.hci",
+ "$zx/system/banjo/ddk.protocol.usb.hub",
+ "$zx/system/banjo/ddk.protocol.usb.request",
"$zx/system/dev/lib/usb",
"$zx/system/fidl/fuchsia-hardware-usb-device:c",
"$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/usb/usb-composite/BUILD.gn b/zircon/system/dev/usb/usb-composite/BUILD.gn
index 3ecb17773a57bb8506df317c3938208c42cca47d..d3d77b09fc3342bb17b6ea1d81bd32d8b7dfe450 100644
--- a/zircon/system/dev/usb/usb-composite/BUILD.gn
+++ b/zircon/system/dev/usb/usb-composite/BUILD.gn
@@ -8,9 +8,9 @@ driver("usb-composite") {
"usb-interface.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-usb",
- "$zx/system/banjo/ddk-protocol-usb-composite",
- "$zx/system/banjo/ddk-protocol-usb-request",
+ "$zx/system/banjo/ddk.protocol.usb",
+ "$zx/system/banjo/ddk.protocol.usb.composite",
+ "$zx/system/banjo/ddk.protocol.usb.request",
"$zx/system/dev/lib/usb",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/usb/usb-dfu/BUILD.gn b/zircon/system/dev/usb/usb-dfu/BUILD.gn
index 43c3e38dabfce1583a649ce477356729b67dcea6..930f2853cb89822be89ecf8cb84e825c386c5e3a 100644
--- a/zircon/system/dev/usb/usb-dfu/BUILD.gn
+++ b/zircon/system/dev/usb/usb-dfu/BUILD.gn
@@ -7,9 +7,9 @@ driver("usb-dfu") {
"usb-dfu.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-usb",
- "$zx/system/banjo/ddk-protocol-usb-composite",
- "$zx/system/banjo/ddk-protocol-usb-request",
+ "$zx/system/banjo/ddk.protocol.usb",
+ "$zx/system/banjo/ddk.protocol.usb.composite",
+ "$zx/system/banjo/ddk.protocol.usb.request",
"$zx/system/dev/lib/usb",
"$zx/system/fidl/fuchsia-hardware-usb-fwloader:c",
"$zx/system/fidl/fuchsia-mem:c",
diff --git a/zircon/system/dev/usb/usb-hub/BUILD.gn b/zircon/system/dev/usb/usb-hub/BUILD.gn
index 23b83e8119fecd42464df415f87c0ffd65dc67a9..fb83a01a238e4eeba2b0fd227289464413016a02 100644
--- a/zircon/system/dev/usb/usb-hub/BUILD.gn
+++ b/zircon/system/dev/usb/usb-hub/BUILD.gn
@@ -7,11 +7,11 @@ driver("usb-hub") {
"usb-hub.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-usb",
- "$zx/system/banjo/ddk-protocol-usb-bus",
- "$zx/system/banjo/ddk-protocol-usb-composite",
- "$zx/system/banjo/ddk-protocol-usb-hub",
- "$zx/system/banjo/ddk-protocol-usb-request",
+ "$zx/system/banjo/ddk.protocol.usb",
+ "$zx/system/banjo/ddk.protocol.usb.bus",
+ "$zx/system/banjo/ddk.protocol.usb.composite",
+ "$zx/system/banjo/ddk.protocol.usb.hub",
+ "$zx/system/banjo/ddk.protocol.usb.request",
"$zx/system/dev/lib/usb",
"$zx/system/ulib/ddk",
"$zx/system/ulib/sync",
diff --git a/zircon/system/dev/usb/usb-peripheral-test/BUILD.gn b/zircon/system/dev/usb/usb-peripheral-test/BUILD.gn
index 95ffd2f0ebea374175ca61b605845c52e345c9a4..aaaf1dbfd09700cdb4db0824b8f6e8a761b90ff2 100644
--- a/zircon/system/dev/usb/usb-peripheral-test/BUILD.gn
+++ b/zircon/system/dev/usb/usb-peripheral-test/BUILD.gn
@@ -8,9 +8,9 @@ if (is_fuchsia) {
"driver.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-usb",
- "$zx/system/banjo/ddk-protocol-usb-function",
- "$zx/system/banjo/ddk-protocol-usb-request",
+ "$zx/system/banjo/ddk.protocol.usb",
+ "$zx/system/banjo/ddk.protocol.usb.function",
+ "$zx/system/banjo/ddk.protocol.usb.request",
"$zx/system/dev/lib/usb",
"$zx/system/ulib/ddk",
"$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/usb/usb-peripheral/BUILD.gn b/zircon/system/dev/usb/usb-peripheral/BUILD.gn
index 648ea7cf5a3418bda79070410eed00ce7bb9e155..c4e12a86f7d1e424266240ec66b60c3c89ae00b4 100644
--- a/zircon/system/dev/usb/usb-peripheral/BUILD.gn
+++ b/zircon/system/dev/usb/usb-peripheral/BUILD.gn
@@ -8,11 +8,11 @@ driver("usb-peripheral") {
"usb-peripheral.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-usb",
- "$zx/system/banjo/ddk-protocol-usb-dci",
- "$zx/system/banjo/ddk-protocol-usb-function",
- "$zx/system/banjo/ddk-protocol-usb-modeswitch",
- "$zx/system/banjo/ddk-protocol-usb-request",
+ "$zx/system/banjo/ddk.protocol.usb",
+ "$zx/system/banjo/ddk.protocol.usb.dci",
+ "$zx/system/banjo/ddk.protocol.usb.function",
+ "$zx/system/banjo/ddk.protocol.usb.modeswitch",
+ "$zx/system/banjo/ddk.protocol.usb.request",
"$zx/system/dev/lib/usb",
"$zx/system/fidl/fuchsia-hardware-usb-peripheral:c",
"$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/usb/usb-test/flash-programmer/BUILD.gn b/zircon/system/dev/usb/usb-test/flash-programmer/BUILD.gn
index 1a1ce1182090103db3e24df3011cc010d50070f4..a25c0b0ba72fcee31d4371e386916845afda9d78 100644
--- a/zircon/system/dev/usb/usb-test/flash-programmer/BUILD.gn
+++ b/zircon/system/dev/usb/usb-test/flash-programmer/BUILD.gn
@@ -11,9 +11,9 @@ driver("flash-programmer") {
"flash-programmer.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-usb",
- "$zx/system/banjo/ddk-protocol-usb-composite",
- "$zx/system/banjo/ddk-protocol-usb-request",
+ "$zx/system/banjo/ddk.protocol.usb",
+ "$zx/system/banjo/ddk.protocol.usb.composite",
+ "$zx/system/banjo/ddk.protocol.usb.request",
"$zx/system/dev/lib/usb",
"$zx/system/fidl/fuchsia-hardware-usb-fwloader:c",
"$zx/system/fidl/fuchsia-mem:c",
diff --git a/zircon/system/dev/usb/usb-test/fx3/BUILD.gn b/zircon/system/dev/usb/usb-test/fx3/BUILD.gn
index 3445302cb240d636a4d907bdb21255ac70aff5cf..7a6fb7c5d0551c4e5e30f5d263a48ffc0c35b29c 100644
--- a/zircon/system/dev/usb/usb-test/fx3/BUILD.gn
+++ b/zircon/system/dev/usb/usb-test/fx3/BUILD.gn
@@ -10,9 +10,9 @@ driver("fx3") { # TODO: test_driver?
"fx3.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-usb",
- "$zx/system/banjo/ddk-protocol-usb-composite",
- "$zx/system/banjo/ddk-protocol-usb-request",
+ "$zx/system/banjo/ddk.protocol.usb",
+ "$zx/system/banjo/ddk.protocol.usb.composite",
+ "$zx/system/banjo/ddk.protocol.usb.request",
"$zx/system/dev/lib/usb",
"$zx/system/fidl/fuchsia-hardware-usb-fwloader:c",
"$zx/system/fidl/fuchsia-mem:c",
diff --git a/zircon/system/dev/usb/usb-test/usb-tester/BUILD.gn b/zircon/system/dev/usb/usb-test/usb-tester/BUILD.gn
index e1d0a170665630dddc9c1b06a2f8a324cfcf63e8..da848394945c96c58c04fb174e5aeca63c5d5f0f 100644
--- a/zircon/system/dev/usb/usb-test/usb-tester/BUILD.gn
+++ b/zircon/system/dev/usb/usb-test/usb-tester/BUILD.gn
@@ -8,9 +8,9 @@ driver("usb-tester") { # TODO: test_driver?
"usb-tester.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-usb",
- "$zx/system/banjo/ddk-protocol-usb-composite",
- "$zx/system/banjo/ddk-protocol-usb-request",
+ "$zx/system/banjo/ddk.protocol.usb",
+ "$zx/system/banjo/ddk.protocol.usb.composite",
+ "$zx/system/banjo/ddk.protocol.usb.request",
"$zx/system/dev/lib/usb",
"$zx/system/fidl/fuchsia-hardware-usb-tester:c",
"$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/usb/usb-virtual-bus/BUILD.gn b/zircon/system/dev/usb/usb-virtual-bus/BUILD.gn
index 6ed40b70482e0f2a91ac04e59a69d33bfe8c0d8e..ecb35901b73950ae25da121a3b22dc4216529135 100644
--- a/zircon/system/dev/usb/usb-virtual-bus/BUILD.gn
+++ b/zircon/system/dev/usb/usb-virtual-bus/BUILD.gn
@@ -9,14 +9,14 @@ driver("usb-virtual-bus") {
"usb-virtual-host.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-usb",
- "$zx/system/banjo/ddk-protocol-usb-bus",
- "$zx/system/banjo/ddk-protocol-usb-dci",
- "$zx/system/banjo/ddk-protocol-usb-function",
- "$zx/system/banjo/ddk-protocol-usb-hci",
- "$zx/system/banjo/ddk-protocol-usb-hub",
- "$zx/system/banjo/ddk-protocol-usb-modeswitch",
- "$zx/system/banjo/ddk-protocol-usb-request",
+ "$zx/system/banjo/ddk.protocol.usb",
+ "$zx/system/banjo/ddk.protocol.usb.bus",
+ "$zx/system/banjo/ddk.protocol.usb.dci",
+ "$zx/system/banjo/ddk.protocol.usb.function",
+ "$zx/system/banjo/ddk.protocol.usb.hci",
+ "$zx/system/banjo/ddk.protocol.usb.hub",
+ "$zx/system/banjo/ddk.protocol.usb.modeswitch",
+ "$zx/system/banjo/ddk.protocol.usb.request",
"$zx/system/dev/lib/usb",
"$zx/system/fidl/fuchsia-hardware-usb-virtual-bus:c",
"$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/usb/xhci/BUILD.gn b/zircon/system/dev/usb/xhci/BUILD.gn
index ef6b4a66a3d59d470e4c798ca94fd98d11e3dff9..cd83ba1ffcd9984750dc86388a80c7b2bef949b6 100644
--- a/zircon/system/dev/usb/xhci/BUILD.gn
+++ b/zircon/system/dev/usb/xhci/BUILD.gn
@@ -16,13 +16,13 @@ driver("xhci") {
"xhci.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-pci",
- "$zx/system/banjo/ddk-protocol-platform-device",
- "$zx/system/banjo/ddk-protocol-usb",
- "$zx/system/banjo/ddk-protocol-usb-bus",
- "$zx/system/banjo/ddk-protocol-usb-hci",
- "$zx/system/banjo/ddk-protocol-usb-hub",
- "$zx/system/banjo/ddk-protocol-usb-request",
+ "$zx/system/banjo/ddk.protocol.pci",
+ "$zx/system/banjo/ddk.protocol.platform.device",
+ "$zx/system/banjo/ddk.protocol.usb",
+ "$zx/system/banjo/ddk.protocol.usb.bus",
+ "$zx/system/banjo/ddk.protocol.usb.hci",
+ "$zx/system/banjo/ddk.protocol.usb.hub",
+ "$zx/system/banjo/ddk.protocol.usb.request",
"$zx/system/dev/lib/usb",
"$zx/system/fidl/fuchsia-usb-debug:c",
"$zx/system/ulib/ddk",
diff --git a/zircon/system/uapp/banjo-dummy/BUILD.gn b/zircon/system/uapp/banjo-dummy/BUILD.gn
index 949e4a2019f6d2710c53b815879dba1699be727f..d8eeb6e4a97401dc351ceade27117fda96301c4e 100644
--- a/zircon/system/uapp/banjo-dummy/BUILD.gn
+++ b/zircon/system/uapp/banjo-dummy/BUILD.gn
@@ -7,7 +7,7 @@ executable("banjo-dummy") {
"main.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-bt-gattsvc",
+ "$zx/system/banjo/ddk.protocol.bt.gattsvc",
"$zx/system/ulib/zircon",
]
}
diff --git a/zircon/system/uapp/usbctl/BUILD.gn b/zircon/system/uapp/usbctl/BUILD.gn
index c2b553ee3368ca6532f51cffe5cfcf5c7353af46..6a3287b4335a94748d772a308d7265bc793ecd91 100644
--- a/zircon/system/uapp/usbctl/BUILD.gn
+++ b/zircon/system/uapp/usbctl/BUILD.gn
@@ -7,7 +7,7 @@ executable("usbctl") {
"usbctl.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-usb-modeswitch",
+ "$zx/system/banjo/ddk.protocol.usb.modeswitch",
"$zx/system/fidl/fuchsia-hardware-usb-peripheral:c",
"$zx/system/fidl/fuchsia-hardware-usb-virtual-bus:c",
"$zx/system/ulib/fdio",
diff --git a/zircon/system/ulib/ddk/BUILD.gn b/zircon/system/ulib/ddk/BUILD.gn
index a83fd12da0c9f61da7842dc61ff24e5c7976ca5a..b898e604becb5a52e2010641f4d9d2e46450dc0c 100644
--- a/zircon/system/ulib/ddk/BUILD.gn
+++ b/zircon/system/ulib/ddk/BUILD.gn
@@ -57,7 +57,7 @@ library("ddk") {
#"$zx/system/ulib/trace:headers",
# <ddk/protocol/i2c-lib.h> has #include <ddk/protocol/i2c.h>.
- "$zx/system/banjo/ddk-protocol-i2c",
+ "$zx/system/banjo/ddk.protocol.i2c",
# <ddk/protocol/i2c-lib.h> has #include <lib/sync/completion.h>.
"$zx/system/ulib/sync:headers",
diff --git a/zircon/system/ulib/ddktl/BUILD.gn b/zircon/system/ulib/ddktl/BUILD.gn
index 6d2749a72390d561d4d57dd6ec85998800e12bdb..0e8674ea822e5c15cf879e46ee9d03b516052ba6 100644
--- a/zircon/system/ulib/ddktl/BUILD.gn
+++ b/zircon/system/ulib/ddktl/BUILD.gn
@@ -16,16 +16,16 @@ library("ddktl") {
]
public_deps = [
# <ddktl/pdev.h> has #include <ddktl/protocol/clock.h>.
- "$zx/system/banjo/ddk-protocol-clock",
+ "$zx/system/banjo/ddk.protocol.clock",
# <ddktl/pdev.h> has #include <ddktl/protocol/gpio.h>.
- "$zx/system/banjo/ddk-protocol-gpio",
+ "$zx/system/banjo/ddk.protocol.gpio",
# <ddktl/pdev.h> has #include <ddktl/protocol/power.h>.
- "$zx/system/banjo/ddk-protocol-power",
+ "$zx/system/banjo/ddk.protocol.power",
# <ddktl/pdev.h> has #include <ddktl/protocol/platform/device.h>.
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.platform.device",
# <ddktl/device-internal.h> has #include <fbl/macros.h>.
"$zx/system/ulib/fbl:headers",
@@ -38,10 +38,10 @@ library("ddktl") {
]
configs += [ "$zx/public/gn/config:visibility_hidden" ]
deps = [
- "$zx/system/banjo/ddk-protocol-ethernet",
- "$zx/system/banjo/ddk-protocol-gpio",
- "$zx/system/banjo/ddk-protocol-i2c",
- "$zx/system/banjo/ddk-protocol-platform-device",
+ "$zx/system/banjo/ddk.protocol.ethernet",
+ "$zx/system/banjo/ddk.protocol.gpio",
+ "$zx/system/banjo/ddk.protocol.i2c",
+ "$zx/system/banjo/ddk.protocol.platform.device",
"$zx/system/ulib/ddk",
"$zx/system/ulib/fbl",
"$zx/system/ulib/sync",
@@ -59,8 +59,8 @@ test_driver("ddktl-test") {
"test/ethernet-tests.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-ethernet",
- "$zx/system/banjo/ddk-protocol-test",
+ "$zx/system/banjo/ddk.protocol.ethernet",
+ "$zx/system/banjo/ddk.protocol.test",
"$zx/system/ulib/ddk",
"$zx/system/ulib/ddktl",
"$zx/system/ulib/fbl",
diff --git a/zircon/system/ulib/intel-hda/BUILD.gn b/zircon/system/ulib/intel-hda/BUILD.gn
index 6b7536534d3ac59556039c5869a569099a3ec71f..6bd5dc15fdccdfcb469e897c39c5fb9f93571efb 100644
--- a/zircon/system/ulib/intel-hda/BUILD.gn
+++ b/zircon/system/ulib/intel-hda/BUILD.gn
@@ -12,7 +12,7 @@ library("intel-hda") {
configs += [ "$zx/public/gn/config:visibility_hidden" ]
public_deps = [
# <intel-hda/codec-utils/stream-base.h> has #include <ddk/protocol/intelhda/codec.h>.
- "$zx/system/banjo/ddk-protocol-intelhda-codec",
+ "$zx/system/banjo/ddk.protocol.intelhda.codec",
"$zx/system/fidl/fuchsia-hardware-audio:c",
]
deps = [
diff --git a/zircon/system/ulib/mipi-dsi/BUILD.gn b/zircon/system/ulib/mipi-dsi/BUILD.gn
index e09e6ee5851492f74c2fb8147fc99cbb5ae08713..2900a4c7a2d6cca5ef1bf281f22bd20034e0212d 100644
--- a/zircon/system/ulib/mipi-dsi/BUILD.gn
+++ b/zircon/system/ulib/mipi-dsi/BUILD.gn
@@ -8,6 +8,6 @@ library("mipi-dsi") {
]
configs += [ "$zx/public/gn/config:visibility_hidden" ]
deps = [
- "$zx/system/banjo/ddk-protocol-dsiimpl",
+ "$zx/system/banjo/ddk.protocol.dsiimpl",
]
}
diff --git a/zircon/system/ulib/simplehid/BUILD.gn b/zircon/system/ulib/simplehid/BUILD.gn
index d5b12f8aa6a7066006b68ca89291b8e1b2446edd..193f21641328dec50f778f761142f640206f0bc9 100644
--- a/zircon/system/ulib/simplehid/BUILD.gn
+++ b/zircon/system/ulib/simplehid/BUILD.gn
@@ -6,7 +6,7 @@ library("simplehid") {
sources = []
public_deps = [
# <lib/simplehid/simplehid.h> has #include <ddktl/protocol/hidbus.h>.
- "$zx/system/banjo/ddk-protocol-hidbus",
+ "$zx/system/banjo/ddk.protocol.hidbus",
]
deps = [
"$zx/system/ulib/ddk",
diff --git a/zircon/system/ulib/zxcrypt/BUILD.gn b/zircon/system/ulib/zxcrypt/BUILD.gn
index 9a0578c58bebb3a90dc214e1a37fa69c7074793b..11e3a354588e94cb5892bf9f4fe63185f672709f 100644
--- a/zircon/system/ulib/zxcrypt/BUILD.gn
+++ b/zircon/system/ulib/zxcrypt/BUILD.gn
@@ -18,8 +18,8 @@ library("zxcrypt") {
]
configs += [ "$zx/public/gn/config:integer-paranoia" ]
deps = [
- "$zx/system/banjo/ddk-protocol-block",
- "$zx/system/banjo/ddk-protocol-block-volume",
+ "$zx/system/banjo/ddk.protocol.block",
+ "$zx/system/banjo/ddk.protocol.block.volume",
"$zx/system/fidl/fuchsia-device:c",
"$zx/system/fidl/fuchsia-hardware-block:c",
"$zx/system/fidl/fuchsia-hardware-block-volume:c",
diff --git a/zircon/system/utest/ethernet/BUILD.gn b/zircon/system/utest/ethernet/BUILD.gn
index 7971ab767c48c64f934de6b1226801903691942a..cb9da94af5d4a46df460b7f7e8d3c3ee56863d88 100644
--- a/zircon/system/utest/ethernet/BUILD.gn
+++ b/zircon/system/utest/ethernet/BUILD.gn
@@ -7,7 +7,7 @@ test("ethernet") {
"ethernet.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-ethernet",
+ "$zx/system/banjo/ddk.protocol.ethernet",
"$zx/system/fidl/fuchsia-hardware-ethernet:c",
"$zx/system/fidl/fuchsia-hardware-ethertap:c",
"$zx/system/ulib/ddk",
diff --git a/zircon/system/utest/hid/BUILD.gn b/zircon/system/utest/hid/BUILD.gn
index 844f2747c5663ed5b6d5ec100e55197c283142c5..18cbb7ccba1c1e8dd930163a6d38e43c5e53fc90 100644
--- a/zircon/system/utest/hid/BUILD.gn
+++ b/zircon/system/utest/hid/BUILD.gn
@@ -29,7 +29,7 @@ test("hid-parse-size") {
"hid-parse-test.cpp",
]
deps = [
- "$zx/system/banjo/ddk-protocol-hidbus",
+ "$zx/system/banjo/ddk.protocol.hidbus",
"$zx/system/fidl/fuchsia-hardware-input:c",
"$zx/system/ulib/ddk",
"$zx/system/ulib/driver",
diff --git a/zircon/third_party/dev/ethernet/e1000/BUILD.gn b/zircon/third_party/dev/ethernet/e1000/BUILD.gn
index a8bbee813ede2745cf2e2d7eff4a96f2bc90155b..955fb45a76b9b80d03f718c41a679a82c31d55b2 100644
--- a/zircon/third_party/dev/ethernet/e1000/BUILD.gn
+++ b/zircon/third_party/dev/ethernet/e1000/BUILD.gn
@@ -24,8 +24,8 @@ driver("e1000") {
"fuchsia.c",
]
deps = [
- "$zx/system/banjo/ddk-protocol-ethernet",
- "$zx/system/banjo/ddk-protocol-pci",
+ "$zx/system/banjo/ddk.protocol.ethernet",
+ "$zx/system/banjo/ddk.protocol.pci",
"$zx/system/ulib/ddk",
"$zx/system/ulib/zircon",
]