diff options
Diffstat (limited to 'sys/contrib/dev/acpica/exoparg3.c')
| -rw-r--r-- | sys/contrib/dev/acpica/exoparg3.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sys/contrib/dev/acpica/exoparg3.c b/sys/contrib/dev/acpica/exoparg3.c index 4646fd923e3e..f2aa71479c20 100644 --- a/sys/contrib/dev/acpica/exoparg3.c +++ b/sys/contrib/dev/acpica/exoparg3.c @@ -2,7 +2,7 @@ /****************************************************************************** * * Module Name: exoparg3 - AML execution - opcodes with 3 arguments - * $Revision: 9 $ + * $Revision: 14 $ * *****************************************************************************/ @@ -181,7 +181,7 @@ AcpiExOpcode_3A_0T_0R ( case AML_FATAL_OP: /* Fatal (FatalType FatalCode FatalArg) */ ACPI_DEBUG_PRINT ((ACPI_DB_INFO, - "FatalOp: Type %x Code %x Arg %x <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n", + "FatalOp: Type %X Code %X Arg %X <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n", (UINT32) Operand[0]->Integer.Value, (UINT32) Operand[1]->Integer.Value, (UINT32) Operand[2]->Integer.Value)); @@ -197,7 +197,7 @@ AcpiExOpcode_3A_0T_0R ( /* * Always signal the OS! */ - AcpiOsSignal (ACPI_SIGNAL_FATAL, Fatal); + Status = AcpiOsSignal (ACPI_SIGNAL_FATAL, Fatal); /* Might return while OS is shutting down, just continue */ @@ -240,8 +240,8 @@ AcpiExOpcode_3A_1T_1R ( ACPI_OPERAND_OBJECT *ReturnDesc = NULL; char *Buffer; ACPI_STATUS Status = AE_OK; - UINT32 Index; - UINT32 Length; + NATIVE_UINT Index; + ACPI_SIZE Length; ACPI_FUNCTION_TRACE_STR ("ExOpcode_3A_1T_1R", AcpiPsGetOpcodeName (WalkState->Opcode)); @@ -255,7 +255,7 @@ AcpiExOpcode_3A_1T_1R ( * Create the return object. The Source operand is guaranteed to be * either a String or a Buffer, so just use its type. */ - ReturnDesc = AcpiUtCreateInternalObject (Operand[0]->Common.Type); + ReturnDesc = AcpiUtCreateInternalObject (ACPI_GET_OBJECT_TYPE (Operand[0])); if (!ReturnDesc) { Status = AE_NO_MEMORY; @@ -264,8 +264,8 @@ AcpiExOpcode_3A_1T_1R ( /* Get the Integer values from the objects */ - Index = (UINT32) Operand[1]->Integer.Value; - Length = (UINT32) Operand[2]->Integer.Value; + Index = (NATIVE_UINT) Operand[1]->Integer.Value; + Length = (ACPI_SIZE) Operand[2]->Integer.Value; /* * If the index is beyond the length of the String/Buffer, or if the @@ -279,12 +279,12 @@ AcpiExOpcode_3A_1T_1R ( if ((Index + Length) > Operand[0]->String.Length) { - Length = Operand[0]->String.Length - Index; + Length = (ACPI_SIZE) Operand[0]->String.Length - Index; } /* Allocate a new buffer for the String/Buffer */ - Buffer = ACPI_MEM_CALLOCATE (Length + 1); + Buffer = ACPI_MEM_CALLOCATE ((ACPI_SIZE) Length + 1); if (!Buffer) { Status = AE_NO_MEMORY; @@ -299,7 +299,7 @@ AcpiExOpcode_3A_1T_1R ( /* Set the length of the new String/Buffer */ ReturnDesc->String.Pointer = Buffer; - ReturnDesc->String.Length = Length; + ReturnDesc->String.Length = (UINT32) Length; } break; |