aapits-linux.patch

   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
   4 @@ -639,6 +639,7 @@
   5  }
   6
   7
   8 +#if ACPI_MACHINE_WIDTH == 32
   9  /*******************************************************************************
  10   *
  11   * FUNCTION:    AtBuildLocalRSDT
  12 @@ -757,8 +758,9 @@
  13          LocalRSDT->Header.Checksum = (UINT8)~LocalRSDT->Header.Checksum;
  14      }
  15  }
  16 +#endif
  17
  18
  19  /*******************************************************************************
  20   *
  21   * FUNCTION:    AtBuildLocalXSDT
  22 @@ -1424,7 +1426,7 @@
  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));
  28
  29          return (AE_AML_REGION_LIMIT);
  30      }
  31 @@ -1799,7 +1801,9 @@
  32              Path, Obj.Integer.Value, Value);
  33  #else
  34          printf ("API Error: Value of %s is 0x%llx instead of expected 0x%llx\n",
  35 -            Path, Obj.Integer.Value, Value);
  36 +            Path,
  37 +           (long long unsigned int) Obj.Integer.Value,
  38 +           (long long unsigned int) Value);
  39  #endif
  40          Status = AE_ERROR;
  41      }
  42 @@ -1878,7 +1878,7 @@
  43      {
  44          TestErrors++;
  45          printf ("Test Error: cannot allocate buffer of %d bytes\n",
  46 -            Results.Length);
  47 +                (int) Results.Length);
  48          return (AE_NO_MEMORY);
  49      }
  50      Results.Pointer = Object;
  51 @@ -1959,7 +1963,8 @@
  52      {
  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)));
  58      }
  59
  60      /* Initialize the return buffer structure */
  61 @@ -1968,7 +1973,7 @@
  62      {
  63          TestErrors++;
  64          printf ("Test Error: cannot allocate buffer of %d bytes\n",
  65 -            Results.Length);
  66 +            (int) Results.Length);
  67          return (AE_NO_MEMORY);
  68      }
  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
  73 @@ -3024,7 +3024,7 @@
  74              AapiErrors++;
  75              printf ("API Error: AcpiGetSystemInfo() returned"
  76                  " Length %d, expected %d\n",
  77 -                OutBuffer.Length, sizeof (Info));
  78 +                (int) OutBuffer.Length, (int) sizeof (Info));
  79              return (AE_ERROR);
  80          }
  81
  82 @@ -3046,7 +3046,7 @@
  83              AapiErrors++;
  84              printf ("API Error: AcpiGetSystemInfo() returned"
  85                  " Length %d, expected %d\n",
  86 -                OutBuffer.Length, sizeof (Info));
  87 +                (int) OutBuffer.Length, (int) sizeof (Info));
  88              return (AE_ERROR);
  89          }
  90
  91 @@ -3066,7 +3066,7 @@
  92              AapiErrors++;
  93              printf ("API Error: AcpiGetSystemInfo() returned"
  94                  " Length %d, expected %d\n",
  95 -                OutBuffer.Length, sizeof (Info));
  96 +                (int) OutBuffer.Length, (int) sizeof (Info));
  97              return (AE_ERROR);
  98          }
  99          else if (OutBuffer.Pointer != &Info)
 100 @@ -3149,7 +3149,7 @@
 101              AapiErrors++;
 102              printf ("API Error: AcpiGetSystemInfo() returned"
 103                  " Length %d, expected %d\n",
 104 -                OutBuffer.Length, sizeof (Info));
 105 +                (int) OutBuffer.Length, (int) sizeof (Info));
 106              return (AE_ERROR);
 107          }
 108          else if (OutBuffer.Pointer != &Info)
 109 @@ -3214,7 +3214,7 @@
 110              AapiErrors++;
 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));
 115              return (AE_ERROR);
 116          }
 117          else
 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
 121 @@ -346,7 +336,7 @@
 122      {
 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);
 128      }
 129
 130 @@ -461,7 +451,7 @@
 131      if (test_case < 1 || test_case > AT_TEST_CASE_NUM)
 132      {
 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);
 137      }
 138
 139 @@ -469,7 +459,7 @@
 140      if (test_num < 0 || test_num > AtTestCase[test_case].TestsNum)
 141      {
 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);
 146      }
 147
 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 @@
 152  #else
 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);
 158  #endif
 159  #else
 160                  printf ("API Error: Address of %s (0x%X) != (0x%X)\n",
 161 @@ -2908,7 +2909,8 @@
 162          TestErrors++;
 163          printf ("AtGetNextObjectTypeCommon: different numbers of entities"
 164              "in TypesNames (%d) and LevelTypes0000 (%d)\n",
 165 -            TypesCount, sizeof (LevelTypes0000) / sizeof (ACPI_OBJECT_TYPE));
 166 +            TypesCount,
 167 +           (int) (sizeof (LevelTypes0000) / sizeof (ACPI_OBJECT_TYPE)));
 168          return (AE_ERROR);
 169      }
 170
 171 @@ -4192,7 +4194,9 @@
 172              Pathname, Obj.Integer.Value, Value);
 173  #else
 174          printf ("API Error: Value of %s is 0x%llx instead of expected 0x%llx\n",
 175 -            Pathname, Obj.Integer.Value, Value);
 176 +            Pathname,
 177 +           (long long unsigned int) Obj.Integer.Value,
 178 +           (long long unsigned int) Value);
 179  #endif
 180          Status = AE_ERROR;
 181      }
 182 @@ -5199,7 +5203,7 @@
 183              {
 184                  AapiErrors++;
 185                  printf ("API Error: AcpiOsAllocate(%d) returned NULL\n",
 186 -                    OutName.Length);
 187 +                    (int) OutName.Length);
 188                  return (AE_ERROR);
 189              }
 190          }
 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
 196  #ifdef    _MSC_VER
 197          printf("OsxfCtrlFingReg: unexpected Width %d of Reg 0x%I64x\n",
 198 +            Width, Address);
 199  #else
 200          printf("OsxfCtrlFingReg: unexpected Width %d of Reg 0x%llx\n",
 201 +            Width, (long long unsigned int) Address);
 202  #endif
 203  #else
 204          printf("OsxfCtrlFingReg: unexpected Width %d of Reg 0x%x\n",
 205 -#endif
 206              Width, Address);
 207 +#endif
 208          return (NULL);
 209      }
 210
 211 @@ -764,15 +766,19 @@
 212  #ifdef    _MSC_VER
 213                  printf("OsxfCtrlFingReg: intersection Regs (0x%I64x: 0x%x)"
 214                      " and (0x%I64x: 0x%x)\n",
 215 +                    Reg->Address, Reg->Width, Address, Width);
 216  #else
 217                  printf("OsxfCtrlFingReg: intersection Regs (0x%llx: 0x%x)"
 218                      " and (0x%llx: 0x%x)\n",
 219 +                    (long long unsigned int) Reg->Address,
 220 +                   Reg->Width,
 221 +                   (long long unsigned int) Address, Width);
 222  #endif
 223  #else
 224                  printf("OsxfCtrlFingReg: intersection Regs (0x%x: 0x%x)"
 225                      " and (0x%x: 0x%x)\n",
 226 -#endif
 227                      Reg->Address, Reg->Width, Address, Width);
 228 +#endif
 229                  return (NULL);
 230              }
 231          }
 232 @@ -786,13 +792,15 @@
 233  #if ACPI_MACHINE_WIDTH == 64
 234  #ifdef    _MSC_VER
 235              printf("OsxfCtrlFingReg: no memory for Reg (0x%I64x: 0x%x)\n",
 236 +                Reg->Address, Reg->Width);
 237  #else
 238              printf("OsxfCtrlFingReg: no memory for Reg (0x%llx: 0x%x)\n",
 239 +                (long long unsigned int) Reg->Address, Reg->Width);
 240  #endif
 241  #else
 242              printf("OsxfCtrlFingReg: no memory for Reg (0x%x: 0x%x)\n",
 243 -#endif
 244                  Reg->Address, Reg->Width);
 245 +#endif
 246              return (NULL);
 247          }
 248          Reg->Type = Type;
 249 @@ -932,14 +940,19 @@
 250  #if ACPI_MACHINE_WIDTH == 64
 251  #ifdef    _MSC_VER
 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);
 255  #else
 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);
 260  #endif
 261  #else
 262              printf("%.2u (%s Address 0x%.4x: Width %.2u) r/w counts: %u/%u\n",
 263 -#endif
 264                  i, (Reg->Type == EMUL_REG_SYS)? "SYS": "IO",
 265                  Reg->Address, Reg->Width, Reg->ReadCount, Reg->WriteCount);
 266 +#endif
 267              Reg = Reg->Next;
 268              i++;
 269          }
 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
 273 @@ -174,7 +174,7 @@
 274          AapiErrors++;
 275          printf ("API Error: AcpiGetCurrentResources(%s) returned Length %d,"
 276              " expected %d\n",
 277 -            Pathname, OutBuffer.Length, RT0000_DEV0_CRS_LEN);
 278 +            Pathname, (int) OutBuffer.Length, RT0000_DEV0_CRS_LEN);
 279          return (AE_ERROR);
 280      }
 281
 282 @@ -490,7 +490,7 @@
 283          AapiErrors++;
 284          printf ("API Error: AcpiGetCurrentResources(%s) returned Length %d,"
 285              " expected %d\n",
 286 -            Pathname, OutBuffer.Length, RT0000_DEV0_CRS_LEN);
 287 +            Pathname, (int) OutBuffer.Length, RT0000_DEV0_CRS_LEN);
 288          return (AE_ERROR);
 289      }
 290
 291 @@ -689,7 +689,7 @@
 292          AapiErrors++;
 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))));
 297      }
 298
 299      if (CurrentResource->Data.Irq.Triggering != 0) /* Level-Triggered */
 300 @@ -981,7 +981,7 @@
 301          AapiErrors++;
 302          printf ("API Error: AcpiGetPossibleResources(%s) returned Length %d,"
 303              " expected %d\n",
 304 -            Pathname, OutBuffer.Length, RT0000_DEV0_CRS_LEN);
 305 +            Pathname, (int) OutBuffer.Length, RT0000_DEV0_CRS_LEN);
 306          return (AE_ERROR);
 307      }
 308
 309 @@ -1923,7 +1923,7 @@
 310          AapiErrors++;
 311          printf ("API Error: AcpiGetIrqRoutingTable(%s) returned Length %d,"
 312              " expected %d\n",
 313 -            Pathname, OutBuffer.Length, 0xA48);
 314 +            Pathname, (int) OutBuffer.Length, 0xA48);
 315          return (AE_ERROR);
 316      }
 317
 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
 321 @@ -199,7 +199,7 @@
 322  CFLAGS+= -Wall -g -D_LINUX -DNDEBUG -D_CONSOLE -DACPI_APITS -DACPI_EXEC_APP -D_MULTI_THREADED -Wstrict-prototypes -I../../source/include
 323
 324
 325 -acpiexec : $(patsubst %.c,%.o, $(SRCS))
 326 +$(PROG) : $(patsubst %.c,%.o, $(SRCS))
 327         $(CC) $(LDFLAGS) $(patsubst %.c,%.o, $(SRCS)) -o $(PROG)
 328
 329  CLEANFILES= $(PROG)