1 diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapits/tests/aapits/atexec.c
2 --- acpica-unix2-20130626/tests/aapits/atexec.c 2013-01-17 12:48:28.000000000 -0700
3 +++ acpica-unix2-20130626-aapits/tests/aapits/atexec.c 2013-07-25 13:44:23.023894441 -0600
8 +#if ACPI_MACHINE_WIDTH == 32
9 /*******************************************************************************
11 * FUNCTION: AtBuildLocalRSDT
13 LocalRSDT->Header.Checksum = (UINT8)~LocalRSDT->Header.Checksum;
19 /*******************************************************************************
21 * FUNCTION: AtBuildLocalXSDT
23 ACPI_WARNING ((AE_INFO,
24 "Request on [%4.4s] is beyond region limit Req-%X+%X, Base=%X, Len-%X\n",
25 (RegionObject->Region.Node)->Name.Ascii, (UINT32) Address,
26 - ByteWidth, (UINT32) BufferAddress, Length));
27 + ByteWidth, (UINT32) BufferAddress, (UINT32) Length));
29 return (AE_AML_REGION_LIMIT);
32 Path, Obj.Integer.Value, Value);
34 printf ("API Error: Value of %s is 0x%llx instead of expected 0x%llx\n",
35 - Path, Obj.Integer.Value, Value);
37 + (long long unsigned int) Obj.Integer.Value,
38 + (long long unsigned int) Value);
45 printf ("Test Error: cannot allocate buffer of %d bytes\n",
47 + (int) Results.Length);
48 return (AE_NO_MEMORY);
50 Results.Pointer = Object;
53 printf ("AtCheckBuffer: unexpected length %d of Buffer vs"
54 " calculated %d bytes\n",
55 - Results.Length, ACPI_ROUND_UP_TO_NATIVE_WORD(sizeof (ACPI_OBJECT) + Length));
56 + (int)Results.Length,
57 + (int)(ACPI_ROUND_UP_TO_NATIVE_WORD(sizeof (ACPI_OBJECT) + Length)));
60 /* Initialize the return buffer structure */
64 printf ("Test Error: cannot allocate buffer of %d bytes\n",
66 + (int) Results.Length);
67 return (AE_NO_MEMORY);
69 Results.Pointer = Object;
70 diff -urN acpica-unix2-20130626/tests/aapits/atinit.c acpica-unix2-20130626-aapits/tests/aapits/atinit.c
71 --- acpica-unix2-20130626/tests/aapits/atinit.c 2013-01-17 12:48:28.000000000 -0700
72 +++ acpica-unix2-20130626-aapits/tests/aapits/atinit.c 2013-07-25 13:20:19.706705960 -0600
75 printf ("API Error: AcpiGetSystemInfo() returned"
76 " Length %d, expected %d\n",
77 - OutBuffer.Length, sizeof (Info));
78 + (int) OutBuffer.Length, (int) sizeof (Info));
84 printf ("API Error: AcpiGetSystemInfo() returned"
85 " Length %d, expected %d\n",
86 - OutBuffer.Length, sizeof (Info));
87 + (int) OutBuffer.Length, (int) sizeof (Info));
93 printf ("API Error: AcpiGetSystemInfo() returned"
94 " Length %d, expected %d\n",
95 - OutBuffer.Length, sizeof (Info));
96 + (int) OutBuffer.Length, (int) sizeof (Info));
99 else if (OutBuffer.Pointer != &Info)
100 @@ -3149,7 +3149,7 @@
102 printf ("API Error: AcpiGetSystemInfo() returned"
103 " Length %d, expected %d\n",
104 - OutBuffer.Length, sizeof (Info));
105 + (int) OutBuffer.Length, (int) sizeof (Info));
108 else if (OutBuffer.Pointer != &Info)
109 @@ -3214,7 +3214,7 @@
111 printf ("API Error: AcpiGetSystemInfo() returned"
112 " Length %d, expected %d\n",
113 - OutBuffer.Length, sizeof (ACPI_SYSTEM_INFO));
114 + (int) OutBuffer.Length, (int) sizeof (ACPI_SYSTEM_INFO));
118 diff -urN acpica-unix2-20130626/tests/aapits/atmain.c acpica-unix2-20130626-aapits/tests/aapits/atmain.c
119 --- acpica-unix2-20130626/tests/aapits/atmain.c 2013-01-17 12:48:28.000000000 -0700
120 +++ acpica-unix2-20130626-aapits/tests/aapits/atmain.c 2013-07-25 13:18:22.083323948 -0600
123 printf ("ACPICA API TS err: test num %ld of test case %ld"
124 " is not implemented\n",
125 - test_num, test_case);
126 + (long int) test_num, (long int) test_case);
127 return (AtRetNotImpl);
131 if (test_case < 1 || test_case > AT_TEST_CASE_NUM)
133 printf ("ACPICA API TS err: test case %ld is out of range 1 - %d\n",
134 - test_case, AT_TEST_CASE_NUM);
135 + (long int) test_case, (int) AT_TEST_CASE_NUM);
136 return (AtRetBadParam);
140 if (test_num < 0 || test_num > AtTestCase[test_case].TestsNum)
142 printf ("ACPICA API TS err: test num %ld is out of range 0 - %d\n",
143 - test_num, AtTestCase[test_case].TestsNum);
144 + (long int) test_num, AtTestCase[test_case].TestsNum);
145 return (AtRetBadParam);
148 diff -urN acpica-unix2-20130626/tests/aapits/atnamespace.c acpica-unix2-20130626-aapits/tests/aapits/atnamespace.c
149 --- acpica-unix2-20130626/tests/aapits/atnamespace.c 2013-01-17 12:48:28.000000000 -0700
150 +++ acpica-unix2-20130626-aapits/tests/aapits/atnamespace.c 2013-07-25 13:24:15.366466707 -0600
151 @@ -2535,7 +2535,8 @@
153 printf ("API Error: Address of %s (0x%llX) != (0x%llX)\n",
154 PathNames[2 * i + 1],
155 - Info->Address, ExpectedInfo[i].Address);
156 + (long long unsigned int) Info->Address,
157 + (long long unsigned int) ExpectedInfo[i].Address);
160 printf ("API Error: Address of %s (0x%X) != (0x%X)\n",
161 @@ -2908,7 +2909,8 @@
163 printf ("AtGetNextObjectTypeCommon: different numbers of entities"
164 "in TypesNames (%d) and LevelTypes0000 (%d)\n",
165 - TypesCount, sizeof (LevelTypes0000) / sizeof (ACPI_OBJECT_TYPE));
167 + (int) (sizeof (LevelTypes0000) / sizeof (ACPI_OBJECT_TYPE)));
171 @@ -4192,7 +4194,9 @@
172 Pathname, Obj.Integer.Value, Value);
174 printf ("API Error: Value of %s is 0x%llx instead of expected 0x%llx\n",
175 - Pathname, Obj.Integer.Value, Value);
177 + (long long unsigned int) Obj.Integer.Value,
178 + (long long unsigned int) Value);
182 @@ -5199,7 +5203,7 @@
185 printf ("API Error: AcpiOsAllocate(%d) returned NULL\n",
187 + (int) OutName.Length);
191 diff -urN acpica-unix2-20130626/tests/aapits/atosxfctrl.c acpica-unix2-20130626-aapits/tests/aapits/atosxfctrl.c
192 --- acpica-unix2-20130626/tests/aapits/atosxfctrl.c 2013-01-17 12:48:28.000000000 -0700
193 +++ acpica-unix2-20130626-aapits/tests/aapits/atosxfctrl.c 2013-07-25 13:30:00.375492751 -0600
194 @@ -737,13 +737,15 @@
195 #if ACPI_MACHINE_WIDTH == 64
197 printf("OsxfCtrlFingReg: unexpected Width %d of Reg 0x%I64x\n",
200 printf("OsxfCtrlFingReg: unexpected Width %d of Reg 0x%llx\n",
201 + Width, (long long unsigned int) Address);
204 printf("OsxfCtrlFingReg: unexpected Width %d of Reg 0x%x\n",
211 @@ -764,15 +766,19 @@
213 printf("OsxfCtrlFingReg: intersection Regs (0x%I64x: 0x%x)"
214 " and (0x%I64x: 0x%x)\n",
215 + Reg->Address, Reg->Width, Address, Width);
217 printf("OsxfCtrlFingReg: intersection Regs (0x%llx: 0x%x)"
218 " and (0x%llx: 0x%x)\n",
219 + (long long unsigned int) Reg->Address,
221 + (long long unsigned int) Address, Width);
224 printf("OsxfCtrlFingReg: intersection Regs (0x%x: 0x%x)"
225 " and (0x%x: 0x%x)\n",
227 Reg->Address, Reg->Width, Address, Width);
232 @@ -786,13 +792,15 @@
233 #if ACPI_MACHINE_WIDTH == 64
235 printf("OsxfCtrlFingReg: no memory for Reg (0x%I64x: 0x%x)\n",
236 + Reg->Address, Reg->Width);
238 printf("OsxfCtrlFingReg: no memory for Reg (0x%llx: 0x%x)\n",
239 + (long long unsigned int) Reg->Address, Reg->Width);
242 printf("OsxfCtrlFingReg: no memory for Reg (0x%x: 0x%x)\n",
244 Reg->Address, Reg->Width);
249 @@ -932,14 +940,19 @@
250 #if ACPI_MACHINE_WIDTH == 64
252 printf("%.2u (%s Address 0x%I64x: Width %.2u) r/w counts: %u/%u\n",
253 + i, (Reg->Type == EMUL_REG_SYS)? "SYS": "IO",
254 + Reg->Address, Reg->Width, Reg->ReadCount, Reg->WriteCount);
256 printf("%.2u (%s Address 0x%llx: Width %.2u) r/w counts: %u/%u\n",
257 + i, (Reg->Type == EMUL_REG_SYS)? "SYS": "IO",
258 + (long long unsigned int) Reg->Address,
259 + Reg->Width, Reg->ReadCount, Reg->WriteCount);
262 printf("%.2u (%s Address 0x%.4x: Width %.2u) r/w counts: %u/%u\n",
264 i, (Reg->Type == EMUL_REG_SYS)? "SYS": "IO",
265 Reg->Address, Reg->Width, Reg->ReadCount, Reg->WriteCount);
270 diff -urN acpica-unix2-20130626/tests/aapits/atresource.c acpica-unix2-20130626-aapits/tests/aapits/atresource.c
271 --- acpica-unix2-20130626/tests/aapits/atresource.c 2013-01-17 12:48:29.000000000 -0700
272 +++ acpica-unix2-20130626-aapits/tests/aapits/atresource.c 2013-07-25 13:25:49.423565947 -0600
275 printf ("API Error: AcpiGetCurrentResources(%s) returned Length %d,"
277 - Pathname, OutBuffer.Length, RT0000_DEV0_CRS_LEN);
278 + Pathname, (int) OutBuffer.Length, RT0000_DEV0_CRS_LEN);
284 printf ("API Error: AcpiGetCurrentResources(%s) returned Length %d,"
286 - Pathname, OutBuffer.Length, RT0000_DEV0_CRS_LEN);
287 + Pathname, (int) OutBuffer.Length, RT0000_DEV0_CRS_LEN);
293 printf ("Api Error: Resource->Length (%d) != %d\n",
294 CurrentResource->Length,
295 - ACPI_ROUND_UP_TO_NATIVE_WORD (ACPI_RS_SIZE (ACPI_RESOURCE_IRQ)));
296 + (int) (ACPI_ROUND_UP_TO_NATIVE_WORD (ACPI_RS_SIZE (ACPI_RESOURCE_IRQ))));
299 if (CurrentResource->Data.Irq.Triggering != 0) /* Level-Triggered */
302 printf ("API Error: AcpiGetPossibleResources(%s) returned Length %d,"
304 - Pathname, OutBuffer.Length, RT0000_DEV0_CRS_LEN);
305 + Pathname, (int) OutBuffer.Length, RT0000_DEV0_CRS_LEN);
309 @@ -1923,7 +1923,7 @@
311 printf ("API Error: AcpiGetIrqRoutingTable(%s) returned Length %d,"
313 - Pathname, OutBuffer.Length, 0xA48);
314 + Pathname, (int) OutBuffer.Length, 0xA48);
318 diff -urN acpica-unix2-20130626/tests/aapits/Makefile acpica-unix2-20130626-aapits/tests/aapits/Makefile
319 --- acpica-unix2-20130626/tests/aapits/Makefile 2013-01-17 12:48:29.000000000 -0700
320 +++ acpica-unix2-20130626-aapits/tests/aapits/Makefile 2013-07-25 15:17:09.309236422 -0600
322 CFLAGS+= -Wall -g -D_LINUX -DNDEBUG -D_CONSOLE -DACPI_APITS -DACPI_EXEC_APP -D_MULTI_THREADED -Wstrict-prototypes -I../../source/include
325 -acpiexec : $(patsubst %.c,%.o, $(SRCS))
326 +$(PROG) : $(patsubst %.c,%.o, $(SRCS))
327 $(CC) $(LDFLAGS) $(patsubst %.c,%.o, $(SRCS)) -o $(PROG)