Index: contrib/dev/acpica/acconfig.h =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/acconfig.h,v retrieving revision 1.21 diff -u -r1.21 acconfig.h --- contrib/dev/acpica/acconfig.h 29 Aug 2002 01:52:25 -0000 1.21 +++ contrib/dev/acpica/acconfig.h 20 Sep 2002 13:10:04 -0000 @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acconfig.h - Global configuration constants - * $Revision: 109 $ + * $Revision: 111 $ * *****************************************************************************/ @@ -145,7 +145,7 @@ /* Version string */ -#define ACPI_CA_VERSION 0x20020815 +#define ACPI_CA_VERSION 0x20020918 /* Version of ACPI supported */ Index: contrib/dev/acpica/acdebug.h =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/acdebug.h,v retrieving revision 1.1.1.13 diff -u -r1.1.1.13 acdebug.h --- contrib/dev/acpica/acdebug.h 30 Jul 2002 19:33:33 -0000 1.1.1.13 +++ contrib/dev/acpica/acdebug.h 20 Sep 2002 13:10:04 -0000 @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acdebug.h - ACPI/AML debugger - * $Revision: 63 $ + * $Revision: 64 $ * *****************************************************************************/ @@ -287,6 +287,10 @@ AcpiDbDecodeAndDisplayObject ( NATIVE_CHAR *Target, NATIVE_CHAR *OutputType); + +void +AcpiDbDecodeNode ( + ACPI_NAMESPACE_NODE *Node); void AcpiDbDisplayResultObject ( Index: contrib/dev/acpica/acexcep.h =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/acexcep.h,v retrieving revision 1.1.1.11 diff -u -r1.1.1.11 acexcep.h --- contrib/dev/acpica/acexcep.h 9 Jul 2002 17:51:22 -0000 1.1.1.11 +++ contrib/dev/acpica/acexcep.h 20 Sep 2002 13:10:04 -0000 @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acexcep.h - Exception codes returned by the ACPI subsystem - * $Revision: 63 $ + * $Revision: 64 $ * *****************************************************************************/ @@ -233,8 +233,9 @@ #define AE_AML_ALIGNMENT (ACPI_STATUS) (0x001D | AE_CODE_AML) #define AE_AML_NO_RESOURCE_END_TAG (ACPI_STATUS) (0x001E | AE_CODE_AML) #define AE_AML_BAD_RESOURCE_VALUE (ACPI_STATUS) (0x001F | AE_CODE_AML) +#define AE_AML_CIRCULAR_REFERENCE (ACPI_STATUS) (0x0020 | AE_CODE_AML) -#define AE_CODE_AML_MAX 0x001F +#define AE_CODE_AML_MAX 0x0020 /* * Internal exceptions used for control @@ -249,8 +250,9 @@ #define AE_CTRL_TRANSFER (ACPI_STATUS) (0x0008 | AE_CODE_CONTROL) #define AE_CTRL_BREAK (ACPI_STATUS) (0x0009 | AE_CODE_CONTROL) #define AE_CTRL_CONTINUE (ACPI_STATUS) (0x000A | AE_CODE_CONTROL) +#define AE_CTRL_SKIP (ACPI_STATUS) (0x000B | AE_CODE_CONTROL) -#define AE_CODE_CTRL_MAX 0x000A +#define AE_CODE_CTRL_MAX 0x000B #ifdef DEFINE_ACPI_GLOBALS @@ -346,7 +348,8 @@ "AE_AML_NO_WHILE", "AE_AML_ALIGNMENT", "AE_AML_NO_RESOURCE_END_TAG", - "AE_AML_BAD_RESOURCE_VALUE" + "AE_AML_BAD_RESOURCE_VALUE", + "AE_AML_CIRCULAR_REFERENCE" }; NATIVE_CHAR const *AcpiGbl_ExceptionNames_Ctrl[] = @@ -360,7 +363,8 @@ "AE_CTRL_END", "AE_CTRL_TRANSFER", "AE_CTRL_BREAK", - "AE_CTRL_CONTINUE" + "AE_CTRL_CONTINUE", + "AE_CTRL_SKIP" }; #endif /* ACPI GLOBALS */ Index: contrib/dev/acpica/acglobal.h =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/acglobal.h,v retrieving revision 1.1.1.14 diff -u -r1.1.1.14 acglobal.h --- contrib/dev/acpica/acglobal.h 29 Aug 2002 01:51:16 -0000 1.1.1.14 +++ contrib/dev/acpica/acglobal.h 20 Sep 2002 13:10:05 -0000 @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acglobal.h - Declarations for global variables - * $Revision: 130 $ + * $Revision: 131 $ * *****************************************************************************/ @@ -227,6 +227,7 @@ ACPI_EXTERN BOOLEAN AcpiGbl_StepToNextCall; ACPI_EXTERN BOOLEAN AcpiGbl_AcpiHardwarePresent; ACPI_EXTERN BOOLEAN AcpiGbl_GlobalLockPresent; +ACPI_EXTERN BOOLEAN AcpiGbl_EventsInitialized; extern BOOLEAN AcpiGbl_Shutdown; extern UINT32 AcpiGbl_StartupFlags; Index: contrib/dev/acpica/acinterp.h =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/acinterp.h,v retrieving revision 1.1.1.15 diff -u -r1.1.1.15 acinterp.h --- contrib/dev/acpica/acinterp.h 9 Jul 2002 17:51:22 -0000 1.1.1.15 +++ contrib/dev/acpica/acinterp.h 20 Sep 2002 13:10:05 -0000 @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acinterp.h - Interpreter subcomponent prototypes and defines - * $Revision: 138 $ + * $Revision: 139 $ * *****************************************************************************/ @@ -284,6 +284,13 @@ ACPI_OPERAND_OBJECT *ObjDesc, ACPI_OPERAND_OBJECT **ReturnDesc, ACPI_WALK_STATE *WalkState); + +ACPI_STATUS +AcpiExResolveMultiple ( + ACPI_WALK_STATE *WalkState, + ACPI_OPERAND_OBJECT *Operand, + ACPI_OBJECT_TYPE *ReturnType, + ACPI_OPERAND_OBJECT **ReturnDesc); ACPI_STATUS AcpiExConcatTemplate ( Index: contrib/dev/acpica/aclocal.h =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/aclocal.h,v retrieving revision 1.1.1.19 diff -u -r1.1.1.19 aclocal.h --- contrib/dev/acpica/aclocal.h 29 Aug 2002 01:51:16 -0000 1.1.1.19 +++ contrib/dev/acpica/aclocal.h 20 Sep 2002 13:10:05 -0000 @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: aclocal.h - Internal data types used across the ACPI subsystem - * $Revision: 175 $ + * $Revision: 176 $ * *****************************************************************************/ @@ -758,8 +758,8 @@ UINT32 AmlSubtreeLength; UINT32 FinalAmlLength; UINT32 FinalAmlOffset; + UINT32 CompileFlags; UINT16 ParseOpcode; - UINT16 CompileFlags; UINT8 AmlOpcodeLength; UINT8 AmlPkgLenBytes; UINT8 Extra; Index: contrib/dev/acpica/acparser.h =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/acparser.h,v retrieving revision 1.1.1.10 diff -u -r1.1.1.10 acparser.h --- contrib/dev/acpica/acparser.h 29 Aug 2002 01:51:17 -0000 1.1.1.10 +++ contrib/dev/acpica/acparser.h 20 Sep 2002 13:10:05 -0000 @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: acparser.h - AML Parser subcomponent prototypes and defines - * $Revision: 61 $ + * $Revision: 62 $ * *****************************************************************************/ @@ -135,6 +135,7 @@ #define ACPI_PARSE_EXECUTE 0x0030 #define ACPI_PARSE_MODE_MASK 0x0030 +#define ACPI_PARSE_DEFERRED_OP 0x0100 /* Parser external interfaces */ Index: contrib/dev/acpica/actbl2.h =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/actbl2.h,v retrieving revision 1.1.1.5 diff -u -r1.1.1.5 actbl2.h --- contrib/dev/acpica/actbl2.h 23 Feb 2002 05:10:35 -0000 1.1.1.5 +++ contrib/dev/acpica/actbl2.h 20 Sep 2002 13:10:05 -0000 @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: actbl2.h - ACPI Specification Revision 2.0 Tables - * $Revision: 27 $ + * $Revision: 28 $ * *****************************************************************************/ @@ -230,8 +230,8 @@ UINT16 Plvl3Lat; /* Worst case HW latency to enter/exit C3 state */ UINT16 FlushSize; /* Number of flush strides that need to be read */ UINT16 FlushStride; /* Processor's memory cache line width, in bytes */ - UINT8 DutyOffset; /* Processor’s duty cycle index in processor's P_CNT reg*/ - UINT8 DutyWidth; /* Processor’s duty cycle value bit width in P_CNT register.*/ + UINT8 DutyOffset; /* Processor's duty cycle index in processor's P_CNT reg*/ + UINT8 DutyWidth; /* Processor's duty cycle value bit width in P_CNT register.*/ UINT8 DayAlrm; /* Index to day-of-month alarm in RTC CMOS RAM */ UINT8 MonAlrm; /* Index to month-of-year alarm in RTC CMOS RAM */ UINT8 Century; /* Index to century in RTC CMOS RAM */ Index: contrib/dev/acpica/actypes.h =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/actypes.h,v retrieving revision 1.1.1.19 diff -u -r1.1.1.19 actypes.h --- contrib/dev/acpica/actypes.h 30 Jul 2002 19:33:34 -0000 1.1.1.19 +++ contrib/dev/acpica/actypes.h 20 Sep 2002 13:10:05 -0000 @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: actypes.h - Common data types for the entire ACPI subsystem - * $Revision: 238 $ + * $Revision: 239 $ * *****************************************************************************/ @@ -1306,7 +1306,7 @@ #define ACPI_SIZEOF_RESOURCE(Type) (ACPI_RESOURCE_LENGTH_NO_DATA + sizeof (Type)) -#define ACPI_NEXT_RESOURCE(Res) (ACPI_RESOURCE *)((UINT8 *) Res + Res->length) +#define ACPI_NEXT_RESOURCE(Res) (ACPI_RESOURCE *)((UINT8 *) Res + Res->Length) #ifdef _HW_ALIGNMENT_SUPPORT #define ACPI_ALIGN_RESOURCE_SIZE(Length) (Length) Index: contrib/dev/acpica/acutils.h =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/acutils.h,v retrieving revision 1.4 diff -u -r1.4 acutils.h --- contrib/dev/acpica/acutils.h 29 Aug 2002 01:52:26 -0000 1.4 +++ contrib/dev/acpica/acutils.h 20 Sep 2002 13:10:05 -0000 @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acutils.h -- prototypes for the common (subsystem-wide) procedures - * $Revision: 143 $ + * $Revision: 144 $ * *****************************************************************************/ @@ -229,7 +229,7 @@ #ifndef ACPI_USE_SYSTEM_CLIBRARY -UINT32 +ACPI_SIZE AcpiUtStrlen ( const NATIVE_CHAR *String); @@ -242,15 +242,15 @@ AcpiUtStrncpy ( NATIVE_CHAR *DstString, const NATIVE_CHAR *SrcString, - NATIVE_UINT Count); + ACPI_SIZE Count); int AcpiUtStrncmp ( const NATIVE_CHAR *String1, const NATIVE_CHAR *String2, - NATIVE_UINT Count); + ACPI_SIZE Count); -UINT32 +int AcpiUtStrcmp ( const NATIVE_CHAR *String1, const NATIVE_CHAR *String2); @@ -264,7 +264,7 @@ AcpiUtStrncat ( NATIVE_CHAR *DstString, const NATIVE_CHAR *SrcString, - NATIVE_UINT Count); + ACPI_SIZE Count); UINT32 AcpiUtStrtoul ( @@ -281,13 +281,13 @@ AcpiUtMemcpy ( void *Dest, const void *Src, - NATIVE_UINT Count); + ACPI_SIZE Count); void * AcpiUtMemset ( void *Dest, NATIVE_UINT Value, - NATIVE_UINT Count); + ACPI_SIZE Count); int AcpiUtToUpper ( Index: contrib/dev/acpica/dbcmds.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dbcmds.c,v retrieving revision 1.3 diff -u -r1.3 dbcmds.c --- contrib/dev/acpica/dbcmds.c 29 Aug 2002 01:52:26 -0000 1.3 +++ contrib/dev/acpica/dbcmds.c 20 Sep 2002 13:10:04 -0000 @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: dbcmds - debug commands and output routines - * $Revision: 87 $ + * $Revision: 88 $ * ******************************************************************************/ @@ -283,7 +283,8 @@ if (AcpiGbl_AcpiTables[i].Pointer) { AcpiOsPrintf ("%s at %p length %X\n", AcpiGbl_AcpiTableData[i].Name, - AcpiGbl_AcpiTables[i].Pointer, AcpiGbl_AcpiTables[i].Length); + AcpiGbl_AcpiTables[i].Pointer, + (UINT32) AcpiGbl_AcpiTables[i].Length); } } } @@ -785,7 +786,7 @@ return (AE_OK); } - AcpiOsPrintf ("%32s", Buffer.Pointer); + AcpiOsPrintf ("%32s", (char *) Buffer.Pointer); ACPI_MEM_FREE (Buffer.Pointer); @@ -796,11 +797,14 @@ switch (ACPI_GET_OBJECT_TYPE (ObjDesc)) { case ACPI_TYPE_METHOD: - AcpiOsPrintf (" #Args %d Concurrency %X", ObjDesc->Method.ParamCount, ObjDesc->Method.Concurrency); + AcpiOsPrintf (" #Args %d Concurrency %X", + ObjDesc->Method.ParamCount, ObjDesc->Method.Concurrency); break; case ACPI_TYPE_INTEGER: - AcpiOsPrintf (" Value %X", ObjDesc->Integer.Value); + AcpiOsPrintf (" Value %8.8X%8.8X", + ACPI_HIDWORD (ObjDesc->Integer.Value), + ACPI_LODWORD (ObjDesc->Integer.Value)); break; case ACPI_TYPE_STRING: @@ -808,7 +812,11 @@ break; case ACPI_TYPE_REGION: - AcpiOsPrintf (" SpaceId %X Address %X Length %X", ObjDesc->Region.SpaceId, ObjDesc->Region.Address, ObjDesc->Region.Length); + AcpiOsPrintf (" SpaceId %X Length %X Address %8.8X%8.8X", + ObjDesc->Region.SpaceId, + ObjDesc->Region.Length, + ACPI_HIDWORD (ObjDesc->Region.Address), + ACPI_LODWORD (ObjDesc->Region.Address)); break; case ACPI_TYPE_PACKAGE: @@ -928,7 +936,7 @@ } else { - AcpiOsPrintf ("%32s (%p) - %s\n", Buffer.Pointer, ObjHandle, + AcpiOsPrintf ("%32s (%p) - %s\n", (char *) Buffer.Pointer, ObjHandle, AcpiUtGetTypeName (((ACPI_NAMESPACE_NODE *) ObjHandle)->Type)); ACPI_MEM_FREE (Buffer.Pointer); } Index: contrib/dev/acpica/dbdisply.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dbdisply.c,v retrieving revision 1.1.1.17 diff -u -r1.1.1.17 dbdisply.c --- contrib/dev/acpica/dbdisply.c 29 Aug 2002 01:51:15 -0000 1.1.1.17 +++ contrib/dev/acpica/dbdisply.c 20 Sep 2002 13:10:04 -0000 @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: dbdisply - debug display commands - * $Revision: 78 $ + * $Revision: 79 $ * ******************************************************************************/ @@ -358,7 +358,7 @@ else { - AcpiOsPrintf ("Object (%p) Pathname: %s\n", Node, RetBuf.Pointer); + AcpiOsPrintf ("Object (%p) Pathname: %s\n", Node, (char *) RetBuf.Pointer); } if (!AcpiOsReadable (Node, sizeof (ACPI_NAMESPACE_NODE))) @@ -407,7 +407,7 @@ if (!ObjDesc) { - AcpiOsPrintf (" Uninitialized\n"); + AcpiOsPrintf (" Uninitialized"); return; } @@ -546,7 +546,7 @@ Type = ACPI_GET_OBJECT_TYPE (ObjDesc); if (Type > INTERNAL_TYPE_MAX) { - AcpiOsPrintf (" Type %hX [Invalid Type]", Type); + AcpiOsPrintf (" Type %X [Invalid Type]", (UINT32) Type); return; } @@ -591,13 +591,20 @@ case AML_INDEX_OP: AcpiOsPrintf ("[Index] "); - AcpiDbDecodeInternalObject (ObjDesc->Reference.Object); + if (!ObjDesc->Reference.Where) + { + AcpiOsPrintf ("Uninitialized WHERE ptr"); + } + else + { + AcpiDbDecodeInternalObject (*(ObjDesc->Reference.Where)); + } break; case AML_REF_OF_OP: - AcpiOsPrintf ("[Reference] "); + AcpiOsPrintf ("[RefOf] "); /* Reference can be to a Node or an Operand object */ Index: contrib/dev/acpica/dbexec.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dbexec.c,v retrieving revision 1.1.1.15 diff -u -r1.1.1.15 dbexec.c --- contrib/dev/acpica/dbexec.c 29 Aug 2002 01:51:15 -0000 1.1.1.15 +++ contrib/dev/acpica/dbexec.c 20 Sep 2002 13:10:04 -0000 @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: dbexec - debugger control method execution - * $Revision: 44 $ + * $Revision: 45 $ * ******************************************************************************/ @@ -363,7 +363,8 @@ if (ReturnObj.Length) { AcpiOsPrintf ("Execution of %s returned object %p Buflen %X\n", - AcpiGbl_DbMethodInfo.Pathname, ReturnObj.Pointer, ReturnObj.Length); + AcpiGbl_DbMethodInfo.Pathname, ReturnObj.Pointer, + (UINT32) ReturnObj.Length); AcpiDbDumpObject (ReturnObj.Pointer, 1); } else @@ -408,7 +409,7 @@ if (ReturnObj.Length) { AcpiOsPrintf ("Execution of %s returned object %p Buflen %X\n", - Info->Pathname, ReturnObj.Pointer, ReturnObj.Length); + Info->Pathname, ReturnObj.Pointer, (UINT32) ReturnObj.Length); AcpiDbDumpObject (ReturnObj.Pointer, 1); } } Index: contrib/dev/acpica/dbinput.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dbinput.c,v retrieving revision 1.1.1.14 diff -u -r1.1.1.14 dbinput.c --- contrib/dev/acpica/dbinput.c 29 Aug 2002 01:51:15 -0000 1.1.1.14 +++ contrib/dev/acpica/dbinput.c 20 Sep 2002 13:10:04 -0000 @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: dbinput - user front-end to the AML debugger - * $Revision: 87 $ + * $Revision: 88 $ * ******************************************************************************/ @@ -341,7 +341,7 @@ return; default: - AcpiOsPrintf ("Unrecognized Command Class: %X\n", HelpType); + AcpiOsPrintf ("Unrecognized Command Class: %s\n", HelpType); return; } } Index: contrib/dev/acpica/dbstats.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dbstats.c,v retrieving revision 1.1.1.12 diff -u -r1.1.1.12 dbstats.c --- contrib/dev/acpica/dbstats.c 29 Aug 2002 01:51:15 -0000 1.1.1.12 +++ contrib/dev/acpica/dbstats.c 20 Sep 2002 13:10:04 -0000 @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: dbstats - Generation and display of ACPI table statistics - * $Revision: 61 $ + * $Revision: 62 $ * ******************************************************************************/ @@ -412,7 +412,7 @@ AcpiOsPrintf ("\nObjects defined in the current namespace:\n\n"); - AcpiOsPrintf ("%16.16s % 10.10s % 10.10s\n", "ACPI_TYPE", "NODES", "OBJECTS"); + AcpiOsPrintf ("%16.16s %10.10s %10.10s\n", "ACPI_TYPE", "NODES", "OBJECTS"); for (i = 0; i < INTERNAL_TYPE_NODE_MAX; i++) { Index: contrib/dev/acpica/dbxface.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dbxface.c,v retrieving revision 1.3 diff -u -r1.3 dbxface.c --- contrib/dev/acpica/dbxface.c 29 Aug 2002 01:52:26 -0000 1.3 +++ contrib/dev/acpica/dbxface.c 20 Sep 2002 13:10:04 -0000 @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: dbxface - AML Debugger external interfaces - * $Revision: 64 $ + * $Revision: 65 $ * ******************************************************************************/ @@ -294,7 +294,12 @@ /* Restore everything */ Op->Common.Next = Next; - AcpiOsPrintf ("\n\n"); + AcpiOsPrintf ("\n"); + if ((AcpiGbl_DbOutputToFile) || + (AcpiDbgLevel & ACPI_LV_PARSE)) + { + AcpiOsPrintf ("\n"); + } AcpiDbgLevel = OriginalDebugLevel; } Index: contrib/dev/acpica/dmnames.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dmnames.c,v retrieving revision 1.1.1.2 diff -u -r1.1.1.2 dmnames.c --- contrib/dev/acpica/dmnames.c 29 Aug 2002 01:51:15 -0000 1.1.1.2 +++ contrib/dev/acpica/dmnames.c 20 Sep 2002 13:10:04 -0000 @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: dmnames - AML disassembler, names, namestrings, pathnames - * $Revision: 3 $ + * $Revision: 4 $ * ******************************************************************************/ @@ -145,7 +145,19 @@ char *Name, ACPI_PARSE_OBJECT *Op) { + #if 0 + if ((!Name) || + (!Op->Common.Parent)) + { + return; + } + + if (!Op->Common.Node) + { + AcpiOsPrintf (" /**** Name not found or not accessible from this scope ****/ "); + } + ACPI_PARSE_OBJECT *TargetOp; Index: contrib/dev/acpica/dsfield.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dsfield.c,v retrieving revision 1.1.1.11 diff -u -r1.1.1.11 dsfield.c --- contrib/dev/acpica/dsfield.c 29 Aug 2002 01:51:17 -0000 1.1.1.11 +++ contrib/dev/acpica/dsfield.c 20 Sep 2002 13:10:05 -0000 @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: dsfield - Dispatcher field routines - * $Revision: 66 $ + * $Revision: 67 $ * *****************************************************************************/ @@ -356,7 +356,7 @@ } ACPI_REPORT_ERROR (("Field name [%4.4s] already exists in current scope\n", - &Arg->Named.Name)); + (char *) &Arg->Named.Name)); } else { @@ -380,7 +380,7 @@ if (Position > ACPI_UINT32_MAX) { ACPI_REPORT_ERROR (("Field [%4.4s] bit offset too large (> 0xFFFFFFFF)\n", - &Info->FieldNode->Name)); + (char *) &Info->FieldNode->Name)); return_ACPI_STATUS (AE_SUPPORT); } @@ -533,7 +533,7 @@ } ACPI_REPORT_ERROR (("Field name [%4.4s] already exists in current scope\n", - &Arg->Named.Name)); + (char *) &Arg->Named.Name)); /* Name already exists, just ignore this error */ Index: contrib/dev/acpica/dsobject.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dsobject.c,v retrieving revision 1.1.1.18 diff -u -r1.1.1.18 dsobject.c --- contrib/dev/acpica/dsobject.c 29 Aug 2002 01:51:18 -0000 1.1.1.18 +++ contrib/dev/acpica/dsobject.c 20 Sep 2002 13:10:05 -0000 @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: dsobject - Dispatcher object management routines - * $Revision: 106 $ + * $Revision: 107 $ * *****************************************************************************/ @@ -881,9 +881,10 @@ ObjDesc->Reference.Opcode = AML_LOCAL_OP; ObjDesc->Reference.Offset = Opcode - AML_LOCAL_OP; + #ifndef ACPI_NO_METHOD_EXECUTION - AcpiDsMethodDataGetNode (AML_LOCAL_OP, ObjDesc->Reference.Offset, - WalkState, (ACPI_NAMESPACE_NODE **) &ObjDesc->Reference.Object); + Status = AcpiDsMethodDataGetNode (AML_LOCAL_OP, ObjDesc->Reference.Offset, + WalkState, (ACPI_NAMESPACE_NODE **) &ObjDesc->Reference.Object); #endif break; Index: contrib/dev/acpica/dsopcode.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dsopcode.c,v retrieving revision 1.1.1.17 diff -u -r1.1.1.17 dsopcode.c --- contrib/dev/acpica/dsopcode.c 29 Aug 2002 01:51:18 -0000 1.1.1.17 +++ contrib/dev/acpica/dsopcode.c 20 Sep 2002 13:10:05 -0000 @@ -2,7 +2,7 @@ * * Module Name: dsopcode - Dispatcher Op Region support and handling of * "control" opcodes - * $Revision: 81 $ + * $Revision: 82 $ * *****************************************************************************/ @@ -188,7 +188,7 @@ return_ACPI_STATUS (Status); } - WalkState->ParseFlags = 0; + WalkState->ParseFlags = ACPI_PARSE_DEFERRED_OP; /* Pass1: Parse the entire declaration */ Index: contrib/dev/acpica/dswload.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dswload.c,v retrieving revision 1.1.1.16 diff -u -r1.1.1.16 dswload.c --- contrib/dev/acpica/dswload.c 29 Aug 2002 01:51:20 -0000 1.1.1.16 +++ contrib/dev/acpica/dswload.c 20 Sep 2002 13:10:05 -0000 @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: dswload - Dispatcher namespace load callbacks - * $Revision: 70 $ + * $Revision: 73 $ * *****************************************************************************/ @@ -202,25 +202,30 @@ ACPI_STATUS Status; ACPI_OBJECT_TYPE ObjectType; NATIVE_CHAR *Path; + UINT32 Flags; ACPI_FUNCTION_NAME ("DsLoad1BeginOp"); + Op = WalkState->Op; ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Op=%p State=%p\n", Op, WalkState)); - - if (Op && (Op->Common.AmlOpcode == AML_INT_NAMEDFIELD_OP)) - { - ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Op=%p State=%p\n", Op, WalkState)); - } - /* We are only interested in opcodes that have an associated name */ if (Op) { if (!(WalkState->OpInfo->Flags & AML_NAMED)) { +#if 0 + if ((WalkState->OpInfo->Class == AML_CLASS_EXECUTE) || + (WalkState->OpInfo->Class == AML_CLASS_CONTROL)) + { + AcpiOsPrintf ("\n\n***EXECUTABLE OPCODE %s***\n\n", WalkState->OpInfo->Name); + *OutOp = Op; + return (AE_CTRL_SKIP); + } +#endif *OutOp = Op; return (AE_OK); } @@ -241,7 +246,33 @@ ObjectType = WalkState->OpInfo->ObjectType; ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, - "State=%p Op=%p Type=%X\n", WalkState, Op, ObjectType)); + "State=%p Op=%p [%s] ", WalkState, Op, AcpiUtGetTypeName (ObjectType))); + + /* + * Setup the search flags. + * + * Since we are entering a name into the namespace, we do not want to + * enable the search-to-root upsearch. + * + * There are only two conditions where it is acceptable that the name + * already exists: + * 1) the Scope() operator can reopen a scoping object that was + * previously defined (Scope, Method, Device, etc.) + * 2) Whenever we are parsing a deferred opcode (OpRegion, Buffer, + * BufferField, or Package), the name of the object is already + * in the namespace. + */ + Flags = ACPI_NS_NO_UPSEARCH; + if ((WalkState->Opcode != AML_SCOPE_OP) && + (!(WalkState->ParseFlags & ACPI_PARSE_DEFERRED_OP))) + { + Flags |= ACPI_NS_ERROR_IF_FOUND; + ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DISPATCH, "Cannot already exist\n")); + } + else + { + ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DISPATCH, "Both Find or Create allowed\n")); + } /* * Enter the named type into the internal namespace. We enter the name @@ -249,13 +280,60 @@ * arguments to the opcode must be created as we go back up the parse tree later. */ Status = AcpiNsLookup (WalkState->ScopeInfo, Path, ObjectType, - ACPI_IMODE_LOAD_PASS1, ACPI_NS_NO_UPSEARCH, WalkState, &(Node)); - + ACPI_IMODE_LOAD_PASS1, Flags, WalkState, &(Node)); if (ACPI_FAILURE (Status)) { return (Status); } + /* + * For the scope op, we must check to make sure that the target is + * one of the opcodes that actually opens a scope + */ + if (WalkState->Opcode == AML_SCOPE_OP) + { + switch (Node->Type) + { + case ACPI_TYPE_ANY: /* Scope nodes are untyped (ANY) */ + case ACPI_TYPE_DEVICE: + case ACPI_TYPE_METHOD: + case ACPI_TYPE_POWER: + case ACPI_TYPE_PROCESSOR: + case ACPI_TYPE_THERMAL: + + /* These are acceptable types */ + break; + + case ACPI_TYPE_INTEGER: + case ACPI_TYPE_STRING: + case ACPI_TYPE_BUFFER: + + /* + * These types we will allow, but we will change the type. This + * enables some existing code of the form: + * + * Name (DEB, 0) + * Scope (DEB) { ... } + */ + + ACPI_REPORT_WARNING (("Invalid type (%s) for target of Scope operator [%4.4s], changing type to ANY\n", + AcpiUtGetTypeName (Node->Type), Path)); + + Node->Type = ACPI_TYPE_ANY; + WalkState->ScopeInfo->Common.Value = ACPI_TYPE_ANY; + break; + + default: + + /* All other types are an error */ + + ACPI_REPORT_ERROR (("Invalid type (%s) for target of Scope operator [%4.4s]\n", + AcpiUtGetTypeName (Node->Type), Path)); + + return (AE_AML_OPERAND_TYPE); + } + } + if (!Op) { /* Create a new op */ @@ -314,10 +392,10 @@ ACPI_FUNCTION_NAME ("DsLoad1EndOp"); + Op = WalkState->Op; ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Op=%p State=%p\n", Op, WalkState)); - /* We are only interested in opcodes that have an associated name */ if (!(WalkState->OpInfo->Flags & (AML_NAMED | AML_FIELD))) @@ -506,6 +584,53 @@ if (ACPI_SUCCESS (Status)) { + /* + * For the scope op, we must check to make sure that the target is + * one of the opcodes that actually opens a scope + */ + if (WalkState->Opcode == AML_SCOPE_OP) + { + switch (Node->Type) + { + case ACPI_TYPE_ANY: /* Scope nodes are untyped (ANY) */ + case ACPI_TYPE_DEVICE: + case ACPI_TYPE_METHOD: + case ACPI_TYPE_POWER: + case ACPI_TYPE_PROCESSOR: + case ACPI_TYPE_THERMAL: + + /* These are acceptable types */ + break; + + case ACPI_TYPE_INTEGER: + case ACPI_TYPE_STRING: + case ACPI_TYPE_BUFFER: + + /* + * These types we will allow, but we will change the type. This + * enables some existing code of the form: + * + * Name (DEB, 0) + * Scope (DEB) { ... } + */ + + ACPI_REPORT_WARNING (("Invalid type (%s) for target of Scope operator [%4.4s], changing type to ANY\n", + AcpiUtGetTypeName (Node->Type), BufferPtr)); + + Node->Type = ACPI_TYPE_ANY; + WalkState->ScopeInfo->Common.Value = ACPI_TYPE_ANY; + break; + + default: + + /* All other types are an error */ + + ACPI_REPORT_ERROR (("Invalid type (%s) for target of Scope operator [%4.4s]\n", + AcpiUtGetTypeName (Node->Type), BufferPtr)); + + return (AE_AML_OPERAND_TYPE); + } + } if (!Op) { /* Create a new op */ Index: contrib/dev/acpica/evevent.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/evevent.c,v retrieving revision 1.1.1.18 diff -u -r1.1.1.18 evevent.c --- contrib/dev/acpica/evevent.c 29 Aug 2002 01:51:15 -0000 1.1.1.18 +++ contrib/dev/acpica/evevent.c 20 Sep 2002 13:10:04 -0000 @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: evevent - Fixed and General Purpose Even handling and dispatch - * $Revision: 90 $ + * $Revision: 91 $ * *****************************************************************************/ @@ -234,6 +234,7 @@ return_ACPI_STATUS (Status); } + AcpiGbl_EventsInitialized = TRUE; return_ACPI_STATUS (Status); } Index: contrib/dev/acpica/evmisc.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/evmisc.c,v retrieving revision 1.1.1.16 diff -u -r1.1.1.16 evmisc.c --- contrib/dev/acpica/evmisc.c 29 Aug 2002 01:51:15 -0000 1.1.1.16 +++ contrib/dev/acpica/evmisc.c 20 Sep 2002 13:10:04 -0000 @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: evmisc - Miscellaneous event manager support functions - * $Revision: 56 $ + * $Revision: 57 $ * *****************************************************************************/ @@ -667,7 +667,7 @@ * * RETURN: none * - * DESCRIPTION: free memory allocated for table storage. + * DESCRIPTION: Disable events and free memory allocated for table storage. * ******************************************************************************/ @@ -680,45 +680,49 @@ ACPI_FUNCTION_TRACE ("EvTerminate"); - /* - * Disable all event-related functionality. - * In all cases, on error, print a message but obviously we don't abort. - */ - /* - * Disable all fixed events - */ - for (i = 0; i < ACPI_NUM_FIXED_EVENTS; i++) + if (AcpiGbl_EventsInitialized) { - Status = AcpiDisableEvent(i, ACPI_EVENT_FIXED, 0); - if (ACPI_FAILURE (Status)) + /* + * Disable all event-related functionality. + * In all cases, on error, print a message but obviously we don't abort. + */ + + /* + * Disable all fixed events + */ + for (i = 0; i < ACPI_NUM_FIXED_EVENTS; i++) { - ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Failed to disable fixed event %d.\n", i)); + Status = AcpiDisableEvent(i, ACPI_EVENT_FIXED, 0); + if (ACPI_FAILURE (Status)) + { + ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not disable fixed event %d\n", i)); + } } - } - /* - * Disable all GPEs - */ - for (i = 0; i < AcpiGbl_GpeNumberMax; i++) - { - if (AcpiEvGetGpeNumberIndex(i) != ACPI_GPE_INVALID) + /* + * Disable all GPEs + */ + for (i = 0; i < AcpiGbl_GpeNumberMax; i++) { - Status = AcpiHwDisableGpe(i); - if (ACPI_FAILURE (Status)) + if (AcpiEvGetGpeNumberIndex(i) != ACPI_GPE_INVALID) { - ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Failed to disable GPE %d.\n", i)); + Status = AcpiHwDisableGpe(i); + if (ACPI_FAILURE (Status)) + { + ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not disable GPE %d\n", i)); + } } } - } - /* - * Remove SCI handler - */ - Status = AcpiEvRemoveSciHandler(); - if (ACPI_FAILURE(Status)) - { - ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Unable to remove SCI handler.\n")); + /* + * Remove SCI handler + */ + Status = AcpiEvRemoveSciHandler(); + if (ACPI_FAILURE(Status)) + { + ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not remove SCI handler\n")); + } } /* @@ -729,7 +733,7 @@ Status = AcpiDisable (); if (ACPI_FAILURE (Status)) { - ACPI_DEBUG_PRINT ((ACPI_DB_WARN, "AcpiDisable failed.\n")); + ACPI_DEBUG_PRINT ((ACPI_DB_WARN, "AcpiDisable failed\n")); } } Index: contrib/dev/acpica/exconvrt.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/exconvrt.c,v retrieving revision 1.1.1.10 diff -u -r1.1.1.10 exconvrt.c --- contrib/dev/acpica/exconvrt.c 9 Jul 2002 17:51:25 -0000 1.1.1.10 +++ contrib/dev/acpica/exconvrt.c 20 Sep 2002 13:10:05 -0000 @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: exconvrt - Object conversion routines - * $Revision: 37 $ + * $Revision: 38 $ * *****************************************************************************/ @@ -335,7 +335,35 @@ case ACPI_TYPE_STRING: - *ResultDesc = ObjDesc; + /* + * Create a new Buffer object + */ + RetDesc = AcpiUtCreateInternalObject (ACPI_TYPE_BUFFER); + if (!RetDesc) + { + return_ACPI_STATUS (AE_NO_MEMORY); + } + + /* Need enough space for one integer */ + + NewBuf = ACPI_MEM_CALLOCATE (ObjDesc->String.Length); + if (!NewBuf) + { + ACPI_REPORT_ERROR + (("ExConvertToBuffer: Buffer allocation failure\n")); + AcpiUtRemoveReference (RetDesc); + return_ACPI_STATUS (AE_NO_MEMORY); + } + + ACPI_STRNCPY ((char *) NewBuf, (char *) ObjDesc->String.Pointer, ObjDesc->String.Length); + RetDesc->Buffer.Flags |= AOPOBJ_DATA_VALID; + RetDesc->Buffer.Pointer = NewBuf; + RetDesc->Buffer.Length = ObjDesc->String.Length; + + /* Return the new buffer descriptor */ + + *ResultDesc = RetDesc; + break; Index: contrib/dev/acpica/exmisc.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/exmisc.c,v retrieving revision 1.1.1.15 diff -u -r1.1.1.15 exmisc.c --- contrib/dev/acpica/exmisc.c 29 Aug 2002 01:51:20 -0000 1.1.1.15 +++ contrib/dev/acpica/exmisc.c 20 Sep 2002 13:10:05 -0000 @@ -2,7 +2,7 @@ /****************************************************************************** * * Module Name: exmisc - ACPI AML (p-code) execution - specific opcodes - * $Revision: 108 $ + * $Revision: 109 $ * *****************************************************************************/ @@ -121,7 +121,6 @@ #include "acpi.h" #include "acinterp.h" #include "amlcode.h" -#include "acdispat.h" #define _COMPONENT ACPI_EXECUTER Index: contrib/dev/acpica/exoparg1.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/exoparg1.c,v retrieving revision 1.1.1.7 diff -u -r1.1.1.7 exoparg1.c --- contrib/dev/acpica/exoparg1.c 29 Aug 2002 01:51:20 -0000 1.1.1.7 +++ contrib/dev/acpica/exoparg1.c 20 Sep 2002 13:10:05 -0000 @@ -2,7 +2,7 @@ /****************************************************************************** * * Module Name: exoparg1 - AML execution - opcodes with 1 argument - * $Revision: 142 $ + * $Revision: 143 $ * *****************************************************************************/ @@ -151,7 +151,6 @@ * fully resolved operands. !*/ - /******************************************************************************* * * FUNCTION: AcpiExOpcode_1A_0T_0R @@ -678,78 +677,12 @@ case AML_TYPE_OP: /* ObjectType (SourceObject) */ - if (ACPI_GET_OBJECT_TYPE (Operand[0]) == INTERNAL_TYPE_REFERENCE) - { - /* - * Not a Name -- an indirect name pointer would have - * been converted to a direct name pointer in ResolveOperands - */ - switch (Operand[0]->Reference.Opcode) - { - case AML_DEBUG_OP: - - /* The Debug Object is of type "DebugObject" */ - - Type = ACPI_TYPE_DEBUG_OBJECT; - break; - - - case AML_INDEX_OP: - - /* Get the type of this reference (index into another object) */ - - Type = Operand[0]->Reference.TargetType; - if (Type == ACPI_TYPE_PACKAGE) - { - /* - * The main object is a package, we want to get the type - * of the individual package element that is referenced by - * the index. - */ - Type = ACPI_GET_OBJECT_TYPE (*(Operand[0]->Reference.Where)); - } - break; - - - case AML_LOCAL_OP: - case AML_ARG_OP: - - Type = AcpiDsMethodDataGetType (Operand[0]->Reference.Opcode, - Operand[0]->Reference.Offset, WalkState); - break; - + /* Get the type of the base object */ - default: - - ACPI_REPORT_ERROR (("AcpiExOpcode_1A_0T_1R/TypeOp: Unknown Reference subtype %X\n", - Operand[0]->Reference.Opcode)); - Status = AE_AML_INTERNAL; - goto Cleanup; - } - } - else + Status = AcpiExResolveMultiple (WalkState, Operand[0], &Type, NULL); + if (ACPI_FAILURE (Status)) { - /* - * It's not a Reference, so it must be a direct name pointer. - */ - Type = AcpiNsGetType ((ACPI_NAMESPACE_NODE *) Operand[0]); - - /* Convert internal types to external types */ - - switch (Type) - { - case INTERNAL_TYPE_REGION_FIELD: - case INTERNAL_TYPE_BANK_FIELD: - case INTERNAL_TYPE_INDEX_FIELD: - - Type = ACPI_TYPE_FIELD_UNIT; - break; - - default: - /* No change to Type required */ - break; - } - + goto Cleanup; } /* Allocate a descriptor to hold the type. */ @@ -767,43 +700,38 @@ case AML_SIZE_OF_OP: /* SizeOf (SourceObject) */ - TempDesc = Operand[0]; - if (ACPI_GET_DESCRIPTOR_TYPE (Operand[0]) == ACPI_DESC_TYPE_NAMED) - { - TempDesc = AcpiNsGetAttachedObject ((ACPI_NAMESPACE_NODE *) Operand[0]); - } + /* Get the base object */ - if (!TempDesc) + Status = AcpiExResolveMultiple (WalkState, Operand[0], &Type, &TempDesc); + if (ACPI_FAILURE (Status)) { - Value = 0; + goto Cleanup; } - else + + /* + * Type is guaranteed to be a buffer, string, or package at this + * point (even if the original operand was an object reference, it + * will be resolved and typechecked during operand resolution.) + */ + switch (Type) { - /* - * Type is guaranteed to be a buffer, string, or package at this - * point (even if the original operand was an object reference, it - * will be resolved and typechecked during operand resolution.) - */ - switch (ACPI_GET_OBJECT_TYPE (TempDesc)) - { - case ACPI_TYPE_BUFFER: - Value = TempDesc->Buffer.Length; - break; - - case ACPI_TYPE_STRING: - Value = TempDesc->String.Length; - break; - - case ACPI_TYPE_PACKAGE: - Value = TempDesc->Package.Count; - break; - - default: - ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "SizeOf, Not Buf/Str/Pkg - found type %s\n", - AcpiUtGetObjectTypeName (TempDesc))); - Status = AE_AML_OPERAND_TYPE; - goto Cleanup; - } + case ACPI_TYPE_BUFFER: + Value = TempDesc->Buffer.Length; + break; + + case ACPI_TYPE_STRING: + Value = TempDesc->String.Length; + break; + + case ACPI_TYPE_PACKAGE: + Value = TempDesc->Package.Count; + break; + + default: + ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "SizeOf, Not Buf/Str/Pkg - found type %s\n", + AcpiUtGetTypeName (Type))); + Status = AE_AML_OPERAND_TYPE; + goto Cleanup; } /* Index: contrib/dev/acpica/exresnte.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/exresnte.c,v retrieving revision 1.1.1.15 diff -u -r1.1.1.15 exresnte.c --- contrib/dev/acpica/exresnte.c 30 Jul 2002 19:33:36 -0000 1.1.1.15 +++ contrib/dev/acpica/exresnte.c 20 Sep 2002 13:10:06 -0000 @@ -2,7 +2,7 @@ /****************************************************************************** * * Module Name: exresnte - AML Interpreter object resolution - * $Revision: 57 $ + * $Revision: 58 $ * *****************************************************************************/ @@ -118,7 +118,6 @@ #define __EXRESNTE_C__ #include "acpi.h" -#include "amlcode.h" #include "acdispat.h" #include "acinterp.h" #include "acnamesp.h" Index: contrib/dev/acpica/exresolv.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/exresolv.c,v retrieving revision 1.1.1.15 diff -u -r1.1.1.15 exresolv.c --- contrib/dev/acpica/exresolv.c 30 Jul 2002 19:33:36 -0000 1.1.1.15 +++ contrib/dev/acpica/exresolv.c 20 Sep 2002 13:10:06 -0000 @@ -2,7 +2,7 @@ /****************************************************************************** * * Module Name: exresolv - AML Interpreter object resolution - * $Revision: 115 $ + * $Revision: 116 $ * *****************************************************************************/ @@ -121,6 +121,7 @@ #include "amlcode.h" #include "acdispat.h" #include "acinterp.h" +#include "acnamesp.h" #define _COMPONENT ACPI_EXECUTER @@ -380,6 +381,183 @@ } return_ACPI_STATUS (Status); +} + + +/******************************************************************************* + * + * FUNCTION: AcpiExResolveMultiple + * + * PARAMETERS: WalkState - Current state (contains AML opcode) + * Operand - Starting point for resolution + * ReturnType - Where the object type is returned + * ReturnDesc - Where the resolved object is returned + * + * RETURN: Status + * + * DESCRIPTION: Return the base object and type. Traverse a reference list if + * necessary to get to the base object. + * + ******************************************************************************/ + +ACPI_STATUS +AcpiExResolveMultiple ( + ACPI_WALK_STATE *WalkState, + ACPI_OPERAND_OBJECT *Operand, + ACPI_OBJECT_TYPE *ReturnType, + ACPI_OPERAND_OBJECT **ReturnDesc) +{ + ACPI_OPERAND_OBJECT *ObjDesc = (void *) Operand; + ACPI_NAMESPACE_NODE *Node; + ACPI_OBJECT_TYPE Type; + + + ACPI_FUNCTION_TRACE ("ExGetObjectType"); + + + /* + * For reference objects created via the RefOf or Index operators, + * we need to get to the base object (as per the ACPI specification + * of the ObjectType and SizeOf operators). This means traversing + * the list of possibly many nested references. + */ + while (ACPI_GET_OBJECT_TYPE (ObjDesc) == INTERNAL_TYPE_REFERENCE) + { + switch (ObjDesc->Reference.Opcode) + { + case AML_REF_OF_OP: + + /* Dereference the reference pointer */ + + Node = ObjDesc->Reference.Object; + + /* All "References" point to a NS node */ + + if (ACPI_GET_DESCRIPTOR_TYPE (Node) != ACPI_DESC_TYPE_NAMED) + { + return_ACPI_STATUS (AE_AML_INTERNAL); + } + + /* Get the attached object */ + + ObjDesc = AcpiNsGetAttachedObject (Node); + if (!ObjDesc) + { + /* No object, use the NS node type */ + + Type = AcpiNsGetType (Node); + goto Exit; + } + + /* Check for circular references */ + + if (ObjDesc == Operand) + { + return_ACPI_STATUS (AE_AML_CIRCULAR_REFERENCE); + } + break; + + + case AML_INDEX_OP: + + /* Get the type of this reference (index into another object) */ + + Type = ObjDesc->Reference.TargetType; + if (Type != ACPI_TYPE_PACKAGE) + { + goto Exit; + } + + /* + * The main object is a package, we want to get the type + * of the individual package element that is referenced by + * the index. + * + * This could of course in turn be another reference object. + */ + ObjDesc = *(ObjDesc->Reference.Where); + break; + + + case AML_INT_NAMEPATH_OP: + + /* Dereference the reference pointer */ + + Node = ObjDesc->Reference.Node; + + /* All "References" point to a NS node */ + + if (ACPI_GET_DESCRIPTOR_TYPE (Node) != ACPI_DESC_TYPE_NAMED) + { + return_ACPI_STATUS (AE_AML_INTERNAL); + } + + /* Get the attached object */ + + ObjDesc = AcpiNsGetAttachedObject (Node); + if (!ObjDesc) + { + /* No object, use the NS node type */ + + Type = AcpiNsGetType (Node); + goto Exit; + } + + /* Check for circular references */ + + if (ObjDesc == Operand) + { + return_ACPI_STATUS (AE_AML_CIRCULAR_REFERENCE); + } + break; + + + case AML_DEBUG_OP: + + /* The Debug Object is of type "DebugObject" */ + + Type = ACPI_TYPE_DEBUG_OBJECT; + goto Exit; + + + default: + + ACPI_REPORT_ERROR (("AcpiExResolveMultiple: Unknown Reference subtype %X\n", + ObjDesc->Reference.Opcode)); + return_ACPI_STATUS (AE_AML_INTERNAL); + } + } + + /* + * Now we are guaranteed to have an object that has not been created + * via the RefOf or Index operators. + */ + Type = ACPI_GET_OBJECT_TYPE (ObjDesc); + + +Exit: + /* Convert internal types to external types */ + + switch (Type) + { + case INTERNAL_TYPE_REGION_FIELD: + case INTERNAL_TYPE_BANK_FIELD: + case INTERNAL_TYPE_INDEX_FIELD: + + Type = ACPI_TYPE_FIELD_UNIT; + break; + + default: + /* No change to Type required */ + break; + } + + *ReturnType = Type; + if (ReturnDesc) + { + *ReturnDesc = ObjDesc; + } + return_ACPI_STATUS (AE_OK); } Index: contrib/dev/acpica/exresop.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/exresop.c,v retrieving revision 1.1.1.15 diff -u -r1.1.1.15 exresop.c --- contrib/dev/acpica/exresop.c 29 Aug 2002 01:51:20 -0000 1.1.1.15 +++ contrib/dev/acpica/exresop.c 20 Sep 2002 13:10:06 -0000 @@ -2,7 +2,7 @@ /****************************************************************************** * * Module Name: exresop - AML Interpreter operand/object resolution - * $Revision: 55 $ + * $Revision: 57 $ * *****************************************************************************/ @@ -121,7 +121,6 @@ #include "amlcode.h" #include "acparser.h" #include "acinterp.h" -#include "acnamesp.h" #define _COMPONENT ACPI_EXECUTER @@ -583,11 +582,12 @@ case ARGI_DATAOBJECT: /* * ARGI_DATAOBJECT is only used by the SizeOf operator. - * Need a buffer, string, package, or Node reference. + * Need a buffer, string, package, or RefOf reference. * * The only reference allowed here is a direct reference to * a namespace node. */ +#if 0 if (ACPI_GET_OBJECT_TYPE (*StackPtr) == INTERNAL_TYPE_REFERENCE) { if (!(*StackPtr)->Reference.Node) @@ -620,7 +620,7 @@ AcpiUtRemoveReference (*StackPtr); (*StackPtr) = TempNode; } - +#endif /* Need a buffer, string, package */ switch (ACPI_GET_OBJECT_TYPE (*StackPtr)) @@ -628,6 +628,7 @@ case ACPI_TYPE_PACKAGE: case ACPI_TYPE_STRING: case ACPI_TYPE_BUFFER: + case INTERNAL_TYPE_REFERENCE: /* Valid operand */ break; Index: contrib/dev/acpica/exstore.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/exstore.c,v retrieving revision 1.1.1.17 diff -u -r1.1.1.17 exstore.c --- contrib/dev/acpica/exstore.c 29 Aug 2002 01:51:21 -0000 1.1.1.17 +++ contrib/dev/acpica/exstore.c 20 Sep 2002 13:10:06 -0000 @@ -2,7 +2,7 @@ /****************************************************************************** * * Module Name: exstore - AML Interpreter object store support - * $Revision: 169 $ + * $Revision: 171 $ * *****************************************************************************/ @@ -199,7 +199,7 @@ return_ACPI_STATUS (AE_OK); } - /*lint: -fallthrough */ + /*lint -fallthrough */ default: @@ -387,6 +387,13 @@ { AcpiUtRemoveReference (ObjDesc); *(IndexDesc->Reference.Where) = NewDesc; + + /* If same as the original source, add a reference */ + + if (NewDesc == SourceDesc) + { + AcpiUtAddReference (NewDesc); + } } break; Index: contrib/dev/acpica/exstoren.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/exstoren.c,v retrieving revision 1.1.1.12 diff -u -r1.1.1.12 exstoren.c --- contrib/dev/acpica/exstoren.c 9 Jul 2002 17:51:26 -0000 1.1.1.12 +++ contrib/dev/acpica/exstoren.c 20 Sep 2002 13:10:06 -0000 @@ -3,7 +3,7 @@ * * Module Name: exstoren - AML Interpreter object store support, * Store to Node (namespace object) - * $Revision: 50 $ + * $Revision: 51 $ * *****************************************************************************/ @@ -308,6 +308,16 @@ if (ACPI_FAILURE (Status)) { return_ACPI_STATUS (Status); + } + + if (SourceDesc == ActualSrcDesc) + { + /* + * No conversion was performed. Return the SourceDesc as the + * new object. + */ + *NewDesc = SourceDesc; + return_ACPI_STATUS (AE_OK); } } Index: contrib/dev/acpica/nsdump.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/nsdump.c,v retrieving revision 1.1.1.17 diff -u -r1.1.1.17 nsdump.c --- contrib/dev/acpica/nsdump.c 29 Aug 2002 01:51:21 -0000 1.1.1.17 +++ contrib/dev/acpica/nsdump.c 20 Sep 2002 13:10:06 -0000 @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: nsdump - table dumping routines for debug - * $Revision: 139 $ + * $Revision: 140 $ * *****************************************************************************/ @@ -214,7 +214,7 @@ Status = AcpiNsHandleToPathname (Handle, &Buffer); if (ACPI_SUCCESS (Status)) { - AcpiOsPrintf ("%s %s (Node %p)\n", Msg, Buffer.Pointer, Handle); + AcpiOsPrintf ("%s %s (Node %p)\n", Msg, (char *) Buffer.Pointer, Handle); ACPI_MEM_FREE (Buffer.Pointer); } @@ -370,10 +370,10 @@ { case ACPI_TYPE_PROCESSOR: - AcpiOsPrintf (" ID %hd Addr %.4X Len %.4X\n", + AcpiOsPrintf (" ID %X Len %.4X Addr %p\n", ObjDesc->Processor.ProcId, - ObjDesc->Processor.Address, - ObjDesc->Processor.Length); + ObjDesc->Processor.Length, + (char *) ObjDesc->Processor.Address); break; @@ -385,8 +385,8 @@ case ACPI_TYPE_METHOD: - AcpiOsPrintf (" Args %hd Len %.4X Aml %p \n", - ObjDesc->Method.ParamCount, + AcpiOsPrintf (" Args %X Len %.4X Aml %p\n", + (UINT32) ObjDesc->Method.ParamCount, ObjDesc->Method.AmlLength, ObjDesc->Method.AmlStart); break; Index: contrib/dev/acpica/nsdumpdv.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/nsdumpdv.c,v retrieving revision 1.1.1.2 diff -u -r1.1.1.2 nsdumpdv.c --- contrib/dev/acpica/nsdumpdv.c 29 Aug 2002 01:51:21 -0000 1.1.1.2 +++ contrib/dev/acpica/nsdumpdv.c 20 Sep 2002 13:10:06 -0000 @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: nsdump - table dumping routines for debug - * $Revision: 3 $ + * $Revision: 4 $ * *****************************************************************************/ @@ -119,7 +119,6 @@ #include "acpi.h" #include "acnamesp.h" -#include "acparser.h" #define _COMPONENT ACPI_NAMESPACE Index: contrib/dev/acpica/nsload.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/nsload.c,v retrieving revision 1.1.1.14 diff -u -r1.1.1.14 nsload.c --- contrib/dev/acpica/nsload.c 29 Aug 2002 01:51:22 -0000 1.1.1.14 +++ contrib/dev/acpica/nsload.c 20 Sep 2002 13:10:06 -0000 @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: nsload - namespace loading/expanding/contracting procedures - * $Revision: 58 $ + * $Revision: 59 $ * *****************************************************************************/ @@ -118,7 +118,6 @@ #include "acpi.h" #include "acnamesp.h" -#include "amlcode.h" #include "acparser.h" #include "acdispat.h" Index: contrib/dev/acpica/psxface.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/psxface.c,v retrieving revision 1.1.1.14 diff -u -r1.1.1.14 psxface.c --- contrib/dev/acpica/psxface.c 30 Jul 2002 19:33:37 -0000 1.1.1.14 +++ contrib/dev/acpica/psxface.c 20 Sep 2002 13:10:06 -0000 @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: psxface - Parser external interfaces - * $Revision: 65 $ + * $Revision: 66 $ * *****************************************************************************/ @@ -120,7 +120,6 @@ #include "acparser.h" #include "acdispat.h" #include "acinterp.h" -#include "amlcode.h" #include "acnamesp.h" Index: contrib/dev/acpica/rsdump.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/rsdump.c,v retrieving revision 1.1.1.13 diff -u -r1.1.1.13 rsdump.c --- contrib/dev/acpica/rsdump.c 29 Aug 2002 01:51:22 -0000 1.1.1.13 +++ contrib/dev/acpica/rsdump.c 20 Sep 2002 13:10:06 -0000 @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: rsdump - Functions to display the resource structures. - * $Revision: 33 $ + * $Revision: 34 $ * ******************************************************************************/ @@ -976,20 +976,25 @@ ACPI_ADDRESS_FIXED == Address64Data->MaxAddressFixed ? "" : "not "); - AcpiOsPrintf (" Granularity: %16X\n", - Address64Data->Granularity); - - AcpiOsPrintf (" Address range min: %16X\n", - Address64Data->MinAddressRange); - - AcpiOsPrintf (" Address range max: %16X\n", - Address64Data->MaxAddressRange); - - AcpiOsPrintf (" Address translation offset: %16X\n", - Address64Data->AddressTranslationOffset); - - AcpiOsPrintf (" Address Length: %16X\n", - Address64Data->AddressLength); + AcpiOsPrintf (" Granularity: %8.8X%8.8X\n", + ACPI_HIDWORD (Address64Data->Granularity), + ACPI_LODWORD (Address64Data->Granularity)); + + AcpiOsPrintf (" Address range min: %8.8X%8.8X\n", + ACPI_HIDWORD (Address64Data->MinAddressRange), + ACPI_HIDWORD (Address64Data->MinAddressRange)); + + AcpiOsPrintf (" Address range max: %8.8X%8.8X\n", + ACPI_HIDWORD (Address64Data->MaxAddressRange), + ACPI_HIDWORD (Address64Data->MaxAddressRange)); + + AcpiOsPrintf (" Address translation offset: %8.8X%8.8X\n", + ACPI_HIDWORD (Address64Data->AddressTranslationOffset), + ACPI_HIDWORD (Address64Data->AddressTranslationOffset)); + + AcpiOsPrintf (" Address Length: %8.8X%8.8X\n", + ACPI_HIDWORD (Address64Data->AddressLength), + ACPI_HIDWORD (Address64Data->AddressLength)); if(0xFF != Address64Data->ResourceSource.Index) { Index: contrib/dev/acpica/tbget.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/tbget.c,v retrieving revision 1.8 diff -u -r1.8 tbget.c --- contrib/dev/acpica/tbget.c 29 Aug 2002 01:52:26 -0000 1.8 +++ contrib/dev/acpica/tbget.c 20 Sep 2002 13:10:06 -0000 @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: tbget - ACPI Table get* routines - * $Revision: 79 $ + * $Revision: 80 $ * *****************************************************************************/ @@ -225,8 +225,10 @@ (void **) &Header); if (ACPI_FAILURE (Status)) { - ACPI_REPORT_ERROR (("Could not map memory at %p for length %X\n", - Address->Pointer.Physical, sizeof (ACPI_TABLE_HEADER))); + ACPI_REPORT_ERROR (("Could not map memory at %8.8X%8.8X for length %X\n", + ACPI_HIDWORD (Address->Pointer.Physical), + ACPI_LODWORD (Address->Pointer.Physical), + sizeof (ACPI_TABLE_HEADER))); return_ACPI_STATUS (Status); } @@ -447,8 +449,10 @@ (void **) &FullTable); if (ACPI_FAILURE (Status)) { - ACPI_REPORT_ERROR (("Could not map memory for table [%4.4s] at %p for length %X\n", - Header->Signature, Address->Pointer.Physical, Header->Length)); + ACPI_REPORT_ERROR (("Could not map memory for table [%4.4s] at %8.8X%8.8X for length %X\n", + Header->Signature, + ACPI_HIDWORD (Address->Pointer.Physical), + ACPI_LODWORD (Address->Pointer.Physical), Header->Length)); return (Status); } Index: contrib/dev/acpica/utclib.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/utclib.c,v retrieving revision 1.1.1.8 diff -u -r1.1.1.8 utclib.c --- contrib/dev/acpica/utclib.c 9 Jul 2002 17:51:30 -0000 1.1.1.8 +++ contrib/dev/acpica/utclib.c 20 Sep 2002 13:10:06 -0000 @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: cmclib - Local implementation of C library functions - * $Revision: 46 $ + * $Revision: 47 $ * *****************************************************************************/ @@ -144,7 +144,7 @@ ******************************************************************************/ -UINT32 +ACPI_SIZE AcpiUtStrlen ( const NATIVE_CHAR *String) { @@ -219,7 +219,7 @@ AcpiUtStrncpy ( NATIVE_CHAR *DstString, const NATIVE_CHAR *SrcString, - NATIVE_UINT Count) + ACPI_SIZE Count) { NATIVE_CHAR *String = DstString; @@ -257,7 +257,7 @@ * ******************************************************************************/ -UINT32 +int AcpiUtStrcmp ( const NATIVE_CHAR *String1, const NATIVE_CHAR *String2) @@ -294,7 +294,7 @@ AcpiUtStrncmp ( const NATIVE_CHAR *String1, const NATIVE_CHAR *String2, - NATIVE_UINT Count) + ACPI_SIZE Count) { @@ -306,7 +306,7 @@ } } - return ((Count == ACPI_INTEGER_MAX) ? 0 : ((unsigned char) *String1 - + return ((Count == ACPI_SIZE_MAX) ? 0 : ((unsigned char) *String1 - (unsigned char) *String2)); } @@ -365,7 +365,7 @@ AcpiUtStrncat ( NATIVE_CHAR *DstString, const NATIVE_CHAR *SrcString, - NATIVE_UINT Count) + ACPI_SIZE Count) { NATIVE_CHAR *String; @@ -412,7 +412,7 @@ AcpiUtMemcpy ( void *Dest, const void *Src, - NATIVE_UINT Count) + ACPI_SIZE Count) { NATIVE_CHAR *New = (NATIVE_CHAR *) Dest; NATIVE_CHAR *Old = (NATIVE_CHAR *) Src; @@ -448,7 +448,7 @@ AcpiUtMemset ( void *Dest, NATIVE_UINT Value, - NATIVE_UINT Count) + ACPI_SIZE Count) { NATIVE_CHAR *New = (NATIVE_CHAR *) Dest; Index: contrib/dev/acpica/utcopy.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/utcopy.c,v retrieving revision 1.1.1.17 diff -u -r1.1.1.17 utcopy.c --- contrib/dev/acpica/utcopy.c 30 Jul 2002 19:33:39 -0000 1.1.1.17 +++ contrib/dev/acpica/utcopy.c 20 Sep 2002 13:10:06 -0000 @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: utcopy - Internal to external object translation utilities - * $Revision: 103 $ + * $Revision: 104 $ * *****************************************************************************/ @@ -117,7 +117,6 @@ #define __UTCOPY_C__ #include "acpi.h" -#include "acnamesp.h" #include "amlcode.h" Index: contrib/dev/acpica/utdebug.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/utdebug.c,v retrieving revision 1.1.1.16 diff -u -r1.1.1.16 utdebug.c --- contrib/dev/acpica/utdebug.c 29 Aug 2002 01:51:23 -0000 1.1.1.16 +++ contrib/dev/acpica/utdebug.c 20 Sep 2002 13:10:06 -0000 @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: utdebug - Debug print routines - * $Revision: 104 $ + * $Revision: 105 $ * *****************************************************************************/ @@ -250,7 +250,7 @@ if (ACPI_LV_THREADS & AcpiDbgLevel) { - AcpiOsPrintf ("[%04lX] ", ThreadId, AcpiGbl_NestingLevel, DbgInfo->ProcName); + AcpiOsPrintf ("[%04lX] ", ThreadId); } AcpiOsPrintf ("[%02ld] %-22.22s: ", AcpiGbl_NestingLevel, DbgInfo->ProcName); @@ -620,7 +620,7 @@ { /* Print current offset */ - AcpiOsPrintf ("%05X ", i); + AcpiOsPrintf ("%05X ", (UINT32) i); /* Print 16 hex chars */ Index: contrib/dev/acpica/utglobal.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/utglobal.c,v retrieving revision 1.6 diff -u -r1.6 utglobal.c --- contrib/dev/acpica/utglobal.c 29 Aug 2002 01:52:26 -0000 1.6 +++ contrib/dev/acpica/utglobal.c 20 Sep 2002 13:10:06 -0000 @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: utglobal - Global variables for the ACPI subsystem - * $Revision: 168 $ + * $Revision: 171 $ * *****************************************************************************/ @@ -119,7 +119,6 @@ #include "acpi.h" #include "acnamesp.h" -#include "amlcode.h" #define _COMPONENT ACPI_UTILITIES ACPI_MODULE_NAME ("utglobal") @@ -264,10 +263,10 @@ /* - * Names built-in to the interpreter + * Predefined ACPI Names (Built-in to the Interpreter) * * Initial values are currently supported only for types String and Number. - * To avoid type punning, both are specified as strings in this table. + * Both are specified as strings in this table. * * NOTES: * 1) _SB_ is defined to be a device to allow _SB_/_INI to be run @@ -276,11 +275,11 @@ const ACPI_PREDEFINED_NAMES AcpiGbl_PreDefinedNames[] = { - {"_GPE", INTERNAL_TYPE_DEF_ANY, NULL}, - {"_PR_", INTERNAL_TYPE_DEF_ANY, NULL}, + {"_GPE", INTERNAL_TYPE_SCOPE, NULL}, + {"_PR_", INTERNAL_TYPE_SCOPE, NULL}, {"_SB_", ACPI_TYPE_DEVICE, NULL}, - {"_SI_", INTERNAL_TYPE_DEF_ANY, NULL}, - {"_TZ_", INTERNAL_TYPE_DEF_ANY, NULL}, + {"_SI_", INTERNAL_TYPE_SCOPE, NULL}, + {"_TZ_", INTERNAL_TYPE_SCOPE, NULL}, {"_REV", ACPI_TYPE_INTEGER, "2"}, {"_OS_", ACPI_TYPE_STRING, ACPI_OS_NAME}, {"_GL_", ACPI_TYPE_MUTEX, "0"}, @@ -294,9 +293,7 @@ /* * Properties of the ACPI Object Types, both internal and external. - * - * Elements of AcpiNsProperties are bit significant - * and the table is indexed by values of ACPI_OBJECT_TYPE + * The table is indexed by values of ACPI_OBJECT_TYPE */ const UINT8 AcpiGbl_NsProperties[] = @@ -629,7 +626,6 @@ /* * Strings and procedures used for debug only - * */ @@ -862,6 +858,7 @@ AcpiGbl_GpeRegisterInfo = NULL; AcpiGbl_GpeNumberInfo = NULL; + AcpiGbl_EventsInitialized = FALSE; /* Namespace */ Index: contrib/dev/acpica/utinit.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/utinit.c,v retrieving revision 1.1.1.14 diff -u -r1.1.1.14 utinit.c --- contrib/dev/acpica/utinit.c 29 Aug 2002 01:51:23 -0000 1.1.1.14 +++ contrib/dev/acpica/utinit.c 20 Sep 2002 13:10:07 -0000 @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: utinit - Common ACPI subsystem initialization - * $Revision: 113 $ + * $Revision: 114 $ * *****************************************************************************/ @@ -149,7 +149,7 @@ ACPI_REPORT_WARNING ( ("Invalid FADT value %s=%X at offset %X FADT=%p\n", - RegisterName, Value, Offset, AcpiGbl_FADT)); + RegisterName, Value, (UINT32) Offset, AcpiGbl_FADT)); } Index: contrib/dev/acpica/utmisc.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/utmisc.c,v retrieving revision 1.1.1.13 diff -u -r1.1.1.13 utmisc.c --- contrib/dev/acpica/utmisc.c 29 Aug 2002 01:51:23 -0000 1.1.1.13 +++ contrib/dev/acpica/utmisc.c 20 Sep 2002 13:10:07 -0000 @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: utmisc - common utility procedures - * $Revision: 80 $ + * $Revision: 81 $ * ******************************************************************************/ @@ -119,8 +119,6 @@ #include "acpi.h" #include "acnamesp.h" -#include "amlcode.h" -#include "acinterp.h" #define _COMPONENT ACPI_UTILITIES