Merge ACPICA 20100702.

3 files changed, 8 insertions, 8 deletions

diff --git a/sys/contrib/dev/acpica/disassembler/dmobject.c b/sys/contrib/dev/acpica/disassembler/dmobject.c
index 1bfeadd..fbb6fe8 100644
--- a/sys/contrib/dev/acpica/disassembler/dmobject.c
+++ b/sys/contrib/dev/acpica/disassembler/dmobject.c
@@ -289,7 +289,7 @@ AcpiDmDecodeInternalObject (
 
     case ACPI_TYPE_STRING:
 
-        AcpiOsPrintf ("(%d) \"%.24s",
+        AcpiOsPrintf ("(%u) \"%.24s",
                 ObjDesc->String.Length, ObjDesc->String.Pointer);
 
         if (ObjDesc->String.Length > 24)
@@ -305,7 +305,7 @@ AcpiDmDecodeInternalObject (
 
     case ACPI_TYPE_BUFFER:
 
-        AcpiOsPrintf ("(%d)", ObjDesc->Buffer.Length);
+        AcpiOsPrintf ("(%u)", ObjDesc->Buffer.Length);
         for (i = 0; (i < 8) && (i < ObjDesc->Buffer.Length); i++)
         {
             AcpiOsPrintf (" %2.2X", ObjDesc->Buffer.Pointer[i]);
@@ -651,7 +651,7 @@ AcpiDmDisplayArguments (
     for (i = 0; i < ACPI_METHOD_NUM_ARGS; i++)
     {
         ObjDesc = WalkState->Arguments[i].Object;
-        AcpiOsPrintf ("    Arg%d:   ", i);
+        AcpiOsPrintf ("    Arg%u:   ", i);
         AcpiDmDisplayInternalObject (ObjDesc, WalkState);
     }
 }
diff --git a/sys/contrib/dev/acpica/disassembler/dmopcode.c b/sys/contrib/dev/acpica/disassembler/dmopcode.c
index 57dfa95..2958814 100644
--- a/sys/contrib/dev/acpica/disassembler/dmopcode.c
+++ b/sys/contrib/dev/acpica/disassembler/dmopcode.c
@@ -163,7 +163,7 @@ AcpiDmMethodFlags (
 
     /* 1) Method argument count */
 
-    AcpiOsPrintf (", %d, ", Args);
+    AcpiOsPrintf (", %u, ", Args);
 
     /* 2) Serialize rule */
 
@@ -178,7 +178,7 @@ AcpiDmMethodFlags (
 
     if (Flags & 0xF0)
     {
-        AcpiOsPrintf (", %d", Flags >> 4);
+        AcpiOsPrintf (", %u", Flags >> 4);
     }
 }
 
@@ -550,7 +550,7 @@ AcpiDmDisassembleOneOp (
     case AML_INT_NAMEDFIELD_OP:
 
         Length = AcpiDmDumpName (Op->Named.Name);
-        AcpiOsPrintf (",%*.s  %d", (int) (5 - Length), " ",
+        AcpiOsPrintf (",%*.s  %u", (unsigned) (5 - Length), " ",
             (UINT32) Op->Common.Value.Integer);
         AcpiDmCommaIfFieldMember (Op);
 
@@ -571,7 +571,7 @@ AcpiDmDisassembleOneOp (
         }
         else
         {
-            AcpiOsPrintf ("    ,   %d", Offset);
+            AcpiOsPrintf ("    ,   %u", Offset);
         }
 
         AcpiDmCommaIfFieldMember (Op);
diff --git a/sys/contrib/dev/acpica/disassembler/dmresrc.c b/sys/contrib/dev/acpica/disassembler/dmresrc.c
index ed3b1c1..1f4ce3f 100644
--- a/sys/contrib/dev/acpica/disassembler/dmresrc.c
+++ b/sys/contrib/dev/acpica/disassembler/dmresrc.c
@@ -290,7 +290,7 @@ AcpiDmBitList (
                 AcpiOsPrintf (",");
             }
             Previous = TRUE;
-            AcpiOsPrintf ("%d", i);
+            AcpiOsPrintf ("%u", i);
         }
 
         Mask >>= 1;