Module Name: src
Committed By: joerg
Date: Mon Jul 6 12:36:31 UTC 2009
Modified Files:
src/sys/dev/acpi: files.acpi
src/sys/dev/acpi/acpica: OsdMisc.c
Log Message:
Ignore breakpoints in the DSDT even if DDB is present.
A new option ACPI_BREAKPOINT reenables them.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/acpi/files.acpi
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/acpi/acpica/OsdMisc.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/dev/acpi/files.acpi
diff -u src/sys/dev/acpi/files.acpi:1.52 src/sys/dev/acpi/files.acpi:1.53
--- src/sys/dev/acpi/files.acpi:1.52 Sun May 18 22:05:59 2008
+++ src/sys/dev/acpi/files.acpi Mon Jul 6 12:36:31 2009
@@ -1,9 +1,9 @@
-# $NetBSD: files.acpi,v 1.52 2008/05/18 22:05:59 cegger Exp $
+# $NetBSD: files.acpi,v 1.53 2009/07/06 12:36:31 joerg Exp $
include "dev/acpi/acpica/files.acpica"
defflag opt_acpi.h ACPIVERBOSE ACPI_DEBUG ACPI_ACTIVATE_DEV
- ACPI_DSDT_OVERRIDE ACPI_SCANPCI
+ ACPI_DSDT_OVERRIDE ACPI_SCANPCI ACPI_BREAKPOINT
defparam opt_acpi.h ACPI_DSDT_FILE := "\"/dev/null\""
define acpiapmbus { }
Index: src/sys/dev/acpi/acpica/OsdMisc.c
diff -u src/sys/dev/acpi/acpica/OsdMisc.c:1.5 src/sys/dev/acpi/acpica/OsdMisc.c:1.6
--- src/sys/dev/acpi/acpica/OsdMisc.c:1.5 Thu Nov 16 01:32:47 2006
+++ src/sys/dev/acpi/acpica/OsdMisc.c Mon Jul 6 12:36:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: OsdMisc.c,v 1.5 2006/11/16 01:32:47 christos Exp $ */
+/* $NetBSD: OsdMisc.c,v 1.6 2009/07/06 12:36:31 joerg Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: OsdMisc.c,v 1.5 2006/11/16 01:32:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: OsdMisc.c,v 1.6 2009/07/06 12:36:31 joerg Exp $");
#include "opt_acpi.h"
#include "opt_ddb.h"
@@ -115,14 +115,16 @@
case ACPI_SIGNAL_BREAKPOINT:
{
+#ifdef ACPI_BREAKPOINT
const char *info = Info;
printf("%s\n", info);
-#if defined(DDB)
+# if defined(DDB)
Debugger();
-#else
+# else
printf("ACPI: WARNING: DDB not configured into kernel.\n");
return AE_NOT_EXIST;
+# endif
#endif
break;
}
