diff options
| author | jkim <jkim@FreeBSD.org> | 2013-01-17 23:56:43 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2013-01-17 23:56:43 +0000 |
| commit | 2a54ee62b3fb5d0e9bf39d81edd2cc14a56166a4 (patch) | |
| tree | a7cdf321edb5a438878660c0df9e9bf8a70038e1 /sys/contrib/dev/acpica/components/namespace/nsdump.c | |
| parent | 39b667a9d0968b8b54185d03b5b8bb2670346424 (diff) | |
| parent | 8f7c8be022add76a280165a4247448f1fcd77631 (diff) | |
| download | FreeBSD-src-2a54ee62b3fb5d0e9bf39d81edd2cc14a56166a4.zip FreeBSD-src-2a54ee62b3fb5d0e9bf39d81edd2cc14a56166a4.tar.gz | |
Merge ACPICA 20130117.
Diffstat (limited to 'sys/contrib/dev/acpica/components/namespace/nsdump.c')
| -rw-r--r-- | sys/contrib/dev/acpica/components/namespace/nsdump.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/contrib/dev/acpica/components/namespace/nsdump.c b/sys/contrib/dev/acpica/components/namespace/nsdump.c index fd82cdb..1411534 100644 --- a/sys/contrib/dev/acpica/components/namespace/nsdump.c +++ b/sys/contrib/dev/acpica/components/namespace/nsdump.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2012, Intel Corp. + * Copyright (C) 2000 - 2013, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -46,6 +46,7 @@ #include <contrib/dev/acpica/include/acpi.h> #include <contrib/dev/acpica/include/accommon.h> #include <contrib/dev/acpica/include/acnamesp.h> +#include <contrib/dev/acpica/include/acoutput.h> #define _COMPONENT ACPI_NAMESPACE @@ -92,7 +93,9 @@ AcpiNsPrintPathname ( ACPI_FUNCTION_NAME (NsPrintPathname); - if (!(AcpiDbgLevel & ACPI_LV_NAMES) || !(AcpiDbgLayer & ACPI_NAMESPACE)) + /* Check if debug output enabled */ + + if (!ACPI_IS_DEBUG_ENABLED (ACPI_LV_NAMES, ACPI_NAMESPACE)) { return; } @@ -151,7 +154,7 @@ AcpiNsDumpPathname ( /* Do this only if the requested debug level and component are enabled */ - if (!(AcpiDbgLevel & Level) || !(AcpiDbgLayer & Component)) + if (!ACPI_IS_DEBUG_ENABLED (Level, Component)) { return_VOID; } |
