Vendor import of the Intel ACPI CA 20020611 drop.

1 files changed, 10 insertions, 27 deletions

diff --git a/sys/contrib/dev/acpica/utclib.c b/sys/contrib/dev/acpica/utclib.c
index 01245eaa6772..c94a70b8dd3a 100644
--- a/sys/contrib/dev/acpica/utclib.c
+++ b/sys/contrib/dev/acpica/utclib.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: cmclib - Local implementation of C library functions
- * $Revision: 43 $
+ * $Revision: 46 $
  *
  *****************************************************************************/
 
@@ -118,11 +118,6 @@
 #define __CMCLIB_C__
 
 #include "acpi.h"
-#include "acevents.h"
-#include "achware.h"
-#include "acnamesp.h"
-#include "acinterp.h"
-#include "amlcode.h"
 
 /*
  * These implementations of standard C Library routines can optionally be
@@ -130,7 +125,7 @@
  * than an inline or assembly implementation
  */
 
-#define _COMPONENT          MISCELLANEOUS
+#define _COMPONENT          ACPI_UTILITIES
         ACPI_MODULE_NAME    ("cmclib")
 
 
@@ -295,7 +290,7 @@ AcpiUtStrcmp (
  *
  ******************************************************************************/
 
-UINT32
+int
 AcpiUtStrncmp (
     const NATIVE_CHAR       *String1,
     const NATIVE_CHAR       *String2,
@@ -472,19 +467,7 @@ AcpiUtMemset (
 #define NEGATIVE    1
 #define POSITIVE    0
 
-
-#define _ACPI_XA     0x00    /* extra alphabetic - not supported */
-#define _ACPI_XS     0x40    /* extra space */
-#define _ACPI_BB     0x00    /* BEL, BS, etc. - not supported */
-#define _ACPI_CN     0x20    /* CR, FF, HT, NL, VT */
-#define _ACPI_DI     0x04    /* '0'-'9' */
-#define _ACPI_LO     0x02    /* 'a'-'z' */
-#define _ACPI_PU     0x10    /* punctuation */
-#define _ACPI_SP     0x08    /* space */
-#define _ACPI_UP     0x01    /* 'A'-'Z' */
-#define _ACPI_XD     0x80    /* '0'-'9', 'A'-'F', 'a'-'f' */
-
-static const UINT8 _acpi_ctype[257] = {
+const UINT8 _acpi_ctype[257] = {
     _ACPI_CN,            /* 0x0      0.     */
     _ACPI_CN,            /* 0x1      1.     */
     _ACPI_CN,            /* 0x2      2.     */
@@ -643,9 +626,9 @@ static const UINT8 _acpi_ctype[257] = {
  *
  ******************************************************************************/
 
-UINT32
+int
 AcpiUtToUpper (
-    UINT32                  c)
+    int                     c)
 {
 
     return (IS_LOWER(c) ? ((c)-0x20) : (c));
@@ -664,9 +647,9 @@ AcpiUtToUpper (
  *
  ******************************************************************************/
 
-UINT32
+int
 AcpiUtToLower (
-    UINT32                  c)
+    int                     c)
 {
 
     return (IS_UPPER(c) ? ((c)+0x20) : (c));
@@ -832,11 +815,11 @@ AcpiUtStrtoul (
     {
         if (IS_DIGIT (*String))
         {
-            index = *String - '0';
+            index = (UINT32) ((UINT8) *String - '0');
         }
         else
         {
-            index = AcpiUtToUpper (*String);
+            index = (UINT32) AcpiUtToUpper (*String);
             if (IS_UPPER (index))
             {
                 index = index - 'A' + 10;