Vendor import of Intel ACPI-CA 20041119

1 files changed, 14 insertions, 32 deletions

diff --git a/sys/contrib/dev/acpica/acmacros.h b/sys/contrib/dev/acpica/acmacros.h
index 6eb509d..2925e2f 100644
--- a/sys/contrib/dev/acpica/acmacros.h
+++ b/sys/contrib/dev/acpica/acmacros.h
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acmacros.h - C macros for the entire subsystem.
- *       $Revision: 151 $
+ *       $Revision: 154 $
  *
  *****************************************************************************/
 
@@ -437,24 +437,6 @@
 
 #define ACPI_IS_OCTAL_DIGIT(d)               (((char)(d) >= '0') && ((char)(d) <= '7'))
 
-/* Macros for GAS addressing */
-
-#if ACPI_MACHINE_WIDTH != 16
-
-#define ACPI_PCI_DEVICE(a)              (UINT16) ((ACPI_HIDWORD ((a))) & 0x0000FFFF)
-#define ACPI_PCI_FUNCTION(a)            (UINT16) ((ACPI_LODWORD ((a))) >> 16)
-#define ACPI_PCI_REGISTER(a)            (UINT16) ((ACPI_LODWORD ((a))) & 0x0000FFFF)
-
-#else
-
-/* No support for GAS and PCI IDs in 16-bit mode  */
-
-#define ACPI_PCI_FUNCTION(a)            (UINT16) ((a) & 0xFFFF0000)
-#define ACPI_PCI_DEVICE(a)              (UINT16) ((a) & 0x0000FFFF)
-#define ACPI_PCI_REGISTER(a)            (UINT16) ((a) & 0x0000FFFF)
-
-#endif
-
 
 /* Bitfields within ACPI registers */
 
@@ -578,19 +560,19 @@
  * The first parameter should be the procedure name as a quoted string.  This is declared
  * as a local string ("_ProcName) so that it can be also used by the function exit macros below.
  */
-#define ACPI_FUNCTION_NAME(a)               ACPI_DEBUG_PRINT_INFO _Dbg; \
-                                                _Dbg.ComponentId = _COMPONENT; \
-                                                _Dbg.ProcName    = a; \
-                                                _Dbg.ModuleName  = _THIS_MODULE;
+#define ACPI_FUNCTION_NAME(a)               ACPI_DEBUG_PRINT_INFO _DebugInfo; \
+                                                _DebugInfo.ComponentId = _COMPONENT; \
+                                                _DebugInfo.ProcName    = a; \
+                                                _DebugInfo.ModuleName  = _THIS_MODULE;
 
 #define ACPI_FUNCTION_TRACE(a)              ACPI_FUNCTION_NAME(a) \
-                                                AcpiUtTrace(__LINE__,&_Dbg)
+                                                AcpiUtTrace(__LINE__,&_DebugInfo)
 #define ACPI_FUNCTION_TRACE_PTR(a,b)        ACPI_FUNCTION_NAME(a) \
-                                                AcpiUtTracePtr(__LINE__,&_Dbg,(void *)b)
+                                                AcpiUtTracePtr(__LINE__,&_DebugInfo,(void *)b)
 #define ACPI_FUNCTION_TRACE_U32(a,b)        ACPI_FUNCTION_NAME(a) \
-                                                AcpiUtTraceU32(__LINE__,&_Dbg,(UINT32)b)
+                                                AcpiUtTraceU32(__LINE__,&_DebugInfo,(UINT32)b)
 #define ACPI_FUNCTION_TRACE_STR(a,b)        ACPI_FUNCTION_NAME(a) \
-                                                AcpiUtTraceStr(__LINE__,&_Dbg,(char *)b)
+                                                AcpiUtTraceStr(__LINE__,&_DebugInfo,(char *)b)
 
 #define ACPI_FUNCTION_ENTRY()               AcpiUtTrackStackPtr()
 
@@ -607,10 +589,10 @@
 #define ACPI_DO_WHILE0(a)               a
 #endif
 
-#define return_VOID                     ACPI_DO_WHILE0 ({AcpiUtExit(__LINE__,&_Dbg);return;})
-#define return_ACPI_STATUS(s)           ACPI_DO_WHILE0 ({AcpiUtStatusExit(__LINE__,&_Dbg,(s));return((s));})
-#define return_VALUE(s)                 ACPI_DO_WHILE0 ({AcpiUtValueExit(__LINE__,&_Dbg,(ACPI_INTEGER)(s));return((s));})
-#define return_PTR(s)                   ACPI_DO_WHILE0 ({AcpiUtPtrExit(__LINE__,&_Dbg,(UINT8 *)(s));return((s));})
+#define return_VOID                     ACPI_DO_WHILE0 ({AcpiUtExit(__LINE__,&_DebugInfo);return;})
+#define return_ACPI_STATUS(s)           ACPI_DO_WHILE0 ({AcpiUtStatusExit(__LINE__,&_DebugInfo,(s));return((s));})
+#define return_VALUE(s)                 ACPI_DO_WHILE0 ({AcpiUtValueExit(__LINE__,&_DebugInfo,(ACPI_INTEGER)(s));return((s));})
+#define return_PTR(s)                   ACPI_DO_WHILE0 ({AcpiUtPtrExit(__LINE__,&_DebugInfo,(UINT8 *)(s));return((s));})
 
 /* Conditional execution */
 
@@ -624,7 +606,7 @@
 
 /* Stack and buffer dumping */
 
-#define ACPI_DUMP_STACK_ENTRY(a)        AcpiExDumpOperand(a)
+#define ACPI_DUMP_STACK_ENTRY(a)        AcpiExDumpOperand((a),0)
 #define ACPI_DUMP_OPERANDS(a,b,c,d,e)   AcpiExDumpOperands(a,b,c,d,e,_THIS_MODULE,__LINE__)