1 files changed, 18 insertions, 18 deletions

diff --git a/sys/contrib/dev/acpica/nsutils.c b/sys/contrib/dev/acpica/nsutils.c
index 5385470..017d917 100644
--- a/sys/contrib/dev/acpica/nsutils.c
+++ b/sys/contrib/dev/acpica/nsutils.c
@@ -2,7 +2,7 @@
  *
  * Module Name: nsutils - Utilities for accessing ACPI namespace, accessing
  *                        parents and siblings and Scope manipulation
- *              $Revision: 105 $
+ *              $Revision: 110 $
  *
  *****************************************************************************/
 
@@ -119,7 +119,6 @@
 
 #include "acpi.h"
 #include "acnamesp.h"
-#include "acinterp.h"
 #include "amlcode.h"
 #include "actables.h"
 
@@ -240,7 +239,7 @@ AcpiNsLocal (
  *
  ******************************************************************************/
 
-ACPI_STATUS
+void
 AcpiNsGetInternalNameLength (
     ACPI_NAMESTRING_INFO    *Info)
 {
@@ -304,8 +303,6 @@ AcpiNsGetInternalNameLength (
                     4 + Info->NumCarats;
 
     Info->NextExternalChar = NextExternalChar;
-
-    return (AE_OK);
 }
 
 
@@ -330,7 +327,7 @@ AcpiNsBuildInternalName (
     NATIVE_CHAR             *InternalName = Info->InternalName;
     NATIVE_CHAR             *ExternalName = Info->NextExternalChar;
     NATIVE_CHAR             *Result = NULL;
-    UINT32                  i;
+    NATIVE_UINT             i;
 
 
     ACPI_FUNCTION_TRACE ("NsBuildInternalName");
@@ -407,7 +404,7 @@ AcpiNsBuildInternalName (
             {
                 /* Convert the character to uppercase and save it */
 
-                Result[i] = (char) ACPI_TOUPPER (*ExternalName);
+                Result[i] = (char) ACPI_TOUPPER ((int) *ExternalName);
                 ExternalName++;
             }
         }
@@ -530,12 +527,12 @@ AcpiNsExternalizeName (
     UINT32                  *ConvertedNameLength,
     char                    **ConvertedName)
 {
-    UINT32                  PrefixLength = 0;
-    UINT32                  NamesIndex = 0;
-    UINT32                  NumSegments = 0;
-    UINT32                  i = 0;
-    UINT32                  j = 0;
-    UINT32                  RequiredLength;
+    NATIVE_UINT_MIN32       PrefixLength = 0;
+    NATIVE_UINT_MIN32       NamesIndex = 0;
+    NATIVE_UINT_MIN32       NumSegments = 0;
+    NATIVE_UINT_MIN32       i = 0;
+    NATIVE_UINT_MIN32       j = 0;
+    NATIVE_UINT_MIN32       RequiredLength;
 
 
     ACPI_FUNCTION_TRACE ("NsExternalizeName");
@@ -572,6 +569,9 @@ AcpiNsExternalizeName (
         }
 
         break;
+
+    default:
+        break;
     }
 
     /*
@@ -668,7 +668,7 @@ AcpiNsExternalizeName (
 
     if (ConvertedNameLength)
     {
-        *ConvertedNameLength = RequiredLength;
+        *ConvertedNameLength = (UINT32) RequiredLength;
     }
 
     return_ACPI_STATUS (AE_OK);
@@ -963,17 +963,17 @@ AcpiNsFindParentName (
         if (ParentNode)
         {
             ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Parent of %p [%4.4s] is %p [%4.4s]\n",
-                ChildNode,  (char *) &ChildNode->Name,
-                ParentNode, (char *) &ParentNode->Name));
+                ChildNode,  ChildNode->Name.Ascii,
+                ParentNode, ParentNode->Name.Ascii));
 
             if (ParentNode->Name.Integer)
             {
-                return_VALUE (ParentNode->Name.Integer);
+                return_VALUE ((ACPI_NAME) ParentNode->Name.Integer);
             }
         }
 
         ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "unable to find parent of %p (%4.4s)\n",
-            ChildNode, (char *) &ChildNode->Name));
+            ChildNode, ChildNode->Name.Ascii));
     }
 
     return_VALUE (ACPI_UNKNOWN_NAME);