diff options
author | msmith <msmith@FreeBSD.org> | 2001-10-31 02:36:07 +0000 |
---|---|---|
committer | msmith <msmith@FreeBSD.org> | 2001-10-31 02:36:07 +0000 |
commit | de8bc4ba10fb07aa68c4cd0d79b35529c6b1b958 (patch) | |
tree | da9e8b6becd34ab0ca163a295cb7ed093e3b6b61 | |
parent | 05445bb80c710a64dfe36c3d64d56b17e1d47399 (diff) | |
download | FreeBSD-src-de8bc4ba10fb07aa68c4cd0d79b35529c6b1b958.zip FreeBSD-src-de8bc4ba10fb07aa68c4cd0d79b35529c6b1b958.tar.gz |
Don't try to probe the PnP BIOS if ACPI is active.
-rw-r--r-- | sys/amd64/amd64/bios.c | 5 | ||||
-rw-r--r-- | sys/i386/i386/bios.c | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/sys/amd64/amd64/bios.c b/sys/amd64/amd64/bios.c index 6755253..cc887e7 100644 --- a/sys/amd64/amd64/bios.c +++ b/sys/amd64/amd64/bios.c @@ -523,6 +523,11 @@ pnpbios_identify(driver_t *driver, device_t parent) if (pt == NULL) return; + /* ACPI already active */ + if (devclass_get_softc(devclass_find("ACPI"), 0) != NULL) + return; + + /* get count of PnP devices */ bzero(&args, sizeof(args)); args.seg.code16.base = BIOS_PADDRTOVADDR(pt->pmentrybase); args.seg.code16.limit = 0xffff; /* XXX ? */ diff --git a/sys/i386/i386/bios.c b/sys/i386/i386/bios.c index 6755253..cc887e7 100644 --- a/sys/i386/i386/bios.c +++ b/sys/i386/i386/bios.c @@ -523,6 +523,11 @@ pnpbios_identify(driver_t *driver, device_t parent) if (pt == NULL) return; + /* ACPI already active */ + if (devclass_get_softc(devclass_find("ACPI"), 0) != NULL) + return; + + /* get count of PnP devices */ bzero(&args, sizeof(args)); args.seg.code16.base = BIOS_PADDRTOVADDR(pt->pmentrybase); args.seg.code16.limit = 0xffff; /* XXX ? */ |