Trash the PnPBIOStable pointer later on when we know that the acpi probe

and attach routines have succeeded so that if they fail we can still use
the PnP BIOS to find ISA on-board devices.  The fact that we do this here
is gross but fixing it properly involves a lot more work.
This commit is contained in:
John Baldwin 2002-09-30 18:45:20 +00:00
parent fe74650816
commit 31a51bf683
4 changed files with 12 additions and 12 deletions

View File

@ -38,12 +38,6 @@
ACPI_STATUS
AcpiOsInitialize(void)
{
/*
* Prevent the PnP BIOS code from interfering with our own scan of
* ISA devices.
*/
PnPBIOStable = NULL;
return(0);
}

View File

@ -326,6 +326,12 @@ acpi_machdep_init(device_t dev)
return (ENXIO);
}
/*
* XXX: Prevent the PnP BIOS code from interfering with
* our own scan of ISA devices.
*/
PnPBIOStable = NULL;
acpi_capm_init(sc);
acpi_install_wakeup_handler(sc);

View File

@ -38,12 +38,6 @@
ACPI_STATUS
AcpiOsInitialize(void)
{
/*
* Prevent the PnP BIOS code from interfering with our own scan of
* ISA devices.
*/
PnPBIOStable = NULL;
return(0);
}

View File

@ -326,6 +326,12 @@ acpi_machdep_init(device_t dev)
return (ENXIO);
}
/*
* XXX: Prevent the PnP BIOS code from interfering with
* our own scan of ISA devices.
*/
PnPBIOStable = NULL;
acpi_capm_init(sc);
acpi_install_wakeup_handler(sc);