diff options
Diffstat (limited to 'source/tools')
| -rw-r--r-- | source/tools/acpiexec/aeexec.c | 4 | ||||
| -rw-r--r-- | source/tools/acpiexec/aeregion.c | 16 | ||||
| -rw-r--r-- | source/tools/acpiexec/aetables.c | 3 | ||||
| -rw-r--r-- | source/tools/examples/examples.c | 4 |
4 files changed, 12 insertions, 15 deletions
diff --git a/source/tools/acpiexec/aeexec.c b/source/tools/acpiexec/aeexec.c index 2cd0138a8..74da1a656 100644 --- a/source/tools/acpiexec/aeexec.c +++ b/source/tools/acpiexec/aeexec.c @@ -448,8 +448,8 @@ ExecuteOSI ( if (ReturnValue.Length < sizeof (ACPI_OBJECT)) { AcpiOsPrintf ( - "Return value from _OSI method too small, %.8lX\n", - (UINT64) ReturnValue.Length); + "Return value from _OSI method too small, %.8X\n", + ReturnValue.Length); goto ErrorExit; } diff --git a/source/tools/acpiexec/aeregion.c b/source/tools/acpiexec/aeregion.c index 1d33b77f8..4d961a870 100644 --- a/source/tools/acpiexec/aeregion.c +++ b/source/tools/acpiexec/aeregion.c @@ -650,12 +650,12 @@ AeRegionHandler ( if (AcpiGbl_DisplayRegionAccess) { AcpiOsPrintf ("AcpiExec: %s " - "%s: Attr %X Addr %.4X BaseAddr %.4X Len %.2lX Width %X BufLen %X", + "%s: Attr %X Addr %.4X BaseAddr %.4X Len %.2X Width %X BufLen %X", AcpiUtGetRegionName (SpaceId), (Function & ACPI_IO_MASK) ? "Write" : "Read ", (UINT32) (Function >> 16), (UINT32) Address, (UINT32) BaseAddress, - (UINT64) Length, BitWidth, Buffer[1]); + Length, BitWidth, Buffer[1]); /* GenericSerialBus has a Connection() parameter */ @@ -687,10 +687,10 @@ AeRegionHandler ( if (AcpiGbl_DisplayRegionAccess) { AcpiOsPrintf ("AcpiExec: IPMI " - "%s: Attr %X Addr %.4X BaseAddr %.4X Len %.2lX Width %X BufLen %X\n", + "%s: Attr %X Addr %.4X BaseAddr %.4X Len %.2X Width %X BufLen %X\n", (Function & ACPI_IO_MASK) ? "Write" : "Read ", (UINT32) (Function >> 16), (UINT32) Address, (UINT32) BaseAddress, - (UINT64) Length, BitWidth, Buffer[1]); + Length, BitWidth, Buffer[1]); } /* @@ -967,9 +967,9 @@ DoFunction: case ACPI_ADR_SPACE_SYSTEM_MEMORY: AcpiOsPrintf ("AcpiExec: SystemMemory " - "%s: Val %.8X Addr %.4X Width %X [REGION: BaseAddr %.4X Len %.2lX]\n", + "%s: Val %.8X Addr %.4X Width %X [REGION: BaseAddr %.4X Len %.2X]\n", (Function & ACPI_IO_MASK) ? "Write" : "Read ", - (UINT32) *Value, (UINT32) Address, BitWidth, (UINT32) BaseAddress, (UINT64) Length); + (UINT32) *Value, (UINT32) Address, BitWidth, (UINT32) BaseAddress, Length); break; case ACPI_ADR_SPACE_GPIO: /* ACPI 5.0 */ @@ -980,9 +980,9 @@ DoFunction: MyContext->Length, &Resource); AcpiOsPrintf ("AcpiExec: GeneralPurposeIo " - "%s: Val %.8X Addr %.4X BaseAddr %.4X Len %.2lX Width %X AccLen %.2X Conn %p\n", + "%s: Val %.8X Addr %.4X BaseAddr %.4X Len %.2X Width %X AccLen %.2X Conn %p\n", (Function & ACPI_IO_MASK) ? "Write" : "Read ", (UINT32) *Value, - (UINT32) Address, (UINT32) BaseAddress, (UINT64) Length, BitWidth, + (UINT32) Address, (UINT32) BaseAddress, Length, BitWidth, MyContext->AccessLength, MyContext->Connection); break; diff --git a/source/tools/acpiexec/aetables.c b/source/tools/acpiexec/aetables.c index 4f4b071f0..c0a8e926f 100644 --- a/source/tools/acpiexec/aetables.c +++ b/source/tools/acpiexec/aetables.c @@ -623,11 +623,8 @@ AeLoadTables ( ACPI_STATUS Status; - ACPI_FUNCTION_NAME (AeLoadTables); - Status = AcpiLoadTables (); ACPI_CHECK_OK (AcpiLoadTables, Status); - ACPI_DEBUG_PRINT_RAW ((ACPI_DB_INIT, "\n")); /* * Test run-time control method installation. Do it twice to test code diff --git a/source/tools/examples/examples.c b/source/tools/examples/examples.c index e8b79de06..d9bbe5330 100644 --- a/source/tools/examples/examples.c +++ b/source/tools/examples/examples.c @@ -540,8 +540,8 @@ ExecuteOSI (void) if (ReturnValue.Length < sizeof (ACPI_OBJECT)) { - AcpiOsPrintf ("Return value from _OSI method too small, %.8lX\n", - (UINT64) ReturnValue.Length); + AcpiOsPrintf ("Return value from _OSI method too small, %.8X\n", + ReturnValue.Length); goto ErrorExit; } |