From 6cf26d088897fe7dadddeeaac14b071282bc1476 Mon Sep 17 00:00:00 2001 From: scottl Date: Sat, 2 Dec 2000 01:14:14 +0000 Subject: [PATCH] Revert attach() back to the old behaviour of calling bus_generic_attach(). The new way doesn't seem to work reliably and was causing devices to not be seen. Approved by: msmith --- sys/dev/acpica/acpi_pcib.c | 9 +++++---- sys/dev/acpica/acpi_pcib_acpi.c | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/sys/dev/acpica/acpi_pcib.c b/sys/dev/acpica/acpi_pcib.c index 76c1d86f1777..1e7ef6ed6594 100644 --- a/sys/dev/acpica/acpi_pcib.c +++ b/sys/dev/acpica/acpi_pcib.c @@ -181,11 +181,12 @@ acpi_pcib_attach(device_t dev) } /* - * Note that we defer the actual scan of the child PCI bus; ACPI will call - * bus_generic_attach on its children a second time after the first pass - * is complete. This leads to slightly neater output. + * Now go scan the bus. + * + * XXX It would be nice to defer this and count on the nexus getting it + * after the first pass, but this does not seem to be reliable. */ - return(0); + return(bus_generic_attach(dev)); } static int diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c index 76c1d86f1777..1e7ef6ed6594 100644 --- a/sys/dev/acpica/acpi_pcib_acpi.c +++ b/sys/dev/acpica/acpi_pcib_acpi.c @@ -181,11 +181,12 @@ acpi_pcib_attach(device_t dev) } /* - * Note that we defer the actual scan of the child PCI bus; ACPI will call - * bus_generic_attach on its children a second time after the first pass - * is complete. This leads to slightly neater output. + * Now go scan the bus. + * + * XXX It would be nice to defer this and count on the nexus getting it + * after the first pass, but this does not seem to be reliable. */ - return(0); + return(bus_generic_attach(dev)); } static int