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 | 74 |
1 files changed, 40 insertions, 34 deletions
diff --git a/usr/src/uts/intel/io/acpica/utilities/utdebug.c b/usr/src/uts/intel/io/acpica/utilities/utdebug.c index 4cb018aed2..70e4db8a2b 100644 --- a/usr/src/uts/intel/io/acpica/utilities/utdebug.c +++ b/usr/src/uts/intel/io/acpica/utilities/utdebug.c @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: utdebug - Debug print routines - * $Revision: 1.132 $ + * $Revision: 1.137 $ * *****************************************************************************/ @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2006, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2008, Intel Corp. * All rights reserved. * * 2. License @@ -124,9 +124,9 @@ #ifdef ACPI_DEBUG_OUTPUT -static UINT32 AcpiGbl_PrevThreadId = 0xFFFFFFFF; -static char *AcpiGbl_FnEntryStr = "----Entry"; -static char *AcpiGbl_FnExitStr = "----Exit-"; +static ACPI_THREAD_ID AcpiGbl_PrevThreadId = 0xFFFFFFFF; +static char *AcpiGbl_FnEntryStr = "----Entry"; +static char *AcpiGbl_FnExitStr = "----Exit-"; /* Local prototypes */ @@ -151,10 +151,10 @@ void AcpiUtInitStackPtrTrace ( void) { - UINT32 CurrentSp; + ACPI_SIZE CurrentSp; - AcpiGbl_EntryStackPointer = ACPI_PTR_DIFF (&CurrentSp, NULL); + AcpiGbl_EntryStackPointer = &CurrentSp; } @@ -177,11 +177,9 @@ AcpiUtTrackStackPtr ( ACPI_SIZE CurrentSp; - CurrentSp = ACPI_PTR_DIFF (&CurrentSp, NULL); - - if (CurrentSp < AcpiGbl_LowestStackPointer) + if (&CurrentSp < AcpiGbl_LowestStackPointer) { - AcpiGbl_LowestStackPointer = CurrentSp; + AcpiGbl_LowestStackPointer = &CurrentSp; } if (AcpiGbl_NestingLevel > AcpiGbl_DeepestNesting) @@ -254,9 +252,9 @@ AcpiUtDebugPrint ( UINT32 RequestedDebugLevel, UINT32 LineNumber, const char *FunctionName, - char *ModuleName, + const char *ModuleName, UINT32 ComponentId, - char *Format, + const char *Format, ...) { ACPI_THREAD_ID ThreadId; @@ -304,6 +302,7 @@ AcpiUtDebugPrint ( va_start (args, Format); AcpiOsVprintf (Format, args); + va_end (args); } ACPI_EXPORT_SYMBOL (AcpiUtDebugPrint) @@ -333,9 +332,9 @@ AcpiUtDebugPrintRaw ( UINT32 RequestedDebugLevel, UINT32 LineNumber, const char *FunctionName, - char *ModuleName, + const char *ModuleName, UINT32 ComponentId, - char *Format, + const char *Format, ...) { va_list args; @@ -349,6 +348,7 @@ AcpiUtDebugPrintRaw ( va_start (args, Format); AcpiOsVprintf (Format, args); + va_end (args); } ACPI_EXPORT_SYMBOL (AcpiUtDebugPrintRaw) @@ -374,7 +374,7 @@ void AcpiUtTrace ( UINT32 LineNumber, const char *FunctionName, - char *ModuleName, + const char *ModuleName, UINT32 ComponentId) { @@ -410,7 +410,7 @@ void AcpiUtTracePtr ( UINT32 LineNumber, const char *FunctionName, - char *ModuleName, + const char *ModuleName, UINT32 ComponentId, void *Pointer) { @@ -444,7 +444,7 @@ void AcpiUtTraceStr ( UINT32 LineNumber, const char *FunctionName, - char *ModuleName, + const char *ModuleName, UINT32 ComponentId, char *String) { @@ -479,7 +479,7 @@ void AcpiUtTraceU32 ( UINT32 LineNumber, const char *FunctionName, - char *ModuleName, + const char *ModuleName, UINT32 ComponentId, UINT32 Integer) { @@ -513,7 +513,7 @@ void AcpiUtExit ( UINT32 LineNumber, const char *FunctionName, - char *ModuleName, + const char *ModuleName, UINT32 ComponentId) { @@ -548,7 +548,7 @@ void AcpiUtStatusExit ( UINT32 LineNumber, const char *FunctionName, - char *ModuleName, + const char *ModuleName, UINT32 ComponentId, ACPI_STATUS Status) { @@ -595,7 +595,7 @@ void AcpiUtValueExit ( UINT32 LineNumber, const char *FunctionName, - char *ModuleName, + const char *ModuleName, UINT32 ComponentId, ACPI_INTEGER Value) { @@ -632,7 +632,7 @@ void AcpiUtPtrExit ( UINT32 LineNumber, const char *FunctionName, - char *ModuleName, + const char *ModuleName, UINT32 ComponentId, UINT8 *Ptr) { @@ -668,12 +668,18 @@ AcpiUtDumpBuffer2 ( UINT32 Count, UINT32 Display) { - ACPI_NATIVE_UINT i = 0; - ACPI_NATIVE_UINT j; + UINT32 i = 0; + UINT32 j; UINT32 Temp32; UINT8 BufChar; + if (!Buffer) + { + AcpiOsPrintf ("Null Buffer Pointer in DumpBuffer!\n"); + return; + } + if ((Count < 4) || (Count & 0x01)) { Display = DB_BYTE_DISPLAY; @@ -685,7 +691,7 @@ AcpiUtDumpBuffer2 ( { /* Print current offset */ - AcpiOsPrintf ("%6.4X: ", (UINT32) i); + AcpiOsPrintf ("%6.4X: ", i); /* Print 16 hex chars */ @@ -696,7 +702,7 @@ AcpiUtDumpBuffer2 ( /* Dump fill spaces */ AcpiOsPrintf ("%*s", ((Display * 2) + 1), " "); - j += (ACPI_NATIVE_UINT) Display; + j += Display; continue; } @@ -705,35 +711,35 @@ AcpiUtDumpBuffer2 ( case DB_BYTE_DISPLAY: default: /* Default is BYTE display */ - AcpiOsPrintf ("%02X ", Buffer[i + j]); + AcpiOsPrintf ("%02X ", Buffer[(ACPI_SIZE) i + j]); break; case DB_WORD_DISPLAY: - ACPI_MOVE_16_TO_32 (&Temp32, &Buffer[i + j]); + ACPI_MOVE_16_TO_32 (&Temp32, &Buffer[(ACPI_SIZE) i + j]); AcpiOsPrintf ("%04X ", Temp32); break; case DB_DWORD_DISPLAY: - ACPI_MOVE_32_TO_32 (&Temp32, &Buffer[i + j]); + ACPI_MOVE_32_TO_32 (&Temp32, &Buffer[(ACPI_SIZE) i + j]); AcpiOsPrintf ("%08X ", Temp32); break; case DB_QWORD_DISPLAY: - ACPI_MOVE_32_TO_32 (&Temp32, &Buffer[i + j]); + ACPI_MOVE_32_TO_32 (&Temp32, &Buffer[(ACPI_SIZE) i + j]); AcpiOsPrintf ("%08X", Temp32); - ACPI_MOVE_32_TO_32 (&Temp32, &Buffer[i + j + 4]); + ACPI_MOVE_32_TO_32 (&Temp32, &Buffer[(ACPI_SIZE) i + j + 4]); AcpiOsPrintf ("%08X ", Temp32); break; } - j += (ACPI_NATIVE_UINT) Display; + j += Display; } /* @@ -749,7 +755,7 @@ AcpiUtDumpBuffer2 ( return; } - BufChar = Buffer[i + j]; + BufChar = Buffer[(ACPI_SIZE) i + j]; if (ACPI_IS_PRINT (BufChar)) { AcpiOsPrintf ("%c", BufChar); |