diff options
author | Tomasz Nowicki <tomasz.nowicki@linaro.org> | 2014-02-25 15:56:10 +0100 |
---|---|---|
committer | Tomasz Nowicki <tomasz.nowicki@linaro.org> | 2014-02-25 15:56:10 +0100 |
commit | d2c6c369bf7710e5111e0c4f50a7cec8d17398b1 (patch) | |
tree | 048485ee76516b19b173324d2a120a5d0e0ef866 | |
parent | 7a9c5830e5edc0a4ed3bae70bf96ccfc25b34661 (diff) |
Signed-off-by: Tomasz Nowicki <tomasz.nowicki@linaro.org>
-rw-r--r-- | tests/aapits/atexec.c | 10 | ||||
-rw-r--r-- | tests/aapits/atinit.c | 10 | ||||
-rw-r--r-- | tests/aapits/atnamespace.c | 8 | ||||
-rw-r--r-- | tests/aapits/atosxfctrl.c | 10 | ||||
-rw-r--r-- | tests/aapits/atresource.c | 12 |
5 files changed, 25 insertions, 25 deletions
diff --git a/tests/aapits/atexec.c b/tests/aapits/atexec.c index 389bb1e9a..959dfe8fa 100644 --- a/tests/aapits/atexec.c +++ b/tests/aapits/atexec.c @@ -1428,7 +1428,7 @@ AeRegionHandler ( ACPI_WARNING ((AE_INFO, "Request on [%4.4s] is beyond region limit Req-%X+%X, Base=%X, Len-%X\n", (RegionObject->Region.Node)->Name.Ascii, (UINT32) Address, - ByteWidth, (UINT32) BufferAddress, Length)); + ByteWidth, (UINT32) BufferAddress, (UINT32)Length)); return (AE_AML_REGION_LIMIT); } @@ -1795,7 +1795,7 @@ AtCheckInteger( printf ("API Error: Value of %s is 0x%I64x instead of expected 0x%I64x\n", Path, Obj.Integer.Value, Value); #else - printf ("API Error: Value of %s is 0x%llx instead of expected 0x%llx\n", + printf ("API Error: Value of %s is 0x%lx instead of expected 0x%lx\n", Path, Obj.Integer.Value, Value); #endif Status = AE_ERROR; @@ -1875,7 +1875,7 @@ AtCheckString( { TestErrors++; printf ("Test Error: cannot allocate buffer of %d bytes\n", - Results.Length); + (UINT32)Results.Length); return (AE_NO_MEMORY); } Results.Pointer = Object; @@ -1956,7 +1956,7 @@ AtCheckBuffer( { printf ("AtCheckBuffer: unexpected length %d of Buffer vs" " calculated %d bytes\n", - Results.Length, ACPI_ROUND_UP_TO_NATIVE_WORD(sizeof (ACPI_OBJECT) + Length)); + (UINT32)Results.Length, (UINT32)ACPI_ROUND_UP_TO_NATIVE_WORD(sizeof (ACPI_OBJECT) + Length)); } /* Initialize the return buffer structure */ @@ -1965,7 +1965,7 @@ AtCheckBuffer( { TestErrors++; printf ("Test Error: cannot allocate buffer of %d bytes\n", - Results.Length); + (UINT32)Results.Length); return (AE_NO_MEMORY); } Results.Pointer = Object; diff --git a/tests/aapits/atinit.c b/tests/aapits/atinit.c index 909cda4b8..4215b53e4 100644 --- a/tests/aapits/atinit.c +++ b/tests/aapits/atinit.c @@ -3025,7 +3025,7 @@ AtInitTest0041(void) AapiErrors++; printf ("API Error: AcpiGetSystemInfo() returned" " Length %d, expected %d\n", - OutBuffer.Length, sizeof (Info)); + (UINT32)OutBuffer.Length, (UINT32)sizeof (Info)); return (AE_ERROR); } @@ -3047,7 +3047,7 @@ AtInitTest0041(void) AapiErrors++; printf ("API Error: AcpiGetSystemInfo() returned" " Length %d, expected %d\n", - OutBuffer.Length, sizeof (Info)); + (UINT32)OutBuffer.Length, (UINT32)sizeof (Info)); return (AE_ERROR); } @@ -3067,7 +3067,7 @@ AtInitTest0041(void) AapiErrors++; printf ("API Error: AcpiGetSystemInfo() returned" " Length %d, expected %d\n", - OutBuffer.Length, sizeof (Info)); + (UINT32)OutBuffer.Length, (UINT32)sizeof (Info)); return (AE_ERROR); } else if (OutBuffer.Pointer != &Info) @@ -3150,7 +3150,7 @@ AtInitTest0042(void) AapiErrors++; printf ("API Error: AcpiGetSystemInfo() returned" " Length %d, expected %d\n", - OutBuffer.Length, sizeof (Info)); + (UINT32)OutBuffer.Length, (UINT32)sizeof (Info)); return (AE_ERROR); } else if (OutBuffer.Pointer != &Info) @@ -3215,7 +3215,7 @@ AtInitTest0043(void) AapiErrors++; printf ("API Error: AcpiGetSystemInfo() returned" " Length %d, expected %d\n", - OutBuffer.Length, sizeof (ACPI_SYSTEM_INFO)); + (UINT32)OutBuffer.Length, (UINT32)sizeof (ACPI_SYSTEM_INFO)); return (AE_ERROR); } else diff --git a/tests/aapits/atnamespace.c b/tests/aapits/atnamespace.c index 6f3b7b3a0..6cd40fec1 100644 --- a/tests/aapits/atnamespace.c +++ b/tests/aapits/atnamespace.c @@ -2562,7 +2562,7 @@ AtGetObjectInfoTypeCommon( PathNames[2 * i + 1], Info->Address, ExpectedInfo[i].Address); #else - printf ("API Error: Address of %s (0x%llX) != (0x%llX)\n", + printf ("API Error: Address of %s (0x%lX) != (0x%lX)\n", PathNames[2 * i + 1], Info->Address, ExpectedInfo[i].Address); #endif @@ -2942,7 +2942,7 @@ AtGetNextObjectTypeCommon( TestErrors++; printf ("AtGetNextObjectTypeCommon: different numbers of entities" "in TypesNames (%d) and LevelTypes0000 (%d)\n", - TypesCount, sizeof (LevelTypes0000) / sizeof (ACPI_OBJECT_TYPE)); + TypesCount, (UINT32)(sizeof (LevelTypes0000) / sizeof (ACPI_OBJECT_TYPE))); return (AE_ERROR); } @@ -4225,7 +4225,7 @@ AtCheckHandlePathMapping( printf ("API Error: Value of %s is 0x%I64x instead of expected 0x%I64x\n", Pathname, Obj.Integer.Value, Value); #else - printf ("API Error: Value of %s is 0x%llx instead of expected 0x%llx\n", + printf ("API Error: Value of %s is 0x%lx instead of expected 0x%lx\n", Pathname, Obj.Integer.Value, Value); #endif Status = AE_ERROR; @@ -5233,7 +5233,7 @@ AtGetNameExceptionTest( { AapiErrors++; printf ("API Error: AcpiOsAllocate(%d) returned NULL\n", - OutName.Length); + (UINT32)OutName.Length); return (AE_ERROR); } } diff --git a/tests/aapits/atosxfctrl.c b/tests/aapits/atosxfctrl.c index 851b547c1..3d7ceee3d 100644 --- a/tests/aapits/atosxfctrl.c +++ b/tests/aapits/atosxfctrl.c @@ -740,7 +740,7 @@ ACPI_OSXF_EMUL_REG #ifdef _MSC_VER printf("OsxfCtrlFingReg: unexpected Width %d of Reg 0x%I64x\n", #else - printf("OsxfCtrlFingReg: unexpected Width %d of Reg 0x%llx\n", + printf("OsxfCtrlFingReg: unexpected Width %d of Reg 0x%lx\n", #endif #else printf("OsxfCtrlFingReg: unexpected Width %d of Reg 0x%x\n", @@ -767,8 +767,8 @@ ACPI_OSXF_EMUL_REG printf("OsxfCtrlFingReg: intersection Regs (0x%I64x: 0x%x)" " and (0x%I64x: 0x%x)\n", #else - printf("OsxfCtrlFingReg: intersection Regs (0x%llx: 0x%x)" - " and (0x%llx: 0x%x)\n", + printf("OsxfCtrlFingReg: intersection Regs (0x%lx: 0x%x)" + " and (0x%lx: 0x%x)\n", #endif #else printf("OsxfCtrlFingReg: intersection Regs (0x%x: 0x%x)" @@ -789,7 +789,7 @@ ACPI_OSXF_EMUL_REG #ifdef _MSC_VER printf("OsxfCtrlFingReg: no memory for Reg (0x%I64x: 0x%x)\n", #else - printf("OsxfCtrlFingReg: no memory for Reg (0x%llx: 0x%x)\n", + printf("OsxfCtrlFingReg: no memory for Reg (0x%lx: 0x%x)\n", #endif #else printf("OsxfCtrlFingReg: no memory for Reg (0x%x: 0x%x)\n", @@ -935,7 +935,7 @@ OsxfCtrlRegService(UINT32 ServiceFlag) #ifdef _MSC_VER printf("%.2u (%s Address 0x%I64x: Width %.2u) r/w counts: %u/%u\n", #else - printf("%.2u (%s Address 0x%llx: Width %.2u) r/w counts: %u/%u\n", + printf("%.2u (%s Address 0x%lx: Width %.2u) r/w counts: %u/%u\n", #endif #else printf("%.2u (%s Address 0x%.4x: Width %.2u) r/w counts: %u/%u\n", diff --git a/tests/aapits/atresource.c b/tests/aapits/atresource.c index e9ab38aee..bdff99418 100644 --- a/tests/aapits/atresource.c +++ b/tests/aapits/atresource.c @@ -174,7 +174,7 @@ AtRsrcTest0000(void) AapiErrors++; printf ("API Error: AcpiGetCurrentResources(%s) returned Length %d," " expected %d\n", - Pathname, OutBuffer.Length, RT0000_DEV0_CRS_LEN); + Pathname, (UINT32)OutBuffer.Length, RT0000_DEV0_CRS_LEN); return (AE_ERROR); } @@ -490,7 +490,7 @@ AtRsrcTest0005(void) AapiErrors++; printf ("API Error: AcpiGetCurrentResources(%s) returned Length %d," " expected %d\n", - Pathname, OutBuffer.Length, RT0000_DEV0_CRS_LEN); + Pathname, (UINT32)OutBuffer.Length, RT0000_DEV0_CRS_LEN); return (AE_ERROR); } @@ -694,8 +694,8 @@ AtRsrcTest0007(void) { AapiErrors++; printf ("Api Error: Resource->Length (%d) != %d\n", - CurrentResource->Length, - ACPI_ROUND_UP_TO_NATIVE_WORD (ACPI_RS_SIZE (ACPI_RESOURCE_IRQ))); + (UINT32)CurrentResource->Length, + (UINT32)ACPI_ROUND_UP_TO_NATIVE_WORD (ACPI_RS_SIZE (ACPI_RESOURCE_IRQ))); } if (CurrentResource->Data.Irq.Triggering != 0) /* Level-Triggered */ @@ -987,7 +987,7 @@ AtRsrcTest0012(void) AapiErrors++; printf ("API Error: AcpiGetPossibleResources(%s) returned Length %d," " expected %d\n", - Pathname, OutBuffer.Length, RT0000_DEV0_CRS_LEN); + Pathname, (UINT32)OutBuffer.Length, RT0000_DEV0_CRS_LEN); return (AE_ERROR); } @@ -1940,7 +1940,7 @@ AtRsrcTest0026(void) AapiErrors++; printf ("API Error: AcpiGetIrqRoutingTable(%s) returned Length %d," " expected %d\n", - Pathname, OutBuffer.Length, 0xA48); + Pathname, (UINT32)OutBuffer.Length, 0xA48); return (AE_ERROR); } |