Import of Intel ACPI 20030228 vendor distribution

1 files changed, 8 insertions, 8 deletions

diff --git a/sys/contrib/dev/acpica/tbinstal.c b/sys/contrib/dev/acpica/tbinstal.c
index d4a28d1..5e5f017 100644
--- a/sys/contrib/dev/acpica/tbinstal.c
+++ b/sys/contrib/dev/acpica/tbinstal.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: tbinstal - ACPI table installation and removal
- *              $Revision: 64 $
+ *              $Revision: 68 $
  *
  *****************************************************************************/
 
@@ -9,7 +9,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -141,11 +141,11 @@
 
 ACPI_STATUS
 AcpiTbMatchSignature (
-    NATIVE_CHAR             *Signature,
+    char                    *Signature,
     ACPI_TABLE_DESC         *TableInfo,
     UINT8                   SearchType)
 {
-    NATIVE_UINT             i;
+    ACPI_NATIVE_UINT        i;
 
 
     ACPI_FUNCTION_TRACE ("TbMatchSignature");
@@ -156,7 +156,7 @@ AcpiTbMatchSignature (
      */
     for (i = 0; i < NUM_ACPI_TABLES; i++)
     {
-        if ((AcpiGbl_AcpiTableData[i].Flags & ACPI_TABLE_TYPE_MASK) != SearchType)
+        if (!(AcpiGbl_AcpiTableData[i].Flags & SearchType))
         {
             continue;
         }
@@ -172,7 +172,7 @@ AcpiTbMatchSignature (
             }
 
             ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
-                "Table [%4.4s] matched and is a required ACPI table\n",
+                "Table [%4.4s] is an ACPI table consumed by the core subsystem\n",
                 (char *) AcpiGbl_AcpiTableData[i].Signature));
 
             return_ACPI_STATUS (AE_OK);
@@ -180,7 +180,7 @@ AcpiTbMatchSignature (
     }
 
     ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
-        "Table [%4.4s] is not a required ACPI table - ignored\n",
+        "Table [%4.4s] is not an ACPI table consumed by the core subsystem - ignored\n",
         (char *) Signature));
 
     return_ACPI_STATUS (AE_TABLE_NOT_SUPPORTED);
@@ -225,7 +225,7 @@ AcpiTbInstallTable (
     Status = AcpiTbInitTableDescriptor (TableInfo->Type, TableInfo);
     if (ACPI_FAILURE (Status))
     {
-        ACPI_REPORT_ERROR (("Could not install ACPI table [%s], %s\n",
+        ACPI_REPORT_ERROR (("Could not install ACPI table [%4.4s], %s\n",
             TableInfo->Pointer->Signature, AcpiFormatException (Status)));
     }