Module Name: src
Committed By: jmcneill
Date: Sat Aug 21 17:10:03 UTC 2010
Modified Files:
src/sys/arch/x86/x86: x86_autoconf.c
Log Message:
If ACPI is active and the FADT reports no legacy devices present, set
the 'no-legacy-devices' property to true on isa0.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/x86/x86/x86_autoconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/x86_autoconf.c
diff -u src/sys/arch/x86/x86/x86_autoconf.c:1.50 src/sys/arch/x86/x86/x86_autoconf.c:1.51
--- src/sys/arch/x86/x86/x86_autoconf.c:1.50 Wed Feb 24 22:37:55 2010
+++ src/sys/arch/x86/x86/x86_autoconf.c Sat Aug 21 17:10:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_autoconf.c,v 1.50 2010/02/24 22:37:55 dyoung Exp $ */
+/* $NetBSD: x86_autoconf.c,v 1.51 2010/08/21 17:10:03 jmcneill Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.50 2010/02/24 22:37:55 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.51 2010/08/21 17:10:03 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -55,10 +55,15 @@
#include "acpica.h"
#include "pci.h"
+#include "isa.h"
#include "genfb.h"
#include "wsdisplay.h"
#include "opt_vga.h"
+#if NACPICA > 0
+#include <dev/acpi/acpivar.h>
+#endif
+
#ifdef VGA_POST
#include <x86/vga_post.h>
#endif
@@ -618,6 +623,13 @@
}
#endif /* NPCI > 0 */
}
+#if NISA > 0 && NACPICA > 0
+ if (device_is_a(dev, "isa") && acpi_active) {
+ if (!(AcpiGbl_FADT.BootFlags & ACPI_FADT_LEGACY_DEVICES))
+ prop_dictionary_set_bool(device_properties(dev),
+ "no-legacy-devices", true);
+ }
+#endif /* NISA > 0 && NACPICA > 0 */
#if NPCI > 0
if (device_parent(dev) && device_is_a(device_parent(dev), "pci") &&
found_console == false) {
