diff options
Diffstat (limited to 'sys/contrib/dev/acpica/utdebug.c')
| -rw-r--r-- | sys/contrib/dev/acpica/utdebug.c | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/sys/contrib/dev/acpica/utdebug.c b/sys/contrib/dev/acpica/utdebug.c index bc46c68..16b32a9 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: 91 $ + * $Revision: 95 $ * *****************************************************************************/ @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, 2000, 2001, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp. * All rights reserved. * * 2. License @@ -119,7 +119,7 @@ #include "acpi.h" #define _COMPONENT ACPI_UTILITIES - MODULE_NAME ("utdebug") + ACPI_MODULE_NAME ("utdebug") UINT32 AcpiGbl_PrevThreadId = 0xFFFFFFFF; @@ -149,7 +149,7 @@ AcpiUtInitStackPtrTrace ( UINT32 CurrentSp; - AcpiGbl_EntryStackPointer = (UINT32) &CurrentSp; + AcpiGbl_EntryStackPointer = ACPI_PTR_DIFF (&CurrentSp, NULL); } @@ -169,9 +169,10 @@ void AcpiUtTrackStackPtr ( void) { - UINT32 CurrentSp; + ACPI_SIZE CurrentSp; + - CurrentSp = (UINT32) &CurrentSp; + CurrentSp = ACPI_PTR_DIFF (&CurrentSp, NULL); if (CurrentSp < AcpiGbl_LowestStackPointer) { @@ -532,7 +533,8 @@ AcpiUtValueExit ( { AcpiUtDebugPrint (ACPI_LV_FUNCTIONS, LineNumber, DbgInfo, - "%s %8.8X%8.8X\n", AcpiGbl_FnExitStr, HIDWORD(Value), LODWORD(Value)); + "%s %8.8X%8.8X\n", AcpiGbl_FnExitStr, + ACPI_HIDWORD (Value), ACPI_LODWORD (Value)); AcpiGbl_NestingLevel--; } @@ -645,8 +647,8 @@ AcpiUtDumpBuffer ( case DB_WORD_DISPLAY: - MOVE_UNALIGNED16_TO_32 (&Temp32, - &Buffer[i + j]); + ACPI_MOVE_UNALIGNED16_TO_32 (&Temp32, + &Buffer[i + j]); AcpiOsPrintf ("%04X ", Temp32); j += 2; break; @@ -654,8 +656,8 @@ AcpiUtDumpBuffer ( case DB_DWORD_DISPLAY: - MOVE_UNALIGNED32_TO_32 (&Temp32, - &Buffer[i + j]); + ACPI_MOVE_UNALIGNED32_TO_32 (&Temp32, + &Buffer[i + j]); AcpiOsPrintf ("%08X ", Temp32); j += 4; break; @@ -663,12 +665,12 @@ AcpiUtDumpBuffer ( case DB_QWORD_DISPLAY: - MOVE_UNALIGNED32_TO_32 (&Temp32, - &Buffer[i + j]); + ACPI_MOVE_UNALIGNED32_TO_32 (&Temp32, + &Buffer[i + j]); AcpiOsPrintf ("%08X", Temp32); - MOVE_UNALIGNED32_TO_32 (&Temp32, - &Buffer[i + j + 4]); + ACPI_MOVE_UNALIGNED32_TO_32 (&Temp32, + &Buffer[i + j + 4]); AcpiOsPrintf ("%08X ", Temp32); j += 8; break; |
