4c4
< * $Revision: 121 $
---
> * $Revision: 127 $
120,123d119
< #include "acparser.h"
< #include "acinterp.h"
< #include "acnamesp.h"
< #include "acglobal.h"
175c171
< ACPI_SET_DESCRIPTOR_TYPE (Object, ACPI_CACHED_OBJECT);
---
> ACPI_SET_DESCRIPTOR_TYPE (Object, ACPI_DESC_TYPE_CACHED);
179c175
< * (char **) (((char *) Object) + CacheInfo->LinkOffset) = CacheInfo->ListHead;
---
> * (ACPI_CAST_INDIRECT_PTR (char, &(((char *) Object)[CacheInfo->LinkOffset]))) = CacheInfo->ListHead;
228c224
< CacheInfo->ListHead = * (char **) (((char *) Object) + CacheInfo->LinkOffset);
---
> CacheInfo->ListHead = *(ACPI_CAST_INDIRECT_PTR (char, &(((char *) Object)[CacheInfo->LinkOffset])));
295c291
< Next = * (char **) (((char *) CacheInfo->ListHead) + CacheInfo->LinkOffset);
---
> Next = *(ACPI_CAST_INDIRECT_PTR (char, &(((char *) CacheInfo->ListHead)[CacheInfo->LinkOffset])));
475c471
< ("UtAllocate: Could not allocate size %X\n", Size));
---
> ("UtAllocate: Could not allocate size %X\n", (UINT32) Size));
527c523
< ("UtCallocate: Could not allocate size %X\n", Size));
---
> ("UtCallocate: Could not allocate size %X\n", (UINT32) Size));
632c628
< ("UtCallocate: Could not allocate size %X\n", Size));
---
> ("UtCallocate: Could not allocate size %X\n", (UINT32) Size));
673a670
> ACPI_STATUS Status;
687,688c684,685
< DebugBlock = (ACPI_DEBUG_MEM_BLOCK *)
< (((char *) Allocation) - sizeof (ACPI_DEBUG_MEM_HEADER));
---
> DebugBlock = ACPI_CAST_PTR (ACPI_DEBUG_MEM_BLOCK,
> (((char *) Allocation) - sizeof (ACPI_DEBUG_MEM_HEADER)));
693,694c690,697
< AcpiUtRemoveAllocation (ACPI_MEM_LIST_GLOBAL, DebugBlock,
< Component, Module, Line);
---
> Status = AcpiUtRemoveAllocation (ACPI_MEM_LIST_GLOBAL, DebugBlock,
> Component, Module, Line);
> if (ACPI_FAILURE (Status))
> {
> ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not free memory, %s\n",
> AcpiFormatException (Status)));
> }
>
996a1000
> ACPI_DESCRIPTOR *Descriptor;
1019c1023,1024
< if (((ACPI_OPERAND_OBJECT *)(&Element->UserSpace))->Common.Type != ACPI_CACHED_OBJECT)
---
> Descriptor = ACPI_CAST_PTR (ACPI_DESCRIPTOR, &Element->UserSpace);
> if (Descriptor->DescriptorId != ACPI_DESC_TYPE_CACHED)
1022c1027
< &Element->UserSpace, Element->Size, Element->Module,
---
> Descriptor, Element->Size, Element->Module,
1027c1032
< switch (ACPI_GET_DESCRIPTOR_TYPE (&Element->UserSpace))
---
> switch (ACPI_GET_DESCRIPTOR_TYPE (Descriptor))
1029,1032c1034,1037
< case ACPI_DESC_TYPE_INTERNAL:
< AcpiOsPrintf ("ObjType %12.12s R%d",
< AcpiUtGetTypeName (((ACPI_OPERAND_OBJECT *)(&Element->UserSpace))->Common.Type),
< ((ACPI_OPERAND_OBJECT *)(&Element->UserSpace))->Common.ReferenceCount);
---
> case ACPI_DESC_TYPE_OPERAND:
> AcpiOsPrintf ("ObjType %12.12s R%hd",
> AcpiUtGetTypeName (Descriptor->Object.Common.Type),
> Descriptor->Object.Common.ReferenceCount);
1036,1037c1041,1042
< AcpiOsPrintf ("ParseObj Opcode %04X",
< ((ACPI_PARSE_OBJECT *)(&Element->UserSpace))->Opcode);
---
> AcpiOsPrintf ("ParseObj AmlOpcode %04hX",
> Descriptor->Op.Asl.AmlOpcode);
1042c1047
< (char *) &((ACPI_NAMESPACE_NODE *)(&Element->UserSpace))->Name);
---
> Descriptor->Node.Name.Ascii);
1083a1089,1092
>
> default:
> /* All types should appear above */
> break;
1100c1109
< "No outstanding allocations.\n"));
---
> "No outstanding allocations.\n"));