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:
parent
fe74650816
commit
31a51bf683
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=104223
@ -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);
|
||||
}
|
||||
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user