[src/trunk]: src/sys/dev/acpi * defflag ACPI_DSDT_OVERRIDE and defparam ACPI_...

[rpaulo <rpaulo%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b5ce7abee86f
branches:  trunk
changeset: 586940:b5ce7abee86f
user:      rpaulo <rpaulo%NetBSD.org@localhost>
date:      Thu Jan 05 16:56:54 2006 +0000

description:
* defflag ACPI_DSDT_OVERRIDE and defparam ACPI_DSDT_FILE.
* adjust comments to reality

diffstat:

 sys/dev/acpi/acpica/Osd/OsdMisc.c |  10 +++++-----
 sys/dev/acpi/files.acpi           |   5 +++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diffs (52 lines):

diff -r 630f01b8cf9c -r b5ce7abee86f sys/dev/acpi/acpica/Osd/OsdMisc.c
--- a/sys/dev/acpi/acpica/Osd/OsdMisc.c Thu Jan 05 12:32:27 2006 +0000
+++ b/sys/dev/acpi/acpica/Osd/OsdMisc.c Thu Jan 05 16:56:54 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: OsdMisc.c,v 1.12 2005/12/11 12:21:02 christos Exp $    */
+/*     $NetBSD: OsdMisc.c,v 1.13 2006/01/05 16:56:54 rpaulo Exp $      */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -42,8 +42,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: OsdMisc.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: OsdMisc.c,v 1.13 2006/01/05 16:56:54 rpaulo Exp $");
 
+#include "opt_acpi.h"
 #include "opt_ddb.h"
 
 #include <sys/param.h>
@@ -69,14 +70,13 @@
  *    -or-
  *    options ACPI_DSDT_FILE="\"yourdsdt.hex\"" in
  *    your config file and yourdsdt.hex in the build directory
- * 6. uncomment ACPI_DEDT_OVERRIDE or options ACPI_DSDT_OVERRIDE
- *    in your kernel config file and rebuild the kernel
+ * 6. options ACPI_DSDT_OVERRIDE in your kernel config file
+ *    and rebuild the kernel
  *
  * (*1) /usr/pkgsrc/sysutils/acpidump
  * (*2) /usr/pkgsrc/sysutils/acpi-iasl
  */
 
-/* #define ACPI_DSDT_OVERRIDE */
 #ifdef ACPI_DSDT_OVERRIDE
 #ifndef ACPI_DSDT_FILE
 #define ACPI_DSDT_FILE "dsdt.hex"
diff -r 630f01b8cf9c -r b5ce7abee86f sys/dev/acpi/files.acpi
--- a/sys/dev/acpi/files.acpi   Thu Jan 05 12:32:27 2006 +0000
+++ b/sys/dev/acpi/files.acpi   Thu Jan 05 16:56:54 2006 +0000
@@ -1,8 +1,9 @@
-#      $NetBSD: files.acpi,v 1.33 2005/12/11 12:21:02 christos Exp $
+#      $NetBSD: files.acpi,v 1.34 2006/01/05 16:56:54 rpaulo Exp $
 
 include "dev/acpi/acpica/files.acpica"
 
-defflag        opt_acpi.h      ACPIVERBOSE ACPI_DEBUG ACPI_ACTIVATE_DEV ACPI_DISABLE_ON_POWEROFF
+defflag        opt_acpi.h      ACPIVERBOSE ACPI_DEBUG ACPI_ACTIVATE_DEV ACPI_DISABLE_ON_POWEROFF ACPI_DSDT_OVERRIDE
+defparam opt_acpi.h    ACPI_DSDT_FILE
 
 device acpi { }: sysmon_power, sysmon_taskq
 attach acpi at acpibus