From 4b40c9999c4d400d6a2d421390b510397d71a4d9 Mon Sep 17 00:00:00 2001 From: msmith Date: Thu, 21 Dec 2000 07:04:32 +0000 Subject: Resolve conflicts from the ACPI CA 20001215 vendor import. --- .../dev/acpica/Subsystem/Hardware/hwxface.c | 6 ++-- .../dev/acpica/Subsystem/Include/acconfig.h | 6 ++-- .../dev/acpica/Subsystem/Include/acfreebsd.h | 6 ++-- sys/contrib/dev/acpica/Subsystem/Include/acgcc.h | 6 ++-- sys/contrib/dev/acpica/Subsystem/Include/acpixf.h | 6 ++-- sys/contrib/dev/acpica/Subsystem/Parser/psparse.c | 37 ++++++++++------------ sys/contrib/dev/acpica/acconfig.h | 6 ++-- sys/contrib/dev/acpica/acfreebsd.h | 6 ++-- sys/contrib/dev/acpica/acgcc.h | 6 ++-- sys/contrib/dev/acpica/acpixf.h | 6 ++-- sys/contrib/dev/acpica/psparse.c | 37 ++++++++++------------ 11 files changed, 61 insertions(+), 67 deletions(-) (limited to 'sys') diff --git a/sys/contrib/dev/acpica/Subsystem/Hardware/hwxface.c b/sys/contrib/dev/acpica/Subsystem/Hardware/hwxface.c index 5524936..f20bd93 100644 --- a/sys/contrib/dev/acpica/Subsystem/Hardware/hwxface.c +++ b/sys/contrib/dev/acpica/Subsystem/Hardware/hwxface.c @@ -2,7 +2,7 @@ /****************************************************************************** * * Name: hwxface.c - Hardware access external interfaces - * $Revision: 36 $ + * $Revision: 37 $ * *****************************************************************************/ @@ -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/Include/acconfig.h b/sys/contrib/dev/acpica/Subsystem/Include/acconfig.h index ad40cf2..cb41ade 100644 --- a/sys/contrib/dev/acpica/Subsystem/Include/acconfig.h +++ b/sys/contrib/dev/acpica/Subsystem/Include/acconfig.h @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acconfig.h - Global configuration constants - * $Revision: 48 $ + * $Revision: 49 $ * *****************************************************************************/ @@ -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/Include/acfreebsd.h b/sys/contrib/dev/acpica/Subsystem/Include/acfreebsd.h index 8b62fc3..f60ae88 100644 --- a/sys/contrib/dev/acpica/Subsystem/Include/acfreebsd.h +++ b/sys/contrib/dev/acpica/Subsystem/Include/acfreebsd.h @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acfreebsd.h - OS specific defines, etc. - * $Revision: 1 $ + * $Revision: 2 $ * *****************************************************************************/ @@ -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/Include/acgcc.h b/sys/contrib/dev/acpica/Subsystem/Include/acgcc.h index abbfa98..aa57a34 100644 --- a/sys/contrib/dev/acpica/Subsystem/Include/acgcc.h +++ b/sys/contrib/dev/acpica/Subsystem/Include/acgcc.h @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acgcc.h - GCC specific defines, etc. - * $Revision: 2 $ + * $Revision: 3 $ * *****************************************************************************/ @@ -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/Include/acpixf.h b/sys/contrib/dev/acpica/Subsystem/Include/acpixf.h index 410a35d..48e232c 100644 --- a/sys/contrib/dev/acpica/Subsystem/Include/acpixf.h +++ b/sys/contrib/dev/acpica/Subsystem/Include/acpixf.h @@ -1,7 +1,7 @@ /****************************************************************************** * - * Name: acxface.h - External interfaces to the ACPI subsystem + * Name: acpixf.h - External interfaces to the ACPI subsystem * *****************************************************************************/ @@ -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/Parser/psparse.c b/sys/contrib/dev/acpica/Subsystem/Parser/psparse.c index 258e679..d043cf8 100644 --- a/sys/contrib/dev/acpica/Subsystem/Parser/psparse.c +++ b/sys/contrib/dev/acpica/Subsystem/Parser/psparse.c @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: psparse - Parser top level AML parse routines - * $Revision: 69 $ + * $Revision: 71 $ * *****************************************************************************/ @@ -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 * @@ -381,9 +381,9 @@ AcpiPsCompleteThisOp ( break; case OPTYPE_NAMED_OBJECT: /* Scope, method, etc. */ - - /* - * These opcodes contain TermArg operands. The current + + /* + * These opcodes contain TermArg operands. The current * op must be replace by a placeholder return op */ @@ -800,8 +800,8 @@ AcpiPsParseLoop ( * because we don't have enough info in the first pass * to parse it correctly (i.e., there may be method * calls within the TermArg elements of the body. - * - * However, we must continue parsing because + * + * However, we must continue parsing because * the opregion is not a standalone package -- * we don't know where the end is at this point. * @@ -833,7 +833,7 @@ AcpiPsParseLoop ( (Op->Opcode == AML_DWORD_FIELD_OP)) { /* - * Backup to beginning of CreateXXXfield declaration + * Backup to beginning of CreateXXXfield declaration * BodyLength is unknown until we parse the body */ DeferredOp = (ACPI_PARSE2_OBJECT *) Op; @@ -1228,7 +1228,6 @@ AcpiPsParseAml ( ACPI_OPERAND_OBJECT *ReturnDesc; ACPI_OPERAND_OBJECT *EffectiveReturnDesc = NULL; ACPI_OPERAND_OBJECT *MthDesc = NULL; - ACPI_NAMESPACE_NODE *StartNode; FUNCTION_TRACE ("PsParseAml"); @@ -1277,21 +1276,17 @@ AcpiPsParseAml ( if (MethodNode) { - StartNode = MethodNode; ParserState->StartNode = MethodNode; WalkState->WalkType = WALK_METHOD; - if (StartNode) - { - /* Push start scope on scope stack and make it current */ - - Status = AcpiDsScopeStackPush (StartNode, ACPI_TYPE_METHOD, WalkState); - if (ACPI_FAILURE (Status)) - { - return_ACPI_STATUS (Status); - } + /* Push start scope on scope stack and make it current */ + Status = AcpiDsScopeStackPush (MethodNode, ACPI_TYPE_METHOD, WalkState); + if (ACPI_FAILURE (Status)) + { + return_ACPI_STATUS (Status); } + /* Init arguments if this is a control method */ /* TBD: [Restructure] add walkstate as a param */ @@ -1303,6 +1298,8 @@ AcpiPsParseAml ( /* Setup the current scope */ Node = ParserState->StartOp->Node; + ParserState->StartNode = Node; + if (Node) { /* Push start scope on scope stack and make it current */ diff --git a/sys/contrib/dev/acpica/acconfig.h b/sys/contrib/dev/acpica/acconfig.h index ad40cf2..cb41ade 100644 --- a/sys/contrib/dev/acpica/acconfig.h +++ b/sys/contrib/dev/acpica/acconfig.h @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acconfig.h - Global configuration constants - * $Revision: 48 $ + * $Revision: 49 $ * *****************************************************************************/ @@ -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/acfreebsd.h b/sys/contrib/dev/acpica/acfreebsd.h index 8b62fc3..f60ae88 100644 --- a/sys/contrib/dev/acpica/acfreebsd.h +++ b/sys/contrib/dev/acpica/acfreebsd.h @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acfreebsd.h - OS specific defines, etc. - * $Revision: 1 $ + * $Revision: 2 $ * *****************************************************************************/ @@ -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/acgcc.h b/sys/contrib/dev/acpica/acgcc.h index abbfa98..aa57a34 100644 --- a/sys/contrib/dev/acpica/acgcc.h +++ b/sys/contrib/dev/acpica/acgcc.h @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acgcc.h - GCC specific defines, etc. - * $Revision: 2 $ + * $Revision: 3 $ * *****************************************************************************/ @@ -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/acpixf.h b/sys/contrib/dev/acpica/acpixf.h index 410a35d..48e232c 100644 --- a/sys/contrib/dev/acpica/acpixf.h +++ b/sys/contrib/dev/acpica/acpixf.h @@ -1,7 +1,7 @@ /****************************************************************************** * - * Name: acxface.h - External interfaces to the ACPI subsystem + * Name: acpixf.h - External interfaces to the ACPI subsystem * *****************************************************************************/ @@ -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/psparse.c b/sys/contrib/dev/acpica/psparse.c index 258e679..d043cf8 100644 --- a/sys/contrib/dev/acpica/psparse.c +++ b/sys/contrib/dev/acpica/psparse.c @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: psparse - Parser top level AML parse routines - * $Revision: 69 $ + * $Revision: 71 $ * *****************************************************************************/ @@ -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 * @@ -381,9 +381,9 @@ AcpiPsCompleteThisOp ( break; case OPTYPE_NAMED_OBJECT: /* Scope, method, etc. */ - - /* - * These opcodes contain TermArg operands. The current + + /* + * These opcodes contain TermArg operands. The current * op must be replace by a placeholder return op */ @@ -800,8 +800,8 @@ AcpiPsParseLoop ( * because we don't have enough info in the first pass * to parse it correctly (i.e., there may be method * calls within the TermArg elements of the body. - * - * However, we must continue parsing because + * + * However, we must continue parsing because * the opregion is not a standalone package -- * we don't know where the end is at this point. * @@ -833,7 +833,7 @@ AcpiPsParseLoop ( (Op->Opcode == AML_DWORD_FIELD_OP)) { /* - * Backup to beginning of CreateXXXfield declaration + * Backup to beginning of CreateXXXfield declaration * BodyLength is unknown until we parse the body */ DeferredOp = (ACPI_PARSE2_OBJECT *) Op; @@ -1228,7 +1228,6 @@ AcpiPsParseAml ( ACPI_OPERAND_OBJECT *ReturnDesc; ACPI_OPERAND_OBJECT *EffectiveReturnDesc = NULL; ACPI_OPERAND_OBJECT *MthDesc = NULL; - ACPI_NAMESPACE_NODE *StartNode; FUNCTION_TRACE ("PsParseAml"); @@ -1277,21 +1276,17 @@ AcpiPsParseAml ( if (MethodNode) { - StartNode = MethodNode; ParserState->StartNode = MethodNode; WalkState->WalkType = WALK_METHOD; - if (StartNode) - { - /* Push start scope on scope stack and make it current */ - - Status = AcpiDsScopeStackPush (StartNode, ACPI_TYPE_METHOD, WalkState); - if (ACPI_FAILURE (Status)) - { - return_ACPI_STATUS (Status); - } + /* Push start scope on scope stack and make it current */ + Status = AcpiDsScopeStackPush (MethodNode, ACPI_TYPE_METHOD, WalkState); + if (ACPI_FAILURE (Status)) + { + return_ACPI_STATUS (Status); } + /* Init arguments if this is a control method */ /* TBD: [Restructure] add walkstate as a param */ @@ -1303,6 +1298,8 @@ AcpiPsParseAml ( /* Setup the current scope */ Node = ParserState->StartOp->Node; + ParserState->StartNode = Node; + if (Node) { /* Push start scope on scope stack and make it current */ -- cgit v1.1