diff options
Diffstat (limited to 'sys/contrib/dev/acpica/Subsystem/Interpreter')
20 files changed, 146 insertions, 109 deletions
diff --git a/sys/contrib/dev/acpica/Subsystem/Interpreter/amconfig.c b/sys/contrib/dev/acpica/Subsystem/Interpreter/amconfig.c index db3c767..765cb62 100644 --- a/sys/contrib/dev/acpica/Subsystem/Interpreter/amconfig.c +++ b/sys/contrib/dev/acpica/Subsystem/Interpreter/amconfig.c @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: amconfig - Namespace reconfiguration (Load/Unload opcodes) - * $Revision: 26 $ + * $Revision: 27 $ * *****************************************************************************/ @@ -9,8 +9,8 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, Intel Corp. All rights - * reserved. + * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp. + * All rights reserved. * * 2. License * diff --git a/sys/contrib/dev/acpica/Subsystem/Interpreter/amcreate.c b/sys/contrib/dev/acpica/Subsystem/Interpreter/amcreate.c index 4826be9..4dbf3d8 100644 --- a/sys/contrib/dev/acpica/Subsystem/Interpreter/amcreate.c +++ b/sys/contrib/dev/acpica/Subsystem/Interpreter/amcreate.c @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: amcreate - Named object creation - * $Revision: 51 $ + * $Revision: 52 $ * *****************************************************************************/ @@ -9,8 +9,8 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, Intel Corp. All rights - * reserved. + * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp. + * All rights reserved. * * 2. License * @@ -531,8 +531,8 @@ AcpiAmlExecCreateRegion ( FUNCTION_TRACE ("AmlExecCreateRegion"); - /* - * Space ID must be one of the predefined IDs, or in the user-defined + /* + * Space ID must be one of the predefined IDs, or in the user-defined * range */ if ((RegionSpace >= NUM_REGION_TYPES) && diff --git a/sys/contrib/dev/acpica/Subsystem/Interpreter/amdump.c b/sys/contrib/dev/acpica/Subsystem/Interpreter/amdump.c index bdab038..c766a06 100644 --- a/sys/contrib/dev/acpica/Subsystem/Interpreter/amdump.c +++ b/sys/contrib/dev/acpica/Subsystem/Interpreter/amdump.c @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: amdump - Interpreter debug output routines - * $Revision: 96 $ + * $Revision: 97 $ * *****************************************************************************/ @@ -9,8 +9,8 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, Intel Corp. All rights - * reserved. + * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp. + * All rights reserved. * * 2. License * diff --git a/sys/contrib/dev/acpica/Subsystem/Interpreter/amdyadic.c b/sys/contrib/dev/acpica/Subsystem/Interpreter/amdyadic.c index 57b0730..f0b87ec 100644 --- a/sys/contrib/dev/acpica/Subsystem/Interpreter/amdyadic.c +++ b/sys/contrib/dev/acpica/Subsystem/Interpreter/amdyadic.c @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: amdyadic - ACPI AML (p-code) execution for dyadic operators - * $Revision: 68 $ + * $Revision: 69 $ * *****************************************************************************/ @@ -9,8 +9,8 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, Intel Corp. All rights - * reserved. + * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp. + * All rights reserved. * * 2. License * diff --git a/sys/contrib/dev/acpica/Subsystem/Interpreter/amfield.c b/sys/contrib/dev/acpica/Subsystem/Interpreter/amfield.c index 646af1c..b99df95 100644 --- a/sys/contrib/dev/acpica/Subsystem/Interpreter/amfield.c +++ b/sys/contrib/dev/acpica/Subsystem/Interpreter/amfield.c @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: amfield - ACPI AML (p-code) execution - field manipulation - * $Revision: 74 $ + * $Revision: 75 $ * *****************************************************************************/ @@ -9,8 +9,8 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, Intel Corp. All rights - * reserved. + * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp. + * All rights reserved. * * 2. License * diff --git a/sys/contrib/dev/acpica/Subsystem/Interpreter/amfldio.c b/sys/contrib/dev/acpica/Subsystem/Interpreter/amfldio.c index 766d55c..66d6043 100644 --- a/sys/contrib/dev/acpica/Subsystem/Interpreter/amfldio.c +++ b/sys/contrib/dev/acpica/Subsystem/Interpreter/amfldio.c @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: amfldio - Aml Field I/O - * $Revision: 32 $ + * $Revision: 33 $ * *****************************************************************************/ @@ -9,8 +9,8 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, Intel Corp. All rights - * reserved. + * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp. + * All rights reserved. * * 2. License * @@ -193,7 +193,7 @@ AcpiAmlReadFieldData ( DEBUG_PRINT (TRACE_OPREGION, ("AmlReadFieldData: Region %s(%X) at %08lx width %X\n", - AcpiCmGetRegionName (RgnDesc->Region.SpaceId), + AcpiCmGetRegionName (RgnDesc->Region.SpaceId), RgnDesc->Region.SpaceId, Address, FieldBitWidth)); @@ -207,7 +207,7 @@ AcpiAmlReadFieldData ( { DEBUG_PRINT (ACPI_ERROR, ("AmlReadFieldData: **** Region %s(%X) not implemented\n", - AcpiCmGetRegionName (RgnDesc->Region.SpaceId), + AcpiCmGetRegionName (RgnDesc->Region.SpaceId), RgnDesc->Region.SpaceId)); } @@ -215,7 +215,7 @@ AcpiAmlReadFieldData ( { DEBUG_PRINT (ACPI_ERROR, ("AmlReadFieldData: **** Region %s(%X) has no handler\n", - AcpiCmGetRegionName (RgnDesc->Region.SpaceId), + AcpiCmGetRegionName (RgnDesc->Region.SpaceId), RgnDesc->Region.SpaceId)); } @@ -487,7 +487,7 @@ AcpiAmlWriteFieldData ( DEBUG_PRINT (TRACE_OPREGION, ("AmlWriteField: Store %lx in Region %s(%X) at %p width %X\n", - Value, AcpiCmGetRegionName (RgnDesc->Region.SpaceId), + Value, AcpiCmGetRegionName (RgnDesc->Region.SpaceId), RgnDesc->Region.SpaceId, Address, FieldBitWidth)); diff --git a/sys/contrib/dev/acpica/Subsystem/Interpreter/ammisc.c b/sys/contrib/dev/acpica/Subsystem/Interpreter/ammisc.c index 5884acd..1757bc7 100644 --- a/sys/contrib/dev/acpica/Subsystem/Interpreter/ammisc.c +++ b/sys/contrib/dev/acpica/Subsystem/Interpreter/ammisc.c @@ -2,7 +2,7 @@ /****************************************************************************** * * Module Name: ammisc - ACPI AML (p-code) execution - specific opcodes - * $Revision: 71 $ + * $Revision: 72 $ * *****************************************************************************/ @@ -10,8 +10,8 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, Intel Corp. All rights - * reserved. + * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp. + * All rights reserved. * * 2. License * diff --git a/sys/contrib/dev/acpica/Subsystem/Interpreter/ammonad.c b/sys/contrib/dev/acpica/Subsystem/Interpreter/ammonad.c index a899d63..4dcf021 100644 --- a/sys/contrib/dev/acpica/Subsystem/Interpreter/ammonad.c +++ b/sys/contrib/dev/acpica/Subsystem/Interpreter/ammonad.c @@ -2,7 +2,7 @@ /****************************************************************************** * * Module Name: ammonad - ACPI AML (p-code) execution for monadic operators - * $Revision: 85 $ + * $Revision: 88 $ * *****************************************************************************/ @@ -10,8 +10,8 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, Intel Corp. All rights - * reserved. + * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp. + * All rights reserved. * * 2. License * @@ -355,10 +355,9 @@ AcpiAmlExecMonadic2R ( ACPI_OPERAND_OBJECT *RetDesc2 = NULL; UINT32 ResVal; ACPI_STATUS Status; - UINT32 d0; - UINT32 d1; - UINT32 d2; - UINT32 d3; + UINT32 i; + UINT32 j; + ACPI_INTEGER Digit; FUNCTION_TRACE_PTR ("AmlExecMonadic2R", WALK_OPERANDS); @@ -461,23 +460,39 @@ AcpiAmlExecMonadic2R ( case AML_FROM_BCD_OP: - /* TBD: for ACPI 2.0, expand to 64 bits */ + /* + * The 64-bit ACPI integer can hold 16 4-bit BCD integers + */ + RetDesc->Number.Value = 0; + for (i = 0; i < ACPI_MAX_BCD_DIGITS; i++) + { + /* Get one BCD digit */ - d0 = (UINT32) (ObjDesc->Number.Value & 15); - d1 = (UINT32) (ObjDesc->Number.Value >> 4 & 15); - d2 = (UINT32) (ObjDesc->Number.Value >> 8 & 15); - d3 = (UINT32) (ObjDesc->Number.Value >> 12 & 15); + Digit = (ACPI_INTEGER) ((ObjDesc->Number.Value >> (i * 4)) & 0xF); - if (d0 > 9 || d1 > 9 || d2 > 9 || d3 > 9) - { - DEBUG_PRINT (ACPI_ERROR, - ("Monadic2R/FromBCDOp: BCD digit too large %d %d %d %d\n", - d3, d2, d1, d0)); - Status = AE_AML_NUMERIC_OVERFLOW; - goto Cleanup; - } + /* Check the range of the digit */ + + if (Digit > 9) + { + DEBUG_PRINT (ACPI_ERROR, + ("Monadic2R/FromBCDOp: BCD digit too large: \n", + Digit)); + Status = AE_AML_NUMERIC_OVERFLOW; + goto Cleanup; + } + + if (Digit > 0) + { + /* Sum into the result with the appropriate power of 10 */ + + for (j = 0; j < i; j++) + { + Digit *= 10; + } - RetDesc->Number.Value = d0 + d1 * 10 + d2 * 100 + d3 * 1000; + RetDesc->Number.Value += Digit; + } + } break; @@ -485,9 +500,8 @@ AcpiAmlExecMonadic2R ( case AML_TO_BCD_OP: - /* TBD: for ACPI 2.0, expand to 64 bits */ - if (ObjDesc->Number.Value > 9999) + if (ObjDesc->Number.Value > ACPI_MAX_BCD_VALUE) { DEBUG_PRINT (ACPI_ERROR, ("Monadic2R/ToBCDOp: BCD overflow: %d\n", ObjDesc->Number.Value)); @@ -495,12 +509,24 @@ AcpiAmlExecMonadic2R ( goto Cleanup; } - RetDesc->Number.Value - = ACPI_MODULO (ObjDesc->Number.Value, 10) - + (ACPI_MODULO (ACPI_DIVIDE (ObjDesc->Number.Value, 10), 10) << 4) - + (ACPI_MODULO (ACPI_DIVIDE (ObjDesc->Number.Value, 100), 10) << 8) - + (ACPI_MODULO (ACPI_DIVIDE (ObjDesc->Number.Value, 1000), 10) << 12); + RetDesc->Number.Value = 0; + for (i = 0; i < ACPI_MAX_BCD_DIGITS; i++) + { + /* Divide by nth factor of 10 */ + + Digit = ObjDesc->Number.Value; + for (j = 0; j < i; j++) + { + Digit /= 10; + } + + /* Create the BCD digit */ + if (Digit > 0) + { + RetDesc->Number.Value += (ACPI_MODULO (Digit, 10) << (i * 4)); + } + } break; @@ -544,7 +570,7 @@ AcpiAmlExecMonadic2R ( /* The object exists in the namespace, return TRUE */ - RetDesc->Number.Value = ACPI_INTEGER_MAX + RetDesc->Number.Value = ACPI_INTEGER_MAX; goto Cleanup; break; diff --git a/sys/contrib/dev/acpica/Subsystem/Interpreter/amnames.c b/sys/contrib/dev/acpica/Subsystem/Interpreter/amnames.c index 60de051..60ea50d 100644 --- a/sys/contrib/dev/acpica/Subsystem/Interpreter/amnames.c +++ b/sys/contrib/dev/acpica/Subsystem/Interpreter/amnames.c @@ -2,7 +2,7 @@ /****************************************************************************** * * Module Name: amnames - interpreter/scanner name load/execute - * $Revision: 71 $ + * $Revision: 72 $ * *****************************************************************************/ @@ -10,8 +10,8 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, Intel Corp. All rights - * reserved. + * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp. + * All rights reserved. * * 2. License * diff --git a/sys/contrib/dev/acpica/Subsystem/Interpreter/amprep.c b/sys/contrib/dev/acpica/Subsystem/Interpreter/amprep.c index 63b7c0b..b0aa979 100644 --- a/sys/contrib/dev/acpica/Subsystem/Interpreter/amprep.c +++ b/sys/contrib/dev/acpica/Subsystem/Interpreter/amprep.c @@ -2,7 +2,7 @@ /****************************************************************************** * * Module Name: amprep - ACPI AML (p-code) execution - field prep utilities - * $Revision: 69 $ + * $Revision: 72 $ * *****************************************************************************/ @@ -10,8 +10,8 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, Intel Corp. All rights - * reserved. + * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp. + * All rights reserved. * * 2. License * @@ -142,13 +142,29 @@ static UINT32 AcpiAmlDecodeFieldAccessType ( - UINT32 Access) + UINT32 Access, + UINT16 Length) { switch (Access) { case ACCESS_ANY_ACC: - return (8); + if (Length <= 8) + { + return (8); + } + else if (Length <= 16) + { + return (16); + } + else if (Length <= 32) + { + return (32); + } + else + { + return (8); + } break; case ACCESS_BYTE_ACC: @@ -229,7 +245,7 @@ AcpiAmlPrepCommonFieldObject ( /* Decode the access type so we can compute offsets */ - Granularity = AcpiAmlDecodeFieldAccessType (ObjDesc->Field.Access); + Granularity = AcpiAmlDecodeFieldAccessType (ObjDesc->Field.Access, ObjDesc->Field.Length); if (!Granularity) { return_ACPI_STATUS (AE_AML_OPERAND_VALUE); diff --git a/sys/contrib/dev/acpica/Subsystem/Interpreter/amregion.c b/sys/contrib/dev/acpica/Subsystem/Interpreter/amregion.c index 7ae052f..d85b8e4 100644 --- a/sys/contrib/dev/acpica/Subsystem/Interpreter/amregion.c +++ b/sys/contrib/dev/acpica/Subsystem/Interpreter/amregion.c @@ -2,7 +2,7 @@ /****************************************************************************** * * Module Name: amregion - ACPI default OpRegion (address space) handlers - * $Revision: 41 $ + * $Revision: 42 $ * *****************************************************************************/ @@ -10,8 +10,8 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, Intel Corp. All rights - * reserved. + * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp. + * All rights reserved. * * 2. License * diff --git a/sys/contrib/dev/acpica/Subsystem/Interpreter/amresnte.c b/sys/contrib/dev/acpica/Subsystem/Interpreter/amresnte.c index cd232e5..3ed35cb 100644 --- a/sys/contrib/dev/acpica/Subsystem/Interpreter/amresnte.c +++ b/sys/contrib/dev/acpica/Subsystem/Interpreter/amresnte.c @@ -2,7 +2,7 @@ /****************************************************************************** * * Module Name: amresnte - AML Interpreter object resolution - * $Revision: 25 $ + * $Revision: 26 $ * *****************************************************************************/ @@ -10,8 +10,8 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, Intel Corp. All rights - * reserved. + * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp. + * All rights reserved. * * 2. License * diff --git a/sys/contrib/dev/acpica/Subsystem/Interpreter/amresolv.c b/sys/contrib/dev/acpica/Subsystem/Interpreter/amresolv.c index bd50719..f43b15f 100644 --- a/sys/contrib/dev/acpica/Subsystem/Interpreter/amresolv.c +++ b/sys/contrib/dev/acpica/Subsystem/Interpreter/amresolv.c @@ -2,7 +2,7 @@ /****************************************************************************** * * Module Name: amresolv - AML Interpreter object resolution - * $Revision: 78 $ + * $Revision: 79 $ * *****************************************************************************/ @@ -10,8 +10,8 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, Intel Corp. All rights - * reserved. + * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp. + * All rights reserved. * * 2. License * diff --git a/sys/contrib/dev/acpica/Subsystem/Interpreter/amresop.c b/sys/contrib/dev/acpica/Subsystem/Interpreter/amresop.c index 0fe9b8c..9c52434 100644 --- a/sys/contrib/dev/acpica/Subsystem/Interpreter/amresop.c +++ b/sys/contrib/dev/acpica/Subsystem/Interpreter/amresop.c @@ -2,7 +2,7 @@ /****************************************************************************** * * Module Name: amresop - AML Interpreter operand/object resolution - * $Revision: 18 $ + * $Revision: 19 $ * *****************************************************************************/ @@ -10,8 +10,8 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, Intel Corp. All rights - * reserved. + * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp. + * All rights reserved. * * 2. License * @@ -131,7 +131,6 @@ MODULE_NAME ("amresop") - /******************************************************************************* * * FUNCTION: AcpiAmlCheckObjectType @@ -344,8 +343,8 @@ AcpiAmlResolveOperands ( /* - * Handle cases where the object does not need to be - * resolved to a value + * Handle cases where the object does not need to be + * resolved to a value */ switch (ThisArgType) @@ -361,7 +360,7 @@ AcpiAmlResolveOperands ( goto NextOperand; } - Status = AcpiAmlCheckObjectType (INTERNAL_TYPE_REFERENCE, + Status = AcpiAmlCheckObjectType (INTERNAL_TYPE_REFERENCE, ObjectType, ObjDesc); if (ACPI_FAILURE (Status)) { @@ -380,7 +379,7 @@ AcpiAmlResolveOperands ( AcpiCmRemoveReference (ObjDesc); (*StackPtr) = TempHandle; } - + goto NextOperand; break; @@ -404,7 +403,6 @@ AcpiAmlResolveOperands ( } - /* * Resolve this object to a value */ @@ -426,7 +424,7 @@ AcpiAmlResolveOperands ( * is allowed */ case ARGI_NUMBER: /* Number */ - + /* Need an operand of type ACPI_TYPE_NUMBER */ TypeNeeded = ACPI_TYPE_NUMBER; @@ -523,7 +521,7 @@ AcpiAmlResolveOperands ( DEBUG_PRINT (ACPI_INFO, ("AmlResolveOperands: Needed [Buf/Str/Pkg/Ref], found [%s] %p\n", AcpiCmGetTypeName ((*StackPtr)->Common.Type), *StackPtr)); - + return_ACPI_STATUS (AE_AML_OPERAND_TYPE); } @@ -574,11 +572,11 @@ AcpiAmlResolveOperands ( } - /* + /* * Make sure that the original object was resolved to the * required object type (Simple cases only). */ - Status = AcpiAmlCheckObjectType (TypeNeeded, + Status = AcpiAmlCheckObjectType (TypeNeeded, (*StackPtr)->Common.Type, *StackPtr); if (ACPI_FAILURE (Status)) { @@ -586,8 +584,6 @@ AcpiAmlResolveOperands ( } - - NextOperand: /* * If more operands needed, decrement StackPtr to point @@ -601,7 +597,6 @@ NextOperand: } /* while (*Types) */ - return_ACPI_STATUS (Status); } diff --git a/sys/contrib/dev/acpica/Subsystem/Interpreter/amstore.c b/sys/contrib/dev/acpica/Subsystem/Interpreter/amstore.c index 7d9285f..51f1bb6 100644 --- a/sys/contrib/dev/acpica/Subsystem/Interpreter/amstore.c +++ b/sys/contrib/dev/acpica/Subsystem/Interpreter/amstore.c @@ -2,7 +2,7 @@ /****************************************************************************** * * Module Name: amstore - AML Interpreter object store support - * $Revision: 117 $ + * $Revision: 118 $ * *****************************************************************************/ @@ -10,8 +10,8 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, Intel Corp. All rights - * reserved. + * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp. + * All rights reserved. * * 2. License * diff --git a/sys/contrib/dev/acpica/Subsystem/Interpreter/amstoren.c b/sys/contrib/dev/acpica/Subsystem/Interpreter/amstoren.c index 3458a84..57e02ff 100644 --- a/sys/contrib/dev/acpica/Subsystem/Interpreter/amstoren.c +++ b/sys/contrib/dev/acpica/Subsystem/Interpreter/amstoren.c @@ -3,7 +3,7 @@ * * Module Name: amstoren - AML Interpreter object store support, * Store to Node (namespace object) - * $Revision: 24 $ + * $Revision: 25 $ * *****************************************************************************/ @@ -11,8 +11,8 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, Intel Corp. All rights - * reserved. + * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp. + * All rights reserved. * * 2. License * diff --git a/sys/contrib/dev/acpica/Subsystem/Interpreter/amstorob.c b/sys/contrib/dev/acpica/Subsystem/Interpreter/amstorob.c index c9d96c6..675288b 100644 --- a/sys/contrib/dev/acpica/Subsystem/Interpreter/amstorob.c +++ b/sys/contrib/dev/acpica/Subsystem/Interpreter/amstorob.c @@ -2,7 +2,7 @@ /****************************************************************************** * * Module Name: amstorob - AML Interpreter object store support, store to object - * $Revision: 18 $ + * $Revision: 19 $ * *****************************************************************************/ @@ -10,8 +10,8 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, Intel Corp. All rights - * reserved. + * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp. + * All rights reserved. * * 2. License * diff --git a/sys/contrib/dev/acpica/Subsystem/Interpreter/amsystem.c b/sys/contrib/dev/acpica/Subsystem/Interpreter/amsystem.c index d4c1923..d7b5fd8 100644 --- a/sys/contrib/dev/acpica/Subsystem/Interpreter/amsystem.c +++ b/sys/contrib/dev/acpica/Subsystem/Interpreter/amsystem.c @@ -2,7 +2,7 @@ /****************************************************************************** * * Module Name: amsystem - Interface to OS services - * $Revision: 52 $ + * $Revision: 53 $ * *****************************************************************************/ @@ -10,8 +10,8 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, Intel Corp. All rights - * reserved. + * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp. + * All rights reserved. * * 2. License * diff --git a/sys/contrib/dev/acpica/Subsystem/Interpreter/amutils.c b/sys/contrib/dev/acpica/Subsystem/Interpreter/amutils.c index 9304b5a..f009e02 100644 --- a/sys/contrib/dev/acpica/Subsystem/Interpreter/amutils.c +++ b/sys/contrib/dev/acpica/Subsystem/Interpreter/amutils.c @@ -2,7 +2,7 @@ /****************************************************************************** * * Module Name: amutils - interpreter/scanner utilities - * $Revision: 64 $ + * $Revision: 66 $ * *****************************************************************************/ @@ -10,8 +10,8 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, Intel Corp. All rights - * reserved. + * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp. + * All rights reserved. * * 2. License * @@ -264,7 +264,7 @@ AcpiAmlTruncateFor32bitTable ( * We are running a method that exists in a 32-bit ACPI table. * Truncate the value to 32 bits by zeroing out the upper 32-bit field */ - ObjDesc->Number.Value &= (UINT64) ACPI_UINT32_MAX; + ObjDesc->Number.Value &= (ACPI_INTEGER) ACPI_UINT32_MAX; } } diff --git a/sys/contrib/dev/acpica/Subsystem/Interpreter/amxface.c b/sys/contrib/dev/acpica/Subsystem/Interpreter/amxface.c index 1c0380e..5149403 100644 --- a/sys/contrib/dev/acpica/Subsystem/Interpreter/amxface.c +++ b/sys/contrib/dev/acpica/Subsystem/Interpreter/amxface.c @@ -2,7 +2,7 @@ /****************************************************************************** * * Module Name: amxface - External interpreter interfaces - * $Revision: 22 $ + * $Revision: 23 $ * *****************************************************************************/ @@ -10,8 +10,8 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, Intel Corp. All rights - * reserved. + * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp. + * All rights reserved. * * 2. License * |
