Index: aecommon.h
===================================================================
RCS file: /home/ncvs/src/sys/contrib/dev/acpica/aecommon.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -I\$Revision: -u -r1.1.1.1 -r1.2
--- aecommon.h	1 Nov 2005 22:11:08 -0000	1.1.1.1
+++ aecommon.h	1 Nov 2005 22:33:32 -0000	1.2
@@ -183,7 +183,7 @@
 #define OSD_PRINT(lvl,fp)               TEST_OUTPUT_LEVEL(lvl) {\
                                             AcpiOsPrintf PARAM_LIST(fp);}
 
-void __cdecl
+void
 AeCtrlCHandler (
     int                     Sig);
 
Index: aeexec.c
===================================================================
RCS file: /home/ncvs/src/sys/contrib/dev/acpica/aeexec.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -I\$Revision: -u -r1.1.1.1 -r1.2
--- aeexec.c	1 Nov 2005 22:11:08 -0000	1.1.1.1
+++ aeexec.c	1 Nov 2005 22:33:32 -0000	1.2
@@ -195,7 +195,7 @@
  *
  *****************************************************************************/
 
-void __cdecl
+void
 AeCtrlCHandler (
     int                     Sig)
 {
Index: dbcmds.c
===================================================================
RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dbcmds.c,v
retrieving revision 1.1.1.25
retrieving revision 1.18
diff -I\$Revision: -u -r1.1.1.25 -r1.18
--- dbcmds.c	1 Nov 2005 22:10:48 -0000	1.1.1.25
+++ dbcmds.c	3 Nov 2005 20:27:38 -0000	1.18
@@ -619,7 +619,9 @@
         NumStatements = ACPI_STRTOUL (Statements, NULL, 0);
     }
 
+#ifdef ACPI_DISASSEMBLER
     AcpiDmDisassemble (NULL, Op, NumStatements);
+#endif
 }
 
 
@@ -683,7 +685,9 @@
     WalkState->ParseFlags |= ACPI_PARSE_DISASSEMBLE;
     Status = AcpiPsParseAml (WalkState);
 
+#ifdef ACPI_DISASSEMBLER
     AcpiDmDisassemble (NULL, Op, 0);
+#endif
     AcpiPsDeleteParseTree (Op);
     return (AE_OK);
 }
@@ -1734,7 +1738,7 @@
 
     /* Exit if there is no _PRT under this device */
 
-    Status = AcpiGetHandle (Node, METHOD_NAME__PRT, &TempNode);
+    Status = AcpiGetHandle (Node, METHOD_NAME__PRT, (ACPI_HANDLE *) (uintptr_t) &TempNode);
     if (ACPI_FAILURE (Status))
     {
         return (AE_OK);
Index: dbxface.c
===================================================================
RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dbxface.c,v
retrieving revision 1.1.1.19
retrieving revision 1.9
diff -I\$Revision: -u -r1.1.1.19 -r1.9
--- dbxface.c	1 Nov 2005 22:10:49 -0000	1.1.1.19
+++ dbxface.c	1 Nov 2005 22:28:49 -0000	1.9
@@ -373,7 +373,9 @@
 
         /* Now we can display it */
 
+#ifdef ACPI_DISASSEMBLER
         AcpiDmDisassemble (WalkState, DisplayOp, ACPI_UINT32_MAX);
+#endif
 
         if ((Op->Common.AmlOpcode == AML_IF_OP) ||
             (Op->Common.AmlOpcode == AML_WHILE_OP))
@@ -485,9 +487,11 @@
     AcpiGbl_DbOutputFlags       = ACPI_DB_CONSOLE_OUTPUT;
 
     AcpiGbl_DbOpt_tables        = FALSE;
-    AcpiGbl_DbOpt_disasm        = FALSE;
     AcpiGbl_DbOpt_stats         = FALSE;
+#ifdef ACPI_DISASSEMBLER
+    AcpiGbl_DbOpt_disasm        = FALSE;
     AcpiGbl_DbOpt_verbose       = TRUE;
+#endif
     AcpiGbl_DbOpt_ini_methods   = TRUE;
 
     AcpiGbl_DbBuffer = AcpiOsAllocate (ACPI_DEBUG_BUFFER_SIZE);
@@ -536,11 +540,13 @@
         }
     }
 
+#ifdef ACPI_DISASSEMBLER
     if (!AcpiGbl_DbOpt_verbose)
     {
         AcpiGbl_DbOpt_disasm = TRUE;
         AcpiGbl_DbOpt_stats = FALSE;
     }
+#endif
 
     return (AE_OK);
 }
Index: dmopcode.c
===================================================================
RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dmopcode.c,v
retrieving revision 1.1.1.8
retrieving revision 1.4
diff -I\$Revision: -u -r1.1.1.8 -r1.4
--- dmopcode.c	1 Nov 2005 22:10:50 -0000	1.1.1.8
+++ dmopcode.c	1 Nov 2005 22:28:49 -0000	1.4
@@ -346,7 +346,7 @@
     }
     else
     {
-        AcpiOsPrintf ("%s", (char *)
+        AcpiOsPrintf ("%s", (char *) (uintptr_t)
             AcpiGbl_MatchOps[(ACPI_SIZE) Op->Common.Value.Integer]);
     }
 }
Index: hwregs.c
===================================================================
RCS file: /home/ncvs/src/sys/contrib/dev/acpica/hwregs.c,v
retrieving revision 1.1.1.25
retrieving revision 1.6
diff -I\$Revision: -u -r1.1.1.25 -r1.6
--- hwregs.c	1 Nov 2005 22:10:53 -0000	1.1.1.25
+++ hwregs.c	1 Nov 2005 22:28:49 -0000	1.6
@@ -236,7 +236,7 @@
 
     Info.Parameters = NULL;
     Info.ReturnObject = NULL;
-    SleepStateName = (char *) AcpiGbl_SleepStateNames[SleepState];
+    SleepStateName = (char *) (uintptr_t) AcpiGbl_SleepStateNames[SleepState];
 
     Status = AcpiNsEvaluateByName (SleepStateName, &Info);
     if (ACPI_FAILURE (Status))
Index: hwsleep.c
===================================================================
RCS file: /home/ncvs/src/sys/contrib/dev/acpica/hwsleep.c,v
retrieving revision 1.1.1.25
retrieving revision 1.20
diff -I\$Revision: -u -r1.1.1.25 -r1.20
--- hwsleep.c	1 Nov 2005 22:10:53 -0000	1.1.1.25
+++ hwsleep.c	1 Nov 2005 22:28:49 -0000	1.20
@@ -320,6 +320,7 @@
     ACPI_BIT_REGISTER_INFO  *SleepTypeRegInfo;
     ACPI_BIT_REGISTER_INFO  *SleepEnableRegInfo;
     UINT32                  InValue;
+    UINT32                  Retry;
     ACPI_STATUS             Status;
 
 
@@ -474,6 +475,7 @@
 
     /* Wait until we enter sleep state */
 
+    Retry = 1000;
     do
     {
         Status = AcpiGetRegister (ACPI_BITREG_WAKE_STATUS, &InValue,
@@ -483,6 +485,15 @@
             return_ACPI_STATUS (Status);
         }
 
+        /*
+         * Some BIOSs don't set WAK_STS at all.  Give up waiting after
+         * 1000 retries if it still isn't set.
+         */
+        if (Retry-- == 0)
+        {
+            break;
+        }
+
         /* Spin until we wake */
 
     } while (!InValue);
Index: osunixxf.c
===================================================================
RCS file: /home/ncvs/src/sys/contrib/dev/acpica/osunixxf.c,v
retrieving revision 1.1.1.12
retrieving revision 1.2
diff -I\$Revision: -u -r1.1.1.12 -r1.2
--- osunixxf.c	1 Nov 2005 22:18:47 -0000	1.1.1.12
+++ osunixxf.c	1 Nov 2005 22:30:52 -0000	1.2
@@ -187,7 +187,7 @@
     ACPI_POINTER           *Address)
 {
 
-    return (AeLocalGetRootPointer(Flags, Address));
+    return (AeLocalGetRootPointer(Flags, (ACPI_PHYSICAL_ADDRESS *) Address));
 }
 
 
Index: rsdump.c
===================================================================
RCS file: /home/ncvs/src/sys/contrib/dev/acpica/rsdump.c,v
retrieving revision 1.1.1.19
retrieving revision 1.2
diff -I\$Revision: -u -r1.1.1.19 -r1.2
--- rsdump.c	1 Nov 2005 22:11:06 -0000	1.1.1.19
+++ rsdump.c	1 Nov 2005 22:30:52 -0000	1.2
@@ -452,11 +452,11 @@
         /* Strings */
 
         case ACPI_RSD_LITERAL:
-            AcpiRsOutString (Name, (char *) Table->Pointer);
+            AcpiRsOutString (Name, (char *) (uintptr_t) Table->Pointer);
             break;
 
         case ACPI_RSD_STRING:
-            AcpiRsOutString (Name, (char *) Target);
+            AcpiRsOutString (Name, (char *) (uintptr_t) Target);
             break;
 
         /* Data items, 8/16/32/64 bit */
@@ -480,13 +480,13 @@
         /* Flags: 1-bit and 2-bit flags supported */
 
         case ACPI_RSD_1BITFLAG:
-            AcpiRsOutString (Name, (char *)
-                ((const char **) Table->Pointer)[(*(UINT8 *) Target) & 0x01]);
+            AcpiRsOutString (Name, (char *) (uintptr_t)
+                ((const char **) (uintptr_t) Table->Pointer)[(*(UINT8 *) Target) & 0x01]);
             break;
 
         case ACPI_RSD_2BITFLAG:
-            AcpiRsOutString (Name, (char *)
-                ((const char **) Table->Pointer)[(*(UINT8 *) Target) & 0x03]);
+            AcpiRsOutString (Name, (char *) (uintptr_t)
+                ((const char **) (uintptr_t) Table->Pointer)[(*(UINT8 *) Target) & 0x03]);
             break;
 
         case ACPI_RSD_SHORTLIST:
Index: utdebug.c
===================================================================
RCS file: /home/ncvs/src/sys/contrib/dev/acpica/utdebug.c,v
retrieving revision 1.1.1.23
retrieving revision 1.2
diff -I\$Revision: -u -r1.1.1.23 -r1.2
--- utdebug.c	1 Nov 2005 22:11:09 -0000	1.1.1.23
+++ utdebug.c	1 Nov 2005 22:30:52 -0000	1.2
@@ -212,14 +212,14 @@
 
     /* All Function names are longer than 4 chars, check is safe */
 
-    if (*(ACPI_CAST_PTR (UINT32, FunctionName)) == ACPI_PREFIX_MIXED)
+    if (*((UINT32 *) (uintptr_t) FunctionName) == ACPI_PREFIX_MIXED)
     {
         /* This is the case where the original source has not been modified */
 
         return (FunctionName + 4);
     }
 
-    if (*(ACPI_CAST_PTR (UINT32, FunctionName)) == ACPI_PREFIX_LOWER)
+    if (*((UINT32 *) (uintptr_t) FunctionName) == ACPI_PREFIX_LOWER)
     {
         /* This is the case where the source has been 'linuxized' */
 
Index: uteval.c
===================================================================
RCS file: /home/ncvs/src/sys/contrib/dev/acpica/uteval.c,v
retrieving revision 1.1.1.22
retrieving revision 1.6
diff -I\$Revision: -u -r1.1.1.22 -r1.6
--- uteval.c	1 Nov 2005 22:11:10 -0000	1.1.1.22
+++ uteval.c	1 Nov 2005 22:28:49 -0000	1.6
@@ -184,7 +184,7 @@
     for (i = 0; i < ACPI_NUM_OSI_STRINGS; i++)
     {
         if (!ACPI_STRCMP (StringDesc->String.Pointer,
-                            (char *) AcpiGbl_ValidOsiStrings[i]))
+                            (char *) (uintptr_t) AcpiGbl_ValidOsiStrings[i]))
         {
             /* This string is supported */
 
@@ -788,7 +788,7 @@
     {
         Highest[i] = 0xFF;
         Status = AcpiUtEvaluateObject (DeviceNode,
-                    (char *) AcpiGbl_HighestDstateNames[i],
+                    (char *) (uintptr_t) AcpiGbl_HighestDstateNames[i],
                     ACPI_BTYPE_INTEGER, &ObjDesc);
         if (ACPI_FAILURE (Status))
         {
@@ -796,7 +796,7 @@
             {
                 ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
                     "%s on Device %4.4s, %s\n",
-                    (char *) AcpiGbl_HighestDstateNames[i],
+                    (char *) (uintptr_t) AcpiGbl_HighestDstateNames[i],
                     AcpiUtGetNodeName (DeviceNode),
                     AcpiFormatException (Status)));
 
Index: utglobal.c
===================================================================
RCS file: /home/ncvs/src/sys/contrib/dev/acpica/utglobal.c,v
retrieving revision 1.1.1.29
retrieving revision 1.19
diff -I\$Revision: -u -r1.1.1.29 -r1.19
--- utglobal.c	1 Nov 2005 22:11:10 -0000	1.1.1.29
+++ utglobal.c	1 Nov 2005 22:28:49 -0000	1.19
@@ -520,7 +520,7 @@
         return ("InvalidSpaceId");
     }
 
-    return ((char *) AcpiGbl_RegionTypes[SpaceId]);
+    return ((char *) (uintptr_t) AcpiGbl_RegionTypes[SpaceId]);
 }
 
 
@@ -560,7 +560,7 @@
         return ("InvalidEventID");
     }
 
-    return ((char *) AcpiGbl_EventTypes[EventId]);
+    return ((char *) (uintptr_t) AcpiGbl_EventTypes[EventId]);
 }
 
 
@@ -633,10 +633,10 @@
 
     if (Type > ACPI_TYPE_INVALID)
     {
-        return ((char *) AcpiGbl_BadType);
+        return ((char *) (uintptr_t) AcpiGbl_BadType);
     }
 
-    return ((char *) AcpiGbl_NsTypeNames[Type]);
+    return ((char *) (uintptr_t) AcpiGbl_NsTypeNames[Type]);
 }
 
 
@@ -757,10 +757,10 @@
 
     if (ACPI_GET_DESCRIPTOR_TYPE (Object) > ACPI_DESC_TYPE_MAX)
     {
-        return ((char *) AcpiGbl_BadType);
+        return ((char *) (uintptr_t) AcpiGbl_BadType);
     }
 
-    return ((char *) AcpiGbl_DescTypeNames[ACPI_GET_DESCRIPTOR_TYPE (Object)]);
+    return ((char *) (uintptr_t) AcpiGbl_DescTypeNames[ACPI_GET_DESCRIPTOR_TYPE (Object)]);
 
 }