diff options
Diffstat (limited to 'usr/src/uts/intel/io/acpica/utilities/utdebug.c')
| -rw-r--r-- | usr/src/uts/intel/io/acpica/utilities/utdebug.c | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/usr/src/uts/intel/io/acpica/utilities/utdebug.c b/usr/src/uts/intel/io/acpica/utilities/utdebug.c index 70e4db8a2b..3901b07d19 100644 --- a/usr/src/uts/intel/io/acpica/utilities/utdebug.c +++ b/usr/src/uts/intel/io/acpica/utilities/utdebug.c @@ -1,7 +1,6 @@ /****************************************************************************** * * Module Name: utdebug - Debug print routines - * $Revision: 1.137 $ * *****************************************************************************/ @@ -9,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2008, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp. * All rights reserved. * * 2. License @@ -117,6 +116,7 @@ #define __UTDEBUG_C__ #include "acpi.h" +#include "accommon.h" #define _COMPONENT ACPI_UTILITIES ACPI_MODULE_NAME ("utdebug") @@ -124,7 +124,7 @@ #ifdef ACPI_DEBUG_OUTPUT -static ACPI_THREAD_ID AcpiGbl_PrevThreadId = 0xFFFFFFFF; +static ACPI_THREAD_ID AcpiGbl_PrevThreadId = (ACPI_THREAD_ID) 0xFFFFFFFF; static char *AcpiGbl_FnEntryStr = "----Entry"; static char *AcpiGbl_FnExitStr = "----Exit-"; @@ -230,7 +230,7 @@ AcpiUtTrimFunctionName ( /******************************************************************************* * - * FUNCTION: AcpiUtDebugPrint + * FUNCTION: AcpiDebugPrint * * PARAMETERS: RequestedDebugLevel - Requested debug print level * LineNumber - Caller's line number (for error output) @@ -248,7 +248,7 @@ AcpiUtTrimFunctionName ( ******************************************************************************/ void ACPI_INTERNAL_VAR_XFACE -AcpiUtDebugPrint ( +AcpiDebugPrint ( UINT32 RequestedDebugLevel, UINT32 LineNumber, const char *FunctionName, @@ -279,8 +279,9 @@ AcpiUtDebugPrint ( if (ACPI_LV_THREADS & AcpiDbgLevel) { AcpiOsPrintf ( - "\n**** Context Switch from TID %X to TID %X ****\n\n", - AcpiGbl_PrevThreadId, ThreadId); + "\n**** Context Switch from TID %p to TID %p ****\n\n", + ACPI_CAST_PTR (void, AcpiGbl_PrevThreadId), + ACPI_CAST_PTR (void, ThreadId)); } AcpiGbl_PrevThreadId = ThreadId; @@ -294,7 +295,7 @@ AcpiUtDebugPrint ( if (ACPI_LV_THREADS & AcpiDbgLevel) { - AcpiOsPrintf ("[%04lX] ", ThreadId); + AcpiOsPrintf ("[%p] ", ACPI_CAST_PTR (void, ThreadId)); } AcpiOsPrintf ("[%02ld] %-22.22s: ", @@ -305,12 +306,12 @@ AcpiUtDebugPrint ( va_end (args); } -ACPI_EXPORT_SYMBOL (AcpiUtDebugPrint) +ACPI_EXPORT_SYMBOL (AcpiDebugPrint) /******************************************************************************* * - * FUNCTION: AcpiUtDebugPrintRaw + * FUNCTION: AcpiDebugPrintRaw * * PARAMETERS: RequestedDebugLevel - Requested debug print level * LineNumber - Caller's line number @@ -328,7 +329,7 @@ ACPI_EXPORT_SYMBOL (AcpiUtDebugPrint) ******************************************************************************/ void ACPI_INTERNAL_VAR_XFACE -AcpiUtDebugPrintRaw ( +AcpiDebugPrintRaw ( UINT32 RequestedDebugLevel, UINT32 LineNumber, const char *FunctionName, @@ -351,7 +352,7 @@ AcpiUtDebugPrintRaw ( va_end (args); } -ACPI_EXPORT_SYMBOL (AcpiUtDebugPrintRaw) +ACPI_EXPORT_SYMBOL (AcpiDebugPrintRaw) /******************************************************************************* @@ -381,7 +382,7 @@ AcpiUtTrace ( AcpiGbl_NestingLevel++; AcpiUtTrackStackPtr (); - AcpiUtDebugPrint (ACPI_LV_FUNCTIONS, + AcpiDebugPrint (ACPI_LV_FUNCTIONS, LineNumber, FunctionName, ModuleName, ComponentId, "%s\n", AcpiGbl_FnEntryStr); } @@ -417,7 +418,7 @@ AcpiUtTracePtr ( AcpiGbl_NestingLevel++; AcpiUtTrackStackPtr (); - AcpiUtDebugPrint (ACPI_LV_FUNCTIONS, + AcpiDebugPrint (ACPI_LV_FUNCTIONS, LineNumber, FunctionName, ModuleName, ComponentId, "%s %p\n", AcpiGbl_FnEntryStr, Pointer); } @@ -452,7 +453,7 @@ AcpiUtTraceStr ( AcpiGbl_NestingLevel++; AcpiUtTrackStackPtr (); - AcpiUtDebugPrint (ACPI_LV_FUNCTIONS, + AcpiDebugPrint (ACPI_LV_FUNCTIONS, LineNumber, FunctionName, ModuleName, ComponentId, "%s %s\n", AcpiGbl_FnEntryStr, String); } @@ -487,7 +488,7 @@ AcpiUtTraceU32 ( AcpiGbl_NestingLevel++; AcpiUtTrackStackPtr (); - AcpiUtDebugPrint (ACPI_LV_FUNCTIONS, + AcpiDebugPrint (ACPI_LV_FUNCTIONS, LineNumber, FunctionName, ModuleName, ComponentId, "%s %08X\n", AcpiGbl_FnEntryStr, Integer); } @@ -517,7 +518,7 @@ AcpiUtExit ( UINT32 ComponentId) { - AcpiUtDebugPrint (ACPI_LV_FUNCTIONS, + AcpiDebugPrint (ACPI_LV_FUNCTIONS, LineNumber, FunctionName, ModuleName, ComponentId, "%s\n", AcpiGbl_FnExitStr); @@ -555,14 +556,14 @@ AcpiUtStatusExit ( if (ACPI_SUCCESS (Status)) { - AcpiUtDebugPrint (ACPI_LV_FUNCTIONS, + AcpiDebugPrint (ACPI_LV_FUNCTIONS, LineNumber, FunctionName, ModuleName, ComponentId, "%s %s\n", AcpiGbl_FnExitStr, AcpiFormatException (Status)); } else { - AcpiUtDebugPrint (ACPI_LV_FUNCTIONS, + AcpiDebugPrint (ACPI_LV_FUNCTIONS, LineNumber, FunctionName, ModuleName, ComponentId, "%s ****Exception****: %s\n", AcpiGbl_FnExitStr, AcpiFormatException (Status)); @@ -600,7 +601,7 @@ AcpiUtValueExit ( ACPI_INTEGER Value) { - AcpiUtDebugPrint (ACPI_LV_FUNCTIONS, + AcpiDebugPrint (ACPI_LV_FUNCTIONS, LineNumber, FunctionName, ModuleName, ComponentId, "%s %8.8X%8.8X\n", AcpiGbl_FnExitStr, ACPI_FORMAT_UINT64 (Value)); @@ -637,7 +638,7 @@ AcpiUtPtrExit ( UINT8 *Ptr) { - AcpiUtDebugPrint (ACPI_LV_FUNCTIONS, + AcpiDebugPrint (ACPI_LV_FUNCTIONS, LineNumber, FunctionName, ModuleName, ComponentId, "%s %p\n", AcpiGbl_FnExitStr, Ptr); |