Moved ReportNsError to the Namespace manager

date	2002.10.02.17.10.00;	author rmoore1;	state Exp;
This commit is contained in:
aystarik 2005-06-29 19:48:52 +00:00
parent 2c531b4189
commit 8ab3e5ab6a
2 changed files with 71 additions and 45 deletions

View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acmacros.h - C macros for the entire subsystem.
* $Revision: 1.129 $
* $Revision: 1.130 $
*
*****************************************************************************/
@ -456,7 +456,7 @@
AcpiOsPrintf ACPI_PARAM_LIST(fp);}
#define ACPI_REPORT_WARNING(fp) {AcpiUtReportWarning(_THIS_MODULE,__LINE__,_COMPONENT); \
AcpiOsPrintf ACPI_PARAM_LIST(fp);}
#define ACPI_REPORT_NSERROR(s,e) AcpiUtReportNsError(_THIS_MODULE,__LINE__,_COMPONENT, s, e);
#define ACPI_REPORT_NSERROR(s,e) AcpiNsReportError(_THIS_MODULE,__LINE__,_COMPONENT, s, e);
#else
@ -466,7 +466,7 @@
AcpiOsPrintf ACPI_PARAM_LIST(fp);}
#define ACPI_REPORT_WARNING(fp) {AcpiUtReportWarning("ACPI",__LINE__,_COMPONENT); \
AcpiOsPrintf ACPI_PARAM_LIST(fp);}
#define ACPI_REPORT_NSRROR(s,e) AcpiUtReportNsError("ACPI",__LINE__,_COMPONENT, s, e);
#define ACPI_REPORT_NSERROR(s,e) AcpiNsReportError("ACPI",__LINE__,_COMPONENT, s, e);
#endif

View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acnamesp.h - Namespace subcomponent prototypes and defines
* $Revision: 1.118 $
* $Revision: 1.127 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, 2000, 2001, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* All rights reserved.
*
* 2. License
@ -120,37 +120,37 @@
/* To search the entire name space, pass this as SearchBase */
#define NS_ALL ((ACPI_HANDLE)0)
#define ACPI_NS_ALL ((ACPI_HANDLE)0)
/*
* Elements of AcpiNsProperties are bit significant
* and should be one-to-one with values of ACPI_OBJECT_TYPE
*/
#define NSP_NORMAL 0
#define NSP_NEWSCOPE 1 /* a definition of this type opens a name scope */
#define NSP_LOCAL 2 /* suppress search of enclosing scopes */
#define ACPI_NS_NORMAL 0
#define ACPI_NS_NEWSCOPE 1 /* a definition of this type opens a name scope */
#define ACPI_NS_LOCAL 2 /* suppress search of enclosing scopes */
/* Definitions of the predefined namespace names */
#define ACPI_UNKNOWN_NAME (UINT32) 0x3F3F3F3F /* Unknown name is "????" */
#define ACPI_ROOT_NAME (UINT32) 0x2F202020 /* Root name is "/ " */
#define ACPI_SYS_BUS_NAME (UINT32) 0x5F53425F /* Sys bus name is "_SB_" */
#define ACPI_UNKNOWN_NAME (UINT32) 0x3F3F3F3F /* Unknown name is "????" */
#define ACPI_ROOT_NAME (UINT32) 0x5F5F5F5C /* Root name is "\___" */
#define ACPI_SYS_BUS_NAME (UINT32) 0x5F53425F /* Sys bus name is "_SB_" */
#define NS_ROOT_PATH "\\"
#define NS_SYSTEM_BUS "_SB_"
#define ACPI_NS_ROOT_PATH "\\"
#define ACPI_NS_SYSTEM_BUS "_SB_"
/* Flags for AcpiNsLookup, AcpiNsSearchAndEnter */
#define NS_NO_UPSEARCH 0
#define NS_SEARCH_PARENT 0x01
#define NS_DONT_OPEN_SCOPE 0x02
#define NS_NO_PEER_SEARCH 0x04
#define NS_ERROR_IF_FOUND 0x08
#define ACPI_NS_NO_UPSEARCH 0
#define ACPI_NS_SEARCH_PARENT 0x01
#define ACPI_NS_DONT_OPEN_SCOPE 0x02
#define ACPI_NS_NO_PEER_SEARCH 0x04
#define ACPI_NS_ERROR_IF_FOUND 0x08
#define NS_WALK_UNLOCK TRUE
#define NS_WALK_NO_UNLOCK FALSE
#define ACPI_NS_WALK_UNLOCK TRUE
#define ACPI_NS_WALK_NO_UNLOCK FALSE
ACPI_STATUS
@ -185,7 +185,7 @@ AcpiNsInitOneObject (
ACPI_STATUS
AcpiNsWalkNamespace (
ACPI_OBJECT_TYPE8 Type,
ACPI_OBJECT_TYPE Type,
ACPI_HANDLE StartObject,
UINT32 MaxDepth,
BOOLEAN UnlockBeforeCallback,
@ -195,11 +195,11 @@ AcpiNsWalkNamespace (
ACPI_NAMESPACE_NODE *
AcpiNsGetNextNode (
ACPI_OBJECT_TYPE8 Type,
ACPI_OBJECT_TYPE Type,
ACPI_NAMESPACE_NODE *Parent,
ACPI_NAMESPACE_NODE *Child);
ACPI_STATUS
void
AcpiNsDeleteNamespaceByOwner (
UINT16 TableId);
@ -230,7 +230,6 @@ AcpiNsLoadTableByType (
* Top-level namespace access - nsaccess
*/
ACPI_STATUS
AcpiNsRootInitialize (
void);
@ -239,8 +238,8 @@ ACPI_STATUS
AcpiNsLookup (
ACPI_GENERIC_STATE *ScopeInfo,
NATIVE_CHAR *Name,
ACPI_OBJECT_TYPE8 Type,
OPERATING_MODE InterpreterMode,
ACPI_OBJECT_TYPE Type,
ACPI_INTERPRETER_MODE InterpreterMode,
UINT32 Flags,
ACPI_WALK_STATE *WalkState,
ACPI_NAMESPACE_NODE **RetNode);
@ -250,7 +249,6 @@ AcpiNsLookup (
* Named object allocation/deallocation - nsalloc
*/
ACPI_NAMESPACE_NODE *
AcpiNsCreateNode (
UINT32 Name);
@ -259,7 +257,7 @@ void
AcpiNsDeleteNode (
ACPI_NAMESPACE_NODE *Node);
ACPI_STATUS
void
AcpiNsDeleteNamespaceSubtree (
ACPI_NAMESPACE_NODE *ParentHandle);
@ -311,13 +309,27 @@ AcpiNsPrintPathname (
UINT32 NumSegments,
char *Pathname);
ACPI_STATUS
AcpiNsDumpOneDevice (
ACPI_HANDLE ObjHandle,
UINT32 Level,
void *Context,
void **ReturnValue);
void
AcpiNsDumpRootDevices (
void);
ACPI_STATUS
AcpiNsDumpOneObject (
ACPI_HANDLE ObjHandle,
UINT32 Level,
void *Context,
void **ReturnValue);
void
AcpiNsDumpObjects (
ACPI_OBJECT_TYPE8 Type,
ACPI_OBJECT_TYPE Type,
UINT8 DisplayType,
UINT32 MaxDepth,
UINT32 OwnderId,
@ -378,7 +390,13 @@ AcpiNsExistDownstreamSibling (
UINT32
AcpiNsOpensScope (
ACPI_OBJECT_TYPE8 Type);
ACPI_OBJECT_TYPE Type);
void
AcpiNsBuildExternalPath (
ACPI_NAMESPACE_NODE *Node,
ACPI_SIZE Size,
NATIVE_CHAR *NameBuffer);
NATIVE_CHAR *
AcpiNsGetExternalPathname (
@ -390,9 +408,8 @@ AcpiNsNameOfCurrentScope (
ACPI_STATUS
AcpiNsHandleToPathname (
ACPI_HANDLE ObjHandle,
ACPI_SIZE *BufSize,
NATIVE_CHAR *UserBuffer);
ACPI_HANDLE TargetHandle,
ACPI_BUFFER *Buffer);
BOOLEAN
AcpiNsPatternMatch (
@ -400,9 +417,10 @@ AcpiNsPatternMatch (
NATIVE_CHAR *SearchFor);
ACPI_STATUS
AcpiNsGetNode (
NATIVE_CHAR *Pathname,
AcpiNsGetNodeByPath (
NATIVE_CHAR *ExternalPathname,
ACPI_NAMESPACE_NODE *InPrefixNode,
UINT32 Flags,
ACPI_NAMESPACE_NODE **OutNode);
ACPI_SIZE
@ -411,14 +429,14 @@ AcpiNsGetPathnameLength (
/*
* Object management for NTEs - nsobject
* Object management for namespace nodes - nsobject
*/
ACPI_STATUS
AcpiNsAttachObject (
ACPI_NAMESPACE_NODE *Node,
ACPI_OPERAND_OBJECT *Object,
ACPI_OBJECT_TYPE8 Type);
ACPI_OBJECT_TYPE Type);
ACPI_OPERAND_OBJECT *
AcpiNsGetAttachedObject (
@ -455,8 +473,8 @@ AcpiNsSearchAndEnter (
UINT32 EntryName,
ACPI_WALK_STATE *WalkState,
ACPI_NAMESPACE_NODE *Node,
OPERATING_MODE InterpreterMode,
ACPI_OBJECT_TYPE8 Type,
ACPI_INTERPRETER_MODE InterpreterMode,
ACPI_OBJECT_TYPE Type,
UINT32 Flags,
ACPI_NAMESPACE_NODE **RetNode);
@ -464,7 +482,7 @@ ACPI_STATUS
AcpiNsSearchNode (
UINT32 EntryName,
ACPI_NAMESPACE_NODE *Node,
ACPI_OBJECT_TYPE8 Type,
ACPI_OBJECT_TYPE Type,
ACPI_NAMESPACE_NODE **RetNode);
void
@ -472,7 +490,7 @@ AcpiNsInstallNode (
ACPI_WALK_STATE *WalkState,
ACPI_NAMESPACE_NODE *ParentNode, /* Parent */
ACPI_NAMESPACE_NODE *Node, /* New Child*/
ACPI_OBJECT_TYPE8 Type);
ACPI_OBJECT_TYPE Type);
/*
@ -487,19 +505,27 @@ BOOLEAN
AcpiNsValidPathSeparator (
NATIVE_CHAR Sep);
ACPI_OBJECT_TYPE8
ACPI_OBJECT_TYPE
AcpiNsGetType (
ACPI_NAMESPACE_NODE *Node);
UINT32
AcpiNsLocal (
ACPI_OBJECT_TYPE8 Type);
ACPI_OBJECT_TYPE Type);
void
AcpiNsReportError (
NATIVE_CHAR *ModuleName,
UINT32 LineNumber,
UINT32 ComponentId,
char *InternalName,
ACPI_STATUS LookupStatus);
ACPI_STATUS
AcpiNsBuildInternalName (
ACPI_NAMESTRING_INFO *Info);
ACPI_STATUS
void
AcpiNsGetInternalNameLength (
ACPI_NAMESTRING_INFO *Info);