Merge local changes with the ACPI CA 20010717 import.

5 files changed, 80 insertions, 114 deletions

diff --git a/sys/contrib/dev/acpica/acconfig.h b/sys/contrib/dev/acpica/acconfig.h
index 771d62f..2a361f3 100644
--- a/sys/contrib/dev/acpica/acconfig.h
+++ b/sys/contrib/dev/acpica/acconfig.h
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acconfig.h - Global configuration constants
- *       $Revision: 65 $
+ *       $Revision: 66 $
  *
  *****************************************************************************/
 
@@ -144,7 +144,7 @@
 
 /* Version string */
 
-#define ACPI_CA_VERSION             0x20010615
+#define ACPI_CA_VERSION             0x20010717
 
 
 /* Maximum objects in the various object caches */
diff --git a/sys/contrib/dev/acpica/acpiosxf.h b/sys/contrib/dev/acpica/acpiosxf.h
index f4e1642..ec8c787 100644
--- a/sys/contrib/dev/acpica/acpiosxf.h
+++ b/sys/contrib/dev/acpica/acpiosxf.h
@@ -135,6 +135,20 @@
 #define ACPI_MUTEX_SEM              1
 
 
+/* Functions for AcpiOsSignal */
+
+#define ACPI_SIGNAL_FATAL           0
+#define ACPI_SIGNAL_BREAKPOINT      1
+
+typedef struct AcpiFatalInfo
+{
+    UINT32                  Type;
+    UINT32                  Code;
+    UINT32                  Argument;
+
+} ACPI_SIGNAL_FATAL_INFO;
+
+
 /*
  * Types specific to the OS service interfaces
  */
@@ -160,6 +174,11 @@ ACPI_STATUS
 AcpiOsTerminate (
     void);
 
+ACPI_STATUS
+AcpiOsGetRootPointer (
+    UINT32                  Flags,
+    ACPI_PHYSICAL_ADDRESS   *RsdpPhysicalAddress);
+
 
 /*
  * Synchronization primitives
@@ -256,131 +275,70 @@ AcpiOsSleep (
     UINT32                  Milliseconds);
 
 void
-AcpiOsSleepUsec (
+AcpiOsStall (
     UINT32                  Microseconds);
 
 
 /*
- * Platform/Hardware independent I/O interfaces
+ * Platform and hardware-independent I/O interfaces
  */
 
-UINT8
-AcpiOsIn8 (
-    ACPI_IO_ADDRESS         InPort);
-
-
-UINT16
-AcpiOsIn16 (
-    ACPI_IO_ADDRESS         InPort);
-
-UINT32
-AcpiOsIn32 (
-    ACPI_IO_ADDRESS         InPort);
-
-void
-AcpiOsOut8 (
-    ACPI_IO_ADDRESS         OutPort,
-    UINT8                   Value);
+ACPI_STATUS
+AcpiOsReadPort (
+    ACPI_IO_ADDRESS         Address,
+    void                    *Value,
+    UINT32                  Width);
 
-void
-AcpiOsOut16 (
-    ACPI_IO_ADDRESS         OutPort,
-    UINT16                  Value);
 
-void
-AcpiOsOut32 (
-    ACPI_IO_ADDRESS         OutPort,
-    UINT32                  Value);
+ACPI_STATUS
+AcpiOsWritePort (
+    ACPI_IO_ADDRESS         Address,
+    NATIVE_UINT             Value,
+    UINT32                  Width);
 
 
 /*
- * Platform/Hardware independent physical memory interfaces
+ * Platform and hardware-independent physical memory interfaces
  */
 
-UINT8
-AcpiOsMemIn8 (
-    ACPI_PHYSICAL_ADDRESS   InAddr);
-
-UINT16
-AcpiOsMemIn16 (
-    ACPI_PHYSICAL_ADDRESS   InAddr);
-
-UINT32
-AcpiOsMemIn32 (
-    ACPI_PHYSICAL_ADDRESS   InAddr);
-
-void
-AcpiOsMemOut8 (
-    ACPI_PHYSICAL_ADDRESS   OutAddr,
-    UINT8                   Value);
+ACPI_STATUS
+AcpiOsReadMemory (
+    ACPI_PHYSICAL_ADDRESS   Address,
+    void                    *Value,
+    UINT32                  Width);
 
-void
-AcpiOsMemOut16 (
-    ACPI_PHYSICAL_ADDRESS   OutAddr,
-    UINT16                  Value);
 
-void
-AcpiOsMemOut32 (
-    ACPI_PHYSICAL_ADDRESS   OutAddr,
-    UINT32                  Value);
+ACPI_STATUS
+AcpiOsWriteMemory (
+    ACPI_PHYSICAL_ADDRESS   Address,
+    NATIVE_UINT             Value,
+    UINT32                  Width);
 
 
 /*
- * Standard access to PCI configuration space
+ * Platform and hardware-independent PCI configuration space access
  */
 
 ACPI_STATUS
-AcpiOsReadPciCfgByte (
-    UINT32                  Bus,
-    UINT32                  DeviceFunction,
+AcpiOsReadPciConfiguration (
+    ACPI_PCI_ID             *PciId,
     UINT32                  Register,
-    UINT8                   *Value);
+    void                    *Value,
+    UINT32                  Width);
 
-ACPI_STATUS
-AcpiOsReadPciCfgWord (
-    UINT32                  Bus,
-    UINT32                  DeviceFunction,
-    UINT32                  Register,
-    UINT16                  *Value);
 
 ACPI_STATUS
-AcpiOsReadPciCfgDword (
-    UINT32                  Bus,
-    UINT32                  DeviceFunction,
+AcpiOsWritePciConfiguration (
+    ACPI_PCI_ID             *PciId,
     UINT32                  Register,
-    UINT32                  *Value);
-
-ACPI_STATUS
-AcpiOsWritePciCfgByte (
-    UINT32                  Bus,
-    UINT32                  DeviceFunction,
-    UINT32                  Register,
-    UINT8                   Value);
-
-ACPI_STATUS
-AcpiOsWritePciCfgWord (
-    UINT32                  Bus,
-    UINT32                  DeviceFunction,
-    UINT32                  Register,
-    UINT16                  Value);
-
-
-ACPI_STATUS
-AcpiOsWritePciCfgDword (
-    UINT32                  Bus,
-    UINT32                  DeviceFunction,
-    UINT32                  Register,
-    UINT32                  Value);
+    NATIVE_UINT             Value,
+    UINT32                  Width);
 
 
 /*
  * Miscellaneous
  */
 
-ACPI_STATUS
-AcpiOsBreakpoint (
-    NATIVE_CHAR             *Message);
-
 BOOLEAN
 AcpiOsReadable (
     void                    *Pointer,
@@ -396,7 +354,10 @@ UINT32
 AcpiOsGetTimer (
     void);
 
-
+ACPI_STATUS
+AcpiOsSignal (
+    UINT32                  Function,
+    void                    *Info);
 
 /*
  * Debug print routines
diff --git a/sys/contrib/dev/acpica/acpixf.h b/sys/contrib/dev/acpica/acpixf.h
index 28a1761..367065f 100644
--- a/sys/contrib/dev/acpica/acpixf.h
+++ b/sys/contrib/dev/acpica/acpixf.h
@@ -122,7 +122,7 @@
 #include "actbl.h"
 
 
-/*
+ /*
  * Global interfaces
  */
 
@@ -139,6 +139,10 @@ AcpiTerminate (
     void);
 
 ACPI_STATUS
+AcpiSubsystemStatus (
+    void);
+
+ACPI_STATUS
 AcpiEnable (
     void);
 
@@ -147,13 +151,12 @@ AcpiDisable (
     void);
 
 ACPI_STATUS
-AcpiGetSystemInfo(
+AcpiGetSystemInfo (
     ACPI_BUFFER             *RetBuffer);
 
-ACPI_STATUS
+const char *
 AcpiFormatException (
-    ACPI_STATUS             Exception,
-    ACPI_BUFFER             *OutBuffer);
+    ACPI_STATUS             Exception);
 
 
 /*
@@ -179,11 +182,12 @@ AcpiFree (
 
 ACPI_STATUS
 AcpiFindRootPointer (
+    UINT32                  Flags,
     ACPI_PHYSICAL_ADDRESS   *RsdpPhysicalAddress);
 
 ACPI_STATUS
 AcpiLoadTables (
-    ACPI_PHYSICAL_ADDRESS   RsdpPhysicalAddress);
+    void);
 
 ACPI_STATUS
 AcpiLoadTable (
diff --git a/sys/contrib/dev/acpica/exfldio.c b/sys/contrib/dev/acpica/exfldio.c
index 96f3227..fd49c6b 100644
--- a/sys/contrib/dev/acpica/exfldio.c
+++ b/sys/contrib/dev/acpica/exfldio.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: exfldio - Aml Field I/O
- *              $Revision: 57 $
+ *              $Revision: 59 $
  *
  *****************************************************************************/
 
@@ -153,7 +153,7 @@ AcpiExSetupField (
     ACPI_OPERAND_OBJECT     *RgnDesc;
 
 
-    FUNCTION_TRACE ("ExSetupField");
+    FUNCTION_TRACE_U32 ("ExSetupField", FieldDatumByteOffset);
 
 
     /* Parameter validation */
@@ -309,11 +309,11 @@ AcpiExReadFieldDatum (
         Address = RgnDesc->Region.Address + ObjDesc->CommonField.BaseByteOffset +
                     FieldDatumByteOffset;
 
-        DEBUG_PRINTP (TRACE_BFIELD, ("Region %s(%X) width %X base:off %X:%X at %08lX\n",
+        DEBUG_PRINTP (TRACE_BFIELD, ("Region %s(%X) width %X base:off %X:%X at %8.8lX%8.8lX\n",
             AcpiUtGetRegionName (RgnDesc->Region.SpaceId),
             RgnDesc->Region.SpaceId, ObjDesc->CommonField.AccessBitWidth,
             ObjDesc->CommonField.BaseByteOffset, FieldDatumByteOffset,
-            Address));
+            HIDWORD(Address), LODWORD(Address)));
 
 
         /* Invoke the appropriate AddressSpace/OpRegion handler */
@@ -696,9 +696,10 @@ AcpiExWriteFieldDatum (
                     FieldDatumByteOffset;
 
         DEBUG_PRINTP (TRACE_BFIELD, 
-            ("Store %X in Region %s(%X) at %p width %X\n",
+            ("Store %X in Region %s(%X) at %8.8lX%8.8lX width %X\n",
             Value, AcpiUtGetRegionName (RgnDesc->Region.SpaceId),
-            RgnDesc->Region.SpaceId, Address, ObjDesc->CommonField.AccessBitWidth));
+            RgnDesc->Region.SpaceId, HIDWORD(Address), LODWORD(Address),
+            ObjDesc->CommonField.AccessBitWidth));
 
         /* Invoke the appropriate AddressSpace/OpRegion handler */
 
diff --git a/sys/contrib/dev/acpica/psparse.c b/sys/contrib/dev/acpica/psparse.c
index 3f4548d..7aa09a2 100644
--- a/sys/contrib/dev/acpica/psparse.c
+++ b/sys/contrib/dev/acpica/psparse.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: psparse - Parser top level AML parse routines
- *              $Revision: 85 $
+ *              $Revision: 87 $
  *
  *****************************************************************************/
 
@@ -249,7 +249,7 @@ AcpiPsCreateState (
     FUNCTION_TRACE ("PsCreateState");
 
 
-    ParserState = AcpiUtCallocate (sizeof (ACPI_PARSE_STATE));
+    ParserState = ACPI_MEM_CALLOCATE (sizeof (ACPI_PARSE_STATE));
     if (!ParserState)
     {
         return_PTR (NULL);
@@ -666,11 +666,11 @@ AcpiPsParseLoop (
                     {
                         DEBUG_PRINTP (ACPI_ERROR,
                             ("Invoked method did not return a value, %s\n",
-                            AcpiUtFormatException (Status)));
+                            AcpiFormatException (Status)));
 
                     }
                     DEBUG_PRINTP (ACPI_ERROR, ("GetPredicate Failed, %s\n",
-                        AcpiUtFormatException (Status)));
+                        AcpiFormatException (Status)));
                     return_ACPI_STATUS (Status);
                 }
 
@@ -1407,7 +1407,7 @@ AcpiPsParseAml (
          /* Delete this walk state and all linked control states */
 
         AcpiPsCleanupScope (WalkState->ParserState);
-        AcpiUtFree (WalkState->ParserState);
+        ACPI_MEM_FREE (WalkState->ParserState);
         AcpiDsDeleteWalkState (WalkState);
 
        /* Check if we have restarted a preempted walk */
@@ -1469,7 +1469,7 @@ Cleanup:
 
     AcpiDsDeleteWalkState (WalkState);
     AcpiPsCleanupScope (ParserState);
-    AcpiUtFree (ParserState);
+    ACPI_MEM_FREE (ParserState);
 
     AcpiExReleaseAllMutexes ((ACPI_OPERAND_OBJECT *)&WalkList.AcquiredMutexList);
     AcpiGbl_CurrentWalkList = PrevWalkList;