Update to the 20001115 Intel ACPI CA snapshot.

1 files changed, 12 insertions, 4 deletions

diff --git a/sys/contrib/dev/acpica/tbxface.c b/sys/contrib/dev/acpica/tbxface.c
index b657f6f..aeced48 100644
--- a/sys/contrib/dev/acpica/tbxface.c
+++ b/sys/contrib/dev/acpica/tbxface.c
@@ -2,7 +2,7 @@
  *
  * Module Name: tbxface - Public interfaces to the ACPI subsystem
  *                         ACPI table oriented interfaces
- *              $Revision: 28 $
+ *              $Revision: 32 $
  *
  *****************************************************************************/
 
@@ -142,7 +142,7 @@
 
 ACPI_STATUS
 AcpiLoadTables (
-    void                    *RsdpPhysicalAddress)
+    ACPI_PHYSICAL_ADDRESS   RsdpPhysicalAddress)
 {
     ACPI_STATUS             Status = AE_OK;
     UINT32                  NumberOfTables = 0;
@@ -156,6 +156,8 @@ AcpiLoadTables (
     Status = AcpiTbVerifyRsdp (RsdpPhysicalAddress);
     if (ACPI_FAILURE (Status))
     {
+        REPORT_ERROR (("AcpiLoadTables: RSDP Failed validation: %s\n",
+                        AcpiCmFormatException (Status)));
         goto ErrorExit;
     }
 
@@ -164,6 +166,8 @@ AcpiLoadTables (
     Status = AcpiTbGetTableRsdt (&NumberOfTables);
     if (ACPI_FAILURE (Status))
     {
+        REPORT_ERROR (("AcpiLoadTables: Could not load RSDT: %s\n",
+                        AcpiCmFormatException (Status)));
         goto ErrorExit;
     }
 
@@ -172,6 +176,8 @@ AcpiLoadTables (
     Status = AcpiTbGetAllTables (NumberOfTables, NULL);
     if (ACPI_FAILURE (Status))
     {
+        REPORT_ERROR (("AcpiLoadTables: Error getting required tables (DSDT/FADT/FACS): %s\n",
+                        AcpiCmFormatException (Status)));
         goto ErrorExit;
     }
 
@@ -183,6 +189,8 @@ AcpiLoadTables (
     Status = AcpiNsLoadNamespace ();
     if (ACPI_FAILURE (Status))
     {
+        REPORT_ERROR (("AcpiLoadTables: Could not load namespace: %s\n",
+                        AcpiCmFormatException (Status)));
         goto ErrorExit;
     }
 
@@ -232,7 +240,7 @@ AcpiLoadTable (
 
     /* Copy the table to a local buffer */
 
-    Status = AcpiTbGetTable (NULL, TablePtr, &TableInfo);
+    Status = AcpiTbGetTable (0, TablePtr, &TableInfo);
     if (ACPI_FAILURE (Status))
     {
         return_ACPI_STATUS (Status);
@@ -481,7 +489,7 @@ AcpiGetTable (
         /*
          *  RSD PTR is the only "table" without a header
          */
-        RetBufLen = sizeof (ROOT_SYSTEM_DESCRIPTOR_POINTER);
+        RetBufLen = sizeof (RSDP_DESCRIPTOR);
     }
     else
     {