From a91d0e1ccf44ea8990ee9f77308317f23956bc1e Mon Sep 17 00:00:00 2001 From: Mike Smith Date: Wed, 31 Oct 2001 02:36:07 +0000 Subject: [PATCH] Don't try to probe the PnP BIOS if ACPI is active. --- sys/amd64/amd64/bios.c | 5 +++++ sys/i386/i386/bios.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/sys/amd64/amd64/bios.c b/sys/amd64/amd64/bios.c index 6755253b307..cc887e711bf 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 6755253b307..cc887e711bf 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 ? */