diff options
Diffstat (limited to 'sys/contrib/dev/acpica/utdebug.c')
| -rw-r--r-- | sys/contrib/dev/acpica/utdebug.c | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/sys/contrib/dev/acpica/utdebug.c b/sys/contrib/dev/acpica/utdebug.c index 76dcd2512ce1..2280075ff6c3 100644 --- a/sys/contrib/dev/acpica/utdebug.c +++ b/sys/contrib/dev/acpica/utdebug.c @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: utdebug - Debug print routines - * $Revision: 97 $ + * $Revision: 103 $ * *****************************************************************************/ @@ -122,13 +122,12 @@ ACPI_MODULE_NAME ("utdebug") -UINT32 AcpiGbl_PrevThreadId = 0xFFFFFFFF; -char *AcpiGbl_FnEntryStr = "----Entry"; -char *AcpiGbl_FnExitStr = "----Exit-"; - - #ifdef ACPI_DEBUG +static UINT32 AcpiGbl_PrevThreadId = 0xFFFFFFFF; +static char *AcpiGbl_FnEntryStr = "----Entry"; +static char *AcpiGbl_FnExitStr = "----Exit-"; + /***************************************************************************** * @@ -227,7 +226,6 @@ AcpiUtDebugPrint ( return; } - /* * Thread tracking and context switch notification */ @@ -248,15 +246,14 @@ AcpiUtDebugPrint ( * Display the module name, current line number, thread ID (if requested), * current procedure nesting level, and the current procedure name */ - AcpiOsPrintf ("%8s-%04d ", DbgInfo->ModuleName, LineNumber); + AcpiOsPrintf ("%8s-%04ld ", DbgInfo->ModuleName, LineNumber); if (ACPI_LV_THREADS & AcpiDbgLevel) { - AcpiOsPrintf ("[%04X] ", ThreadId, AcpiGbl_NestingLevel, DbgInfo->ProcName); + AcpiOsPrintf ("[%04lX] ", ThreadId, AcpiGbl_NestingLevel, DbgInfo->ProcName); } - AcpiOsPrintf ("[%02d] %-22.22s: ", AcpiGbl_NestingLevel, DbgInfo->ProcName); - + AcpiOsPrintf ("[%02ld] %-22.22s: ", AcpiGbl_NestingLevel, DbgInfo->ProcName); va_start (args, Format); AcpiOsVprintf (Format, args); @@ -301,7 +298,6 @@ AcpiUtDebugPrintRaw ( } va_start (args, Format); - AcpiOsVprintf (Format, args); } @@ -596,8 +592,8 @@ AcpiUtDumpBuffer ( UINT32 Display, UINT32 ComponentId) { - UINT32 i = 0; - UINT32 j; + NATIVE_UINT i = 0; + NATIVE_UINT j; UINT32 Temp32; UINT8 BufChar; @@ -626,7 +622,6 @@ AcpiUtDumpBuffer ( AcpiOsPrintf ("%05X ", i); - /* Print 16 hex chars */ for (j = 0; j < 16;) @@ -683,12 +678,10 @@ AcpiUtDumpBuffer ( } } - /* * Print the ASCII equivalent characters * But watch out for the bad unprintable ones... */ - for (j = 0; j < 16; j++) { if (i + j >= Count) |