d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Use the correct devclass name ("acpi" vs "ACPI") to detect if acpi0 is

Browse Source 
present and thus that the PnPBIOS probe should be skipped instead of
  having ACPI zero out the PnPBIOStable pointer.
- Make the PnPBIOStable pointer static to i386/i386/bios.c now that that is
  the only place it is used.
This commit is contained in:
jhb 2004-06-10 20:43:04 +00:00
parent f7c8770deb
commit ee8370535a
5 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/amd64/amd64/bios.c
View File

@ -59,7 +59,8 @@ __FBSDID("$FreeBSD$");
/* exported lookup results */
struct bios32_SDentry PCIbios;
struct PnPBIOS_table *PnPBIOStable;
static struct PnPBIOS_table *PnPBIOStable;
static u_int bios32_SDCI;
@ -555,7 +556,7 @@ pnpbios_identify(driver_t *driver, device_t parent)
return;
/* ACPI already active */
if (devclass_get_softc(devclass_find("ACPI"), 0) != NULL)
if (devclass_get_softc(devclass_find("acpi"), 0) != NULL)
return;
/* get count of PnP devices */

1
sys/amd64/include/pc/bios.h
View File

@ -93,7 +93,6 @@ struct PnPBIOS_table
* Exported lookup results
*/
extern struct bios32_SDentry PCIbios;
extern struct PnPBIOS_table *PnPBIOStable;
struct segment_info {
u_int base;

6
sys/i386/acpica/acpi_machdep.c
View File

@ -306,12 +306,6 @@ acpi_machdep_init(device_t dev)
acpi_dev = dev;
sc = device_get_softc(acpi_dev);
/*
* 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);

5
sys/i386/i386/bios.c
View File

@ -59,7 +59,8 @@ __FBSDID("$FreeBSD$");
/* exported lookup results */
struct bios32_SDentry PCIbios;
struct PnPBIOS_table *PnPBIOStable;
static struct PnPBIOS_table *PnPBIOStable;
static u_int bios32_SDCI;
@ -555,7 +556,7 @@ pnpbios_identify(driver_t *driver, device_t parent)
return;
/* ACPI already active */
if (devclass_get_softc(devclass_find("ACPI"), 0) != NULL)
if (devclass_get_softc(devclass_find("acpi"), 0) != NULL)
return;
/* get count of PnP devices */

1
sys/i386/include/pc/bios.h
View File

@ -93,7 +93,6 @@ struct PnPBIOS_table
* Exported lookup results
*/
extern struct bios32_SDentry PCIbios;
extern struct PnPBIOS_table *PnPBIOStable;
struct segment_info {
u_int base;