commit 5115d53a9819f79f9f8899a4adebbd8053f1e125
author Suraj Malhotra <surajmalhotra@google.com> Thu Jun 02 01:18:24 2022 +0000
committer CQ Bot <fuchsia-internal-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Jun 02 01:18:24 2022 +0000
tree 675b4124ccf1aebf92064c2c265ccce1a38ec1e2
parent 5363c03307079729bcacf830746434161ca0e930

[qemu_edu] Remove acpi binding support

Because the driver talk to pci now, it will no longer successfully bind
to the acpi node.

Change-Id: I3d3ad37a3cdfafaddb9d1213a064ee580b436f0b
Reviewed-on: https://fuchsia-review.googlesource.com/c/sdk-samples/drivers/+/681367
Reviewed-by: David Gilhooley <dgilhooley@google.com>
Commit-Queue: Suraj Malhotra <surajmalhotra@google.com>

src/qemu_edu/BUILD.bazel

diff --git a/src/qemu_edu/BUILD.bazel b/src/qemu_edu/BUILD.bazel
index 2bc5136..5f995ca 100644
--- a/src/qemu_edu/BUILD.bazel
+++ b/src/qemu_edu/BUILD.bazel
@@ -41,7 +41,6 @@
     output = "qemu_edu.bindbc",
     rules = "qemu_edu.bind",
     deps = [
-        "@fuchsia_sdk//bind/fuchsia.acpi",
         "@fuchsia_sdk//bind/fuchsia.pci",
     ],
 )

src/qemu_edu/eductl.cc

diff --git a/src/qemu_edu/eductl.cc b/src/qemu_edu/eductl.cc
index da02139..b5c1189 100644
--- a/src/qemu_edu/eductl.cc
+++ b/src/qemu_edu/eductl.cc
@@ -17,7 +17,6 @@
 
 constexpr char kEduDevicePath[] =
     "/dev/sys/platform/platform-passthrough/PCI0/bus/00:06.0_/qemu-edu";
-constexpr char kEduDevicePath2[] = "/dev/sys/platform/platform-passthrough/acpi/acpi-KBLT/qemu-edu";
 
 int usage(const char* cmd) {
   fprintf(stderr,
@@ -43,9 +42,6 @@
   int device = open(kEduDevicePath, O_RDWR);
 
   if (device < 0) {
-    device = open(kEduDevicePath2, O_RDWR);
-  }
-  if (device < 0) {
     fprintf(stderr, "Failed to open qemu edu device: %s\n", strerror(errno));
     return {};
   }

src/qemu_edu/qemu_edu.bind

diff --git a/src/qemu_edu/qemu_edu.bind b/src/qemu_edu/qemu_edu.bind
index f4a2082..014a4d5 100644
--- a/src/qemu_edu/qemu_edu.bind
+++ b/src/qemu_edu/qemu_edu.bind
@@ -1,15 +1,11 @@
 // Copyright 2022 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.
-using fuchsia.acpi;
 using fuchsia.pci;
 
-if fuchsia.BIND_FIDL_PROTOCOL == fuchsia.pci.BIND_FIDL_PROTOCOL.DEVICE {
-	fuchsia.BIND_PCI_VID == 0x1234;
-	fuchsia.BIND_PCI_DID == 0x11e8;
-} else {
-	fuchsia.acpi.hid == "GOOG0002";
-}
+fuchsia.BIND_FIDL_PROTOCOL == fuchsia.pci.BIND_FIDL_PROTOCOL.DEVICE;
+fuchsia.BIND_PCI_VID == 0x1234;
+fuchsia.BIND_PCI_DID == 0x11e8;
 
 // TODO(surajmalhotra): Use constants from bind library.
 //fuchsia.BIND_PCI_VID == fuchsia.pci.BIND_PCI_VID.QEMU_TEST;