[bluetooth] Migrate bt-transport-uart to new composite spec

Test:
1. Bluetooth basic functionalities are verified by bt-cli tool
on astro, sherlock, nelson and vim3.
2. CQ.

Change-Id: I8a57ee4028095fb47a43a0cb105e07980f0cd8cb
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/863296
Commit-Queue: Zhiyi Chen <[email protected]>
Reviewed-by: Sarah Chan <[email protected]>

Author: Zhiyi Chen

src/devices/board/drivers/astro/BUILD.gn

@@ -25,18 +25,6 @@ driver_bind_rules("astro-bind") {
   ]
 }
 
-driver_bind_rules("astro-bluetooth-bind") {
-  rules = "bind/astro-bluetooth.bind"
-  header_output = "astro-bluetooth-bind.h"
-  bind_output = "astro-bluetooth.bindbc"
-  tests = "bind-tests/astro-bluetooth-test.json"
-  deps = [
-    "//src/devices/bind/fuchsia.amlogic.platform",
-    "//src/devices/bind/fuchsia.hardware.pwm",
-    "//src/devices/bind/fuchsia.platform",
-  ]
-}
-
 driver_bind_rules("astro-buttons-bind") {
   rules = "bind/astro-buttons.bind"
   header_output = "astro-buttons-bind.h"
@@ -240,7 +228,6 @@ fuchsia_driver("astro-driver") {
     ":astro-aml-sdio-bind_header",
     ":astro-aml-usb-phy-v2-bind_header",
     ":astro-bind",
-    ":astro-bluetooth-bind_header",
     ":astro-buttons-bind_header",
     ":astro-cpu-bind_header",
     ":astro-dwc2-phy-bind_header",
@@ -330,7 +317,6 @@ group("tests") {
     ":astro-aml-sdio-bind_test",
     ":astro-aml-usb-phy-v2-bind_test",
     ":astro-bind_test",
-    ":astro-bluetooth-bind_test",
     ":astro-buttons-bind_test",
     ":astro-cpu-bind_test",
     ":astro-dwc2-phy-bind_test",

src/devices/board/drivers/astro/astro-bluetooth.cc

@@ -14,10 +14,13 @@
 #include <lib/mmio/mmio.h>
 #include <unistd.h>
 
+#include <bind/fuchsia/cpp/bind.h>
+#include <bind/fuchsia/hardware/pwm/cpp/bind.h>
+#include <sdk/lib/driver/component/cpp/composite_node_spec.h>
+#include <sdk/lib/driver/component/cpp/node_add_args.h>
 #include <soc/aml-s905d2/s905d2-hw.h>
 
 #include "astro.h"
-#include "src/devices/board/drivers/astro/astro-bluetooth-bind.h"
 #include "src/devices/bus/lib/platform-bus-composites/platform-bus-composite.h"
 
 namespace astro {
@@ -96,21 +99,45 @@ zx_status_t Astro::BluetoothInit() {
     return status;
   }
 
-  // Bind UART for Bluetooth HCI
-  fidl::Arena<> fidl_arena;
   fdf::Arena arena('BLUE');
-  auto result = pbus_.buffer(arena)->AddComposite(
-      fidl::ToWire(fidl_arena, bt_uart_dev),
-      platform_bus_composite::MakeFidlFragment(fidl_arena, bt_uart_fragments,
-                                               std::size(bt_uart_fragments)),
-      "pdev");
+
+  fuchsia_driver_framework::wire::BindRule kPwmBindRules[] = {
+      // TODO(fxbug.dev/129042): Replace this with wire type function.
+      fidl::ToWire(arena, fdf::MakeAcceptBindRule(bind_fuchsia::INIT_STEP,
+                                                  bind_fuchsia_hardware_pwm::BIND_INIT_STEP_PWM)),
+  };
+
+  fuchsia_driver_framework::wire::NodeProperty kPwmProperties[] = {
+      fdf::MakeProperty(arena, bind_fuchsia::INIT_STEP,
+                        bind_fuchsia_hardware_pwm::BIND_INIT_STEP_PWM),
+  };
+
+  auto parents = std::vector{
+      fuchsia_driver_framework::wire::ParentSpec{
+          .bind_rules = fidl::VectorView<fuchsia_driver_framework::wire::BindRule>::FromExternal(
+              kPwmBindRules, 1),
+          .properties =
+              fidl::VectorView<fuchsia_driver_framework::wire::NodeProperty>::FromExternal(
+                  kPwmProperties, 1),
+      },
+  };
+
+  auto builder =
+      fuchsia_driver_framework::wire::CompositeNodeSpec::Builder(arena)
+          .name("bluetooth-composite-spec")
+          .parents(fidl::VectorView<fuchsia_driver_framework::wire::ParentSpec>(arena, parents));
+
+  // Create composite spec for aml-uart based on UART and PWM nodes. The parent spec of bt_uart_dev
+  // will be generated by the handler of AddCompositeNodeSpec.
+  auto result =
+      pbus_.buffer(arena)->AddCompositeNodeSpec(fidl::ToWire(arena, bt_uart_dev), builder.Build());
   if (!result.ok()) {
-    zxlogf(ERROR, "%s: AddComposite Bluetooth(bt_uart_dev) request failed: %s", __func__,
+    zxlogf(ERROR, "AddCompositeNodeSpec Bluetooth(bt_uart_dev) request failed: %s",
            result.FormatDescription().data());
     return result.status();
   }
   if (result->is_error()) {
-    zxlogf(ERROR, "%s: AddComposite Bluetooth(bt_uart_dev) failed: %s", __func__,
+    zxlogf(ERROR, "AddCompositeNodeSpec Bluetooth(bt_uart_dev) failed: %s",
            zx_status_get_string(result->error_value()));
     return result->error_value();
   }

src/devices/board/drivers/astro/bind-tests/astro-bluetooth-test.json

@@ -37,18 +37,6 @@ driver_bind_rules("nelson-bind") {
   ]
 }
 
-driver_bind_rules("nelson_bt_uart_bind") {
-  rules = "bind/nelson_bt_uart.bind"
-  header_output = "nelson_bt_uart_bind.h"
-  bind_output = "nelson_bt_uart_bind.bc"
-  tests = "bind-tests/nelson_bt_uart-test.json"
-  deps = [
-    "//src/devices/bind/fuchsia.amlogic.platform",
-    "//src/devices/bind/fuchsia.hardware.pwm",
-    "//src/devices/bind/fuchsia.platform",
-  ]
-}
-
 driver_bind_rules("nelson_buttons_bind") {
   rules = "bind/nelson_buttons.bind"
   header_output = "nelson_buttons_bind.h"
@@ -331,7 +319,6 @@ fuchsia_driver("nelson-module-driver") {
     ":nelson-bind",
     ":nelson_aml_sdio_bind_header",
     ":nelson_aml_video_bind_header",
-    ":nelson_bt_uart_bind_header",
     ":nelson_buttons_bind_header",
     ":nelson_dwc2_bind_header",
     ":nelson_emmc_bind_header",
@@ -432,7 +419,6 @@ group("tests") {
     ":nelson_aml_sdio_bind_test",
     ":nelson_aml_video_bind_test",
     ":nelson_aml_video_bind_test",
-    ":nelson_bt_uart_bind_test",
     ":nelson_dwc2_bind_test",
     ":nelson_ot_radio_bind_test",
     ":nelson_selina_bind_test",

src/devices/board/drivers/astro/bind/astro-bluetooth.bind

@@ -14,11 +14,14 @@
 #include <lib/mmio/mmio.h>
 #include <unistd.h>
 
+#include <bind/fuchsia/cpp/bind.h>
+#include <bind/fuchsia/hardware/pwm/cpp/bind.h>
+#include <sdk/lib/driver/component/cpp/composite_node_spec.h>
+#include <sdk/lib/driver/component/cpp/node_add_args.h>
 #include <soc/aml-s905d3/s905d3-gpio.h>
 #include <soc/aml-s905d3/s905d3-hw.h>
 
 #include "nelson.h"
-#include "src/devices/board/drivers/nelson/nelson_bt_uart_bind.h"
 #include "src/devices/bus/lib/platform-bus-composites/platform-bus-composite.h"
 
 namespace nelson {
@@ -98,20 +101,45 @@ zx_status_t Nelson::BluetoothInit() {
   }
 
   // Bind UART for Bluetooth HCI
-  fidl::Arena<> fidl_arena;
   fdf::Arena arena('BLUE');
-  auto result = pbus_.buffer(arena)->AddComposite(
-      fidl::ToWire(fidl_arena, bt_uart_dev),
-      platform_bus_composite::MakeFidlFragment(fidl_arena, bt_uart_fragments,
-                                               std::size(bt_uart_fragments)),
-      "pdev");
+
+  fuchsia_driver_framework::wire::BindRule kPwmBindRules[] = {
+      // TODO(fxbug.dev/129042): Replace this with wire type function.
+      fidl::ToWire(arena, fdf::MakeAcceptBindRule(bind_fuchsia::INIT_STEP,
+                                                  bind_fuchsia_hardware_pwm::BIND_INIT_STEP_PWM)),
+  };
+
+  fuchsia_driver_framework::wire::NodeProperty kPwmProperties[] = {
+      fdf::MakeProperty(arena, bind_fuchsia::INIT_STEP,
+                        bind_fuchsia_hardware_pwm::BIND_INIT_STEP_PWM),
+  };
+
+  auto parents = std::vector{
+      fuchsia_driver_framework::wire::ParentSpec{
+          .bind_rules = fidl::VectorView<fuchsia_driver_framework::wire::BindRule>::FromExternal(
+              kPwmBindRules, 1),
+          .properties =
+              fidl::VectorView<fuchsia_driver_framework::wire::NodeProperty>::FromExternal(
+                  kPwmProperties, 1),
+      },
+  };
+
+  auto builder =
+      fuchsia_driver_framework::wire::CompositeNodeSpec::Builder(arena)
+          .name("bluetooth-composite-spec")
+          .parents(fidl::VectorView<fuchsia_driver_framework::wire::ParentSpec>(arena, parents));
+
+  // Create composite spec for aml-uart based on UART and PWM nodes. The parent spec of bt_uart_dev
+  // will be generated by the handler of AddCompositeNodeSpec.
+  auto result =
+      pbus_.buffer(arena)->AddCompositeNodeSpec(fidl::ToWire(arena, bt_uart_dev), builder.Build());
   if (!result.ok()) {
-    zxlogf(ERROR, "%s: AddComposite Bluetooth(bt_uart_dev) request failed: %s", __func__,
+    zxlogf(ERROR, "AddCompositeNodeSpec Bluetooth(bt_uart_dev) request failed: %s",
            result.FormatDescription().data());
     return result.status();
   }
   if (result->is_error()) {
-    zxlogf(ERROR, "%s: AddComposite Bluetooth(bt_uart_dev) failed: %s", __func__,
+    zxlogf(ERROR, "AddCompositeNodeSpec Bluetooth(bt_uart_dev) failed: %s",
            zx_status_get_string(result->error_value()));
     return result->error_value();
   }

src/devices/board/drivers/nelson/BUILD.gn

@@ -69,18 +69,6 @@ driver_bind_rules("sherlock-tee-bind") {
   ]
 }
 
-driver_bind_rules("sherlock-bluetooth-bind") {
-  rules = "bind/sherlock-bluetooth.bind"
-  header_output = "sherlock-bluetooth-bind.h"
-  bind_output = "sherlock-bluetooth-bind.bc"
-  tests = "bind-tests/sherlock-bluetooth-test.json"
-  deps = [
-    "//src/devices/bind/fuchsia.amlogic.platform",
-    "//src/devices/bind/fuchsia.hardware.pwm",
-    "//src/devices/bind/fuchsia.platform",
-  ]
-}
-
 driver_bind_rules("sherlock-video-bind") {
   rules = "bind/sherlock-video.bind"
   header_output = "sherlock-video-bind.h"
@@ -331,7 +319,6 @@ template("sherlock_driver") {
     deps = [
       ":camera-isp-bind_header",
       ":sherlock-aml-usb-phy-v2-bind_header",
-      ":sherlock-bluetooth-bind_header",
       ":sherlock-buttons-bind_header",
       ":sherlock-dwc2-phy-bind_header",
       ":sherlock-emmc-bind_header",