Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup usage of ENABLE_DEBUGGER/ACPI_DEBUGGER/DDB. 

By this change, ACPI debugger/disassembler are only
compiled when both DDB and ACPI_DEBUG options are
specified.  This change also reduces the kernel size
a little when ACPI_DEBUG is not specified.
This commit is contained in:
kochi 2003-07-03 14:37:34 +00:00
parent 9c1d55b97c
commit 3c3271accf
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/acpi/acpi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: acpi.c,v 1.38 2003/07/02 12:23:25 kochi Exp $ */
/* $NetBSD: acpi.c,v 1.39 2003/07/03 14:37:34 kochi Exp $ */
/*
* Copyright 2001, 2003 Wasabi Systems, Inc.
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.38 2003/07/02 12:23:25 kochi Exp $");
__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.39 2003/07/03 14:37:34 kochi Exp $");
#include "opt_acpi.h"
@ -73,6 +73,8 @@ MALLOC_DECLARE(M_ACPI);
#include <machine/acpi_machdep.h>
#undef ENABLE_DEBUGGER
#ifdef ENABLE_DEBUGGER
#define ACPI_DBGR_INIT 0x01
#define ACPI_DBGR_TABLES 0x02

14
sys/dev/acpi/acpica/Osd/OsdMisc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: OsdMisc.c,v 1.6 2003/03/04 17:28:00 kochi Exp $ */
/* $NetBSD: OsdMisc.c,v 1.7 2003/07/03 14:37:34 kochi Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: OsdMisc.c,v 1.6 2003/03/04 17:28:00 kochi Exp $");
__KERNEL_RCSID(0, "$NetBSD: OsdMisc.c,v 1.7 2003/07/03 14:37:34 kochi Exp $");
#include "opt_ddb.h"
@ -148,13 +148,11 @@ AcpiOsPredefinedOverride(const ACPI_PREDEFINED_NAMES *InitVal,
void
acpi_osd_debugger(void)
{
#ifdef ENABLE_DEBUGGER
#ifdef ACPI_DEBUGGER
static int beenhere;
ACPI_PARSE_OBJECT obj;
#ifdef DDB
label_t acpi_jmpbuf;
label_t *savejmp;
#endif
if (beenhere == 0) {
printf("Initializing ACPICA debugger...\n");
@ -163,17 +161,15 @@ acpi_osd_debugger(void)
}
printf("Entering ACPICA debugger...\n");
#ifdef DDB
savejmp = db_recover;
setjmp(&acpi_jmpbuf);
db_recover = &acpi_jmpbuf;
#endif
acpi_indebugger = 1;
AcpiDbUserCommands('A', &obj);
acpi_indebugger = 0;
#ifdef DDB
db_recover = savejmp;
#endif
#else
printf("ACPI: WARNING: ACPCICA debugger not present.\n");
#endif

3
sys/dev/acpi/acpica/Subsystem/acnetbsd.h
View File

@ -158,7 +158,6 @@
#define ACPI_EXTERNAL_XFACE
#define ACPI_INTERNAL_XFACE
#define ACPI_INTERNAL_VAR_XFACE
#define ACPI_DISASSEMBLER
#ifdef ACPI_DEBUG
#define ACPI_DEBUG_OUTPUT
@ -168,7 +167,9 @@
#define DEBUGGER_THREADING 0 /* integrated with DDB */
#include "opt_ddb.h"
#ifdef DDB
/* we enable debugger/disassembler component only when DDB is compiled in */
#define ACPI_DEBUGGER
#define ACPI_DISASSEMBLER
#endif /* DDB */
#endif /* ACPI_DEBUG */