4c4
< * $Revision: 80 $
---
> * $Revision: 86 $
175a176
> #ifdef ACPI_NO_INTEGER64_SUPPORT
177c178
< * Full 64-bit address on 32-bit and 64-bit platforms
---
> * ACPI_INTEGER is 32-bits, no 64-bit support on this platform
179a181,197
> #define LODWORD(l) ((UINT32)(l))
> #endif
>
> #ifndef HIDWORD
> #define HIDWORD(l) (0)
> #endif
>
> #define ACPI_GET_ADDRESS(a) (a)
> #define ACPI_STORE_ADDRESS(a,b) ((a)=(b))
> #define ACPI_VALID_ADDRESS(a) (a)
>
> #else
>
> /*
> * Full 64-bit address/integer on both 32-bit and 64-bit platforms
> */
> #ifndef LODWORD
184c202
< #define HIDWORD(l) ((UINT32)((((UINT64)(l)) >> 32) & 0xFFFFFFFF))
---
> #define HIDWORD(l) ((UINT32)(((*(UINT64_STRUCT *)(&l))).Hi))
190a209
> #endif
445c464
< DebugPrintRaw PARAM_LIST(fp);}
---
> AcpiOsPrintf PARAM_LIST(fp);}
447c466
< DebugPrintRaw PARAM_LIST(fp);}
---
> AcpiOsPrintf PARAM_LIST(fp);}
449c468
< DebugPrintRaw PARAM_LIST(fp);}
---
> AcpiOsPrintf PARAM_LIST(fp);}
454c473
< DebugPrintRaw PARAM_LIST(fp);}
---
> AcpiOsPrintf PARAM_LIST(fp);}
456c475
< DebugPrintRaw PARAM_LIST(fp);}
---
> AcpiOsPrintf PARAM_LIST(fp);}
458c477
< DebugPrintRaw PARAM_LIST(fp);}
---
> AcpiOsPrintf PARAM_LIST(fp);}
465c484
< DebugPrintRaw PARAM_LIST(fp);}
---
> AcpiOsPrintf PARAM_LIST(fp);}
467c486
< DebugPrintRaw PARAM_LIST(fp);}
---
> AcpiOsPrintf PARAM_LIST(fp);}
469c488
< DebugPrintRaw PARAM_LIST(fp);}
---
> AcpiOsPrintf PARAM_LIST(fp);}
551d569
< *
554c572,573
< #define TEST_DEBUG_SWITCH(lvl) if (((lvl) & AcpiDbgLevel) && (_COMPONENT & AcpiDbgLayer))
---
> #define ACPI_DEBUG_PRINT(pl) AcpiUtDebugPrint PARAM_LIST(pl)
> #define ACPI_DEBUG_PRINT_RAW(pl) AcpiUtDebugPrintRaw PARAM_LIST(pl)
556,559d574
< #define DEBUG_PRINT(lvl,fp) TEST_DEBUG_SWITCH(lvl) {\
< DebugPrintPrefix (_THIS_MODULE,__LINE__);\
< DebugPrintRaw PARAM_LIST(fp);\
< BREAK_ON_ERROR(lvl);}
561,569d575
< #define DEBUG_PRINTP(lvl,fp) TEST_DEBUG_SWITCH(lvl) {\
< DebugPrintPrefix (_THIS_MODULE,__LINE__);\
< DebugPrintRaw ("%s: ",_ProcName);\
< DebugPrintRaw PARAM_LIST(fp);\
< BREAK_ON_ERROR(lvl);}
<
< #define DEBUG_PRINT_RAW(lvl,fp) TEST_DEBUG_SWITCH(lvl) {\
< DebugPrintRaw PARAM_LIST(fp);}
<
598,600c604,605
< #define DEBUG_PRINT(l,f)
< #define DEBUG_PRINTP(l,f)
< #define DEBUG_PRINT_RAW(l,f)
---
> #define ACPI_DEBUG_PRINT(pl)
> #define ACPI_DEBUG_PRINT_RAW(pl)
660a666
> #define ACPI_MEM_TRACKING(a)
663,668d668
< #define DECREMENT_OBJECT_METRICS(a)
< #define INCREMENT_OBJECT_METRICS(a)
< #define INITIALIZE_ALLOCATION_METRICS()
< #define DECREMENT_NAME_TABLE_METRICS(a)
< #define INCREMENT_NAME_TABLE_METRICS(a)
<
675a676
> #define ACPI_MEM_TRACKING(a) a
677,723d677
< #define INITIALIZE_ALLOCATION_METRICS() \
< AcpiGbl_CurrentObjectCount = 0; \
< AcpiGbl_CurrentObjectSize = 0; \
< AcpiGbl_RunningObjectCount = 0; \
< AcpiGbl_RunningObjectSize = 0; \
< AcpiGbl_MaxConcurrentObjectCount = 0; \
< AcpiGbl_MaxConcurrentObjectSize = 0; \
< AcpiGbl_CurrentAllocSize = 0; \
< AcpiGbl_CurrentAllocCount = 0; \
< AcpiGbl_RunningAllocSize = 0; \
< AcpiGbl_RunningAllocCount = 0; \
< AcpiGbl_MaxConcurrentAllocSize = 0; \
< AcpiGbl_MaxConcurrentAllocCount = 0; \
< AcpiGbl_CurrentNodeCount = 0; \
< AcpiGbl_CurrentNodeSize = 0; \
< AcpiGbl_MaxConcurrentNodeCount = 0
<
<
< #define DECREMENT_OBJECT_METRICS(a) \
< AcpiGbl_CurrentObjectCount--; \
< AcpiGbl_CurrentObjectSize -= a
<
< #define INCREMENT_OBJECT_METRICS(a) \
< AcpiGbl_CurrentObjectCount++; \
< AcpiGbl_RunningObjectCount++; \
< if (AcpiGbl_MaxConcurrentObjectCount < AcpiGbl_CurrentObjectCount) \
< { \
< AcpiGbl_MaxConcurrentObjectCount = AcpiGbl_CurrentObjectCount; \
< } \
< AcpiGbl_RunningObjectSize += a; \
< AcpiGbl_CurrentObjectSize += a; \
< if (AcpiGbl_MaxConcurrentObjectSize < AcpiGbl_CurrentObjectSize) \
< { \
< AcpiGbl_MaxConcurrentObjectSize = AcpiGbl_CurrentObjectSize; \
< }
<
< #define DECREMENT_NAME_TABLE_METRICS(a) \
< AcpiGbl_CurrentNodeCount--; \
< AcpiGbl_CurrentNodeSize -= (a)
<
< #define INCREMENT_NAME_TABLE_METRICS(a) \
< AcpiGbl_CurrentNodeCount++; \
< AcpiGbl_CurrentNodeSize+= (a); \
< if (AcpiGbl_MaxConcurrentNodeCount < AcpiGbl_CurrentNodeCount) \
< { \
< AcpiGbl_MaxConcurrentNodeCount = AcpiGbl_CurrentNodeCount; \
< }