Index: contrib/dev/acpica/acconfig.h =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/acconfig.h,v retrieving revision 1.20 diff -u -r1.20 acconfig.h --- contrib/dev/acpica/acconfig.h 30 Jul 2002 19:35:22 -0000 1.20 +++ contrib/dev/acpica/acconfig.h 22 Aug 2002 12:00:18 -0000 @@ -125,7 +125,7 @@ *****************************************************************************/ /* - * ACPI_DEBUG - This switch enables all the debug facilities of the + * ACPI_DEBUG_OUTPUT - This switch enables all the debug facilities of the * ACPI subsystem. This includes the DEBUG_PRINT output * statements. When disabled, all DEBUG_PRINT * statements are compiled out. @@ -145,7 +145,7 @@ /* Version string */ -#define ACPI_CA_VERSION 0x20020725 +#define ACPI_CA_VERSION 0x20020815 /* Version of ACPI supported */ Index: contrib/dev/acpica/acdisasm.h =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/acdisasm.h,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 acdisasm.h --- contrib/dev/acpica/acdisasm.h 30 Jul 2002 19:33:33 -0000 1.1.1.1 +++ contrib/dev/acpica/acdisasm.h 22 Aug 2002 10:07:09 -0000 @@ -161,7 +161,6 @@ void *Context); - /* * dmwalk */ @@ -224,7 +223,7 @@ void AcpiDmDisassembleOneOp ( ACPI_WALK_STATE *WalkState, - ACPI_OP_WALK_INFO *Info, + ACPI_OP_WALK_INFO *Info, ACPI_PARSE_OBJECT *Op); void @@ -276,12 +275,12 @@ AcpiDmCommaIfListMember ( ACPI_PARSE_OBJECT *Op); -void +void AcpiDmCommaIfFieldMember ( ACPI_PARSE_OBJECT *Op); -/* +/* * dmbuffer */ @@ -314,12 +313,12 @@ void AcpiDmByteList ( - ACPI_OP_WALK_INFO *Info, + ACPI_OP_WALK_INFO *Info, ACPI_PARSE_OBJECT *Op); void AcpiDmResourceDescriptor ( - ACPI_OP_WALK_INFO *Info, + ACPI_OP_WALK_INFO *Info, UINT8 *ByteData, UINT32 ByteCount); Index: contrib/dev/acpica/acefi.h =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/acefi.h,v retrieving revision 1.1.1.8 diff -u -r1.1.1.8 acefi.h --- contrib/dev/acpica/acefi.h 30 Jun 2002 17:50:43 -0000 1.1.1.8 +++ contrib/dev/acpica/acefi.h 22 Aug 2002 10:07:10 -0000 @@ -133,7 +133,7 @@ * Calling conventions: * * ACPI_SYSTEM_XFACE - Interfaces to host OS (handlers, threads) - * ACPI_EXTERNAL_XFACE - External ACPI interfaces + * ACPI_EXTERNAL_XFACE - External ACPI interfaces * ACPI_INTERNAL_XFACE - Internal ACPI interfaces * ACPI_INTERNAL_VAR_XFACE - Internal variable-parameter list interfaces */ Index: contrib/dev/acpica/acenv.h =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/acenv.h,v retrieving revision 1.3 diff -u -r1.3 acenv.h --- contrib/dev/acpica/acenv.h 30 Jul 2002 19:35:22 -0000 1.3 +++ contrib/dev/acpica/acenv.h 22 Aug 2002 12:00:18 -0000 @@ -124,7 +124,7 @@ #ifdef _ACPI_DUMP_APP #ifndef MSDOS -#define ACPI_DEBUG +#define ACPI_DEBUG_OUTPUT #endif #define ACPI_APPLICATION #define ACPI_DISASSEMBLER @@ -135,15 +135,15 @@ #ifdef _ACPI_EXEC_APP #undef DEBUGGER_THREADING #define DEBUGGER_THREADING DEBUGGER_SINGLE_THREADED -#define ACPI_DEBUG +#define ACPI_DEBUG_OUTPUT #define ACPI_APPLICATION -#define ENABLE_DEBUGGER +#define ACPI_DEBUGGER #define ACPI_DISASSEMBLER #define ACPI_USE_SYSTEM_CLIBRARY #endif #ifdef _ACPI_ASL_COMPILER -#define ACPI_DEBUG +#define ACPI_DEBUG_OUTPUT #define ACPI_APPLICATION #define ACPI_DISASSEMBLER #define ACPI_CONSTANT_EVAL_ONLY @@ -240,7 +240,7 @@ * 1) This is the debug version * 2) This is NOT a 16-bit version of the code (not enough real-mode memory) */ -#ifdef ACPI_DEBUG +#ifdef ACPI_DEBUG_OUTPUT #if ACPI_MACHINE_WIDTH != 16 #define ACPI_DBG_TRACK_ALLOCATIONS #endif @@ -401,7 +401,7 @@ * Calling conventions: * * ACPI_SYSTEM_XFACE - Interfaces to host OS (handlers, threads) - * ACPI_EXTERNAL_XFACE - External ACPI interfaces + * ACPI_EXTERNAL_XFACE - External ACPI interfaces * ACPI_INTERNAL_XFACE - Internal ACPI interfaces * ACPI_INTERNAL_VAR_XFACE - Internal variable-parameter list interfaces */ Index: contrib/dev/acpica/acfreebsd.h =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/acfreebsd.h,v retrieving revision 1.11 diff -u -r1.11 acfreebsd.h --- contrib/dev/acpica/acfreebsd.h 30 Jul 2002 19:35:22 -0000 1.11 +++ contrib/dev/acpica/acfreebsd.h 22 Aug 2002 12:00:18 -0000 @@ -128,6 +128,10 @@ #include "acgcc.h" #include +#ifdef ACPI_DEBUG +#define ACPI_DEBUG_OUTPUT /* for backward compatibility */ +#endif + #ifdef _KERNEL #include "opt_acpi.h" @@ -141,12 +145,12 @@ #undef DEBUGGER_THREADING #endif /* DEBUGGER_THREADING */ #define DEBUGGER_THREADING 0 /* integrated with DDB */ -#ifdef ACPI_DEBUG +#ifdef ACPI_DEBUG_OUTPUT #include "opt_ddb.h" #ifdef DDB -#define ENABLE_DEBUGGER +#define ACPI_DEBUGGER #endif /* DDB */ -#endif /* ACPI_DEBUG */ +#endif /* ACPI_DEBUG_OUTPUT */ #else /* _KERNEL */ Index: contrib/dev/acpica/acglobal.h =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/acglobal.h,v retrieving revision 1.1.1.13 diff -u -r1.1.1.13 acglobal.h --- contrib/dev/acpica/acglobal.h 30 Jul 2002 19:33:33 -0000 1.1.1.13 +++ contrib/dev/acpica/acglobal.h 22 Aug 2002 10:07:09 -0000 @@ -243,8 +243,12 @@ ****************************************************************************/ #define NUM_NS_TYPES INTERNAL_TYPE_INVALID+1 -#define NUM_PREDEFINED_NAMES 9 +#if defined (ACPI_NO_METHOD_EXECUTION) || defined (ACPI_CONSTANT_EVAL_ONLY) +#define NUM_PREDEFINED_NAMES 10 +#else +#define NUM_PREDEFINED_NAMES 9 +#endif ACPI_EXTERN ACPI_NAMESPACE_NODE AcpiGbl_RootNodeStruct; ACPI_EXTERN ACPI_NAMESPACE_NODE *AcpiGbl_RootNode; @@ -252,7 +256,7 @@ extern const UINT8 AcpiGbl_NsProperties[NUM_NS_TYPES]; extern const ACPI_PREDEFINED_NAMES AcpiGbl_PreDefinedNames [NUM_PREDEFINED_NAMES]; -#ifdef ACPI_DEBUG +#ifdef ACPI_DEBUG_OUTPUT ACPI_EXTERN UINT32 AcpiGbl_CurrentNodeCount; ACPI_EXTERN UINT32 AcpiGbl_CurrentNodeSize; ACPI_EXTERN UINT32 AcpiGbl_MaxConcurrentNodeCount; @@ -336,7 +340,7 @@ #endif -#ifdef ENABLE_DEBUGGER +#ifdef ACPI_DEBUGGER extern BOOLEAN AcpiGbl_MethodExecuting; extern BOOLEAN AcpiGbl_DbTerminateThreads; @@ -378,7 +382,7 @@ ACPI_EXTERN UINT32 AcpiGbl_SizeOfNodeEntries; ACPI_EXTERN UINT32 AcpiGbl_SizeOfAcpiObjects; -#endif /* ENABLE_DEBUGGER */ +#endif /* ACPI_DEBUGGER */ #endif /* __ACGLOBAL_H__ */ Index: contrib/dev/acpica/aclocal.h =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/aclocal.h,v retrieving revision 1.1.1.18 diff -u -r1.1.1.18 aclocal.h --- contrib/dev/acpica/aclocal.h 30 Jul 2002 19:33:33 -0000 1.1.1.18 +++ contrib/dev/acpica/aclocal.h 22 Aug 2002 10:07:09 -0000 @@ -129,7 +129,6 @@ #define AML_NUM_OPCODES 0x7E - /***************************************************************************** * * Mutex typedefs and structs @@ -165,7 +164,7 @@ #define NUM_MTX MAX_MTX+1 -#if defined(ACPI_DEBUG) || defined(ENABLE_DEBUGGER) +#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) #ifdef DEFINE_ACPI_GLOBALS /* Names for the mutexes used in the subsystem */ @@ -659,7 +658,7 @@ */ typedef struct acpi_opcode_info { -#if defined(ACPI_DISASSEMBLER) || defined(ACPI_DEBUG) +#if defined(ACPI_DISASSEMBLER) || defined(ACPI_DEBUG_OUTPUT) NATIVE_CHAR *Name; /* Opcode name (disassembler/debug only) */ #endif UINT32 ParseArgs; /* Grammar/Parse time arguments */ @@ -776,7 +775,6 @@ ACPI_PARSE_OBJ_ASL Asl; } ACPI_PARSE_OBJECT; - /* Index: contrib/dev/acpica/acmacros.h =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/acmacros.h,v retrieving revision 1.1.1.14 diff -u -r1.1.1.14 acmacros.h --- contrib/dev/acpica/acmacros.h 30 Jul 2002 19:33:33 -0000 1.1.1.14 +++ contrib/dev/acpica/acmacros.h 22 Aug 2002 10:07:09 -0000 @@ -182,7 +182,7 @@ #define ACPI_TO_POINTER(i) ACPI_PTR_ADD (void, (void *) NULL,(NATIVE_UINT)i) #define ACPI_TO_INTEGER(p) ACPI_PTR_DIFF (p,(void *) NULL) -#define ACPI_OFFSET(d,f) (ACPI_SIZE) ACPI_PTR_DIFF (&(((d *)0)->f),(void *) NULL) +#define ACPI_OFFSET(d,f) (ACPI_SIZE) ACPI_PTR_DIFF (&(((d *)0)->f),(void *) NULL) #define ACPI_FADT_OFFSET(f) ACPI_OFFSET (FADT_DESCRIPTOR, f) #define ACPI_CAST_PTR(t, p) ((t *)(void *)(p)) @@ -378,7 +378,7 @@ /* * Macros for the master AML opcode table */ -#if defined(ACPI_DISASSEMBLER) || defined (ACPI_DEBUG) +#if defined(ACPI_DISASSEMBLER) || defined (ACPI_DEBUG_OUTPUT) #define ACPI_OP(Name,PArgs,IArgs,ObjType,Class,Type,Flags) {Name,PArgs,IArgs,Flags,ObjType,Class,Type} #else #define ACPI_OP(Name,PArgs,IArgs,ObjType,Class,Type,Flags) {PArgs,IArgs,Flags,ObjType,Class,Type} @@ -444,11 +444,11 @@ /* * Error reporting. These versions add callers module and line#. Since - * _THIS_MODULE gets compiled out when ACPI_DEBUG isn't defined, only + * _THIS_MODULE gets compiled out when ACPI_DEBUG_OUTPUT isn't defined, only * use it in debug mode. */ -#ifdef ACPI_DEBUG +#ifdef ACPI_DEBUG_OUTPUT #define ACPI_REPORT_INFO(fp) {AcpiUtReportInfo(_THIS_MODULE,__LINE__,_COMPONENT); \ AcpiOsPrintf ACPI_PARAM_LIST(fp);} @@ -481,7 +481,7 @@ * Debug macros that are conditionally compiled */ -#ifdef ACPI_DEBUG +#ifdef ACPI_DEBUG_OUTPUT #define ACPI_MODULE_NAME(name) static char *_THIS_MODULE = name; @@ -616,9 +616,9 @@ /* * Some code only gets executed when the debugger is built in. * Note that this is entirely independent of whether the - * DEBUG_PRINT stuff (set by ACPI_DEBUG) is on, or not. + * DEBUG_PRINT stuff (set by ACPI_DEBUG_OUTPUT) is on, or not. */ -#ifdef ENABLE_DEBUGGER +#ifdef ACPI_DEBUGGER #define ACPI_DEBUGGER_EXEC(a) a #else #define ACPI_DEBUGGER_EXEC(a) @@ -627,7 +627,7 @@ /* * For 16-bit code, we want to shrink some things even though - * we are using ACPI_DEBUG to get the debug output + * we are using ACPI_DEBUG_OUTPUT to get the debug output */ #if ACPI_MACHINE_WIDTH == 16 #undef ACPI_DEBUG_ONLY_MEMBERS @@ -636,7 +636,7 @@ #endif -#ifdef ACPI_DEBUG +#ifdef ACPI_DEBUG_OUTPUT /* * 1) Set name to blanks * 2) Copy the object name Index: contrib/dev/acpica/acobject.h =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/acobject.h,v retrieving revision 1.1.1.12 diff -u -r1.1.1.12 acobject.h --- contrib/dev/acpica/acobject.h 9 Jul 2002 17:51:22 -0000 1.1.1.12 +++ contrib/dev/acpica/acobject.h 22 Aug 2002 10:07:09 -0000 @@ -190,7 +190,6 @@ union acpi_operand_obj *AddrHandler; /* Handler for Address space */ - /****************************************************************************** * * Basic data types @@ -247,7 +246,6 @@ } ACPI_OBJECT_PACKAGE; - /****************************************************************************** * * Complex data types @@ -311,7 +309,6 @@ } ACPI_OBJECT_REGION; - /****************************************************************************** * * Objects that can be notified. All share a common NotifyInfo area. @@ -366,7 +363,6 @@ } ACPI_OBJECT_THERMAL_ZONE; - /****************************************************************************** * * Fields. All share a common header/info field. @@ -430,7 +426,6 @@ } ACPI_OBJECT_BUFFER_FIELD; - /****************************************************************************** * * Objects for handlers @@ -470,7 +465,6 @@ } ACPI_OBJECT_ADDR_HANDLER; - /****************************************************************************** * * Special internal objects @@ -537,14 +531,13 @@ } ACPI_OBJECT_CACHE_LIST; - /****************************************************************************** * * ACPI_OPERAND_OBJECT Descriptor - a giant union of all of the above * *****************************************************************************/ -typedef union acpi_operand_obj +typedef union acpi_operand_obj { ACPI_OBJECT_COMMON Common; @@ -581,9 +574,6 @@ } ACPI_OPERAND_OBJECT; - - - /****************************************************************************** * * ACPI_DESCRIPTOR - objects that share a common descriptor identifier @@ -608,7 +598,6 @@ #define ACPI_DESC_TYPE_PARSER 0x66 #define ACPI_DESC_TYPE_OPERAND 0x88 #define ACPI_DESC_TYPE_NAMED 0xAA - typedef union acpi_desc Index: contrib/dev/acpica/acoutput.h =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/acoutput.h,v retrieving revision 1.1.1.11 diff -u -r1.1.1.11 acoutput.h --- contrib/dev/acpica/acoutput.h 9 Jul 2002 17:51:22 -0000 1.1.1.11 +++ contrib/dev/acpica/acoutput.h 22 Aug 2002 10:07:09 -0000 @@ -134,18 +134,20 @@ #define ACPI_DISPATCHER 0x00000040 #define ACPI_EXECUTER 0x00000080 #define ACPI_RESOURCES 0x00000100 -#define ACPI_DEBUGGER 0x00000200 +#define ACPI_CA_DEBUGGER 0x00000200 #define ACPI_OS_SERVICES 0x00000400 - -#define ACPI_ALL_COMPONENTS 0x00000FFF - -#define ACPI_COMPONENT_DEFAULT (ACPI_ALL_COMPONENTS) +#define ACPI_CA_DISASSEMBLER 0x00000800 /* Component IDs for ACPI tools and utilities */ #define ACPI_COMPILER 0x00001000 #define ACPI_TOOLS 0x00002000 +#define ACPI_ALL_COMPONENTS 0x00003FFF + +#define ACPI_COMPONENT_DEFAULT (ACPI_ALL_COMPONENTS) + + /* Component IDs reserved for ACPI drivers */ #define ACPI_ALL_DRIVERS 0xFFFF0000 @@ -185,7 +187,8 @@ #define ACPI_LV_ALLOCATIONS 0x00100000 #define ACPI_LV_FUNCTIONS 0x00200000 -#define ACPI_LV_VERBOSITY2 0x00300000 | ACPI_LV_VERBOSITY1 +#define ACPI_LV_OPTIMIZATIONS 0x00400000 +#define ACPI_LV_VERBOSITY2 0x00700000 | ACPI_LV_VERBOSITY1 #define ACPI_LV_ALL ACPI_LV_VERBOSITY2 /* Trace verbosity level 3 [Threading, I/O, and Interrupts] */ @@ -235,6 +238,7 @@ #define ACPI_DB_BFIELD ACPI_DEBUG_LEVEL (ACPI_LV_BFIELD) #define ACPI_DB_TABLES ACPI_DEBUG_LEVEL (ACPI_LV_TABLES) #define ACPI_DB_FUNCTIONS ACPI_DEBUG_LEVEL (ACPI_LV_FUNCTIONS) +#define ACPI_DB_OPTIMIZATIONS ACPI_DEBUG_LEVEL (ACPI_LV_OPTIMIZATIONS) #define ACPI_DB_VALUES ACPI_DEBUG_LEVEL (ACPI_LV_VALUES) #define ACPI_DB_OBJECTS ACPI_DEBUG_LEVEL (ACPI_LV_OBJECTS) #define ACPI_DB_ALLOCATIONS ACPI_DEBUG_LEVEL (ACPI_LV_ALLOCATIONS) @@ -247,7 +251,6 @@ #define ACPI_DB_INIT ACPI_DEBUG_LEVEL (ACPI_LV_INIT) #define ACPI_DB_ALL ACPI_DEBUG_LEVEL (ACPI_LV_ALL) - /* Defaults for DebugLevel, debug and normal */ Index: contrib/dev/acpica/acparser.h =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/acparser.h,v retrieving revision 1.1.1.9 diff -u -r1.1.1.9 acparser.h --- contrib/dev/acpica/acparser.h 30 Jul 2002 19:33:34 -0000 1.1.1.9 +++ contrib/dev/acpica/acparser.h 22 Aug 2002 10:07:09 -0000 @@ -177,7 +177,7 @@ UINT32 ArgType, ACPI_PARSE_OBJECT *Arg); -void +ACPI_STATUS AcpiPsGetNextNamepath ( ACPI_PARSE_STATE *ParserState, ACPI_PARSE_OBJECT *Arg, @@ -188,11 +188,12 @@ AcpiPsGetNextField ( ACPI_PARSE_STATE *ParserState); -ACPI_PARSE_OBJECT * +ACPI_STATUS AcpiPsGetNextArg ( ACPI_PARSE_STATE *ParserState, UINT32 ArgType, - UINT32 *ArgCount); + UINT32 *ArgCount, + ACPI_PARSE_OBJECT **ReturnArg); /* psfind */ Index: contrib/dev/acpica/acpiosxf.h =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/acpiosxf.h,v retrieving revision 1.10 diff -u -r1.10 acpiosxf.h --- contrib/dev/acpica/acpiosxf.h 30 Jul 2002 19:35:22 -0000 1.10 +++ contrib/dev/acpica/acpiosxf.h 22 Aug 2002 12:00:18 -0000 @@ -154,11 +154,11 @@ * Types specific to the OS service interfaces */ -typedef UINT32 +typedef UINT32 (ACPI_SYSTEM_XFACE *OSD_HANDLER) ( void *Context); -typedef void +typedef void (ACPI_SYSTEM_XFACE *OSD_EXECUTION_CALLBACK) ( void *Context); Index: contrib/dev/acpica/acresrc.h =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/acresrc.h,v retrieving revision 1.1.1.6 diff -u -r1.1.1.6 acresrc.h --- contrib/dev/acpica/acresrc.h 9 Jul 2002 17:51:23 -0000 1.1.1.6 +++ contrib/dev/acpica/acresrc.h 22 Aug 2002 10:07:09 -0000 @@ -174,11 +174,11 @@ void AcpiRsDumpAddress32 ( ACPI_RESOURCE_DATA *Data); - + void AcpiRsDumpAddress64 ( ACPI_RESOURCE_DATA *Data); - + void AcpiRsDumpDma ( ACPI_RESOURCE_DATA *Data); @@ -186,7 +186,7 @@ void AcpiRsDumpIo ( ACPI_RESOURCE_DATA *Data); - + void AcpiRsDumpExtendedIrq ( ACPI_RESOURCE_DATA *Data); Index: contrib/dev/acpica/acutils.h =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/acutils.h,v retrieving revision 1.3 diff -u -r1.3 acutils.h --- contrib/dev/acpica/acutils.h 30 Jul 2002 19:35:22 -0000 1.3 +++ contrib/dev/acpica/acutils.h 22 Aug 2002 12:00:18 -0000 @@ -185,7 +185,7 @@ * UtGlobal - Global data structures and procedures */ -#if defined(ACPI_DEBUG) || defined(ENABLE_DEBUGGER) +#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) NATIVE_CHAR * AcpiUtGetMutexName ( @@ -777,7 +777,7 @@ AcpiUtSetIntegerWidth ( UINT8 Revision); -#ifdef ACPI_DEBUG +#ifdef ACPI_DEBUG_OUTPUT void AcpiUtDisplayInitPathname ( ACPI_HANDLE ObjHandle, Index: contrib/dev/acpica/amlcode.h =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/amlcode.h,v retrieving revision 1.1.1.12 diff -u -r1.1.1.12 amlcode.h --- contrib/dev/acpica/amlcode.h 30 Jul 2002 19:33:34 -0000 1.1.1.12 +++ contrib/dev/acpica/amlcode.h 22 Aug 2002 10:07:10 -0000 @@ -563,7 +563,6 @@ #define METHOD_FLAGS_ARG_COUNT 0x07 #define METHOD_FLAGS_SERIALIZED 0x08 #define METHOD_FLAGS_SYNCH_LEVEL 0xF0 - #endif /* __AMLCODE_H__ */ Index: contrib/dev/acpica/amlresrc.h =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/amlresrc.h,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 amlresrc.h --- contrib/dev/acpica/amlresrc.h 30 Jul 2002 19:33:34 -0000 1.1.1.1 +++ contrib/dev/acpica/amlresrc.h 22 Aug 2002 10:07:10 -0000 @@ -417,173 +417,6 @@ UINT8 U8Item; } ASL_RESOURCE_DESC; - - -#define NEXT_RESOURCE_DESC(a,b) (ASL_RESOURCE_DESC *) (((char *) (a)) + sizeof(b)) - -#define DEFAULT_RESOURCE_DESC_SIZE (sizeof (ASL_RESOURCE_DESC) + sizeof (ASL_END_TAG_DESC)) - - -/* - * Resource utilities - */ - -ASL_RESOURCE_NODE * -RsAllocateResourceNode ( - UINT32 Size); - - void -RsCreateBitField ( - ACPI_PARSE_OBJECT *Op, - char *Name, - UINT32 ByteOffset, - UINT32 BitOffset); - -void -RsCreateByteField ( - ACPI_PARSE_OBJECT *Op, - char *Name, - UINT32 ByteOffset); - -void -RsSetFlagBits ( - UINT8 *Flags, - ACPI_PARSE_OBJECT *Op, - UINT8 Position, - UINT8 Default); - -ACPI_PARSE_OBJECT * -RsCompleteNodeAndGetNext ( - ACPI_PARSE_OBJECT *Op); - -ASL_RESOURCE_NODE * -RsDoOneResourceDescriptor ( - ACPI_PARSE_OBJECT *DescriptorTypeOp, - UINT32 CurrentByteOffset); - -UINT32 -RsLinkDescriptorChain ( - ASL_RESOURCE_NODE **PreviousRnode, - ASL_RESOURCE_NODE *Rnode); - - -/* - * Small descriptors - */ - -ASL_RESOURCE_NODE * -RsDoDmaDescriptor ( - ACPI_PARSE_OBJECT *Op, - UINT32 CurrentByteOffset); - -ASL_RESOURCE_NODE * -RsDoEndDependentDescriptor ( - ACPI_PARSE_OBJECT *Op, - UINT32 CurrentByteOffset); - -ASL_RESOURCE_NODE * -RsDoFixedIoDescriptor ( - ACPI_PARSE_OBJECT *Op, - UINT32 CurrentByteOffset); - -ASL_RESOURCE_NODE * -RsDoInterruptDescriptor ( - ACPI_PARSE_OBJECT *Op, - UINT32 CurrentByteOffset); - -ASL_RESOURCE_NODE * -RsDoIoDescriptor ( - ACPI_PARSE_OBJECT *Op, - UINT32 CurrentByteOffset); - -ASL_RESOURCE_NODE * -RsDoIrqDescriptor ( - ACPI_PARSE_OBJECT *Op, - UINT32 CurrentByteOffset); - -ASL_RESOURCE_NODE * -RsDoIrqNoFlagsDescriptor ( - ACPI_PARSE_OBJECT *Op, - UINT32 CurrentByteOffset); - -ASL_RESOURCE_NODE * -RsDoMemory24Descriptor ( - ACPI_PARSE_OBJECT *Op, - UINT32 CurrentByteOffset); - -ASL_RESOURCE_NODE * -RsDoMemory32Descriptor ( - ACPI_PARSE_OBJECT *Op, - UINT32 CurrentByteOffset); - -ASL_RESOURCE_NODE * -RsDoMemory32FixedDescriptor ( - ACPI_PARSE_OBJECT *Op, - UINT32 CurrentByteOffset); - -ASL_RESOURCE_NODE * -RsDoStartDependentDescriptor ( - ACPI_PARSE_OBJECT *Op, - UINT32 CurrentByteOffset); - -ASL_RESOURCE_NODE * -RsDoStartDependentNoPriDescriptor ( - ACPI_PARSE_OBJECT *Op, - UINT32 CurrentByteOffset); - -ASL_RESOURCE_NODE * -RsDoVendorSmallDescriptor ( - ACPI_PARSE_OBJECT *Op, - UINT32 CurrentByteOffset); - - -/* - * Large descriptors - */ - -UINT32 -RsGetStringDataLength ( - ACPI_PARSE_OBJECT *InitializerOp); - -ASL_RESOURCE_NODE * -RsDoDwordIoDescriptor ( - ACPI_PARSE_OBJECT *Op, - UINT32 CurrentByteOffset); - -ASL_RESOURCE_NODE * -RsDoDwordMemoryDescriptor ( - ACPI_PARSE_OBJECT *Op, - UINT32 CurrentByteOffset); - -ASL_RESOURCE_NODE * -RsDoQwordIoDescriptor ( - ACPI_PARSE_OBJECT *Op, - UINT32 CurrentByteOffset); - -ASL_RESOURCE_NODE * -RsDoQwordMemoryDescriptor ( - ACPI_PARSE_OBJECT *Op, - UINT32 CurrentByteOffset); - -ASL_RESOURCE_NODE * -RsDoWordIoDescriptor ( - ACPI_PARSE_OBJECT *Op, - UINT32 CurrentByteOffset); - -ASL_RESOURCE_NODE * -RsDoWordBusNumberDescriptor ( - ACPI_PARSE_OBJECT *Op, - UINT32 CurrentByteOffset); - -ASL_RESOURCE_NODE * -RsDoVendorLargeDescriptor ( - ACPI_PARSE_OBJECT *Op, - UINT32 CurrentByteOffset); - -ASL_RESOURCE_NODE * -RsDoGeneralRegisterDescriptor ( - ACPI_PARSE_OBJECT *Op, - UINT32 CurrentByteOffset); #endif Index: contrib/dev/acpica/dbcmds.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dbcmds.c,v retrieving revision 1.2 diff -u -r1.2 dbcmds.c --- contrib/dev/acpica/dbcmds.c 30 Jul 2002 19:35:22 -0000 1.2 +++ contrib/dev/acpica/dbcmds.c 22 Aug 2002 12:00:19 -0000 @@ -124,9 +124,9 @@ #include "acresrc.h" #include "acdisasm.h" -#ifdef ENABLE_DEBUGGER +#ifdef ACPI_DEBUGGER -#define _COMPONENT ACPI_DEBUGGER +#define _COMPONENT ACPI_CA_DEBUGGER ACPI_MODULE_NAME ("dbcmds") @@ -861,7 +861,7 @@ } AcpiDbSetOutputDestination (ACPI_DB_DUPLICATE_OUTPUT); - AcpiOsPrintf ("Objects of type [%s] defined in the current ACPI Namespace: \n", + AcpiOsPrintf ("Objects of type [%s] defined in the current ACPI Namespace: \n", AcpiUtGetTypeName (Type)); AcpiDbSetOutputDestination (ACPI_DB_REDIRECTABLE_OUTPUT); @@ -1177,9 +1177,7 @@ } - - -typedef struct +typedef struct { UINT32 Nodes; UINT32 Objects; @@ -1269,4 +1267,4 @@ } -#endif /* ENABLE_DEBUGGER */ +#endif /* ACPI_DEBUGGER */ Index: contrib/dev/acpica/dbdisply.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dbdisply.c,v retrieving revision 1.1.1.16 diff -u -r1.1.1.16 dbdisply.c --- contrib/dev/acpica/dbdisply.c 30 Jul 2002 19:33:32 -0000 1.1.1.16 +++ contrib/dev/acpica/dbdisply.c 22 Aug 2002 10:07:06 -0000 @@ -124,10 +124,10 @@ #include "acdebug.h" -#ifdef ENABLE_DEBUGGER +#ifdef ACPI_DEBUGGER -#define _COMPONENT ACPI_DEBUGGER +#define _COMPONENT ACPI_CA_DEBUGGER ACPI_MODULE_NAME ("dbdisply") @@ -453,9 +453,9 @@ } break; - + default: - + AcpiOsPrintf ("%p", ObjDesc); break; } @@ -619,7 +619,7 @@ default: - AcpiOsPrintf ("Unknown Reference opcode %X\n", + AcpiOsPrintf ("Unknown Reference opcode %X\n", ObjDesc->Reference.Opcode); break; } @@ -998,5 +998,5 @@ AcpiDbDisplayInternalObject (ObjDesc, WalkState); } -#endif /* ENABLE_DEBUGGER */ +#endif /* ACPI_DEBUGGER */ Index: contrib/dev/acpica/dbexec.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dbexec.c,v retrieving revision 1.1.1.14 diff -u -r1.1.1.14 dbexec.c --- contrib/dev/acpica/dbexec.c 30 Jul 2002 19:33:33 -0000 1.1.1.14 +++ contrib/dev/acpica/dbexec.c 22 Aug 2002 10:07:06 -0000 @@ -118,9 +118,9 @@ #include "acpi.h" #include "acdebug.h" -#ifdef ENABLE_DEBUGGER +#ifdef ACPI_DEBUGGER -#define _COMPONENT ACPI_DEBUGGER +#define _COMPONENT ACPI_CA_DEBUGGER ACPI_MODULE_NAME ("dbexec") @@ -308,7 +308,7 @@ ACPI_BUFFER ReturnObj; -#ifdef ACPI_DEBUG +#ifdef ACPI_DEBUG_OUTPUT UINT32 PreviousAllocations; UINT32 Allocations; @@ -335,7 +335,7 @@ AcpiOsSleep (0, 10); -#ifdef ACPI_DEBUG +#ifdef ACPI_DEBUG_OUTPUT /* Memory allocation tracking */ @@ -368,7 +368,7 @@ } else { - AcpiOsPrintf ("No return object from execution of %s\n", + AcpiOsPrintf ("No return object from execution of %s\n", AcpiGbl_DbMethodInfo.Pathname); } } @@ -513,6 +513,6 @@ } -#endif /* ENABLE_DEBUGGER */ +#endif /* ACPI_DEBUGGER */ Index: contrib/dev/acpica/dbfileio.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dbfileio.c,v retrieving revision 1.5 diff -u -r1.5 dbfileio.c --- contrib/dev/acpica/dbfileio.c 30 Jul 2002 19:35:22 -0000 1.5 +++ contrib/dev/acpica/dbfileio.c 22 Aug 2002 12:00:19 -0000 @@ -121,9 +121,9 @@ #include "acnamesp.h" #include "actables.h" -#if (defined ENABLE_DEBUGGER || defined ACPI_DISASSEMBLER) +#if (defined ACPI_DEBUGGER || defined ACPI_DISASSEMBLER) -#define _COMPONENT ACPI_DEBUGGER +#define _COMPONENT ACPI_CA_DEBUGGER ACPI_MODULE_NAME ("dbfileio") @@ -177,7 +177,7 @@ } -#ifdef ENABLE_DEBUGGER +#ifdef ACPI_DEBUGGER /******************************************************************************* * * FUNCTION: AcpiDbCloseDebugFile @@ -506,5 +506,5 @@ } -#endif /* ENABLE_DEBUGGER */ +#endif /* ACPI_DEBUGGER */ Index: contrib/dev/acpica/dbhistry.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dbhistry.c,v retrieving revision 1.1.1.7 diff -u -r1.1.1.7 dbhistry.c --- contrib/dev/acpica/dbhistry.c 9 Jul 2002 17:51:23 -0000 1.1.1.7 +++ contrib/dev/acpica/dbhistry.c 22 Aug 2002 10:07:06 -0000 @@ -118,9 +118,9 @@ #include "acpi.h" #include "acdebug.h" -#ifdef ENABLE_DEBUGGER +#ifdef ACPI_DEBUGGER -#define _COMPONENT ACPI_DEBUGGER +#define _COMPONENT ACPI_CA_DEBUGGER ACPI_MODULE_NAME ("dbhistry") @@ -287,5 +287,5 @@ } -#endif /* ENABLE_DEBUGGER */ +#endif /* ACPI_DEBUGGER */ Index: contrib/dev/acpica/dbinput.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dbinput.c,v retrieving revision 1.1.1.13 diff -u -r1.1.1.13 dbinput.c --- contrib/dev/acpica/dbinput.c 9 Jul 2002 17:51:23 -0000 1.1.1.13 +++ contrib/dev/acpica/dbinput.c 22 Aug 2002 10:07:06 -0000 @@ -119,9 +119,9 @@ #include "acdebug.h" -#ifdef ENABLE_DEBUGGER +#ifdef ACPI_DEBUGGER -#define _COMPONENT ACPI_DEBUGGER +#define _COMPONENT ACPI_CA_DEBUGGER ACPI_MODULE_NAME ("dbinput") @@ -980,5 +980,5 @@ } -#endif /* ENABLE_DEBUGGER */ +#endif /* ACPI_DEBUGGER */ Index: contrib/dev/acpica/dbstats.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dbstats.c,v retrieving revision 1.1.1.11 diff -u -r1.1.1.11 dbstats.c --- contrib/dev/acpica/dbstats.c 9 Jul 2002 17:51:23 -0000 1.1.1.11 +++ contrib/dev/acpica/dbstats.c 22 Aug 2002 10:07:06 -0000 @@ -119,9 +119,9 @@ #include #include -#ifdef ENABLE_DEBUGGER +#ifdef ACPI_DEBUGGER -#define _COMPONENT ACPI_DEBUGGER +#define _COMPONENT ACPI_CA_DEBUGGER ACPI_MODULE_NAME ("dbstats") /* @@ -240,8 +240,6 @@ } -#ifndef PARSER_ONLY - /******************************************************************************* * * FUNCTION: AcpiDbClassifyOneObject @@ -346,8 +344,6 @@ FALSE, AcpiDbClassifyOneObject, NULL, NULL); } -#endif - /******************************************************************************* * @@ -395,13 +391,11 @@ switch (Type) { -#ifndef PARSER_ONLY case CMD_STAT_ALLOCATIONS: #ifdef ACPI_DBG_TRACK_ALLOCATIONS AcpiUtDumpAllocationInfo (); #endif break; -#endif case CMD_STAT_TABLES: @@ -414,8 +408,6 @@ case CMD_STAT_OBJECTS: -#ifndef PARSER_ONLY - AcpiDbCountNamespaceObjects (); AcpiOsPrintf ("\nObjects defined in the current namespace:\n\n"); @@ -432,8 +424,6 @@ AcpiOsPrintf ("%16.16s % 10ld% 10ld\n", "TOTALS:", AcpiGbl_NumNodes, AcpiGbl_NumObjects); - -#endif break; case CMD_STAT_MEMORY: @@ -537,7 +527,7 @@ case CMD_STAT_STACK: -#if defined(ACPI_DEBUG) +#if defined(ACPI_DEBUG_OUTPUT) Size = (UINT32) (AcpiGbl_EntryStackPointer - AcpiGbl_LowestStackPointer); @@ -558,4 +548,4 @@ } -#endif /* ENABLE_DEBUGGER */ +#endif /* ACPI_DEBUGGER */ Index: contrib/dev/acpica/dbutils.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dbutils.c,v retrieving revision 1.1.1.13 diff -u -r1.1.1.13 dbutils.c --- contrib/dev/acpica/dbutils.c 9 Jul 2002 17:51:24 -0000 1.1.1.13 +++ contrib/dev/acpica/dbutils.c 22 Aug 2002 10:07:07 -0000 @@ -123,9 +123,9 @@ #include "acdispat.h" -#ifdef ENABLE_DEBUGGER +#ifdef ACPI_DEBUGGER -#define _COMPONENT ACPI_DEBUGGER +#define _COMPONENT ACPI_CA_DEBUGGER ACPI_MODULE_NAME ("dbutils") @@ -486,6 +486,6 @@ } -#endif /* ENABLE_DEBUGGER */ +#endif /* ACPI_DEBUGGER */ Index: contrib/dev/acpica/dbxface.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dbxface.c,v retrieving revision 1.2 diff -u -r1.2 dbxface.c --- contrib/dev/acpica/dbxface.c 30 Jul 2002 19:35:22 -0000 1.2 +++ contrib/dev/acpica/dbxface.c 22 Aug 2002 12:00:19 -0000 @@ -121,9 +121,9 @@ #include "acdisasm.h" -#ifdef ENABLE_DEBUGGER +#ifdef ACPI_DEBUGGER -#define _COMPONENT ACPI_DEBUGGER +#define _COMPONENT ACPI_CA_DEBUGGER ACPI_MODULE_NAME ("dbxface") @@ -158,7 +158,7 @@ /* Check for single-step breakpoint */ - if (WalkState->MethodBreakpoint && + if (WalkState->MethodBreakpoint && (WalkState->MethodBreakpoint <= Op->Common.AmlOffset)) { /* Check if the breakpoint has been reached or passed */ @@ -172,7 +172,7 @@ /* Check for user breakpoint (Must be on exact Aml offset) */ - else if (WalkState->UserBreakpoint && + else if (WalkState->UserBreakpoint && (WalkState->UserBreakpoint == Op->Common.AmlOffset)) { AcpiOsPrintf ("***UserBreakpoint*** at AML offset %X\n", Op->Common.AmlOffset); @@ -294,7 +294,7 @@ /* Restore everything */ Op->Common.Next = Next; - AcpiOsPrintf ("\n"); + AcpiOsPrintf ("\n\n"); AcpiDbgLevel = OriginalDebugLevel; } @@ -518,4 +518,4 @@ } -#endif /* ENABLE_DEBUGGER */ +#endif /* ACPI_DEBUGGER */ Index: contrib/dev/acpica/dmbuffer.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dmbuffer.c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 dmbuffer.c --- contrib/dev/acpica/dmbuffer.c 30 Jul 2002 19:33:33 -0000 1.1.1.1 +++ contrib/dev/acpica/dmbuffer.c 22 Aug 2002 10:07:07 -0000 @@ -123,7 +123,7 @@ #ifdef ACPI_DISASSEMBLER -#define _COMPONENT ACPI_DEBUGGER +#define _COMPONENT ACPI_CA_DEBUGGER ACPI_MODULE_NAME ("dmbuffer") @@ -513,7 +513,7 @@ /******************************************************************************* * - * FUNCTION: AcpiIsEisaId + * FUNCTION: AcpiIsEisaId * * PARAMETERS: Op - Op to be examined * @@ -541,7 +541,7 @@ { return; } - + /* We are looking for _HID */ if (ACPI_STRNCMP ((char *) &Name, "_HID", 4)) @@ -587,7 +587,7 @@ /******************************************************************************* * - * FUNCTION: AcpiDmEisaId + * FUNCTION: AcpiDmEisaId * * PARAMETERS: EncodedId - Raw encoded EISA ID. * Index: contrib/dev/acpica/dmnames.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dmnames.c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 dmnames.c --- contrib/dev/acpica/dmnames.c 30 Jul 2002 19:33:33 -0000 1.1.1.1 +++ contrib/dev/acpica/dmnames.c 22 Aug 2002 10:07:07 -0000 @@ -124,7 +124,7 @@ #ifdef ACPI_DISASSEMBLER -#define _COMPONENT ACPI_DEBUGGER +#define _COMPONENT ACPI_CA_DEBUGGER ACPI_MODULE_NAME ("dmnames") @@ -145,7 +145,7 @@ char *Name, ACPI_PARSE_OBJECT *Op) { -#ifdef PARSER_ONLY +#if 0 ACPI_PARSE_OBJECT *TargetOp; @@ -226,58 +226,6 @@ * ******************************************************************************/ -#ifdef PARSER_ONLY - -ACPI_STATUS -AcpiPsDisplayObjectPathname ( - ACPI_WALK_STATE *WalkState, - ACPI_PARSE_OBJECT *Op) -{ - ACPI_PARSE_OBJECT *TargetOp; - char *Name; - - - if (Op->Common.Flags & ACPI_PARSEOP_GENERIC) - { - Name = Op->Common.Value.Name; - if (Name[0] == '\\') - { - AcpiOsPrintf (" (Fully Qualified Pathname)"); - return (AE_OK); - } - } - else - { - Name = (char *) &Op->Named.Name; - } - - /* Search parent tree up to the root if necessary */ - - TargetOp = AcpiPsFind (Op, Name, 0, 0); - if (!TargetOp) - { - /* - * Didn't find the name in the parse tree. This may be - * a problem, or it may simply be one of the predefined names - * (such as _OS_). Rather than worry about looking up all - * the predefined names, just display the name as given - */ - AcpiOsPrintf (" **** Path not found in parse tree"); - } - else - { - /* The target was found, print the name and complete path */ - - AcpiOsPrintf (" (Path "); - AcpiDmDisplayPath (TargetOp); - AcpiOsPrintf (")"); - } - - return (AE_OK); -} - -#else - ACPI_STATUS AcpiPsDisplayObjectPathname ( ACPI_WALK_STATE *WalkState, @@ -340,8 +288,6 @@ AcpiDbgLevel = DebugLevel; return (Status); } - -#endif /******************************************************************************* Index: contrib/dev/acpica/dmopcode.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dmopcode.c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 dmopcode.c --- contrib/dev/acpica/dmopcode.c 30 Jul 2002 19:33:33 -0000 1.1.1.1 +++ contrib/dev/acpica/dmopcode.c 22 Aug 2002 10:07:07 -0000 @@ -122,7 +122,7 @@ #ifdef ACPI_DISASSEMBLER -#define _COMPONENT ACPI_DEBUGGER +#define _COMPONENT ACPI_CA_DEBUGGER ACPI_MODULE_NAME ("dmopcode") @@ -419,7 +419,7 @@ case AML_BYTE_OP: - AcpiOsPrintf ("0x%.2X", (UINT32) Op->Common.Value.Integer8); + AcpiOsPrintf ("0x%2.2X", (UINT32) Op->Common.Value.Integer8); break; @@ -431,7 +431,7 @@ } else { - AcpiOsPrintf ("0x%.2X", (UINT32) Op->Common.Value.Integer16); + AcpiOsPrintf ("0x%4.4X", (UINT32) Op->Common.Value.Integer16); } break; @@ -442,30 +442,17 @@ { AcpiDmEisaId (Op->Common.Value.Integer32); } - else if ((Op->Common.Value.Integer32 == ACPI_UINT32_MAX) && - (AcpiGbl_DSDT->Revision < 2)) - { - AcpiOsPrintf ("Ones"); - } else { - AcpiOsPrintf ("0x%.2X", Op->Common.Value.Integer32); + AcpiOsPrintf ("0x%8.8X", Op->Common.Value.Integer32); } break; case AML_QWORD_OP: - if ((Op->Common.Value.Integer == ACPI_INTEGER_MAX) && - (AcpiGbl_DSDT->Revision >= 2)) - { - AcpiOsPrintf ("Ones"); - } - else - { - AcpiOsPrintf ("0x%X%8.8X", Op->Common.Value.Integer64.Hi, - Op->Common.Value.Integer64.Lo); - } + AcpiOsPrintf ("0x%8.8X%8.8X", Op->Common.Value.Integer64.Hi, + Op->Common.Value.Integer64.Lo); break; @@ -596,7 +583,7 @@ AcpiOsPrintf ("%s", OpInfo->Name); -#ifdef ENABLE_DEBUGGER +#ifdef ACPI_DEBUGGER if ((Op->Common.AmlOpcode == AML_INT_RETURN_VALUE_OP) && (WalkState) && Index: contrib/dev/acpica/dmresrc.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dmresrc.c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 dmresrc.c --- contrib/dev/acpica/dmresrc.c 30 Jul 2002 19:33:33 -0000 1.1.1.1 +++ contrib/dev/acpica/dmresrc.c 22 Aug 2002 10:07:07 -0000 @@ -121,7 +121,7 @@ #ifdef ACPI_DISASSEMBLER -#define _COMPONENT ACPI_DEBUGGER +#define _COMPONENT ACPI_CA_DEBUGGER ACPI_MODULE_NAME ("dbresrc") @@ -305,7 +305,7 @@ AcpiOsPrintf ("/*** Missing EndDependentFunctions descriptor */"); /* - * We could fix the problem, but then the ASL would not match the AML + * We could fix the problem, but then the ASL would not match the AML * So, we don't do this: * AcpiDmEndDependentDescriptor (DescriptorBody, Length, Level); */ @@ -391,7 +391,7 @@ * * PARAMETERS: Op - Buffer Op to be examined * - * RETURN: TRUE if this Buffer Op contains a valid resource + * RETURN: TRUE if this Buffer Op contains a valid resource * descriptor. * * DESCRIPTION: Walk a byte list to determine if it consists of a valid set @@ -441,7 +441,7 @@ } /* - * Walk the byte list. Abort on any invalid descriptor ID or + * Walk the byte list. Abort on any invalid descriptor ID or * or length */ for (CurrentByteOffset = 0; CurrentByteOffset < ByteCount; ) Index: contrib/dev/acpica/dmresrcl.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dmresrcl.c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 dmresrcl.c --- contrib/dev/acpica/dmresrcl.c 30 Jul 2002 19:33:33 -0000 1.1.1.1 +++ contrib/dev/acpica/dmresrcl.c 22 Aug 2002 10:07:07 -0000 @@ -121,7 +121,7 @@ #ifdef ACPI_DISASSEMBLER -#define _COMPONENT ACPI_DEBUGGER +#define _COMPONENT ACPI_CA_DEBUGGER ACPI_MODULE_NAME ("dbresrcl") @@ -286,19 +286,19 @@ AcpiOsPrintf ("\n"); AcpiDmIndent (Level + 1); - AcpiOsPrintf ("0x%8.8X,\n", + AcpiOsPrintf ("0x%8.8X,\n", Resource->Granularity); AcpiDmIndent (Level + 1); AcpiOsPrintf ("0x%8.8X,\n", Resource->AddressMin); AcpiDmIndent (Level + 1); - AcpiOsPrintf ("0x%8.8X,\n", + AcpiOsPrintf ("0x%8.8X,\n", Resource->AddressMax); AcpiDmIndent (Level + 1); AcpiOsPrintf ("0x%8.8X,\n", Resource->TranslationOffset); AcpiDmIndent (Level + 1); - AcpiOsPrintf ("0x%8.8X", + AcpiOsPrintf ("0x%8.8X", Resource->AddressLength); /* Optional fields */ @@ -512,9 +512,9 @@ AcpiDmIndent (Level); AcpiOsPrintf ("Register ("); - + AcpiDmAddressSpace (Resource->AddressSpaceId); - + AcpiOsPrintf ("0x%2.2X, 0x%2.2X, 0x%8.8X%8.8X)\n", (UINT32) Resource->BitWidth, (UINT32) Resource->BitOffset, Index: contrib/dev/acpica/dmresrcs.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dmresrcs.c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 dmresrcs.c --- contrib/dev/acpica/dmresrcs.c 30 Jul 2002 19:33:33 -0000 1.1.1.1 +++ contrib/dev/acpica/dmresrcs.c 22 Aug 2002 10:07:07 -0000 @@ -121,7 +121,7 @@ #ifdef ACPI_DISASSEMBLER -#define _COMPONENT ACPI_DEBUGGER +#define _COMPONENT ACPI_CA_DEBUGGER ACPI_MODULE_NAME ("dbresrcs") Index: contrib/dev/acpica/dmutils.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dmutils.c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 dmutils.c --- contrib/dev/acpica/dmutils.c 30 Jul 2002 19:33:33 -0000 1.1.1.1 +++ contrib/dev/acpica/dmutils.c 22 Aug 2002 10:07:07 -0000 @@ -122,12 +122,10 @@ #ifdef ACPI_DISASSEMBLER -#define _COMPONENT ACPI_DEBUGGER +#define _COMPONENT ACPI_CA_DEBUGGER ACPI_MODULE_NAME ("dmutils") - - /* Data used in keeping track of fields */ #if 0 const NATIVE_CHAR *AcpiGbl_FENames[NUM_FIELD_NAMES] = @@ -399,7 +397,6 @@ AcpiOsPrintf (", "); } } - #endif Index: contrib/dev/acpica/dmwalk.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dmwalk.c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 dmwalk.c --- contrib/dev/acpica/dmwalk.c 30 Jul 2002 19:33:33 -0000 1.1.1.1 +++ contrib/dev/acpica/dmwalk.c 22 Aug 2002 10:07:07 -0000 @@ -124,14 +124,13 @@ #ifdef ACPI_DISASSEMBLER -#define _COMPONENT ACPI_DEBUGGER +#define _COMPONENT ACPI_CA_DEBUGGER ACPI_MODULE_NAME ("dmwalk") #define DB_FULL_OP_INFO "%5.5X #%4.4hX " - /******************************************************************************* * * FUNCTION: AcpiDmDisassemble @@ -421,7 +420,7 @@ * * RETURN: Status * - * DESCRIPTION: First visitation of a parse object during tree descent. + * DESCRIPTION: First visitation of a parse object during tree descent. * Decode opcode name and begin parameter list(s), if any. * ******************************************************************************/ @@ -483,7 +482,7 @@ */ OpInfo = AcpiPsGetOpcodeInfo (Op->Common.AmlOpcode); - if ((OpInfo->Flags & AML_HAS_ARGS) || + if ((OpInfo->Flags & AML_HAS_ARGS) || (Op->Common.AmlOpcode == AML_EVENT_OP)) { /* This opcode has an argument list */ @@ -680,7 +679,7 @@ if (Op->Common.DisasmOpcode == ACPI_DASM_RESOURCE) { /* - * We have a resource list. Don't need to output + * We have a resource list. Don't need to output * the buffer size Op. Open up a new block */ NextOp->Common.DisasmFlags |= ACPI_PARSEOP_IGNORE; Index: contrib/dev/acpica/dsfield.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dsfield.c,v retrieving revision 1.1.1.10 diff -u -r1.1.1.10 dsfield.c --- contrib/dev/acpica/dsfield.c 9 Jul 2002 17:51:24 -0000 1.1.1.10 +++ contrib/dev/acpica/dsfield.c 22 Aug 2002 10:07:10 -0000 @@ -312,7 +312,7 @@ { case AML_INT_RESERVEDFIELD_OP: - Position = (ACPI_INTEGER) Info->FieldBitPosition + Position = (ACPI_INTEGER) Info->FieldBitPosition + (ACPI_INTEGER) Arg->Common.Value.Size; if (Position > ACPI_UINT32_MAX) @@ -374,7 +374,7 @@ /* Keep track of bit position for the next field */ - Position = (ACPI_INTEGER) Info->FieldBitPosition + Position = (ACPI_INTEGER) Info->FieldBitPosition + (ACPI_INTEGER) Arg->Common.Value.Size; if (Position > ACPI_UINT32_MAX) Index: contrib/dev/acpica/dsmethod.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dsmethod.c,v retrieving revision 1.1.1.14 diff -u -r1.1.1.14 dsmethod.c --- contrib/dev/acpica/dsmethod.c 30 Jul 2002 19:33:34 -0000 1.1.1.14 +++ contrib/dev/acpica/dsmethod.c 22 Aug 2002 10:07:10 -0000 @@ -249,7 +249,7 @@ return_ACPI_STATUS (Status); } - ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, + ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "**** [%4.4s] Parsed **** NamedObj=%p Op=%p\n", ((ACPI_NAMESPACE_NODE *) ObjHandle)->Name.Ascii, ObjHandle, Op)); @@ -459,7 +459,7 @@ ThisWalkState->NumOperands = 0; - ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, + ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Starting nested execution, newstate=%p\n", NextWalkState)); return_ACPI_STATUS (AE_OK); Index: contrib/dev/acpica/dsmthdat.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dsmthdat.c,v retrieving revision 1.1.1.12 diff -u -r1.1.1.12 dsmthdat.c --- contrib/dev/acpica/dsmthdat.c 9 Jul 2002 17:51:24 -0000 1.1.1.12 +++ contrib/dev/acpica/dsmthdat.c 22 Aug 2002 10:07:10 -0000 @@ -704,24 +704,43 @@ * * Weird, but true. */ - if ((Opcode == AML_ARG_OP) && - (ACPI_GET_DESCRIPTOR_TYPE (CurrentObjDesc) == ACPI_DESC_TYPE_NAMED)) + if (Opcode == AML_ARG_OP) { - ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, - "Arg (%p) is an ObjRef(Node), storing in node %p\n", - ObjDesc, CurrentObjDesc)); - - /* Detach an existing object from the Node */ - - AcpiNsDetachObject ((ACPI_NAMESPACE_NODE *) CurrentObjDesc); - - /* - * Store this object into the Node - * (perform the indirect store) + /* + * Make sure that the object is the correct type. This may be overkill, but + * it is here because references were NS nodes in the past. Now they are + * operand objects of type Reference. */ - Status = AcpiNsAttachObject ((ACPI_NAMESPACE_NODE *) CurrentObjDesc, - ObjDesc, ACPI_GET_OBJECT_TYPE (ObjDesc)); - return_ACPI_STATUS (Status); + if (ACPI_GET_DESCRIPTOR_TYPE (CurrentObjDesc) != ACPI_DESC_TYPE_OPERAND) + { + ACPI_REPORT_ERROR (("Invalid descriptor type while storing to method arg: %X\n", + CurrentObjDesc->Common.Type)); + return_ACPI_STATUS (AE_AML_INTERNAL); + } + + /* + * If we have a valid reference object that came from RefOf(), do the + * indirect store + */ + if ((CurrentObjDesc->Common.Type == INTERNAL_TYPE_REFERENCE) && + (CurrentObjDesc->Reference.Opcode == AML_REF_OF_OP)) + { + ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, + "Arg (%p) is an ObjRef(Node), storing in node %p\n", + ObjDesc, CurrentObjDesc)); + + /* Detach an existing object from the referenced Node */ + + AcpiNsDetachObject (CurrentObjDesc->Reference.Object); + + /* + * Store this object into the Node + * (perform the indirect store) + */ + Status = AcpiNsAttachObject (CurrentObjDesc->Reference.Object, + ObjDesc, ACPI_GET_OBJECT_TYPE (ObjDesc)); + return_ACPI_STATUS (Status); + } } /* Index: contrib/dev/acpica/dsobject.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dsobject.c,v retrieving revision 1.1.1.17 diff -u -r1.1.1.17 dsobject.c --- contrib/dev/acpica/dsobject.c 30 Jul 2002 19:33:35 -0000 1.1.1.17 +++ contrib/dev/acpica/dsobject.c 22 Aug 2002 10:07:10 -0000 @@ -267,7 +267,7 @@ * * RETURN: Status * - * DESCRIPTION: Walk the namespace starting at "StartNode" and perform any + * DESCRIPTION: Walk the namespace starting at "StartNode" and perform any * necessary initialization on the objects found therein * ******************************************************************************/ @@ -300,7 +300,7 @@ AcpiDsInitOneObject, &Info, NULL); if (ACPI_FAILURE (Status)) { - ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "WalkNamespace failed, %s\n", + ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "WalkNamespace failed, %s\n", AcpiFormatException (Status))); } @@ -461,7 +461,7 @@ /* * Second arg is the buffer data (optional) ByteList can be either - * individual bytes or a string initializer. In either case, a + * individual bytes or a string initializer. In either case, a * ByteList appears in the AML. */ Arg = Op->Common.Value.Arg; /* skip first arg */ @@ -471,7 +471,7 @@ { if (ByteList->Common.AmlOpcode != AML_INT_BYTELIST_OP) { - ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, + ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Expecting bytelist, got AML opcode %X in op %p\n", ByteList->Common.AmlOpcode, ByteList)); @@ -484,7 +484,7 @@ /* * The buffer length (number of bytes) will be the larger of: - * 1) The specified buffer length and + * 1) The specified buffer length and * 2) The length of the initializer byte list */ ObjDesc->Buffer.Length = BufferLength; @@ -507,7 +507,7 @@ if (!ObjDesc->Buffer.Pointer) { AcpiUtDeleteObjectDesc (ObjDesc); - return_ACPI_STATUS (AE_NO_MEMORY); + return_ACPI_STATUS (AE_NO_MEMORY); } /* Initialize buffer from the ByteList (if present) */ @@ -789,7 +789,7 @@ break; - case ACPI_TYPE_INTEGER: + case ACPI_TYPE_INTEGER: switch (OpInfo->Type) { @@ -882,7 +882,7 @@ 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, + AcpiDsMethodDataGetNode (AML_LOCAL_OP, ObjDesc->Reference.Offset, WalkState, (ACPI_NAMESPACE_NODE **) &ObjDesc->Reference.Object); #endif break; @@ -922,6 +922,5 @@ return_ACPI_STATUS (Status); } - Index: contrib/dev/acpica/dsopcode.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dsopcode.c,v retrieving revision 1.1.1.16 diff -u -r1.1.1.16 dsopcode.c --- contrib/dev/acpica/dsopcode.c 9 Jul 2002 17:51:24 -0000 1.1.1.16 +++ contrib/dev/acpica/dsopcode.c 22 Aug 2002 10:07:10 -0000 @@ -319,7 +319,7 @@ Node = ObjDesc->Buffer.Node; if (!Node) { - ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, + ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "No pointer back to NS node in buffer %p\n", ObjDesc)); return_ACPI_STATUS (AE_AML_INTERNAL); } @@ -368,7 +368,7 @@ Node = ObjDesc->Package.Node; if (!Node) { - ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, + ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "No pointer back to NS node in package %p\n", ObjDesc)); return_ACPI_STATUS (AE_AML_INTERNAL); } @@ -515,7 +515,7 @@ /* * The last parameter to all of these opcodes (ResultDesc) started * out as a NameString, and should therefore now be a NS node - * after resolution in AcpiExResolveOperands(). + * after resolution in AcpiExResolveOperands(). */ if (ACPI_GET_DESCRIPTOR_TYPE (ResultDesc) != ACPI_DESC_TYPE_NAMED) { @@ -711,10 +711,10 @@ /* Resolve the operands */ - Status = AcpiExResolveOperands (Op->Common.AmlOpcode, + Status = AcpiExResolveOperands (Op->Common.AmlOpcode, ACPI_WALK_OPERANDS, WalkState); - ACPI_DUMP_OPERANDS (ACPI_WALK_OPERANDS, ACPI_IMODE_EXECUTE, + ACPI_DUMP_OPERANDS (ACPI_WALK_OPERANDS, ACPI_IMODE_EXECUTE, AcpiPsGetOpcodeName (Op->Common.AmlOpcode), WalkState->NumOperands, "after AcpiExResolveOperands"); @@ -732,16 +732,16 @@ { /* NOTE: Slightly different operands for this opcode */ - Status = AcpiDsInitBufferField (Op->Common.AmlOpcode, ObjDesc, - WalkState->Operands[0], WalkState->Operands[1], + Status = AcpiDsInitBufferField (Op->Common.AmlOpcode, ObjDesc, + WalkState->Operands[0], WalkState->Operands[1], WalkState->Operands[2], WalkState->Operands[3]); } else { /* All other, CreateXxxField opcodes */ - Status = AcpiDsInitBufferField (Op->Common.AmlOpcode, ObjDesc, - WalkState->Operands[0], WalkState->Operands[1], + Status = AcpiDsInitBufferField (Op->Common.AmlOpcode, ObjDesc, + WalkState->Operands[0], WalkState->Operands[1], NULL, WalkState->Operands[2]); } @@ -848,7 +848,6 @@ } - /***************************************************************************** * * FUNCTION: AcpiDsEvalDataObjectOperands @@ -910,7 +909,7 @@ AcpiUtRemoveReference (ArgDesc); - /* + /* * Create the actual data object */ switch (Op->Common.AmlOpcode) @@ -948,7 +947,6 @@ return_ACPI_STATUS (Status); } - /******************************************************************************* Index: contrib/dev/acpica/dswexec.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dswexec.c,v retrieving revision 1.1.1.15 diff -u -r1.1.1.15 dswexec.c --- contrib/dev/acpica/dswexec.c 9 Jul 2002 17:51:24 -0000 1.1.1.15 +++ contrib/dev/acpica/dswexec.c 22 Aug 2002 10:07:11 -0000 @@ -417,7 +417,6 @@ } - /***************************************************************************** * * FUNCTION: AcpiDsExecEndOp @@ -660,7 +659,7 @@ case AML_INT_EVAL_SUBTREE_OP: - Status = AcpiDsEvalDataObjectOperands (WalkState, Op, + Status = AcpiDsEvalDataObjectOperands (WalkState, Op, AcpiNsGetAttachedObject (Op->Common.Parent->Common.Node)); break; Index: contrib/dev/acpica/dswload.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dswload.c,v retrieving revision 1.1.1.15 diff -u -r1.1.1.15 dswload.c --- contrib/dev/acpica/dswload.c 30 Jul 2002 19:33:35 -0000 1.1.1.15 +++ contrib/dev/acpica/dswload.c 22 Aug 2002 10:07:11 -0000 @@ -404,7 +404,7 @@ NATIVE_CHAR *BufferPtr; - ACPI_FUNCTION_NAME ("DsLoad2BeginOp"); + ACPI_FUNCTION_TRACE ("DsLoad2BeginOp"); Op = WalkState->Op; @@ -417,7 +417,7 @@ if ((!(WalkState->OpInfo->Flags & AML_NSOPCODE) && (WalkState->Opcode != AML_INT_NAMEPATH_OP)) || (!(WalkState->OpInfo->Flags & AML_NAMED))) { - return (AE_OK); + return_ACPI_STATUS (AE_OK); } /* @@ -432,7 +432,7 @@ { /* No name, just exit */ - return (AE_OK); + return_ACPI_STATUS (AE_OK); } } else @@ -488,11 +488,11 @@ Status = AcpiDsScopeStackPush (Node, ObjectType, WalkState); if (ACPI_FAILURE (Status)) { - return (Status); + return_ACPI_STATUS (Status); } } - return (AE_OK); + return_ACPI_STATUS (AE_OK); } /* @@ -513,7 +513,7 @@ Op = AcpiPsAllocOp (WalkState->Opcode); if (!Op) { - return (AE_NO_MEMORY); + return_ACPI_STATUS (AE_NO_MEMORY); } /* Initialize the new op */ @@ -535,7 +535,7 @@ Op->Common.Node = Node; } - return (Status); + return_ACPI_STATUS (Status); } @@ -569,7 +569,7 @@ #endif - ACPI_FUNCTION_NAME ("DsLoad2EndOp"); + ACPI_FUNCTION_TRACE ("DsLoad2EndOp"); Op = WalkState->Op; ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Opcode [%s] Op %p State %p\n", @@ -579,7 +579,7 @@ if (!(WalkState->OpInfo->Flags & AML_NSOBJECT)) { - return (AE_OK); + return_ACPI_STATUS (AE_OK); } if (Op->Common.AmlOpcode == AML_SCOPE_OP) @@ -606,7 +606,7 @@ /* Pop the scope stack */ - if (AcpiNsOpensScope (ObjectType)) + if (AcpiNsOpensScope (ObjectType) && (Op->Common.AmlOpcode != AML_INT_METHODCALL_OP)) { ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "(%s) Popping scope for Op %p\n", AcpiUtGetTypeName (ObjectType), Op)); @@ -614,7 +614,7 @@ Status = AcpiDsScopeStackPop (WalkState); if (ACPI_FAILURE (Status)) { - return (Status); + return_ACPI_STATUS (Status); } } @@ -871,7 +871,7 @@ WalkState->Operands[0] = NULL; WalkState->NumOperands = 0; - return (Status); + return_ACPI_STATUS (Status); } Index: contrib/dev/acpica/dswstate.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dswstate.c,v retrieving revision 1.1.1.14 diff -u -r1.1.1.14 dswstate.c --- contrib/dev/acpica/dswstate.c 30 Jul 2002 19:33:35 -0000 1.1.1.14 +++ contrib/dev/acpica/dswstate.c 22 Aug 2002 10:07:11 -0000 @@ -962,6 +962,8 @@ WalkState->MethodDesc = MthDesc; WalkState->Thread = Thread; + WalkState->ParserState.StartOp = Origin; + /* Init the method args/local */ #if (!defined (ACPI_NO_METHOD_EXECUTION) && !defined (ACPI_CONSTANT_EVAL_ONLY)) @@ -1012,6 +1014,7 @@ { ACPI_STATUS Status; ACPI_PARSE_STATE *ParserState = &WalkState->ParserState; + ACPI_PARSE_OBJECT *ExtraOp; ACPI_FUNCTION_TRACE ("DsInitAmlWalk"); @@ -1059,9 +1062,26 @@ } else { - /* Setup the current scope */ - - ParserState->StartNode = ParserState->StartOp->Common.Node; + /* + * Setup the current scope. + * Find a Named Op that has a namespace node associated with it. + * search upwards from this Op. Current scope is the first + * Op with a namespace node. + */ + ExtraOp = ParserState->StartOp; + while (ExtraOp && !ExtraOp->Common.Node) + { + ExtraOp = ExtraOp->Common.Parent; + } + if (!ExtraOp) + { + ParserState->StartNode = NULL; + } + else + { + ParserState->StartNode = ExtraOp->Common.Node; + } + if (ParserState->StartNode) { /* Push start scope on scope stack and make it current */ Index: contrib/dev/acpica/evevent.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/evevent.c,v retrieving revision 1.1.1.17 diff -u -r1.1.1.17 evevent.c --- contrib/dev/acpica/evevent.c 9 Jul 2002 17:51:21 -0000 1.1.1.17 +++ contrib/dev/acpica/evevent.c 22 Aug 2002 10:07:07 -0000 @@ -198,7 +198,7 @@ ACPI_STATUS Status; - ACPI_FUNCTION_TRACE ("EvInitialize"); + ACPI_FUNCTION_TRACE ("EvHandlerInitialize"); /* Install the SCI handler */ @@ -545,12 +545,12 @@ GpeRegisterInfo->BaseGpeNumber = (UINT8) (AcpiGbl_GpeBlockInfo[GpeBlock].BlockBaseNumber + (ACPI_MUL_8 (i))); - ACPI_STORE_ADDRESS (GpeRegisterInfo->StatusAddress.Address, - (ACPI_GET_ADDRESS (AcpiGbl_GpeBlockInfo[GpeBlock].BlockAddress->Address) + ACPI_STORE_ADDRESS (GpeRegisterInfo->StatusAddress.Address, + (ACPI_GET_ADDRESS (AcpiGbl_GpeBlockInfo[GpeBlock].BlockAddress->Address) + i)); ACPI_STORE_ADDRESS (GpeRegisterInfo->EnableAddress.Address, - (ACPI_GET_ADDRESS (AcpiGbl_GpeBlockInfo[GpeBlock].BlockAddress->Address) + (ACPI_GET_ADDRESS (AcpiGbl_GpeBlockInfo[GpeBlock].BlockAddress->Address) + i + AcpiGbl_GpeBlockInfo[GpeBlock].RegisterCount)); @@ -599,7 +599,7 @@ ACPI_LODWORD (ACPI_GET_ADDRESS (AcpiGbl_GpeBlockInfo[GpeBlock].BlockAddress->Address)))); ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "GPE Block%d Range GPE #%2.2X to GPE #%2.2X\n", - (INT32) GpeBlock, + (INT32) GpeBlock, AcpiGbl_GpeBlockInfo[GpeBlock].BlockBaseNumber, AcpiGbl_GpeBlockInfo[GpeBlock].BlockBaseNumber + ((AcpiGbl_GpeBlockInfo[GpeBlock].RegisterCount * 8) -1))); Index: contrib/dev/acpica/evmisc.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/evmisc.c,v retrieving revision 1.1.1.15 diff -u -r1.1.1.15 evmisc.c --- contrib/dev/acpica/evmisc.c 9 Jul 2002 17:51:21 -0000 1.1.1.15 +++ contrib/dev/acpica/evmisc.c 22 Aug 2002 10:07:07 -0000 @@ -480,7 +480,7 @@ /* Run the Global Lock thread which will signal all waiting threads */ - Status = AcpiOsQueueForExecution (OSD_PRIORITY_HIGH, + Status = AcpiOsQueueForExecution (OSD_PRIORITY_HIGH, AcpiEvGlobalLockThread, Context); if (ACPI_FAILURE (Status)) { @@ -556,12 +556,14 @@ ACPI_FUNCTION_TRACE ("EvAcquireGlobalLock"); +#ifndef ACPI_APPLICATION /* Make sure that we actually have a global lock */ if (!AcpiGbl_GlobalLockPresent) { return_ACPI_STATUS (AE_NO_GLOBAL_LOCK); } +#endif /* One more thread wants the global lock */ @@ -672,9 +674,64 @@ void AcpiEvTerminate (void) { + NATIVE_UINT_MAX32 i; + ACPI_STATUS Status; + 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++) + { + Status = AcpiDisableEvent(i, ACPI_EVENT_FIXED, 0); + if (ACPI_FAILURE (Status)) + { + ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Failed to disable fixed event %d.\n", i)); + } + } + + /* + * Disable all GPEs + */ + for (i = 0; i < AcpiGbl_GpeNumberMax; i++) + { + if (AcpiEvGetGpeNumberIndex(i) != ACPI_GPE_INVALID) + { + Status = AcpiHwDisableGpe(i); + if (ACPI_FAILURE (Status)) + { + ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Failed to 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")); + } + + /* + * Return to original mode if necessary + */ + if (AcpiGbl_OriginalMode == ACPI_SYS_MODE_LEGACY) + { + Status = AcpiDisable (); + if (ACPI_FAILURE (Status)) + { + ACPI_DEBUG_PRINT ((ACPI_DB_WARN, "AcpiDisable failed.\n")); + } + } /* * Free global tables, etc. Index: contrib/dev/acpica/evregion.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/evregion.c,v retrieving revision 1.1.1.15 diff -u -r1.1.1.15 evregion.c --- contrib/dev/acpica/evregion.c 9 Jul 2002 17:51:21 -0000 1.1.1.15 +++ contrib/dev/acpica/evregion.c 22 Aug 2002 10:07:07 -0000 @@ -124,7 +124,6 @@ #define _COMPONENT ACPI_EVENTS ACPI_MODULE_NAME ("evregion") - /******************************************************************************* Index: contrib/dev/acpica/evrgnini.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/evrgnini.c,v retrieving revision 1.1.1.15 diff -u -r1.1.1.15 evrgnini.c --- contrib/dev/acpica/evrgnini.c 9 Jul 2002 17:51:21 -0000 1.1.1.15 +++ contrib/dev/acpica/evrgnini.c 22 Aug 2002 10:07:07 -0000 @@ -303,7 +303,7 @@ Status = AcpiUtEvaluateNumericObject (METHOD_NAME__ADR, Node, &Temp); /* - * The default is zero, and since the allocation above zeroed + * The default is zero, and since the allocation above zeroed * the data, just do nothing on failure. */ if (ACPI_SUCCESS (Status)) Index: contrib/dev/acpica/evxface.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/evxface.c,v retrieving revision 1.1.1.14 diff -u -r1.1.1.14 evxface.c --- contrib/dev/acpica/evxface.c 9 Jul 2002 17:51:21 -0000 1.1.1.14 +++ contrib/dev/acpica/evxface.c 22 Aug 2002 10:07:07 -0000 @@ -124,7 +124,6 @@ #define _COMPONENT ACPI_EVENTS ACPI_MODULE_NAME ("evxface") - /******************************************************************************* Index: contrib/dev/acpica/evxfevnt.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/evxfevnt.c,v retrieving revision 1.1.1.11 diff -u -r1.1.1.11 evxfevnt.c --- contrib/dev/acpica/evxfevnt.c 9 Jul 2002 17:51:21 -0000 1.1.1.11 +++ contrib/dev/acpica/evxfevnt.c 22 Aug 2002 10:07:07 -0000 @@ -145,17 +145,15 @@ ACPI_FUNCTION_TRACE ("AcpiEnable"); - /* Make sure we have ACPI tables */ + /* Make sure we have the FADT*/ - if (!AcpiGbl_DSDT) + if (!AcpiGbl_FADT) { - ACPI_DEBUG_PRINT ((ACPI_DB_WARN, "No ACPI tables present!\n")); + ACPI_DEBUG_PRINT ((ACPI_DB_WARN, "No FADT information present!\n")); return_ACPI_STATUS (AE_NO_ACPI_TABLES); } - AcpiGbl_OriginalMode = AcpiHwGetMode (); - - if (AcpiGbl_OriginalMode == ACPI_SYS_MODE_ACPI) + if (AcpiHwGetMode() == ACPI_SYS_MODE_ACPI) { ACPI_DEBUG_PRINT ((ACPI_DB_OK, "Already in ACPI mode.\n")); } @@ -185,8 +183,7 @@ * * RETURN: Status * - * DESCRIPTION: Returns the system to original ACPI/legacy mode, and - * uninstalls the SCI interrupt handler. + * DESCRIPTION: Transfers the system into LEGACY mode. * ******************************************************************************/ @@ -198,22 +195,30 @@ ACPI_FUNCTION_TRACE ("AcpiDisable"); + if (!AcpiGbl_FADT) + { + ACPI_DEBUG_PRINT ((ACPI_DB_WARN, "No FADT information present!\n")); + return_ACPI_STATUS (AE_NO_ACPI_TABLES); + } - if (AcpiHwGetMode () != AcpiGbl_OriginalMode) + if (AcpiHwGetMode() == ACPI_SYS_MODE_LEGACY) { - /* Restore original mode */ + ACPI_DEBUG_PRINT ((ACPI_DB_OK, "Already in LEGACY mode.\n")); + } + else + { + /* Transition to LEGACY mode */ + Status = AcpiHwSetMode (ACPI_SYS_MODE_LEGACY); - Status = AcpiHwSetMode (AcpiGbl_OriginalMode); if (ACPI_FAILURE (Status)) { - ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Unable to transition to original mode")); + ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not transition to LEGACY mode.")); return_ACPI_STATUS (Status); } - } - /* Unload the SCI interrupt handler */ + ACPI_DEBUG_PRINT ((ACPI_DB_OK, "Transition to LEGACY mode successful\n")); + } - Status = AcpiEvRemoveSciHandler (); return_ACPI_STATUS (Status); } Index: contrib/dev/acpica/exdump.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/exdump.c,v retrieving revision 1.1.1.14 diff -u -r1.1.1.14 exdump.c --- contrib/dev/acpica/exdump.c 30 Jul 2002 19:33:35 -0000 1.1.1.14 +++ contrib/dev/acpica/exdump.c 22 Aug 2002 10:07:11 -0000 @@ -130,7 +130,7 @@ * The following routines are used for debug output only */ -#if defined(ACPI_DEBUG) || defined(ENABLE_DEBUGGER) +#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) /***************************************************************************** * @@ -153,7 +153,6 @@ UINT32 i; ACPI_OPERAND_OBJECT **Element; UINT16 ElementIndex; - ACPI_FUNCTION_NAME ("ExDumpOperand") Index: contrib/dev/acpica/exfldio.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/exfldio.c,v retrieving revision 1.12 diff -u -r1.12 exfldio.c --- contrib/dev/acpica/exfldio.c 9 Jul 2002 17:53:51 -0000 1.12 +++ contrib/dev/acpica/exfldio.c 22 Aug 2002 12:00:19 -0000 @@ -160,7 +160,7 @@ if (ACPI_GET_OBJECT_TYPE (RgnDesc) != ACPI_TYPE_REGION) { ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Needed Region, found type %X (%s)\n", - ACPI_GET_OBJECT_TYPE (RgnDesc), + ACPI_GET_OBJECT_TYPE (RgnDesc), AcpiUtGetObjectTypeName (RgnDesc))); return_ACPI_STATUS (AE_AML_OPERAND_TYPE); Index: contrib/dev/acpica/exmisc.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/exmisc.c,v retrieving revision 1.1.1.14 diff -u -r1.1.1.14 exmisc.c --- contrib/dev/acpica/exmisc.c 30 Jul 2002 19:33:35 -0000 1.1.1.14 +++ contrib/dev/acpica/exmisc.c 22 Aug 2002 10:07:11 -0000 @@ -191,7 +191,7 @@ case ACPI_DESC_TYPE_NAMED: - /* + /* * A named reference that has already been resolved to a Node */ ReferencedObj = ObjDesc; @@ -354,7 +354,7 @@ /* * There are three cases to handle: - * + * * 1) Two Integers concatenated to produce a new Buffer * 2) Two Strings concatenated to produce a new String * 3) Two Buffers concatenated to produce a new Buffer Index: contrib/dev/acpica/exoparg1.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/exoparg1.c,v retrieving revision 1.1.1.6 diff -u -r1.1.1.6 exoparg1.c --- contrib/dev/acpica/exoparg1.c 30 Jul 2002 19:33:35 -0000 1.1.1.6 +++ contrib/dev/acpica/exoparg1.c 22 Aug 2002 10:07:11 -0000 @@ -306,7 +306,6 @@ ACPI_FUNCTION_TRACE_STR ("ExOpcode_1A_1T_1R", AcpiPsGetOpcodeName (WalkState->Opcode)); - /* Examine the AML opcode */ switch (WalkState->Opcode) @@ -894,8 +893,8 @@ * 2) Dereference the node to an actual object. Could be a Field, so we nee * to resolve the node to a value. */ - Status = AcpiNsGetNodeByPath (Operand[0]->String.Pointer, - WalkState->ScopeInfo->Scope.Node, ACPI_NS_SEARCH_PARENT, + Status = AcpiNsGetNodeByPath (Operand[0]->String.Pointer, + WalkState->ScopeInfo->Scope.Node, ACPI_NS_SEARCH_PARENT, ACPI_CAST_INDIRECT_PTR (ACPI_NAMESPACE_NODE, &ReturnDesc)); if (ACPI_FAILURE (Status)) { @@ -946,7 +945,7 @@ TempDesc = Operand[0]->Reference.Object; /* - * Create a new object that contains one element of the + * Create a new object that contains one element of the * buffer -- the element pointed to by the index. * * NOTE: index into a buffer is NOT a pointer to a @@ -973,7 +972,7 @@ case ACPI_TYPE_PACKAGE: /* - * Return the referenced element of the package. We must add + * Return the referenced element of the package. We must add * another reference to the referenced object, however. */ ReturnDesc = *(Operand[0]->Reference.Where); Index: contrib/dev/acpica/exoparg2.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/exoparg2.c,v retrieving revision 1.1.1.6 diff -u -r1.1.1.6 exoparg2.c --- contrib/dev/acpica/exoparg2.c 30 Jul 2002 19:33:36 -0000 1.1.1.6 +++ contrib/dev/acpica/exoparg2.c 22 Aug 2002 10:07:12 -0000 @@ -175,7 +175,7 @@ ACPI_STATUS Status = AE_OK; - ACPI_FUNCTION_TRACE_STR ("ExOpcode_2A_0T_0R", + ACPI_FUNCTION_TRACE_STR ("ExOpcode_2A_0T_0R", AcpiPsGetOpcodeName (WalkState->Opcode)); @@ -214,7 +214,7 @@ default: - ACPI_REPORT_ERROR (("AcpiExOpcode_2A_0T_0R: Unknown opcode %X\n", + ACPI_REPORT_ERROR (("AcpiExOpcode_2A_0T_0R: Unknown opcode %X\n", WalkState->Opcode)); Status = AE_AML_BAD_OPCODE; } @@ -647,7 +647,7 @@ default: - ACPI_REPORT_ERROR (("AcpiExOpcode_2A_0T_1R: Unknown opcode %X\n", + ACPI_REPORT_ERROR (("AcpiExOpcode_2A_0T_1R: Unknown opcode %X\n", WalkState->Opcode)); Status = AE_AML_BAD_OPCODE; goto Cleanup; Index: contrib/dev/acpica/exprep.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/exprep.c,v retrieving revision 1.1.1.16 diff -u -r1.1.1.16 exprep.c --- contrib/dev/acpica/exprep.c 9 Jul 2002 17:51:25 -0000 1.1.1.16 +++ contrib/dev/acpica/exprep.c 22 Aug 2002 10:07:12 -0000 @@ -303,17 +303,17 @@ * two pieces of information - the width of each field access and the * necessary ByteAlignment (address granularity) of the access. * - * For AnyAcc, the AccessBitWidth is the largest width that is both + * For AnyAcc, the AccessBitWidth is the largest width that is both * necessary and possible in an attempt to access the whole field in one - * I/O operation. However, for AnyAcc, the ByteAlignment is always one + * I/O operation. However, for AnyAcc, the ByteAlignment is always one * byte. * * For all Buffer Fields, the ByteAlignment is always one byte. * - * For all other access types (Byte, Word, Dword, Qword), the Bitwidth is + * For all other access types (Byte, Word, Dword, Qword), the Bitwidth is * the same (equivalent) as the ByteAlignment. */ - AccessBitWidth = AcpiExDecodeFieldAccess (ObjDesc, FieldFlags, + AccessBitWidth = AcpiExDecodeFieldAccess (ObjDesc, FieldFlags, &ByteAlignment); if (!AccessBitWidth) { @@ -322,26 +322,26 @@ /* Setup width (access granularity) fields */ - ObjDesc->CommonField.AccessByteWidth = (UINT8) + ObjDesc->CommonField.AccessByteWidth = (UINT8) ACPI_DIV_8 (AccessBitWidth); /* 1, 2, 4, 8 */ /* - * BaseByteOffset is the address of the start of the field within the - * region. It is the byte address of the first *datum* (field-width data - * unit) of the field. (i.e., the first datum that contains at least the + * BaseByteOffset is the address of the start of the field within the + * region. It is the byte address of the first *datum* (field-width data + * unit) of the field. (i.e., the first datum that contains at least the * first *bit* of the field.) * - * Note: ByteAlignment is always either equal to the AccessBitWidth or 8 - * (Byte access), and it defines the addressing granularity of the parent + * Note: ByteAlignment is always either equal to the AccessBitWidth or 8 + * (Byte access), and it defines the addressing granularity of the parent * region or buffer. */ - NearestByteAddress = + NearestByteAddress = ACPI_ROUND_BITS_DOWN_TO_BYTES (FieldBitPosition); - ObjDesc->CommonField.BaseByteOffset = + ObjDesc->CommonField.BaseByteOffset = ACPI_ROUND_DOWN (NearestByteAddress, ByteAlignment); /* - * StartFieldBitOffset is the offset of the first bit of the field within + * StartFieldBitOffset is the offset of the first bit of the field within * a field datum. */ ObjDesc->CommonField.StartFieldBitOffset = (UINT8) @@ -349,24 +349,24 @@ /* * Valid bits -- the number of bits that compose a partial datum, - * 1) At the end of the field within the region (arbitrary starting bit + * 1) At the end of the field within the region (arbitrary starting bit * offset) - * 2) At the end of a buffer used to contain the field (starting offset + * 2) At the end of a buffer used to contain the field (starting offset * always zero) */ - ObjDesc->CommonField.EndFieldValidBits = (UINT8) + ObjDesc->CommonField.EndFieldValidBits = (UINT8) ((ObjDesc->CommonField.StartFieldBitOffset + FieldBitLength) % AccessBitWidth); /* StartBufferBitOffset always = 0 */ - ObjDesc->CommonField.EndBufferValidBits = (UINT8) + ObjDesc->CommonField.EndBufferValidBits = (UINT8) (FieldBitLength % AccessBitWidth); /* - * DatumValidBits is the number of valid field bits in the first + * DatumValidBits is the number of valid field bits in the first * field datum. */ - ObjDesc->CommonField.DatumValidBits = (UINT8) + ObjDesc->CommonField.DatumValidBits = (UINT8) (AccessBitWidth - ObjDesc->CommonField.StartFieldBitOffset); /* @@ -482,11 +482,11 @@ AcpiUtAddReference (ObjDesc->BankField.RegionObj); AcpiUtAddReference (ObjDesc->BankField.BankObj); - ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD, + ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD, "Bank Field: BitOff=%X Off=%X Gran=%X Region %p BankReg %p\n", - ObjDesc->BankField.StartFieldBitOffset, + ObjDesc->BankField.StartFieldBitOffset, ObjDesc->BankField.BaseByteOffset, - ObjDesc->Field.AccessByteWidth, + ObjDesc->Field.AccessByteWidth, ObjDesc->BankField.RegionObj, ObjDesc->BankField.BankObj)); break; @@ -496,7 +496,7 @@ ObjDesc->IndexField.IndexObj = AcpiNsGetAttachedObject (Info->RegisterNode); ObjDesc->IndexField.DataObj = AcpiNsGetAttachedObject (Info->DataRegisterNode); - ObjDesc->IndexField.Value = (UINT32) + ObjDesc->IndexField.Value = (UINT32) (Info->FieldBitPosition / ACPI_MUL_8 (ObjDesc->Field.AccessByteWidth)); if (!ObjDesc->IndexField.DataObj || !ObjDesc->IndexField.IndexObj) @@ -510,11 +510,11 @@ AcpiUtAddReference (ObjDesc->IndexField.DataObj); AcpiUtAddReference (ObjDesc->IndexField.IndexObj); - ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD, + ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD, "IndexField: bitoff=%X off=%X gran=%X Index %p Data %p\n", - ObjDesc->IndexField.StartFieldBitOffset, + ObjDesc->IndexField.StartFieldBitOffset, ObjDesc->IndexField.BaseByteOffset, - ObjDesc->Field.AccessByteWidth, + ObjDesc->Field.AccessByteWidth, ObjDesc->IndexField.IndexObj, ObjDesc->IndexField.DataObj)); break; Index: contrib/dev/acpica/exregion.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/exregion.c,v retrieving revision 1.1.1.16 diff -u -r1.1.1.16 exregion.c --- contrib/dev/acpica/exregion.c 9 Jul 2002 17:51:25 -0000 1.1.1.16 +++ contrib/dev/acpica/exregion.c 22 Aug 2002 10:07:12 -0000 @@ -225,7 +225,7 @@ MemInfo->MappedLength); } - /* + /* * Don't attempt to map memory beyond the end of the region, and * constrain the maximum mapping size to something reasonable. */ @@ -234,7 +234,7 @@ { WindowSize = SYSMEM_REGION_WINDOW_SIZE; } - + /* Create a new mapping starting at the address given */ Status = AcpiOsMapMemory (Address, WindowSize, @@ -264,7 +264,7 @@ "SystemMemory %d (%d width) Address=%8.8X%8.8X\n", Function, BitWidth, ACPI_HIDWORD (Address), ACPI_LODWORD (Address))); - /* + /* * Perform the memory read or write * * Note: For machines that do not support non-aligned transfers, the target @@ -323,7 +323,7 @@ *(UINT64 *) LogicalAddrPtr = (UINT64) *Value; break; #endif - + default: /* BitWidth was already validated */ break; Index: contrib/dev/acpica/exresop.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/exresop.c,v retrieving revision 1.1.1.14 diff -u -r1.1.1.14 exresop.c --- contrib/dev/acpica/exresop.c 30 Jul 2002 19:33:36 -0000 1.1.1.14 +++ contrib/dev/acpica/exresop.c 22 Aug 2002 10:07:12 -0000 @@ -201,8 +201,8 @@ * target operator. * * Each 5-bit group in ArgTypes represents one required - * operand and indicates the required Type. The corresponding operand - * will be converted to the required type if possible, otherwise we + * operand and indicates the required Type. The corresponding operand + * will be converted to the required type if possible, otherwise we * abort with an exception. * ******************************************************************************/ Index: contrib/dev/acpica/exstore.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/exstore.c,v retrieving revision 1.1.1.16 diff -u -r1.1.1.16 exstore.c --- contrib/dev/acpica/exstore.c 30 Jul 2002 19:33:37 -0000 1.1.1.16 +++ contrib/dev/acpica/exstore.c 22 Aug 2002 10:07:12 -0000 @@ -186,7 +186,7 @@ /* Destination object must be a Reference or a Constant object */ switch (ACPI_GET_OBJECT_TYPE (DestDesc)) - { + { case INTERNAL_TYPE_REFERENCE: break; Index: contrib/dev/acpica/exutils.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/exutils.c,v retrieving revision 1.1.1.15 diff -u -r1.1.1.15 exutils.c --- contrib/dev/acpica/exutils.c 30 Jul 2002 19:33:37 -0000 1.1.1.15 +++ contrib/dev/acpica/exutils.c 22 Aug 2002 10:07:12 -0000 @@ -363,7 +363,8 @@ { /* Report the error, but there isn't much else we can do */ - ACPI_REPORT_ERROR (("Could not release ACPI Global Lock\n")); + ACPI_REPORT_ERROR (("Could not release ACPI Global Lock, %s\n", + AcpiFormatException (Status))); } } Index: contrib/dev/acpica/hwacpi.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/hwacpi.c,v retrieving revision 1.1.1.13 diff -u -r1.1.1.13 hwacpi.c --- contrib/dev/acpica/hwacpi.c 9 Jul 2002 17:51:21 -0000 1.1.1.13 +++ contrib/dev/acpica/hwacpi.c 22 Aug 2002 10:07:08 -0000 @@ -190,13 +190,36 @@ ACPI_FUNCTION_TRACE ("HwSetMode"); + /* + * ACPI 2.0 clarified that if SMI_CMD in FADT is zero, + * system does not support mode transition. + */ + if (!AcpiGbl_FADT->SmiCmd) + { + ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "No SMI_CMD in FADT, mode transition failed.\n")); + return_ACPI_STATUS (AE_NO_HARDWARE_RESPONSE); + } + + /* + * ACPI 2.0 clarified the meaning of ACPI_ENABLE and ACPI_DISABLE + * in FADT: If it is zero, enabling or disabling is not supported. + * As old systems may have used zero for mode transition, + * we make sure both the numbers are zero to determine these + * transitions are not supported. + */ + if (!AcpiGbl_FADT->AcpiEnable && !AcpiGbl_FADT->AcpiDisable) + { + ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "No mode transition supported in this system.\n")); + return_ACPI_STATUS (AE_OK); + } + switch (Mode) { case ACPI_SYS_MODE_ACPI: /* BIOS should have disabled ALL fixed and GP events */ - Status = AcpiOsWritePort (AcpiGbl_FADT->SmiCmd, + Status = AcpiOsWritePort (AcpiGbl_FADT->SmiCmd, (ACPI_INTEGER) AcpiGbl_FADT->AcpiEnable, 8); ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Attempting to enable ACPI mode\n")); break; @@ -207,7 +230,7 @@ * BIOS should clear all fixed status bits and restore fixed event * enable bits to default */ - Status = AcpiOsWritePort (AcpiGbl_FADT->SmiCmd, + Status = AcpiOsWritePort (AcpiGbl_FADT->SmiCmd, (ACPI_INTEGER) AcpiGbl_FADT->AcpiDisable, 8); ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Attempting to enable Legacy (non-ACPI) mode\n")); @@ -231,12 +254,13 @@ { Status = AE_NO_HARDWARE_RESPONSE; - if (AcpiHwGetMode() == Mode) { + if (AcpiHwGetMode() == Mode) + { ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Mode %X successfully enabled\n", Mode)); Status = AE_OK; break; } - AcpiOsStall(1000); + AcpiOsStall(1000); Retry--; } Index: contrib/dev/acpica/hwgpe.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/hwgpe.c,v retrieving revision 1.1.1.12 diff -u -r1.1.1.12 hwgpe.c --- contrib/dev/acpica/hwgpe.c 9 Jul 2002 17:51:21 -0000 1.1.1.12 +++ contrib/dev/acpica/hwgpe.c 22 Aug 2002 10:07:08 -0000 @@ -179,14 +179,14 @@ * Read the current value of the register, set the appropriate bit * to enable the GPE, and write out the new register. */ - Status = AcpiHwLowLevelRead (8, &InByte, + Status = AcpiHwLowLevelRead (8, &InByte, &AcpiGbl_GpeRegisterInfo[RegisterIndex].EnableAddress, 0); if (ACPI_FAILURE (Status)) { return (Status); } - Status = AcpiHwLowLevelWrite (8, (InByte | BitMask), + Status = AcpiHwLowLevelWrite (8, (InByte | BitMask), &AcpiGbl_GpeRegisterInfo[RegisterIndex].EnableAddress, 0); return (Status); @@ -276,7 +276,7 @@ return (Status); } - Status = AcpiHwLowLevelWrite (8, (InByte & ~BitMask), + Status = AcpiHwLowLevelWrite (8, (InByte & ~BitMask), &AcpiGbl_GpeRegisterInfo[RegisterIndex].EnableAddress, 0); if (ACPI_FAILURE (Status)) { @@ -363,7 +363,7 @@ * Write a one to the appropriate bit in the status register to * clear this GPE. */ - Status = AcpiHwLowLevelWrite (8, BitMask, + Status = AcpiHwLowLevelWrite (8, BitMask, &AcpiGbl_GpeRegisterInfo[RegisterIndex].StatusAddress, 0); return (Status); @@ -486,7 +486,7 @@ * Read the enabled status of all GPEs. We * will be using it to restore all the GPEs later. */ - Status = AcpiHwLowLevelRead (8, &InValue, + Status = AcpiHwLowLevelRead (8, &InValue, &GpeRegisterInfo->EnableAddress, 0); if (ACPI_FAILURE (Status)) { @@ -498,7 +498,7 @@ /* * Disable all GPEs except wakeup GPEs. */ - Status = AcpiHwLowLevelWrite (8, GpeRegisterInfo->WakeEnable, + Status = AcpiHwLowLevelWrite (8, GpeRegisterInfo->WakeEnable, &GpeRegisterInfo->EnableAddress, 0); if (ACPI_FAILURE (Status)) { Index: contrib/dev/acpica/hwregs.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/hwregs.c,v retrieving revision 1.1.1.13 diff -u -r1.1.1.13 hwregs.c --- contrib/dev/acpica/hwregs.c 9 Jul 2002 17:51:22 -0000 1.1.1.13 +++ contrib/dev/acpica/hwregs.c 22 Aug 2002 10:07:08 -0000 @@ -305,7 +305,7 @@ * FUNCTION: AcpiHwGetRegisterBitMask * * PARAMETERS: RegisterId - Index of ACPI Register to access - * + * * RETURN: The bit mask to be used when accessing the register * * DESCRIPTION: Map RegisterId into a register bit mask. @@ -374,7 +374,7 @@ } } - Status = AcpiHwRegisterRead (ACPI_MTX_DO_NOT_LOCK, + Status = AcpiHwRegisterRead (ACPI_MTX_DO_NOT_LOCK, BitRegInfo->ParentRegister, &RegisterValue); if (Flags & ACPI_MTX_LOCK) @@ -386,7 +386,7 @@ { /* Normalize the value that was read */ - RegisterValue = ((RegisterValue & BitRegInfo->AccessBitMask) + RegisterValue = ((RegisterValue & BitRegInfo->AccessBitMask) >> BitRegInfo->BitPosition); *ReturnValue = RegisterValue; @@ -447,7 +447,7 @@ /* Always do a register read first so we can insert the new bits */ - Status = AcpiHwRegisterRead (ACPI_MTX_DO_NOT_LOCK, + Status = AcpiHwRegisterRead (ACPI_MTX_DO_NOT_LOCK, BitRegInfo->ParentRegister, &RegisterValue); if (ACPI_FAILURE (Status)) { @@ -471,11 +471,11 @@ * information is the single bit we're interested in, all others should * be written as 0 so they will be left unchanged */ - Value = ACPI_REGISTER_PREPARE_BITS (Value, + Value = ACPI_REGISTER_PREPARE_BITS (Value, BitRegInfo->BitPosition, BitRegInfo->AccessBitMask); if (Value) { - Status = AcpiHwRegisterWrite (ACPI_MTX_DO_NOT_LOCK, + Status = AcpiHwRegisterWrite (ACPI_MTX_DO_NOT_LOCK, ACPI_REGISTER_PM1_STATUS, (UINT16) Value); RegisterValue = 0; } @@ -484,10 +484,10 @@ case ACPI_REGISTER_PM1_ENABLE: - ACPI_REGISTER_INSERT_VALUE (RegisterValue, BitRegInfo->BitPosition, + ACPI_REGISTER_INSERT_VALUE (RegisterValue, BitRegInfo->BitPosition, BitRegInfo->AccessBitMask, Value); - Status = AcpiHwRegisterWrite (ACPI_MTX_DO_NOT_LOCK, + Status = AcpiHwRegisterWrite (ACPI_MTX_DO_NOT_LOCK, ACPI_REGISTER_PM1_ENABLE, (UINT16) RegisterValue); break; @@ -501,7 +501,7 @@ */ ACPI_DEBUG_PRINT ((ACPI_DB_IO, "PM1 control: Read %X\n", RegisterValue)); - ACPI_REGISTER_INSERT_VALUE (RegisterValue, BitRegInfo->BitPosition, + ACPI_REGISTER_INSERT_VALUE (RegisterValue, BitRegInfo->BitPosition, BitRegInfo->AccessBitMask, Value); Status = AcpiHwRegisterWrite (ACPI_MTX_DO_NOT_LOCK, RegisterId, @@ -511,7 +511,7 @@ case ACPI_REGISTER_PM2_CONTROL: - Status = AcpiHwRegisterRead (ACPI_MTX_DO_NOT_LOCK, + Status = AcpiHwRegisterRead (ACPI_MTX_DO_NOT_LOCK, ACPI_REGISTER_PM2_CONTROL, &RegisterValue); if (ACPI_FAILURE (Status)) { @@ -519,11 +519,11 @@ } ACPI_DEBUG_PRINT ((ACPI_DB_IO, "PM2 control: Read %X from %8.8X%8.8X\n", - RegisterValue, + RegisterValue, ACPI_HIDWORD (ACPI_GET_ADDRESS (AcpiGbl_FADT->XPm2CntBlk.Address)), ACPI_LODWORD (ACPI_GET_ADDRESS (AcpiGbl_FADT->XPm2CntBlk.Address)))); - ACPI_REGISTER_INSERT_VALUE (RegisterValue, BitRegInfo->BitPosition, + ACPI_REGISTER_INSERT_VALUE (RegisterValue, BitRegInfo->BitPosition, BitRegInfo->AccessBitMask, Value); ACPI_DEBUG_PRINT ((ACPI_DB_IO, "About to write %4.4X to %8.8X%8.8X\n", @@ -847,7 +847,7 @@ { case ACPI_ADR_SPACE_SYSTEM_MEMORY: - MemAddress = (ACPI_GET_ADDRESS (Reg->Address) + MemAddress = (ACPI_GET_ADDRESS (Reg->Address) + (ACPI_PHYSICAL_ADDRESS) Offset); Status = AcpiOsReadMemory (MemAddress, Value, Width); @@ -856,7 +856,7 @@ case ACPI_ADR_SPACE_SYSTEM_IO: - IoAddress = (ACPI_IO_ADDRESS) (ACPI_GET_ADDRESS (Reg->Address) + IoAddress = (ACPI_IO_ADDRESS) (ACPI_GET_ADDRESS (Reg->Address) + (ACPI_PHYSICAL_ADDRESS) Offset); Status = AcpiOsReadPort (IoAddress, Value, Width); @@ -937,7 +937,7 @@ { case ACPI_ADR_SPACE_SYSTEM_MEMORY: - MemAddress = (ACPI_GET_ADDRESS (Reg->Address) + MemAddress = (ACPI_GET_ADDRESS (Reg->Address) + (ACPI_PHYSICAL_ADDRESS) Offset); Status = AcpiOsWriteMemory (MemAddress, (ACPI_INTEGER) Value, Width); @@ -946,7 +946,7 @@ case ACPI_ADR_SPACE_SYSTEM_IO: - IoAddress = (ACPI_IO_ADDRESS) (ACPI_GET_ADDRESS (Reg->Address) + IoAddress = (ACPI_IO_ADDRESS) (ACPI_GET_ADDRESS (Reg->Address) + (ACPI_PHYSICAL_ADDRESS) Offset); Status = AcpiOsWritePort (IoAddress, (ACPI_INTEGER) Value, Width); @@ -959,7 +959,7 @@ PciId.Bus = 0; PciId.Device = ACPI_PCI_DEVICE (ACPI_GET_ADDRESS (Reg->Address)); PciId.Function = ACPI_PCI_FUNCTION (ACPI_GET_ADDRESS (Reg->Address)); - PciRegister = (UINT16) (ACPI_PCI_REGISTER (ACPI_GET_ADDRESS (Reg->Address)) + PciRegister = (UINT16) (ACPI_PCI_REGISTER (ACPI_GET_ADDRESS (Reg->Address)) + Offset); Status = AcpiOsWritePciConfiguration (&PciId, PciRegister, (ACPI_INTEGER) Value, Width); Index: contrib/dev/acpica/hwsleep.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/hwsleep.c,v retrieving revision 1.6 diff -u -r1.6 hwsleep.c --- contrib/dev/acpica/hwsleep.c 9 Jul 2002 17:53:51 -0000 1.6 +++ contrib/dev/acpica/hwsleep.c 22 Aug 2002 12:00:19 -0000 @@ -146,12 +146,12 @@ if (AcpiGbl_CommonFACS.VectorWidth == 32) { - *(ACPI_CAST_PTR (UINT32, AcpiGbl_CommonFACS.FirmwareWakingVector)) + *(ACPI_CAST_PTR (UINT32, AcpiGbl_CommonFACS.FirmwareWakingVector)) = (UINT32) PhysicalAddress; } else { - *AcpiGbl_CommonFACS.FirmwareWakingVector + *AcpiGbl_CommonFACS.FirmwareWakingVector = PhysicalAddress; } @@ -190,12 +190,12 @@ if (AcpiGbl_CommonFACS.VectorWidth == 32) { - *PhysicalAddress = (ACPI_PHYSICAL_ADDRESS) + *PhysicalAddress = (ACPI_PHYSICAL_ADDRESS) *(ACPI_CAST_PTR (UINT32, AcpiGbl_CommonFACS.FirmwareWakingVector)); } else { - *PhysicalAddress = + *PhysicalAddress = *AcpiGbl_CommonFACS.FirmwareWakingVector; } @@ -412,7 +412,7 @@ /* Wait until we enter sleep state */ Retry = 1000; - do + do { Status = AcpiGetRegister (ACPI_BITREG_WAKE_STATUS, &InValue, ACPI_MTX_LOCK); if (ACPI_FAILURE (Status)) Index: contrib/dev/acpica/nsaccess.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/nsaccess.c,v retrieving revision 1.1.1.14 diff -u -r1.1.1.14 nsaccess.c --- contrib/dev/acpica/nsaccess.c 9 Jul 2002 17:51:29 -0000 1.1.1.14 +++ contrib/dev/acpica/nsaccess.c 22 Aug 2002 10:07:13 -0000 @@ -216,6 +216,19 @@ */ switch (InitVal->Type) { + case ACPI_TYPE_METHOD: + ObjDesc->Method.ParamCount = + (UINT8) ACPI_STRTOUL (InitVal->Val, NULL, 10); + ObjDesc->Common.Flags |= AOPOBJ_DATA_VALID; + +#if defined (ACPI_NO_METHOD_EXECUTION) || defined (ACPI_CONSTANT_EVAL_ONLY) + + /* Compiler cheats by putting parameter count in the OwnerID */ + + NewNode->OwnerId = ObjDesc->Method.ParamCount; +#endif + break; + case ACPI_TYPE_INTEGER: ObjDesc->Integer.Value = @@ -331,6 +344,7 @@ ACPI_NAMESPACE_NODE **ReturnNode) { ACPI_STATUS Status; + NATIVE_CHAR *Path = Pathname; ACPI_NAMESPACE_NODE *PrefixNode; ACPI_NAMESPACE_NODE *CurrentNode = NULL; ACPI_NAMESPACE_NODE *ThisNode = NULL; @@ -338,7 +352,9 @@ ACPI_NAME SimpleName; ACPI_OBJECT_TYPE TypeToCheckFor; ACPI_OBJECT_TYPE ThisSearchType; - UINT32 LocalFlags = Flags & ~ACPI_NS_ERROR_IF_FOUND; + UINT32 SearchParentFlag = ACPI_NS_SEARCH_PARENT; + UINT32 LocalFlags = Flags & ~(ACPI_NS_ERROR_IF_FOUND | + ACPI_NS_SEARCH_PARENT); ACPI_FUNCTION_TRACE ("NsLookup"); @@ -373,6 +389,23 @@ else { PrefixNode = ScopeInfo->Scope.Node; + if (ACPI_GET_DESCRIPTOR_TYPE (PrefixNode) != ACPI_DESC_TYPE_NAMED) + { + ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "[%p] Not a namespace node\n", + PrefixNode)); + return_ACPI_STATUS (AE_AML_INTERNAL); + } + + /* + * This node might not be a actual "scope" node (such as a + * Device/Method, etc.) It could be a Package or other object node. + * Backup up the tree to find the containing scope node. + */ + while (!AcpiNsOpensScope (PrefixNode->Type) && + PrefixNode->Type != ACPI_TYPE_ANY) + { + PrefixNode = AcpiNsGetParentNode (PrefixNode); + } } /* @@ -408,7 +441,7 @@ NumSegments = 0; ThisNode = AcpiGbl_RootNode; - Pathname = ""; + Path = ""; ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "Null Pathname (Zero segments), Flags=%X\n", Flags)); @@ -428,25 +461,26 @@ * Parent Prefixes (in which case the name's scope is relative * to the current scope). */ - if (*Pathname == (UINT8) AML_ROOT_PREFIX) + if (*Path == (UINT8) AML_ROOT_PREFIX) { /* Pathname is fully qualified, start from the root */ ThisNode = AcpiGbl_RootNode; + SearchParentFlag = ACPI_NS_NO_UPSEARCH; /* Point to name segment part */ - Pathname++; + Path++; - ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "Searching from root [%p]\n", - ThisNode)); + ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, + "Path is absolute from root [%p]\n", ThisNode)); } else { /* Pathname is relative to current scope, start there */ ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, - "Searching relative to pfx scope [%p]\n", + "Searching relative to prefix scope [%p]\n", PrefixNode)); /* @@ -454,13 +488,16 @@ * the parent node for each prefix instance. */ ThisNode = PrefixNode; - while (*Pathname == (UINT8) AML_PARENT_PREFIX) + while (*Path == (UINT8) AML_PARENT_PREFIX) { + /* Name is fully qualified, no search rules apply */ + + SearchParentFlag = ACPI_NS_NO_UPSEARCH; /* * Point past this prefix to the name segment * part or the next Parent Prefix */ - Pathname++; + Path++; /* Backup to the parent node */ @@ -474,6 +511,12 @@ return_ACPI_STATUS (AE_NOT_FOUND); } } + + if (SearchParentFlag == ACPI_NS_NO_UPSEARCH) + { + ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, + "Path is absolute with one or more carats\n")); + } } /* @@ -489,7 +532,7 @@ * Examine the name prefix opcode, if any, to determine the number of * segments. */ - switch (*Pathname) + switch (*Path) { case 0: /* @@ -504,10 +547,14 @@ case AML_DUAL_NAME_PREFIX: + /* More than one NameSeg, search rules do not apply */ + + SearchParentFlag = ACPI_NS_NO_UPSEARCH; + /* Two segments, point to first name segment */ NumSegments = 2; - Pathname++; + Path++; ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "Dual Pathname (2 segments, Flags=%X)\n", Flags)); @@ -515,11 +562,15 @@ case AML_MULTI_NAME_PREFIX_OP: + /* More than one NameSeg, search rules do not apply */ + + SearchParentFlag = ACPI_NS_NO_UPSEARCH; + /* Extract segment count, point to first name segment */ - Pathname++; - NumSegments = (UINT32) (UINT8) *Pathname; - Pathname++; + Path++; + NumSegments = (UINT32) (UINT8) *Path; + Path++; ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "Multi Pathname (%d Segments, Flags=%X) \n", @@ -538,35 +589,53 @@ break; } - ACPI_DEBUG_EXEC (AcpiNsPrintPathname (NumSegments, Pathname)); + ACPI_DEBUG_EXEC (AcpiNsPrintPathname (NumSegments, Path)); } + /* * Search namespace for each segment of the name. Loop through and - * verify/add each name segment. + * verify (or add to the namespace) each name segment. + * + * The object type is significant only at the last name + * segment. (We don't care about the types along the path, only + * the type of the final target object.) */ + ThisSearchType = ACPI_TYPE_ANY; CurrentNode = ThisNode; while (NumSegments && CurrentNode) { - /* - * Search for the current name segment under the current - * named object. The Type is significant only at the last name - * segment. (We don't care about the types along the path, only - * the type of the final target object.) - */ - ThisSearchType = ACPI_TYPE_ANY; NumSegments--; if (!NumSegments) { + /* + * This is the last segment, enable typechecking + */ ThisSearchType = Type; - LocalFlags = Flags; + + /* + * Only allow automatic parent search (search rules) if the caller + * requested it AND we have a single, non-fully-qualified NameSeg + */ + if ((SearchParentFlag != ACPI_NS_NO_UPSEARCH) && + (Flags & ACPI_NS_SEARCH_PARENT)) + { + LocalFlags |= ACPI_NS_SEARCH_PARENT; + } + + /* Set error flag according to caller */ + + if (Flags & ACPI_NS_ERROR_IF_FOUND) + { + LocalFlags |= ACPI_NS_ERROR_IF_FOUND; + } } /* Extract one ACPI name from the front of the pathname */ - ACPI_MOVE_UNALIGNED32_TO_32 (&SimpleName, Pathname); + ACPI_MOVE_UNALIGNED32_TO_32 (&SimpleName, Path); - /* Try to find the ACPI name */ + /* Try to find the single (4 character) ACPI name */ Status = AcpiNsSearchAndEnter (SimpleName, WalkState, CurrentNode, InterpreterMode, ThisSearchType, LocalFlags, &ThisNode); @@ -578,7 +647,8 @@ ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "Name [%4.4s] not found in scope [%4.4s] %p\n", - (char *) &SimpleName, (char *) &CurrentNode->Name, CurrentNode)); + (char *) &SimpleName, (char *) &CurrentNode->Name, + CurrentNode)); } return_ACPI_STATUS (Status); @@ -627,7 +697,7 @@ /* Point to next name segment and make this node current */ - Pathname += ACPI_NAME_SIZE; + Path += ACPI_NAME_SIZE; CurrentNode = ThisNode; } @@ -649,7 +719,7 @@ } ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, - "Setting current scope to [%4.4s] (%p)\n", + "Setting current scope to [%4.4s] (%p)\n", ThisNode->Name.Ascii, ThisNode)); } } Index: contrib/dev/acpica/nsdump.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/nsdump.c,v retrieving revision 1.1.1.16 diff -u -r1.1.1.16 nsdump.c --- contrib/dev/acpica/nsdump.c 30 Jul 2002 19:33:37 -0000 1.1.1.16 +++ contrib/dev/acpica/nsdump.c 22 Aug 2002 10:07:13 -0000 @@ -125,7 +125,7 @@ #define _COMPONENT ACPI_NAMESPACE ACPI_MODULE_NAME ("nsdump") -#if defined(ACPI_DEBUG) || defined(ENABLE_DEBUGGER) +#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) /******************************************************************************* @@ -369,7 +369,7 @@ switch (Type) { case ACPI_TYPE_PROCESSOR: - + AcpiOsPrintf (" ID %hd Addr %.4X Len %.4X\n", ObjDesc->Processor.ProcId, ObjDesc->Processor.Address, @@ -378,13 +378,13 @@ case ACPI_TYPE_DEVICE: - + AcpiOsPrintf (" Notification object: %p", ObjDesc); break; case ACPI_TYPE_METHOD: - + AcpiOsPrintf (" Args %hd Len %.4X Aml %p \n", ObjDesc->Method.ParamCount, ObjDesc->Method.AmlLength, @@ -393,7 +393,7 @@ case ACPI_TYPE_INTEGER: - + AcpiOsPrintf (" = %8.8X%8.8X\n", ACPI_HIDWORD (ObjDesc->Integer.Value), ACPI_LODWORD (ObjDesc->Integer.Value)); @@ -441,7 +441,7 @@ case ACPI_TYPE_STRING: - + AcpiOsPrintf (" Len %.2X", ObjDesc->String.Length); if (ObjDesc->String.Length > 0) @@ -457,7 +457,7 @@ case ACPI_TYPE_REGION: - + AcpiOsPrintf (" [%s]", AcpiUtGetRegionName (ObjDesc->Region.SpaceId)); if (ObjDesc->Region.Flags & AOPOBJ_DATA_VALID) { @@ -474,14 +474,14 @@ case INTERNAL_TYPE_REFERENCE: - + AcpiOsPrintf (" [%s]\n", AcpiPsGetOpcodeName (ObjDesc->Reference.Opcode)); break; case ACPI_TYPE_BUFFER_FIELD: - + if (ObjDesc->BufferField.BufferObj && ObjDesc->BufferField.BufferObj->Buffer.Node) { @@ -492,14 +492,14 @@ case INTERNAL_TYPE_REGION_FIELD: - + AcpiOsPrintf (" Rgn [%4.4s]", ObjDesc->CommonField.RegionObj->Region.Node->Name.Ascii); break; case INTERNAL_TYPE_BANK_FIELD: - + AcpiOsPrintf (" Rgn [%4.4s] Bnk [%4.4s]", ObjDesc->CommonField.RegionObj->Region.Node->Name.Ascii, ObjDesc->BankField.BankObj->CommonField.Node->Name.Ascii); @@ -507,7 +507,7 @@ case INTERNAL_TYPE_INDEX_FIELD: - + AcpiOsPrintf (" Idx [%4.4s] Dat [%4.4s]", ObjDesc->IndexField.IndexObj->CommonField.Node->Name.Ascii, ObjDesc->IndexField.DataObj->CommonField.Node->Name.Ascii); @@ -515,7 +515,7 @@ default: - + AcpiOsPrintf (" Object %p\n", ObjDesc); break; } @@ -534,7 +534,7 @@ ObjDesc->CommonField.BitLength, ObjDesc->CommonField.AccessByteWidth); break; - + default: break; } @@ -750,7 +750,7 @@ Info.DisplayType = DisplayType; - (void) AcpiNsWalkNamespace (Type, StartHandle, MaxDepth, + (void) AcpiNsWalkNamespace (Type, StartHandle, MaxDepth, ACPI_NS_WALK_NO_UNLOCK, AcpiNsDumpOneObject, (void *) &Info, NULL); } Index: contrib/dev/acpica/nsdumpdv.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/nsdumpdv.c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 nsdumpdv.c --- contrib/dev/acpica/nsdumpdv.c 30 Jul 2002 19:33:37 -0000 1.1.1.1 +++ contrib/dev/acpica/nsdumpdv.c 22 Aug 2002 10:07:13 -0000 @@ -126,7 +126,7 @@ ACPI_MODULE_NAME ("nsdumpdv") -#if defined(ACPI_DEBUG) || defined(ENABLE_DEBUGGER) +#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) /******************************************************************************* * @@ -211,7 +211,7 @@ ACPI_DEBUG_PRINT ((ACPI_DB_TABLES, "Display of all devices in the namespace:\n")); - Status = AcpiNsWalkNamespace (ACPI_TYPE_DEVICE, SysBusHandle, + Status = AcpiNsWalkNamespace (ACPI_TYPE_DEVICE, SysBusHandle, ACPI_UINT32_MAX, ACPI_NS_WALK_NO_UNLOCK, AcpiNsDumpOneDevice, NULL, NULL); } Index: contrib/dev/acpica/nseval.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/nseval.c,v retrieving revision 1.1.1.15 diff -u -r1.1.1.15 nseval.c --- contrib/dev/acpica/nseval.c 30 Jul 2002 19:33:38 -0000 1.1.1.15 +++ contrib/dev/acpica/nseval.c 22 Aug 2002 10:07:13 -0000 @@ -602,7 +602,7 @@ { Status = AE_CTRL_RETURN_VALUE; *ReturnObjDesc = ACPI_CAST_PTR (ACPI_OPERAND_OBJECT, ResolvedNode); - ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "Returning object %p [%s]\n", + ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "Returning object %p [%s]\n", *ReturnObjDesc, AcpiUtGetObjectTypeName (*ReturnObjDesc))); } } Index: contrib/dev/acpica/nsinit.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/nsinit.c,v retrieving revision 1.1.1.15 diff -u -r1.1.1.15 nsinit.c --- contrib/dev/acpica/nsinit.c 9 Jul 2002 17:51:29 -0000 1.1.1.15 +++ contrib/dev/acpica/nsinit.c 22 Aug 2002 10:07:13 -0000 @@ -165,15 +165,15 @@ &Info, NULL); if (ACPI_FAILURE (Status)) { - ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "WalkNamespace failed! %s\n", + ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "WalkNamespace failed! %s\n", AcpiFormatException (Status))); } ACPI_DEBUG_PRINT_RAW ((ACPI_DB_OK, "\nInitialized %hd/%hd Regions %hd/%hd Fields %hd/%hd Buffers %hd/%hd Packages (%hd nodes)\n", - Info.OpRegionInit, Info.OpRegionCount, - Info.FieldInit, Info.FieldCount, - Info.BufferInit, Info.BufferCount, + Info.OpRegionInit, Info.OpRegionCount, + Info.FieldInit, Info.FieldCount, + Info.BufferInit, Info.BufferCount, Info.PackageInit, Info.PackageCount, Info.ObjectCount)); ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "%hd Control Methods found\n", Info.MethodCount)); @@ -226,7 +226,7 @@ if (ACPI_FAILURE (Status)) { - ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "WalkNamespace failed! %s\n", + ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "WalkNamespace failed! %s\n", AcpiFormatException (Status))); } @@ -331,7 +331,7 @@ /* * Each of these types can contain executable AML code within - * the declaration. + * the declaration. */ switch (Type) { @@ -479,7 +479,7 @@ { /* Ignore error and move on to next device */ - #ifdef ACPI_DEBUG + #ifdef ACPI_DEBUG_OUTPUT NATIVE_CHAR *ScopeName = AcpiNsGetExternalPathname (ObjHandle); ACPI_DEBUG_PRINT ((ACPI_DB_WARN, "%s._INI failed: %s\n", Index: contrib/dev/acpica/nsload.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/nsload.c,v retrieving revision 1.1.1.13 diff -u -r1.1.1.13 nsload.c --- contrib/dev/acpica/nsload.c 30 Jul 2002 19:33:38 -0000 1.1.1.13 +++ contrib/dev/acpica/nsload.c 22 Aug 2002 10:07:13 -0000 @@ -532,7 +532,6 @@ return_ACPI_STATUS (Status); } - /******************************************************************************* Index: contrib/dev/acpica/nsnames.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/nsnames.c,v retrieving revision 1.1.1.14 diff -u -r1.1.1.14 nsnames.c --- contrib/dev/acpica/nsnames.c 30 Jul 2002 19:33:38 -0000 1.1.1.14 +++ contrib/dev/acpica/nsnames.c 22 Aug 2002 10:07:13 -0000 @@ -198,7 +198,7 @@ } -#ifdef ACPI_DEBUG +#ifdef ACPI_DEBUG_OUTPUT /******************************************************************************* * * FUNCTION: AcpiNsGetExternalPathname Index: contrib/dev/acpica/nssearch.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/nssearch.c,v retrieving revision 1.1.1.15 diff -u -r1.1.1.15 nssearch.c --- contrib/dev/acpica/nssearch.c 9 Jul 2002 17:51:29 -0000 1.1.1.15 +++ contrib/dev/acpica/nssearch.c 22 Aug 2002 10:07:13 -0000 @@ -163,7 +163,7 @@ ACPI_FUNCTION_TRACE ("NsSearchNode"); -#ifdef ACPI_DEBUG +#ifdef ACPI_DEBUG_OUTPUT if (ACPI_LV_NAMES & AcpiDbgLevel) { NATIVE_CHAR *ScopeName; @@ -306,7 +306,7 @@ if (AcpiNsLocal (Type)) { - ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, + ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "[%4.4s] type [%s] must be local to this scope (no parent search)\n", (char *) &TargetName, AcpiUtGetTypeName (Type))); } @@ -395,10 +395,10 @@ if (!Node || !TargetName || !ReturnNode) { - ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Null param- Table %p Name %X Return %p\n", + ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Null param: Node %p Name %X ReturnNode %p\n", Node, TargetName, ReturnNode)); - ACPI_REPORT_ERROR (("NsSearchAndEnter: bad (null) parameter\n")); + ACPI_REPORT_ERROR (("NsSearchAndEnter: Null parameter\n")); return_ACPI_STATUS (AE_BAD_PARAMETER); } Index: contrib/dev/acpica/nsutils.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/nsutils.c,v retrieving revision 1.1.1.14 diff -u -r1.1.1.14 nsutils.c --- contrib/dev/acpica/nsutils.c 9 Jul 2002 17:51:29 -0000 1.1.1.14 +++ contrib/dev/acpica/nsutils.c 22 Aug 2002 10:07:14 -0000 @@ -557,10 +557,14 @@ case '^': for (i = 0; i < InternalNameLength; i++) { - if (InternalName[i] != '^') + if (InternalName[i] == '^') { PrefixLength = i + 1; } + else + { + break; + } } if (i == InternalNameLength) @@ -980,7 +984,7 @@ } -#if defined(ACPI_DEBUG) || defined(ENABLE_DEBUGGER) +#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) /******************************************************************************* * @@ -1016,7 +1020,7 @@ return (FALSE); } -#endif /* ACPI_DEBUG */ +#endif /* ACPI_DEBUG_OUTPUT */ /******************************************************************************* Index: contrib/dev/acpica/nsxfeval.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/nsxfeval.c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 nsxfeval.c --- contrib/dev/acpica/nsxfeval.c 30 Jul 2002 19:33:38 -0000 1.1.1.1 +++ contrib/dev/acpica/nsxfeval.c 22 Aug 2002 10:07:14 -0000 @@ -445,7 +445,6 @@ return_ACPI_STATUS (Status); } - /******************************************************************************* Index: contrib/dev/acpica/psargs.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/psargs.c,v retrieving revision 1.1.1.12 diff -u -r1.1.1.12 psargs.c --- contrib/dev/acpica/psargs.c 30 Jul 2002 19:33:37 -0000 1.1.1.12 +++ contrib/dev/acpica/psargs.c 22 Aug 2002 10:07:12 -0000 @@ -256,7 +256,7 @@ while (AcpiPsIsPrefixChar (ACPI_GET8 (End))) { - /* include prefix '\\' or '^' */ + /* Include prefix '\\' or '^' */ End++; } @@ -314,20 +314,17 @@ * MethodCall - Whether the namepath can be the start * of a method call * - * RETURN: None + * RETURN: Status * - * DESCRIPTION: Get next name (if method call, push appropriate # args). Names - * are looked up in either the parsed or internal namespace to - * determine if the name represents a control method. If a method + * DESCRIPTION: Get next name (if method call, return # of required args). + * Names are looked up in the internal namespace to determine + * if the name represents a control method. If a method * is found, the number of arguments to the method is returned. * This information is critical for parsing to continue correctly. * ******************************************************************************/ - -#ifdef PARSER_ONLY - -void +ACPI_STATUS AcpiPsGetNextNamepath ( ACPI_PARSE_STATE *ParserState, ACPI_PARSE_OBJECT *Arg, @@ -336,69 +333,77 @@ { NATIVE_CHAR *Path; ACPI_PARSE_OBJECT *NameOp; - ACPI_PARSE_OBJECT *Op; - ACPI_PARSE_OBJECT *Count; + ACPI_STATUS Status = AE_OK; + ACPI_OPERAND_OBJECT *MethodDesc; + ACPI_NAMESPACE_NODE *Node; + ACPI_GENERIC_STATE ScopeInfo; ACPI_FUNCTION_TRACE ("PsGetNextNamepath"); Path = AcpiPsGetNextNamestring (ParserState); - if (!Path || !MethodCall) - { - /* Null name case, create a null namepath object */ - - AcpiPsInitOp (Arg, AML_INT_NAMEPATH_OP); - Arg->Common.Value.Name = Path; - return_VOID; - } + /* Null path case is allowed */ - if (AcpiGbl_ParsedNamespaceRoot) + if (Path) { /* - * Lookup the name in the parsed namespace + * Lookup the name in the internal namespace */ - Op = NULL; - if (MethodCall) + ScopeInfo.Scope.Node = NULL; + Node = ParserState->StartNode; + if (Node) { - Op = AcpiPsFind (AcpiPsGetParentScope (ParserState), - Path, AML_METHOD_OP, 0); + ScopeInfo.Scope.Node = Node; } - if (Op) + /* + * Lookup object. We don't want to add anything new to the namespace + * here, however. So we use MODE_EXECUTE. Allow searching of the + * parent tree, but don't open a new scope -- we just want to lookup the + * object (MUST BE mode EXECUTE to perform upsearch) + */ + Status = AcpiNsLookup (&ScopeInfo, Path, ACPI_TYPE_ANY, ACPI_IMODE_EXECUTE, + ACPI_NS_SEARCH_PARENT | ACPI_NS_DONT_OPEN_SCOPE, NULL, + &Node); + if (ACPI_SUCCESS (Status) && MethodCall) { - if (Op->Common.AmlOpcode == AML_METHOD_OP) + if (Node->Type == ACPI_TYPE_METHOD) { - /* - * The name refers to a control method, so this namepath is a - * method invocation. We need to 1) Get the number of arguments - * associated with this method, and 2) Change the NAMEPATH - * object into a METHODCALL object. - */ - Count = AcpiPsGetArg (Op, 0); - if (Count && Count->Common.AmlOpcode == AML_BYTE_OP) + MethodDesc = AcpiNsGetAttachedObject (Node); + ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "Control Method - %p Desc %p Path=%p\n", + Node, MethodDesc, Path)); + + NameOp = AcpiPsAllocOp (AML_INT_NAMEPATH_OP); + if (!NameOp) { - NameOp = AcpiPsAllocOp (AML_INT_NAMEPATH_OP); - if (NameOp) - { - /* Change arg into a METHOD CALL and attach the name */ + return_ACPI_STATUS (AE_NO_MEMORY); + } + + /* Change arg into a METHOD CALL and attach name to it */ - AcpiPsInitOp (Arg, AML_INT_METHODCALL_OP); + AcpiPsInitOp (Arg, AML_INT_METHODCALL_OP); - NameOp->Common.Value.Name = Path; + NameOp->Common.Value.Name = Path; - /* Point METHODCALL/NAME to the METHOD Node */ + /* Point METHODCALL/NAME to the METHOD Node */ - NameOp->Common.Node = (ACPI_NAMESPACE_NODE *) Op; - AcpiPsAppendArg (Arg, NameOp); + NameOp->Common.Node = Node; + AcpiPsAppendArg (Arg, NameOp); - *ArgCount = (UINT32) Count->Common.Value.Integer & - METHOD_FLAGS_ARG_COUNT; - } + if (!MethodDesc) + { + ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "Control Method - %p has no attached object\n", + Node)); + return_ACPI_STATUS (AE_AML_INTERNAL); } - return_VOID; + ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "Control Method - %p Args %X\n", + Node, MethodDesc->Method.ParamCount)); + + *ArgCount = MethodDesc->Method.ParamCount; + return_ACPI_STATUS (AE_OK); } /* @@ -410,127 +415,15 @@ } /* - * Either we didn't find the object in the namespace, or the object is - * something other than a control method. Just initialize the Op with the - * pathname - */ - AcpiPsInitOp (Arg, AML_INT_NAMEPATH_OP); - Arg->Common.Value.Name = Path; - - - return_VOID; -} - - -#else - - -void -AcpiPsGetNextNamepath ( - ACPI_PARSE_STATE *ParserState, - ACPI_PARSE_OBJECT *Arg, - UINT32 *ArgCount, - BOOLEAN MethodCall) -{ - NATIVE_CHAR *Path; - ACPI_PARSE_OBJECT *NameOp; - ACPI_STATUS Status; - ACPI_OPERAND_OBJECT *MethodDesc; - ACPI_NAMESPACE_NODE *Node; - ACPI_GENERIC_STATE ScopeInfo; - - - ACPI_FUNCTION_TRACE ("PsGetNextNamepath"); - - - Path = AcpiPsGetNextNamestring (ParserState); - if (!Path || !MethodCall) - { - /* Null name case, create a null namepath object */ - - AcpiPsInitOp (Arg, AML_INT_NAMEPATH_OP); - Arg->Common.Value.Name = Path; - return_VOID; - } - - /* - * Lookup the name in the internal namespace - */ - ScopeInfo.Scope.Node = NULL; - Node = ParserState->StartNode; - if (Node) - { - ScopeInfo.Scope.Node = Node; - } - - /* - * Lookup object. We don't want to add anything new to the namespace - * here, however. So we use MODE_EXECUTE. Allow searching of the - * parent tree, but don't open a new scope -- we just want to lookup the - * object (MUST BE mode EXECUTE to perform upsearch) - */ - Status = AcpiNsLookup (&ScopeInfo, Path, ACPI_TYPE_ANY, ACPI_IMODE_EXECUTE, - ACPI_NS_SEARCH_PARENT | ACPI_NS_DONT_OPEN_SCOPE, NULL, - &Node); - if (ACPI_SUCCESS (Status)) - { - if (Node->Type == ACPI_TYPE_METHOD) - { - MethodDesc = AcpiNsGetAttachedObject (Node); - ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "Control Method - %p Desc %p Path=%p\n", - Node, MethodDesc, Path)); - - NameOp = AcpiPsAllocOp (AML_INT_NAMEPATH_OP); - if (!NameOp) - { - return_VOID; - } - - /* Change arg into a METHOD CALL and attach name to it */ - - AcpiPsInitOp (Arg, AML_INT_METHODCALL_OP); - - NameOp->Common.Value.Name = Path; - - /* Point METHODCALL/NAME to the METHOD Node */ - - NameOp->Common.Node = Node; - AcpiPsAppendArg (Arg, NameOp); - - if (!MethodDesc) - { - ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "Control Method - %p has no attached object\n", - Node)); - return_VOID; - } - - ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "Control Method - %p Args %X\n", - Node, MethodDesc->Method.ParamCount)); - - *ArgCount = MethodDesc->Method.ParamCount; - return_VOID; - } - - /* - * Else this is normal named object reference. - * Just init the NAMEPATH object with the pathname. - * (See code below) - */ - } - - /* - * Either we didn't find the object in the namespace, or the object is - * something other than a control method. Just initialize the Op with the - * pathname. + * Regardless of success/failure above, + * Just initialize the Op with the pathname. */ AcpiPsInitOp (Arg, AML_INT_NAMEPATH_OP); Arg->Common.Value.Name = Path; - - return_VOID; + return_ACPI_STATUS (Status); } -#endif /******************************************************************************* * @@ -744,23 +637,25 @@ * ArgCount - If the argument points to a control method * the method's argument is returned here. * - * RETURN: An op object containing the next argument. + * RETURN: Status, and an op object containing the next argument. * * DESCRIPTION: Get next argument (including complex list arguments that require * pushing the parser stack) * ******************************************************************************/ -ACPI_PARSE_OBJECT * +ACPI_STATUS AcpiPsGetNextArg ( ACPI_PARSE_STATE *ParserState, UINT32 ArgType, - UINT32 *ArgCount) + UINT32 *ArgCount, + ACPI_PARSE_OBJECT **ReturnArg) { ACPI_PARSE_OBJECT *Arg = NULL; ACPI_PARSE_OBJECT *Prev = NULL; ACPI_PARSE_OBJECT *Field; UINT32 Subop; + ACPI_STATUS Status = AE_OK; ACPI_FUNCTION_TRACE_PTR ("PsGetNextArg", ParserState); @@ -778,16 +673,17 @@ /* constants, strings, and namestrings are all the same size */ Arg = AcpiPsAllocOp (AML_BYTE_OP); - if (Arg) + if (!Arg) { - AcpiPsGetNextSimpleArg (ParserState, ArgType, Arg); + return_ACPI_STATUS (AE_NO_MEMORY); } + AcpiPsGetNextSimpleArg (ParserState, ArgType, Arg); break; case ARGP_PKGLENGTH: - /* package length, nothing returned */ + /* Package length, nothing returned */ ParserState->PkgEnd = AcpiPsGetNextPackageEnd (ParserState); break; @@ -797,21 +693,20 @@ if (ParserState->Aml < ParserState->PkgEnd) { - /* non-empty list */ + /* Non-empty list */ while (ParserState->Aml < ParserState->PkgEnd) { Field = AcpiPsGetNextField (ParserState); if (!Field) { - break; + return_ACPI_STATUS (AE_NO_MEMORY); } if (Prev) { Prev->Common.Next = Field; } - else { Arg = Field; @@ -820,7 +715,7 @@ Prev = Field; } - /* skip to End of byte data */ + /* Skip to End of byte data */ ParserState->Aml = ParserState->PkgEnd; } @@ -831,18 +726,20 @@ if (ParserState->Aml < ParserState->PkgEnd) { - /* non-empty list */ + /* Non-empty list */ Arg = AcpiPsAllocOp (AML_INT_BYTELIST_OP); - if (Arg) + if (!Arg) { - /* fill in bytelist data */ - - Arg->Common.Value.Size = ACPI_PTR_DIFF (ParserState->PkgEnd, ParserState->Aml); - Arg->Named.Data = ParserState->Aml; + return_ACPI_STATUS (AE_NO_MEMORY); } - /* skip to End of byte data */ + /* Fill in bytelist data */ + + Arg->Common.Value.Size = ACPI_PTR_DIFF (ParserState->PkgEnd, ParserState->Aml); + Arg->Named.Data = ParserState->Aml; + + /* Skip to End of byte data */ ParserState->Aml = ParserState->PkgEnd; } @@ -852,27 +749,27 @@ case ARGP_TARGET: case ARGP_SUPERNAME: case ARGP_SIMPLENAME: + + Subop = AcpiPsPeekOpcode (ParserState); + if (Subop == 0 || + AcpiPsIsLeadingChar (Subop) || + AcpiPsIsPrefixChar (Subop)) { - Subop = AcpiPsPeekOpcode (ParserState); - if (Subop == 0 || - AcpiPsIsLeadingChar (Subop) || - AcpiPsIsPrefixChar (Subop)) - { - /* NullName or NameString */ + /* NullName or NameString */ - Arg = AcpiPsAllocOp (AML_INT_NAMEPATH_OP); - if (Arg) - { - AcpiPsGetNextNamepath (ParserState, Arg, ArgCount, 0); - } + Arg = AcpiPsAllocOp (AML_INT_NAMEPATH_OP); + if (!Arg) + { + return_ACPI_STATUS (AE_NO_MEMORY); } - else - { - /* single complex argument, nothing returned */ + Status = AcpiPsGetNextNamepath (ParserState, Arg, ArgCount, 0); + } + else + { + /* single complex argument, nothing returned */ - *ArgCount = 1; - } + *ArgCount = 1; } break; @@ -898,10 +795,14 @@ } break; + default: + ACPI_REPORT_ERROR (("Invalid ArgType: %X\n", ArgType)); + Status = AE_AML_OPERAND_TYPE; break; } - return_PTR (Arg); + *ReturnArg = Arg; + return_ACPI_STATUS (Status); } Index: contrib/dev/acpica/psopcode.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/psopcode.c,v retrieving revision 1.1.1.15 diff -u -r1.1.1.15 psopcode.c --- contrib/dev/acpica/psopcode.c 30 Jul 2002 19:33:37 -0000 1.1.1.15 +++ contrib/dev/acpica/psopcode.c 22 Aug 2002 10:07:12 -0000 @@ -649,17 +649,17 @@ /* 60 */ ACPI_OP ("LNotEqual", ARGP_LNOTEQUAL_OP, ARGI_LNOTEQUAL_OP, ACPI_TYPE_ANY, AML_CLASS_INTERNAL, AML_TYPE_BOGUS, AML_HAS_ARGS | AML_CONSTANT), /* 61 */ ACPI_OP ("LLessEqual", ARGP_LLESSEQUAL_OP, ARGI_LLESSEQUAL_OP, ACPI_TYPE_ANY, AML_CLASS_INTERNAL, AML_TYPE_BOGUS, AML_HAS_ARGS | AML_CONSTANT), /* 62 */ ACPI_OP ("LGreaterEqual", ARGP_LGREATEREQUAL_OP, ARGI_LGREATEREQUAL_OP, ACPI_TYPE_ANY, AML_CLASS_INTERNAL, AML_TYPE_BOGUS, AML_HAS_ARGS | AML_CONSTANT), -/* 63 */ ACPI_OP ("[NamePath]", ARGP_NAMEPATH_OP, ARGI_NAMEPATH_OP, INTERNAL_TYPE_REFERENCE, AML_CLASS_ARGUMENT, AML_TYPE_LITERAL, AML_NSOBJECT | AML_NSNODE ), -/* 64 */ ACPI_OP ("[MethodCall]", ARGP_METHODCALL_OP, ARGI_METHODCALL_OP, ACPI_TYPE_METHOD, AML_CLASS_METHOD_CALL, AML_TYPE_METHOD_CALL, AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE), -/* 65 */ ACPI_OP ("[ByteList]", ARGP_BYTELIST_OP, ARGI_BYTELIST_OP, ACPI_TYPE_ANY, AML_CLASS_ARGUMENT, AML_TYPE_LITERAL, 0), -/* 66 */ ACPI_OP ("[ReservedField]", ARGP_RESERVEDFIELD_OP, ARGI_RESERVEDFIELD_OP, ACPI_TYPE_ANY, AML_CLASS_INTERNAL, AML_TYPE_BOGUS, 0), -/* 67 */ ACPI_OP ("[NamedField]", ARGP_NAMEDFIELD_OP, ARGI_NAMEDFIELD_OP, ACPI_TYPE_ANY, AML_CLASS_INTERNAL, AML_TYPE_BOGUS, AML_NSOBJECT | AML_NSOPCODE | AML_NSNODE | AML_NAMED ), -/* 68 */ ACPI_OP ("[AccessField]", ARGP_ACCESSFIELD_OP, ARGI_ACCESSFIELD_OP, ACPI_TYPE_ANY, AML_CLASS_INTERNAL, AML_TYPE_BOGUS, 0), -/* 69 */ ACPI_OP ("[StaticString", ARGP_STATICSTRING_OP, ARGI_STATICSTRING_OP, ACPI_TYPE_ANY, AML_CLASS_INTERNAL, AML_TYPE_BOGUS, 0), -/* 6A */ ACPI_OP ("[Return Value]", ARG_NONE, ARG_NONE, ACPI_TYPE_ANY, AML_CLASS_RETURN_VALUE, AML_TYPE_RETURN, AML_HAS_ARGS | AML_HAS_RETVAL), -/* 6B */ ACPI_OP ("UNKNOWN_OP!", ARG_NONE, ARG_NONE, INTERNAL_TYPE_INVALID, AML_CLASS_UNKNOWN, AML_TYPE_BOGUS, AML_HAS_ARGS), -/* 6C */ ACPI_OP ("ASCII_ONLY!", ARG_NONE, ARG_NONE, ACPI_TYPE_ANY, AML_CLASS_ASCII, AML_TYPE_BOGUS, AML_HAS_ARGS), -/* 6D */ ACPI_OP ("PREFIX_ONLY!", ARG_NONE, ARG_NONE, ACPI_TYPE_ANY, AML_CLASS_PREFIX, AML_TYPE_BOGUS, AML_HAS_ARGS), +/* 63 */ ACPI_OP ("-NamePath-", ARGP_NAMEPATH_OP, ARGI_NAMEPATH_OP, INTERNAL_TYPE_REFERENCE, AML_CLASS_ARGUMENT, AML_TYPE_LITERAL, AML_NSOBJECT | AML_NSNODE ), +/* 64 */ ACPI_OP ("-MethodCall-", ARGP_METHODCALL_OP, ARGI_METHODCALL_OP, ACPI_TYPE_METHOD, AML_CLASS_METHOD_CALL, AML_TYPE_METHOD_CALL, AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE), +/* 65 */ ACPI_OP ("-ByteList-", ARGP_BYTELIST_OP, ARGI_BYTELIST_OP, ACPI_TYPE_ANY, AML_CLASS_ARGUMENT, AML_TYPE_LITERAL, 0), +/* 66 */ ACPI_OP ("-ReservedField-", ARGP_RESERVEDFIELD_OP, ARGI_RESERVEDFIELD_OP, ACPI_TYPE_ANY, AML_CLASS_INTERNAL, AML_TYPE_BOGUS, 0), +/* 67 */ ACPI_OP ("-NamedField-", ARGP_NAMEDFIELD_OP, ARGI_NAMEDFIELD_OP, ACPI_TYPE_ANY, AML_CLASS_INTERNAL, AML_TYPE_BOGUS, AML_NSOBJECT | AML_NSOPCODE | AML_NSNODE | AML_NAMED ), +/* 68 */ ACPI_OP ("-AccessField-", ARGP_ACCESSFIELD_OP, ARGI_ACCESSFIELD_OP, ACPI_TYPE_ANY, AML_CLASS_INTERNAL, AML_TYPE_BOGUS, 0), +/* 69 */ ACPI_OP ("-StaticString", ARGP_STATICSTRING_OP, ARGI_STATICSTRING_OP, ACPI_TYPE_ANY, AML_CLASS_INTERNAL, AML_TYPE_BOGUS, 0), +/* 6A */ ACPI_OP ("-Return Value-", ARG_NONE, ARG_NONE, ACPI_TYPE_ANY, AML_CLASS_RETURN_VALUE, AML_TYPE_RETURN, AML_HAS_ARGS | AML_HAS_RETVAL), +/* 6B */ ACPI_OP ("-UNKNOWN_OP-", ARG_NONE, ARG_NONE, INTERNAL_TYPE_INVALID, AML_CLASS_UNKNOWN, AML_TYPE_BOGUS, AML_HAS_ARGS), +/* 6C */ ACPI_OP ("-ASCII_ONLY-", ARG_NONE, ARG_NONE, ACPI_TYPE_ANY, AML_CLASS_ASCII, AML_TYPE_BOGUS, AML_HAS_ARGS), +/* 6D */ ACPI_OP ("-PREFIX_ONLY-", ARG_NONE, ARG_NONE, ACPI_TYPE_ANY, AML_CLASS_PREFIX, AML_TYPE_BOGUS, AML_HAS_ARGS), /* ACPI 2.0 opcodes */ Index: contrib/dev/acpica/psparse.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/psparse.c,v retrieving revision 1.17 diff -u -r1.17 psparse.c --- contrib/dev/acpica/psparse.c 30 Jul 2002 19:35:24 -0000 1.17 +++ contrib/dev/acpica/psparse.c 22 Aug 2002 12:00:19 -0000 @@ -206,60 +206,6 @@ /******************************************************************************* * - * FUNCTION: AcpiPsFindObject - * - * PARAMETERS: Opcode - Current opcode - * ParserState - Current state - * WalkState - Current state - * *Op - Where found/new op is returned - * - * RETURN: Status - * - * DESCRIPTION: Find a named object. Two versions - one to search the parse - * tree (for parser-only applications such as acpidump), another - * to search the ACPI internal namespace (the parse tree may no - * longer exist) - * - ******************************************************************************/ - -#ifdef PARSER_ONLY - -ACPI_STATUS -AcpiPsFindObject ( - ACPI_WALK_STATE *WalkState, - ACPI_PARSE_OBJECT **OutOp) -{ - NATIVE_CHAR *Path; - - - /* We are only interested in opcodes that have an associated name */ - - if (!(WalkState->OpInfo->Flags & AML_NAMED)) - { - *OutOp = WalkState->Op; - return (AE_OK); - } - - /* Find the name in the parse tree */ - - Path = AcpiPsGetNextNamestring (&WalkState->ParserState); - - *OutOp = AcpiPsFind (AcpiPsGetParentScope (&WalkState->ParserState), - Path, WalkState->Opcode, 1); - - if (!(*OutOp)) - { - return (AE_NOT_FOUND); - } - - return (AE_OK); -} - -#endif - - -/******************************************************************************* - * * FUNCTION: AcpiPsCompleteThisOp * * PARAMETERS: WalkState - Current State @@ -276,7 +222,6 @@ ACPI_WALK_STATE *WalkState, ACPI_PARSE_OBJECT *Op) { -#ifndef PARSER_ONLY ACPI_PARSE_OBJECT *Prev; ACPI_PARSE_OBJECT *Next; const ACPI_OPCODE_INFO *ParentInfo; @@ -431,10 +376,6 @@ } return_VOID; - -#else - return; -#endif } @@ -496,6 +437,13 @@ ParserState->Aml = WalkState->AmlLastWhile; break; +#if 0 + case AE_CTRL_SKIP: + + ParserState->Aml = ParserState->Scope->ParseScope.PkgEnd; + Status = AE_OK; + break; +#endif case AE_CTRL_TRUE: @@ -712,15 +660,28 @@ * Get and append arguments until we find the node that contains * the name (the type ARGP_NAME). */ - while (GET_CURRENT_ARG_TYPE (WalkState->ArgTypes) != ARGP_NAME) + while (GET_CURRENT_ARG_TYPE (WalkState->ArgTypes) && + (GET_CURRENT_ARG_TYPE (WalkState->ArgTypes) != ARGP_NAME)) { - Arg = AcpiPsGetNextArg (ParserState, - GET_CURRENT_ARG_TYPE (WalkState->ArgTypes), - &WalkState->ArgCount); + Status = AcpiPsGetNextArg (ParserState, + GET_CURRENT_ARG_TYPE (WalkState->ArgTypes), + &WalkState->ArgCount, &Arg); + if (ACPI_FAILURE (Status)) + { + goto CloseThisOp; + } + AcpiPsAppendArg (&PreOp, Arg); INCREMENT_ARG_LIST (WalkState->ArgTypes); } + /* Make sure that we found a NAME and didn't run out of arguments */ + + if (!GET_CURRENT_ARG_TYPE (WalkState->ArgTypes)) + { + return_ACPI_STATUS (AE_AML_NO_OPERAND); + } + /* We know that this arg is a name, move to next arg */ INCREMENT_ARG_LIST (WalkState->ArgTypes); @@ -828,8 +789,8 @@ if (WalkState->OpInfo) { ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, - "Opcode %4.4hX [%s] Op %p Aml %p AmlOffset %5.5X\n", - Op->Common.AmlOpcode, WalkState->OpInfo->Name, + "Opcode %4.4X [%s] Op %p Aml %p AmlOffset %5.5X\n", + (UINT32) Op->Common.AmlOpcode, WalkState->OpInfo->Name, Op, ParserState->Aml, Op->Common.AmlOffset)); } } @@ -859,7 +820,19 @@ case AML_INT_NAMEPATH_OP: /* AML_NAMESTRING_ARG */ - AcpiPsGetNextNamepath (ParserState, Op, &WalkState->ArgCount, 1); + Status = AcpiPsGetNextNamepath (ParserState, Op, &WalkState->ArgCount, 1); + if (ACPI_FAILURE (Status)) + { + /* NOT_FOUND is an error only if we are actually executing a method */ + + if ((((WalkState->ParseFlags & ACPI_PARSE_MODE_MASK) == ACPI_PARSE_EXECUTE) && + (Status == AE_NOT_FOUND)) || + (Status != AE_NOT_FOUND)) + { + goto CloseThisOp; + } + } + WalkState->ArgTypes = 0; break; @@ -870,17 +843,29 @@ while (GET_CURRENT_ARG_TYPE (WalkState->ArgTypes) && !WalkState->ArgCount) { - WalkState->AmlOffset = ACPI_PTR_DIFF (ParserState->Aml, + WalkState->AmlOffset = ACPI_PTR_DIFF (ParserState->Aml, ParserState->AmlStart); - Arg = AcpiPsGetNextArg (ParserState, - GET_CURRENT_ARG_TYPE (WalkState->ArgTypes), - &WalkState->ArgCount); + Status = AcpiPsGetNextArg (ParserState, + GET_CURRENT_ARG_TYPE (WalkState->ArgTypes), + &WalkState->ArgCount, &Arg); + if (ACPI_FAILURE (Status)) + { + /* NOT_FOUND is an error only if we are actually executing a method */ + + if ((((WalkState->ParseFlags & ACPI_PARSE_MODE_MASK) == ACPI_PARSE_EXECUTE) && + (Status == AE_NOT_FOUND) && + (Op->Common.AmlOpcode != AML_COND_REF_OF_OP)) || + (Status != AE_NOT_FOUND)) + { + goto CloseThisOp; + } + } + if (Arg) { Arg->Common.AmlOffset = WalkState->AmlOffset; AcpiPsAppendArg (Op, Arg); } - INCREMENT_ARG_LIST (WalkState->ArgTypes); } @@ -915,7 +900,7 @@ (WalkState->DescendingCallback != AcpiDsExecBeginOp)) { /* - * Skip parsing of + * Skip parsing of * because we don't have enough info in the first pass * to parse them correctly. */ @@ -1043,15 +1028,18 @@ AcpiPsPopScope (ParserState, &Op, &WalkState->ArgTypes, &WalkState->ArgCount); - WalkState->Op = Op; - WalkState->OpInfo = AcpiPsGetOpcodeInfo (Op->Common.AmlOpcode); - WalkState->Opcode = Op->Common.AmlOpcode; + if (Op) + { + WalkState->Op = Op; + WalkState->OpInfo = AcpiPsGetOpcodeInfo (Op->Common.AmlOpcode); + WalkState->Opcode = Op->Common.AmlOpcode; - Status = WalkState->AscendingCallback (WalkState); - Status = AcpiPsNextParseState (WalkState, Op, Status); + Status = WalkState->AscendingCallback (WalkState); + Status = AcpiPsNextParseState (WalkState, Op, Status); - AcpiPsCompleteThisOp (WalkState, Op); - Op = NULL; + AcpiPsCompleteThisOp (WalkState, Op); + Op = NULL; + } Status = AE_OK; break; @@ -1225,6 +1213,7 @@ ACPI_WALK_STATE *WalkState) { ACPI_STATUS Status; + ACPI_STATUS TerminateStatus; ACPI_THREAD_STATE *Thread; ACPI_THREAD_STATE *PrevWalkList = AcpiGbl_CurrentWalkList; ACPI_WALK_STATE *PreviousWalkState; @@ -1320,11 +1309,10 @@ */ if ((WalkState->ParseFlags & ACPI_PARSE_MODE_MASK) == ACPI_PARSE_EXECUTE) { - Status = AcpiDsTerminateControlMethod (WalkState); - if (ACPI_FAILURE (Status)) + TerminateStatus = AcpiDsTerminateControlMethod (WalkState); + if (ACPI_FAILURE (TerminateStatus)) { ACPI_REPORT_ERROR (("Could not terminate control method properly\n")); - Status = AE_OK; /* Ignore error and continue */ } Index: contrib/dev/acpica/pstree.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/pstree.c,v retrieving revision 1.1.1.10 diff -u -r1.1.1.10 pstree.c --- contrib/dev/acpica/pstree.c 9 Jul 2002 17:51:29 -0000 1.1.1.10 +++ contrib/dev/acpica/pstree.c 22 Aug 2002 10:07:13 -0000 @@ -219,7 +219,7 @@ { /* Invalid opcode */ - ACPI_REPORT_ERROR (("PsAppendArg: Invalid AML Opcode: 0x%2.2X\n", + ACPI_REPORT_ERROR (("PsAppendArg: Invalid AML Opcode: 0x%2.2X\n", Op->Common.AmlOpcode)); return; } Index: contrib/dev/acpica/rsdump.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/rsdump.c,v retrieving revision 1.1.1.12 diff -u -r1.1.1.12 rsdump.c --- contrib/dev/acpica/rsdump.c 9 Jul 2002 17:51:30 -0000 1.1.1.12 +++ contrib/dev/acpica/rsdump.c 22 Aug 2002 10:07:14 -0000 @@ -124,7 +124,7 @@ ACPI_MODULE_NAME ("rsdump") -#if defined(ACPI_DEBUG) || defined(ENABLE_DEBUGGER) +#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) /******************************************************************************* * Index: contrib/dev/acpica/tbconvrt.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/tbconvrt.c,v retrieving revision 1.1.1.13 diff -u -r1.1.1.13 tbconvrt.c --- contrib/dev/acpica/tbconvrt.c 30 Jul 2002 19:33:38 -0000 1.1.1.13 +++ contrib/dev/acpica/tbconvrt.c 22 Aug 2002 10:07:14 -0000 @@ -195,7 +195,7 @@ /* Compute size of the converted XSDT */ - TableSize = ((ACPI_SIZE) AcpiGbl_RsdtTableCount * sizeof (UINT64)) + + TableSize = ((ACPI_SIZE) AcpiGbl_RsdtTableCount * sizeof (UINT64)) + sizeof (ACPI_TABLE_HEADER); /* Allocate an XSDT */ @@ -242,7 +242,6 @@ } - /******************************************************************************* * * FUNCTION: AcpiTbConvertFadt1 @@ -365,49 +364,49 @@ if (!(ACPI_GET_ADDRESS (LocalFadt->XPm1aEvtBlk.Address))) { - ASL_BUILD_GAS_FROM_V1_ENTRY (LocalFadt->XPm1aEvtBlk, + ASL_BUILD_GAS_FROM_V1_ENTRY (LocalFadt->XPm1aEvtBlk, LocalFadt->Pm1EvtLen, LocalFadt->V1_Pm1aEvtBlk); } if (!(ACPI_GET_ADDRESS (LocalFadt->XPm1bEvtBlk.Address))) { - ASL_BUILD_GAS_FROM_V1_ENTRY (LocalFadt->XPm1bEvtBlk, + ASL_BUILD_GAS_FROM_V1_ENTRY (LocalFadt->XPm1bEvtBlk, LocalFadt->Pm1EvtLen, LocalFadt->V1_Pm1bEvtBlk); } if (!(ACPI_GET_ADDRESS (LocalFadt->XPm1aCntBlk.Address))) { - ASL_BUILD_GAS_FROM_V1_ENTRY (LocalFadt->XPm1aCntBlk, + ASL_BUILD_GAS_FROM_V1_ENTRY (LocalFadt->XPm1aCntBlk, LocalFadt->Pm1CntLen, LocalFadt->V1_Pm1aCntBlk); } if (!(ACPI_GET_ADDRESS (LocalFadt->XPm1bCntBlk.Address))) { - ASL_BUILD_GAS_FROM_V1_ENTRY (LocalFadt->XPm1bCntBlk, + ASL_BUILD_GAS_FROM_V1_ENTRY (LocalFadt->XPm1bCntBlk, LocalFadt->Pm1CntLen, LocalFadt->V1_Pm1bCntBlk); } if (!(ACPI_GET_ADDRESS (LocalFadt->XPm2CntBlk.Address))) { - ASL_BUILD_GAS_FROM_V1_ENTRY (LocalFadt->XPm2CntBlk, + ASL_BUILD_GAS_FROM_V1_ENTRY (LocalFadt->XPm2CntBlk, LocalFadt->Pm2CntLen, LocalFadt->V1_Pm2CntBlk); } if (!(ACPI_GET_ADDRESS (LocalFadt->XPmTmrBlk.Address))) { - ASL_BUILD_GAS_FROM_V1_ENTRY (LocalFadt->XPmTmrBlk, + ASL_BUILD_GAS_FROM_V1_ENTRY (LocalFadt->XPmTmrBlk, LocalFadt->PmTmLen, LocalFadt->V1_PmTmrBlk); } if (!(ACPI_GET_ADDRESS (LocalFadt->XGpe0Blk.Address))) { - ASL_BUILD_GAS_FROM_V1_ENTRY (LocalFadt->XGpe0Blk, + ASL_BUILD_GAS_FROM_V1_ENTRY (LocalFadt->XGpe0Blk, LocalFadt->Gpe0BlkLen, LocalFadt->V1_Gpe0Blk); } if (!(ACPI_GET_ADDRESS (LocalFadt->XGpe1Blk.Address))) { - ASL_BUILD_GAS_FROM_V1_ENTRY (LocalFadt->XGpe1Blk, + ASL_BUILD_GAS_FROM_V1_ENTRY (LocalFadt->XGpe1Blk, LocalFadt->Gpe1BlkLen, LocalFadt->V1_Gpe1Blk); } } @@ -449,7 +448,7 @@ { return_ACPI_STATUS (AE_NO_MEMORY); } - + /* * FADT length and version validation. The table must be at least as * long as the version 1.0 FADT @@ -466,7 +465,7 @@ { /* Length is too short to be a V2.0 table */ - ACPI_REPORT_WARNING (("Inconsistent FADT length (0x%X) and revision (0x%X), using FADT V1.0 portion of table\n", + ACPI_REPORT_WARNING (("Inconsistent FADT length (0x%X) and revision (0x%X), using FADT V1.0 portion of table\n", AcpiGbl_FADT->Header.Length, AcpiGbl_FADT->Header.Revision)); AcpiTbConvertFadt1 (LocalFadt, (void *) AcpiGbl_FADT); @@ -545,7 +544,7 @@ if (AcpiGbl_FACS->Length < 64) { - ACPI_REPORT_WARNING (("FACS is shorter than the ACPI specification allows: 0x%X, using anyway\n", + ACPI_REPORT_WARNING (("FACS is shorter than the ACPI specification allows: 0x%X, using anyway\n", AcpiGbl_FACS->Length)); } Index: contrib/dev/acpica/tbget.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/tbget.c,v retrieving revision 1.7 diff -u -r1.7 tbget.c --- contrib/dev/acpica/tbget.c 30 Jul 2002 19:35:24 -0000 1.7 +++ contrib/dev/acpica/tbget.c 22 Aug 2002 12:00:19 -0000 @@ -164,7 +164,7 @@ Status = AcpiTbGetTableBody (Address, &Header, TableInfo); if (ACPI_FAILURE (Status)) { - ACPI_REPORT_ERROR (("Could not get ACPI table (size %X), %s\n", + ACPI_REPORT_ERROR (("Could not get ACPI table (size %X), %s\n", Header.Length, AcpiFormatException (Status))); return_ACPI_STATUS (Status); } @@ -185,7 +185,7 @@ * * DESCRIPTION: Get an ACPI table header. Works in both physical or virtual * addressing mode. Works with both physical or logical pointers. - * Table is either copied or mapped, depending on the pointer + * Table is either copied or mapped, depending on the pointer * type and mode of the processor. * ******************************************************************************/ @@ -260,10 +260,10 @@ * RETURN: Status * * DESCRIPTION: Get an entire ACPI table with support to allow the host OS to - * replace the table with a newer version (table override.) + * replace the table with a newer version (table override.) * Works in both physical or virtual * addressing mode. Works with both physical or logical pointers. - * Table is either copied or mapped, depending on the pointer + * Table is either copied or mapped, depending on the pointer * type and mode of the processor. * ******************************************************************************/ @@ -332,7 +332,7 @@ /* * The OSL will examine the header and decide whether to override this - * table. If it decides to override, a table will be returned in NewTable, + * table. If it decides to override, a table will be returned in NewTable, * which we will then copy. */ Status = AcpiOsTableOverride (Header, &NewTable); @@ -340,7 +340,7 @@ { /* Some severe error from the OSL, but we basically ignore it */ - ACPI_REPORT_ERROR (("Could not override ACPI table, %s\n", + ACPI_REPORT_ERROR (("Could not override ACPI table, %s\n", AcpiFormatException (Status))); return_ACPI_STATUS (Status); } @@ -352,8 +352,8 @@ return_ACPI_STATUS (AE_NO_ACPI_TABLES); } - /* - * We have a new table to override the old one. Get a copy of + /* + * We have a new table to override the old one. Get a copy of * the new one. We know that the new table has a logical pointer. */ Address.PointerType = ACPI_LOGICAL_POINTER | ACPI_LOGICAL_ADDRESSING; @@ -369,7 +369,7 @@ /* Copy the table info */ - ACPI_REPORT_INFO (("Table [%4.4s] replaced by host OS\n", + ACPI_REPORT_INFO (("Table [%4.4s] replaced by host OS\n", TableInfo->Pointer->Signature)); return_ACPI_STATUS (AE_OK); @@ -389,7 +389,7 @@ * * DESCRIPTION: Get an entire ACPI table. Works in both physical or virtual * addressing mode. Works with both physical or logical pointers. - * Table is either copied or mapped, depending on the pointer + * Table is either copied or mapped, depending on the pointer * type and mode of the processor. * ******************************************************************************/ @@ -404,7 +404,7 @@ UINT8 Allocation; ACPI_STATUS Status = AE_OK; - + ACPI_FUNCTION_TRACE ("TbGetThisTable"); @@ -443,7 +443,7 @@ * Just map the table's physical memory * into our address space. */ - Status = AcpiOsMapMemory (Address->Pointer.Physical, (ACPI_SIZE) Header->Length, + Status = AcpiOsMapMemory (Address->Pointer.Physical, (ACPI_SIZE) Header->Length, (void **) &FullTable); if (ACPI_FAILURE (Status)) { @@ -490,9 +490,9 @@ TableInfo->Allocation = Allocation; TableInfo->BasePointer = FullTable; - ACPI_DEBUG_PRINT ((ACPI_DB_INFO, - "Found table [%4.4s] at %8.8X%8.8X, mapped/copied to %p\n", - FullTable->Signature, + ACPI_DEBUG_PRINT ((ACPI_DB_INFO, + "Found table [%4.4s] at %8.8X%8.8X, mapped/copied to %p\n", + FullTable->Signature, ACPI_HIDWORD (Address->Pointer.Physical), ACPI_LODWORD (Address->Pointer.Physical), FullTable)); Index: contrib/dev/acpica/tbgetall.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/tbgetall.c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 tbgetall.c --- contrib/dev/acpica/tbgetall.c 30 Jul 2002 19:33:38 -0000 1.1.1.1 +++ contrib/dev/acpica/tbgetall.c 22 Aug 2002 10:07:14 -0000 @@ -124,7 +124,6 @@ ACPI_MODULE_NAME ("tbgetall") - /******************************************************************************* * * FUNCTION: AcpiTbGetPrimaryTable @@ -291,12 +290,12 @@ ACPI_STATUS Status = AE_OK; UINT32 i; ACPI_TABLE_DESC TableInfo; - ACPI_POINTER Address; + ACPI_POINTER Address; ACPI_FUNCTION_TRACE ("TbGetRequiredTables"); - ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "%d ACPI tables in RSDT\n", + ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "%d ACPI tables in RSDT\n", AcpiGbl_RsdtTableCount)); @@ -316,7 +315,7 @@ Address.Pointer.Value = ACPI_GET_ADDRESS (AcpiGbl_XSDT->TableOffsetEntry[i]); - /* + /* * Get the tables needed by this subsystem (FADT and any SSDTs). * NOTE: All other tables are completely ignored at this time. */ Index: contrib/dev/acpica/tbinstal.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/tbinstal.c,v retrieving revision 1.1.1.16 diff -u -r1.1.1.16 tbinstal.c --- contrib/dev/acpica/tbinstal.c 30 Jul 2002 19:33:38 -0000 1.1.1.16 +++ contrib/dev/acpica/tbinstal.c 22 Aug 2002 10:07:14 -0000 @@ -171,7 +171,7 @@ TableInfo->Type = (UINT8) i; } - ACPI_DEBUG_PRINT ((ACPI_DB_INFO, + ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Table [%4.4s] matched and is a required ACPI table\n", (char *) AcpiGbl_AcpiTableData[i].Signature)); @@ -179,7 +179,7 @@ } } - ACPI_DEBUG_PRINT ((ACPI_DB_INFO, + ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Table [%4.4s] is not a required ACPI table - ignored\n", (char *) Signature)); @@ -215,7 +215,7 @@ Status = AcpiUtAcquireMutex (ACPI_MTX_TABLES); if (ACPI_FAILURE (Status)) { - ACPI_REPORT_ERROR (("Could not acquire table mutex for [%4.4s], %s\n", + ACPI_REPORT_ERROR (("Could not acquire table mutex for [%4.4s], %s\n", TableInfo->Pointer->Signature, AcpiFormatException (Status))); return_ACPI_STATUS (Status); } @@ -225,7 +225,7 @@ Status = AcpiTbInitTableDescriptor (TableInfo->Type, TableInfo); if (ACPI_FAILURE (Status)) { - ACPI_REPORT_ERROR (("Could not install ACPI table [%s], %s\n", + ACPI_REPORT_ERROR (("Could not install ACPI table [%s], %s\n", TableInfo->Pointer->Signature, AcpiFormatException (Status))); } Index: contrib/dev/acpica/tbrsdt.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/tbrsdt.c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 tbrsdt.c --- contrib/dev/acpica/tbrsdt.c 30 Jul 2002 19:33:38 -0000 1.1.1.1 +++ contrib/dev/acpica/tbrsdt.c 22 Aug 2002 10:07:15 -0000 @@ -166,7 +166,7 @@ return_ACPI_STATUS (Status); } break; - + default: return_ACPI_STATUS (AE_BAD_PARAMETER); } @@ -346,7 +346,7 @@ { ACPI_TABLE_DESC TableInfo; ACPI_STATUS Status; - ACPI_POINTER Address; + ACPI_POINTER Address; ACPI_FUNCTION_TRACE ("TbGetTableRsdt"); Index: contrib/dev/acpica/tbutils.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/tbutils.c,v retrieving revision 1.1.1.15 diff -u -r1.1.1.15 tbutils.c --- contrib/dev/acpica/tbutils.c 30 Jul 2002 19:33:39 -0000 1.1.1.15 +++ contrib/dev/acpica/tbutils.c 22 Aug 2002 10:07:15 -0000 @@ -233,7 +233,7 @@ TableHeader, (char *) &Signature)); ACPI_REPORT_WARNING (("Invalid table header length (0x%X) found\n", - TableHeader->Length)); + (UINT32) TableHeader->Length)); ACPI_DUMP_BUFFER (TableHeader, sizeof (ACPI_TABLE_HEADER)); return (AE_BAD_HEADER); } @@ -275,7 +275,7 @@ if (Checksum) { ACPI_REPORT_WARNING (("Invalid checksum (%X) in table %4.4s\n", - Checksum, TableHeader->Signature)); + (UINT32) Checksum, TableHeader->Signature)); Status = AE_BAD_CHECKSUM; } Index: contrib/dev/acpica/utdebug.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/utdebug.c,v retrieving revision 1.1.1.15 diff -u -r1.1.1.15 utdebug.c --- contrib/dev/acpica/utdebug.c 9 Jul 2002 17:51:31 -0000 1.1.1.15 +++ contrib/dev/acpica/utdebug.c 22 Aug 2002 10:07:15 -0000 @@ -122,7 +122,7 @@ ACPI_MODULE_NAME ("utdebug") -#ifdef ACPI_DEBUG +#ifdef ACPI_DEBUG_OUTPUT static UINT32 AcpiGbl_PrevThreadId = 0xFFFFFFFF; static char *AcpiGbl_FnEntryStr = "----Entry"; Index: contrib/dev/acpica/uteval.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/uteval.c,v retrieving revision 1.1.1.13 diff -u -r1.1.1.13 uteval.c --- contrib/dev/acpica/uteval.c 9 Jul 2002 17:51:31 -0000 1.1.1.13 +++ contrib/dev/acpica/uteval.c 22 Aug 2002 10:07:15 -0000 @@ -277,7 +277,7 @@ Status = AE_TYPE; ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Type returned from _HID not a number or string: %s(%X) \n", - AcpiUtGetObjectTypeName (ObjDesc), + AcpiUtGetObjectTypeName (ObjDesc), ACPI_GET_OBJECT_TYPE (ObjDesc))); } else @@ -390,7 +390,7 @@ Status = AE_TYPE; ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Type returned from _CID not a number, string, or package: %s(%X) \n", - AcpiUtGetObjectTypeName (ObjDesc), + AcpiUtGetObjectTypeName (ObjDesc), ACPI_GET_OBJECT_TYPE (ObjDesc))); break; } Index: contrib/dev/acpica/utglobal.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/utglobal.c,v retrieving revision 1.5 diff -u -r1.5 utglobal.c --- contrib/dev/acpica/utglobal.c 30 Jul 2002 19:35:24 -0000 1.5 +++ contrib/dev/acpica/utglobal.c 22 Aug 2002 12:00:19 -0000 @@ -125,7 +125,6 @@ ACPI_MODULE_NAME ("utglobal") - /****************************************************************************** * * FUNCTION: AcpiFormatException @@ -225,7 +224,7 @@ /* Debug switch - level and trace mask */ -#ifdef ACPI_DEBUG +#ifdef ACPI_DEBUG_OUTPUT UINT32 AcpiDbgLevel = DEBUG_DEFAULT; #else UINT32 AcpiDbgLevel = NORMAL_DEFAULT; @@ -285,6 +284,10 @@ {"_REV", ACPI_TYPE_INTEGER, "2"}, {"_OS_", ACPI_TYPE_STRING, ACPI_OS_NAME}, {"_GL_", ACPI_TYPE_MUTEX, "0"}, + +#if defined (ACPI_NO_METHOD_EXECUTION) || defined (ACPI_CONSTANT_EVAL_ONLY) + {"_OSI", ACPI_TYPE_METHOD, "1"}, +#endif {NULL, ACPI_TYPE_ANY, NULL} /* Table terminator */ }; @@ -622,7 +625,7 @@ } -#if defined(ACPI_DEBUG) || defined(ENABLE_DEBUGGER) +#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) /* * Strings and procedures used for debug only @@ -873,7 +876,7 @@ AcpiGbl_RootNodeStruct.Flags = ANOBJ_END_OF_PEER_LIST; -#ifdef ACPI_DEBUG +#ifdef ACPI_DEBUG_OUTPUT AcpiGbl_LowestStackPointer = ACPI_SIZE_MAX; #endif Index: contrib/dev/acpica/utinit.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/utinit.c,v retrieving revision 1.1.1.13 diff -u -r1.1.1.13 utinit.c --- contrib/dev/acpica/utinit.c 9 Jul 2002 17:51:31 -0000 1.1.1.13 +++ contrib/dev/acpica/utinit.c 22 Aug 2002 10:07:15 -0000 @@ -301,13 +301,13 @@ AcpiGbl_Shutdown = TRUE; ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Shutting down ACPI Subsystem...\n")); - /* Close the Namespace */ - - AcpiNsTerminate (); - /* Close the AcpiEvent Handling */ AcpiEvTerminate (); + + /* Close the Namespace */ + + AcpiNsTerminate (); /* Close the globals */ Index: contrib/dev/acpica/utmisc.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/utmisc.c,v retrieving revision 1.1.1.12 diff -u -r1.1.1.12 utmisc.c --- contrib/dev/acpica/utmisc.c 9 Jul 2002 17:51:31 -0000 1.1.1.12 +++ contrib/dev/acpica/utmisc.c 22 Aug 2002 10:07:15 -0000 @@ -201,8 +201,7 @@ } - -#ifdef ACPI_DEBUG +#ifdef ACPI_DEBUG_OUTPUT /******************************************************************************* * * FUNCTION: AcpiUtDisplayInitPathname Index: contrib/dev/acpica/utxface.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/utxface.c,v retrieving revision 1.1.1.15 diff -u -r1.1.1.15 utxface.c --- contrib/dev/acpica/utxface.c 30 Jul 2002 19:33:39 -0000 1.1.1.15 +++ contrib/dev/acpica/utxface.c 22 Aug 2002 10:07:16 -0000 @@ -260,6 +260,8 @@ { ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "[Init] Going into ACPI mode\n")); + AcpiGbl_OriginalMode = AcpiHwGetMode(); + Status = AcpiEnable (); if (ACPI_FAILURE (Status)) { @@ -309,7 +311,7 @@ * * RETURN: Status * - * DESCRIPTION: Completes namespace initialization by initializing device + * DESCRIPTION: Completes namespace initialization by initializing device * objects and executing AML code for Regions, buffers, etc. * ******************************************************************************/ @@ -401,7 +403,7 @@ AcpiUtMutexTerminate (); -#ifdef ENABLE_DEBUGGER +#ifdef ACPI_DEBUGGER /* Shut down the debugger */ Index: dev/acpica/acpi.c =================================================================== RCS file: /home/ncvs/src/sys/dev/acpica/acpi.c,v retrieving revision 1.68 diff -u -r1.68 acpi.c --- dev/acpica/acpi.c 12 Aug 2002 22:36:18 -0000 1.68 +++ dev/acpica/acpi.c 22 Aug 2002 12:00:19 -0000 @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.68 2002/08/12 22:36:18 imp Exp $ + * $FreeBSD$ */ #include "opt_acpi.h" @@ -208,7 +208,7 @@ { device_t child; int error; -#ifdef ENABLE_DEBUGGER +#ifdef ACPI_DEBUGGER char *debugpoint; #endif @@ -238,7 +238,7 @@ /* * Start up the ACPI CA subsystem. */ -#ifdef ENABLE_DEBUGGER +#ifdef ACPI_DEBUGGER debugpoint = getenv("debug.acpi.debugger"); if (debugpoint) { if (!strcmp(debugpoint, "init")) @@ -250,7 +250,7 @@ printf("ACPI: initialisation failed: %s\n", AcpiFormatException(error)); return_VOID; } -#ifdef ENABLE_DEBUGGER +#ifdef ACPI_DEBUGGER debugpoint = getenv("debug.acpi.debugger"); if (debugpoint) { if (!strcmp(debugpoint, "tables")) @@ -314,7 +314,7 @@ int error; UINT32 flags; -#ifdef ENABLE_DEBUGGER +#ifdef ACPI_DEBUGGER char *debugpoint; #endif @@ -324,7 +324,7 @@ bzero(sc, sizeof(*sc)); sc->acpi_dev = dev; -#ifdef ENABLE_DEBUGGER +#ifdef ACPI_DEBUGGER debugpoint = getenv("debug.acpi.debugger"); if (debugpoint) { if (!strcmp(debugpoint, "spaces")) @@ -371,7 +371,7 @@ * XXX We should arrange for the object init pass after we have attached all our * child devices, but on many systems it works here. */ -#ifdef ENABLE_DEBUGGER +#ifdef ACPI_DEBUGGER debugpoint = getenv("debug.acpi.debugger"); if (debugpoint) { if (!strcmp(debugpoint, "enable")) @@ -441,7 +441,7 @@ /* * Scan the namespace and attach/initialise children. */ -#ifdef ENABLE_DEBUGGER +#ifdef ACPI_DEBUGGER debugpoint = getenv("debug.acpi.debugger"); if (debugpoint) { if (!strcmp(debugpoint, "probe")) @@ -478,7 +478,7 @@ sc->acpi_dev_t = make_dev(&acpi_cdevsw, 0, 0, 5, 0660, "acpi"); sc->acpi_dev_t->si_drv1 = sc; -#ifdef ENABLE_DEBUGGER +#ifdef ACPI_DEBUGGER debugpoint = getenv("debug.acpi.debugger"); if (debugpoint) { if (!strcmp(debugpoint, "running")) @@ -1931,8 +1931,9 @@ {"ACPI_DISPATCHER", ACPI_DISPATCHER}, {"ACPI_EXECUTER", ACPI_EXECUTER}, {"ACPI_RESOURCES", ACPI_RESOURCES}, - {"ACPI_DEBUGGER", ACPI_DEBUGGER}, + {"ACPI_CA_DEBUGGER", ACPI_CA_DEBUGGER}, {"ACPI_OS_SERVICES", ACPI_OS_SERVICES}, + {"ACPI_CA_DISASSEMBLER", ACPI_CA_DISASSEMBLER}, {"ACPI_BUS", ACPI_BUS}, {"ACPI_SYSTEM", ACPI_SYSTEM}, @@ -1958,27 +1959,39 @@ {"ACPI_LV_FATAL", ACPI_LV_FATAL}, {"ACPI_LV_DEBUG_OBJECT", ACPI_LV_DEBUG_OBJECT}, {"ACPI_LV_ALL_EXCEPTIONS", ACPI_LV_ALL_EXCEPTIONS}, - {"ACPI_LV_THREADS", ACPI_LV_THREADS}, + + /* Trace verbosity level 1 [Standard Trace Level] */ {"ACPI_LV_PARSE", ACPI_LV_PARSE}, - {"ACPI_LV_DISPATCH", ACPI_LV_DISPATCH}, {"ACPI_LV_LOAD", ACPI_LV_LOAD}, + {"ACPI_LV_DISPATCH", ACPI_LV_DISPATCH}, {"ACPI_LV_EXEC", ACPI_LV_EXEC}, {"ACPI_LV_NAMES", ACPI_LV_NAMES}, {"ACPI_LV_OPREGION", ACPI_LV_OPREGION}, {"ACPI_LV_BFIELD", ACPI_LV_BFIELD}, {"ACPI_LV_TABLES", ACPI_LV_TABLES}, - {"ACPI_LV_FUNCTIONS", ACPI_LV_FUNCTIONS}, {"ACPI_LV_VALUES", ACPI_LV_VALUES}, {"ACPI_LV_OBJECTS", ACPI_LV_OBJECTS}, - {"ACPI_LV_ALLOCATIONS", ACPI_LV_ALLOCATIONS}, {"ACPI_LV_RESOURCES", ACPI_LV_RESOURCES}, - {"ACPI_LV_IO", ACPI_LV_IO}, - {"ACPI_LV_INTERRUPTS", ACPI_LV_INTERRUPTS}, {"ACPI_LV_USER_REQUESTS", ACPI_LV_USER_REQUESTS}, {"ACPI_LV_PACKAGE", ACPI_LV_PACKAGE}, - {"ACPI_LV_MUTEX", ACPI_LV_MUTEX}, {"ACPI_LV_INIT", ACPI_LV_INIT}, + {"ACPI_LV_VERBOSITY1", ACPI_LV_VERBOSITY1}, + + /* Trace verbosity level 2 [Function tracing and memory allocation] */ + {"ACPI_LV_ALLOCATIONS", ACPI_LV_ALLOCATIONS}, + {"ACPI_LV_FUNCTIONS", ACPI_LV_FUNCTIONS}, + {"ACPI_LV_OPTIMIZATIONS", ACPI_LV_OPTIMIZATIONS}, + {"ACPI_LV_VERBOSITY2", ACPI_LV_VERBOSITY2}, {"ACPI_LV_ALL", ACPI_LV_ALL}, + + /* Trace verbosity level 3 [Threading, I/O, and Interrupts] */ + {"ACPI_LV_MUTEX", ACPI_LV_MUTEX}, + {"ACPI_LV_THREADS", ACPI_LV_THREADS}, + {"ACPI_LV_IO", ACPI_LV_IO}, + {"ACPI_LV_INTERRUPTS", ACPI_LV_INTERRUPTS}, + {"ACPI_LV_VERBOSITY3", ACPI_LV_VERBOSITY3}, + + /* Exceptionally verbose output -- also used in the global "DebugLevel" */ {"ACPI_LV_AML_DISASSEMBLE", ACPI_LV_AML_DISASSEMBLE}, {"ACPI_LV_VERBOSE_INFO", ACPI_LV_VERBOSE_INFO}, {"ACPI_LV_FULL_TABLES", ACPI_LV_FULL_TABLES}, Index: dev/acpica/acpi_acad.c =================================================================== RCS file: /home/ncvs/src/sys/dev/acpica/acpi_acad.c,v retrieving revision 1.12 diff -u -r1.12 acpi_acad.c --- dev/acpica/acpi_acad.c 4 Mar 2002 18:45:46 -0000 1.12 +++ dev/acpica/acpi_acad.c 4 Mar 2002 18:45:46 -0000 @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_acad.c,v 1.12 2002/03/04 18:45:46 iwasaki Exp $ + * $FreeBSD$ */ #include "opt_acpi.h" Index: dev/acpica/acpi_battery.c =================================================================== RCS file: /home/ncvs/src/sys/dev/acpica/acpi_battery.c,v retrieving revision 1.5 diff -u -r1.5 acpi_battery.c --- dev/acpica/acpi_battery.c 8 Jan 2002 06:45:56 -0000 1.5 +++ dev/acpica/acpi_battery.c 8 Jan 2002 06:45:56 -0000 @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_battery.c,v 1.5 2002/01/08 06:45:56 msmith Exp $ + * $FreeBSD$ */ #include "opt_acpi.h" /* XXX trim includes */ Index: dev/acpica/acpi_button.c =================================================================== RCS file: /home/ncvs/src/sys/dev/acpica/acpi_button.c,v retrieving revision 1.11 diff -u -r1.11 acpi_button.c --- dev/acpica/acpi_button.c 22 Jul 2002 12:52:54 -0000 1.11 +++ dev/acpica/acpi_button.c 22 Jul 2002 12:52:54 -0000 @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_button.c,v 1.11 2002/07/22 12:52:54 iwasaki Exp $ + * $FreeBSD$ */ #include "opt_acpi.h" Index: dev/acpica/acpi_cmbat.c =================================================================== RCS file: /home/ncvs/src/sys/dev/acpica/acpi_cmbat.c,v retrieving revision 1.18 diff -u -r1.18 acpi_cmbat.c --- dev/acpica/acpi_cmbat.c 21 Aug 2002 15:01:53 -0000 1.18 +++ dev/acpica/acpi_cmbat.c 21 Aug 2002 15:01:53 -0000 @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_cmbat.c,v 1.18 2002/08/21 15:01:53 jhb Exp $ + * $FreeBSD$ */ #include "opt_acpi.h" Index: dev/acpica/acpi_cpu.c =================================================================== RCS file: /home/ncvs/src/sys/dev/acpica/acpi_cpu.c,v retrieving revision 1.13 diff -u -r1.13 acpi_cpu.c --- dev/acpica/acpi_cpu.c 19 May 2002 06:16:45 -0000 1.13 +++ dev/acpica/acpi_cpu.c 19 May 2002 06:16:45 -0000 @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.13 2002/05/19 06:16:45 peter Exp $ + * $FreeBSD$ */ #include "opt_acpi.h" Index: dev/acpica/acpi_ec.c =================================================================== RCS file: /home/ncvs/src/sys/dev/acpica/acpi_ec.c,v retrieving revision 1.26 diff -u -r1.26 acpi_ec.c --- dev/acpica/acpi_ec.c 2 Jul 2002 03:38:07 -0000 1.26 +++ dev/acpica/acpi_ec.c 2 Jul 2002 03:38:07 -0000 @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.26 2002/07/02 03:38:07 takawata Exp $ + * $FreeBSD$ */ /****************************************************************************** * Index: dev/acpica/acpi_lid.c =================================================================== RCS file: /home/ncvs/src/sys/dev/acpica/acpi_lid.c,v retrieving revision 1.11 diff -u -r1.11 acpi_lid.c --- dev/acpica/acpi_lid.c 22 Jul 2002 12:52:54 -0000 1.11 +++ dev/acpica/acpi_lid.c 22 Jul 2002 12:52:54 -0000 @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_lid.c,v 1.11 2002/07/22 12:52:54 iwasaki Exp $ + * $FreeBSD$ */ #include "opt_acpi.h" Index: dev/acpica/acpi_pcib.c =================================================================== RCS file: /home/ncvs/src/sys/dev/acpica/acpi_pcib.c,v retrieving revision 1.21 diff -u -r1.21 acpi_pcib.c --- dev/acpica/acpi_pcib.c 19 May 2002 06:16:45 -0000 1.21 +++ dev/acpica/acpi_pcib.c 19 May 2002 06:16:45 -0000 @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.21 2002/05/19 06:16:45 peter Exp $ + * $FreeBSD$ */ #include "opt_acpi.h" #include Index: dev/acpica/acpi_powerres.c =================================================================== RCS file: /home/ncvs/src/sys/dev/acpica/acpi_powerres.c,v retrieving revision 1.12 diff -u -r1.12 acpi_powerres.c --- dev/acpica/acpi_powerres.c 19 May 2002 06:16:45 -0000 1.12 +++ dev/acpica/acpi_powerres.c 19 May 2002 06:16:45 -0000 @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_powerres.c,v 1.12 2002/05/19 06:16:45 peter Exp $ + * $FreeBSD$ */ #include "opt_acpi.h" /* XXX trim includes */ Index: dev/acpica/acpi_resource.c =================================================================== RCS file: /home/ncvs/src/sys/dev/acpica/acpi_resource.c,v retrieving revision 1.14 diff -u -r1.14 acpi_resource.c --- dev/acpica/acpi_resource.c 19 May 2002 06:16:45 -0000 1.14 +++ dev/acpica/acpi_resource.c 19 May 2002 06:16:45 -0000 @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_resource.c,v 1.14 2002/05/19 06:16:45 peter Exp $ + * $FreeBSD$ */ #include "opt_acpi.h" Index: dev/acpica/acpi_thermal.c =================================================================== RCS file: /home/ncvs/src/sys/dev/acpica/acpi_thermal.c,v retrieving revision 1.26 diff -u -r1.26 acpi_thermal.c --- dev/acpica/acpi_thermal.c 25 May 2002 11:18:02 -0000 1.26 +++ dev/acpica/acpi_thermal.c 25 May 2002 11:18:02 -0000 @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.26 2002/05/25 11:18:02 bde Exp $ + * $FreeBSD$ */ #include "opt_acpi.h" Index: dev/acpica/acpi_timer.c =================================================================== RCS file: /home/ncvs/src/sys/dev/acpica/acpi_timer.c,v retrieving revision 1.19 diff -u -r1.19 acpi_timer.c --- dev/acpica/acpi_timer.c 19 May 2002 06:16:45 -0000 1.19 +++ dev/acpica/acpi_timer.c 19 May 2002 06:16:45 -0000 @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_timer.c,v 1.19 2002/05/19 06:16:45 peter Exp $ + * $FreeBSD$ */ #include "opt_acpi.h" #include Index: dev/acpica/acpica_support.c =================================================================== RCS file: /home/ncvs/src/sys/dev/acpica/acpica_support.c,v retrieving revision 1.6 diff -u -r1.6 acpica_support.c --- dev/acpica/acpica_support.c 9 Jul 2002 17:53:54 -0000 1.6 +++ dev/acpica/acpica_support.c 9 Jul 2002 17:53:54 -0000 @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpica_support.c,v 1.6 2002/07/09 17:53:54 iwasaki Exp $ + * $FreeBSD$ */ #include "acpi.h" Index: dev/acpica/acpica_support.h =================================================================== RCS file: /home/ncvs/src/sys/dev/acpica/acpica_support.h,v retrieving revision 1.1 diff -u -r1.1 acpica_support.h --- dev/acpica/acpica_support.h 6 Nov 2001 15:00:19 -0000 1.1 +++ dev/acpica/acpica_support.h 6 Nov 2001 15:00:19 -0000 @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpica_support.h,v 1.1 2001/11/06 15:00:19 iwasaki Exp $ + * $FreeBSD$ */ #include "acpi.h" Index: dev/acpica/acpiio.h =================================================================== RCS file: /home/ncvs/src/sys/dev/acpica/acpiio.h,v retrieving revision 1.6 diff -u -r1.6 acpiio.h --- dev/acpica/acpiio.h 9 Aug 2002 07:08:53 -0000 1.6 +++ dev/acpica/acpiio.h 9 Aug 2002 07:08:53 -0000 @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpiio.h,v 1.6 2002/08/09 07:08:53 iwasaki Exp $ + * $FreeBSD$ */ /* Index: dev/acpica/acpivar.h =================================================================== RCS file: /home/ncvs/src/sys/dev/acpica/acpivar.h,v retrieving revision 1.32 diff -u -r1.32 acpivar.h --- dev/acpica/acpivar.h 22 Jul 2002 12:52:54 -0000 1.32 +++ dev/acpica/acpivar.h 22 Aug 2002 12:00:19 -0000 @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.32 2002/07/22 12:52:54 iwasaki Exp $ + * $FreeBSD$ */ #include "bus_if.h" @@ -230,7 +230,7 @@ return(t); } -#ifdef ENABLE_DEBUGGER +#ifdef ACPI_DEBUGGER extern void acpi_EnterDebugger(void); #endif Index: dev/acpica/Osd/OsdDebug.c =================================================================== RCS file: /home/ncvs/src/sys/dev/acpica/Osd/OsdDebug.c,v retrieving revision 1.3 diff -u -r1.3 OsdDebug.c --- dev/acpica/Osd/OsdDebug.c 22 Dec 2001 16:05:38 -0000 1.3 +++ dev/acpica/Osd/OsdDebug.c 22 Dec 2001 16:05:38 -0000 @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/Osd/OsdDebug.c,v 1.3 2001/12/22 16:05:38 iwasaki Exp $ + * $FreeBSD$ */ /* Index: dev/acpica/Osd/OsdHardware.c =================================================================== RCS file: /home/ncvs/src/sys/dev/acpica/Osd/OsdHardware.c,v retrieving revision 1.5 diff -u -r1.5 OsdHardware.c --- dev/acpica/Osd/OsdHardware.c 19 Mar 2002 11:01:52 -0000 1.5 +++ dev/acpica/Osd/OsdHardware.c 19 Mar 2002 11:01:52 -0000 @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/Osd/OsdHardware.c,v 1.5 2002/03/19 11:01:52 peter Exp $ + * $FreeBSD$ */ /* Index: dev/acpica/Osd/OsdInterrupt.c =================================================================== RCS file: /home/ncvs/src/sys/dev/acpica/Osd/OsdInterrupt.c,v retrieving revision 1.11 diff -u -r1.11 OsdInterrupt.c --- dev/acpica/Osd/OsdInterrupt.c 19 May 2002 06:16:47 -0000 1.11 +++ dev/acpica/Osd/OsdInterrupt.c 19 May 2002 06:16:47 -0000 @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/Osd/OsdInterrupt.c,v 1.11 2002/05/19 06:16:47 peter Exp $ + * $FreeBSD$ */ /* Index: dev/acpica/Osd/OsdMemory.c =================================================================== RCS file: /home/ncvs/src/sys/dev/acpica/Osd/OsdMemory.c,v retrieving revision 1.8 diff -u -r1.8 OsdMemory.c --- dev/acpica/Osd/OsdMemory.c 19 Mar 2002 11:01:52 -0000 1.8 +++ dev/acpica/Osd/OsdMemory.c 19 Mar 2002 11:01:52 -0000 @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/Osd/OsdMemory.c,v 1.8 2002/03/19 11:01:52 peter Exp $ + * $FreeBSD$ */ /* Index: dev/acpica/Osd/OsdSchedule.c =================================================================== RCS file: /home/ncvs/src/sys/dev/acpica/Osd/OsdSchedule.c,v retrieving revision 1.20 diff -u -r1.20 OsdSchedule.c --- dev/acpica/Osd/OsdSchedule.c 19 May 2002 06:16:47 -0000 1.20 +++ dev/acpica/Osd/OsdSchedule.c 19 May 2002 06:16:47 -0000 @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/Osd/OsdSchedule.c,v 1.20 2002/05/19 06:16:47 peter Exp $ + * $FreeBSD$ */ /* Index: dev/acpica/Osd/OsdStream.c =================================================================== RCS file: /home/ncvs/src/sys/dev/acpica/Osd/OsdStream.c,v retrieving revision 1.2 diff -u -r1.2 OsdStream.c --- dev/acpica/Osd/OsdStream.c 23 Feb 2002 05:32:51 -0000 1.2 +++ dev/acpica/Osd/OsdStream.c 23 Feb 2002 05:32:51 -0000 @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/Osd/OsdStream.c,v 1.2 2002/02/23 05:32:51 msmith Exp $ + * $FreeBSD$ */ /* Index: dev/acpica/Osd/OsdSynch.c =================================================================== RCS file: /home/ncvs/src/sys/dev/acpica/Osd/OsdSynch.c,v retrieving revision 1.14 diff -u -r1.14 OsdSynch.c --- dev/acpica/Osd/OsdSynch.c 6 Jul 2002 13:59:59 -0000 1.14 +++ dev/acpica/Osd/OsdSynch.c 6 Jul 2002 13:59:59 -0000 @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/Osd/OsdSynch.c,v 1.14 2002/07/06 13:59:59 iwasaki Exp $ + * $FreeBSD$ */ /* Index: dev/acpica/Osd/OsdTable.c =================================================================== RCS file: /home/ncvs/src/sys/dev/acpica/Osd/OsdTable.c,v retrieving revision 1.2 diff -u -r1.2 OsdTable.c --- dev/acpica/Osd/OsdTable.c 30 Jul 2002 19:35:30 -0000 1.2 +++ dev/acpica/Osd/OsdTable.c 30 Jul 2002 19:35:30 -0000 @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/Osd/OsdTable.c,v 1.2 2002/07/30 19:35:30 iwasaki Exp $ + * $FreeBSD$ */ /*