4c4
<  *       $Revision: 1.180 $
---
>  *       $Revision: 1.191 $
132a133
> /* Size calculation */
133a135,137
> #define ACPI_ARRAY_LENGTH(x)            (sizeof(x) / sizeof((x)[0]))
> 
> 
208d211
< #define ACPI_FADT_OFFSET(f)             ACPI_OFFSET (FADT_DESCRIPTOR, f)
218a222,227
> #ifndef ACPI_MISALIGNMENT_NOT_SUPPORTED
> #define ACPI_COMPARE_NAME(a,b)          (*ACPI_CAST_PTR (UINT32,(a)) == *ACPI_CAST_PTR (UINT32,(b)))
> #else
> #define ACPI_COMPARE_NAME(a,b)          (!ACPI_STRNCMP (ACPI_CAST_PTR (char,(a)), ACPI_CAST_PTR (char,(b)), ACPI_NAME_SIZE))
> #endif
> 
464a474,475
> #define ACPI_INSERT_BITS(Target, Mask, Source)          Target = ((Target & (~(Mask))) | (Source & Mask))
> 
480,481c491,492
< #define ACPI_GET_DESCRIPTOR_TYPE(d)     (((ACPI_DESCRIPTOR *)(void *)(d))->DescriptorId)
< #define ACPI_SET_DESCRIPTOR_TYPE(d,t)   (((ACPI_DESCRIPTOR *)(void *)(d))->DescriptorId = t)
---
> #define ACPI_GET_DESCRIPTOR_TYPE(d)     (((ACPI_DESCRIPTOR *)(void *)(d))->Common.DescriptorType)
> #define ACPI_SET_DESCRIPTOR_TYPE(d,t)   (((ACPI_DESCRIPTOR *)(void *)(d))->Common.DescriptorType = t)
562,569d572
< /* Legacy interfaces. Remove when migration is complete */
< 
< #define ACPI_REPORT_INFO(fp)            {AcpiUtReportInfo (AE_INFO); \
<                                             AcpiOsPrintf fp;}
< #define ACPI_REPORT_ERROR(fp)           {AcpiUtReportError (AE_INFO); \
<                                             AcpiOsPrintf fp;}
< #define ACPI_REPORT_WARNING(fp)         {AcpiUtReportWarning (AE_INFO); \
<                                             AcpiOsPrintf fp;}
580,583d582
< 
< #define ACPI_REPORT_INFO(fp)
< #define ACPI_REPORT_ERROR(fp)
< #define ACPI_REPORT_WARNING(fp)
616c615
< #define ACPI_FUNCTION_NAME(Name)        const char *_AcpiFunctionName = Name;
---
> #define ACPI_FUNCTION_NAME(Name)        const char *_AcpiFunctionName = #Name;
814,816c813,815
< #define ACPI_MEM_ALLOCATE(a)            AcpiUtAllocate((ACPI_SIZE)(a),_COMPONENT,_AcpiModuleName,__LINE__)
< #define ACPI_MEM_CALLOCATE(a)           AcpiUtCallocate((ACPI_SIZE)(a), _COMPONENT,_AcpiModuleName,__LINE__)
< #define ACPI_MEM_FREE(a)                AcpiOsFree(a)
---
> #define ACPI_ALLOCATE(a)            AcpiUtAllocate((ACPI_SIZE)(a),_COMPONENT,_AcpiModuleName,__LINE__)
> #define ACPI_ALLOCATE_ZEROED(a)     AcpiUtAllocateZeroed((ACPI_SIZE)(a), _COMPONENT,_AcpiModuleName,__LINE__)
> #define ACPI_FREE(a)                AcpiOsFree(a)
823,826c822,825
< #define ACPI_MEM_ALLOCATE(a)            AcpiUtAllocateAndTrack((ACPI_SIZE)(a),_COMPONENT,_AcpiModuleName,__LINE__)
< #define ACPI_MEM_CALLOCATE(a)           AcpiUtCallocateAndTrack((ACPI_SIZE)(a), _COMPONENT,_AcpiModuleName,__LINE__)
< #define ACPI_MEM_FREE(a)                AcpiUtFreeAndTrack(a,_COMPONENT,_AcpiModuleName,__LINE__)
< #define ACPI_MEM_TRACKING(a)            a
---
> #define ACPI_ALLOCATE(a)            AcpiUtAllocateAndTrack((ACPI_SIZE)(a),_COMPONENT,_AcpiModuleName,__LINE__)
> #define ACPI_ALLOCATE_ZEROED(a)     AcpiUtAllocateZeroedAndTrack((ACPI_SIZE)(a), _COMPONENT,_AcpiModuleName,__LINE__)
> #define ACPI_FREE(a)                AcpiUtFreeAndTrack(a,_COMPONENT,_AcpiModuleName,__LINE__)
> #define ACPI_MEM_TRACKING(a)        a