1 files changed, 14 insertions, 8 deletions
diff --git a/sys/contrib/dev/acpica/dmbuffer.c b/sys/contrib/dev/acpica/dmbuffer.c
index 771e35b..cd6f1f0 100644
--- a/sys/contrib/dev/acpica/dmbuffer.c
+++ b/sys/contrib/dev/acpica/dmbuffer.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: dmbuffer - AML disassembler, buffer and string support
- *              $Revision: 13 $
+ *              $Revision: 1.19 $
  *
  ******************************************************************************/
 
@@ -9,7 +9,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2004, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2005, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -126,6 +126,12 @@
 #define _COMPONENT          ACPI_CA_DEBUGGER
         ACPI_MODULE_NAME    ("dmbuffer")
 
+/* Local prototypes */
+
+static void
+AcpiDmUnicode (
+    ACPI_PARSE_OBJECT       *Op);
+
 
 /*******************************************************************************
  *
@@ -137,7 +143,7 @@
  *
  * RETURN:      None
  *
- * DESCRIPTION: Dump a list of bytes in Hex format
+ * DESCRIPTION: Dump an AML "ByteList" in Hex format
  *
  ******************************************************************************/
 
@@ -215,7 +221,7 @@ AcpiDmByteList (
     {
     case ACPI_DASM_RESOURCE:
 
-        AcpiDmResourceDescriptor (Info, ByteData, ByteCount);
+        AcpiDmResourceTemplate (Info, ByteData, ByteCount);
         break;
 
     case ACPI_DASM_STRING:
@@ -321,7 +327,7 @@ AcpiDmIsUnicodeBuffer (
  *
  * PARAMETERS:  Op              - Buffer Object to be examined
  *
- * RETURN:      TRUE if buffer contains a ASCII string
+ * RETURN:      TRUE if buffer contains a ASCII string, FALSE otherwise
  *
  * DESCRIPTION: Determine if a buffer Op contains a ASCII string
  *
@@ -393,7 +399,7 @@ AcpiDmIsStringBuffer (
  *
  ******************************************************************************/
 
-void
+static void
 AcpiDmUnicode (
     ACPI_PARSE_OBJECT       *Op)
 {
@@ -423,7 +429,7 @@ AcpiDmUnicode (
 
 /*******************************************************************************
  *
- * FUNCTION:    AcpiIsEisaId
+ * FUNCTION:    AcpiDmIsEisaId
  *
  * PARAMETERS:  Op              - Op to be examined
  *
@@ -434,7 +440,7 @@ AcpiDmUnicode (
  ******************************************************************************/
 
 void
-AcpiIsEisaId (
+AcpiDmIsEisaId (
     ACPI_PARSE_OBJECT       *Op)
 {
     UINT32                  Name;