[version roller] Update dependencies
SDK version updated from 10.20221103.2.1 to 10.20221130.0.1
Changes:
- Replaced MakeEnumProperty with MakeProperty (fxr/753444)
Change-Id: I7085d1775ea05174a2826f8a3c815d9f33123de8
Reviewed-on: https://fuchsia-review.googlesource.com/c/sdk-samples/drivers/+/768802
Reviewed-by: Renato Mangini Dias <mangini@google.com>
Commit-Queue: Atul Sharma <atshar@google.com>
Reviewed-by: Atul Sharma <atshar@google.com>
Reviewed-by: Wayne Piekarski <waynepie@google.com>
diff --git a/scripts/smoke_test.sh b/scripts/smoke_test.sh
index a9e4617..2fbdcde 100755
--- a/scripts/smoke_test.sh
+++ b/scripts/smoke_test.sh
@@ -69,7 +69,7 @@
# build all samples in this repository
print_and_run tools/bazel build src:fuchsia_samples
# other build commands in https://fuchsia.dev/fuchsia-src/get-started/sdk/get-started-with-driver
- print_and_run tools/bazel build --config=fuchsia_x64 //src/qemu_edu/drivers:qemu_edu
+ print_and_run tools/bazel build //src/qemu_edu/drivers:pkg
print_and_run tools/ffx doctor --restart-daemon
print_and_run tools/ffx sdk version
@@ -146,7 +146,7 @@
else
print_and_run tools/ffx driver list-devices root.sys.platform.pt.PCI0.bus.00_06_0_ --verbose | check_output "Name : 00_06_0_"
fi
- print_and_run tools/ffx driver list-hosts | check_output "fuchsia-pkg://bazel.pkg.component/qemu_edu#meta/qemu_edu.cm"
+ print_and_run tools/ffx driver list-hosts | check_output "meta/qemu_edu.cm"
print_and_run tools/ffx driver lspci | check_output "Host bridge:"
# check debugging tools work
test_zxdb() { echo quit | tools/ffx debug connect; }
diff --git a/src/acpi_multiply/controller/acpi_controller.cc b/src/acpi_multiply/controller/acpi_controller.cc
index e475150..0426a7b 100644
--- a/src/acpi_multiply/controller/acpi_controller.cc
+++ b/src/acpi_multiply/controller/acpi_controller.cc
@@ -96,8 +96,8 @@
// Set the properties of the node that a driver binds to.
auto properties = fidl::VectorView<fuchsia_driver_framework::wire::NodeProperty>(arena, 2);
- properties[0] = driver::MakeEnumProperty(arena, bind_fuchsia_hardware_acpi::SERVICE,
- bind_fuchsia_hardware_acpi::SERVICE_ZIRCONTRANSPORT);
+ properties[0] = driver::MakeProperty(arena, bind_fuchsia_hardware_acpi::SERVICE,
+ bind_fuchsia_hardware_acpi::SERVICE_ZIRCONTRANSPORT);
properties[1] = driver::MakeProperty(arena, bind_fuchsia_acpi::HID, "FDFS0001");
auto args = fuchsia_driver_framework::wire::NodeAddArgs::Builder(arena)
diff --git a/src/bind_library/parent/parent-driver.cc b/src/bind_library/parent/parent-driver.cc
index f3f2646..8aa6302 100644
--- a/src/bind_library/parent/parent-driver.cc
+++ b/src/bind_library/parent/parent-driver.cc
@@ -55,17 +55,17 @@
driver::MakeProperty(arena, 1 /* BIND_PROTOCOL */, bind_fuchsia_acpi::BIND_PROTOCOL_DEVICE);
properties[1] = driver::MakeProperty(arena, bind_fuchsia_acpi::HID, "GOOG");
properties[2] = driver::MakeProperty(arena, bind_examples_gizmo_bind::MODELNAME, "GIZMO3000");
- properties[3] = driver::MakeEnumProperty(arena, bind_examples_gizmo_bind::GIZMOTYPE,
- bind_examples_gizmo_bind::GIZMOTYPE_MEM_64K);
+ properties[3] = driver::MakeProperty(arena, bind_examples_gizmo_bind::GIZMOTYPE,
+ bind_examples_gizmo_bind::GIZMOTYPE_MEM_64K);
// [END add_bind_properties]
// We are not actually offering the Exporter protocol to the child, nor using it from the child.
// This is just to demonstrate access to these values through the auto-generated bind library.
// [START add_fidl_bind_properties]
- properties[4] = driver::MakeEnumProperty(arena, bind_fuchsia_device_fs::EXPORTER,
- bind_fuchsia_device_fs::EXPORTER_ZIRCONTRANSPORT);
- properties[5] = driver::MakeEnumProperty(arena, bind_examples_gizmo::TESTINGPROTOCOL,
- bind_examples_gizmo::TESTINGPROTOCOL_ZIRCONTRANSPORT);
+ properties[4] = driver::MakeProperty(arena, bind_fuchsia_device_fs::EXPORTER,
+ bind_fuchsia_device_fs::EXPORTER_ZIRCONTRANSPORT);
+ properties[5] = driver::MakeProperty(arena, bind_examples_gizmo::TESTINGPROTOCOL,
+ bind_examples_gizmo::TESTINGPROTOCOL_ZIRCONTRANSPORT);
// [END add_fidl_bind_properties]
auto args = fuchsia_driver_framework::wire::NodeAddArgs::Builder(arena)
diff --git a/src/i2c_temperature/controller/i2c_controller.cc b/src/i2c_temperature/controller/i2c_controller.cc
index 39b3d9d..914d4d0 100644
--- a/src/i2c_temperature/controller/i2c_controller.cc
+++ b/src/i2c_temperature/controller/i2c_controller.cc
@@ -66,8 +66,8 @@
// [START add_child_properties]
// Set the properties of the node for drivers to target.
auto properties = fidl::VectorView<fuchsia_driver_framework::wire::NodeProperty>(arena, 2);
- properties[0] = driver::MakeEnumProperty(arena, bind_fuchsia_hardware_i2c::SERVICE,
- bind_fuchsia_hardware_i2c::SERVICE_ZIRCONTRANSPORT);
+ properties[0] = driver::MakeProperty(arena, bind_fuchsia_hardware_i2c::SERVICE,
+ bind_fuchsia_hardware_i2c::SERVICE_ZIRCONTRANSPORT);
properties[1] = driver::MakeProperty(arena, 0x0A02 /* BIND_I2C_ADDRESS */, 0xff);
// [END add_child_properties]
diff --git a/third_party/sdk-integration b/third_party/sdk-integration
index c0794de..a43e2e0 160000
--- a/third_party/sdk-integration
+++ b/third_party/sdk-integration
@@ -1 +1 @@
-Subproject commit c0794deba860f8503e8829094ce4a3fef90d0d03
+Subproject commit a43e2e0504a5c57446c5d86d7668ffb0682f1edf
