diff -ur acpica-unix-20080321.orig/debugger/dbcmds.c acpica-unix-20080321/debugger/dbcmds.c
--- acpica-unix-20080321.orig/debugger/dbcmds.c	2008-04-12 12:46:31.000000000 -0400
+++ acpica-unix-20080321/debugger/dbcmds.c	2008-04-13 08:58:36.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: dbcmds - debug commands and output routines
- *              $Revision: 1.157 $
+ *              $Revision: 1.7 $
  *
  ******************************************************************************/
 
@@ -176,7 +176,7 @@
 static ACPI_STATUS
 AcpiDmTestResourceConversion (
     ACPI_NAMESPACE_NODE     *Node,
-    char                    *Name);
+    const char              *Name);
 
 
 /*
@@ -1044,7 +1044,7 @@
 
 ACPI_STATUS
 AcpiDbDisplayObjects (
-    char                    *ObjTypeArg,
+    const char              *ObjTypeArg,
     char                    *DisplayCountArg)
 {
     ACPI_WALK_INFO          Info;
@@ -1361,7 +1361,7 @@
 static ACPI_STATUS
 AcpiDmTestResourceConversion (
     ACPI_NAMESPACE_NODE     *Node,
-    char                    *Name)
+    const char              *Name)
 {
     ACPI_STATUS             Status;
     ACPI_BUFFER             ReturnObj;
diff -ur acpica-unix-20080321.orig/debugger/dbdisply.c acpica-unix-20080321/debugger/dbdisply.c
--- acpica-unix-20080321.orig/debugger/dbdisply.c	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/debugger/dbdisply.c	2008-04-13 08:58:36.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: dbdisply - debug display commands
- *              $Revision: 1.121 $
+ *              $Revision: 1.4 $
  *
  ******************************************************************************/
 
diff -ur acpica-unix-20080321.orig/debugger/dbexec.c acpica-unix-20080321/debugger/dbexec.c
--- acpica-unix-20080321.orig/debugger/dbexec.c	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/debugger/dbexec.c	2008-04-13 08:58:36.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: dbexec - debugger control method execution
- *              $Revision: 1.83 $
+ *              $Revision: 1.7 $
  *
  ******************************************************************************/
 
@@ -205,7 +205,7 @@
 
         Params[1].Type           = ACPI_TYPE_STRING;
         Params[1].String.Length  = 12;
-        Params[1].String.Pointer = "AML Debugger";
+        Params[1].String.Pointer = __UNCONST("AML Debugger");
 
         ParamObjects.Pointer     = Params;
         ParamObjects.Count       = 2;
diff -ur acpica-unix-20080321.orig/debugger/dbfileio.c acpica-unix-20080321/debugger/dbfileio.c
--- acpica-unix-20080321.orig/debugger/dbfileio.c	2008-04-12 12:46:31.000000000 -0400
+++ acpica-unix-20080321/debugger/dbfileio.c	2008-04-13 08:58:37.000000000 -0400
@@ -2,7 +2,7 @@
  *
  * Module Name: dbfileio - Debugger file I/O commands.  These can't usually
  *              be used when running the debugger in Ring 0 (Kernel mode)
- *              $Revision: 1.96 $
+ *              $Revision: 1.7 $
  *
  ******************************************************************************/
 
diff -ur acpica-unix-20080321.orig/debugger/dbhistry.c acpica-unix-20080321/debugger/dbhistry.c
--- acpica-unix-20080321.orig/debugger/dbhistry.c	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/debugger/dbhistry.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: dbhistry - debugger HISTORY command
- *              $Revision: 1.35 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/debugger/dbinput.c acpica-unix-20080321/debugger/dbinput.c
--- acpica-unix-20080321.orig/debugger/dbinput.c	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/debugger/dbinput.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: dbinput - user front-end to the AML debugger
- *              $Revision: 1.116 $
+ *              $Revision: 1.6 $
  *
  ******************************************************************************/
 
diff -ur acpica-unix-20080321.orig/debugger/dbstats.c acpica-unix-20080321/debugger/dbstats.c
--- acpica-unix-20080321.orig/debugger/dbstats.c	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/debugger/dbstats.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: dbstats - Generation and display of ACPI table statistics
- *              $Revision: 1.90 $
+ *              $Revision: 1.6 $
  *
  ******************************************************************************/
 
diff -ur acpica-unix-20080321.orig/debugger/dbutils.c acpica-unix-20080321/debugger/dbutils.c
--- acpica-unix-20080321.orig/debugger/dbutils.c	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/debugger/dbutils.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: dbutils - AML debugger utilities
- *              $Revision: 1.87 $
+ *              $Revision: 1.5 $
  *
  ******************************************************************************/
 
@@ -138,7 +138,7 @@
     UINT32                  Address);
 #endif
 
-static char                 *Converter = "0123456789ABCDEF";
+static const char           *Converter = "0123456789ABCDEF";
 
 
 /*******************************************************************************
@@ -156,7 +156,7 @@
 
 ACPI_OBJECT_TYPE
 AcpiDbMatchArgument (
-    char                    *UserArgument,
+    const char              *UserArgument,
     ARGUMENT_INFO           *Arguments)
 {
     UINT32                  i;
diff -ur acpica-unix-20080321.orig/debugger/dbxface.c acpica-unix-20080321/debugger/dbxface.c
--- acpica-unix-20080321.orig/debugger/dbxface.c	2008-04-12 12:46:31.000000000 -0400
+++ acpica-unix-20080321/debugger/dbxface.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: dbxface - AML Debugger external interfaces
- *              $Revision: 1.79 $
+ *              $Revision: 1.4 $
  *
  ******************************************************************************/
 
diff -ur acpica-unix-20080321.orig/disassembler/dmbuffer.c acpica-unix-20080321/disassembler/dmbuffer.c
--- acpica-unix-20080321.orig/disassembler/dmbuffer.c	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/disassembler/dmbuffer.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: dmbuffer - AML disassembler, buffer and string support
- *              $Revision: 1.26 $
+ *              $Revision: 1.4 $
  *
  ******************************************************************************/
 
diff -ur acpica-unix-20080321.orig/disassembler/dmnames.c acpica-unix-20080321/disassembler/dmnames.c
--- acpica-unix-20080321.orig/disassembler/dmnames.c	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/disassembler/dmnames.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: dmnames - AML disassembler, names, namestrings, pathnames
- *              $Revision: 1.18 $
+ *              $Revision: 1.4 $
  *
  ******************************************************************************/
 
diff -ur acpica-unix-20080321.orig/disassembler/dmobject.c acpica-unix-20080321/disassembler/dmobject.c
--- acpica-unix-20080321.orig/disassembler/dmobject.c	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/disassembler/dmobject.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: dmobject - ACPI object decode and display
- *              $Revision: 1.24 $
+ *              $Revision: 1.4 $
  *
  ******************************************************************************/
 
diff -ur acpica-unix-20080321.orig/disassembler/dmopcode.c acpica-unix-20080321/disassembler/dmopcode.c
--- acpica-unix-20080321.orig/disassembler/dmopcode.c	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/disassembler/dmopcode.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: dmopcode - AML disassembler, specific AML opcodes
- *              $Revision: 1.105 $
+ *              $Revision: 1.5 $
  *
  ******************************************************************************/
 
@@ -344,7 +344,7 @@
     }
     else
     {
-        AcpiOsPrintf ("%s", ACPI_CAST_PTR (char,
+        AcpiOsPrintf ("%s", ACPI_CAST_CONST_PTR (char,
             AcpiGbl_MatchOps[(ACPI_SIZE) Op->Common.Value.Integer]));
     }
 }
diff -ur acpica-unix-20080321.orig/disassembler/dmresrc.c acpica-unix-20080321/disassembler/dmresrc.c
--- acpica-unix-20080321.orig/disassembler/dmresrc.c	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/disassembler/dmresrc.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: dmresrc.c - Resource Descriptor disassembly
- *              $Revision: 1.36 $
+ *              $Revision: 1.5 $
  *
  ******************************************************************************/
 
@@ -222,7 +222,7 @@
 void
 AcpiDmDumpInteger8 (
     UINT8                   Value,
-    char                    *Name)
+    const char              *Name)
 {
     AcpiOsPrintf ("0x%2.2X,               // %s\n", Value, Name);
 }
@@ -230,7 +230,7 @@
 void
 AcpiDmDumpInteger16 (
     UINT16                  Value,
-    char                    *Name)
+    const char              *Name)
 {
     AcpiOsPrintf ("0x%4.4X,             // %s\n", Value, Name);
 }
@@ -238,7 +238,7 @@
 void
 AcpiDmDumpInteger32 (
     UINT32                  Value,
-    char                    *Name)
+    const char              *Name)
 {
     AcpiOsPrintf ("0x%8.8X,         // %s\n", Value, Name);
 }
@@ -246,7 +246,7 @@
 void
 AcpiDmDumpInteger64 (
     UINT64                  Value,
-    char                    *Name)
+    const char              *Name)
 {
     AcpiOsPrintf ("0x%8.8X%8.8X, // %s\n", ACPI_FORMAT_UINT64 (Value), Name);
 }
diff -ur acpica-unix-20080321.orig/disassembler/dmresrcl.c acpica-unix-20080321/disassembler/dmresrcl.c
--- acpica-unix-20080321.orig/disassembler/dmresrcl.c	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/disassembler/dmresrcl.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: dmresrcl.c - "Large" Resource Descriptor disassembly
- *              $Revision: 1.38 $
+ *              $Revision: 1.7 $
  *
  ******************************************************************************/
 
@@ -127,7 +127,7 @@
 
 /* Common names for address and memory descriptors */
 
-static char                 *AcpiDmAddressNames[] =
+static const char           *AcpiDmAddressNames[] =
 {
     "Granularity",
     "Range Minimum",
@@ -136,7 +136,7 @@
     "Length"
 };
 
-static char                 *AcpiDmMemoryNames[] =
+static const char           *AcpiDmMemoryNames[] =
 {
     "Range Minimum",
     "Range Maximum",
@@ -1067,7 +1067,7 @@
 
 void
 AcpiDmVendorCommon (
-    char                    *Name,
+    const char              *Name,
     UINT8                   *ByteData,
     UINT32                  Length,
     UINT32                  Level)
diff -ur acpica-unix-20080321.orig/disassembler/dmresrcs.c acpica-unix-20080321/disassembler/dmresrcs.c
--- acpica-unix-20080321.orig/disassembler/dmresrcs.c	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/disassembler/dmresrcs.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: dmresrcs.c - "Small" Resource Descriptor disassembly
- *              $Revision: 1.17 $
+ *              $Revision: 1.6 $
  *
  ******************************************************************************/
 
diff -ur acpica-unix-20080321.orig/disassembler/dmutils.c acpica-unix-20080321/disassembler/dmutils.c
--- acpica-unix-20080321.orig/disassembler/dmutils.c	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/disassembler/dmutils.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: dmutils - AML disassembler utilities
- *              $Revision: 1.26 $
+ *              $Revision: 1.4 $
  *
  ******************************************************************************/
 
diff -ur acpica-unix-20080321.orig/disassembler/dmwalk.c acpica-unix-20080321/disassembler/dmwalk.c
--- acpica-unix-20080321.orig/disassembler/dmwalk.c	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/disassembler/dmwalk.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: dmwalk - AML disassembly tree walk
- *              $Revision: 1.34 $
+ *              $Revision: 1.6 $
  *
  ******************************************************************************/
 
diff -ur acpica-unix-20080321.orig/events/evevent.c acpica-unix-20080321/events/evevent.c
--- acpica-unix-20080321.orig/events/evevent.c	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/events/evevent.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: evevent - Fixed Event handling and dispatch
- *              $Revision: 1.127 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/events/evgpe.c acpica-unix-20080321/events/evgpe.c
--- acpica-unix-20080321.orig/events/evgpe.c	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/events/evgpe.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: evgpe - General Purpose Event handling and dispatch
- *              $Revision: 1.72 $
+ *              $Revision: 1.5 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/events/evgpeblk.c acpica-unix-20080321/events/evgpeblk.c
--- acpica-unix-20080321.orig/events/evgpeblk.c	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/events/evgpeblk.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: evgpeblk - GPE block creation and initialization.
- *              $Revision: 1.62 $
+ *              $Revision: 1.6 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/events/evmisc.c acpica-unix-20080321/events/evmisc.c
--- acpica-unix-20080321.orig/events/evmisc.c	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/events/evmisc.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: evmisc - Miscellaneous event manager support functions
- *              $Revision: 1.109 $
+ *              $Revision: 1.6 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/events/evregion.c acpica-unix-20080321/events/evregion.c
--- acpica-unix-20080321.orig/events/evregion.c	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/events/evregion.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: evregion - ACPI AddressSpace (OpRegion) handler dispatch
- *              $Revision: 1.171 $
+ *              $Revision: 1.6 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/events/evrgnini.c acpica-unix-20080321/events/evrgnini.c
--- acpica-unix-20080321.orig/events/evrgnini.c	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/events/evrgnini.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: evrgnini- ACPI AddressSpace (OpRegion) init
- *              $Revision: 1.89 $
+ *              $Revision: 1.6 $
  *
  *****************************************************************************/
 
@@ -672,7 +672,7 @@
     ACPI_NAMESPACE_NODE     *Node;
     ACPI_STATUS             Status;
     ACPI_NAMESPACE_NODE     *MethodNode;
-    ACPI_NAME               *RegNamePtr = (ACPI_NAME *) METHOD_NAME__REG;
+    const ACPI_NAME         *RegNamePtr = (const ACPI_NAME *) METHOD_NAME__REG;
     ACPI_OPERAND_OBJECT     *RegionObj2;
 
 
diff -ur acpica-unix-20080321.orig/events/evsci.c acpica-unix-20080321/events/evsci.c
--- acpica-unix-20080321.orig/events/evsci.c	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/events/evsci.c	2008-04-13 08:58:37.000000000 -0400
@@ -2,7 +2,7 @@
  *
  * Module Name: evsci - System Control Interrupt configuration and
  *                      legacy to ACPI mode state transition functions
- *              $Revision: 1.104 $
+ *              $Revision: 1.4 $
  *
  ******************************************************************************/
 
diff -ur acpica-unix-20080321.orig/events/evxface.c acpica-unix-20080321/events/evxface.c
--- acpica-unix-20080321.orig/events/evxface.c	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/events/evxface.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: evxface - External interfaces for ACPI events
- *              $Revision: 1.167 $
+ *              $Revision: 1.6 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/events/evxfevnt.c acpica-unix-20080321/events/evxfevnt.c
--- acpica-unix-20080321.orig/events/evxfevnt.c	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/events/evxfevnt.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: evxfevnt - External Interfaces, ACPI event disable/enable
- *              $Revision: 1.94 $
+ *              $Revision: 1.6 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/events/evxfregn.c acpica-unix-20080321/events/evxfregn.c
--- acpica-unix-20080321.orig/events/evxfregn.c	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/events/evxfregn.c	2008-04-13 08:58:37.000000000 -0400
@@ -2,7 +2,7 @@
  *
  * Module Name: evxfregn - External Interfaces, ACPI Operation Regions and
  *                         Address Spaces.
- *              $Revision: 1.71 $
+ *              $Revision: 1.6 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/hardware/hwacpi.c acpica-unix-20080321/hardware/hwacpi.c
--- acpica-unix-20080321.orig/hardware/hwacpi.c	2008-04-12 12:46:31.000000000 -0400
+++ acpica-unix-20080321/hardware/hwacpi.c	2008-04-13 08:58:37.000000000 -0400
@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Module Name: hwacpi - ACPI Hardware Initialization/Mode Interface
- *              $Revision: 1.79 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/hardware/hwgpe.c acpica-unix-20080321/hardware/hwgpe.c
--- acpica-unix-20080321.orig/hardware/hwgpe.c	2008-04-12 12:46:31.000000000 -0400
+++ acpica-unix-20080321/hardware/hwgpe.c	2008-04-13 08:58:37.000000000 -0400
@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Module Name: hwgpe - Low level GPE enable/disable/clear functions
- *              $Revision: 1.76 $
+ *              $Revision: 1.6 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/hardware/hwregs.c acpica-unix-20080321/hardware/hwregs.c
--- acpica-unix-20080321.orig/hardware/hwregs.c	2008-04-12 12:46:31.000000000 -0400
+++ acpica-unix-20080321/hardware/hwregs.c	2008-04-13 08:58:37.000000000 -0400
@@ -3,7 +3,7 @@
  *
  * Module Name: hwregs - Read/write access functions for the various ACPI
  *                       control and status registers.
- *              $Revision: 1.188 $
+ *              $Revision: 1.4 $
  *
  ******************************************************************************/
 
@@ -230,7 +230,7 @@
         return_ACPI_STATUS (AE_NO_MEMORY);
     }
 
-    Info->Pathname = ACPI_CAST_PTR (char, AcpiGbl_SleepStateNames[SleepState]);
+    Info->Pathname = ACPI_CAST_CONST_PTR (char, AcpiGbl_SleepStateNames[SleepState]);
 
     /* Evaluate the namespace object containing the values for this state */
 
diff -ur acpica-unix-20080321.orig/hardware/hwsleep.c acpica-unix-20080321/hardware/hwsleep.c
--- acpica-unix-20080321.orig/hardware/hwsleep.c	2008-04-12 12:46:31.000000000 -0400
+++ acpica-unix-20080321/hardware/hwsleep.c	2008-04-13 08:58:37.000000000 -0400
@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Name: hwsleep.c - ACPI Hardware Sleep/Wake Interface
- *              $Revision: 1.89 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/hardware/hwtimer.c acpica-unix-20080321/hardware/hwtimer.c
--- acpica-unix-20080321.orig/hardware/hwtimer.c	2008-04-12 12:46:31.000000000 -0400
+++ acpica-unix-20080321/hardware/hwtimer.c	2008-04-13 08:58:37.000000000 -0400
@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Name: hwtimer.c - ACPI Power Management Timer Interface
- *              $Revision: 1.38 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/include/acconfig.h acpica-unix-20080321/include/acconfig.h
--- acpica-unix-20080321.orig/include/acconfig.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/acconfig.h	2008-04-13 08:58:36.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acconfig.h - Global configuration constants
- *       $Revision: 1.243 $
+ *       $Revision: 1.3 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/include/acdebug.h acpica-unix-20080321/include/acdebug.h
--- acpica-unix-20080321.orig/include/acdebug.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/acdebug.h	2008-04-13 08:58:36.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acdebug.h - ACPI/AML debugger
- *       $Revision: 1.85 $
+ *       $Revision: 1.4 $
  *
  *****************************************************************************/
 
@@ -122,7 +122,7 @@
 
 typedef struct CommandInfo
 {
-    char                    *Name;          /* Command Name */
+    const char              *Name;          /* Command Name */
     UINT8                   MinArgs;        /* Minimum arguments required */
 
 } COMMAND_INFO;
@@ -130,7 +130,7 @@
 
 typedef struct ArgumentInfo
 {
-    char                    *Name;          /* Argument Name */
+    const char              *Name;          /* Argument Name */
 
 } ARGUMENT_INFO;
 
@@ -220,7 +220,7 @@
 
 ACPI_STATUS
 AcpiDbDisplayObjects (
-    char                    *ObjTypeArg,
+    const char              *ObjTypeArg,
     char                    *DisplayCountArg);
 
 ACPI_STATUS
@@ -335,7 +335,7 @@
  */
 ACPI_OBJECT_TYPE
 AcpiDbMatchArgument (
-    char                    *UserArgument,
+    const char              *UserArgument,
     ARGUMENT_INFO           *Arguments);
 
 void
diff -ur acpica-unix-20080321.orig/include/acdisasm.h acpica-unix-20080321/include/acdisasm.h
--- acpica-unix-20080321.orig/include/acdisasm.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/acdisasm.h	2008-04-13 08:58:36.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acdisasm.h - AML disassembler
- *       $Revision: 1.44 $
+ *       $Revision: 1.4 $
  *
  *****************************************************************************/
 
@@ -124,7 +124,7 @@
 #define BLOCK_PAREN             1
 #define BLOCK_BRACE             2
 #define BLOCK_COMMA_LIST        4
-#define ACPI_DEFAULT_RESNAME    *(UINT32 *) "__RD"
+#define ACPI_DEFAULT_RESNAME    *(const UINT32 *) "__RD"
 
 typedef struct acpi_external_list
 {
@@ -518,22 +518,22 @@
 void
 AcpiDmDumpInteger8 (
     UINT8                   Value,
-    char                    *Name);
+    const char              *Name);
 
 void
 AcpiDmDumpInteger16 (
     UINT16                  Value,
-    char                    *Name);
+    const char              *Name);
 
 void
 AcpiDmDumpInteger32 (
     UINT32                  Value,
-    char                    *Name);
+    const char              *Name);
 
 void
 AcpiDmDumpInteger64 (
     UINT64                  Value,
-    char                    *Name);
+    const char              *Name);
 
 void
 AcpiDmResourceTemplate (
@@ -628,7 +628,7 @@
 
 void
 AcpiDmVendorCommon (
-    char                    *Name,
+    const char              *Name,
     UINT8                   *ByteData,
     UINT32                  Length,
     UINT32                  Level);
diff -ur acpica-unix-20080321.orig/include/acdispat.h acpica-unix-20080321/include/acdispat.h
--- acpica-unix-20080321.orig/include/acdispat.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/acdispat.h	2008-04-13 08:58:36.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acdispat.h - dispatcher (parser to interpreter interface)
- *       $Revision: 1.79 $
+ *       $Revision: 1.3 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/include/acevents.h acpica-unix-20080321/include/acevents.h
--- acpica-unix-20080321.orig/include/acevents.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/acevents.h	2008-04-13 08:58:36.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acevents.h - Event subcomponent prototypes and defines
- *       $Revision: 1.110 $
+ *       $Revision: 1.3 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/include/acexcep.h acpica-unix-20080321/include/acexcep.h
--- acpica-unix-20080321.orig/include/acexcep.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/acexcep.h	2008-04-13 08:58:36.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acexcep.h - Exception codes returned by the ACPI subsystem
- *       $Revision: 1.80 $
+ *       $Revision: 1.3 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/include/acglobal.h acpica-unix-20080321/include/acglobal.h
--- acpica-unix-20080321.orig/include/acglobal.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/acglobal.h	2008-04-13 08:58:36.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acglobal.h - Declarations for global variables
- *       $Revision: 1.199 $
+ *       $Revision: 1.3 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/include/achware.h acpica-unix-20080321/include/achware.h
--- acpica-unix-20080321.orig/include/achware.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/achware.h	2008-04-13 08:58:36.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: achware.h -- hardware specific interfaces
- *       $Revision: 1.84 $
+ *       $Revision: 1.3 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/include/acinterp.h acpica-unix-20080321/include/acinterp.h
--- acpica-unix-20080321.orig/include/acinterp.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/acinterp.h	2008-04-13 08:58:36.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acinterp.h - Interpreter subcomponent prototypes and defines
- *       $Revision: 1.173 $
+ *       $Revision: 1.4 $
  *
  *****************************************************************************/
 
@@ -142,7 +142,7 @@
 {
     UINT8                   Opcode;
     UINT8                   Offset;
-    char                    *Name;
+    const char              *Name;
 
 } ACPI_EXDUMP_INFO;
 
@@ -565,10 +565,10 @@
 AcpiExDumpOperands (
     ACPI_OPERAND_OBJECT     **Operands,
     ACPI_INTERPRETER_MODE   InterpreterMode,
-    char                    *Ident,
+    const char              *Ident,
     UINT32                  NumLevels,
-    char                    *Note,
-    char                    *ModuleName,
+    const char              *Note,
+    const char              *ModuleName,
     UINT32                  LineNumber);
 
 void
diff -ur acpica-unix-20080321.orig/include/aclocal.h acpica-unix-20080321/include/aclocal.h
--- acpica-unix-20080321.orig/include/aclocal.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/aclocal.h	2008-04-13 08:58:36.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: aclocal.h - Internal data types used across the ACPI subsystem
- *       $Revision: 1.250 $
+ *       $Revision: 1.5 $
  *
  *****************************************************************************/
 
@@ -172,7 +172,7 @@
 
 /* Debug names for the mutexes above */
 
-static char                 *AcpiGbl_MutexNames[ACPI_NUM_MUTEX] =
+static const char           *AcpiGbl_MutexNames[ACPI_NUM_MUTEX] =
 {
     "ACPI_MTX_Interpreter",
     "ACPI_MTX_Tables",
@@ -375,9 +375,9 @@
  */
 typedef struct acpi_predefined_names
 {
-    char                            *Name;
+    const char                      *Name;
     UINT8                           Type;
-    char                            *Val;
+    const char                      *Val;
 
 } ACPI_PREDEFINED_NAMES;
 
@@ -392,8 +392,8 @@
 
 typedef struct acpi_namestring_info
 {
-    char                            *ExternalName;
-    char                            *NextExternalChar;
+    const char                      *ExternalName;
+    const char                      *NextExternalChar;
     char                            *InternalName;
     UINT32                          Length;
     UINT32                          NumSegments;
@@ -761,7 +761,7 @@
 typedef struct acpi_opcode_info
 {
 #if defined(ACPI_DISASSEMBLER) || defined(ACPI_DEBUG_OUTPUT)
-    char                            *Name;          /* Opcode name (disassembler/debug only) */
+    const char                      *Name;          /* Opcode name (disassembler/debug only) */
 #endif
     UINT32                          ParseArgs;      /* Grammar/Parse time arguments */
     UINT32                          RuntimeArgs;    /* Interpret time arguments */
@@ -1176,7 +1176,7 @@
 
 typedef struct acpi_memory_list
 {
-    char                            *ListName;
+    const char                      *ListName;
     void                            *ListHead;
     UINT16                          ObjectSize;
     UINT16                          MaxDepth;
diff -ur acpica-unix-20080321.orig/include/acmacros.h acpica-unix-20080321/include/acmacros.h
--- acpica-unix-20080321.orig/include/acmacros.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/acmacros.h	2008-04-13 08:58:36.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acmacros.h - C macros for the entire subsystem.
- *       $Revision: 1.199 $
+ *       $Revision: 1.4 $
  *
  *****************************************************************************/
 
@@ -155,6 +155,8 @@
  */
 #define ACPI_CAST_PTR(t, p)             ((t *) (ACPI_UINTPTR_T) (p))
 #define ACPI_CAST_INDIRECT_PTR(t, p)    ((t **) (ACPI_UINTPTR_T) (p))
+#define ACPI_CAST_CONST_PTR(t, p)	((const t *)(const void *)(p))
+#define ACPI_CAST_INDIRECT_CONST_PTR(t, p) ((const t **)(const void *)(p))
 #define ACPI_ADD_PTR(t,a,b)             ACPI_CAST_PTR (t, (ACPI_CAST_PTR (UINT8,(a)) + (ACPI_NATIVE_UINT)(b)))
 #define ACPI_PTR_DIFF(a,b)              (ACPI_NATIVE_UINT) (ACPI_CAST_PTR (UINT8,(a)) - ACPI_CAST_PTR (UINT8,(b)))
 
@@ -167,7 +169,7 @@
 #define ACPI_PTR_TO_PHYSADDR(i)         ACPI_TO_INTEGER(i)
 
 #ifndef ACPI_MISALIGNMENT_NOT_SUPPORTED
-#define ACPI_COMPARE_NAME(a,b)          (*ACPI_CAST_PTR (UINT32,(a)) == *ACPI_CAST_PTR (UINT32,(b)))
+#define ACPI_COMPARE_NAME(a,b)          (*ACPI_CAST_CONST_PTR (UINT32,(a)) == *ACPI_CAST_CONST_PTR (UINT32,(b)))
 #else
 #define ACPI_COMPARE_NAME(a,b)          (!ACPI_STRNCMP (ACPI_CAST_PTR (char,(a)), ACPI_CAST_PTR (char,(b)), ACPI_NAME_SIZE))
 #endif
@@ -282,14 +284,14 @@
 /* 32-bit source, 16/32/64 destination */
 
 #define ACPI_MOVE_32_TO_16(d,s)         ACPI_MOVE_16_TO_16(d,s)    /* Truncate to 16 */
-#define ACPI_MOVE_32_TO_32(d,s)         *(UINT32 *)(void *)(d) = *(UINT32 *)(void *)(s)
-#define ACPI_MOVE_32_TO_64(d,s)         *(UINT64 *)(void *)(d) = *(UINT32 *)(void *)(s)
+#define ACPI_MOVE_32_TO_32(d,s)         *(UINT32 *)(void *)(d) = *(const UINT32 *)(const void *)(s)
+#define ACPI_MOVE_32_TO_64(d,s)         *(UINT64 *)(void *)(d) = *(const UINT32 *)(const void *)(s)
 
 /* 64-bit source, 16/32/64 destination */
 
 #define ACPI_MOVE_64_TO_16(d,s)         ACPI_MOVE_16_TO_16(d,s)    /* Truncate to 16 */
 #define ACPI_MOVE_64_TO_32(d,s)         ACPI_MOVE_32_TO_32(d,s)    /* Truncate to 32 */
-#define ACPI_MOVE_64_TO_64(d,s)         *(UINT64 *)(void *)(d) = *(UINT64 *)(void *)(s)
+#define ACPI_MOVE_64_TO_64(d,s)         *(UINT64 *)(void *)(d) = *(const UINT64 *)(const void *)(s)
 
 #else
 /*
@@ -496,7 +498,7 @@
  * error messages. The __FILE__ macro is not very useful for this, because it
  * often includes the entire pathname to the module
  */
-#define ACPI_MODULE_NAME(Name)          static char ACPI_UNUSED_VAR *_AcpiModuleName = Name;
+#define ACPI_MODULE_NAME(Name)          static const char ACPI_UNUSED_VAR *_AcpiModuleName = Name;
 #else
 #define ACPI_MODULE_NAME(Name)
 #endif
@@ -572,11 +574,11 @@
 #define ACPI_FUNCTION_TRACE(a)          ACPI_FUNCTION_NAME(a) \
                                             AcpiUtTrace(ACPI_DEBUG_PARAMETERS)
 #define ACPI_FUNCTION_TRACE_PTR(a,b)    ACPI_FUNCTION_NAME(a) \
-                                            AcpiUtTracePtr(ACPI_DEBUG_PARAMETERS,(void *)b)
+                                            AcpiUtTracePtr(ACPI_DEBUG_PARAMETERS,(const void *)b)
 #define ACPI_FUNCTION_TRACE_U32(a,b)    ACPI_FUNCTION_NAME(a) \
                                             AcpiUtTraceU32(ACPI_DEBUG_PARAMETERS,(UINT32)b)
 #define ACPI_FUNCTION_TRACE_STR(a,b)    ACPI_FUNCTION_NAME(a) \
-                                            AcpiUtTraceStr(ACPI_DEBUG_PARAMETERS,(char *)b)
+                                            AcpiUtTraceStr(ACPI_DEBUG_PARAMETERS,(const char *)b)
 
 #define ACPI_FUNCTION_ENTRY()           AcpiUtTrackStackPtr()
 
diff -ur acpica-unix-20080321.orig/include/acnames.h acpica-unix-20080321/include/acnames.h
--- acpica-unix-20080321.orig/include/acnames.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/acnames.h	2008-04-13 08:58:36.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acnames.h - Global names and strings
- *       $Revision: 1.8 $
+ *       $Revision: 1.3 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/include/acnamesp.h acpica-unix-20080321/include/acnamesp.h
--- acpica-unix-20080321.orig/include/acnamesp.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/acnamesp.h	2008-04-13 08:58:36.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acnamesp.h - Namespace subcomponent prototypes and defines
- *       $Revision: 1.154 $
+ *       $Revision: 1.4 $
  *
  *****************************************************************************/
 
@@ -218,7 +218,7 @@
 ACPI_STATUS
 AcpiNsLookup (
     ACPI_GENERIC_STATE      *ScopeInfo,
-    char                    *Name,
+    const char              *Name,
     ACPI_OBJECT_TYPE        Type,
     ACPI_INTERPRETER_MODE   InterpreterMode,
     UINT32                  Flags,
@@ -275,14 +275,14 @@
 void
 AcpiNsDumpPathname (
     ACPI_HANDLE             Handle,
-    char                    *Msg,
+    const char              *Msg,
     UINT32                  Level,
     UINT32                  Component);
 
 void
 AcpiNsPrintPathname (
     UINT32                  NumSegments,
-    char                    *Pathname);
+    const char              *Pathname);
 
 ACPI_STATUS
 AcpiNsDumpOneObject (
@@ -342,7 +342,7 @@
 ACPI_STATUS
 AcpiNsGetNode (
     ACPI_NAMESPACE_NODE     *PrefixNode,
-    char                    *ExternalPathname,
+    const char              *ExternalPathname,
     UINT32                  Flags,
     ACPI_NAMESPACE_NODE     **OutNode);
 
@@ -431,24 +431,24 @@
 
 void
 AcpiNsReportError (
-    char                    *ModuleName,
+    const char              *ModuleName,
     UINT32                  LineNumber,
     char                    *InternalName,
     ACPI_STATUS             LookupStatus);
 
 void
 AcpiNsReportMethodError (
-    char                    *ModuleName,
+    const char              *ModuleName,
     UINT32                  LineNumber,
-    char                    *Message,
+    const char              *Message,
     ACPI_NAMESPACE_NODE     *Node,
-    char                    *Path,
+    const char              *Path,
     ACPI_STATUS             LookupStatus);
 
 void
 AcpiNsPrintNodePathname (
     ACPI_NAMESPACE_NODE     *Node,
-    char                    *Msg);
+    const char              *Msg);
 
 ACPI_STATUS
 AcpiNsBuildInternalName (
@@ -460,7 +460,7 @@
 
 ACPI_STATUS
 AcpiNsInternalizeName (
-    char                    *DottedName,
+    const char              *DottedName,
     char                    **ConvertedName);
 
 ACPI_STATUS
diff -ur acpica-unix-20080321.orig/include/acobject.h acpica-unix-20080321/include/acobject.h
--- acpica-unix-20080321.orig/include/acobject.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/acobject.h	2008-04-13 08:58:36.000000000 -0400
@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Name: acobject.h - Definition of ACPI_OPERAND_OBJECT  (Internal object only)
- *       $Revision: 1.144 $
+ *       $Revision: 1.3 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/include/acopcode.h acpica-unix-20080321/include/acopcode.h
--- acpica-unix-20080321.orig/include/acopcode.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/acopcode.h	2008-04-13 08:58:36.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acopcode.h - AML opcode information for the AML parser and interpreter
- *       $Revision: 1.9 $
+ *       $Revision: 1.3 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/include/acoutput.h acpica-unix-20080321/include/acoutput.h
--- acpica-unix-20080321.orig/include/acoutput.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/acoutput.h	2008-04-13 08:58:36.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acoutput.h -- debug output
- *       $Revision: 1.102 $
+ *       $Revision: 1.3 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/include/acparser.h acpica-unix-20080321/include/acparser.h
--- acpica-unix-20080321.orig/include/acparser.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/acparser.h	2008-04-13 08:58:36.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: acparser.h - AML Parser subcomponent prototypes and defines
- *       $Revision: 1.84 $
+ *       $Revision: 1.3 $
  *
  *****************************************************************************/
 
@@ -207,7 +207,7 @@
 AcpiPsGetOpcodeInfo (
     UINT16                  Opcode);
 
-char *
+const char *
 AcpiPsGetOpcodeName (
     UINT16                  Opcode);
 
diff -ur acpica-unix-20080321.orig/include/acpi.h acpica-unix-20080321/include/acpi.h
--- acpica-unix-20080321.orig/include/acpi.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/acpi.h	2008-04-13 08:58:36.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acpi.h - Master include file, Publics and external data.
- *       $Revision: 1.62 $
+ *       $Revision: 1.3 $
  *
  *****************************************************************************/
 
@@ -124,7 +124,7 @@
  */
 #include "acnames.h"            /* Global ACPI names and strings */
 #include "acconfig.h"           /* Configuration constants */
-#include "platform/acenv.h"     /* Target environment specific items */
+#include "acenv.h"              /* Target environment specific items */
 #include "actypes.h"            /* Fundamental common data types */
 #include "acexcep.h"            /* ACPI exception codes */
 #include "acmacros.h"           /* C macros */
diff -ur acpica-unix-20080321.orig/include/acpiosxf.h acpica-unix-20080321/include/acpiosxf.h
--- acpica-unix-20080321.orig/include/acpiosxf.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/acpiosxf.h	2008-04-13 08:58:36.000000000 -0400
@@ -121,7 +121,7 @@
 #ifndef __ACPIOSXF_H__
 #define __ACPIOSXF_H__
 
-#include "platform/acenv.h"
+#include "acenv.h"
 #include "actypes.h"
 
 
@@ -292,7 +292,7 @@
  */
 ACPI_STATUS
 AcpiOsCreateCache (
-    char                    *CacheName,
+    const char              *CacheName,
     UINT16                  ObjectSize,
     UINT16                  MaxDepth,
     ACPI_CACHE_T            **ReturnCache);
@@ -448,7 +448,7 @@
 ACPI_STATUS
 AcpiOsSignal (
     UINT32                  Function,
-    void                    *Info);
+    const void              *Info);
 
 
 /*
diff -ur acpica-unix-20080321.orig/include/acpixf.h acpica-unix-20080321/include/acpixf.h
--- acpica-unix-20080321.orig/include/acpixf.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/acpixf.h	2008-04-13 08:58:36.000000000 -0400
@@ -213,13 +213,13 @@
 
 ACPI_STATUS
 AcpiGetTableHeader (
-    ACPI_STRING             Signature,
+    ACPI_CONST_STRING       Signature,
     ACPI_NATIVE_UINT        Instance,
     ACPI_TABLE_HEADER       *OutTableHeader);
 
 ACPI_STATUS
 AcpiGetTable (
-    ACPI_STRING             Signature,
+    ACPI_CONST_STRING       Signature,
     ACPI_NATIVE_UINT        Instance,
     ACPI_TABLE_HEADER       **OutTable);
 
@@ -266,7 +266,7 @@
 ACPI_STATUS
 AcpiGetHandle (
     ACPI_HANDLE             Parent,
-    ACPI_STRING             Pathname,
+    ACPI_CONST_STRING       Pathname,
     ACPI_HANDLE             *RetHandle);
 
 ACPI_STATUS
@@ -300,14 +300,14 @@
 ACPI_STATUS
 AcpiEvaluateObject (
     ACPI_HANDLE             Object,
-    ACPI_STRING             Pathname,
+    ACPI_CONST_STRING       Pathname,
     ACPI_OBJECT_LIST        *ParameterObjects,
     ACPI_BUFFER             *ReturnObjectBuffer);
 
 ACPI_STATUS
 AcpiEvaluateObjectTyped (
     ACPI_HANDLE             Object,
-    ACPI_STRING             Pathname,
+    ACPI_CONST_STRING       Pathname,
     ACPI_OBJECT_LIST        *ExternalParams,
     ACPI_BUFFER             *ReturnBuffer,
     ACPI_OBJECT_TYPE        ReturnType);
@@ -497,7 +497,7 @@
 ACPI_STATUS
 AcpiWalkResources (
     ACPI_HANDLE                 DeviceHandle,
-    char                        *Name,
+    const char                  *Name,
     ACPI_WALK_RESOURCE_CALLBACK UserFunction,
     void                        *Context);
 
diff -ur acpica-unix-20080321.orig/include/acresrc.h acpica-unix-20080321/include/acresrc.h
--- acpica-unix-20080321.orig/include/acresrc.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/acresrc.h	2008-04-13 08:58:36.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acresrc.h - Resource Manager function prototypes
- *       $Revision: 1.62 $
+ *       $Revision: 1.4 $
  *
  *****************************************************************************/
 
@@ -187,8 +187,8 @@
 {
     UINT8                   Opcode;
     UINT8                   Offset;
-    char                    *Name;
-    const char              **Pointer;
+    const char              *Name;
+    const char * const      *Pointer;
 
 } ACPI_RSDUMP_INFO;
 
@@ -274,7 +274,7 @@
 ACPI_STATUS
 AcpiRsGetMethodData (
     ACPI_HANDLE             Handle,
-    char                    *Path,
+    const char              *Path,
     ACPI_BUFFER             *RetBuffer);
 
 ACPI_STATUS
diff -ur acpica-unix-20080321.orig/include/acstruct.h acpica-unix-20080321/include/acstruct.h
--- acpica-unix-20080321.orig/include/acstruct.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/acstruct.h	2008-04-13 08:58:36.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acstruct.h - Internal structs
- *       $Revision: 1.50 $
+ *       $Revision: 1.3 $
  *
  *****************************************************************************/
 
@@ -275,7 +275,7 @@
 typedef struct acpi_evaluate_info
 {
     ACPI_NAMESPACE_NODE             *PrefixNode;
-    char                            *Pathname;
+    const char                      *Pathname;
     ACPI_OPERAND_OBJECT             *ObjDesc;
     ACPI_OPERAND_OBJECT             **Parameters;
     ACPI_NAMESPACE_NODE             *ResolvedNode;
diff -ur acpica-unix-20080321.orig/include/actables.h acpica-unix-20080321/include/actables.h
--- acpica-unix-20080321.orig/include/actables.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/actables.h	2008-04-13 08:58:36.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: actables.h - ACPI table management
- *       $Revision: 1.65 $
+ *       $Revision: 1.3 $
  *
  *****************************************************************************/
 
@@ -232,7 +232,7 @@
 AcpiTbInstallTable (
     ACPI_PHYSICAL_ADDRESS   Address,
     UINT8                   Flags,
-    char                    *Signature,
+    const char              *Signature,
     ACPI_NATIVE_UINT        TableIndex);
 
 ACPI_STATUS
diff -ur acpica-unix-20080321.orig/include/actbl.h acpica-unix-20080321/include/actbl.h
--- acpica-unix-20080321.orig/include/actbl.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/actbl.h	2008-04-13 08:58:36.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: actbl.h - Basic ACPI Table Definitions
- *       $Revision: 1.85 $
+ *       $Revision: 1.3 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/include/actbl1.h acpica-unix-20080321/include/actbl1.h
--- acpica-unix-20080321.orig/include/actbl1.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/actbl1.h	2008-04-13 08:58:36.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: actbl1.h - Additional ACPI table definitions
- *       $Revision: 1.51 $
+ *       $Revision: 1.3 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/include/actbl2.h acpica-unix-20080321/include/actbl2.h
--- acpica-unix-20080321.orig/include/actbl2.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/actbl2.h	2008-04-13 08:58:36.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: actbl2.h - ACPI Specification Revision 2.0 Tables
- *       $Revision: 1.52 $
+ *       $Revision: 1.3 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/include/actypes.h acpica-unix-20080321/include/actypes.h
--- acpica-unix-20080321.orig/include/actypes.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/actypes.h	2008-04-13 08:58:36.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: actypes.h - Common data types for the entire ACPI subsystem
- *       $Revision: 1.323 $
+ *       $Revision: 1.4 $
  *
  *****************************************************************************/
 
@@ -383,6 +383,7 @@
 typedef UINT32                          ACPI_STATUS;    /* All ACPI Exceptions */
 typedef UINT32                          ACPI_NAME;      /* 4-byte ACPI name */
 typedef char *                          ACPI_STRING;    /* Null terminated ASCII string */
+typedef const char *                    ACPI_CONST_STRING; /* Null terminated ASCII string */
 typedef void *                          ACPI_HANDLE;    /* Actually a ptr to a NS Node */
 
 typedef struct uint64_struct
diff -ur acpica-unix-20080321.orig/include/acutils.h acpica-unix-20080321/include/acutils.h
--- acpica-unix-20080321.orig/include/acutils.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/acutils.h	2008-04-13 08:58:36.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acutils.h -- prototypes for the common (subsystem-wide) procedures
- *       $Revision: 1.203 $
+ *       $Revision: 1.4 $
  *
  *****************************************************************************/
 
@@ -196,7 +196,7 @@
 
 #if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
 
-char *
+const char *
 AcpiUtGetMutexName (
     UINT32                  MutexId);
 
@@ -206,27 +206,27 @@
 
 #endif
 
-char *
+const char *
 AcpiUtGetTypeName (
     ACPI_OBJECT_TYPE        Type);
 
-char *
+const char *
 AcpiUtGetNodeName (
     void                    *Object);
 
-char *
+const char *
 AcpiUtGetDescriptorName (
     void                    *Object);
 
-char *
+const char *
 AcpiUtGetObjectTypeName (
     ACPI_OPERAND_OBJECT     *ObjDesc);
 
-char *
+const char *
 AcpiUtGetRegionName (
     UINT8                   SpaceId);
 
-char *
+const char *
 AcpiUtGetEventName (
     UINT32                  EventId);
 
@@ -417,22 +417,22 @@
 AcpiUtTrace (
     UINT32                  LineNumber,
     const char              *FunctionName,
-    char                    *ModuleName,
+    const char              *ModuleName,
     UINT32                  ComponentId);
 
 void
 AcpiUtTracePtr (
     UINT32                  LineNumber,
     const char              *FunctionName,
-    char                    *ModuleName,
+    const char              *ModuleName,
     UINT32                  ComponentId,
-    void                    *Pointer);
+    const void              *Pointer);
 
 void
 AcpiUtTraceU32 (
     UINT32                  LineNumber,
     const char              *FunctionName,
-    char                    *ModuleName,
+    const char              *ModuleName,
     UINT32                  ComponentId,
     UINT32                  Integer);
 
@@ -440,22 +440,22 @@
 AcpiUtTraceStr (
     UINT32                  LineNumber,
     const char              *FunctionName,
-    char                    *ModuleName,
+    const char              *ModuleName,
     UINT32                  ComponentId,
-    char                    *String);
+    const char              *String);
 
 void
 AcpiUtExit (
     UINT32                  LineNumber,
     const char              *FunctionName,
-    char                    *ModuleName,
+    const char              *ModuleName,
     UINT32                  ComponentId);
 
 void
 AcpiUtStatusExit (
     UINT32                  LineNumber,
     const char              *FunctionName,
-    char                    *ModuleName,
+    const char              *ModuleName,
     UINT32                  ComponentId,
     ACPI_STATUS             Status);
 
@@ -463,7 +463,7 @@
 AcpiUtValueExit (
     UINT32                  LineNumber,
     const char              *FunctionName,
-    char                    *ModuleName,
+    const char              *ModuleName,
     UINT32                  ComponentId,
     ACPI_INTEGER            Value);
 
@@ -471,7 +471,7 @@
 AcpiUtPtrExit (
     UINT32                  LineNumber,
     const char              *FunctionName,
-    char                    *ModuleName,
+    const char              *ModuleName,
     UINT32                  ComponentId,
     UINT8                   *Ptr);
 
@@ -490,17 +490,17 @@
 
 void
 AcpiUtReportError (
-    char                    *ModuleName,
+    const char              *ModuleName,
     UINT32                  LineNumber);
 
 void
 AcpiUtReportInfo (
-    char                    *ModuleName,
+    const char              *ModuleName,
     UINT32                  LineNumber);
 
 void
 AcpiUtReportWarning (
-    char                    *ModuleName,
+    const char              *ModuleName,
     UINT32                  LineNumber);
 
 /* Error and message reporting interfaces */
@@ -510,9 +510,9 @@
     UINT32                  RequestedDebugLevel,
     UINT32                  LineNumber,
     const char              *FunctionName,
-    char                    *ModuleName,
+    const char              *ModuleName,
     UINT32                  ComponentId,
-    char                    *Format,
+    const char              *Format,
     ...) ACPI_PRINTF_LIKE(6);
 
 void ACPI_INTERNAL_VAR_XFACE
@@ -520,38 +520,38 @@
     UINT32                  RequestedDebugLevel,
     UINT32                  LineNumber,
     const char              *FunctionName,
-    char                    *ModuleName,
+    const char              *ModuleName,
     UINT32                  ComponentId,
-    char                    *Format,
+    const char              *Format,
     ...) ACPI_PRINTF_LIKE(6);
 
 void ACPI_INTERNAL_VAR_XFACE
 AcpiUtError (
-    char                    *ModuleName,
+    const char              *ModuleName,
     UINT32                  LineNumber,
-    char                    *Format,
+    const char              *Format,
     ...) ACPI_PRINTF_LIKE(3);
 
 void  ACPI_INTERNAL_VAR_XFACE
 AcpiUtException (
-    char                    *ModuleName,
+    const char              *ModuleName,
     UINT32                  LineNumber,
     ACPI_STATUS             Status,
-    char                    *Format,
+    const char              *Format,
     ...) ACPI_PRINTF_LIKE(4);
 
 void ACPI_INTERNAL_VAR_XFACE
 AcpiUtWarning (
-    char                    *ModuleName,
+    const char              *ModuleName,
     UINT32                  LineNumber,
-    char                    *Format,
+    const char              *Format,
     ...) ACPI_PRINTF_LIKE(3);
 
 void ACPI_INTERNAL_VAR_XFACE
 AcpiUtInfo (
-    char                    *ModuleName,
+    const char              *ModuleName,
     UINT32                  LineNumber,
-    char                    *Format,
+    const char              *Format,
     ...) ACPI_PRINTF_LIKE(3);
 
 
@@ -589,13 +589,13 @@
 ACPI_STATUS
 AcpiUtEvaluateObject (
     ACPI_NAMESPACE_NODE     *PrefixNode,
-    char                    *Path,
+    const char              *Path,
     UINT32                  ExpectedReturnBtypes,
     ACPI_OPERAND_OBJECT     **ReturnDesc);
 
 ACPI_STATUS
 AcpiUtEvaluateNumericObject (
-    char                    *ObjectName,
+    const char              *ObjectName,
     ACPI_NAMESPACE_NODE     *DeviceNode,
     ACPI_INTEGER            *Address);
 
@@ -630,14 +630,14 @@
  */
 ACPI_OPERAND_OBJECT  *
 AcpiUtCreateInternalObjectDbg (
-    char                    *ModuleName,
+    const char              *ModuleName,
     UINT32                  LineNumber,
     UINT32                  ComponentId,
     ACPI_OBJECT_TYPE        Type);
 
 void *
 AcpiUtAllocateObjectDescDbg (
-    char                    *ModuleName,
+    const char              *ModuleName,
     UINT32                  LineNumber,
     UINT32                  ComponentId);
 
@@ -812,7 +812,7 @@
 AcpiUtDisplayInitPathname (
     UINT8                   Type,
     ACPI_NAMESPACE_NODE     *ObjHandle,
-    char                    *Path);
+    const char              *Path);
 #endif
 
 
@@ -897,14 +897,14 @@
 AcpiUtAllocate (
     ACPI_SIZE               Size,
     UINT32                  Component,
-    char                    *Module,
+    const char              *Module,
     UINT32                  Line);
 
 void *
 AcpiUtAllocateZeroed (
     ACPI_SIZE               Size,
     UINT32                  Component,
-    char                    *Module,
+    const char              *Module,
     UINT32                  Line);
 
 #ifdef ACPI_DBG_TRACK_ALLOCATIONS
@@ -912,21 +912,21 @@
 AcpiUtAllocateAndTrack (
     ACPI_SIZE               Size,
     UINT32                  Component,
-    char                    *Module,
+    const char              *Module,
     UINT32                  Line);
 
 void *
 AcpiUtAllocateZeroedAndTrack (
     ACPI_SIZE               Size,
     UINT32                  Component,
-    char                    *Module,
+    const char              *Module,
     UINT32                  Line);
 
 void
 AcpiUtFreeAndTrack (
     void                    *Address,
     UINT32                  Component,
-    char                    *Module,
+    const char              *Module,
     UINT32                  Line);
 
 void
@@ -936,11 +936,11 @@
 void
 AcpiUtDumpAllocations (
     UINT32                  Component,
-    char                    *Module);
+    const char              *Module);
 
 ACPI_STATUS
 AcpiUtCreateList (
-    char                    *ListName,
+    const char              *ListName,
     UINT16                  ObjectSize,
     ACPI_MEMORY_LIST        **ReturnCache);
 
diff -ur acpica-unix-20080321.orig/include/amlcode.h acpica-unix-20080321/include/amlcode.h
--- acpica-unix-20080321.orig/include/amlcode.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/amlcode.h	2008-04-13 08:58:36.000000000 -0400
@@ -3,7 +3,7 @@
  * Name: amlcode.h - Definitions for AML, as included in "definition blocks"
  *                   Declarations and definitions contained herein are derived
  *                   directly from the ACPI specification.
- *       $Revision: 1.87 $
+ *       $Revision: 1.3 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/include/amlresrc.h acpica-unix-20080321/include/amlresrc.h
--- acpica-unix-20080321.orig/include/amlresrc.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/amlresrc.h	2008-04-13 08:58:36.000000000 -0400
@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Module Name: amlresrc.h - AML resource descriptors
- *              $Revision: 1.41 $
+ *              $Revision: 1.3 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/include/platform/acefi.h acpica-unix-20080321/include/platform/acefi.h
--- acpica-unix-20080321.orig/include/platform/acefi.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/platform/acefi.h	2008-04-13 08:58:36.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acefi.h - OS specific defines, etc.
- *       $Revision: 1.19 $
+ *       $Revision: 1.3 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/include/platform/acenv.h acpica-unix-20080321/include/platform/acenv.h
--- acpica-unix-20080321.orig/include/platform/acenv.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/platform/acenv.h	2008-04-13 08:58:36.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acenv.h - Generation environment specific items
- *       $Revision: 1.133 $
+ *       $Revision: 1.3 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/include/platform/acgcc.h acpica-unix-20080321/include/platform/acgcc.h
--- acpica-unix-20080321.orig/include/platform/acgcc.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/platform/acgcc.h	2008-04-13 08:58:36.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acgcc.h - GCC specific defines, etc.
- *       $Revision: 1.33 $
+ *       $Revision: 1.3 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/include/platform/acnetbsd.h acpica-unix-20080321/include/platform/acnetbsd.h
--- acpica-unix-20080321.orig/include/platform/acnetbsd.h	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/include/platform/acnetbsd.h	2008-04-13 08:58:36.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acnetbsd.h - OS specific defines, etc.
- *       $Revision: 1.10 $
+ *       $Revision: 1.3 $
  *
  *****************************************************************************/
 
@@ -121,6 +121,8 @@
 
 #include "acgcc.h"
 
+#define ACPI_USE_LOCAL_CACHE
+
 #ifdef _LP64
 #define ACPI_MACHINE_WIDTH      64
 #else
diff -ur acpica-unix-20080321.orig/interpreter/dispatcher/dsfield.c acpica-unix-20080321/interpreter/dispatcher/dsfield.c
--- acpica-unix-20080321.orig/interpreter/dispatcher/dsfield.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/dispatcher/dsfield.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: dsfield - Dispatcher field routines
- *              $Revision: 1.87 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/dispatcher/dsinit.c acpica-unix-20080321/interpreter/dispatcher/dsinit.c
--- acpica-unix-20080321.orig/interpreter/dispatcher/dsinit.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/dispatcher/dsinit.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: dsinit - Object initialization namespace walk
- *              $Revision: 1.29 $
+ *              $Revision: 1.6 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/dispatcher/dsmethod.c acpica-unix-20080321/interpreter/dispatcher/dsmethod.c
--- acpica-unix-20080321.orig/interpreter/dispatcher/dsmethod.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/dispatcher/dsmethod.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: dsmethod - Parser/Interpreter interface - control method parsing
- *              $Revision: 1.140 $
+ *              $Revision: 1.6 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/dispatcher/dsmthdat.c acpica-unix-20080321/interpreter/dispatcher/dsmthdat.c
--- acpica-unix-20080321.orig/interpreter/dispatcher/dsmthdat.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/dispatcher/dsmthdat.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: dsmthdat - control method arguments and local variables
- *              $Revision: 1.94 $
+ *              $Revision: 1.4 $
  *
  ******************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/dispatcher/dsobject.c acpica-unix-20080321/interpreter/dispatcher/dsobject.c
--- acpica-unix-20080321.orig/interpreter/dispatcher/dsobject.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/dispatcher/dsobject.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: dsobject - Dispatcher object management routines
- *              $Revision: 1.140 $
+ *              $Revision: 1.7 $
  *
  *****************************************************************************/
 
@@ -586,8 +586,8 @@
         }
 
         ACPI_ERROR ((AE_INFO,
-            "Package List length (%X) larger than NumElements count (%X), truncated\n",
-            i, ElementCount));
+            "Package List length larger than NumElements count (%X), truncated\n",
+            ElementCount));
     }
     else if (i < ElementCount)
     {
@@ -597,7 +597,7 @@
          */
         ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
             "Package List length (%X) smaller than NumElements count (%X), padded with null elements\n",
-            i, ElementCount));
+            (UINT32) i, ElementCount));
     }
 
     ObjDesc->Package.Flags |= AOPOBJ_DATA_VALID;
diff -ur acpica-unix-20080321.orig/interpreter/dispatcher/dsopcode.c acpica-unix-20080321/interpreter/dispatcher/dsopcode.c
--- acpica-unix-20080321.orig/interpreter/dispatcher/dsopcode.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/dispatcher/dsopcode.c	2008-04-13 08:58:37.000000000 -0400
@@ -2,7 +2,7 @@
  *
  * Module Name: dsopcode - Dispatcher Op Region support and handling of
  *                         "control" opcodes
- *              $Revision: 1.115 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/dispatcher/dsutils.c acpica-unix-20080321/interpreter/dispatcher/dsutils.c
--- acpica-unix-20080321.orig/interpreter/dispatcher/dsutils.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/dispatcher/dsutils.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: dsutils - Dispatcher utilities
- *              $Revision: 1.127 $
+ *              $Revision: 1.4 $
  *
  ******************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/dispatcher/dswexec.c acpica-unix-20080321/interpreter/dispatcher/dswexec.c
--- acpica-unix-20080321.orig/interpreter/dispatcher/dswexec.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/dispatcher/dswexec.c	2008-04-13 08:58:37.000000000 -0400
@@ -2,7 +2,7 @@
  *
  * Module Name: dswexec - Dispatcher method execution callbacks;
  *                        dispatch to interpreter.
- *              $Revision: 1.138 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/dispatcher/dswload.c acpica-unix-20080321/interpreter/dispatcher/dswload.c
--- acpica-unix-20080321.orig/interpreter/dispatcher/dswload.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/dispatcher/dswload.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: dswload - Dispatcher namespace load callbacks
- *              $Revision: 1.120 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/dispatcher/dswscope.c acpica-unix-20080321/interpreter/dispatcher/dswscope.c
--- acpica-unix-20080321.orig/interpreter/dispatcher/dswscope.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/dispatcher/dswscope.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: dswscope - Scope stack manipulation
- *              $Revision: 1.70 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/dispatcher/dswstate.c acpica-unix-20080321/interpreter/dispatcher/dswstate.c
--- acpica-unix-20080321.orig/interpreter/dispatcher/dswstate.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/dispatcher/dswstate.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: dswstate - Dispatcher parse tree walk management routines
- *              $Revision: 1.105 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/executer/exconfig.c acpica-unix-20080321/interpreter/executer/exconfig.c
--- acpica-unix-20080321.orig/interpreter/executer/exconfig.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/executer/exconfig.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: exconfig - Namespace reconfiguration (Load/Unload opcodes)
- *              $Revision: 1.113 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/executer/exconvrt.c acpica-unix-20080321/interpreter/executer/exconvrt.c
--- acpica-unix-20080321.orig/interpreter/executer/exconvrt.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/executer/exconvrt.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: exconvrt - Object conversion routines
- *              $Revision: 1.75 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/executer/excreate.c acpica-unix-20080321/interpreter/executer/excreate.c
--- acpica-unix-20080321.orig/interpreter/executer/excreate.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/executer/excreate.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: excreate - Named object creation
- *              $Revision: 1.117 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/executer/exdump.c acpica-unix-20080321/interpreter/executer/exdump.c
--- acpica-unix-20080321.orig/interpreter/executer/exdump.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/executer/exdump.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: exdump - Interpreter debug output routines
- *              $Revision: 1.206 $
+ *              $Revision: 1.7 $
  *
  *****************************************************************************/
 
@@ -134,12 +134,12 @@
 
 static void
 AcpiExOutString (
-    char                    *Title,
-    char                    *Value);
+    const char              *Title,
+    const char              *Value);
 
 static void
 AcpiExOutPointer (
-    char                    *Title,
+    const char              *Title,
     void                    *Value);
 
 static void
@@ -422,7 +422,7 @@
     ACPI_EXDUMP_INFO        *Info)
 {
     UINT8                   *Target;
-    char                    *Name;
+    const char              *Name;
     UINT8                   Count;
 
 
@@ -893,10 +893,10 @@
 AcpiExDumpOperands (
     ACPI_OPERAND_OBJECT     **Operands,
     ACPI_INTERPRETER_MODE   InterpreterMode,
-    char                    *Ident,
+    const char              *Ident,
     UINT32                  NumLevels,
-    char                    *Note,
-    char                    *ModuleName,
+    const char              *Note,
+    const char              *ModuleName,
     UINT32                  LineNumber)
 {
     ACPI_NATIVE_UINT        i;
@@ -953,15 +953,15 @@
 
 static void
 AcpiExOutString (
-    char                    *Title,
-    char                    *Value)
+    const char              *Title,
+    const char              *Value)
 {
     AcpiOsPrintf ("%20s : %s\n", Title, Value);
 }
 
 static void
 AcpiExOutPointer (
-    char                    *Title,
+    const char              *Title,
     void                    *Value)
 {
     AcpiOsPrintf ("%20s : %p\n", Title, Value);
diff -ur acpica-unix-20080321.orig/interpreter/executer/exfield.c acpica-unix-20080321/interpreter/executer/exfield.c
--- acpica-unix-20080321.orig/interpreter/executer/exfield.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/executer/exfield.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: exfield - ACPI AML (p-code) execution - field manipulation
- *              $Revision: 1.133 $
+ *              $Revision: 1.6 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/executer/exfldio.c acpica-unix-20080321/interpreter/executer/exfldio.c
--- acpica-unix-20080321.orig/interpreter/executer/exfldio.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/executer/exfldio.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: exfldio - Aml Field I/O
- *              $Revision: 1.131 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/executer/exmisc.c acpica-unix-20080321/interpreter/executer/exmisc.c
--- acpica-unix-20080321.orig/interpreter/executer/exmisc.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/executer/exmisc.c	2008-04-13 08:58:37.000000000 -0400
@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Module Name: exmisc - ACPI AML (p-code) execution - specific opcodes
- *              $Revision: 1.145 $
+ *              $Revision: 1.6 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/executer/exmutex.c acpica-unix-20080321/interpreter/executer/exmutex.c
--- acpica-unix-20080321.orig/interpreter/executer/exmutex.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/executer/exmutex.c	2008-04-13 08:58:37.000000000 -0400
@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Module Name: exmutex - ASL Mutex Acquire/Release functions
- *              $Revision: 1.43 $
+ *              $Revision: 1.6 $
  *
  *****************************************************************************/
 
@@ -488,10 +488,10 @@
         (ObjDesc != AcpiGbl_GlobalLockMutex))
     {
         ACPI_ERROR ((AE_INFO,
-            "Thread %X cannot release Mutex [%4.4s] acquired by thread %X",
-            WalkState->Thread->ThreadId,
+            "Thread %lX cannot release Mutex [%4.4s] acquired by thread %lX",
+            (unsigned long)WalkState->Thread->ThreadId,
             AcpiUtGetNodeName (ObjDesc->Mutex.Node),
-            ObjDesc->Mutex.OwnerThread->ThreadId));
+            (unsigned long)ObjDesc->Mutex.OwnerThread->ThreadId));
         return_ACPI_STATUS (AE_AML_NOT_OWNER);
     }
 
diff -ur acpica-unix-20080321.orig/interpreter/executer/exnames.c acpica-unix-20080321/interpreter/executer/exnames.c
--- acpica-unix-20080321.orig/interpreter/executer/exnames.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/executer/exnames.c	2008-04-13 08:58:37.000000000 -0400
@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Module Name: exnames - interpreter/scanner name load/execute
- *              $Revision: 1.112 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/executer/exoparg1.c acpica-unix-20080321/interpreter/executer/exoparg1.c
--- acpica-unix-20080321.orig/interpreter/executer/exoparg1.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/executer/exoparg1.c	2008-04-13 08:58:37.000000000 -0400
@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Module Name: exoparg1 - AML execution - opcodes with 1 argument
- *              $Revision: 1.186 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/executer/exoparg2.c acpica-unix-20080321/interpreter/executer/exoparg2.c
--- acpica-unix-20080321.orig/interpreter/executer/exoparg2.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/executer/exoparg2.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: exoparg2 - AML execution - opcodes with 2 arguments
- *              $Revision: 1.146 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/executer/exoparg3.c acpica-unix-20080321/interpreter/executer/exoparg3.c
--- acpica-unix-20080321.orig/interpreter/executer/exoparg3.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/executer/exoparg3.c	2008-04-13 08:58:37.000000000 -0400
@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Module Name: exoparg3 - AML execution - opcodes with 3 arguments
- *              $Revision: 1.36 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/executer/exoparg6.c acpica-unix-20080321/interpreter/executer/exoparg6.c
--- acpica-unix-20080321.orig/interpreter/executer/exoparg6.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/executer/exoparg6.c	2008-04-13 08:58:37.000000000 -0400
@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Module Name: exoparg6 - AML execution - opcodes with 6 arguments
- *              $Revision: 1.30 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/executer/exprep.c acpica-unix-20080321/interpreter/executer/exprep.c
--- acpica-unix-20080321.orig/interpreter/executer/exprep.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/executer/exprep.c	2008-04-13 08:58:37.000000000 -0400
@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Module Name: exprep - ACPI AML (p-code) execution - field prep utilities
- *              $Revision: 1.144 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/executer/exregion.c acpica-unix-20080321/interpreter/executer/exregion.c
--- acpica-unix-20080321.orig/interpreter/executer/exregion.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/executer/exregion.c	2008-04-13 08:58:37.000000000 -0400
@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Module Name: exregion - ACPI default OpRegion (address space) handlers
- *              $Revision: 1.103 $
+ *              $Revision: 1.6 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/executer/exresnte.c acpica-unix-20080321/interpreter/executer/exresnte.c
--- acpica-unix-20080321.orig/interpreter/executer/exresnte.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/executer/exresnte.c	2008-04-13 08:58:37.000000000 -0400
@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Module Name: exresnte - AML Interpreter object resolution
- *              $Revision: 1.78 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/executer/exresolv.c acpica-unix-20080321/interpreter/executer/exresolv.c
--- acpica-unix-20080321.orig/interpreter/executer/exresolv.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/executer/exresolv.c	2008-04-13 08:58:37.000000000 -0400
@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Module Name: exresolv - AML Interpreter object resolution
- *              $Revision: 1.146 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/executer/exresop.c acpica-unix-20080321/interpreter/executer/exresop.c
--- acpica-unix-20080321.orig/interpreter/executer/exresop.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/executer/exresop.c	2008-04-13 08:58:37.000000000 -0400
@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Module Name: exresop - AML Interpreter operand/object resolution
- *              $Revision: 1.96 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/executer/exstore.c acpica-unix-20080321/interpreter/executer/exstore.c
--- acpica-unix-20080321.orig/interpreter/executer/exstore.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/executer/exstore.c	2008-04-13 08:58:37.000000000 -0400
@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Module Name: exstore - AML Interpreter object store support
- *              $Revision: 1.210 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/executer/exstoren.c acpica-unix-20080321/interpreter/executer/exstoren.c
--- acpica-unix-20080321.orig/interpreter/executer/exstoren.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/executer/exstoren.c	2008-04-13 08:58:37.000000000 -0400
@@ -3,7 +3,7 @@
  *
  * Module Name: exstoren - AML Interpreter object store support,
  *                        Store to Node (namespace object)
- *              $Revision: 1.72 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/executer/exstorob.c acpica-unix-20080321/interpreter/executer/exstorob.c
--- acpica-unix-20080321.orig/interpreter/executer/exstorob.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/executer/exstorob.c	2008-04-13 08:58:37.000000000 -0400
@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Module Name: exstorob - AML Interpreter object store support, store to object
- *              $Revision: 1.63 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/executer/exsystem.c acpica-unix-20080321/interpreter/executer/exsystem.c
--- acpica-unix-20080321.orig/interpreter/executer/exsystem.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/executer/exsystem.c	2008-04-13 08:58:37.000000000 -0400
@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Module Name: exsystem - Interface to OS services
- *              $Revision: 1.95 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/executer/exutils.c acpica-unix-20080321/interpreter/executer/exutils.c
--- acpica-unix-20080321.orig/interpreter/executer/exutils.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/executer/exutils.c	2008-04-13 08:58:37.000000000 -0400
@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Module Name: exutils - interpreter/scanner utilities
- *              $Revision: 1.131 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/parser/psargs.c acpica-unix-20080321/interpreter/parser/psargs.c
--- acpica-unix-20080321.orig/interpreter/parser/psargs.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/parser/psargs.c	2008-04-13 08:58:38.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: psargs - Parse AML opcode arguments
- *              $Revision: 1.95 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/parser/psloop.c acpica-unix-20080321/interpreter/parser/psloop.c
--- acpica-unix-20080321.orig/interpreter/parser/psloop.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/parser/psloop.c	2008-04-13 08:58:38.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: psloop - Main AML parse loop
- *              $Revision: 1.19 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/parser/psopcode.c acpica-unix-20080321/interpreter/parser/psopcode.c
--- acpica-unix-20080321.orig/interpreter/parser/psopcode.c	2008-04-12 12:46:34.000000000 -0400
+++ acpica-unix-20080321/interpreter/parser/psopcode.c	2008-04-13 08:58:38.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: psopcode - Parser/Interpreter opcode information table
- *              $Revision: 1.103 $
+ *              $Revision: 1.6 $
  *
  *****************************************************************************/
 
@@ -541,7 +541,7 @@
  *
  ******************************************************************************/
 
-char *
+const char *
 AcpiPsGetOpcodeName (
     UINT16                  Opcode)
 {
diff -ur acpica-unix-20080321.orig/interpreter/parser/psparse.c acpica-unix-20080321/interpreter/parser/psparse.c
--- acpica-unix-20080321.orig/interpreter/parser/psparse.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/parser/psparse.c	2008-04-13 08:58:38.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: psparse - Parser top level AML parse routines
- *              $Revision: 1.176 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/parser/psscope.c acpica-unix-20080321/interpreter/parser/psscope.c
--- acpica-unix-20080321.orig/interpreter/parser/psscope.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/parser/psscope.c	2008-04-13 08:58:38.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: psscope - Parser scope stack management routines
- *              $Revision: 1.48 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/parser/pstree.c acpica-unix-20080321/interpreter/parser/pstree.c
--- acpica-unix-20080321.orig/interpreter/parser/pstree.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/parser/pstree.c	2008-04-13 08:58:38.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: pstree - Parser op tree manipulation/traversal/search
- *              $Revision: 1.52 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/parser/psutils.c acpica-unix-20080321/interpreter/parser/psutils.c
--- acpica-unix-20080321.orig/interpreter/parser/psutils.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/parser/psutils.c	2008-04-13 08:58:38.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: psutils - Parser miscellaneous utilities (Parser only)
- *              $Revision: 1.71 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/parser/pswalk.c acpica-unix-20080321/interpreter/parser/pswalk.c
--- acpica-unix-20080321.orig/interpreter/parser/pswalk.c	2008-04-12 12:46:34.000000000 -0400
+++ acpica-unix-20080321/interpreter/parser/pswalk.c	2008-04-13 08:58:38.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: pswalk - Parser routines to walk parsed op tree(s)
- *              $Revision: 1.79 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/interpreter/parser/psxface.c acpica-unix-20080321/interpreter/parser/psxface.c
--- acpica-unix-20080321.orig/interpreter/parser/psxface.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/interpreter/parser/psxface.c	2008-04-13 08:58:38.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: psxface - Parser external interfaces
- *              $Revision: 1.94 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/namespace/nsaccess.c acpica-unix-20080321/namespace/nsaccess.c
--- acpica-unix-20080321.orig/namespace/nsaccess.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/namespace/nsaccess.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: nsaccess - Top-level functions for accessing ACPI namespace
- *              $Revision: 1.209 $
+ *              $Revision: 1.4 $
  *
  ******************************************************************************/
 
@@ -218,7 +218,7 @@
 
             if (!Val)
             {
-                Val = InitVal->Val;
+                Val = __UNCONST(InitVal->Val);
             }
 
             /*
@@ -371,7 +371,7 @@
 ACPI_STATUS
 AcpiNsLookup (
     ACPI_GENERIC_STATE      *ScopeInfo,
-    char                    *Pathname,
+    const char              *Pathname,
     ACPI_OBJECT_TYPE        Type,
     ACPI_INTERPRETER_MODE   InterpreterMode,
     UINT32                  Flags,
@@ -379,7 +379,7 @@
     ACPI_NAMESPACE_NODE     **ReturnNode)
 {
     ACPI_STATUS             Status;
-    char                    *Path = Pathname;
+    const char              *Path = Pathname;
     ACPI_NAMESPACE_NODE     *PrefixNode;
     ACPI_NAMESPACE_NODE     *CurrentNode = NULL;
     ACPI_NAMESPACE_NODE     *ThisNode = NULL;
diff -ur acpica-unix-20080321.orig/namespace/nsalloc.c acpica-unix-20080321/namespace/nsalloc.c
--- acpica-unix-20080321.orig/namespace/nsalloc.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/namespace/nsalloc.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: nsalloc - Namespace allocation and deletion utilities
- *              $Revision: 1.109 $
+ *              $Revision: 1.4 $
  *
  ******************************************************************************/
 
diff -ur acpica-unix-20080321.orig/namespace/nsdump.c acpica-unix-20080321/namespace/nsdump.c
--- acpica-unix-20080321.orig/namespace/nsdump.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/namespace/nsdump.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: nsdump - table dumping routines for debug
- *              $Revision: 1.184 $
+ *              $Revision: 1.7 $
  *
  *****************************************************************************/
 
@@ -158,7 +158,7 @@
 void
 AcpiNsPrintPathname (
     UINT32                  NumSegments,
-    char                    *Pathname)
+    const char              *Pathname)
 {
     ACPI_NATIVE_UINT        i;
 
@@ -215,7 +215,7 @@
 void
 AcpiNsDumpPathname (
     ACPI_HANDLE             Handle,
-    char                    *Msg,
+    const char              *Msg,
     UINT32                  Level,
     UINT32                  Component)
 {
diff -ur acpica-unix-20080321.orig/namespace/nsdumpdv.c acpica-unix-20080321/namespace/nsdumpdv.c
--- acpica-unix-20080321.orig/namespace/nsdumpdv.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/namespace/nsdumpdv.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: nsdump - table dumping routines for debug
- *              $Revision: 1.21 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/namespace/nseval.c acpica-unix-20080321/namespace/nseval.c
--- acpica-unix-20080321.orig/namespace/nseval.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/namespace/nseval.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: nseval - Object evaluation, includes control method execution
- *              $Revision: 1.145 $
+ *              $Revision: 1.4 $
  *
  ******************************************************************************/
 
diff -ur acpica-unix-20080321.orig/namespace/nsinit.c acpica-unix-20080321/namespace/nsinit.c
--- acpica-unix-20080321.orig/namespace/nsinit.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/namespace/nsinit.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: nsinit - namespace initialization
- *              $Revision: 1.88 $
+ *              $Revision: 1.6 $
  *
  *****************************************************************************/
 
@@ -484,7 +484,7 @@
 
     /* We are only looking for methods named _INI */
 
-    if (!ACPI_COMPARE_NAME (Node->Name.Ascii, METHOD_NAME__INI))
+    if (ACPI_STRNCMP (Node->Name.Ascii, METHOD_NAME__INI, 4))
     {
         return (AE_OK);
     }
diff -ur acpica-unix-20080321.orig/namespace/nsload.c acpica-unix-20080321/namespace/nsload.c
--- acpica-unix-20080321.orig/namespace/nsload.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/namespace/nsload.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: nsload - namespace loading/expanding/contracting procedures
- *              $Revision: 1.83 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/namespace/nsnames.c acpica-unix-20080321/namespace/nsnames.c
--- acpica-unix-20080321.orig/namespace/nsnames.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/namespace/nsnames.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: nsnames - Name manipulation and search
- *              $Revision: 1.101 $
+ *              $Revision: 1.5 $
  *
  ******************************************************************************/
 
diff -ur acpica-unix-20080321.orig/namespace/nsobject.c acpica-unix-20080321/namespace/nsobject.c
--- acpica-unix-20080321.orig/namespace/nsobject.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/namespace/nsobject.c	2008-04-13 08:58:37.000000000 -0400
@@ -2,7 +2,7 @@
  *
  * Module Name: nsobject - Utilities for objects attached to namespace
  *                         table entries
- *              $Revision: 1.99 $
+ *              $Revision: 1.4 $
  *
  ******************************************************************************/
 
diff -ur acpica-unix-20080321.orig/namespace/nsparse.c acpica-unix-20080321/namespace/nsparse.c
--- acpica-unix-20080321.orig/namespace/nsparse.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/namespace/nsparse.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: nsparse - namespace interface to AML parser
- *              $Revision: 1.19 $
+ *              $Revision: 1.7 $
  *
  *****************************************************************************/
 
@@ -223,7 +223,7 @@
 
     /* Parse the AML */
 
-    ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "*PARSE* pass %d parse\n", PassNumber));
+    ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "*PARSE* pass %d parse\n", (UINT32) PassNumber));
     Status = AcpiPsParseAml (WalkState);
 
 Cleanup:
diff -ur acpica-unix-20080321.orig/namespace/nssearch.c acpica-unix-20080321/namespace/nssearch.c
--- acpica-unix-20080321.orig/namespace/nssearch.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/namespace/nssearch.c	2008-04-13 08:58:37.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: nssearch - Namespace search
- *              $Revision: 1.122 $
+ *              $Revision: 1.6 $
  *
  ******************************************************************************/
 
diff -ur acpica-unix-20080321.orig/namespace/nsutils.c acpica-unix-20080321/namespace/nsutils.c
--- acpica-unix-20080321.orig/namespace/nsutils.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/namespace/nsutils.c	2008-04-13 08:58:38.000000000 -0400
@@ -2,7 +2,7 @@
  *
  * Module Name: nsutils - Utilities for accessing ACPI namespace, accessing
  *                        parents and siblings and Scope manipulation
- *              $Revision: 1.157 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
@@ -154,7 +154,7 @@
 
 void
 AcpiNsReportError (
-    char                    *ModuleName,
+    const char              *ModuleName,
     UINT32                  LineNumber,
     char                    *InternalName,
     ACPI_STATUS             LookupStatus)
@@ -221,11 +221,11 @@
 
 void
 AcpiNsReportMethodError (
-    char                    *ModuleName,
+    const char              *ModuleName,
     UINT32                  LineNumber,
-    char                    *Message,
+    const char              *Message,
     ACPI_NAMESPACE_NODE     *PrefixNode,
-    char                    *Path,
+    const char              *Path,
     ACPI_STATUS             MethodStatus)
 {
     ACPI_STATUS             Status;
@@ -264,7 +264,7 @@
 void
 AcpiNsPrintNodePathname (
     ACPI_NAMESPACE_NODE     *Node,
-    char                    *Message)
+    const char              *Message)
 {
     ACPI_BUFFER             Buffer;
     ACPI_STATUS             Status;
@@ -415,7 +415,7 @@
 AcpiNsGetInternalNameLength (
     ACPI_NAMESTRING_INFO    *Info)
 {
-    char                    *NextExternalChar;
+    const char              *NextExternalChar;
     UINT32                  i;
 
 
@@ -494,7 +494,7 @@
 {
     UINT32                  NumSegments = Info->NumSegments;
     char                    *InternalName = Info->InternalName;
-    char                    *ExternalName = Info->NextExternalChar;
+    const char              *ExternalName = Info->NextExternalChar;
     char                    *Result = NULL;
     ACPI_NATIVE_UINT        i;
 
@@ -628,7 +628,7 @@
 
 ACPI_STATUS
 AcpiNsInternalizeName (
-    char                    *ExternalName,
+    const char              *ExternalName,
     char                    **ConvertedName)
 {
     char                    *InternalName;
@@ -1033,7 +1033,7 @@
 ACPI_STATUS
 AcpiNsGetNode (
     ACPI_NAMESPACE_NODE     *PrefixNode,
-    char                    *Pathname,
+    const char              *Pathname,
     UINT32                  Flags,
     ACPI_NAMESPACE_NODE     **ReturnNode)
 {
diff -ur acpica-unix-20080321.orig/namespace/nswalk.c acpica-unix-20080321/namespace/nswalk.c
--- acpica-unix-20080321.orig/namespace/nswalk.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/namespace/nswalk.c	2008-04-13 08:58:38.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: nswalk - Functions for walking the ACPI namespace
- *              $Revision: 1.47 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/namespace/nsxfeval.c acpica-unix-20080321/namespace/nsxfeval.c
--- acpica-unix-20080321.orig/namespace/nsxfeval.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/namespace/nsxfeval.c	2008-04-13 08:58:38.000000000 -0400
@@ -2,7 +2,7 @@
  *
  * Module Name: nsxfeval - Public interfaces to the ACPI subsystem
  *                         ACPI Object evaluation interfaces
- *              $Revision: 1.33 $
+ *              $Revision: 1.4 $
  *
  ******************************************************************************/
 
@@ -151,7 +151,7 @@
 ACPI_STATUS
 AcpiEvaluateObjectTyped (
     ACPI_HANDLE             Handle,
-    ACPI_STRING             Pathname,
+    ACPI_CONST_STRING       Pathname,
     ACPI_OBJECT_LIST        *ExternalParams,
     ACPI_BUFFER             *ReturnBuffer,
     ACPI_OBJECT_TYPE        ReturnType)
@@ -250,7 +250,7 @@
 ACPI_STATUS
 AcpiEvaluateObject (
     ACPI_HANDLE             Handle,
-    ACPI_STRING             Pathname,
+    ACPI_CONST_STRING       Pathname,
     ACPI_OBJECT_LIST        *ExternalParams,
     ACPI_BUFFER             *ReturnBuffer)
 {
diff -ur acpica-unix-20080321.orig/namespace/nsxfname.c acpica-unix-20080321/namespace/nsxfname.c
--- acpica-unix-20080321.orig/namespace/nsxfname.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/namespace/nsxfname.c	2008-04-13 08:58:38.000000000 -0400
@@ -2,7 +2,7 @@
  *
  * Module Name: nsxfname - Public interfaces to the ACPI subsystem
  *                         ACPI Namespace oriented interfaces
- *              $Revision: 1.113 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
@@ -146,7 +146,7 @@
 ACPI_STATUS
 AcpiGetHandle (
     ACPI_HANDLE             Parent,
-    ACPI_STRING             Pathname,
+    ACPI_CONST_STRING       Pathname,
     ACPI_HANDLE             *RetHandle)
 {
     ACPI_STATUS             Status;
diff -ur acpica-unix-20080321.orig/namespace/nsxfobj.c acpica-unix-20080321/namespace/nsxfobj.c
--- acpica-unix-20080321.orig/namespace/nsxfobj.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/namespace/nsxfobj.c	2008-04-13 08:58:38.000000000 -0400
@@ -2,7 +2,7 @@
  *
  * Module Name: nsxfobj - Public interfaces to the ACPI subsystem
  *                         ACPI Object oriented interfaces
- *              $Revision: 1.123 $
+ *              $Revision: 1.4 $
  *
  ******************************************************************************/
 
diff -ur acpica-unix-20080321.orig/resources/rsaddr.c acpica-unix-20080321/resources/rsaddr.c
--- acpica-unix-20080321.orig/resources/rsaddr.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/resources/rsaddr.c	2008-04-13 08:58:38.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: rsaddr - Address resource descriptors (16/32/64)
- *              $Revision: 1.51 $
+ *              $Revision: 1.4 $
  *
  ******************************************************************************/
 
diff -ur acpica-unix-20080321.orig/resources/rscalc.c acpica-unix-20080321/resources/rscalc.c
--- acpica-unix-20080321.orig/resources/rscalc.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/resources/rscalc.c	2008-04-13 08:58:38.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: rscalc - Calculate stream and list lengths
- *              $Revision: 1.84 $
+ *              $Revision: 1.4 $
  *
  ******************************************************************************/
 
diff -ur acpica-unix-20080321.orig/resources/rscreate.c acpica-unix-20080321/resources/rscreate.c
--- acpica-unix-20080321.orig/resources/rscreate.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/resources/rscreate.c	2008-04-13 08:58:38.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: rscreate - Create resource lists/tables
- *              $Revision: 1.79 $
+ *              $Revision: 1.4 $
  *
  ******************************************************************************/
 
diff -ur acpica-unix-20080321.orig/resources/rsdump.c acpica-unix-20080321/resources/rsdump.c
--- acpica-unix-20080321.orig/resources/rsdump.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/resources/rsdump.c	2008-04-13 08:58:38.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: rsdump - Functions to display the resource structures.
- *              $Revision: 1.64 $
+ *              $Revision: 1.5 $
  *
  ******************************************************************************/
 
@@ -130,32 +130,32 @@
 
 static void
 AcpiRsOutString (
-    char                    *Title,
-    char                    *Value);
+    const char              *Title,
+    const char              *Value);
 
 static void
 AcpiRsOutInteger8 (
-    char                    *Title,
+    const char              *Title,
     UINT8                   Value);
 
 static void
 AcpiRsOutInteger16 (
-    char                    *Title,
+    const char              *Title,
     UINT16                  Value);
 
 static void
 AcpiRsOutInteger32 (
-    char                    *Title,
+    const char              *Title,
     UINT32                  Value);
 
 static void
 AcpiRsOutInteger64 (
-    char                    *Title,
+    const char              *Title,
     UINT64                  Value);
 
 static void
 AcpiRsOutTitle (
-    char                    *Title);
+    const char              *Title);
 
 static void
 AcpiRsDumpByteList (
@@ -376,7 +376,7 @@
 
 static ACPI_RSDUMP_INFO AcpiRsDumpMemoryFlags[5] =
 {
-    {ACPI_RSD_LITERAL,  ACPI_RSD_TABLE_SIZE (AcpiRsDumpMemoryFlags),        "Resource Type",            (void *) "Memory Range"},
+    {ACPI_RSD_LITERAL,  ACPI_RSD_TABLE_SIZE (AcpiRsDumpMemoryFlags),        "Resource Type",            (const char * const *)"Memory Range"},
     {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Address.Info.Mem.WriteProtect),    "Write Protect",            AcpiGbl_RwDecode},
     {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Address.Info.Mem.Caching),         "Caching",                  AcpiGbl_MemDecode},
     {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Address.Info.Mem.RangeType),       "Range Type",               AcpiGbl_MtpDecode},
@@ -385,7 +385,7 @@
 
 static ACPI_RSDUMP_INFO AcpiRsDumpIoFlags[4] =
 {
-    {ACPI_RSD_LITERAL,  ACPI_RSD_TABLE_SIZE (AcpiRsDumpIoFlags),            "Resource Type",            (void *) "I/O Range"},
+    {ACPI_RSD_LITERAL,  ACPI_RSD_TABLE_SIZE (AcpiRsDumpIoFlags),            "Resource Type",            (const char * const *)"I/O Range"},
     {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Address.Info.Io.RangeType),        "Range Type",               AcpiGbl_RngDecode},
     {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Address.Info.Io.Translation),      "Translation",              AcpiGbl_TtpDecode},
     {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Address.Info.Io.TranslationType),  "Translation Type",         AcpiGbl_TrsDecode}
@@ -424,7 +424,7 @@
 {
     UINT8                   *Target = NULL;
     UINT8                   *PreviousTarget;
-    char                    *Name;
+    const char              *Name;
     UINT8                    Count;
 
 
@@ -453,11 +453,11 @@
         /* Strings */
 
         case ACPI_RSD_LITERAL:
-            AcpiRsOutString (Name, ACPI_CAST_PTR (char, Table->Pointer));
+            AcpiRsOutString (Name, ACPI_CAST_CONST_PTR (char, Table->Pointer));
             break;
 
         case ACPI_RSD_STRING:
-            AcpiRsOutString (Name, ACPI_CAST_PTR (char, Target));
+            AcpiRsOutString (Name, ACPI_CAST_CONST_PTR (char, Target));
             break;
 
         /* Data items, 8/16/32/64 bit */
@@ -481,12 +481,12 @@
         /* Flags: 1-bit and 2-bit flags supported */
 
         case ACPI_RSD_1BITFLAG:
-            AcpiRsOutString (Name, ACPI_CAST_PTR (char,
+            AcpiRsOutString (Name, ACPI_CAST_CONST_PTR (char,
                 Table->Pointer [*Target & 0x01]));
             break;
 
         case ACPI_RSD_2BITFLAG:
-            AcpiRsOutString (Name, ACPI_CAST_PTR (char,
+            AcpiRsOutString (Name, ACPI_CAST_CONST_PTR (char,
                 Table->Pointer [*Target & 0x03]));
             break;
 
@@ -758,8 +758,8 @@
 
 static void
 AcpiRsOutString (
-    char                    *Title,
-    char                    *Value)
+    const char              *Title,
+    const char              *Value)
 {
     AcpiOsPrintf ("%27s : %s", Title, Value);
     if (!*Value)
@@ -771,7 +771,7 @@
 
 static void
 AcpiRsOutInteger8 (
-    char                    *Title,
+    const char              *Title,
     UINT8                   Value)
 {
     AcpiOsPrintf ("%27s : %2.2X\n", Title, Value);
@@ -779,7 +779,7 @@
 
 static void
 AcpiRsOutInteger16 (
-    char                    *Title,
+    const char              *Title,
     UINT16                  Value)
 {
     AcpiOsPrintf ("%27s : %4.4X\n", Title, Value);
@@ -787,7 +787,7 @@
 
 static void
 AcpiRsOutInteger32 (
-    char                    *Title,
+    const char              *Title,
     UINT32                  Value)
 {
     AcpiOsPrintf ("%27s : %8.8X\n", Title, Value);
@@ -795,7 +795,7 @@
 
 static void
 AcpiRsOutInteger64 (
-    char                    *Title,
+    const char              *Title,
     UINT64                  Value)
 {
     AcpiOsPrintf ("%27s : %8.8X%8.8X\n", Title,
@@ -804,7 +804,7 @@
 
 static void
 AcpiRsOutTitle (
-    char                    *Title)
+    const char              *Title)
 {
     AcpiOsPrintf ("%27s : ", Title);
 }
diff -ur acpica-unix-20080321.orig/resources/rsinfo.c acpica-unix-20080321/resources/rsinfo.c
--- acpica-unix-20080321.orig/resources/rsinfo.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/resources/rsinfo.c	2008-04-13 08:58:38.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: rsinfo - Dispatch and Info tables
- *              $Revision: 1.9 $
+ *              $Revision: 1.4 $
  *
  ******************************************************************************/
 
diff -ur acpica-unix-20080321.orig/resources/rsio.c acpica-unix-20080321/resources/rsio.c
--- acpica-unix-20080321.orig/resources/rsio.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/resources/rsio.c	2008-04-13 08:58:38.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: rsio - IO and DMA resource descriptors
- *              $Revision: 1.38 $
+ *              $Revision: 1.4 $
  *
  ******************************************************************************/
 
diff -ur acpica-unix-20080321.orig/resources/rsirq.c acpica-unix-20080321/resources/rsirq.c
--- acpica-unix-20080321.orig/resources/rsirq.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/resources/rsirq.c	2008-04-13 08:58:38.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: rsirq - IRQ resource descriptors
- *              $Revision: 1.52 $
+ *              $Revision: 1.4 $
  *
  ******************************************************************************/
 
diff -ur acpica-unix-20080321.orig/resources/rslist.c acpica-unix-20080321/resources/rslist.c
--- acpica-unix-20080321.orig/resources/rslist.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/resources/rslist.c	2008-04-13 08:58:38.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: rslist - Linked list utilities
- *              $Revision: 1.63 $
+ *              $Revision: 1.4 $
  *
  ******************************************************************************/
 
diff -ur acpica-unix-20080321.orig/resources/rsmemory.c acpica-unix-20080321/resources/rsmemory.c
--- acpica-unix-20080321.orig/resources/rsmemory.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/resources/rsmemory.c	2008-04-13 08:58:38.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: rsmem24 - Memory resource descriptors
- *              $Revision: 1.35 $
+ *              $Revision: 1.4 $
  *
  ******************************************************************************/
 
diff -ur acpica-unix-20080321.orig/resources/rsmisc.c acpica-unix-20080321/resources/rsmisc.c
--- acpica-unix-20080321.orig/resources/rsmisc.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/resources/rsmisc.c	2008-04-13 08:58:38.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: rsmisc - Miscellaneous resource descriptors
- *              $Revision: 1.48 $
+ *              $Revision: 1.4 $
  *
  ******************************************************************************/
 
diff -ur acpica-unix-20080321.orig/resources/rsutils.c acpica-unix-20080321/resources/rsutils.c
--- acpica-unix-20080321.orig/resources/rsutils.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/resources/rsutils.c	2008-04-13 08:58:38.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: rsutils - Utilities for the resource manager
- *              $Revision: 1.69 $
+ *              $Revision: 1.5 $
  *
  ******************************************************************************/
 
@@ -745,7 +745,7 @@
 ACPI_STATUS
 AcpiRsGetMethodData (
     ACPI_HANDLE             Handle,
-    char                    *Path,
+    const char              *Path,
     ACPI_BUFFER             *RetBuffer)
 {
     ACPI_OPERAND_OBJECT     *ObjDesc;
diff -ur acpica-unix-20080321.orig/resources/rsxface.c acpica-unix-20080321/resources/rsxface.c
--- acpica-unix-20080321.orig/resources/rsxface.c	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/resources/rsxface.c	2008-04-13 08:58:38.000000000 -0400
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: rsxface - Public interfaces to the resource manager
- *              $Revision: 1.49 $
+ *              $Revision: 1.4 $
  *
  ******************************************************************************/
 
@@ -632,7 +632,7 @@
 ACPI_STATUS
 AcpiWalkResources (
     ACPI_HANDLE                 DeviceHandle,
-    char                        *Name,
+    const char                  *Name,
     ACPI_WALK_RESOURCE_CALLBACK UserFunction,
     void                        *Context)
 {
@@ -648,8 +648,8 @@
     /* Parameter validation */
 
     if (!DeviceHandle || !UserFunction || !Name ||
-        (!ACPI_COMPARE_NAME (Name, METHOD_NAME__CRS) &&
-         !ACPI_COMPARE_NAME (Name, METHOD_NAME__PRS)))
+        (ACPI_STRNCMP (Name, METHOD_NAME__CRS, 4) &&
+         ACPI_STRNCMP (Name, METHOD_NAME__PRS, 4)))
     {
         return_ACPI_STATUS (AE_BAD_PARAMETER);
     }
diff -ur acpica-unix-20080321.orig/tables/tbfadt.c acpica-unix-20080321/tables/tbfadt.c
--- acpica-unix-20080321.orig/tables/tbfadt.c	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/tables/tbfadt.c	2008-04-13 08:58:38.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: tbfadt   - FADT table utilities
- *              $Revision: 1.8 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
@@ -124,7 +124,7 @@
 
 /* Local prototypes */
 
-static void inline
+static inline void
 AcpiTbInitGenericAddress (
     ACPI_GENERIC_ADDRESS    *GenericAddress,
     UINT8                   BitWidth,
@@ -143,7 +143,7 @@
 
 typedef struct acpi_fadt_info
 {
-    char                    *Name;
+    const char              *Name;
     UINT8                   Target;
     UINT8                   Source;
     UINT8                   Length;
@@ -208,7 +208,7 @@
  *
  ******************************************************************************/
 
-static void inline
+static inline void
 AcpiTbInitGenericAddress (
     ACPI_GENERIC_ADDRESS    *GenericAddress,
     UINT8                   BitWidth,
@@ -324,7 +324,7 @@
     {
         ACPI_WARNING ((AE_INFO,
             "FADT (revision %u) is longer than ACPI 2.0 version, truncating length 0x%X to 0x%X",
-            Table->Revision, Length, sizeof (ACPI_TABLE_FADT)));
+            Table->Revision, Length, (UINT32)sizeof (ACPI_TABLE_FADT)));
     }
 
     /* Clear the entire local FADT */
diff -ur acpica-unix-20080321.orig/tables/tbfind.c acpica-unix-20080321/tables/tbfind.c
--- acpica-unix-20080321.orig/tables/tbfind.c	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/tables/tbfind.c	2008-04-13 08:58:38.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: tbfind   - find table
- *              $Revision: 1.5 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/tables/tbinstal.c acpica-unix-20080321/tables/tbinstal.c
--- acpica-unix-20080321.orig/tables/tbinstal.c	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/tables/tbinstal.c	2008-04-13 08:58:38.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: tbinstal - ACPI table installation and removal
- *              $Revision: 1.94 $
+ *              $Revision: 1.5 $
  *
  *****************************************************************************/
 
@@ -166,7 +166,7 @@
 
     /* FACS is the odd table, has no standard ACPI header and no checksum */
 
-    if (!ACPI_COMPARE_NAME (&TableDesc->Signature, ACPI_SIG_FACS))
+    if (ACPI_STRNCMP ((const char *)&TableDesc->Signature, ACPI_SIG_FACS, 4))
     {
         /* Always calculate checksum, ignore bad checksum if requested */
 
@@ -214,8 +214,8 @@
 
     /* The table must be either an SSDT or a PSDT */
 
-    if ((!ACPI_COMPARE_NAME (TableDesc->Pointer->Signature, ACPI_SIG_PSDT)) &&
-        (!ACPI_COMPARE_NAME (TableDesc->Pointer->Signature, ACPI_SIG_SSDT)))
+    if ((ACPI_STRNCMP (TableDesc->Pointer->Signature, ACPI_SIG_PSDT, 4)) && 
+        (ACPI_STRNCMP (TableDesc->Pointer->Signature, ACPI_SIG_SSDT, 4)))
     {
         /* Check for a printable name */
 
diff -ur acpica-unix-20080321.orig/tables/tbutils.c acpica-unix-20080321/tables/tbutils.c
--- acpica-unix-20080321.orig/tables/tbutils.c	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/tables/tbutils.c	2008-04-13 08:58:38.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: tbutils   - table utilities
- *              $Revision: 1.91 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
@@ -176,14 +176,14 @@
     ACPI_TABLE_HEADER       *Header)
 {
 
-    if (ACPI_COMPARE_NAME (Header->Signature, ACPI_SIG_FACS))
+    if (!ACPI_STRNCMP (Header->Signature, ACPI_SIG_FACS, 4))
     {
         /* FACS only has signature and length fields of common table header */
 
         ACPI_INFO ((AE_INFO, "%4.4s @ 0x%p/0x%04X",
             Header->Signature, ACPI_CAST_PTR (UINT64, Address), Header->Length));
     }
-    else if (ACPI_COMPARE_NAME (Header->Signature, ACPI_SIG_RSDP))
+    else if (!ACPI_STRNCMP (Header->Signature, ACPI_SIG_RSDP, 4))
     {
         /* RSDP has no common fields */
 
@@ -302,7 +302,7 @@
 AcpiTbInstallTable (
     ACPI_PHYSICAL_ADDRESS   Address,
     UINT8                   Flags,
-    char                    *Signature,
+    const char              *Signature,
     ACPI_NATIVE_UINT        TableIndex)
 {
     ACPI_TABLE_HEADER       *Table;
@@ -325,8 +325,7 @@
 
     /* If a particular signature is expected, signature must match */
 
-    if (Signature &&
-        !ACPI_COMPARE_NAME (Table->Signature, Signature))
+    if (Signature && ACPI_STRNCMP (Table->Signature, Signature, 4))
     {
         ACPI_ERROR ((AE_INFO, "Invalid signature 0x%X for ACPI table [%s]",
             *ACPI_CAST_PTR (UINT32, Table->Signature), Signature));
@@ -583,8 +582,9 @@
 
         /* Special case for FADT - get the DSDT and FACS */
 
-        if (ACPI_COMPARE_NAME (
-                &AcpiGbl_RootTableList.Tables[i].Signature, ACPI_SIG_FADT))
+        if (!ACPI_STRNCMP(
+                (const char *)&AcpiGbl_RootTableList.Tables[i].Signature,
+                ACPI_SIG_FADT, 4))
         {
             AcpiTbParseFadt (i, Flags);
         }
diff -ur acpica-unix-20080321.orig/tables/tbxface.c acpica-unix-20080321/tables/tbxface.c
--- acpica-unix-20080321.orig/tables/tbxface.c	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/tables/tbxface.c	2008-04-13 08:58:38.000000000 -0400
@@ -2,7 +2,7 @@
  *
  * Module Name: tbxface - Public interfaces to the ACPI subsystem
  *                         ACPI table oriented interfaces
- *              $Revision: 1.88 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
@@ -322,7 +322,7 @@
 
 ACPI_STATUS
 AcpiGetTableHeader (
-    char                    *Signature,
+    const char              *Signature,
     ACPI_NATIVE_UINT        Instance,
     ACPI_TABLE_HEADER       *OutTableHeader)
 {
@@ -343,8 +343,9 @@
      */
     for (i = 0, j = 0; i < AcpiGbl_RootTableList.Count; i++)
     {
-        if (!ACPI_COMPARE_NAME (&(AcpiGbl_RootTableList.Tables[i].Signature),
-                    Signature))
+        if (ACPI_STRNCMP(
+                    (const char *)&(AcpiGbl_RootTableList.Tables[i].Signature),
+                    Signature, 4))
         {
             continue;
         }
@@ -407,7 +408,7 @@
 
 ACPI_STATUS
 AcpiGetTable (
-    char                    *Signature,
+    const char              *Signature,
     ACPI_NATIVE_UINT        Instance,
     ACPI_TABLE_HEADER       **OutTable)
 {
@@ -428,8 +429,9 @@
      */
     for (i = 0, j = 0; i < AcpiGbl_RootTableList.Count; i++)
     {
-        if (!ACPI_COMPARE_NAME (&(AcpiGbl_RootTableList.Tables[i].Signature),
-                Signature))
+        if (ACPI_STRNCMP(
+                    (const char *)&(AcpiGbl_RootTableList.Tables[i].Signature),
+                    Signature, 4))
         {
             continue;
         }
@@ -547,8 +549,8 @@
      * are optional.
      */
     if (!AcpiGbl_RootTableList.Count ||
-        !ACPI_COMPARE_NAME (&(AcpiGbl_RootTableList.Tables[ACPI_TABLE_INDEX_DSDT].Signature),
-                ACPI_SIG_DSDT) ||
+        ACPI_STRNCMP ((const char *)&(AcpiGbl_RootTableList.Tables[ACPI_TABLE_INDEX_DSDT].Signature),
+                ACPI_SIG_DSDT, 4) ||
         ACPI_FAILURE (AcpiTbVerifyTable(&AcpiGbl_RootTableList.Tables[ACPI_TABLE_INDEX_DSDT])))
     {
         Status = AE_NO_ACPI_TABLES;
@@ -600,10 +602,10 @@
     (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
     for (i = 0; i < AcpiGbl_RootTableList.Count; ++i)
     {
-        if ((!ACPI_COMPARE_NAME (&(AcpiGbl_RootTableList.Tables[i].Signature),
-                    ACPI_SIG_SSDT) &&
-             !ACPI_COMPARE_NAME (&(AcpiGbl_RootTableList.Tables[i].Signature),
-                    ACPI_SIG_PSDT)) ||
+        if ((ACPI_STRNCMP ((const char *)&(AcpiGbl_RootTableList.Tables[i].Signature),
+                     ACPI_SIG_SSDT, 4) &&
+             ACPI_STRNCMP ((const char *)&(AcpiGbl_RootTableList.Tables[i].Signature),
+                     ACPI_SIG_PSDT, 4)) ||
              ACPI_FAILURE (AcpiTbVerifyTable (&AcpiGbl_RootTableList.Tables[i])))
         {
             continue;
diff -ur acpica-unix-20080321.orig/tables/tbxfroot.c acpica-unix-20080321/tables/tbxfroot.c
--- acpica-unix-20080321.orig/tables/tbxfroot.c	2008-04-12 12:46:32.000000000 -0400
+++ acpica-unix-20080321/tables/tbxfroot.c	2008-04-13 08:58:38.000000000 -0400
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: tbxfroot - Find the root ACPI table (RSDT)
- *              $Revision: 1.106 $
+ *              $Revision: 1.4 $
  *
  *****************************************************************************/
 
diff -ur acpica-unix-20080321.orig/tools/acpiexec/aecommon.h acpica-unix-20080321/tools/acpiexec/aecommon.h
--- acpica-unix-20080321.orig/tools/acpiexec/aecommon.h	2008-04-12 12:46:33.000000000 -0400
+++ acpica-unix-20080321/tools/acpiexec/aecommon.h	2008-04-13 08:58:36.000000000 -0400
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2008, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2007, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -125,14 +125,14 @@
 #incl