Al Stone 938de5
Index: src/source/compiler/aslcompile.c
Al Stone 938de5
===================================================================
Al Stone 938de5
--- src.orig/source/compiler/aslcompile.c
Al Stone 938de5
+++ src/source/compiler/aslcompile.c
Al Stone 702e10
@@ -692,7 +692,7 @@ CmCleanupAndExit (
Al Stone d20c51
 
Al Stone d20c51
     if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
Al Stone d20c51
     {
Al Stone d20c51
-        printf ("\nMaximum error count (%u) exceeded\n",
Al Stone d20c51
+        printf ("\nMaximum error count (%d) exceeded\n",
Al Stone d20c51
             ASL_MAX_ERROR_COUNT);
Al Stone d20c51
     }
Al Stone d20c51
 
Al Stone 938de5
Index: src/source/tools/acpiexec/aemain.c
Al Stone 938de5
===================================================================
Al Stone 938de5
--- src.orig/source/tools/acpiexec/aemain.c
Al Stone 938de5
+++ src/source/tools/acpiexec/aemain.c
Al Stone 938de5
@@ -197,7 +197,7 @@ AeDoOptions (
Al Stone d20c51
 
Al Stone d20c51
         if (strlen (AcpiGbl_Optarg) > (AE_BUFFER_SIZE -1))
Al Stone d20c51
         {
Al Stone d20c51
-            printf ("**** The length of command line (%u) exceeded maximum (%u)\n",
Al Stone d20c51
+            printf ("**** The length of command line (%u) exceeded maximum (%d)\n",
Al Stone d20c51
                 (UINT32) strlen (AcpiGbl_Optarg), (AE_BUFFER_SIZE -1));
Al Stone d20c51
             return (-1);
Al Stone d20c51
         }
Al Stone 938de5
Index: src/source/compiler/aslerror.c
Al Stone 938de5
===================================================================
Al Stone 938de5
--- src.orig/source/compiler/aslerror.c
Al Stone 938de5
+++ src/source/compiler/aslerror.c
Al Stone 938de5
@@ -685,7 +685,7 @@ AslCommonError (
Al Stone d20c51
     Gbl_ExceptionCount[Level]++;
Al Stone d20c51
     if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
Al Stone d20c51
     {
Al Stone d20c51
-        printf ("\nMaximum error count (%u) exceeded\n", ASL_MAX_ERROR_COUNT);
Al Stone d20c51
+        printf ("\nMaximum error count (%d) exceeded\n", ASL_MAX_ERROR_COUNT);
Al Stone d20c51
 
Al Stone d20c51
         Gbl_SourceLine = 0;
Al Stone d20c51
         Gbl_NextError = Gbl_ErrorLog;
Al Stone 938de5
@@ -731,7 +731,7 @@ AslDisableException (
Al Stone 9f52a5
 
Al Stone 9f52a5
     if (Gbl_DisabledMessagesIndex >= ASL_MAX_DISABLED_MESSAGES)
Al Stone 9f52a5
     {
Al Stone 9f52a5
-        printf ("Too many messages have been disabled (max %u)\n",
Al Stone 9f52a5
+        printf ("Too many messages have been disabled (max %d)\n",
Al Stone 9f52a5
             ASL_MAX_DISABLED_MESSAGES);
Al Stone 9f52a5
         return (AE_LIMIT);
Al Stone 9f52a5
     }
Al Stone 938de5
Index: src/source/components/debugger/dbexec.c
Al Stone 938de5
===================================================================
Al Stone 938de5
--- src.orig/source/components/debugger/dbexec.c
Al Stone 938de5
+++ src/source/components/debugger/dbexec.c
Al Stone 938de5
@@ -214,7 +214,7 @@ AcpiDbExecuteMethod (
Al Stone d20c51
         {
Al Stone d20c51
             ACPI_ERROR ((AE_INFO,
Al Stone d20c51
                 "Possible overflow of internal debugger buffer (size 0x%X needed 0x%X)",
Al Stone d20c51
-                ACPI_DEBUG_BUFFER_SIZE, (UINT32) ReturnObj->Length));
Al Stone 9f52a5
+                (UINT32) ACPI_DEBUG_BUFFER_SIZE, (UINT32) ReturnObj->Length));
Al Stone 9f52a5
         }
Al Stone 9f52a5
     }
Al Stone 9f52a5
 
Al Stone 938de5
Index: src/source/compiler/aslopt.c
Al Stone 938de5
===================================================================
Al Stone 938de5
--- src.orig/source/compiler/aslopt.c
Al Stone 938de5
+++ src/source/compiler/aslopt.c
Al Stone 938de5
@@ -576,7 +576,7 @@ OptOptimizeNamePath (
Al Stone 9f52a5
     }
Al Stone 9f52a5
 
Al Stone 9f52a5
     ACPI_DEBUG_PRINT_RAW ((ACPI_DB_OPTIMIZATIONS,
Al Stone 9f52a5
-        "PATH OPTIMIZE: Line %5d ParentOp [%12.12s] ThisOp [%12.12s] ",
Al Stone 9f52a5
+        "PATH OPTIMIZE: Line %5u ParentOp [%12.12s] ThisOp [%12.12s] ",
Al Stone 9f52a5
         Op->Asl.LogicalLineNumber,
Al Stone 9f52a5
         AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode),
Al Stone 9f52a5
         AcpiPsGetOpcodeName (Op->Common.AmlOpcode)));
Al Stone 938de5
Index: src/source/components/dispatcher/dsmthdat.c
Al Stone 938de5
===================================================================
Al Stone 938de5
--- src.orig/source/components/dispatcher/dsmthdat.c
Al Stone 938de5
+++ src/source/components/dispatcher/dsmthdat.c
Al Stone 938de5
@@ -287,7 +287,7 @@ AcpiDsMethodDataGetNode (
Al Stone 9f52a5
         if (Index > ACPI_METHOD_MAX_LOCAL)
Al Stone 9f52a5
         {
Al Stone 9f52a5
             ACPI_ERROR ((AE_INFO,
Al Stone 9f52a5
-                "Local index %u is invalid (max %u)",
Al Stone 9f52a5
+                "Local index %u is invalid (max %d)",
Al Stone 9f52a5
                 Index, ACPI_METHOD_MAX_LOCAL));
Al Stone 9f52a5
             return_ACPI_STATUS (AE_AML_INVALID_INDEX);
Al Stone 9f52a5
         }
Al Stone 938de5
@@ -302,7 +302,7 @@ AcpiDsMethodDataGetNode (
Al Stone 9f52a5
         if (Index > ACPI_METHOD_MAX_ARG)
Al Stone 9f52a5
         {
Al Stone 9f52a5
             ACPI_ERROR ((AE_INFO,
Al Stone 9f52a5
-                "Arg index %u is invalid (max %u)",
Al Stone 9f52a5
+                "Arg index %u is invalid (max %d)",
Al Stone 9f52a5
                 Index, ACPI_METHOD_MAX_ARG));
Al Stone 9f52a5
             return_ACPI_STATUS (AE_AML_INVALID_INDEX);
Al Stone d20c51
         }
Al Stone 938de5
Index: src/source/compiler/aslpredef.c
Al Stone 938de5
===================================================================
Al Stone 938de5
--- src.orig/source/compiler/aslpredef.c
Al Stone 938de5
+++ src/source/compiler/aslpredef.c
Al Stone 938de5
@@ -114,7 +114,7 @@ ApCheckForPredefinedMethod (
Al Stone 9f52a5
 
Al Stone 9f52a5
         if (MethodInfo->NumArguments != 0)
Al Stone 9f52a5
         {
Al Stone 9f52a5
-            sprintf (MsgBuffer, "%s requires %u", Op->Asl.ExternalName, 0);
Al Stone 9f52a5
+            sprintf (MsgBuffer, "%s requires %d", Op->Asl.ExternalName, 0);
Al Stone 9f52a5
 
Al Stone 9f52a5
             AslError (ASL_WARNING, ASL_MSG_RESERVED_ARG_COUNT_HI, Op,
Al Stone 9f52a5
                 MsgBuffer);
Al Stone 938de5
Index: src/source/compiler/aslprepkg.c
Al Stone 938de5
===================================================================
Al Stone 938de5
--- src.orig/source/compiler/aslprepkg.c
Al Stone 938de5
+++ src/source/compiler/aslprepkg.c
Al Stone ba7935
@@ -298,7 +298,7 @@ ApCheckPackage (
Al Stone 9f52a5
 
Al Stone 9f52a5
         if (Count & 1)
Al Stone 9f52a5
         {
Al Stone 9f52a5
-            sprintf (MsgBuffer, "%4.4s: Package length, %d, must be even.",
Al Stone 9f52a5
+            sprintf (MsgBuffer, "%4.4s: Package length, %u, must be even.",
Al Stone 9f52a5
                 Predefined->Info.Name, Count);
Al Stone 9f52a5
 
Al Stone 9f52a5
             AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH,
Al Stone 938de5
Index: src/source/components/dispatcher/dsutils.c
Al Stone 938de5
===================================================================
Al Stone 938de5
--- src.orig/source/components/dispatcher/dsutils.c
Al Stone 938de5
+++ src/source/components/dispatcher/dsutils.c
Al Stone 938de5
@@ -787,7 +787,7 @@ AcpiDsCreateOperands (
Al Stone 9f52a5
     }
Al Stone 9f52a5
 
Al Stone 9f52a5
     ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
Al Stone 9f52a5
-        "NumOperands %d, ArgCount %d, Index %d\n",
Al Stone 9f52a5
+        "NumOperands %d, ArgCount %u, Index %u\n",
Al Stone 9f52a5
         WalkState->NumOperands, ArgCount, Index));
Al Stone 9f52a5
 
Al Stone 9f52a5
     /* Create the interpreter arguments, in reverse order */
Al Stone 938de5
Index: src/source/components/dispatcher/dswscope.c
Al Stone 938de5
===================================================================
Al Stone 938de5
--- src.orig/source/components/dispatcher/dswscope.c
Al Stone 938de5
+++ src/source/components/dispatcher/dswscope.c
Al Stone 938de5
@@ -148,7 +148,7 @@ AcpiDsScopeStackPush (
Al Stone 9f52a5
     WalkState->ScopeDepth++;
Al Stone 9f52a5
 
Al Stone 9f52a5
     ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
Al Stone 9f52a5
-        "[%.2d] Pushed scope ", (UINT32) WalkState->ScopeDepth));
Al Stone 9f52a5
+        "[%.2d] Pushed scope ", WalkState->ScopeDepth));
Al Stone 9f52a5
 
Al Stone 9f52a5
     OldScopeInfo = WalkState->ScopeInfo;
Al Stone 9f52a5
     if (OldScopeInfo)
Al Stone 938de5
@@ -211,7 +211,7 @@ AcpiDsScopeStackPop (
Al Stone 9f52a5
     WalkState->ScopeDepth--;
Al Stone 9f52a5
 
Al Stone 9f52a5
     ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
Al Stone 9f52a5
-        "[%.2d] Popped scope [%4.4s] (%s), New scope -> ",
Al Stone 9f52a5
+        "[%.2u] Popped scope [%4.4s] (%s), New scope -> ",
Al Stone 9f52a5
         (UINT32) WalkState->ScopeDepth,
Al Stone 9f52a5
         AcpiUtGetNodeName (ScopeInfo->Scope.Node),
Al Stone 9f52a5
         AcpiUtGetTypeName (ScopeInfo->Common.Value)));
Al Stone 938de5
Index: src/source/components/events/evgpe.c
Al Stone 938de5
===================================================================
Al Stone 938de5
--- src.orig/source/components/events/evgpe.c
Al Stone 938de5
+++ src/source/components/events/evgpe.c
Al Stone 702e10
@@ -430,7 +430,7 @@ AcpiEvGpeDetect (
Al Stone 9f52a5
                     "Ignore disabled registers for GPE %02X-%02X: "
Al Stone 9f52a5
                     "RunEnable=%02X, WakeEnable=%02X\n",
Al Stone 9f52a5
                     GpeRegisterInfo->BaseGpeNumber,
Al Stone 9f52a5
-                    GpeRegisterInfo->BaseGpeNumber + (ACPI_GPE_REGISTER_WIDTH - 1),
Al Stone 9f52a5
+                    (unsigned int) (GpeRegisterInfo->BaseGpeNumber + (ACPI_GPE_REGISTER_WIDTH - 1)),
Al Stone 9f52a5
                     GpeRegisterInfo->EnableForRun,
Al Stone 9f52a5
                     GpeRegisterInfo->EnableForWake));
Al Stone 9f52a5
                 continue;
Al Stone 702e10
@@ -456,7 +456,7 @@ AcpiEvGpeDetect (
Al Stone 9f52a5
                 "Read registers for GPE %02X-%02X: Status=%02X, Enable=%02X, "
Al Stone 9f52a5
                 "RunEnable=%02X, WakeEnable=%02X\n",
Al Stone 9f52a5
                 GpeRegisterInfo->BaseGpeNumber,
Al Stone 9f52a5
-                GpeRegisterInfo->BaseGpeNumber + (ACPI_GPE_REGISTER_WIDTH - 1),
Al Stone 9f52a5
+                (unsigned int) (GpeRegisterInfo->BaseGpeNumber + (ACPI_GPE_REGISTER_WIDTH - 1)),
Al Stone 9f52a5
                 StatusReg, EnableReg,
Al Stone 9f52a5
                 GpeRegisterInfo->EnableForRun,
Al Stone 9f52a5
                 GpeRegisterInfo->EnableForWake));
Al Stone 938de5
Index: src/source/components/executer/exdump.c
Al Stone 938de5
===================================================================
Al Stone 938de5
--- src.orig/source/components/executer/exdump.c
Al Stone 938de5
+++ src/source/components/executer/exdump.c
Al Stone 702e10
@@ -664,7 +664,7 @@ AcpiExDumpOperand (
Al Stone 9f52a5
     if (Depth > 0)
Al Stone 9f52a5
     {
Al Stone 9f52a5
         ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%*s[%u] %p ",
Al Stone 9f52a5
-            Depth, " ", Depth, ObjDesc));
Al Stone 9f52a5
+            (int) Depth, " ", Depth, ObjDesc));
Al Stone 9f52a5
     }
Al Stone 9f52a5
     else
Al Stone 9f52a5
     {
Al Stone 938de5
Index: src/source/components/executer/exnames.c
Al Stone 938de5
===================================================================
Al Stone 938de5
--- src.orig/source/components/executer/exnames.c
Al Stone 938de5
+++ src/source/components/executer/exnames.c
Al Stone 938de5
@@ -239,7 +239,7 @@ AcpiExNameSegment (
Al Stone 9f52a5
          */
Al Stone 9f52a5
         ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
Al Stone 9f52a5
             "Leading character is not alpha: %02Xh (not a name)\n",
Al Stone 9f52a5
-            CharBuf[0]));
Al Stone 9f52a5
+            (unsigned int) CharBuf[0]));
Al Stone 9f52a5
         Status = AE_CTRL_PENDING;
Al Stone 9f52a5
     }
Al Stone 9f52a5
     else
Al Stone 938de5
@@ -251,7 +251,7 @@ AcpiExNameSegment (
Al Stone 9f52a5
         Status = AE_AML_BAD_NAME;
Al Stone 9f52a5
         ACPI_ERROR ((AE_INFO,
Al Stone 9f52a5
             "Bad character 0x%02x in name, at %p",
Al Stone 9f52a5
-            *AmlAddress, AmlAddress));
Al Stone 9f52a5
+            (unsigned int) (*AmlAddress), AmlAddress));
Al Stone 9f52a5
     }
Al Stone 9f52a5
 
Al Stone 9f52a5
     *InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress);
Al Stone 938de5
Index: src/source/components/executer/exfldio.c
Al Stone 938de5
===================================================================
Al Stone 938de5
--- src.orig/source/components/executer/exfldio.c
Al Stone 938de5
+++ src/source/components/executer/exfldio.c
Al Stone 938de5
@@ -679,7 +679,7 @@ AcpiExWriteWithUpdateRule (
Al Stone 9f52a5
 
Al Stone 9f52a5
             ACPI_ERROR ((AE_INFO,
Al Stone 9f52a5
                 "Unknown UpdateRule value: 0x%X",
Al Stone 9f52a5
-                (ObjDesc->CommonField.FieldFlags & AML_FIELD_UPDATE_RULE_MASK)));
Al Stone 9f52a5
+                (unsigned int) (ObjDesc->CommonField.FieldFlags & AML_FIELD_UPDATE_RULE_MASK)));
Al Stone 9f52a5
             return_ACPI_STATUS (AE_AML_OPERAND_VALUE);
Al Stone 9f52a5
         }
Al Stone 9f52a5
     }
Al Stone 938de5
Index: src/source/components/tables/tbfadt.c
Al Stone 938de5
===================================================================
Al Stone 938de5
--- src.orig/source/components/tables/tbfadt.c
Al Stone 938de5
+++ src/source/components/tables/tbfadt.c
Al Stone 938de5
@@ -233,7 +233,7 @@ AcpiTbInitGenericAddress (
Al Stone 9f52a5
         if (!(Flags & ACPI_FADT_GPE_REGISTER))
Al Stone 9f52a5
         {
Al Stone 9f52a5
             ACPI_ERROR ((AE_INFO,
Al Stone 9f52a5
-                "%s - 32-bit FADT register is too long (%u bytes, %u bits) "
Al Stone 9f52a5
+                "%s - 32-bit FADT register is too long (%u bytes, %d bits) "
Al Stone 9f52a5
                 "to convert to GAS struct - 255 bits max, truncating",
Al Stone 9f52a5
                 RegisterName, ByteWidth, (ByteWidth * 8)));
Al Stone 9f52a5
         }
Al Stone 938de5
@@ -304,7 +304,7 @@ AcpiTbSelectAddress (
Al Stone 9f52a5
 
Al Stone 9f52a5
         ACPI_BIOS_WARNING ((AE_INFO,
Al Stone 9f52a5
             "32/64X %s address mismatch in FADT: "
Al Stone 9f52a5
-            "0x%8.8X/0x%8.8X%8.8X, using %u-bit address",
Al Stone 9f52a5
+            "0x%8.8X/0x%8.8X%8.8X, using %d-bit address",
Al Stone 9f52a5
             RegisterName, Address32, ACPI_FORMAT_UINT64 (Address64),
Al Stone 9f52a5
             AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
Al Stone 9f52a5
 
Al Stone 702e10
@@ -617,7 +617,7 @@ AcpiTbConvertFadt (
Al Stone 9f52a5
 
Al Stone 9f52a5
                 ACPI_BIOS_WARNING ((AE_INFO,
Al Stone 9f52a5
                     "32/64X address mismatch in FADT/%s: "
Al Stone 9f52a5
-                    "0x%8.8X/0x%8.8X%8.8X, using %u-bit address",
Al Stone 9f52a5
+                    "0x%8.8X/0x%8.8X%8.8X, using %d-bit address",
Al Stone 9f52a5
                     Name, Address32,
Al Stone 9f52a5
                     ACPI_FORMAT_UINT64 (Address64->Address),
Al Stone 9f52a5
                     AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
Al Stone 938de5
Index: src/source/components/hardware/hwregs.c
Al Stone 938de5
===================================================================
Al Stone 938de5
--- src.orig/source/components/hardware/hwregs.c
Al Stone 938de5
+++ src/source/components/hardware/hwregs.c
Al Stone 938de5
@@ -299,7 +299,7 @@ AcpiHwClearAcpiStatus (
Al Stone 9f52a5
 
Al Stone 9f52a5
 
Al Stone 9f52a5
     ACPI_DEBUG_PRINT ((ACPI_DB_IO, "About to write %04X to %8.8X%8.8X\n",
Al Stone 9f52a5
-        ACPI_BITMASK_ALL_FIXED_STATUS,
Al Stone 9f52a5
+        (UINT32) ACPI_BITMASK_ALL_FIXED_STATUS,
Al Stone 9f52a5
         ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address)));
Al Stone 9f52a5
 
Al Stone 9f52a5
     LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock);
Al Stone 938de5
Index: src/source/components/tables/tbxfroot.c
Al Stone 938de5
===================================================================
Al Stone 938de5
--- src.orig/source/components/tables/tbxfroot.c
Al Stone 938de5
+++ src/source/components/tables/tbxfroot.c
Al Stone 938de5
@@ -177,7 +177,7 @@ AcpiFindRootPointer (
Al Stone 9f52a5
     {
Al Stone 9f52a5
         ACPI_ERROR ((AE_INFO,
Al Stone 9f52a5
             "Could not map memory at 0x%8.8X for length %u",
Al Stone 9f52a5
-            ACPI_EBDA_PTR_LOCATION, ACPI_EBDA_PTR_LENGTH));
Al Stone 9f52a5
+            (UINT32) ACPI_EBDA_PTR_LOCATION, (UINT32) ACPI_EBDA_PTR_LENGTH));
Al Stone 9f52a5
 
Al Stone 9f52a5
         return_ACPI_STATUS (AE_NO_MEMORY);
Al Stone 9f52a5
     }
Al Stone 938de5
@@ -204,7 +204,7 @@ AcpiFindRootPointer (
Al Stone 9f52a5
         {
Al Stone 9f52a5
             ACPI_ERROR ((AE_INFO,
Al Stone 9f52a5
                 "Could not map memory at 0x%8.8X for length %u",
Al Stone 9f52a5
-                PhysicalAddress, ACPI_EBDA_WINDOW_SIZE));
Al Stone 9f52a5
+                PhysicalAddress, (UINT32) ACPI_EBDA_WINDOW_SIZE));
Al Stone 9f52a5
 
Al Stone 9f52a5
             return_ACPI_STATUS (AE_NO_MEMORY);
Al Stone 9f52a5
         }
Al Stone 938de5
@@ -234,7 +234,7 @@ AcpiFindRootPointer (
Al Stone 9f52a5
     {
Al Stone 9f52a5
         ACPI_ERROR ((AE_INFO,
Al Stone 9f52a5
             "Could not map memory at 0x%8.8X for length %u",
Al Stone 9f52a5
-            ACPI_HI_RSDP_WINDOW_BASE, ACPI_HI_RSDP_WINDOW_SIZE));
Al Stone 9f52a5
+            (UINT32) ACPI_HI_RSDP_WINDOW_BASE, (UINT32) ACPI_HI_RSDP_WINDOW_SIZE));
Al Stone 9f52a5
 
Al Stone 9f52a5
         return_ACPI_STATUS (AE_NO_MEMORY);
Al Stone 9f52a5
     }
Al Stone 938de5
Index: src/source/components/utilities/utownerid.c
Al Stone 938de5
===================================================================
Al Stone 938de5
--- src.orig/source/components/utilities/utownerid.c
Al Stone 938de5
+++ src/source/components/utilities/utownerid.c
Al Stone 938de5
@@ -230,7 +230,7 @@ AcpiUtReleaseOwnerId (
Al Stone 9f52a5
     else
Al Stone 9f52a5
     {
Al Stone 9f52a5
         ACPI_ERROR ((AE_INFO,
Al Stone 9f52a5
-            "Release of non-allocated OwnerId: 0x%2.2X", OwnerId + 1));
Al Stone 9f52a5
+            "Release of non-allocated OwnerId: 0x%2.2X", (UINT32) OwnerId + 1));
Al Stone d20c51
     }
Al Stone d20c51
 
Al Stone 9f52a5
     (void) AcpiUtReleaseMutex (ACPI_MTX_CACHES);