diff options
| author | joerg <joerg@NetBSD.org> | 2009-07-06 12:36:31 +0000 |
|---|---|---|
| committer | joerg <joerg@NetBSD.org> | 2009-07-06 12:36:31 +0000 |
| commit | ac7c4cf1464a795da27c0089e40ebf33211ce2ba (patch) | |
| tree | bb975d8ebe57aba26a86a79dff625a98d796a07b /sys/dev | |
| parent | 03324155b95e14256850a345471c51ee8447405d (diff) | |
Ignore breakpoints in the DSDT even if DDB is present.
A new option ACPI_BREAKPOINT reenables them.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/acpi/acpica/OsdMisc.c | 10 | ||||
| -rw-r--r-- | sys/dev/acpi/files.acpi | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/sys/dev/acpi/acpica/OsdMisc.c b/sys/dev/acpi/acpica/OsdMisc.c index a79aefb8f3b..6fc18aa078f 100644 --- a/sys/dev/acpi/acpica/OsdMisc.c +++ b/sys/dev/acpi/acpica/OsdMisc.c @@ -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 @@ AcpiOsSignal(UINT32 Function, const void *Info) 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; } diff --git a/sys/dev/acpi/files.acpi b/sys/dev/acpi/files.acpi index 3340e304d3d..2b6f50bef5a 100644 --- a/sys/dev/acpi/files.acpi +++ b/sys/dev/acpi/files.acpi @@ -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 { } |
