Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve conflict from acpica-unix-20030123.

Browse Source
This commit is contained in:
kanaoka 2003-02-13 14:16:13 +00:00
parent 34d90725e0
commit 47b9a825ab
153 changed files with 1817 additions and 1682 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/acpi/acpica/Osd/OsdStream.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: OsdStream.c,v 1.4 2002/06/15 18:02:43 thorpej Exp $ */
/* $NetBSD: OsdStream.c,v 1.5 2003/02/13 14:16:14 kanaoka Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: OsdStream.c,v 1.4 2002/06/15 18:02:43 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: OsdStream.c,v 1.5 2003/02/13 14:16:14 kanaoka Exp $");
#include "opt_ddb.h"
@ -63,7 +63,7 @@ extern int acpi_indebugger;
* Formatted stream output.
*/
void ACPI_INTERNAL_VAR_XFACE
AcpiOsPrintf(const NATIVE_CHAR *Format, ...)
AcpiOsPrintf(const char *Format, ...)
{
va_list ap;
@ -74,7 +74,7 @@ AcpiOsPrintf(const NATIVE_CHAR *Format, ...)
}
void
AcpiOsVprintf(const NATIVE_CHAR *Format, va_list Args)
AcpiOsVprintf(const char *Format, va_list Args)
{
#ifdef DDB

6
sys/dev/acpi/acpica/Subsystem/acconfig.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acconfig.h - Global configuration constants
* xRevision: 122 $
* xRevision: 127 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -145,7 +145,7 @@
/* Version string */
#define ACPI_CA_VERSION 0x20021205
#define ACPI_CA_VERSION 0x20030122
/* Version of ACPI supported */

134
sys/dev/acpi/acpica/Subsystem/acdebug.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acdebug.h - ACPI/AML debugger
* xRevision: 64 $
* xRevision: 68 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -122,7 +122,7 @@
typedef struct CommandInfo
{
NATIVE_CHAR *Name; /* Command Name */
char *Name; /* Command Name */
UINT8 MinArgs; /* Minimum arguments required */
} COMMAND_INFO;
@ -130,7 +130,7 @@ typedef struct CommandInfo
typedef struct ArgumentInfo
{
NATIVE_CHAR *Name; /* Argument Name */
char *Name; /* Argument Name */
} ARGUMENT_INFO;
@ -142,15 +142,15 @@ typedef struct ArgumentInfo
#define VERBOSE_PRINT(fp) DBTEST_OUTPUT_LEVEL(lvl) {\
AcpiOsPrintf PARAM_LIST(fp);}
#define EX_NO_SINGLE_STEP 1
#define EX_SINGLE_STEP 2
#define EX_NO_SINGLE_STEP 1
#define EX_SINGLE_STEP 2
/* Prototypes */
/*
* dbapi - external debugger interfaces
* dbxface - external debugger interfaces
*/
ACPI_STATUS
@ -167,6 +167,15 @@ AcpiDbSingleStep (
ACPI_PARSE_OBJECT *Op,
UINT32 OpType);
ACPI_STATUS
AcpiDbStartCommand (
ACPI_WALK_STATE *WalkState,
ACPI_PARSE_OBJECT *Op);
void
AcpiDbMethodEnd (
ACPI_WALK_STATE *WalkState);
/*
* dbcmds - debug commands and output routines
@ -174,16 +183,16 @@ AcpiDbSingleStep (
void
AcpiDbDisplayTableInfo (
NATIVE_CHAR *TableArg);
char *TableArg);
void
AcpiDbUnloadAcpiTable (
NATIVE_CHAR *TableArg,
NATIVE_CHAR *InstanceArg);
char *TableArg,
char *InstanceArg);
void
AcpiDbSetMethodBreakpoint (
NATIVE_CHAR *Location,
char *Location,
ACPI_WALK_STATE *WalkState,
ACPI_PARSE_OBJECT *Op);
@ -193,46 +202,46 @@ AcpiDbSetMethodCallBreakpoint (
void
AcpiDbDisassembleAml (
NATIVE_CHAR *Statements,
char *Statements,
ACPI_PARSE_OBJECT *Op);
void
AcpiDbDumpNamespace (
NATIVE_CHAR *StartArg,
NATIVE_CHAR *DepthArg);
char *StartArg,
char *DepthArg);
void
AcpiDbDumpNamespaceByOwner (
NATIVE_CHAR *OwnerArg,
NATIVE_CHAR *DepthArg);
char *OwnerArg,
char *DepthArg);
void
AcpiDbSendNotify (
NATIVE_CHAR *Name,
char *Name,
UINT32 Value);
void
AcpiDbSetMethodData (
NATIVE_CHAR *TypeArg,
NATIVE_CHAR *IndexArg,
NATIVE_CHAR *ValueArg);
char *TypeArg,
char *IndexArg,
char *ValueArg);
ACPI_STATUS
AcpiDbDisplayObjects (
NATIVE_CHAR *ObjTypeArg,
NATIVE_CHAR *DisplayCountArg);
char *ObjTypeArg,
char *DisplayCountArg);
ACPI_STATUS
AcpiDbFindNameInNamespace (
NATIVE_CHAR *NameArg);
char *NameArg);
void
AcpiDbSetScope (
NATIVE_CHAR *Name);
char *Name);
void
AcpiDbFindReferences (
NATIVE_CHAR *ObjectArg);
char *ObjectArg);
void
AcpiDbDisplayLocks (void);
@ -240,7 +249,7 @@ AcpiDbDisplayLocks (void);
void
AcpiDbDisplayResources (
NATIVE_CHAR *ObjectArg);
char *ObjectArg);
void
AcpiDbCheckIntegrity (
@ -285,8 +294,8 @@ AcpiDbDisplayMethodInfo (
void
AcpiDbDecodeAndDisplayObject (
NATIVE_CHAR *Target,
NATIVE_CHAR *OutputType);
char *Target,
char *OutputType);
void
AcpiDbDecodeNode (
@ -299,7 +308,7 @@ AcpiDbDisplayResultObject (
ACPI_STATUS
AcpiDbDisplayAllMethods (
NATIVE_CHAR *DisplayCountArg);
char *DisplayCountArg);
void
AcpiDbDisplayInternalObject (
@ -346,15 +355,15 @@ AcpiDbDecodeInternalObject (
void
AcpiDbExecute (
NATIVE_CHAR *Name,
NATIVE_CHAR **Args,
char *Name,
char **Args,
UINT32 Flags);
void
AcpiDbCreateExecutionThreads (
NATIVE_CHAR *NumThreadsArg,
NATIVE_CHAR *NumLoopsArg,
NATIVE_CHAR *MethodNameArg);
char *NumThreadsArg,
char *NumLoopsArg,
char *MethodNameArg);
ACPI_STATUS
AcpiDbExecuteMethod (
@ -373,6 +382,13 @@ void ACPI_SYSTEM_XFACE
AcpiDbMethodThread (
void *Context);
ACPI_STATUS
AcpiDbExecutionWalk (
ACPI_HANDLE ObjHandle,
UINT32 NestingLevel,
void *Context,
void **ReturnValue);
/*
* dbfileio - Debugger file I/O commands
@ -380,7 +396,7 @@ AcpiDbMethodThread (
ACPI_OBJECT_TYPE
AcpiDbMatchArgument (
NATIVE_CHAR *UserArgument,
char *UserArgument,
ARGUMENT_INFO *Arguments);
ACPI_STATUS
@ -393,15 +409,21 @@ AcpiDbCloseDebugFile (
void
AcpiDbOpenDebugFile (
NATIVE_CHAR *Name);
char *Name);
ACPI_STATUS
AcpiDbLoadAcpiTable (
NATIVE_CHAR *Filename);
char *Filename);
ACPI_STATUS
AcpiDbGetAcpiTable (
NATIVE_CHAR *Filename);
AcpiDbGetTableFromFile (
char *Filename,
ACPI_TABLE_HEADER **Table);
ACPI_STATUS
AcpiDbReadTableFromFile (
char *Filename,
ACPI_TABLE_HEADER **Table);
/*
* dbhistry - debugger HISTORY command
@ -409,14 +431,14 @@ AcpiDbGetAcpiTable (
void
AcpiDbAddToHistory (
NATIVE_CHAR *CommandLine);
char *CommandLine);
void
AcpiDbDisplayHistory (void);
NATIVE_CHAR *
char *
AcpiDbGetFromHistory (
NATIVE_CHAR *CommandNumArg);
char *CommandNumArg);
/*
@ -425,7 +447,7 @@ AcpiDbGetFromHistory (
ACPI_STATUS
AcpiDbCommandDispatch (
NATIVE_CHAR *InputBuffer,
char *InputBuffer,
ACPI_WALK_STATE *WalkState,
ACPI_PARSE_OBJECT *Op);
@ -435,25 +457,25 @@ AcpiDbExecuteThread (
ACPI_STATUS
AcpiDbUserCommands (
NATIVE_CHAR Prompt,
char Prompt,
ACPI_PARSE_OBJECT *Op);
void
AcpiDbDisplayHelp (
NATIVE_CHAR *HelpType);
char *HelpType);
NATIVE_CHAR *
char *
AcpiDbGetNextToken (
NATIVE_CHAR *String,
NATIVE_CHAR **Next);
char *String,
char **Next);
UINT32
AcpiDbGetLine (
NATIVE_CHAR *InputBuffer);
char *InputBuffer);
UINT32
AcpiDbMatchCommand (
NATIVE_CHAR *UserCommand);
char *UserCommand);
void
AcpiDbSingleThread (
@ -472,7 +494,7 @@ AcpiDbGenerateStatistics (
ACPI_STATUS
AcpiDbDisplayStatistics (
NATIVE_CHAR *TypeArg);
char *TypeArg);
ACPI_STATUS
AcpiDbClassifyOneObject (
@ -509,7 +531,7 @@ AcpiDbDumpObject (
void
AcpiDbPrepNamestring (
NATIVE_CHAR *Name);
char *Name);
ACPI_STATUS
@ -518,13 +540,7 @@ AcpiDbSecondPassParse (
ACPI_NAMESPACE_NODE *
AcpiDbLocalNsLookup (
NATIVE_CHAR *Name);
char *Name);
ACPI_STATUS
AcpiDbExecutionWalk (
ACPI_HANDLE ObjHandle,
UINT32 NestingLevel,
void *Context,
void **ReturnValue);
#endif /* __ACDEBUG_H__ */

2
sys/dev/acpi/acpica/Subsystem/acdisasm.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acdisasm.h - AML disassembler
* $Revision: 1.1.1.2 $
* xRevision: 8 $
*
*****************************************************************************/

4
sys/dev/acpi/acpica/Subsystem/acdispat.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acdispat.h - dispatcher (parser to interpreter interface)
* xRevision: 55 $
* xRevision: 56 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License

9
sys/dev/acpi/acpica/Subsystem/acenv.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acenv.h - Generation environment specific items
* xRevision: 101 $
* xRevision: 103 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -266,6 +266,7 @@
#ifndef DEBUGGER_THREADING
#ifdef ACPI_APPLICATION
#define DEBUGGER_THREADING DEBUGGER_SINGLE_THREADED
#else
#define DEBUGGER_THREADING DEBUGGER_MULTI_THREADED
#endif
@ -347,8 +348,8 @@ typedef char *va_list;
* Storage alignment properties
*/
#define _AUPBND (sizeof (NATIVE_INT) - 1)
#define _ADNBND (sizeof (NATIVE_INT) - 1)
#define _AUPBND (sizeof (ACPI_NATIVE_INT) - 1)
#define _ADNBND (sizeof (ACPI_NATIVE_INT) - 1)
/*
* Variable argument list macro definitions

4
sys/dev/acpi/acpica/Subsystem/acevents.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acevents.h - Event subcomponent prototypes and defines
* xRevision: 80 $
* xRevision: 81 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License

14
sys/dev/acpi/acpica/Subsystem/acexcep.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acexcep.h - Exception codes returned by the ACPI subsystem
* xRevision: 65 $
* xRevision: 67 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -262,7 +262,7 @@
* String versions of the exception codes above
* These strings must match the corresponding defines exactly
*/
NATIVE_CHAR const *AcpiGbl_ExceptionNames_Env[] =
char const *AcpiGbl_ExceptionNames_Env[] =
{
"AE_OK",
"AE_ERROR",
@ -295,7 +295,7 @@ NATIVE_CHAR const *AcpiGbl_ExceptionNames_Env[] =
"AE_ABORT_METHOD"
};
NATIVE_CHAR const *AcpiGbl_ExceptionNames_Pgm[] =
char const *AcpiGbl_ExceptionNames_Pgm[] =
{
"AE_BAD_PARAMETER",
"AE_BAD_CHARACTER",
@ -308,7 +308,7 @@ NATIVE_CHAR const *AcpiGbl_ExceptionNames_Pgm[] =
"AE_BAD_DECIMAL_CONSTANT"
};
NATIVE_CHAR const *AcpiGbl_ExceptionNames_Tbl[] =
char const *AcpiGbl_ExceptionNames_Tbl[] =
{
"AE_BAD_SIGNATURE",
"AE_BAD_HEADER",
@ -318,7 +318,7 @@ NATIVE_CHAR const *AcpiGbl_ExceptionNames_Tbl[] =
"AE_INVALID_TABLE_LENGTH"
};
NATIVE_CHAR const *AcpiGbl_ExceptionNames_Aml[] =
char const *AcpiGbl_ExceptionNames_Aml[] =
{
"AE_AML_ERROR",
"AE_AML_PARSE",
@ -354,7 +354,7 @@ NATIVE_CHAR const *AcpiGbl_ExceptionNames_Aml[] =
"AE_AML_CIRCULAR_REFERENCE"
};
NATIVE_CHAR const *AcpiGbl_ExceptionNames_Ctrl[] =
char const *AcpiGbl_ExceptionNames_Ctrl[] =
{
"AE_CTRL_RETURN_VALUE",
"AE_CTRL_PENDING",

4
sys/dev/acpi/acpica/Subsystem/acgcc.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acgcc.h - GCC specific defines, etc.
* xRevision: 24 $
* xRevision: 25 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License

24
sys/dev/acpi/acpica/Subsystem/acglobal.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acglobal.h - Declarations for global variables
* xRevision: 134 $
* xRevision: 136 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -232,9 +232,9 @@ ACPI_EXTERN BOOLEAN AcpiGbl_EventsInitialized;
extern BOOLEAN AcpiGbl_Shutdown;
extern UINT32 AcpiGbl_StartupFlags;
extern const UINT8 AcpiGbl_DecodeTo8bit[8];
extern const NATIVE_CHAR *AcpiGbl_DbSleepStates[ACPI_S_STATE_COUNT];
extern const char *AcpiGbl_DbSleepStates[ACPI_S_STATE_COUNT];
extern const ACPI_OPCODE_INFO AcpiGbl_AmlOpInfo[AML_NUM_OPCODES];
extern const NATIVE_CHAR *AcpiGbl_RegionTypes[ACPI_NUM_PREDEFINED_REGIONS];
extern const char *AcpiGbl_RegionTypes[ACPI_NUM_PREDEFINED_REGIONS];
/*****************************************************************************
@ -348,21 +348,21 @@ extern BOOLEAN AcpiGbl_AbortMethod;
extern BOOLEAN AcpiGbl_DbTerminateThreads;
ACPI_EXTERN int optind;
ACPI_EXTERN NATIVE_CHAR *optarg;
ACPI_EXTERN char *optarg;
ACPI_EXTERN BOOLEAN AcpiGbl_DbOpt_tables;
ACPI_EXTERN BOOLEAN AcpiGbl_DbOpt_stats;
ACPI_EXTERN BOOLEAN AcpiGbl_DbOpt_ini_methods;
ACPI_EXTERN NATIVE_CHAR *AcpiGbl_DbArgs[ACPI_DEBUGGER_MAX_ARGS];
ACPI_EXTERN NATIVE_CHAR AcpiGbl_DbLineBuf[80];
ACPI_EXTERN NATIVE_CHAR AcpiGbl_DbParsedBuf[80];
ACPI_EXTERN NATIVE_CHAR AcpiGbl_DbScopeBuf[40];
ACPI_EXTERN NATIVE_CHAR AcpiGbl_DbDebugFilename[40];
ACPI_EXTERN char *AcpiGbl_DbArgs[ACPI_DEBUGGER_MAX_ARGS];
ACPI_EXTERN char AcpiGbl_DbLineBuf[80];
ACPI_EXTERN char AcpiGbl_DbParsedBuf[80];
ACPI_EXTERN char AcpiGbl_DbScopeBuf[40];
ACPI_EXTERN char AcpiGbl_DbDebugFilename[40];
ACPI_EXTERN BOOLEAN AcpiGbl_DbOutputToFile;
ACPI_EXTERN NATIVE_CHAR *AcpiGbl_DbBuffer;
ACPI_EXTERN NATIVE_CHAR *AcpiGbl_DbFilename;
ACPI_EXTERN char *AcpiGbl_DbBuffer;
ACPI_EXTERN char *AcpiGbl_DbFilename;
ACPI_EXTERN UINT32 AcpiGbl_DbDebugLevel;
ACPI_EXTERN UINT32 AcpiGbl_DbConsoleDebugLevel;
ACPI_EXTERN ACPI_TABLE_HEADER *AcpiGbl_DbTablePtr;

4
sys/dev/acpi/acpica/Subsystem/achware.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: achware.h -- hardware specific interfaces
* xRevision: 60 $
* xRevision: 61 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License

23
sys/dev/acpi/acpica/Subsystem/acinterp.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acinterp.h - Interpreter subcomponent prototypes and defines
* xRevision: 142 $
* xRevision: 145 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -183,7 +183,8 @@ UINT32
AcpiExConvertToAscii (
ACPI_INTEGER Integer,
UINT32 Base,
UINT8 *String);
UINT8 *String,
UINT8 MaxLength);
/*
* exfield - ACPI AML (p-code) execution - field manipulation
@ -545,10 +546,10 @@ void
AcpiExDumpOperands (
ACPI_OPERAND_OBJECT **Operands,
ACPI_INTERPRETER_MODE InterpreterMode,
NATIVE_CHAR *Ident,
char *Ident,
UINT32 NumLevels,
NATIVE_CHAR *Note,
NATIVE_CHAR *ModuleName,
char *Note,
char *ModuleName,
UINT32 LineNumber);
void
@ -586,7 +587,7 @@ AcpiExOutAddress (
* exnames - interpreter/scanner name load/execute
*/
NATIVE_CHAR *
char *
AcpiExAllocateNameString (
UINT32 PrefixCount,
UINT32 NumNameSegs);
@ -598,13 +599,13 @@ AcpiExGoodChar (
ACPI_STATUS
AcpiExNameSegment (
UINT8 **InAmlAddress,
NATIVE_CHAR *NameString);
char *NameString);
ACPI_STATUS
AcpiExGetNameString (
ACPI_OBJECT_TYPE DataType,
UINT8 *InAmlAddress,
NATIVE_CHAR **OutNameString,
char **OutNameString,
UINT32 *OutNameLength);
ACPI_STATUS
@ -720,12 +721,12 @@ AcpiExDigitsNeeded (
void
AcpiExEisaIdToString (
UINT32 NumericId,
NATIVE_CHAR *OutString);
char *OutString);
void
AcpiExUnsignedIntegerToString (
ACPI_INTEGER Value,
NATIVE_CHAR *OutString);
char *OutString);
/*

320
sys/dev/acpi/acpica/Subsystem/aclocal.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: aclocal.h - Internal data types used across the ACPI subsystem
* xRevision: 182 $
* xRevision: 188 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -120,7 +120,7 @@
#define ACPI_WAIT_FOREVER 0xFFFF /* UINT16, as per ACPI spec */
typedef void* ACPI_MUTEX;
typedef void * ACPI_MUTEX;
typedef UINT32 ACPI_MUTEX_HANDLE;
@ -169,7 +169,7 @@ typedef UINT32 ACPI_MUTEX_HANDLE;
/* Names for the mutexes used in the subsystem */
static NATIVE_CHAR *AcpiGbl_MutexNames[] =
static char *AcpiGbl_MutexNames[] =
{
"ACPI_MTX_Execute",
"ACPI_MTX_Interpreter",
@ -192,7 +192,7 @@ static NATIVE_CHAR *AcpiGbl_MutexNames[] =
/* Table for the global mutexes */
typedef struct AcpiMutexInfo
typedef struct acpi_mutex_info
{
ACPI_MUTEX Mutex;
UINT32 UseCount;
@ -257,23 +257,24 @@ typedef enum
typedef union acpi_name_union
{
UINT32 Integer;
char Ascii[4];
UINT32 Integer;
char Ascii[4];
} ACPI_NAME_UNION;
typedef struct acpi_node
typedef struct acpi_namespace_node
{
UINT8 Descriptor; /* Used to differentiate object descriptor types */
UINT8 Type; /* Type associated with this name */
UINT16 OwnerId;
ACPI_NAME_UNION Name; /* ACPI Name, always 4 chars per ACPI spec */
UINT8 Descriptor; /* Used to differentiate object descriptor types */
UINT8 Type; /* Type associated with this name */
UINT16 OwnerId;
ACPI_NAME_UNION Name; /* ACPI Name, always 4 chars per ACPI spec */
union acpi_operand_obj *Object; /* Pointer to attached ACPI object (optional) */
struct acpi_node *Child; /* first child */
struct acpi_node *Peer; /* Next peer*/
UINT16 ReferenceCount; /* Current count of references and children */
UINT8 Flags;
union acpi_operand_object *Object; /* Pointer to attached ACPI object (optional) */
struct acpi_namespace_node *Child; /* first child */
struct acpi_namespace_node *Peer; /* Next peer*/
UINT16 ReferenceCount; /* Current count of references and children */
UINT8 Flags;
} ACPI_NAMESPACE_NODE;
@ -297,11 +298,11 @@ typedef struct acpi_node
/*
* ACPI Table Descriptor. One per ACPI table
*/
typedef struct AcpiTableDesc
typedef struct acpi_table_desc
{
struct AcpiTableDesc *Prev;
struct AcpiTableDesc *Next;
struct AcpiTableDesc *InstalledDesc;
struct acpi_table_desc *Prev;
struct acpi_table_desc *Next;
struct acpi_table_desc *InstalledDesc;
ACPI_TABLE_HEADER *Pointer;
UINT8 *AmlStart;
UINT64 PhysicalAddress;
@ -316,29 +317,30 @@ typedef struct AcpiTableDesc
} ACPI_TABLE_DESC;
typedef struct
typedef struct acpi_find_context
{
NATIVE_CHAR *SearchFor;
char *SearchFor;
ACPI_HANDLE *List;
UINT32 *Count;
} ACPI_FIND_CONTEXT;
typedef struct
typedef struct acpi_ns_search_data
{
ACPI_NAMESPACE_NODE *Node;
} ACPI_NS_SEARCH_DATA;
/*
* Predefined Namespace items
*/
typedef struct
typedef struct acpi_predefined_names
{
NATIVE_CHAR *Name;
char *Name;
UINT8 Type;
NATIVE_CHAR *Val;
char *Val;
} ACPI_PREDEFINED_NAMES;
@ -353,9 +355,9 @@ typedef struct
typedef struct acpi_namestring_info
{
NATIVE_CHAR *ExternalName;
NATIVE_CHAR *NextExternalChar;
NATIVE_CHAR *InternalName;
char *ExternalName;
char *NextExternalChar;
char *InternalName;
UINT32 Length;
UINT32 NumSegments;
UINT32 NumCarats;
@ -366,7 +368,7 @@ typedef struct acpi_namestring_info
/* Field creation info */
typedef struct
typedef struct acpi_create_field_info
{
ACPI_NAMESPACE_NODE *RegionNode;
ACPI_NAMESPACE_NODE *FieldNode;
@ -390,7 +392,7 @@ typedef struct
/* Information about each GPE register block */
typedef struct
typedef struct acpi_gpe_block_info
{
ACPI_GENERIC_ADDRESS *BlockAddress;
UINT16 RegisterCount;
@ -400,7 +402,7 @@ typedef struct
/* Information about a particular GPE register pair */
typedef struct
typedef struct acpi_gpe_register_info
{
ACPI_GENERIC_ADDRESS StatusAddress; /* Address of status reg */
ACPI_GENERIC_ADDRESS EnableAddress; /* Address of enable reg */
@ -418,7 +420,7 @@ typedef struct
/* Information about each particular GPE level */
typedef struct
typedef struct acpi_gpe_number_info
{
ACPI_NAMESPACE_NODE *MethodNode; /* Method node for this GPE level */
ACPI_GPE_HANDLER Handler; /* Address of handler, if any */
@ -426,11 +428,10 @@ typedef struct
UINT8 Type; /* Level or Edge */
UINT8 BitMask;
} ACPI_GPE_NUMBER_INFO;
typedef struct
typedef struct acpi_gpe_index_info
{
UINT8 NumberIndex;
@ -438,7 +439,7 @@ typedef struct
/* Information about each particular fixed event */
typedef struct
typedef struct acpi_fixed_event_handler
{
ACPI_EVENT_HANDLER Handler; /* Address of handler. */
void *Context; /* Context to be passed to handler */
@ -446,7 +447,7 @@ typedef struct
} ACPI_FIXED_EVENT_HANDLER;
typedef struct
typedef struct acpi_fixed_event_info
{
UINT8 StatusRegisterId;
UINT8 EnableRegisterId;
@ -457,7 +458,7 @@ typedef struct
/* Information used during field processing */
typedef struct
typedef struct acpi_field_info
{
UINT8 SkipField;
UINT8 FieldFlag;
@ -483,16 +484,16 @@ typedef struct
/* Forward declarations */
struct acpi_walk_state;
struct acpi_obj_mutex;
union acpi_parse_obj;
union acpi_parse_object;
#define ACPI_STATE_COMMON /* Two 32-bit fields and a pointer */\
UINT8 DataType; /* To differentiate various internal objs */\
UINT8 Flags; \
UINT16 Value; \
UINT16 State; \
UINT16 Reserved; \
void *Next; \
UINT8 DataType; /* To differentiate various internal objs */\
UINT8 Flags; \
UINT16 Value; \
UINT16 State; \
UINT16 Reserved; \
void *Next; \
typedef struct acpi_common_state
{
@ -506,7 +507,7 @@ typedef struct acpi_common_state
typedef struct acpi_update_state
{
ACPI_STATE_COMMON
union acpi_operand_obj *Object;
union acpi_operand_object *Object;
} ACPI_UPDATE_STATE;
@ -517,12 +518,12 @@ typedef struct acpi_update_state
typedef struct acpi_pkg_state
{
ACPI_STATE_COMMON
union acpi_operand_obj *SourceObject;
union acpi_operand_obj *DestObject;
struct acpi_walk_state *WalkState;
void *ThisTargetObj;
UINT32 NumPackages;
UINT16 Index;
union acpi_operand_object *SourceObject;
union acpi_operand_object *DestObject;
struct acpi_walk_state *WalkState;
void *ThisTargetObj;
UINT32 NumPackages;
UINT16 Index;
} ACPI_PKG_STATE;
@ -534,10 +535,10 @@ typedef struct acpi_pkg_state
typedef struct acpi_control_state
{
ACPI_STATE_COMMON
union acpi_parse_obj *PredicateOp;
UINT8 *AmlPredicateStart; /* Start of if/while predicate */
UINT8 *PackageEnd; /* End of if/while block */
UINT16 Opcode;
union acpi_parse_object *PredicateOp;
UINT8 *AmlPredicateStart; /* Start of if/while predicate */
UINT8 *PackageEnd; /* End of if/while block */
UINT16 Opcode;
} ACPI_CONTROL_STATE;
@ -548,7 +549,7 @@ typedef struct acpi_control_state
typedef struct acpi_scope_state
{
ACPI_STATE_COMMON
ACPI_NAMESPACE_NODE *Node;
ACPI_NAMESPACE_NODE *Node;
} ACPI_SCOPE_STATE;
@ -556,11 +557,11 @@ typedef struct acpi_scope_state
typedef struct acpi_pscope_state
{
ACPI_STATE_COMMON
union acpi_parse_obj *Op; /* current op being parsed */
UINT8 *ArgEnd; /* current argument end */
UINT8 *PkgEnd; /* current package end */
UINT32 ArgList; /* next argument to parse */
UINT32 ArgCount; /* Number of fixed arguments */
union acpi_parse_object *Op; /* current op being parsed */
UINT8 *ArgEnd; /* current argument end */
UINT8 *PkgEnd; /* current package end */
UINT32 ArgList; /* next argument to parse */
UINT32 ArgCount; /* Number of fixed arguments */
} ACPI_PSCOPE_STATE;
@ -572,10 +573,10 @@ typedef struct acpi_pscope_state
typedef struct acpi_thread_state
{
ACPI_STATE_COMMON
struct acpi_walk_state *WalkStateList; /* Head of list of WalkStates for this thread */
union acpi_operand_obj *AcquiredMutexList; /* List of all currently acquired mutexes */
UINT32 ThreadId; /* Running thread ID */
UINT16 CurrentSyncLevel; /* Mutex Sync (nested acquire) level */
struct acpi_walk_state *WalkStateList; /* Head of list of WalkStates for this thread */
union acpi_operand_object *AcquiredMutexList; /* List of all currently acquired mutexes */
UINT32 ThreadId; /* Running thread ID */
UINT16 CurrentSyncLevel; /* Mutex Sync (nested acquire) level */
} ACPI_THREAD_STATE;
@ -587,21 +588,21 @@ typedef struct acpi_thread_state
typedef struct acpi_result_values
{
ACPI_STATE_COMMON
union acpi_operand_obj *ObjDesc [ACPI_OBJ_NUM_OPERANDS];
UINT8 NumResults;
UINT8 LastInsert;
union acpi_operand_object *ObjDesc [ACPI_OBJ_NUM_OPERANDS];
UINT8 NumResults;
UINT8 LastInsert;
} ACPI_RESULT_VALUES;
typedef
ACPI_STATUS (*ACPI_PARSE_DOWNWARDS) (
struct acpi_walk_state *WalkState,
union acpi_parse_obj **OutOp);
struct acpi_walk_state *WalkState,
union acpi_parse_object **OutOp);
typedef
ACPI_STATUS (*ACPI_PARSE_UPWARDS) (
struct acpi_walk_state *WalkState);
struct acpi_walk_state *WalkState);
/*
@ -611,25 +612,25 @@ ACPI_STATUS (*ACPI_PARSE_UPWARDS) (
typedef struct acpi_notify_info
{
ACPI_STATE_COMMON
ACPI_NAMESPACE_NODE *Node;
union acpi_operand_obj *HandlerObj;
ACPI_NAMESPACE_NODE *Node;
union acpi_operand_object *HandlerObj;
} ACPI_NOTIFY_INFO;
/* Generic state is union of structs above */
typedef union acpi_gen_state
typedef union acpi_generic_state
{
ACPI_COMMON_STATE Common;
ACPI_CONTROL_STATE Control;
ACPI_UPDATE_STATE Update;
ACPI_SCOPE_STATE Scope;
ACPI_PSCOPE_STATE ParseScope;
ACPI_PKG_STATE Pkg;
ACPI_THREAD_STATE Thread;
ACPI_RESULT_VALUES Results;
ACPI_NOTIFY_INFO Notify;
ACPI_COMMON_STATE Common;
ACPI_CONTROL_STATE Control;
ACPI_UPDATE_STATE Update;
ACPI_SCOPE_STATE Scope;
ACPI_PSCOPE_STATE ParseScope;
ACPI_PKG_STATE Pkg;
ACPI_THREAD_STATE Thread;
ACPI_RESULT_VALUES Results;
ACPI_NOTIFY_INFO Notify;
} ACPI_GENERIC_STATE;
@ -642,7 +643,7 @@ typedef union acpi_gen_state
typedef
ACPI_STATUS (*ACPI_EXECUTE_OP) (
struct acpi_walk_state *WalkState);
struct acpi_walk_state *WalkState);
/*****************************************************************************
@ -657,48 +658,49 @@ ACPI_STATUS (*ACPI_EXECUTE_OP) (
typedef struct acpi_opcode_info
{
#if defined(ACPI_DISASSEMBLER) || defined(ACPI_DEBUG_OUTPUT)
NATIVE_CHAR *Name; /* Opcode name (disassembler/debug only) */
char *Name; /* Opcode name (disassembler/debug only) */
#endif
UINT32 ParseArgs; /* Grammar/Parse time arguments */
UINT32 RuntimeArgs; /* Interpret time arguments */
UINT32 Flags; /* Misc flags */
UINT8 ObjectType; /* Corresponding internal object type */
UINT8 Class; /* Opcode class */
UINT8 Type; /* Opcode type */
UINT32 ParseArgs; /* Grammar/Parse time arguments */
UINT32 RuntimeArgs; /* Interpret time arguments */
UINT32 Flags; /* Misc flags */
UINT8 ObjectType; /* Corresponding internal object type */
UINT8 Class; /* Opcode class */
UINT8 Type; /* Opcode type */
} ACPI_OPCODE_INFO;
typedef union acpi_parse_val
typedef union acpi_parse_value
{
ACPI_INTEGER Integer; /* integer constant (Up to 64 bits) */
UINT64_STRUCT Integer64; /* Structure overlay for 2 32-bit Dwords */
UINT32 Integer32; /* integer constant, 32 bits only */
UINT16 Integer16; /* integer constant, 16 bits only */
UINT8 Integer8; /* integer constant, 8 bits only */
UINT32 Size; /* bytelist or field size */
NATIVE_CHAR *String; /* NULL terminated string */
UINT8 *Buffer; /* buffer or string */
NATIVE_CHAR *Name; /* NULL terminated string */
union acpi_parse_obj *Arg; /* arguments and contained ops */
ACPI_INTEGER Integer; /* integer constant (Up to 64 bits) */
UINT64_STRUCT Integer64; /* Structure overlay for 2 32-bit Dwords */
UINT32 Integer32; /* integer constant, 32 bits only */
UINT16 Integer16; /* integer constant, 16 bits only */
UINT8 Integer8; /* integer constant, 8 bits only */
UINT32 Size; /* bytelist or field size */
char *String; /* NULL terminated string */
UINT8 *Buffer; /* buffer or string */
char *Name; /* NULL terminated string */
union acpi_parse_object *Arg; /* arguments and contained ops */
} ACPI_PARSE_VALUE;
#define ACPI_PARSE_COMMON \
UINT8 DataType; /* To differentiate various internal objs */\
UINT8 Flags; /* Type of Op */\
UINT16 AmlOpcode; /* AML opcode */\
UINT32 AmlOffset; /* offset of declaration in AML */\
union acpi_parse_obj *Parent; /* parent op */\
union acpi_parse_obj *Next; /* next op */\
UINT8 DataType; /* To differentiate various internal objs */\
UINT8 Flags; /* Type of Op */\
UINT16 AmlOpcode; /* AML opcode */\
UINT32 AmlOffset; /* offset of declaration in AML */\
union acpi_parse_object *Parent; /* parent op */\
union acpi_parse_object *Next; /* next op */\
ACPI_DISASM_ONLY_MEMBERS (\
UINT8 DisasmFlags; /* Used during AML disassembly */\
UINT8 DisasmOpcode; /* Subtype used for disassembly */\
NATIVE_CHAR AmlOpName[16]) /* op name (debug only) */\
/* NON-DEBUG members below: */\
ACPI_NAMESPACE_NODE *Node; /* for use by interpreter */\
ACPI_PARSE_VALUE Value; /* Value or args associated with the opcode */\
UINT8 DisasmFlags; /* Used during AML disassembly */\
UINT8 DisasmOpcode; /* Subtype used for disassembly */\
char AmlOpName[16]) /* op name (debug only) */\
/* NON-DEBUG members below: */\
ACPI_NAMESPACE_NODE *Node; /* for use by interpreter */\
ACPI_PARSE_VALUE Value; /* Value or args associated with the opcode */\
#define ACPI_DASM_BUFFER 0x00
#define ACPI_DASM_RESOURCE 0x01
@ -710,7 +712,7 @@ typedef union acpi_parse_val
/*
* generic operation (for example: If, While, Store)
*/
typedef struct acpi_parseobj_common
typedef struct acpi_parse_obj_common
{
ACPI_PARSE_COMMON
} ACPI_PARSE_OBJ_COMMON;
@ -720,27 +722,24 @@ typedef struct acpi_parseobj_common
* Extended Op for named ops (Scope, Method, etc.), deferred ops (Methods and OpRegions),
* and bytelists.
*/
typedef struct acpi_parseobj_named
typedef struct acpi_parse_obj_named
{
ACPI_PARSE_COMMON
UINT8 *Path;
UINT8 *Data; /* AML body or bytelist data */
UINT32 Length; /* AML length */
UINT32 Name; /* 4-byte name or zero if no name */
UINT8 *Path;
UINT8 *Data; /* AML body or bytelist data */
UINT32 Length; /* AML length */
UINT32 Name; /* 4-byte name or zero if no name */
} ACPI_PARSE_OBJ_NAMED;
/* The parse node is the fundamental element of the parse tree */
typedef struct acpi_parseobj_asl
typedef struct acpi_parse_obj_asl
{
ACPI_PARSE_COMMON
union acpi_parse_obj *Child;
union acpi_parse_obj *ParentMethod;
union acpi_parse_object *Child;
union acpi_parse_object *ParentMethod;
char *Filename;
char *ExternalName;
char *Namepath;
@ -767,7 +766,7 @@ typedef struct acpi_parseobj_asl
} ACPI_PARSE_OBJ_ASL;
typedef union acpi_parse_obj
typedef union acpi_parse_object
{
ACPI_PARSE_OBJ_COMMON Common;
ACPI_PARSE_OBJ_NAMED Named;
@ -782,16 +781,16 @@ typedef union acpi_parse_obj
*/
typedef struct acpi_parse_state
{
UINT32 AmlSize;
UINT8 *AmlStart; /* first AML byte */
UINT8 *Aml; /* next AML byte */
UINT8 *AmlEnd; /* (last + 1) AML byte */
UINT8 *PkgStart; /* current package begin */
UINT8 *PkgEnd; /* current package end */
union acpi_parse_obj *StartOp; /* root of parse tree */
struct acpi_node *StartNode;
union acpi_gen_state *Scope; /* current scope */
union acpi_parse_obj *StartScope;
UINT32 AmlSize;
UINT8 *AmlStart; /* first AML byte */
UINT8 *Aml; /* next AML byte */
UINT8 *AmlEnd; /* (last + 1) AML byte */
UINT8 *PkgStart; /* current package begin */
UINT8 *PkgEnd; /* current package end */
union acpi_parse_object *StartOp; /* root of parse tree */
struct acpi_namespace_node *StartNode;
union acpi_generic_state *Scope; /* current scope */
union acpi_parse_object *StartScope;
} ACPI_PARSE_STATE;
@ -820,11 +819,11 @@ typedef struct acpi_parse_state
#define PCI_ROOT_HID_STRING "PNP0A03"
typedef struct
typedef struct acpi_bit_register_info
{
UINT8 ParentRegister;
UINT8 BitPosition;
UINT16 AccessBitMask;
UINT8 ParentRegister;
UINT8 BitPosition;
UINT16 AccessBitMask;
} ACPI_BIT_REGISTER_INFO;
@ -956,7 +955,7 @@ typedef struct
#define ACPI_DEVICE_ID_LENGTH 0x09
typedef struct
typedef struct acpi_device_id
{
char Buffer[ACPI_DEVICE_ID_LENGTH];
@ -978,17 +977,24 @@ typedef struct
*
****************************************************************************/
typedef struct dbmethodinfo
typedef struct acpi_db_method_info
{
ACPI_HANDLE ThreadGate;
NATIVE_CHAR *Name;
NATIVE_CHAR **Args;
char *Name;
char **Args;
UINT32 Flags;
UINT32 NumLoops;
NATIVE_CHAR Pathname[128];
char Pathname[128];
} ACPI_DB_METHOD_INFO;
typedef struct acpi_integrity_info
{
UINT32 Nodes;
UINT32 Objects;
} ACPI_INTEGRITY_INFO;
#define ACPI_DB_REDIRECTABLE_OUTPUT 0x01
#define ACPI_DB_CONSOLE_OUTPUT 0x02
@ -1001,11 +1007,11 @@ typedef struct dbmethodinfo
*
****************************************************************************/
typedef struct
typedef struct acpi_debug_print_info
{
UINT32 ComponentId;
NATIVE_CHAR *ProcName;
NATIVE_CHAR *ModuleName;
char *ProcName;
char *ModuleName;
} ACPI_DEBUG_PRINT_INFO;
@ -1017,21 +1023,21 @@ typedef struct
#define ACPI_MAX_MODULE_NAME 16
#define ACPI_COMMON_DEBUG_MEM_HEADER \
struct AcpiDebugMemBlock *Previous; \
struct AcpiDebugMemBlock *Next; \
struct acpi_debug_mem_block *Previous; \
struct acpi_debug_mem_block *Next; \
UINT32 Size; \
UINT32 Component; \
UINT32 Line; \
NATIVE_CHAR Module[ACPI_MAX_MODULE_NAME]; \
char Module[ACPI_MAX_MODULE_NAME]; \
UINT8 AllocType;
typedef struct
typedef struct acpi_debug_mem_header
{
ACPI_COMMON_DEBUG_MEM_HEADER
} ACPI_DEBUG_MEM_HEADER;
typedef struct AcpiDebugMemBlock
typedef struct acpi_debug_mem_block
{
ACPI_COMMON_DEBUG_MEM_HEADER
UINT64 UserSpace;
@ -1052,7 +1058,7 @@ typedef struct AcpiDebugMemBlock
#define ACPI_NUM_MEM_LISTS 7
typedef struct
typedef struct acpi_memory_list
{
void *ListHead;
UINT16 LinkOffset;

48
sys/dev/acpi/acpica/Subsystem/acmacros.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acmacros.h - C macros for the entire subsystem.
* xRevision: 133 $
* xRevision: 137 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -175,12 +175,12 @@
/* Pointer arithmetic */
#define ACPI_PTR_ADD(t,a,b) (t *) (void *)((char *)(a) + (NATIVE_UINT)(b))
#define ACPI_PTR_DIFF(a,b) (NATIVE_UINT) ((char *)(a) - (char *)(b))
#define ACPI_PTR_ADD(t,a,b) (t *) (void *)((char *)(a) + (ACPI_NATIVE_UINT)(b))
#define ACPI_PTR_DIFF(a,b) (ACPI_NATIVE_UINT) ((char *)(a) - (char *)(b))
/* Pointer/Integer type conversions */
#define ACPI_TO_POINTER(i) ACPI_PTR_ADD (void, (void *) NULL,(NATIVE_UINT)i)
#define ACPI_TO_POINTER(i) ACPI_PTR_ADD (void, (void *) NULL,(ACPI_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_FADT_OFFSET(f) ACPI_OFFSET (FADT_DESCRIPTOR, f)
@ -269,8 +269,8 @@
/*
* Rounding macros (Power of two boundaries only)
*/
#define ACPI_ROUND_DOWN(value,boundary) (((NATIVE_UINT)(value)) & (~(((NATIVE_UINT) boundary)-1)))
#define ACPI_ROUND_UP(value,boundary) ((((NATIVE_UINT)(value)) + (((NATIVE_UINT) boundary)-1)) & (~(((NATIVE_UINT) boundary)-1)))
#define ACPI_ROUND_DOWN(value,boundary) (((ACPI_NATIVE_UINT)(value)) & (~(((ACPI_NATIVE_UINT) boundary)-1)))
#define ACPI_ROUND_UP(value,boundary) ((((ACPI_NATIVE_UINT)(value)) + (((ACPI_NATIVE_UINT) boundary)-1)) & (~(((ACPI_NATIVE_UINT) boundary)-1)))
#define ACPI_ROUND_DOWN_TO_32_BITS(a) ACPI_ROUND_DOWN(a,4)
#define ACPI_ROUND_DOWN_TO_64_BITS(a) ACPI_ROUND_DOWN(a,8)
@ -359,33 +359,17 @@
#define ACPI_IS_SINGLE_TABLE(x) (((x) & 0x01) == ACPI_TABLE_SINGLE ? 1 : 0)
/*
* Macro to check if a pointer is within an ACPI table.
* Parameter (a) is the pointer to check. Parameter (b) must be defined
* as a pointer to an ACPI_TABLE_HEADER. (b+1) then points past the header,
* and ((UINT8 *)b+b->Length) points one byte past the end of the table.
*/
#if ACPI_MACHINE_WIDTH != 16
#define ACPI_IS_IN_ACPI_TABLE(a,b) (((UINT8 *)(a) >= (UINT8 *)(b + 1)) &&\
((UINT8 *)(a) < ((UINT8 *)b + b->Length)))
#else
#define ACPI_IS_IN_ACPI_TABLE(a,b) (_segment)(a) == (_segment)(b) &&\
(((UINT8 *)(a) >= (UINT8 *)(b + 1)) &&\
((UINT8 *)(a) < ((UINT8 *)b + b->Length)))
#endif
/*
* Macros for the master AML opcode table
*/
#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}
#define ACPI_OP(Name,PArgs,IArgs,ObjType,Class,Type,Flags) {Name,(UINT32)(PArgs),(UINT32)(IArgs),(UINT32)(Flags),ObjType,Class,Type}
#else
#define ACPI_OP(Name,PArgs,IArgs,ObjType,Class,Type,Flags) {PArgs,IArgs,Flags,ObjType,Class,Type}
#define ACPI_OP(Name,PArgs,IArgs,ObjType,Class,Type,Flags) {(UINT32)(PArgs),(UINT32)(IArgs),(UINT32)(Flags),ObjType,Class,Type}
#endif
#ifdef ACPI_DISASSEMBLER
#define ACPI_DISASM_ONLY_MEMBERS(a) a;
#define ACPI_DISASM_ONLY_MEMBERS(a) a;
#else
#define ACPI_DISASM_ONLY_MEMBERS(a)
#endif
@ -425,11 +409,11 @@
* 4) Reserved field is zero
* 5) Expand address to 64 bits
*/
#define ASL_BUILD_GAS_FROM_ENTRY(a,b,c,d) {a.AddressSpaceId = (UINT8) d;\
a.RegisterBitWidth = (UINT8) ACPI_MUL_8 (b);\
a.RegisterBitOffset = 0;\
a.Reserved = 0;\
ACPI_STORE_ADDRESS (a.Address,(ACPI_PHYSICAL_ADDRESS) c);}
#define ASL_BUILD_GAS_FROM_ENTRY(a,b,c,d) do {a.AddressSpaceId = (UINT8) d;\
a.RegisterBitWidth = (UINT8) ACPI_MUL_8 (b);\
a.RegisterBitOffset = 0;\
a.Reserved = 0;\
ACPI_STORE_ADDRESS (a.Address,(ACPI_PHYSICAL_ADDRESS) c);} while (0)
/* ACPI V1.0 entries -- address space is always I/O */
@ -509,7 +493,7 @@
#define ACPI_FUNCTION_TRACE_U32(a,b) ACPI_FUNCTION_NAME(a)\
AcpiUtTraceU32(__LINE__,&_Dbg,(UINT32)b)
#define ACPI_FUNCTION_TRACE_STR(a,b) ACPI_FUNCTION_NAME(a)\
AcpiUtTraceStr(__LINE__,&_Dbg,(NATIVE_CHAR *)b)
AcpiUtTraceStr(__LINE__,&_Dbg,(char *)b)
#define ACPI_FUNCTION_ENTRY() AcpiUtTrackStackPtr()

40
sys/dev/acpi/acpica/Subsystem/acnamesp.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acnamesp.h - Namespace subcomponent prototypes and defines
* xRevision: 131 $
* xRevision: 133 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -237,7 +237,7 @@ AcpiNsRootInitialize (
ACPI_STATUS
AcpiNsLookup (
ACPI_GENERIC_STATE *ScopeInfo,
NATIVE_CHAR *Name,
char *Name,
ACPI_OBJECT_TYPE Type,
ACPI_INTERPRETER_MODE InterpreterMode,
UINT32 Flags,
@ -304,7 +304,7 @@ AcpiNsDumpEntry (
void
AcpiNsDumpPathname (
ACPI_HANDLE Handle,
NATIVE_CHAR *Msg,
char *Msg,
UINT32 Level,
UINT32 Component);
@ -352,14 +352,14 @@ AcpiNsEvaluateByHandle (
ACPI_STATUS
AcpiNsEvaluateByName (
NATIVE_CHAR *Pathname,
char *Pathname,
ACPI_OPERAND_OBJECT **Params,
ACPI_OPERAND_OBJECT **ReturnObject);
ACPI_STATUS
AcpiNsEvaluateRelative (
ACPI_NAMESPACE_NODE *PrefixNode,
NATIVE_CHAR *Pathname,
char *Pathname,
ACPI_OPERAND_OBJECT **Params,
ACPI_OPERAND_OBJECT **ReturnObject);
@ -396,13 +396,13 @@ void
AcpiNsBuildExternalPath (
ACPI_NAMESPACE_NODE *Node,
ACPI_SIZE Size,
NATIVE_CHAR *NameBuffer);
char *NameBuffer);
NATIVE_CHAR *
char *
AcpiNsGetExternalPathname (
ACPI_NAMESPACE_NODE *Node);
NATIVE_CHAR *
char *
AcpiNsNameOfCurrentScope (
ACPI_WALK_STATE *WalkState);
@ -414,11 +414,11 @@ AcpiNsHandleToPathname (
BOOLEAN
AcpiNsPatternMatch (
ACPI_NAMESPACE_NODE *ObjNode,
NATIVE_CHAR *SearchFor);
char *SearchFor);
ACPI_STATUS
AcpiNsGetNodeByPath (
NATIVE_CHAR *ExternalPathname,
char *ExternalPathname,
ACPI_NAMESPACE_NODE *InPrefixNode,
UINT32 Flags,
ACPI_NAMESPACE_NODE **OutNode);
@ -499,11 +499,11 @@ AcpiNsInstallNode (
BOOLEAN
AcpiNsValidRootPrefix (
NATIVE_CHAR Prefix);
char Prefix);
BOOLEAN
AcpiNsValidPathSeparator (
NATIVE_CHAR Sep);
char Sep);
ACPI_OBJECT_TYPE
AcpiNsGetType (
@ -515,7 +515,7 @@ AcpiNsLocal (
void
AcpiNsReportError (
NATIVE_CHAR *ModuleName,
char *ModuleName,
UINT32 LineNumber,
UINT32 ComponentId,
char *InternalName,
@ -523,7 +523,7 @@ AcpiNsReportError (
void
AcpiNsReportMethodError (
NATIVE_CHAR *ModuleName,
char *ModuleName,
UINT32 LineNumber,
UINT32 ComponentId,
char *Message,
@ -534,7 +534,7 @@ AcpiNsReportMethodError (
void
AcpiNsPrintNodePathname (
ACPI_NAMESPACE_NODE *Node,
NATIVE_CHAR *Msg);
char *Msg);
ACPI_STATUS
AcpiNsBuildInternalName (
@ -546,15 +546,15 @@ AcpiNsGetInternalNameLength (
ACPI_STATUS
AcpiNsInternalizeName (
NATIVE_CHAR *DottedName,
NATIVE_CHAR **ConvertedName);
char *DottedName,
char **ConvertedName);
ACPI_STATUS
AcpiNsExternalizeName (
UINT32 InternalNameLength,
NATIVE_CHAR *InternalName,
char *InternalName,
UINT32 *ConvertedNameLength,
NATIVE_CHAR **ConvertedName);
char **ConvertedName);
ACPI_NAMESPACE_NODE *
AcpiNsMapHandleToNode (

6
sys/dev/acpi/acpica/Subsystem/acnetbsd.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acnetbsd.h - OS specific defines, etc.
* $Revision: 1.5 $
* Name: acfreebsd.h - OS specific defines, etc.
* xRevision: 11 $
*
*****************************************************************************/
@ -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 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License

329
sys/dev/acpi/acpica/Subsystem/acobject.h
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Name: acobject.h - Definition of ACPI_OPERAND_OBJECT (Internal object only)
* xRevision: 114 $
* xRevision: 118 $
*
*****************************************************************************/
@ -10,7 +10,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -138,12 +138,12 @@
* DataType is used to differentiate between internal descriptors, and MUST
* be the first byte in this structure.
*/
#define ACPI_OBJECT_COMMON_HEADER /* SIZE/ALIGNMENT: 32 bits, one ptr plus trailing 8-bit flag */\
UINT8 Descriptor; /* To differentiate various internal objs */\
UINT8 Type; /* ACPI_OBJECT_TYPE */\
UINT16 ReferenceCount; /* For object deletion management */\
union acpi_operand_obj *NextObject; /* Objects linked to parent NS node */\
UINT8 Flags; \
#define ACPI_OBJECT_COMMON_HEADER /* SIZE/ALIGNMENT: 32 bits, one ptr plus trailing 8-bit flag */\
UINT8 Descriptor; /* To differentiate various internal objs */\
UINT8 Type; /* ACPI_OBJECT_TYPE */\
UINT16 ReferenceCount; /* For object deletion management */\
union acpi_operand_object *NextObject; /* Objects linked to parent NS node */\
UINT8 Flags; \
/* Values for flag byte above */
@ -160,34 +160,34 @@
* "Field Datum" -- a datum from the actual field object
* "Buffer Datum" -- a datum from a user buffer, read from or to be written to the field
*/
#define ACPI_COMMON_FIELD_INFO /* SIZE/ALIGNMENT: 24 bits + three 32-bit values */\
UINT8 FieldFlags; /* Access, update, and lock bits */\
UINT8 Attribute; /* From AccessAs keyword */\
UINT8 AccessByteWidth; /* Read/Write size in bytes */\
UINT32 BitLength; /* Length of field in bits */\
UINT32 BaseByteOffset; /* Byte offset within containing object */\
UINT8 StartFieldBitOffset;/* Bit offset within first field datum (0-63) */\
UINT8 DatumValidBits; /* Valid bit in first "Field datum" */\
UINT8 EndFieldValidBits; /* Valid bits in the last "field datum" */\
UINT8 EndBufferValidBits; /* Valid bits in the last "buffer datum" */\
UINT32 Value; /* Value to store into the Bank or Index register */\
ACPI_NAMESPACE_NODE *Node; /* Link back to parent node */
#define ACPI_COMMON_FIELD_INFO /* SIZE/ALIGNMENT: 24 bits + three 32-bit values */\
UINT8 FieldFlags; /* Access, update, and lock bits */\
UINT8 Attribute; /* From AccessAs keyword */\
UINT8 AccessByteWidth; /* Read/Write size in bytes */\
UINT32 BitLength; /* Length of field in bits */\
UINT32 BaseByteOffset; /* Byte offset within containing object */\
UINT8 StartFieldBitOffset;/* Bit offset within first field datum (0-63) */\
UINT8 DatumValidBits; /* Valid bit in first "Field datum" */\
UINT8 EndFieldValidBits; /* Valid bits in the last "field datum" */\
UINT8 EndBufferValidBits; /* Valid bits in the last "buffer datum" */\
UINT32 Value; /* Value to store into the Bank or Index register */\
ACPI_NAMESPACE_NODE *Node; /* Link back to parent node */
/*
* Fields common to both Strings and Buffers
*/
#define ACPI_COMMON_BUFFER_INFO \
UINT32 Length;
UINT32 Length;
/*
* Common fields for objects that support ASL notifications
*/
#define ACPI_COMMON_NOTIFY_INFO \
union acpi_operand_obj *SysHandler; /* Handler for system notifies */\
union acpi_operand_obj *DrvHandler; /* Handler for driver notifies */\
union acpi_operand_obj *AddrHandler; /* Handler for Address space */
union acpi_operand_object *SysHandler; /* Handler for system notifies */\
union acpi_operand_object *DrvHandler; /* Handler for driver notifies */\
union acpi_operand_object *AddrHandler; /* Handler for Address space */
/******************************************************************************
@ -196,52 +196,51 @@
*
*****************************************************************************/
typedef struct AcpiObjectCommon
typedef struct acpi_object_common
{
ACPI_OBJECT_COMMON_HEADER
} ACPI_OBJECT_COMMON;
typedef struct AcpiObjectInteger
typedef struct acpi_object_integer
{
ACPI_OBJECT_COMMON_HEADER
ACPI_INTEGER Value;
ACPI_INTEGER Value;
} ACPI_OBJECT_INTEGER;
typedef struct AcpiObjectString /* Null terminated, ASCII characters only */
typedef struct acpi_object_string /* Null terminated, ASCII characters only */
{
ACPI_OBJECT_COMMON_HEADER
ACPI_COMMON_BUFFER_INFO
NATIVE_CHAR *Pointer; /* String in AML stream or allocated string */
char *Pointer; /* String in AML stream or allocated string */
} ACPI_OBJECT_STRING;
typedef struct AcpiObjectBuffer
typedef struct acpi_object_buffer
{
ACPI_OBJECT_COMMON_HEADER
ACPI_COMMON_BUFFER_INFO
UINT8 *Pointer; /* Buffer in AML stream or allocated buffer */
ACPI_NAMESPACE_NODE *Node; /* Link back to parent node */
UINT8 *AmlStart;
UINT32 AmlLength;
UINT8 *Pointer; /* Buffer in AML stream or allocated buffer */
ACPI_NAMESPACE_NODE *Node; /* Link back to parent node */
UINT8 *AmlStart;
UINT32 AmlLength;
} ACPI_OBJECT_BUFFER;
typedef struct AcpiObjectPackage
typedef struct acpi_object_package
{
ACPI_OBJECT_COMMON_HEADER
UINT32 Count; /* # of elements in package */
UINT32 AmlLength;
UINT8 *AmlStart;
ACPI_NAMESPACE_NODE *Node; /* Link back to parent node */
union acpi_operand_obj **Elements; /* Array of pointers to AcpiObjects */
UINT32 Count; /* # of elements in package */
UINT32 AmlLength;
UINT8 *AmlStart;
ACPI_NAMESPACE_NODE *Node; /* Link back to parent node */
union acpi_operand_object **Elements; /* Array of pointers to AcpiObjects */
} ACPI_OBJECT_PACKAGE;
@ -252,60 +251,55 @@ typedef struct AcpiObjectPackage
*
*****************************************************************************/
typedef struct AcpiObjectEvent
typedef struct acpi_object_event
{
ACPI_OBJECT_COMMON_HEADER
void *Semaphore;
void *Semaphore;
} ACPI_OBJECT_EVENT;
#define INFINITE_CONCURRENCY 0xFF
typedef struct AcpiObjectMethod
typedef struct acpi_object_method
{
ACPI_OBJECT_COMMON_HEADER
UINT8 MethodFlags;
UINT8 ParamCount;
UINT32 AmlLength;
void *Semaphore;
UINT8 *AmlStart;
UINT8 Concurrency;
UINT8 ThreadCount;
ACPI_OWNER_ID OwningId;
UINT8 MethodFlags;
UINT8 ParamCount;
UINT32 AmlLength;
void *Semaphore;
UINT8 *AmlStart;
UINT8 Concurrency;
UINT8 ThreadCount;
ACPI_OWNER_ID OwningId;
} ACPI_OBJECT_METHOD;
typedef struct AcpiObjectMutex
typedef struct acpi_object_mutex
{
ACPI_OBJECT_COMMON_HEADER
UINT16 SyncLevel;
UINT16 AcquisitionDepth;
struct acpi_thread_state *OwnerThread;
void *Semaphore;
union acpi_operand_obj *Prev; /* Link for list of acquired mutexes */
union acpi_operand_obj *Next; /* Link for list of acquired mutexes */
ACPI_NAMESPACE_NODE *Node; /* containing object */
UINT16 SyncLevel;
UINT16 AcquisitionDepth;
struct acpi_thread_state *OwnerThread;
void *Semaphore;
union acpi_operand_object *Prev; /* Link for list of acquired mutexes */
union acpi_operand_object *Next; /* Link for list of acquired mutexes */
ACPI_NAMESPACE_NODE *Node; /* containing object */
} ACPI_OBJECT_MUTEX;
typedef struct AcpiObjectRegion
typedef struct acpi_object_region
{
ACPI_OBJECT_COMMON_HEADER
UINT8 SpaceId;
union acpi_operand_obj *AddrHandler; /* Handler for system notifies */
ACPI_NAMESPACE_NODE *Node; /* containing object */
union acpi_operand_obj *Next;
UINT32 Length;
ACPI_PHYSICAL_ADDRESS Address;
UINT8 SpaceId;
union acpi_operand_object *AddrHandler; /* Handler for system notifies */
ACPI_NAMESPACE_NODE *Node; /* containing object */
union acpi_operand_object *Next;
UINT32 Length;
ACPI_PHYSICAL_ADDRESS Address;
} ACPI_OBJECT_REGION;
@ -316,7 +310,7 @@ typedef struct AcpiObjectRegion
*
*****************************************************************************/
typedef struct AcpiObjectNotifyCommon /* COMMON NOTIFY for POWER, PROCESSOR, DEVICE, and THERMAL */
typedef struct acpi_object_notify_common /* COMMON NOTIFY for POWER, PROCESSOR, DEVICE, and THERMAL */
{
ACPI_OBJECT_COMMON_HEADER
ACPI_COMMON_NOTIFY_INFO
@ -324,7 +318,7 @@ typedef struct AcpiObjectNotifyCommon /* COMMON NOTIFY for POWER,
} ACPI_OBJECT_NOTIFY_COMMON;
typedef struct AcpiObjectDevice
typedef struct acpi_object_device
{
ACPI_OBJECT_COMMON_HEADER
ACPI_COMMON_NOTIFY_INFO
@ -332,35 +326,32 @@ typedef struct AcpiObjectDevice
} ACPI_OBJECT_DEVICE;
typedef struct AcpiObjectPowerResource
typedef struct acpi_object_power_resource
{
ACPI_OBJECT_COMMON_HEADER
ACPI_COMMON_NOTIFY_INFO
UINT32 SystemLevel;
UINT32 ResourceOrder;
UINT32 SystemLevel;
UINT32 ResourceOrder;
} ACPI_OBJECT_POWER_RESOURCE;
typedef struct AcpiObjectProcessor
typedef struct acpi_object_processor
{
ACPI_OBJECT_COMMON_HEADER
ACPI_COMMON_NOTIFY_INFO
UINT32 ProcId;
UINT32 Length;
ACPI_IO_ADDRESS Address;
UINT32 ProcId;
UINT32 Length;
ACPI_IO_ADDRESS Address;
} ACPI_OBJECT_PROCESSOR;
typedef struct AcpiObjectThermalZone
typedef struct acpi_object_thermal_zone
{
ACPI_OBJECT_COMMON_HEADER
ACPI_COMMON_NOTIFY_INFO
} ACPI_OBJECT_THERMAL_ZONE;
@ -370,36 +361,35 @@ typedef struct AcpiObjectThermalZone
*
*****************************************************************************/
typedef struct AcpiObjectFieldCommon /* COMMON FIELD (for BUFFER, REGION, BANK, and INDEX fields) */
typedef struct acpi_object_field_common /* COMMON FIELD (for BUFFER, REGION, BANK, and INDEX fields) */
{
ACPI_OBJECT_COMMON_HEADER
ACPI_COMMON_FIELD_INFO
union acpi_operand_obj *RegionObj; /* Containing Operation Region object */
/* (REGION/BANK fields only) */
union acpi_operand_object *RegionObj; /* Containing Operation Region object */
/* (REGION/BANK fields only) */
} ACPI_OBJECT_FIELD_COMMON;
typedef struct AcpiObjectRegionField
typedef struct acpi_object_region_field
{
ACPI_OBJECT_COMMON_HEADER
ACPI_COMMON_FIELD_INFO
union acpi_operand_obj *RegionObj; /* Containing OpRegion object */
union acpi_operand_object *RegionObj; /* Containing OpRegion object */
} ACPI_OBJECT_REGION_FIELD;
typedef struct AcpiObjectBankField
typedef struct acpi_object_bank_field
{
ACPI_OBJECT_COMMON_HEADER
ACPI_COMMON_FIELD_INFO
union acpi_operand_obj *RegionObj; /* Containing OpRegion object */
union acpi_operand_obj *BankObj; /* BankSelect Register object */
union acpi_operand_object *RegionObj; /* Containing OpRegion object */
union acpi_operand_object *BankObj; /* BankSelect Register object */
} ACPI_OBJECT_BANK_FIELD;
typedef struct AcpiObjectIndexField
typedef struct acpi_object_index_field
{
ACPI_OBJECT_COMMON_HEADER
ACPI_COMMON_FIELD_INFO
@ -408,21 +398,19 @@ typedef struct AcpiObjectIndexField
* No "RegionObj" pointer needed since the Index and Data registers
* are each field definitions unto themselves.
*/
union acpi_operand_obj *IndexObj; /* Index register */
union acpi_operand_obj *DataObj; /* Data register */
union acpi_operand_object *IndexObj; /* Index register */
union acpi_operand_object *DataObj; /* Data register */
} ACPI_OBJECT_INDEX_FIELD;
/* The BufferField is different in that it is part of a Buffer, not an OpRegion */
typedef struct AcpiObjectBufferField
typedef struct acpi_object_buffer_field
{
ACPI_OBJECT_COMMON_HEADER
ACPI_COMMON_FIELD_INFO
union acpi_operand_obj *BufferObj; /* Containing Buffer object */
union acpi_operand_object *BufferObj; /* Containing Buffer object */
} ACPI_OBJECT_BUFFER_FIELD;
@ -433,13 +421,12 @@ typedef struct AcpiObjectBufferField
*
*****************************************************************************/
typedef struct AcpiObjectNotifyHandler
typedef struct acpi_object_notify_handler
{
ACPI_OBJECT_COMMON_HEADER
ACPI_NAMESPACE_NODE *Node; /* Parent device */
ACPI_NOTIFY_HANDLER Handler;
void *Context;
ACPI_NAMESPACE_NODE *Node; /* Parent device */
ACPI_NOTIFY_HANDLER Handler;
void *Context;
} ACPI_OBJECT_NOTIFY_HANDLER;
@ -449,19 +436,17 @@ typedef struct AcpiObjectNotifyHandler
#define ACPI_ADDR_HANDLER_DEFAULT_INSTALLED 0x1
typedef struct AcpiObjectAddrHandler
typedef struct acpi_object_addr_handler
{
ACPI_OBJECT_COMMON_HEADER
UINT8 SpaceId;
UINT16 Hflags;
ACPI_ADR_SPACE_HANDLER Handler;
ACPI_NAMESPACE_NODE *Node; /* Parent device */
void *Context;
ACPI_ADR_SPACE_SETUP Setup;
union acpi_operand_obj *RegionList; /* regions using this handler */
union acpi_operand_obj *Next;
UINT8 SpaceId;
UINT16 Hflags;
ACPI_ADR_SPACE_HANDLER Handler;
ACPI_NAMESPACE_NODE *Node; /* Parent device */
void *Context;
ACPI_ADR_SPACE_SETUP Setup;
union acpi_operand_object *RegionList; /* regions using this handler */
union acpi_operand_object *Next;
} ACPI_OBJECT_ADDR_HANDLER;
@ -476,17 +461,15 @@ typedef struct AcpiObjectAddrHandler
* The Reference object type is used for these opcodes:
* Arg[0-6], Local[0-7], IndexOp, NameOp, ZeroOp, OneOp, OnesOp, DebugOp
*/
typedef struct AcpiObjectReference
typedef struct acpi_object_reference
{
ACPI_OBJECT_COMMON_HEADER
UINT8 TargetType; /* Used for IndexOp */
UINT16 Opcode;
UINT32 Offset; /* Used for ArgOp, LocalOp, and IndexOp */
void *Object; /* NameOp=>HANDLE to obj, IndexOp=>ACPI_OPERAND_OBJECT */
ACPI_NAMESPACE_NODE *Node;
union acpi_operand_obj **Where;
UINT8 TargetType; /* Used for IndexOp */
UINT16 Opcode;
UINT32 Offset; /* Used for ArgOp, LocalOp, and IndexOp */
void *Object; /* NameOp=>HANDLE to obj, IndexOp=>ACPI_OPERAND_OBJECT */
ACPI_NAMESPACE_NODE *Node;
union acpi_operand_object **Where;
} ACPI_OBJECT_REFERENCE;
@ -498,36 +481,36 @@ typedef struct AcpiObjectReference
*
* Currently: Region and FieldUnit types
*/
typedef struct AcpiObjectExtra
typedef struct acpi_object_extra
{
ACPI_OBJECT_COMMON_HEADER
UINT8 ByteFill1;
UINT16 WordFill1;
UINT32 AmlLength;
UINT8 *AmlStart;
ACPI_NAMESPACE_NODE *Method_REG; /* _REG method for this region (if any) */
void *RegionContext; /* Region-specific data */
UINT8 ByteFill1;
UINT16 WordFill1;
UINT32 AmlLength;
UINT8 *AmlStart;
ACPI_NAMESPACE_NODE *Method_REG; /* _REG method for this region (if any) */
void *RegionContext; /* Region-specific data */
} ACPI_OBJECT_EXTRA;
/* Additional data that can be attached to namespace nodes */
typedef struct AcpiObjectData
typedef struct acpi_object_data
{
ACPI_OBJECT_COMMON_HEADER
ACPI_OBJECT_HANDLER Handler;
void *Pointer;
ACPI_OBJECT_HANDLER Handler;
void *Pointer;
} ACPI_OBJECT_DATA;
/* Structure used when objects are cached for reuse */
typedef struct AcpiObjectCacheList
typedef struct acpi_object_cache_list
{
ACPI_OBJECT_COMMON_HEADER
union acpi_operand_obj *Next; /* Link for object cache and internal lists*/
union acpi_operand_object *Next; /* Link for object cache and internal lists*/
} ACPI_OBJECT_CACHE_LIST;
@ -538,39 +521,33 @@ typedef struct AcpiObjectCacheList
*
*****************************************************************************/
typedef union acpi_operand_obj
typedef union acpi_operand_object
{
ACPI_OBJECT_COMMON Common;
ACPI_OBJECT_INTEGER Integer;
ACPI_OBJECT_STRING String;
ACPI_OBJECT_BUFFER Buffer;
ACPI_OBJECT_PACKAGE Package;
ACPI_OBJECT_EVENT Event;
ACPI_OBJECT_METHOD Method;
ACPI_OBJECT_MUTEX Mutex;
ACPI_OBJECT_REGION Region;
ACPI_OBJECT_NOTIFY_COMMON CommonNotify;
ACPI_OBJECT_DEVICE Device;
ACPI_OBJECT_POWER_RESOURCE PowerResource;
ACPI_OBJECT_PROCESSOR Processor;
ACPI_OBJECT_THERMAL_ZONE ThermalZone;
ACPI_OBJECT_FIELD_COMMON CommonField;
ACPI_OBJECT_REGION_FIELD Field;
ACPI_OBJECT_BUFFER_FIELD BufferField;
ACPI_OBJECT_BANK_FIELD BankField;
ACPI_OBJECT_INDEX_FIELD IndexField;
ACPI_OBJECT_NOTIFY_HANDLER NotifyHandler;
ACPI_OBJECT_ADDR_HANDLER AddrHandler;
ACPI_OBJECT_REFERENCE Reference;
ACPI_OBJECT_EXTRA Extra;
ACPI_OBJECT_DATA Data;
ACPI_OBJECT_CACHE_LIST Cache;
ACPI_OBJECT_COMMON Common;
ACPI_OBJECT_INTEGER Integer;
ACPI_OBJECT_STRING String;
ACPI_OBJECT_BUFFER Buffer;
ACPI_OBJECT_PACKAGE Package;
ACPI_OBJECT_EVENT Event;
ACPI_OBJECT_METHOD Method;
ACPI_OBJECT_MUTEX Mutex;
ACPI_OBJECT_REGION Region;
ACPI_OBJECT_NOTIFY_COMMON CommonNotify;
ACPI_OBJECT_DEVICE Device;
ACPI_OBJECT_POWER_RESOURCE PowerResource;
ACPI_OBJECT_PROCESSOR Processor;
ACPI_OBJECT_THERMAL_ZONE ThermalZone;
ACPI_OBJECT_FIELD_COMMON CommonField;
ACPI_OBJECT_REGION_FIELD Field;
ACPI_OBJECT_BUFFER_FIELD BufferField;
ACPI_OBJECT_BANK_FIELD BankField;
ACPI_OBJECT_INDEX_FIELD IndexField;
ACPI_OBJECT_NOTIFY_HANDLER NotifyHandler;
ACPI_OBJECT_ADDR_HANDLER AddrHandler;
ACPI_OBJECT_REFERENCE Reference;
ACPI_OBJECT_EXTRA Extra;
ACPI_OBJECT_DATA Data;
ACPI_OBJECT_CACHE_LIST Cache;
} ACPI_OPERAND_OBJECT;
@ -584,7 +561,7 @@ typedef union acpi_operand_obj
/* Object descriptor types */
#define ACPI_DESC_TYPE_CACHED 0x11 /* Used only when object is cached */
#define ACPI_DESC_TYPE_CACHED 0x11 /* Used only when object is cached */
#define ACPI_DESC_TYPE_STATE 0x20
#define ACPI_DESC_TYPE_STATE_UPDATE 0x21
#define ACPI_DESC_TYPE_STATE_PACKAGE 0x22
@ -601,12 +578,12 @@ typedef union acpi_operand_obj
#define ACPI_DESC_TYPE_NAMED 0xAA
typedef union acpi_desc
typedef union acpi_descriptor
{
UINT8 DescriptorId; /* To differentiate various internal objs */\
ACPI_OPERAND_OBJECT Object;
ACPI_NAMESPACE_NODE Node;
ACPI_PARSE_OBJECT Op;
UINT8 DescriptorId; /* To differentiate various internal objs */\
ACPI_OPERAND_OBJECT Object;
ACPI_NAMESPACE_NODE Node;
ACPI_PARSE_OBJECT Op;
} ACPI_DESCRIPTOR;

6
sys/dev/acpi/acpica/Subsystem/acoutput.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acoutput.h -- debug output
* xRevision: 91 $
* xRevision: 93 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -209,7 +209,7 @@
/*
* Debug level macros that are used in the DEBUG_PRINT macros
*/
#define ACPI_DEBUG_LEVEL(dl) dl,__LINE__,&_Dbg
#define ACPI_DEBUG_LEVEL(dl) (UINT32) dl,__LINE__,&_Dbg
/* Exception level -- used in the global "DebugLevel" */

14
sys/dev/acpi/acpica/Subsystem/acparser.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: acparser.h - AML Parser subcomponent prototypes and defines
* xRevision: 63 $
* xRevision: 65 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -168,7 +168,7 @@ UINT32
AcpiPsGetNextPackageLength (
ACPI_PARSE_STATE *ParserState);
NATIVE_CHAR *
char *
AcpiPsGetNextNamestring (
ACPI_PARSE_STATE *ParserState);
@ -216,7 +216,7 @@ const ACPI_OPCODE_INFO *
AcpiPsGetOpcodeInfo (
UINT16 Opcode);
NATIVE_CHAR *
char *
AcpiPsGetOpcodeName (
UINT16 Opcode);
@ -313,7 +313,7 @@ AcpiPsAppendArg(
ACPI_PARSE_OBJECT*
AcpiPsFind (
ACPI_PARSE_OBJECT *Scope,
NATIVE_CHAR *Path,
char *Path,
UINT16 Opcode,
UINT32 Create);
@ -402,13 +402,13 @@ AcpiPsSetName(
UINT32
AcpiPsSprintPath (
NATIVE_CHAR *BufferStart,
char *BufferStart,
UINT32 BufferSize,
ACPI_PARSE_OBJECT *Op);
UINT32
AcpiPsSprintOp (
NATIVE_CHAR *BufferStart,
char *BufferStart,
UINT32 BufferSize,
ACPI_PARSE_OBJECT *Op);

6
sys/dev/acpi/acpica/Subsystem/acpi.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acpi.h - Master include file, Publics and external data.
* xRevision: 55 $
* xRevision: 56 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -123,7 +123,7 @@
* in the rest of the source code again and again.
*/
#include "acconfig.h" /* Configuration constants */
#include "acenv.h" /* Target environment specific items */
#include "acenv.h" /* Target environment specific items */
#include "actypes.h" /* Fundamental common data types */
#include "acexcep.h" /* ACPI exception codes */
#include "acmacros.h" /* C macros */

41
sys/dev/acpi/acpica/Subsystem/acpiosxf.h
View File

@ -12,7 +12,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -141,7 +141,7 @@
#define ACPI_SIGNAL_FATAL 0
#define ACPI_SIGNAL_BREAKPOINT 1
typedef struct AcpiFatalInfo
typedef struct acpi_signal_fatal_info
{
UINT32 Type;
UINT32 Code;
@ -343,9 +343,9 @@ AcpiOsWritePciConfiguration (
*/
void
AcpiOsDerivePciId(
ACPI_HANDLE rhandle,
ACPI_HANDLE rhandle,
ACPI_HANDLE chandle,
ACPI_PCI_ID **PciId);
ACPI_PCI_ID **PciId);
/*
* Miscellaneous
@ -376,12 +376,12 @@ AcpiOsSignal (
void ACPI_INTERNAL_VAR_XFACE
AcpiOsPrintf (
const NATIVE_CHAR *Format,
const char *Format,
...);
void
AcpiOsVprintf (
const NATIVE_CHAR *Format,
const char *Format,
va_list Args);
void
@ -395,9 +395,34 @@ AcpiOsRedirectOutput (
UINT32
AcpiOsGetLine (
NATIVE_CHAR *Buffer);
char *Buffer);
/*
* Directory manipulation
*/
void *
AcpiOsOpenDirectory (
char *Pathname,
char *WildcardSpec,
char RequestedFileType);
/* RequesteFileType values */
#define REQUEST_FILE_ONLY 0
#define REQUEST_DIR_ONLY 1
char *
AcpiOsGetNextFilename (
void *DirHandle);
void
AcpiOsCloseDirectory (
void *DirHandle);
/*
* Debug
*/
@ -407,7 +432,7 @@ AcpiOsDbgAssert(
void *FailedAssertion,
void *FileName,
UINT32 LineNumber,
NATIVE_CHAR *Message);
char *Message);
#endif /* __ACPIOSXF_H__ */

6
sys/dev/acpi/acpica/Subsystem/acpixf.h
View File

@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -240,11 +240,11 @@ AcpiWalkNamespace (
UINT32 MaxDepth,
ACPI_WALK_CALLBACK UserFunction,
void *Context,
void * *ReturnValue);
void **ReturnValue);
ACPI_STATUS
AcpiGetDevices (
NATIVE_CHAR *HID,
char *HID,
ACPI_WALK_CALLBACK UserFunction,
void *Context,
void **ReturnValue);

4
sys/dev/acpi/acpica/Subsystem/acresrc.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acresrc.h - Resource Manager function prototypes
* xRevision: 34 $
* xRevision: 35 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License

94
sys/dev/acpi/acpica/Subsystem/acstruct.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acstruct.h - Internal structs
* xRevision: 21 $
* xRevision: 25 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -141,53 +141,51 @@
typedef struct acpi_walk_state
{
UINT8 DataType; /* To differentiate various internal objs MUST BE FIRST!*/\
ACPI_OWNER_ID OwnerId; /* Owner of objects created during the walk */
BOOLEAN LastPredicate; /* Result of last predicate */
UINT8 CurrentResult; /* */
UINT8 NextOpInfo; /* Info about NextOp */
UINT8 NumOperands; /* Stack pointer for Operands[] array */
UINT8 ReturnUsed;
UINT8 WalkType;
UINT16 Opcode; /* Current AML opcode */
UINT8 ScopeDepth;
UINT8 Reserved1;
UINT32 ArgCount; /* push for fixed or var args */
UINT32 AmlOffset;
UINT32 ArgTypes;
UINT32 MethodBreakpoint; /* For single stepping */
UINT32 UserBreakpoint; /* User AML breakpoint */
UINT32 ParseFlags;
UINT32 PrevArgTypes;
UINT8 DataType; /* To differentiate various internal objs MUST BE FIRST!*/\
ACPI_OWNER_ID OwnerId; /* Owner of objects created during the walk */
BOOLEAN LastPredicate; /* Result of last predicate */
UINT8 CurrentResult; /* */
UINT8 NextOpInfo; /* Info about NextOp */
UINT8 NumOperands; /* Stack pointer for Operands[] array */
UINT8 ReturnUsed;
UINT8 WalkType;
UINT16 Opcode; /* Current AML opcode */
UINT8 ScopeDepth;
UINT8 Reserved1;
UINT32 ArgCount; /* push for fixed or var args */
UINT32 AmlOffset;
UINT32 ArgTypes;
UINT32 MethodBreakpoint; /* For single stepping */
UINT32 UserBreakpoint; /* User AML breakpoint */
UINT32 ParseFlags;
UINT32 PrevArgTypes;
UINT8 *AmlLastWhile;
struct acpi_namespace_node Arguments[ACPI_METHOD_NUM_ARGS]; /* Control method arguments */
union acpi_operand_object **CallerReturnDesc;
ACPI_GENERIC_STATE *ControlState; /* List of control states (nested IFs) */
struct acpi_namespace_node LocalVariables[ACPI_METHOD_NUM_LOCALS]; /* Control method locals */
struct acpi_namespace_node *MethodCallNode; /* Called method Node*/
ACPI_PARSE_OBJECT *MethodCallOp; /* MethodCall Op if running a method */
union acpi_operand_object *MethodDesc; /* Method descriptor if running a method */
struct acpi_namespace_node *MethodNode; /* Method Node if running a method */
ACPI_PARSE_OBJECT *Op; /* Current parser op */
union acpi_operand_object *Operands[ACPI_OBJ_NUM_OPERANDS+1]; /* Operands passed to the interpreter (+1 for NULL terminator) */
const ACPI_OPCODE_INFO *OpInfo; /* Info on current opcode */
ACPI_PARSE_OBJECT *Origin; /* Start of walk [Obsolete] */
union acpi_operand_object **Params;
ACPI_PARSE_STATE ParserState; /* Current state of parser */
union acpi_operand_object *ResultObj;
ACPI_GENERIC_STATE *Results; /* Stack of accumulated results */
union acpi_operand_object *ReturnDesc; /* Return object, if any */
ACPI_GENERIC_STATE *ScopeInfo; /* Stack of nested scopes */
UINT8 *AmlLastWhile;
struct acpi_node Arguments[ACPI_METHOD_NUM_ARGS]; /* Control method arguments */
union acpi_operand_obj **CallerReturnDesc;
ACPI_GENERIC_STATE *ControlState; /* List of control states (nested IFs) */
struct acpi_node LocalVariables[ACPI_METHOD_NUM_LOCALS]; /* Control method locals */
struct acpi_node *MethodCallNode; /* Called method Node*/
ACPI_PARSE_OBJECT *MethodCallOp; /* MethodCall Op if running a method */
union acpi_operand_obj *MethodDesc; /* Method descriptor if running a method */
struct acpi_node *MethodNode; /* Method Node if running a method */
ACPI_PARSE_OBJECT *Op; /* Current parser op */
union acpi_operand_obj *Operands[ACPI_OBJ_NUM_OPERANDS+1]; /* Operands passed to the interpreter (+1 for NULL terminator) */
const ACPI_OPCODE_INFO *OpInfo; /* Info on current opcode */
ACPI_PARSE_OBJECT *Origin; /* Start of walk [Obsolete] */
union acpi_operand_obj **Params;
ACPI_PARSE_STATE ParserState; /* Current state of parser */
union acpi_operand_obj *ResultObj;
ACPI_GENERIC_STATE *Results; /* Stack of accumulated results */
union acpi_operand_obj *ReturnDesc; /* Return object, if any */
ACPI_GENERIC_STATE *ScopeInfo; /* Stack of nested scopes */
ACPI_PARSE_OBJECT *PrevOp; /* Last op that was processed */
ACPI_PARSE_OBJECT *NextOp; /* next op to be processed */
ACPI_PARSE_DOWNWARDS DescendingCallback;
ACPI_PARSE_UPWARDS AscendingCallback;
ACPI_THREAD_STATE *Thread;
struct acpi_walk_state *Next; /* Next WalkState in list */
ACPI_PARSE_OBJECT *PrevOp; /* Last op that was processed */
ACPI_PARSE_OBJECT *NextOp; /* next op to be processed */
ACPI_PARSE_DOWNWARDS DescendingCallback;
ACPI_PARSE_UPWARDS AscendingCallback;
ACPI_THREAD_STATE *Thread;
struct acpi_walk_state *Next; /* Next WalkState in list */
} ACPI_WALK_STATE;
@ -243,7 +241,7 @@ typedef struct acpi_get_devices_info
{
ACPI_WALK_CALLBACK UserFunction;
void *Context;
NATIVE_CHAR *Hid;
char *Hid;
} ACPI_GET_DEVICES_INFO;

12
sys/dev/acpi/acpica/Subsystem/actables.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: actables.h - ACPI table management
* xRevision: 42 $
* xRevision: 44 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -223,7 +223,7 @@ AcpiTbInstallTable (
ACPI_STATUS
AcpiTbMatchSignature (
NATIVE_CHAR *Signature,
char *Signature,
ACPI_TABLE_DESC *TableInfo,
UINT8 SearchType);
@ -288,9 +288,9 @@ AcpiTbFindRsdp (
ACPI_STATUS
AcpiTbFindTable (
NATIVE_CHAR *Signature,
NATIVE_CHAR *OemId,
NATIVE_CHAR *OemTableId,
char *Signature,
char *OemId,
char *OemTableId,
ACPI_TABLE_HEADER **TablePtr);
ACPI_STATUS

42
sys/dev/acpi/acpica/Subsystem/actbl.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: actbl.h - Table data structures defined in ACPI specification
* xRevision: 53 $
* xRevision: 58 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -165,37 +165,37 @@
* Architecture-independent tables
* The architecture dependent tables are in separate files
*/
typedef struct /* Root System Descriptor Pointer */
typedef struct rsdp_descriptor /* Root System Descriptor Pointer */
{
NATIVE_CHAR Signature [8]; /* ACPI signature, contains "RSD PTR " */
char Signature [8]; /* ACPI signature, contains "RSD PTR " */
UINT8 Checksum; /* To make sum of struct == 0 */
NATIVE_CHAR OemId [6]; /* OEM identification */
char OemId [6]; /* OEM identification */
UINT8 Revision; /* Must be 0 for 1.0, 2 for 2.0 */
UINT32 RsdtPhysicalAddress; /* 32-bit physical address of RSDT */
UINT32 Length; /* XSDT Length in bytes including hdr */
UINT64 XsdtPhysicalAddress; /* 64-bit physical address of XSDT */
UINT8 ExtendedChecksum; /* Checksum of entire table */
NATIVE_CHAR Reserved [3]; /* Reserved field must be 0 */
char Reserved [3]; /* Reserved field must be 0 */
} RSDP_DESCRIPTOR;
typedef struct /* ACPI common table header */
typedef struct acpi_table_header /* ACPI common table header */
{
NATIVE_CHAR Signature [4]; /* ACPI signature (4 ASCII characters) */
char Signature [4]; /* ACPI signature (4 ASCII characters) */
UINT32 Length; /* Length of table, in bytes, including header */
UINT8 Revision; /* ACPI Specification minor version # */
UINT8 Checksum; /* To make sum of entire table == 0 */
NATIVE_CHAR OemId [6]; /* OEM identification */
NATIVE_CHAR OemTableId [8]; /* OEM table identification */
char OemId [6]; /* OEM identification */
char OemTableId [8]; /* OEM table identification */
UINT32 OemRevision; /* OEM revision number */
NATIVE_CHAR AslCompilerId [4]; /* ASL compiler vendor ID */
char AslCompilerId [4]; /* ASL compiler vendor ID */
UINT32 AslCompilerRevision; /* ASL compiler revision number */
} ACPI_TABLE_HEADER;
typedef struct /* Common FACS for internal use */
typedef struct acpi_common_facs /* Common FACS for internal use */
{
UINT32 *GlobalLock;
UINT64 *FirmwareWakingVector;
@ -204,7 +204,7 @@ typedef struct /* Common FACS for internal use */
} ACPI_COMMON_FACS;
typedef struct /* APIC Table */
typedef struct apic_table
{
ACPI_TABLE_HEADER Header; /* ACPI table header */
UINT32 LocalApicAddress; /* Physical address for accessing local APICs */
@ -214,7 +214,7 @@ typedef struct /* APIC Table */
} APIC_TABLE;
typedef struct /* APIC Header */
typedef struct apic_header
{
UINT8 Type; /* APIC type. Either APIC_PROC or APIC_IO */
UINT8 Length; /* Length of APIC structure */
@ -222,7 +222,7 @@ typedef struct /* APIC Header */
} APIC_HEADER;
typedef struct /* Processor APIC */
typedef struct processor_apic
{
APIC_HEADER Header;
UINT8 ProcessorApicId; /* ACPI processor id */
@ -233,7 +233,7 @@ typedef struct /* Processor APIC */
} PROCESSOR_APIC;
typedef struct /* IO APIC */
typedef struct io_apic
{
APIC_HEADER Header;
UINT8 IoApicId; /* I/O APIC ID */
@ -252,7 +252,7 @@ typedef struct /* IO APIC */
* IA64 TBD: Modify Smart Battery Description to comply with ACPI IA64
* extensions.
*/
typedef struct /* Smart Battery Description Table */
typedef struct smart_battery_description_table
{
ACPI_TABLE_HEADER Header;
UINT32 WarningLevel;
@ -283,15 +283,15 @@ typedef struct /* Smart Battery Description Table */
#define ACPI_TABLE_ROOT 0x00
#define ACPI_TABLE_PRIMARY 0x10
#define ACPI_TABLE_SECONDARY 0x20
#define ACPI_TABLE_OTHER 0x30
#define ACPI_TABLE_ALL 0x30
#define ACPI_TABLE_TYPE_MASK 0x30
/* Data about each known table type */
typedef struct _AcpiTableSupport
typedef struct acpi_table_support
{
NATIVE_CHAR *Name;
NATIVE_CHAR *Signature;
char *Name;
char *Signature;
void **GlobalPtr;
UINT8 SigLength;
UINT8 Flags;

14
sys/dev/acpi/acpica/Subsystem/actbl1.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: actbl1.h - ACPI 1.0 tables
* xRevision: 21 $
* xRevision: 26 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -122,7 +122,7 @@
/*
* ACPI 1.0 Root System Description Table (RSDT)
*/
typedef struct
typedef struct rsdt_descriptor_rev1
{
ACPI_TABLE_HEADER Header; /* ACPI Table header */
UINT32 TableOffsetEntry [1]; /* Array of pointers to other */
@ -133,9 +133,9 @@ typedef struct
/*
* ACPI 1.0 Firmware ACPI Control Structure (FACS)
*/
typedef struct
typedef struct facs_descriptor_rev1
{
NATIVE_CHAR Signature[4]; /* ACPI Signature */
char Signature[4]; /* ACPI Signature */
UINT32 Length; /* Length of structure, in bytes */
UINT32 HardwareSignature; /* Hardware configuration signature */
UINT32 FirmwareWakingVector; /* ACPI OS waking vector */
@ -150,7 +150,7 @@ typedef struct
/*
* ACPI 1.0 Fixed ACPI Description Table (FADT)
*/
typedef struct
typedef struct fadt_descriptor_rev1
{
ACPI_TABLE_HEADER Header; /* ACPI Table header */
UINT32 FirmwareCtrl; /* Physical address of FACS */
@ -202,7 +202,7 @@ typedef struct
UINT32_BIT TmrValExt : 1; /* The tmr_val width is 32 bits (0 = 24 bits) */
UINT32_BIT Reserved5 : 23; /* Reserved - must be zero */
} FADT_DESCRIPTOR_REV1;
} FADT_DESCRIPTOR_REV1;
#pragma pack()

18
sys/dev/acpi/acpica/Subsystem/actbl2.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: actbl2.h - ACPI Specification Revision 2.0 Tables
* xRevision: 28 $
* xRevision: 32 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -142,7 +142,7 @@
/*
* ACPI 2.0 Root System Description Table (RSDT)
*/
typedef struct
typedef struct rsdt_descriptor_rev2
{
ACPI_TABLE_HEADER Header; /* ACPI table header */
UINT32 TableOffsetEntry [1]; /* Array of pointers to */
@ -153,7 +153,7 @@ typedef struct
/*
* ACPI 2.0 Extended System Description Table (XSDT)
*/
typedef struct
typedef struct xsdt_descriptor_rev2
{
ACPI_TABLE_HEADER Header; /* ACPI table header */
UINT64 TableOffsetEntry [1]; /* Array of pointers to */
@ -164,9 +164,9 @@ typedef struct
/*
* ACPI 2.0 Firmware ACPI Control Structure (FACS)
*/
typedef struct
typedef struct facs_descriptor_rev2
{
NATIVE_CHAR Signature[4]; /* ACPI signature */
char Signature[4]; /* ACPI signature */
UINT32 Length; /* Length of structure, in bytes */
UINT32 HardwareSignature; /* Hardware configuration signature */
UINT32 FirmwareWakingVector; /* 32bit physical address of the Firmware Waking Vector. */
@ -183,7 +183,7 @@ typedef struct
/*
* ACPI 2.0 Generic Address Structure (GAS)
*/
typedef struct
typedef struct acpi_generic_address
{
UINT8 AddressSpaceId; /* Address space where struct or register exists. */
UINT8 RegisterBitWidth; /* Size in bits of given register */
@ -197,7 +197,7 @@ typedef struct
/*
* ACPI 2.0 Fixed ACPI Description Table (FADT)
*/
typedef struct
typedef struct fadt_descriptor_rev2
{
ACPI_TABLE_HEADER Header; /* ACPI table header */
UINT32 V1_FirmwareCtrl; /* 32-bit physical address of FACS */
@ -268,7 +268,7 @@ typedef struct
ACPI_GENERIC_ADDRESS XGpe0Blk; /* Extended General Purpose AcpiEvent 0 Reg Blk address */
ACPI_GENERIC_ADDRESS XGpe1Blk; /* Extended General Purpose AcpiEvent 1 Reg Blk address */
} FADT_DESCRIPTOR_REV2;
} FADT_DESCRIPTOR_REV2;
#pragma pack()

192
sys/dev/acpi/acpica/Subsystem/actypes.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: actypes.h - Common data types for the entire ACPI subsystem
* xRevision: 242 $
* xRevision: 252 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -131,21 +131,34 @@
#define ACPI_ASCII_MAX 0x7F
#ifdef DEFINE_ALTERNATE_TYPES
/*
* Types used only in translated source, defined here to enable
* cross-platform compilation only.
*/
typedef int s32;
typedef unsigned char u8;
typedef unsigned short u16;
typedef unsigned int u32;
typedef COMPILER_DEPENDENT_UINT64 u64;
#endif
/*
* Data types - Fixed across all compilation models (16/32/64)
*
* BOOLEAN Logical Boolean.
* INT8 8-bit (1 byte) signed value
* UINT8 8-bit (1 byte) unsigned value
* INT16 16-bit (2 byte) signed value
* UINT16 16-bit (2 byte) unsigned value
* INT32 32-bit (4 byte) signed value
* UINT32 32-bit (4 byte) unsigned value
* INT64 64-bit (8 byte) signed value
* UINT64 64-bit (8 byte) unsigned value
* NATIVE_INT 32-bit on IA-32, 64-bit on IA-64 signed value
* NATIVE_UINT 32-bit on IA-32, 64-bit on IA-64 unsigned value
* BOOLEAN Logical Boolean.
* INT8 8-bit (1 byte) signed value
* UINT8 8-bit (1 byte) unsigned value
* INT16 16-bit (2 byte) signed value
* UINT16 16-bit (2 byte) unsigned value
* INT32 32-bit (4 byte) signed value
* UINT32 32-bit (4 byte) unsigned value
* INT64 64-bit (8 byte) signed value
* UINT64 64-bit (8 byte) unsigned value
* ACPI_NATIVE_INT 32-bit on IA-32, 64-bit on IA-64 signed value
* ACPI_NATIVE_UINT 32-bit on IA-32, 64-bit on IA-64 unsigned value
*/
#ifndef ACPI_MACHINE_WIDTH
@ -153,6 +166,9 @@
#endif
#if ACPI_MACHINE_WIDTH == 64
/*! [Begin] no source code translation (keep the typedefs) */
/*
* 64-bit type definitions
*/
@ -164,13 +180,12 @@ typedef unsigned int UINT32;
typedef COMPILER_DEPENDENT_INT64 INT64;
typedef COMPILER_DEPENDENT_UINT64 UINT64;
typedef INT64 NATIVE_INT;
typedef UINT64 NATIVE_UINT;
/*! [End] no source code translation !*/
typedef UINT32 NATIVE_UINT_MAX32;
typedef UINT64 NATIVE_UINT_MIN32;
typedef INT64 ACPI_NATIVE_INT;
typedef UINT64 ACPI_NATIVE_UINT;
typedef UINT64 ACPI_TBLPTR;
typedef UINT64 ACPI_TABLE_PTR;
typedef UINT64 ACPI_IO_ADDRESS;
typedef UINT64 ACPI_PHYSICAL_ADDRESS;
typedef UINT64 ACPI_SIZE;
@ -183,6 +198,8 @@ typedef UINT64 ACPI_SIZE;
#elif ACPI_MACHINE_WIDTH == 16
/*! [Begin] no source code translation (keep the typedefs) */
/*
* 16-bit type definitions
*/
@ -200,13 +217,12 @@ typedef struct
} UINT64;
typedef UINT16 NATIVE_UINT;
typedef INT16 NATIVE_INT;
/*! [End] no source code translation !*/
typedef UINT16 NATIVE_UINT_MAX32;
typedef UINT32 NATIVE_UINT_MIN32;
typedef UINT16 ACPI_NATIVE_UINT;
typedef INT16 ACPI_NATIVE_INT;
typedef UINT32 ACPI_TBLPTR;
typedef UINT32 ACPI_TABLE_PTR;
typedef UINT32 ACPI_IO_ADDRESS;
typedef char *ACPI_PHYSICAL_ADDRESS;
typedef UINT16 ACPI_SIZE;
@ -226,6 +242,8 @@ typedef UINT16 ACPI_SIZE;
#elif ACPI_MACHINE_WIDTH == 32
/*! [Begin] no source code translation (keep the typedefs) */
/*
* 32-bit type definitions (default)
*/
@ -237,13 +255,12 @@ typedef unsigned int UINT32;
typedef COMPILER_DEPENDENT_INT64 INT64;
typedef COMPILER_DEPENDENT_UINT64 UINT64;
typedef INT32 NATIVE_INT;
typedef UINT32 NATIVE_UINT;
/*! [End] no source code translation !*/
typedef UINT32 NATIVE_UINT_MAX32;
typedef UINT32 NATIVE_UINT_MIN32;
typedef INT32 ACPI_NATIVE_INT;
typedef UINT32 ACPI_NATIVE_UINT;
typedef UINT64 ACPI_TBLPTR;
typedef UINT64 ACPI_TABLE_PTR;
typedef UINT32 ACPI_IO_ADDRESS;
typedef UINT64 ACPI_PHYSICAL_ADDRESS;
typedef UINT32 ACPI_SIZE;
@ -262,40 +279,24 @@ typedef UINT32 ACPI_SIZE;
* Miscellaneous common types
*/
typedef UINT32 UINT32_BIT;
typedef NATIVE_UINT ACPI_PTRDIFF;
typedef char NATIVE_CHAR;
#ifdef DEFINE_ALTERNATE_TYPES
/*
* Types used only in translated source, defined here to enable
* cross-platform compilation only.
*/
typedef INT32 s32;
typedef UINT8 u8;
typedef UINT16 u16;
typedef UINT32 u32;
typedef UINT64 u64;
#endif
/*! [End] no source code translation !*/
typedef ACPI_NATIVE_UINT ACPI_PTRDIFF;
/*
* Pointer overlays to avoid lots of typecasting for
* code that accepts both physical and logical pointers.
*/
typedef union acpi_ptrs
typedef union acpi_pointers
{
ACPI_PHYSICAL_ADDRESS Physical;
void *Logical;
ACPI_TBLPTR Value;
ACPI_TABLE_PTR Value;
} ACPI_POINTERS;
typedef struct AcpiPointer
typedef struct acpi_pointer
{
UINT32 PointerType;
union acpi_ptrs Pointer;
union acpi_pointers Pointer;
} ACPI_POINTER;
@ -338,24 +339,24 @@ typedef struct AcpiPointer
*/
typedef UINT32 ACPI_STATUS; /* All ACPI Exceptions */
typedef UINT32 ACPI_NAME; /* 4-byte ACPI name */
typedef char* ACPI_STRING; /* Null terminated ASCII string */
typedef void* ACPI_HANDLE; /* Actually a ptr to an Node */
typedef char * ACPI_STRING; /* Null terminated ASCII string */
typedef void * ACPI_HANDLE; /* Actually a ptr to an Node */
typedef struct
typedef struct uint64_struct
{
UINT32 Lo;
UINT32 Hi;
} UINT64_STRUCT;
typedef union
typedef union uint64_overlay
{
UINT64 Full;
UINT64_STRUCT Part;
} UINT64_OVERLAY;
typedef struct
typedef struct uint32_struct
{
UINT32 Lo;
UINT32 Hi;
@ -520,9 +521,9 @@ typedef UINT32 ACPI_OBJECT_TYPE;
#define ACPI_TYPE_EXTERNAL_MAX 0x10
/*
* These are object types that do not map directly to the ACPI
* ObjectType() operator. They are used for various internal purposes only.
* If new predefined ACPI_TYPEs are added (via the ACPI specification), these
* These are object types that do not map directly to the ACPI
* ObjectType() operator. They are used for various internal purposes only.
* If new predefined ACPI_TYPEs are added (via the ACPI specification), these
* internal types must move upwards. (There is code that depends on these
* values being contiguous with the external types above.)
*/
@ -670,6 +671,7 @@ typedef UINT8 ACPI_ADR_SPACE_TYPE;
#define ACPI_ADR_SPACE_CMOS (ACPI_ADR_SPACE_TYPE) 5
#define ACPI_ADR_SPACE_PCI_BAR_TARGET (ACPI_ADR_SPACE_TYPE) 6
#define ACPI_ADR_SPACE_DATA_TABLE (ACPI_ADR_SPACE_TYPE) 7
#define ACPI_ADR_SPACE_FIXED_HARDWARE (ACPI_ADR_SPACE_TYPE) 127
/*
@ -707,7 +709,7 @@ typedef UINT8 ACPI_ADR_SPACE_TYPE;
/*
* External ACPI object definition
*/
typedef union AcpiObj
typedef union acpi_object
{
ACPI_OBJECT_TYPE Type; /* See definition of AcpiNsType for values */
struct
@ -720,7 +722,7 @@ typedef union AcpiObj
{
ACPI_OBJECT_TYPE Type;
UINT32 Length; /* # of bytes in string, excluding trailing null */
NATIVE_CHAR *Pointer; /* points to the string value */
char *Pointer; /* points to the string value */
} String;
struct
@ -741,7 +743,7 @@ typedef union AcpiObj
{
ACPI_OBJECT_TYPE Type;
UINT32 Count; /* # of elements in package */
union AcpiObj *Elements; /* Pointer to an array of ACPI_OBJECTs */
union acpi_object *Elements; /* Pointer to an array of ACPI_OBJECTs */
} Package;
struct
@ -765,7 +767,7 @@ typedef union AcpiObj
/*
* List of objects, used as a parameter list for control method evaluation
*/
typedef struct AcpiObjList
typedef struct acpi_object_list
{
UINT32 Count;
ACPI_OBJECT *Pointer;
@ -780,7 +782,7 @@ typedef struct AcpiObjList
#define ACPI_ALLOCATE_BUFFER (ACPI_SIZE) (-1)
#define ACPI_ALLOCATE_LOCAL_BUFFER (ACPI_SIZE) (-2)
typedef struct
typedef struct acpi_buffer
{
ACPI_SIZE Length; /* Length in bytes of the buffer */
void *Pointer; /* pointer to buffer */
@ -808,7 +810,7 @@ typedef struct
/*
* ACPI Table Info. One per ACPI table _type_
*/
typedef struct AcpiTableInfo
typedef struct acpi_table_info
{
UINT32 Count;
@ -818,7 +820,7 @@ typedef struct AcpiTableInfo
/*
* System info returned by AcpiGetSystemInfo()
*/
typedef struct _AcpiSysInfo
typedef struct acpi_system_info
{
UINT32 AcpiCaVersion;
UINT32 Flags;
@ -915,42 +917,46 @@ ACPI_STATUS (*ACPI_WALK_CALLBACK) (
ACPI_NAME Name /* ACPI object Name */
typedef struct
typedef struct acpi_obj_info_header
{
ACPI_COMMON_OBJ_INFO;
} ACPI_OBJ_INFO_HEADER;
typedef struct
typedef struct acpi_device_info
{
ACPI_COMMON_OBJ_INFO;
UINT32 Valid; /* Are the next bits legit? */
NATIVE_CHAR HardwareId[9]; /* _HID value if any */
NATIVE_CHAR UniqueId[9]; /* _UID value if any */
char HardwareId[9]; /* _HID value if any */
char UniqueId[9]; /* _UID value if any */
ACPI_INTEGER Address; /* _ADR value if any */
UINT32 CurrentStatus; /* _STA value */
} ACPI_DEVICE_INFO;
/* Context structs for address space handlers */
typedef struct
typedef struct acpi_pci_id
{
UINT16 Segment;
UINT16 Bus;
UINT16 Device;
UINT16 Function;
} ACPI_PCI_ID;
typedef struct
typedef struct acpi_mem_space_context
{
UINT32 Length;
ACPI_PHYSICAL_ADDRESS Address;
ACPI_PHYSICAL_ADDRESS MappedPhysicalAddress;
UINT8 *MappedLogicalAddress;
ACPI_SIZE MappedLength;
} ACPI_MEM_SPACE_CONTEXT;
@ -1038,7 +1044,7 @@ typedef struct
/*
* Structures used to describe device resources
*/
typedef struct
typedef struct acpi_resource_irq
{
UINT32 EdgeLevel;
UINT32 ActiveHighLow;
@ -1048,7 +1054,7 @@ typedef struct
} ACPI_RESOURCE_IRQ;
typedef struct
typedef struct ACPI_RESOURCE_DMA
{
UINT32 Type;
UINT32 BusMaster;
@ -1058,7 +1064,7 @@ typedef struct
} ACPI_RESOURCE_DMA;
typedef struct
typedef struct acpi_resource_start_dpf
{
UINT32 CompatibilityPriority;
UINT32 PerformanceRobustness;
@ -1070,7 +1076,7 @@ typedef struct
* needed because it has no fields
*/
typedef struct
typedef struct acpi_resource_io
{
UINT32 IoDecode;
UINT32 MinBaseAddress;
@ -1080,27 +1086,27 @@ typedef struct
} ACPI_RESOURCE_IO;
typedef struct
typedef struct acpi_resource_fixed_io
{
UINT32 BaseAddress;
UINT32 RangeLength;
} ACPI_RESOURCE_FIXED_IO;
typedef struct
typedef struct acpi_resource_vendor
{
UINT32 Length;
UINT8 Reserved[1];
} ACPI_RESOURCE_VENDOR;
typedef struct
typedef struct acpi_resource_end_tag
{
UINT8 Checksum;
} ACPI_RESOURCE_END_TAG;
typedef struct
typedef struct acpi_resource_mem24
{
UINT32 ReadWriteAttribute;
UINT32 MinBaseAddress;
@ -1110,7 +1116,7 @@ typedef struct
} ACPI_RESOURCE_MEM24;
typedef struct
typedef struct acpi_resource_mem32
{
UINT32 ReadWriteAttribute;
UINT32 MinBaseAddress;
@ -1120,7 +1126,7 @@ typedef struct
} ACPI_RESOURCE_MEM32;
typedef struct
typedef struct acpi_resource_fixed_mem32
{
UINT32 ReadWriteAttribute;
UINT32 RangeBaseAddress;
@ -1128,28 +1134,28 @@ typedef struct
} ACPI_RESOURCE_FIXED_MEM32;
typedef struct
typedef struct acpi_memory_attribute
{
UINT16 CacheAttribute;
UINT16 ReadWriteAttribute;
} ACPI_MEMORY_ATTRIBUTE;
typedef struct
typedef struct acpi_io_attribute
{
UINT16 RangeAttribute;
UINT16 Reserved;
} ACPI_IO_ATTRIBUTE;
typedef struct
typedef struct acpi_bus_attribute
{
UINT16 Reserved1;
UINT16 Reserved2;
} ACPI_BUS_ATTRIBUTE;
typedef union
typedef union acpi_resource_attribute
{
ACPI_MEMORY_ATTRIBUTE Memory;
ACPI_IO_ATTRIBUTE Io;
@ -1157,15 +1163,15 @@ typedef union
} ACPI_RESOURCE_ATTRIBUTE;
typedef struct
typedef struct acpi_resource_source
{
UINT32 Index;
UINT32 StringLength;
NATIVE_CHAR *StringPtr;
char *StringPtr;
} ACPI_RESOURCE_SOURCE;
typedef struct
typedef struct acpi_resource_address16
{
UINT32 ResourceType;
UINT32 ProducerConsumer;
@ -1182,7 +1188,7 @@ typedef struct
} ACPI_RESOURCE_ADDRESS16;
typedef struct
typedef struct acpi_resource_address32
{
UINT32 ResourceType;
UINT32 ProducerConsumer;
@ -1199,7 +1205,7 @@ typedef struct
} ACPI_RESOURCE_ADDRESS32;
typedef struct
typedef struct acpi_resource_address64
{
UINT32 ResourceType;
UINT32 ProducerConsumer;
@ -1216,7 +1222,7 @@ typedef struct
} ACPI_RESOURCE_ADDRESS64;
typedef struct
typedef struct acpi_resource_ext_irq
{
UINT32 ProducerConsumer;
UINT32 EdgeLevel;
@ -1249,7 +1255,7 @@ typedef struct
typedef UINT32 ACPI_RESOURCE_TYPE;
typedef union
typedef union acpi_resource_data
{
ACPI_RESOURCE_IRQ Irq;
ACPI_RESOURCE_DMA Dma;
@ -1268,7 +1274,7 @@ typedef union
} ACPI_RESOURCE_DATA;
typedef struct AcpiResource
typedef struct acpi_resource
{
ACPI_RESOURCE_TYPE Id;
UINT32 Length;
@ -1300,7 +1306,7 @@ typedef struct acpi_pci_routing_table
UINT32 Pin;
ACPI_INTEGER Address; /* here for 64-bit alignment */
UINT32 SourceIndex;
NATIVE_CHAR Source[4]; /* pad to 64 bits so sizeof() works in all cases */
char Source[4]; /* pad to 64 bits so sizeof() works in all cases */
} ACPI_PCI_ROUTING_TABLE;

101
sys/dev/acpi/acpica/Subsystem/acutils.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acutils.h -- prototypes for the common (subsystem-wide) procedures
* xRevision: 149 $
* xRevision: 153 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -140,6 +140,7 @@ typedef struct acpi_pkg_info
ACPI_SIZE Length;
UINT32 ObjectSpace;
UINT32 NumPackages;
} ACPI_PKG_INFO;
#define REF_INCREMENT (UINT16) 0
@ -187,25 +188,25 @@ AcpiUtValidateFadt (
#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
NATIVE_CHAR *
char *
AcpiUtGetMutexName (
UINT32 MutexId);
#endif
NATIVE_CHAR *
char *
AcpiUtGetTypeName (
ACPI_OBJECT_TYPE Type);
NATIVE_CHAR *
char *
AcpiUtGetObjectTypeName (
ACPI_OPERAND_OBJECT *ObjDesc);
NATIVE_CHAR *
char *
AcpiUtGetRegionName (
UINT8 SpaceId);
NATIVE_CHAR *
char *
AcpiUtGetEventName (
UINT32 EventId);
@ -231,51 +232,51 @@ AcpiUtAllocateOwnerId (
ACPI_SIZE
AcpiUtStrlen (
const NATIVE_CHAR *String);
const char *String);
NATIVE_CHAR *
char *
AcpiUtStrcpy (
NATIVE_CHAR *DstString,
const NATIVE_CHAR *SrcString);
char *DstString,
const char *SrcString);
NATIVE_CHAR *
char *
AcpiUtStrncpy (
NATIVE_CHAR *DstString,
const NATIVE_CHAR *SrcString,
char *DstString,
const char *SrcString,
ACPI_SIZE Count);
int
AcpiUtStrncmp (
const NATIVE_CHAR *String1,
const NATIVE_CHAR *String2,
const char *String1,
const char *String2,
ACPI_SIZE Count);
int
AcpiUtStrcmp (
const NATIVE_CHAR *String1,
const NATIVE_CHAR *String2);
const char *String1,
const char *String2);
NATIVE_CHAR *
char *
AcpiUtStrcat (
NATIVE_CHAR *DstString,
const NATIVE_CHAR *SrcString);
char *DstString,
const char *SrcString);
NATIVE_CHAR *
char *
AcpiUtStrncat (
NATIVE_CHAR *DstString,
const NATIVE_CHAR *SrcString,
char *DstString,
const char *SrcString,
ACPI_SIZE Count);
UINT32
AcpiUtStrtoul (
const NATIVE_CHAR *String,
NATIVE_CHAR **Terminator,
const char *String,
char **Terminator,
UINT32 Base);
NATIVE_CHAR *
char *
AcpiUtStrstr (
NATIVE_CHAR *String1,
NATIVE_CHAR *String2);
char *String1,
char *String2);
void *
AcpiUtMemcpy (
@ -286,7 +287,7 @@ AcpiUtMemcpy (
void *
AcpiUtMemset (
void *Dest,
NATIVE_UINT Value,
ACPI_NATIVE_UINT Value,
ACPI_SIZE Count);
int
@ -433,7 +434,7 @@ void
AcpiUtTraceStr (
UINT32 LineNumber,
ACPI_DEBUG_PRINT_INFO *DbgInfo,
NATIVE_CHAR *String);
char *String);
void
AcpiUtExit (
@ -460,19 +461,19 @@ AcpiUtPtrExit (
void
AcpiUtReportInfo (
NATIVE_CHAR *ModuleName,
char *ModuleName,
UINT32 LineNumber,
UINT32 ComponentId);
void
AcpiUtReportError (
NATIVE_CHAR *ModuleName,
char *ModuleName,
UINT32 LineNumber,
UINT32 ComponentId);
void
AcpiUtReportWarning (
NATIVE_CHAR *ModuleName,
char *ModuleName,
UINT32 LineNumber,
UINT32 ComponentId);
@ -541,13 +542,13 @@ AcpiUtDeleteInternalObjectList (
ACPI_STATUS
AcpiUtEvaluateObject (
ACPI_NAMESPACE_NODE *PrefixNode,
NATIVE_CHAR *Path,
char *Path,
UINT32 ExpectedReturnBtypes,
ACPI_OPERAND_OBJECT **ReturnDesc);
ACPI_STATUS
AcpiUtEvaluateNumericObject (
NATIVE_CHAR *ObjectName,
char *ObjectName,
ACPI_NAMESPACE_NODE *DeviceNode,
ACPI_INTEGER *Address);
@ -607,14 +608,14 @@ AcpiUtReleaseMutex (
ACPI_OPERAND_OBJECT *
AcpiUtCreateInternalObjectDbg (
NATIVE_CHAR *ModuleName,
char *ModuleName,
UINT32 LineNumber,
UINT32 ComponentId,
ACPI_OBJECT_TYPE Type);
void *
AcpiUtAllocateObjectDescDbg (
NATIVE_CHAR *ModuleName,
char *ModuleName,
UINT32 LineNumber,
UINT32 ComponentId);
@ -764,17 +765,17 @@ AcpiUtValidAcpiName (
BOOLEAN
AcpiUtValidAcpiCharacter (
NATIVE_CHAR Character);
char Character);
ACPI_STATUS
AcpiUtStrtoul64 (
NATIVE_CHAR *String,
char *String,
UINT32 Base,
ACPI_INTEGER *RetInteger);
NATIVE_CHAR *
char *
AcpiUtStrupr (
NATIVE_CHAR *SrcString);
char *SrcString);
UINT8 *
AcpiUtGetResourceEndTag (
@ -836,14 +837,14 @@ void *
AcpiUtAllocate (
ACPI_SIZE Size,
UINT32 Component,
NATIVE_CHAR *Module,
char *Module,
UINT32 Line);
void *
AcpiUtCallocate (
ACPI_SIZE Size,
UINT32 Component,
NATIVE_CHAR *Module,
char *Module,
UINT32 Line);
@ -853,21 +854,21 @@ void *
AcpiUtAllocateAndTrack (
ACPI_SIZE Size,
UINT32 Component,
NATIVE_CHAR *Module,
char *Module,
UINT32 Line);
void *
AcpiUtCallocateAndTrack (
ACPI_SIZE Size,
UINT32 Component,
NATIVE_CHAR *Module,
char *Module,
UINT32 Line);
void
AcpiUtFreeAndTrack (
void *Address,
UINT32 Component,
NATIVE_CHAR *Module,
char *Module,
UINT32 Line);
ACPI_DEBUG_MEM_BLOCK *
@ -882,7 +883,7 @@ AcpiUtTrackAllocation (
ACPI_SIZE Size,
UINT8 AllocType,
UINT32 Component,
NATIVE_CHAR *Module,
char *Module,
UINT32 Line);
ACPI_STATUS
@ -890,7 +891,7 @@ AcpiUtRemoveAllocation (
UINT32 ListId,
ACPI_DEBUG_MEM_BLOCK *Address,
UINT32 Component,
NATIVE_CHAR *Module,
char *Module,
UINT32 Line);
void
@ -900,7 +901,7 @@ AcpiUtDumpAllocationInfo (
void
AcpiUtDumpAllocations (
UINT32 Component,
NATIVE_CHAR *Module);
char *Module);
#endif

4
sys/dev/acpi/acpica/Subsystem/amlcode.h
View File

@ -3,7 +3,7 @@
* Name: amlcode.h - Definitions for AML, as included in "definition blocks"
* Declarations and definitions contained herein are derived
* directly from the ACPI specification.
* xRevision: 71 $
* xRevision: 72 $
*
*****************************************************************************/
@ -11,7 +11,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License

6
sys/dev/acpi/acpica/Subsystem/amlresrc.h
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: amlresrc.h - AML resource descriptors
* $Revision: 1.2 $
* xRevision: 23 $
*
*****************************************************************************/
@ -10,7 +10,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -143,7 +143,7 @@
#define ASL_RESNAME_REGISTERBITOFFSET "_RBO"
#define ASL_RESNAME_REGISTERBITWIDTH "_RBW"
#define ASL_RESNAME_RANGETYPE "_RNG"
#define ASL_RESNAME_READWRITETYPE "_RW_" /* ReadOnly(0), Writable (1) */
#define ASL_RESNAME_READWRITETYPE "_RW_" /* ReadOnly(0), Writeable (1) */
#define ASL_RESNAME_TRANSLATION "_TRA"
#define ASL_RESNAME_TRANSTYPE "_TRS" /* Sparse(1), Dense(0) */
#define ASL_RESNAME_TYPE "_TTP" /* Translation(1), Static (0) */

62
sys/dev/acpi/acpica/Subsystem/dbcmds.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dbcmds - debug commands and output routines
* xRevision: 91 $
* xRevision: 95 $
*
******************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dbcmds.c,v 1.6 2002/12/23 00:22:07 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: dbcmds.c,v 1.7 2003/02/13 14:16:16 kanaoka Exp $");
#include "acpi.h"
#include "acdispat.h"
@ -217,7 +217,7 @@ AcpiDbWalkForReferences (
void
AcpiDbFindReferences (
NATIVE_CHAR *ObjectArg)
char *ObjectArg)
{
ACPI_OPERAND_OBJECT *ObjDesc;
@ -275,7 +275,7 @@ AcpiDbDisplayLocks (void)
void
AcpiDbDisplayTableInfo (
NATIVE_CHAR *TableArg)
char *TableArg)
{
UINT32 i;
@ -285,7 +285,7 @@ AcpiDbDisplayTableInfo (
if (AcpiGbl_AcpiTables[i].Pointer)
{
AcpiOsPrintf ("%s at %p length %X\n", AcpiGbl_AcpiTableData[i].Name,
AcpiGbl_AcpiTables[i].Pointer,
AcpiGbl_AcpiTables[i].Pointer,
(UINT32) AcpiGbl_AcpiTables[i].Length);
}
}
@ -309,8 +309,8 @@ AcpiDbDisplayTableInfo (
void
AcpiDbUnloadAcpiTable (
NATIVE_CHAR *TableArg,
NATIVE_CHAR *InstanceArg)
char *TableArg,
char *InstanceArg)
{
UINT32 i;
ACPI_STATUS Status;
@ -361,7 +361,7 @@ AcpiDbUnloadAcpiTable (
void
AcpiDbSetMethodBreakpoint (
NATIVE_CHAR *Location,
char *Location,
ACPI_WALK_STATE *WalkState,
ACPI_PARSE_OBJECT *Op)
{
@ -434,7 +434,7 @@ AcpiDbSetMethodCallBreakpoint (
void
AcpiDbDisassembleAml (
NATIVE_CHAR *Statements,
char *Statements,
ACPI_PARSE_OBJECT *Op)
{
UINT32 NumStatements = 8;
@ -471,8 +471,8 @@ AcpiDbDisassembleAml (
void
AcpiDbDumpNamespace (
NATIVE_CHAR *StartArg,
NATIVE_CHAR *DepthArg)
char *StartArg,
char *DepthArg)
{
ACPI_HANDLE SubtreeEntry = AcpiGbl_RootNode;
UINT32 MaxDepth = ACPI_UINT32_MAX;
@ -547,8 +547,8 @@ AcpiDbDumpNamespace (
void
AcpiDbDumpNamespaceByOwner (
NATIVE_CHAR *OwnerArg,
NATIVE_CHAR *DepthArg)
char *OwnerArg,
char *DepthArg)
{
ACPI_HANDLE SubtreeEntry = AcpiGbl_RootNode;
UINT32 MaxDepth = ACPI_UINT32_MAX;
@ -591,7 +591,7 @@ AcpiDbDumpNamespaceByOwner (
void
AcpiDbSendNotify (
NATIVE_CHAR *Name,
char *Name,
UINT32 Value)
{
ACPI_NAMESPACE_NODE *Node;
@ -647,11 +647,11 @@ AcpiDbSendNotify (
void
AcpiDbSetMethodData (
NATIVE_CHAR *TypeArg,
NATIVE_CHAR *IndexArg,
NATIVE_CHAR *ValueArg)
char *TypeArg,
char *IndexArg,
char *ValueArg)
{
NATIVE_CHAR Type;
char Type;
UINT32 Index;
UINT32 Value;
ACPI_WALK_STATE *WalkState;
@ -796,12 +796,12 @@ AcpiDbWalkForSpecificObjects (
switch (ACPI_GET_OBJECT_TYPE (ObjDesc))
{
case ACPI_TYPE_METHOD:
AcpiOsPrintf (" #Args %d Concurrency %X",
AcpiOsPrintf (" #Args %d Concurrency %X",
ObjDesc->Method.ParamCount, ObjDesc->Method.Concurrency);
break;
case ACPI_TYPE_INTEGER:
AcpiOsPrintf (" Value %8.8X%8.8X",
AcpiOsPrintf (" Value %8.8X%8.8X",
ACPI_HIDWORD (ObjDesc->Integer.Value),
ACPI_LODWORD (ObjDesc->Integer.Value));
break;
@ -811,7 +811,7 @@ AcpiDbWalkForSpecificObjects (
break;
case ACPI_TYPE_REGION:
AcpiOsPrintf (" SpaceId %X Length %X Address %8.8X%8.8X",
AcpiOsPrintf (" SpaceId %X Length %X Address %8.8X%8.8X",
ObjDesc->Region.SpaceId,
ObjDesc->Region.Length,
ACPI_HIDWORD (ObjDesc->Region.Address),
@ -852,8 +852,8 @@ AcpiDbWalkForSpecificObjects (
ACPI_STATUS
AcpiDbDisplayObjects (
NATIVE_CHAR *ObjTypeArg,
NATIVE_CHAR *DisplayCountArg)
char *ObjTypeArg,
char *DisplayCountArg)
{
ACPI_OBJECT_TYPE Type;
@ -904,7 +904,7 @@ AcpiDbWalkAndMatchName (
void **ReturnValue)
{
ACPI_STATUS Status;
NATIVE_CHAR *RequestedName = (NATIVE_CHAR *) Context;
char *RequestedName = (char *) Context;
UINT32 i;
ACPI_BUFFER Buffer;
@ -959,7 +959,7 @@ AcpiDbWalkAndMatchName (
ACPI_STATUS
AcpiDbFindNameInNamespace (
NATIVE_CHAR *NameArg)
char *NameArg)
{
if (ACPI_STRLEN (NameArg) > 4)
@ -993,7 +993,7 @@ AcpiDbFindNameInNamespace (
void
AcpiDbSetScope (
NATIVE_CHAR *Name)
char *Name)
{
ACPI_STATUS Status;
ACPI_NAMESPACE_NODE *Node;
@ -1060,7 +1060,7 @@ ErrorExit:
void
AcpiDbDisplayResources (
NATIVE_CHAR *ObjectArg)
char *ObjectArg)
{
#if ACPI_MACHINE_WIDTH != 16
@ -1184,12 +1184,6 @@ Cleanup:
}
typedef struct
{
UINT32 Nodes;
UINT32 Objects;
} ACPI_INTEGRITY_INFO;
/*******************************************************************************
*
* FUNCTION: AcpiDbIntegrityWalk

23
sys/dev/acpi/acpica/Subsystem/dbdisply.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dbdisply - debug display commands
* xRevision: 83 $
* xRevision: 86 $
*
******************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dbdisply.c,v 1.6 2002/12/23 00:22:07 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: dbdisply.c,v 1.7 2003/02/13 14:16:16 kanaoka Exp $");
#include "acpi.h"
#include "amlcode.h"
@ -222,14 +222,14 @@ AcpiDbDumpParserDescriptor (
void
AcpiDbDecodeAndDisplayObject (
NATIVE_CHAR *Target,
NATIVE_CHAR *OutputType)
char *Target,
char *OutputType)
{
void *ObjPtr;
ACPI_NAMESPACE_NODE *Node;
ACPI_OPERAND_OBJECT *ObjDesc;
UINT32 Display = DB_BYTE_DISPLAY;
NATIVE_CHAR Buffer[80];
char Buffer[80];
ACPI_BUFFER RetBuf;
ACPI_STATUS Status;
UINT32 Size;
@ -795,6 +795,12 @@ AcpiDbDisplayLocals (void)
ObjDesc = WalkState->MethodDesc;
Node = WalkState->MethodNode;
if (!Node)
{
AcpiOsPrintf ("No method node (Executing subtree for buffer or opregion)\n");
return;
}
AcpiOsPrintf ("Local Variables for method [%4.4s]:\n", Node->Name.Ascii);
for (i = 0; i < ACPI_METHOD_NUM_LOCALS; i++)
@ -838,6 +844,11 @@ AcpiDbDisplayArguments (void)
ObjDesc = WalkState->MethodDesc;
Node = WalkState->MethodNode;
if (!Node)
{
AcpiOsPrintf ("No method node (Executing subtree for buffer or opregion)\n");
return;
}
NumArgs = ObjDesc->Method.ParamCount;
Concurrency = ObjDesc->Method.Concurrency;

21
sys/dev/acpi/acpica/Subsystem/dbexec.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dbexec - debugger control method execution
* xRevision: 50 $
* xRevision: 53 $
*
******************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dbexec.c,v 1.6 2002/12/23 00:22:07 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: dbexec.c,v 1.7 2003/02/13 14:16:16 kanaoka Exp $");
#include "acpi.h"
#include "acdebug.h"
@ -287,7 +287,6 @@ AcpiDbGetOutstandingAllocations (
}
/*******************************************************************************
*
* FUNCTION: AcpiDbExecutionWalk
@ -332,7 +331,7 @@ AcpiDbExecutionWalk (
Status = AcpiEvaluateObject (Node, NULL, NULL, &ReturnObj);
AcpiOsPrintf ("[%4.4s] returned %s\n", Node->Name.Ascii,
AcpiOsPrintf ("[%4.4s] returned %s\n", Node->Name.Ascii,
AcpiFormatException (Status));
AcpiGbl_MethodExecuting = FALSE;
@ -357,8 +356,8 @@ AcpiDbExecutionWalk (
void
AcpiDbExecute (
NATIVE_CHAR *Name,
NATIVE_CHAR **Args,
char *Name,
char **Args,
UINT32 Flags)
{
ACPI_STATUS Status;
@ -429,7 +428,7 @@ AcpiDbExecute (
if (ReturnObj.Length)
{
AcpiOsPrintf ("Execution of %s returned object %p Buflen %X\n",
AcpiGbl_DbMethodInfo.Pathname, ReturnObj.Pointer,
AcpiGbl_DbMethodInfo.Pathname, ReturnObj.Pointer,
(UINT32) ReturnObj.Length);
AcpiDbDumpObject (ReturnObj.Pointer, 1);
}
@ -507,9 +506,9 @@ AcpiDbMethodThread (
void
AcpiDbCreateExecutionThreads (
NATIVE_CHAR *NumThreadsArg,
NATIVE_CHAR *NumLoopsArg,
NATIVE_CHAR *MethodNameArg)
char *NumThreadsArg,
char *NumLoopsArg,
char *MethodNameArg)
{
ACPI_STATUS Status;
UINT32 NumThreads;

136
sys/dev/acpi/acpica/Subsystem/dbfileio.c
View File

@ -2,7 +2,7 @@
*
* Module Name: dbfileio - Debugger file I/O commands. These can't usually
* be used when running the debugger in Ring 0 (Kernel mode)
* xRevision: 69 $
* xRevision: 72 $
*
******************************************************************************/
@ -10,7 +10,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dbfileio.c,v 1.5 2002/12/23 00:22:07 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: dbfileio.c,v 1.6 2003/02/13 14:16:17 kanaoka Exp $");
#include "acpi.h"
#include "acdebug.h"
@ -139,49 +139,6 @@ FILE *AcpiGbl_DebugFile = NULL;
#endif
ACPI_TABLE_HEADER *AcpiGbl_DbTablePtr = NULL;
/*******************************************************************************
*
* FUNCTION: AcpiDbMatchArgument
*
* PARAMETERS: UserArgument - User command line
* Arguments - Array of commands to match against
*
* RETURN: Index into command array or ACPI_TYPE_NOT_FOUND if not found
*
* DESCRIPTION: Search command array for a command match
*
******************************************************************************/
ACPI_OBJECT_TYPE
AcpiDbMatchArgument (
NATIVE_CHAR *UserArgument,
ARGUMENT_INFO *Arguments)
{
UINT32 i;
if (!UserArgument || UserArgument[0] == 0)
{
return (ACPI_TYPE_NOT_FOUND);
}
for (i = 0; Arguments[i].Name; i++)
{
if (ACPI_STRSTR (Arguments[i].Name, UserArgument) == Arguments[i].Name)
{
return (i);
}
}
/* Argument not recognized */
return (ACPI_TYPE_NOT_FOUND);
}
#ifdef ACPI_DEBUGGER
/*******************************************************************************
*
@ -210,7 +167,6 @@ AcpiDbCloseDebugFile (
AcpiOsPrintf ("Debug output file %s closed\n", AcpiGbl_DbDebugFilename);
}
#endif
}
@ -228,7 +184,7 @@ AcpiDbCloseDebugFile (
void
AcpiDbOpenDebugFile (
NATIVE_CHAR *Name)
char *Name)
{
#ifdef ACPI_APPLICATION
@ -254,11 +210,11 @@ AcpiDbOpenDebugFile (
#ifdef ACPI_APPLICATION
/*******************************************************************************
*
* FUNCTION: AcpiDbLoadTable
* FUNCTION: AcpiDbReadTable
*
* PARAMETERS: fp - File that contains table
* TablePtr - Return value, buffer with table
* TableLenght - Return value, length of table
* Table - Return value, buffer with table
* TableLength - Return value, length of table
*
* RETURN: Status
*
@ -267,9 +223,9 @@ AcpiDbOpenDebugFile (
******************************************************************************/
static ACPI_STATUS
AcpiDbLoadTable(
AcpiDbReadTable (
FILE *fp,
ACPI_TABLE_HEADER **TablePtr,
ACPI_TABLE_HEADER **Table,
UINT32 *TableLength)
{
ACPI_TABLE_HEADER TableHeader;
@ -287,7 +243,6 @@ AcpiDbLoadTable(
return (AE_BAD_SIGNATURE);
}
/* Validate the table header/length */
Status = AcpiTbValidateTableHeader (&TableHeader);
@ -298,7 +253,6 @@ AcpiDbLoadTable(
return (AE_ERROR);
}
/* We only support a limited number of table types */
if (ACPI_STRNCMP ((char *) TableHeader.Signature, DSDT_SIG, 4) &&
@ -313,21 +267,20 @@ AcpiDbLoadTable(
/* Allocate a buffer for the table */
*TableLength = TableHeader.Length;
*TablePtr = AcpiOsAllocate ((size_t) *TableLength);
if (!*TablePtr)
*Table = AcpiOsAllocate ((size_t) *TableLength);
if (!*Table)
{
AcpiOsPrintf ("Could not allocate memory for ACPI table %4.4s (size=%X)\n",
TableHeader.Signature, TableHeader.Length);
return (AE_NO_MEMORY);
}
AmlStart = (UINT8 *) *TablePtr + sizeof (TableHeader);
AmlStart = (UINT8 *) *Table + sizeof (TableHeader);
AmlLength = *TableLength - sizeof (TableHeader);
/* Copy the header to the buffer */
ACPI_MEMCPY (*TablePtr, &TableHeader, sizeof (TableHeader));
ACPI_MEMCPY (*Table, &TableHeader, sizeof (TableHeader));
/* Get the rest of the table */
@ -336,8 +289,7 @@ AcpiDbLoadTable(
{
/* Now validate the checksum */
Status = AcpiTbVerifyTableChecksum (*TablePtr);
Status = AcpiTbVerifyTableChecksum (*Table);
return (AE_OK);
}
@ -347,10 +299,9 @@ AcpiDbLoadTable(
return (AE_OK);
}
AcpiOsPrintf ("Error - could not read the table file\n");
AcpiOsFree (*TablePtr);
*TablePtr = NULL;
AcpiOsFree (*Table);
*Table = NULL;
*TableLength = 0;
return (AE_ERROR);
@ -362,7 +313,7 @@ AcpiDbLoadTable(
*
* FUNCTION: AeLocalLoadTable
*
* PARAMETERS: TablePtr - pointer to a buffer containing the entire
* PARAMETERS: Table - pointer to a buffer containing the entire
* table to be loaded
*
* RETURN: Status
@ -372,13 +323,11 @@ AcpiDbLoadTable(
* a valid header. The header fields will be verified, and if it
* is determined that the table is invalid, the call will fail.
*
* If the call fails an appropriate status will be returned.
*
******************************************************************************/
ACPI_STATUS
AeLocalLoadTable (
ACPI_TABLE_HEADER *TablePtr)
ACPI_TABLE_HEADER *Table)
{
ACPI_STATUS Status;
ACPI_TABLE_DESC TableInfo;
@ -386,13 +335,14 @@ AeLocalLoadTable (
ACPI_FUNCTION_TRACE ("AeLocalLoadTable");
if (!TablePtr)
if (!Table)
{
return_ACPI_STATUS (AE_BAD_PARAMETER);
}
TableInfo.Pointer = TablePtr;
Status = AcpiTbRecognizeTable (&TableInfo, ACPI_TABLE_SECONDARY);
TableInfo.Pointer = Table;
Status = AcpiTbRecognizeTable (&TableInfo, ACPI_TABLE_ALL);
if (ACPI_FAILURE (Status))
{
return_ACPI_STATUS (Status);
@ -409,8 +359,8 @@ AeLocalLoadTable (
return_ACPI_STATUS (Status);
}
#if (!defined (ACPI_NO_METHOD_EXECUTION) && !defined (ACPI_CONSTANT_EVAL_ONLY))
Status = AcpiNsLoadTable (TableInfo.InstalledDesc, AcpiGbl_RootNode);
if (ACPI_FAILURE (Status))
{
@ -428,9 +378,10 @@ AeLocalLoadTable (
#ifdef ACPI_APPLICATION
/*******************************************************************************
*
* FUNCTION: AcpiDbGetAcpiTable
* FUNCTION: AcpiDbReadTableFromFile
*
* PARAMETERS: Filname - File where table is located
* PARAMETERS: Filename - File where table is located
* Table - Where a pointer to the table is returned
*
* RETURN: Status
*
@ -439,8 +390,9 @@ AeLocalLoadTable (
******************************************************************************/
ACPI_STATUS
AcpiDbGetAcpiTable (
NATIVE_CHAR *Filename)
AcpiDbReadTableFromFile (
char *Filename,
ACPI_TABLE_HEADER **Table)
{
FILE *fp;
UINT32 TableLength;
@ -452,15 +404,14 @@ AcpiDbGetAcpiTable (
fp = fopen (Filename, "rb");
if (!fp)
{
AcpiOsPrintf ("Could not open file %s\n", Filename);
AcpiOsPrintf ("Could not open input file %s\n", Filename);
return (AE_ERROR);
}
/* Get the entire file */
fprintf (stderr, "Loading Acpi table from file %s\n", Filename);
Status = AcpiDbLoadTable (fp, &AcpiGbl_DbTablePtr, &TableLength);
Status = AcpiDbReadTable (fp, Table, &TableLength);
fclose(fp);
if (ACPI_FAILURE (Status))
@ -476,9 +427,10 @@ AcpiDbGetAcpiTable (
/*******************************************************************************
*
* FUNCTION: AcpiDbLoadAcpiTable
* FUNCTION: AcpiDbGetTableFromFile
*
* PARAMETERS: Filname - File where table is located
* PARAMETERS: Filename - File where table is located
* Table - Where a pointer to the table is returned
*
* RETURN: Status
*
@ -487,14 +439,16 @@ AcpiDbGetAcpiTable (
******************************************************************************/
ACPI_STATUS
AcpiDbLoadAcpiTable (
NATIVE_CHAR *Filename)
AcpiDbGetTableFromFile (
char *Filename,
ACPI_TABLE_HEADER **ReturnTable)
{
#ifdef ACPI_APPLICATION
ACPI_STATUS Status;
ACPI_TABLE_HEADER *Table;
Status = AcpiDbGetAcpiTable (Filename);
Status = AcpiDbReadTableFromFile (Filename, &Table);
if (ACPI_FAILURE (Status))
{
return (Status);
@ -502,13 +456,13 @@ AcpiDbLoadAcpiTable (
/* Attempt to recognize and install the table */
Status = AeLocalLoadTable (AcpiGbl_DbTablePtr);
Status = AeLocalLoadTable (Table);
if (ACPI_FAILURE (Status))
{
if (Status == AE_ALREADY_EXISTS)
{
AcpiOsPrintf ("Table %4.4s is already installed\n",
AcpiGbl_DbTablePtr->Signature);
Table->Signature);
}
else
{
@ -520,14 +474,18 @@ AcpiDbLoadAcpiTable (
}
fprintf (stderr, "Acpi table [%4.4s] successfully installed and loaded\n",
AcpiGbl_DbTablePtr->Signature);
Table->Signature);
AcpiGbl_AcpiHardwarePresent = FALSE;
if (ReturnTable)
{
*ReturnTable = Table;
}
#endif /* ACPI_APPLICATION */
return (AE_OK);
}
#endif /* ACPI_DEBUGGER */

18
sys/dev/acpi/acpica/Subsystem/dbhistry.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: dbhistry - debugger HISTORY command
* xRevision: 25 $
* xRevision: 28 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dbhistry.c,v 1.4 2002/12/23 00:22:07 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: dbhistry.c,v 1.5 2003/02/13 14:16:17 kanaoka Exp $");
#include "acpi.h"
#include "acdebug.h"
@ -133,7 +133,7 @@ __KERNEL_RCSID(0, "$NetBSD: dbhistry.c,v 1.4 2002/12/23 00:22:07 kanaoka Exp $")
typedef struct HistoryInfo
{
NATIVE_CHAR Command[80];
char Command[80];
UINT32 CmdNum;
} HISTORY_INFO;
@ -160,7 +160,7 @@ static UINT32 AcpiGbl_NextCmdNum = 1;
void
AcpiDbAddToHistory (
NATIVE_CHAR *CommandLine)
char *CommandLine)
{
/* Put command into the next available slot */
@ -210,7 +210,7 @@ AcpiDbAddToHistory (
void
AcpiDbDisplayHistory (void)
{
NATIVE_UINT i;
ACPI_NATIVE_UINT i;
UINT16 HistoryIndex;
@ -245,11 +245,11 @@ AcpiDbDisplayHistory (void)
*
******************************************************************************/
NATIVE_CHAR *
char *
AcpiDbGetFromHistory (
NATIVE_CHAR *CommandNumArg)
char *CommandNumArg)
{
NATIVE_UINT i;
ACPI_NATIVE_UINT i;
UINT16 HistoryIndex;
UINT32 CmdNum;

40
sys/dev/acpi/acpica/Subsystem/dbinput.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dbinput - user front-end to the AML debugger
* xRevision: 90 $
* xRevision: 94 $
*
******************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dbinput.c,v 1.6 2002/12/23 00:22:07 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: dbinput.c,v 1.7 2003/02/13 14:16:17 kanaoka Exp $");
#include "acpi.h"
#include "acdebug.h"
@ -255,7 +255,7 @@ static const COMMAND_INFO AcpiGbl_DbCommands[] =
void
AcpiDbDisplayHelp (
NATIVE_CHAR *HelpType)
char *HelpType)
{
@ -361,12 +361,12 @@ AcpiDbDisplayHelp (
*
******************************************************************************/
NATIVE_CHAR *
char *
AcpiDbGetNextToken (
NATIVE_CHAR *String,
NATIVE_CHAR **Next)
char *String,
char **Next)
{
NATIVE_CHAR *Start;
char *Start;
/* At end of buffer? */
@ -429,12 +429,12 @@ AcpiDbGetNextToken (
UINT32
AcpiDbGetLine (
NATIVE_CHAR *InputBuffer)
char *InputBuffer)
{
UINT32 i;
UINT32 Count;
NATIVE_CHAR *Next;
NATIVE_CHAR *This;
char *Next;
char *This;
ACPI_STRCPY (AcpiGbl_DbParsedBuf, InputBuffer);
@ -483,7 +483,7 @@ AcpiDbGetLine (
UINT32
AcpiDbMatchCommand (
NATIVE_CHAR *UserCommand)
char *UserCommand)
{
UINT32 i;
@ -524,14 +524,14 @@ AcpiDbMatchCommand (
ACPI_STATUS
AcpiDbCommandDispatch (
NATIVE_CHAR *InputBuffer,
char *InputBuffer,
ACPI_WALK_STATE *WalkState,
ACPI_PARSE_OBJECT *Op)
{
UINT32 Temp;
UINT32 CommandIndex;
UINT32 ParamCount;
NATIVE_CHAR *CommandLine;
char *CommandLine;
ACPI_STATUS Status = AE_CTRL_TRUE;
@ -617,7 +617,7 @@ AcpiDbCommandDispatch (
break;
case CMD_FIND:
Status = AcpiDbFindNameInNamespace (AcpiGbl_DbArgs[1]);
AcpiDbFindNameInNamespace (AcpiGbl_DbArgs[1]);
break;
case CMD_GO:
@ -702,7 +702,7 @@ AcpiDbCommandDispatch (
break;
case CMD_LOAD:
Status = AcpiDbLoadAcpiTable (AcpiGbl_DbArgs[1]);
Status = AcpiDbGetTableFromFile (AcpiGbl_DbArgs[1], NULL);
if (ACPI_FAILURE (Status))
{
return (Status);
@ -718,7 +718,7 @@ AcpiDbCommandDispatch (
break;
case CMD_METHODS:
Status = AcpiDbDisplayObjects ("METHOD", AcpiGbl_DbArgs[1]);
AcpiDbDisplayObjects ("METHOD", AcpiGbl_DbArgs[1]);
break;
case CMD_NAMESPACE:
@ -732,7 +732,7 @@ AcpiDbCommandDispatch (
case CMD_OBJECT:
ACPI_STRUPR (AcpiGbl_DbArgs[1]);
Status = AcpiDbDisplayObjects (AcpiGbl_DbArgs[1], AcpiGbl_DbArgs[2]);
AcpiDbDisplayObjects (AcpiGbl_DbArgs[1], AcpiGbl_DbArgs[2]);
break;
case CMD_OPEN:
@ -764,7 +764,7 @@ AcpiDbCommandDispatch (
break;
case CMD_STATS:
Status = AcpiDbDisplayStatistics (AcpiGbl_DbArgs[1]);
AcpiDbDisplayStatistics (AcpiGbl_DbArgs[1]);
break;
case CMD_STOP:
@ -915,7 +915,7 @@ AcpiDbSingleThread (
ACPI_STATUS
AcpiDbUserCommands (
NATIVE_CHAR Prompt,
char Prompt,
ACPI_PARSE_OBJECT *Op)
{
ACPI_STATUS Status = AE_OK;

8
sys/dev/acpi/acpica/Subsystem/dbstats.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dbstats - Generation and display of ACPI table statistics
* xRevision: 64 $
* xRevision: 66 $
*
******************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dbstats.c,v 1.7 2002/12/23 00:22:07 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: dbstats.c,v 1.8 2003/02/13 14:16:17 kanaoka Exp $");
#include "acpi.h"
#include "acdebug.h"
@ -368,7 +368,7 @@ AcpiDbCountNamespaceObjects (
ACPI_STATUS
AcpiDbDisplayStatistics (
NATIVE_CHAR *TypeArg)
char *TypeArg)
{
UINT32 i;
UINT32 Type;

61
sys/dev/acpi/acpica/Subsystem/dbutils.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dbutils - AML debugger utilities
* xRevision: 57 $
* xRevision: 61 $
*
******************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dbutils.c,v 1.4 2002/12/23 00:22:08 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: dbutils.c,v 1.5 2003/02/13 14:16:17 kanaoka Exp $");
#include "acpi.h"
#include "acparser.h"
@ -131,6 +131,46 @@ __KERNEL_RCSID(0, "$NetBSD: dbutils.c,v 1.4 2002/12/23 00:22:08 kanaoka Exp $");
ACPI_MODULE_NAME ("dbutils")
/*******************************************************************************
*
* FUNCTION: AcpiDbMatchArgument
*
* PARAMETERS: UserArgument - User command line
* Arguments - Array of commands to match against
*
* RETURN: Index into command array or ACPI_TYPE_NOT_FOUND if not found
*
* DESCRIPTION: Search command array for a command match
*
******************************************************************************/
ACPI_OBJECT_TYPE
AcpiDbMatchArgument (
char *UserArgument,
ARGUMENT_INFO *Arguments)
{
UINT32 i;
if (!UserArgument || UserArgument[0] == 0)
{
return (ACPI_TYPE_NOT_FOUND);
}
for (i = 0; Arguments[i].Name; i++)
{
if (ACPI_STRSTR (Arguments[i].Name, UserArgument) == Arguments[i].Name)
{
return (i);
}
}
/* Argument not recognized */
return (ACPI_TYPE_NOT_FOUND);
}
/*******************************************************************************
*
* FUNCTION: AcpiDbSetOutputDestination
@ -248,7 +288,14 @@ AcpiDbDumpObject (
case ACPI_TYPE_BUFFER:
AcpiOsPrintf ("[Buffer] Length %.2X = ", ObjDesc->Buffer.Length);
AcpiUtDumpBuffer ((UINT8 *) ObjDesc->Buffer.Pointer, ObjDesc->Buffer.Length, DB_DWORD_DISPLAY, _COMPONENT);
if (ObjDesc->Buffer.Length)
{
AcpiUtDumpBuffer ((UINT8 *) ObjDesc->Buffer.Pointer, ObjDesc->Buffer.Length, DB_DWORD_DISPLAY, _COMPONENT);
}
else
{
AcpiOsPrintf ("\n");
}
break;
@ -303,7 +350,7 @@ AcpiDbDumpObject (
void
AcpiDbPrepNamestring (
NATIVE_CHAR *Name)
char *Name)
{
@ -454,9 +501,9 @@ AcpiDbSecondPassParse (
ACPI_NAMESPACE_NODE *
AcpiDbLocalNsLookup (
NATIVE_CHAR *Name)
char *Name)
{
NATIVE_CHAR *InternalPath;
char *InternalPath;
ACPI_STATUS Status;
ACPI_NAMESPACE_NODE *Node = NULL;

166
sys/dev/acpi/acpica/Subsystem/dbxface.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dbxface - AML Debugger external interfaces
* xRevision: 67 $
* xRevision: 70 $
*
******************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dbxface.c,v 1.4 2002/12/23 00:22:08 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: dbxface.c,v 1.5 2003/02/13 14:16:17 kanaoka Exp $");
#include "acpi.h"
#include "amlcode.h"
@ -129,6 +129,113 @@ __KERNEL_RCSID(0, "$NetBSD: dbxface.c,v 1.4 2002/12/23 00:22:08 kanaoka Exp $");
ACPI_MODULE_NAME ("dbxface")
/*******************************************************************************
*
* FUNCTION: AcpiDbStartCommand
*
* PARAMETERS: WalkState - Current walk
*
* RETURN: Status
*
* DESCRIPTION: Enter debugger command loop
*
******************************************************************************/
ACPI_STATUS
AcpiDbStartCommand (
ACPI_WALK_STATE *WalkState,
ACPI_PARSE_OBJECT *Op)
{
ACPI_STATUS Status;
/* TBD: [Investigate] what are the namespace locking issues here */
/* AcpiUtReleaseMutex (ACPI_MTX_NAMESPACE); */
/* Go into the command loop and await next user command */
AcpiGbl_MethodExecuting = TRUE;
Status = AE_CTRL_TRUE;
while (Status == AE_CTRL_TRUE)
{
if (AcpiGbl_DebuggerConfiguration == DEBUGGER_MULTI_THREADED)
{
/* Handshake with the front-end that gets user command lines */
Status = AcpiUtReleaseMutex (ACPI_MTX_DEBUG_CMD_COMPLETE);
if (ACPI_FAILURE (Status))
{
return (Status);
}
Status = AcpiUtAcquireMutex (ACPI_MTX_DEBUG_CMD_READY);
if (ACPI_FAILURE (Status))
{
return (Status);
}
}
else
{
/* Single threaded, we must get a command line ourselves */
/* Force output to console until a command is entered */
AcpiDbSetOutputDestination (ACPI_DB_CONSOLE_OUTPUT);
/* Different prompt if method is executing */
if (!AcpiGbl_MethodExecuting)
{
AcpiOsPrintf ("%1c ", ACPI_DEBUGGER_COMMAND_PROMPT);
}
else
{
AcpiOsPrintf ("%1c ", ACPI_DEBUGGER_EXECUTE_PROMPT);
}
/* Get the user input line */
(void) AcpiOsGetLine (AcpiGbl_DbLineBuf);
}
Status = AcpiDbCommandDispatch (AcpiGbl_DbLineBuf, WalkState, Op);
}
/* AcpiUtAcquireMutex (ACPI_MTX_NAMESPACE); */
return (Status);
}
/*******************************************************************************
*
* FUNCTION: AcpiDbMethodEnd
*
* PARAMETERS: WalkState - Current walk
*
* RETURN: Status
*
* DESCRIPTION:
*
******************************************************************************/
void
AcpiDbMethodEnd (
ACPI_WALK_STATE *WalkState)
{
if (!AcpiGbl_CmSingleStep)
{
return;
}
AcpiOsPrintf ("<Method Terminating>\n");
AcpiDbStartCommand (WalkState, NULL);
}
/*******************************************************************************
*
* FUNCTION: AcpiDbSingleStep
@ -348,59 +455,8 @@ AcpiDbSingleStep (
WalkState->MethodBreakpoint = 1; /* Must be non-zero! */
}
/* TBD: [Investigate] what are the namespace locking issues here */
/* AcpiUtReleaseMutex (ACPI_MTX_NAMESPACE); */
/* Go into the command loop and await next user command */
AcpiGbl_MethodExecuting = TRUE;
Status = AE_CTRL_TRUE;
while (Status == AE_CTRL_TRUE)
{
if (AcpiGbl_DebuggerConfiguration == DEBUGGER_MULTI_THREADED)
{
/* Handshake with the front-end that gets user command lines */
Status = AcpiUtReleaseMutex (ACPI_MTX_DEBUG_CMD_COMPLETE);
if (ACPI_FAILURE (Status))
{
return (Status);
}
Status = AcpiUtAcquireMutex (ACPI_MTX_DEBUG_CMD_READY);
if (ACPI_FAILURE (Status))
{
return (Status);
}
}
else
{
/* Single threaded, we must get a command line ourselves */
/* Force output to console until a command is entered */
AcpiDbSetOutputDestination (ACPI_DB_CONSOLE_OUTPUT);
/* Different prompt if method is executing */
if (!AcpiGbl_MethodExecuting)
{
AcpiOsPrintf ("%1c ", ACPI_DEBUGGER_COMMAND_PROMPT);
}
else
{
AcpiOsPrintf ("%1c ", ACPI_DEBUGGER_EXECUTE_PROMPT);
}
/* Get the user input line */
(void) AcpiOsGetLine (AcpiGbl_DbLineBuf);
}
Status = AcpiDbCommandDispatch (AcpiGbl_DbLineBuf, WalkState, Op);
}
/* AcpiUtAcquireMutex (ACPI_MTX_NAMESPACE); */
Status = AcpiDbStartCommand (WalkState, Op);
/* User commands complete, continue execution of the interrupted method */

4
sys/dev/acpi/acpica/Subsystem/dmbuffer.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dmbuffer - AML disassembler, buffer and string support
* $Revision: 1.1.1.2 $
* xRevision: 10 $
*
******************************************************************************/
@ -114,6 +114,8 @@
*
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dmbuffer.c,v 1.2 2003/02/13 14:16:17 kanaoka Exp $");
#include "acpi.h"
#include "acdisasm.h"

4
sys/dev/acpi/acpica/Subsystem/dmnames.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dmnames - AML disassembler, names, namestrings, pathnames
* $Revision: 1.1.1.2 $
* xRevision: 6 $
*
******************************************************************************/
@ -114,6 +114,8 @@
*
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dmnames.c,v 1.2 2003/02/13 14:16:17 kanaoka Exp $");
#include "acpi.h"
#include "acparser.h"

5
sys/dev/acpi/acpica/Subsystem/dmopcode.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dmopcode - AML disassembler, specific AML opcodes
* $Revision: 1.1.1.2 $
* xRevision: 81 $
*
******************************************************************************/
@ -114,6 +114,9 @@
*
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dmopcode.c,v 1.2 2003/02/13 14:16:17 kanaoka Exp $");
#include "acpi.h"
#include "acparser.h"
#include "amlcode.h"

4
sys/dev/acpi/acpica/Subsystem/dmresrc.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dmresrc.c - Resource Descriptor disassembly
* $Revision: 1.1.1.2 $
* xRevision: 7 $
*
******************************************************************************/
@ -114,6 +114,8 @@
*
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dmresrc.c,v 1.2 2003/02/13 14:16:17 kanaoka Exp $");
#include "acpi.h"
#include "amlcode.h"

4
sys/dev/acpi/acpica/Subsystem/dmresrcl.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dmresrcl.c - "Large" Resource Descriptor disassembly
* $Revision: 1.1.1.2 $
* xRevision: 10 $
*
******************************************************************************/
@ -114,6 +114,8 @@
*
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dmresrcl.c,v 1.2 2003/02/13 14:16:17 kanaoka Exp $");
#include "acpi.h"
#include "acdisasm.h"

4
sys/dev/acpi/acpica/Subsystem/dmresrcs.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dmresrcs.c - "Small" Resource Descriptor disassembly
* $Revision: 1.1.1.2 $
* xRevision: 4 $
*
******************************************************************************/
@ -114,6 +114,8 @@
*
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dmresrcs.c,v 1.2 2003/02/13 14:16:17 kanaoka Exp $");
#include "acpi.h"
#include "acdisasm.h"

4
sys/dev/acpi/acpica/Subsystem/dmutils.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dmutils - AML disassembler utilities
* $Revision: 1.1.1.2 $
* xRevision: 8 $
*
******************************************************************************/
@ -114,6 +114,8 @@
*
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dmutils.c,v 1.2 2003/02/13 14:16:17 kanaoka Exp $");
#include "acpi.h"
#include "amlcode.h"

4
sys/dev/acpi/acpica/Subsystem/dmwalk.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dmwalk - AML disassembly tree walk
* $Revision: 1.1.1.2 $
* xRevision: 9 $
*
******************************************************************************/
@ -114,6 +114,8 @@
*
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dmwalk.c,v 1.2 2003/02/13 14:16:17 kanaoka Exp $");
#include "acpi.h"
#include "acparser.h"

10
sys/dev/acpi/acpica/Subsystem/dsfield.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: dsfield - Dispatcher field routines
* xRevision: 69 $
* xRevision: 71 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dsfield.c,v 1.4 2002/12/23 00:22:08 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: dsfield.c,v 1.5 2003/02/13 14:16:17 kanaoka Exp $");
#define __DSFIELD_C__
@ -349,7 +349,7 @@ AcpiDsGetFieldNames (
/* Lookup the name */
Status = AcpiNsLookup (WalkState->ScopeInfo,
(NATIVE_CHAR *) &Arg->Named.Name,
(char *) &Arg->Named.Name,
Info->FieldType, ACPI_IMODE_EXECUTE, ACPI_NS_DONT_OPEN_SCOPE,
WalkState, &Info->FieldNode);
if (ACPI_FAILURE (Status))
@ -526,7 +526,7 @@ AcpiDsInitFieldObjects (
if (Arg->Common.AmlOpcode == AML_INT_NAMEDFIELD_OP)
{
Status = AcpiNsLookup (WalkState->ScopeInfo,
(NATIVE_CHAR *) &Arg->Named.Name,
(char *) &Arg->Named.Name,
Type, ACPI_IMODE_LOAD_PASS1,
ACPI_NS_NO_UPSEARCH | ACPI_NS_DONT_OPEN_SCOPE | ACPI_NS_ERROR_IF_FOUND,
WalkState, &Node);

15
sys/dev/acpi/acpica/Subsystem/dsinit.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: dsinit - Object initialization namespace walk
* $Revision: 1.2 $
* xRevision: 6 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -114,14 +114,14 @@
*
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dsinit.c,v 1.3 2003/02/13 14:16:18 kanaoka Exp $");
#define __DSINIT_C__
#include "acpi.h"
#include "acparser.h"
#include "amlcode.h"
#include "acdispat.h"
#include "acnamesp.h"
#include "acinterp.h"
#define _COMPONENT ACPI_DISPATCHER
ACPI_MODULE_NAME ("dsinit")
@ -200,10 +200,9 @@ AcpiDsInitOneObject (
/* Print a dot for each method unless we are going to print the entire pathname */
if (!(AcpiDbgLevel & ACPI_LV_INIT_NAMES)
&& (AcpiDbgLevel & ACPI_LV_LOAD))
if (!(AcpiDbgLevel & ACPI_LV_INIT_NAMES))
{
AcpiOsPrintf (".");
ACPI_DEBUG_PRINT_RAW ((ACPI_DB_INIT, "."));
}
/*

6
sys/dev/acpi/acpica/Subsystem/dsmethod.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: dsmethod - Parser/Interpreter interface - control method parsing
* xRevision: 89 $
* xRevision: 90 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dsmethod.c,v 1.4 2002/12/23 00:22:08 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: dsmethod.c,v 1.5 2003/02/13 14:16:18 kanaoka Exp $");
#define __DSMETHOD_C__

24
sys/dev/acpi/acpica/Subsystem/dsmthdat.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dsmthdat - control method arguments and local variables
* xRevision: 67 $
* xRevision: 69 $
*
******************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dsmthdat.c,v 1.4 2002/12/23 00:22:08 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: dsmthdat.c,v 1.5 2003/02/13 14:16:18 kanaoka Exp $");
#define __DSMTHDAT_C__
@ -401,9 +401,9 @@ AcpiDsMethodDataSetValue (
ACPI_FUNCTION_TRACE ("DsMethodDataSetValue");
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
"obj %p op %X, ref count = %d [%s]\n", Object,
Opcode, Object->Common.ReferenceCount,
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
"obj %p op %X, ref count = %d [%s]\n", Object,
Opcode, Object->Common.ReferenceCount,
AcpiUtGetTypeName (Object->Common.Type)));
/* Get the namespace node for the arg/local */
@ -427,7 +427,7 @@ AcpiDsMethodDataSetValue (
return_ACPI_STATUS (Status);
}
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Object Copied %p, new %p\n",
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Object Copied %p, new %p\n",
Object, NewDesc));
}
else
@ -706,7 +706,7 @@ AcpiDsStoreObjectToLocal (
CurrentObjDesc = AcpiNsGetAttachedObject (Node);
if (CurrentObjDesc == ObjDesc)
{
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Obj=%p already installed!\n",
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Obj=%p already installed!\n",
ObjDesc));
return_ACPI_STATUS (Status);
}
@ -737,19 +737,19 @@ AcpiDsStoreObjectToLocal (
*/
if (Opcode == AML_ARG_OP)
{
/*
/*
* 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.
*/
if (ACPI_GET_DESCRIPTOR_TYPE (CurrentObjDesc) != ACPI_DESC_TYPE_OPERAND)
{
ACPI_REPORT_ERROR (("Invalid descriptor type while storing to method arg: %X\n",
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
*/
@ -764,7 +764,7 @@ AcpiDsStoreObjectToLocal (
* Store this object to the Node
* (perform the indirect store)
*/
Status = AcpiExStoreObjectToNode (ObjDesc,
Status = AcpiExStoreObjectToNode (ObjDesc,
CurrentObjDesc->Reference.Object, WalkState);
return_ACPI_STATUS (Status);
}

33
sys/dev/acpi/acpica/Subsystem/dsobject.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: dsobject - Dispatcher object management routines
* xRevision: 111 $
* xRevision: 113 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dsobject.c,v 1.4 2002/12/23 00:22:08 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: dsobject.c,v 1.5 2003/02/13 14:16:18 kanaoka Exp $");
#define __DSOBJECT_C__
@ -294,23 +294,24 @@ AcpiDsBuildInternalBufferObj (
{
ObjDesc->Buffer.Pointer = NULL;
ACPI_REPORT_WARNING (("Buffer created with zero length in AML\n"));
return_ACPI_STATUS (AE_OK);
}
ObjDesc->Buffer.Pointer = ACPI_MEM_CALLOCATE (
ObjDesc->Buffer.Length);
if (!ObjDesc->Buffer.Pointer)
else
{
AcpiUtDeleteObjectDesc (ObjDesc);
return_ACPI_STATUS (AE_NO_MEMORY);
}
ObjDesc->Buffer.Pointer = ACPI_MEM_CALLOCATE (
ObjDesc->Buffer.Length);
if (!ObjDesc->Buffer.Pointer)
{
AcpiUtDeleteObjectDesc (ObjDesc);
return_ACPI_STATUS (AE_NO_MEMORY);
}
/* Initialize buffer from the ByteList (if present) */
/* Initialize buffer from the ByteList (if present) */
if (ByteList)
{
ACPI_MEMCPY (ObjDesc->Buffer.Pointer, ByteList->Named.Data,
ByteListLength);
if (ByteList)
{
ACPI_MEMCPY (ObjDesc->Buffer.Pointer, ByteList->Named.Data,
ByteListLength);
}
}
ObjDesc->Buffer.Flags |= AOPOBJ_DATA_VALID;

6
sys/dev/acpi/acpica/Subsystem/dsopcode.c
View File

@ -2,7 +2,7 @@
*
* Module Name: dsopcode - Dispatcher Op Region support and handling of
* "control" opcodes
* xRevision: 84 $
* xRevision: 85 $
*
*****************************************************************************/
@ -10,7 +10,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dsopcode.c,v 1.4 2002/12/23 00:22:08 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: dsopcode.c,v 1.5 2003/02/13 14:16:18 kanaoka Exp $");
#define __DSOPCODE_C__

8
sys/dev/acpi/acpica/Subsystem/dsutils.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dsutils - Dispatcher utilities
* xRevision: 97 $
* xRevision: 99 $
*
******************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dsutils.c,v 1.4 2002/12/23 00:22:08 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: dsutils.c,v 1.5 2003/02/13 14:16:18 kanaoka Exp $");
#define __DSUTILS_C__
@ -448,7 +448,7 @@ AcpiDsCreateOperand (
UINT32 ArgIndex)
{
ACPI_STATUS Status = AE_OK;
NATIVE_CHAR *NameString;
char *NameString;
UINT32 NameLength;
ACPI_OPERAND_OBJECT *ObjDesc;
ACPI_PARSE_OBJECT *ParentOp;

14
sys/dev/acpi/acpica/Subsystem/dswexec.c
View File

@ -2,7 +2,7 @@
*
* Module Name: dswexec - Dispatcher method execution callbacks;
* dispatch to interpreter.
* xRevision: 96 $
* xRevision: 98 $
*
*****************************************************************************/
@ -10,7 +10,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dswexec.c,v 1.4 2002/12/23 00:22:08 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: dswexec.c,v 1.5 2003/02/13 14:16:18 kanaoka Exp $");
#define __DSWEXEC_C__
@ -766,6 +766,14 @@ Cleanup:
AcpiDsDeleteResultIfNotUsed (Op, WalkState->ResultObj, WalkState);
}
#if _UNDER_DEVELOPMENT
if (WalkState->ParserState.Aml == WalkState->ParserState.AmlEnd)
{
AcpiDbMethodEnd (WalkState);
}
#endif
/* Always clear the object stack */
WalkState->NumOperands = 0;

32
sys/dev/acpi/acpica/Subsystem/dswload.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: dswload - Dispatcher namespace load callbacks
* xRevision: 80 $
* xRevision: 83 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dswload.c,v 1.4 2002/12/23 00:22:09 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: dswload.c,v 1.5 2003/02/13 14:16:18 kanaoka Exp $");
#define __DSWLOAD_C__
@ -204,7 +204,7 @@ AcpiDsLoad1BeginOp (
ACPI_NAMESPACE_NODE *Node;
ACPI_STATUS Status;
ACPI_OBJECT_TYPE ObjectType;
NATIVE_CHAR *Path;
char *Path;
UINT32 Flags;
@ -287,7 +287,7 @@ AcpiDsLoad1BeginOp (
case ACPI_TYPE_STRING:
case ACPI_TYPE_BUFFER:
/*
/*
* These types we will allow, but we will change the type. This
* enables some existing code of the form:
*
@ -297,7 +297,7 @@ AcpiDsLoad1BeginOp (
* Note: silently change the type here. On the second pass, we will report a warning
*/
ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Type override - [%4.4s] had invalid type (%s) for Scope operator, changed to (Scope)\n",
ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Type override - [%4.4s] had invalid type (%s) for Scope operator, changed to (Scope)\n",
Path, AcpiUtGetTypeName (Node->Type)));
Node->Type = ACPI_TYPE_ANY;
@ -308,7 +308,7 @@ AcpiDsLoad1BeginOp (
/* All other types are an error */
ACPI_REPORT_ERROR (("Invalid type (%s) for target of Scope operator [%4.4s] (Cannot override)\n",
ACPI_REPORT_ERROR (("Invalid type (%s) for target of Scope operator [%4.4s] (Cannot override)\n",
AcpiUtGetTypeName (Node->Type), Path));
return (AE_AML_OPERAND_TYPE);
@ -322,15 +322,15 @@ AcpiDsLoad1BeginOp (
* For all other named opcodes, we will enter the name into the namespace.
*
* Setup the search flags.
* Since we are entering a name into the namespace, we do not want to
* Since we are entering a name into the namespace, we do not want to
* enable the search-to-root upsearch.
*
* There are only two conditions where it is acceptable that the name
* already exists:
* 1) the Scope() operator can reopen a scoping object that was
* 1) the Scope() operator can reopen a scoping object that was
* previously defined (Scope, Method, Device, etc.)
* 2) Whenever we are parsing a deferred opcode (OpRegion, Buffer,
* BufferField, or Package), the name of the object is already
* 2) Whenever we are parsing a deferred opcode (OpRegion, Buffer,
* BufferField, or Package), the name of the object is already
* in the namespace.
*/
Flags = ACPI_NS_NO_UPSEARCH;
@ -543,7 +543,7 @@ AcpiDsLoad2BeginOp (
ACPI_NAMESPACE_NODE *Node;
ACPI_STATUS Status;
ACPI_OBJECT_TYPE ObjectType;
NATIVE_CHAR *BufferPtr;
char *BufferPtr;
ACPI_FUNCTION_TRACE ("DsLoad2BeginOp");
@ -581,7 +581,7 @@ AcpiDsLoad2BeginOp (
{
/* Get name from the op */
BufferPtr = (NATIVE_CHAR *) &Op->Named.Name;
BufferPtr = (char *) &Op->Named.Name;
}
}
else
@ -651,7 +651,7 @@ AcpiDsLoad2BeginOp (
case ACPI_TYPE_STRING:
case ACPI_TYPE_BUFFER:
/*
/*
* These types we will allow, but we will change the type. This
* enables some existing code of the form:
*
@ -659,7 +659,7 @@ AcpiDsLoad2BeginOp (
* Scope (DEB) { ... }
*/
ACPI_REPORT_WARNING (("Type override - [%4.4s] had invalid type (%s) for Scope operator, changed to (Scope)\n",
ACPI_REPORT_WARNING (("Type override - [%4.4s] had invalid type (%s) for Scope operator, changed to (Scope)\n",
BufferPtr, AcpiUtGetTypeName (Node->Type)));
Node->Type = ACPI_TYPE_ANY;
@ -670,7 +670,7 @@ AcpiDsLoad2BeginOp (
/* All other types are an error */
ACPI_REPORT_ERROR (("Invalid type (%s) for target of Scope operator [%4.4s]\n",
ACPI_REPORT_ERROR (("Invalid type (%s) for target of Scope operator [%4.4s]\n",
AcpiUtGetTypeName (Node->Type), BufferPtr));
return (AE_AML_OPERAND_TYPE);

6
sys/dev/acpi/acpica/Subsystem/dswscope.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: dswscope - Scope stack manipulation
* xRevision: 56 $
* xRevision: 57 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dswscope.c,v 1.4 2002/12/23 00:22:09 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: dswscope.c,v 1.5 2003/02/13 14:16:18 kanaoka Exp $");
#define __DSWSCOPE_C__

18
sys/dev/acpi/acpica/Subsystem/dswstate.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: dswstate - Dispatcher parse tree walk management routines
* xRevision: 71 $
* xRevision: 75 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dswstate.c,v 1.4 2002/12/23 00:22:09 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: dswstate.c,v 1.5 2003/02/13 14:16:18 kanaoka Exp $");
#define __DSWSTATE_C__
@ -275,7 +275,7 @@ AcpiDsResultPop (
ACPI_OPERAND_OBJECT **Object,
ACPI_WALK_STATE *WalkState)
{
NATIVE_UINT Index;
ACPI_NATIVE_UINT Index;
ACPI_GENERIC_STATE *State;
@ -339,7 +339,7 @@ AcpiDsResultPopFromBottom (
ACPI_OPERAND_OBJECT **Object,
ACPI_WALK_STATE *WalkState)
{
NATIVE_UINT Index;
ACPI_NATIVE_UINT Index;
ACPI_GENERIC_STATE *State;
@ -815,7 +815,7 @@ AcpiDsObjStackGetValue (
return_PTR (NULL);
}
return_PTR (WalkState->Operands[(NATIVE_UINT)(WalkState->NumOperands - 1) -
return_PTR (WalkState->Operands[(ACPI_NATIVE_UINT)(WalkState->NumOperands - 1) -
Index]);
}
@ -846,7 +846,7 @@ AcpiDsGetCurrentWalkState (
return (NULL);
}
ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "DsGetCurrentWalkState, =%p\n",
ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "Current WalkState %p\n",
Thread->WalkStateList));
return (Thread->WalkStateList);
@ -1064,7 +1064,7 @@ AcpiDsInitAmlWalk (
}
else
{
/*
/*
* 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
@ -1083,7 +1083,7 @@ AcpiDsInitAmlWalk (
{
ParserState->StartNode = ExtraOp->Common.Node;
}
if (ParserState->StartNode)
{
/* Push start scope on scope stack and make it current */

13
sys/dev/acpi/acpica/Subsystem/evevent.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: evevent - Fixed Event handling and dispatch
* xRevision: 104 $
* xRevision: 106 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -115,11 +115,10 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: evevent.c,v 1.4 2002/12/23 00:22:09 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: evevent.c,v 1.5 2003/02/13 14:16:19 kanaoka Exp $");
#include "acpi.h"
#include "acevents.h"
#include "acnamesp.h"
#define _COMPONENT ACPI_EVENTS
ACPI_MODULE_NAME ("evevent")
@ -258,7 +257,7 @@ ACPI_STATUS
AcpiEvFixedEventInitialize (
void)
{
NATIVE_UINT i;
ACPI_NATIVE_UINT i;
ACPI_STATUS Status;
@ -307,7 +306,7 @@ AcpiEvFixedEventDetect (
UINT32 IntStatus = ACPI_INTERRUPT_NOT_HANDLED;
UINT32 FixedStatus;
UINT32 FixedEnable;
NATIVE_UINT_MAX32 i;
ACPI_NATIVE_UINT i;
ACPI_FUNCTION_NAME ("EvFixedEventDetect");
@ -336,7 +335,7 @@ AcpiEvFixedEventDetect (
{
/* Found an active (signalled) event */
IntStatus |= AcpiEvFixedEventDispatch (i);
IntStatus |= AcpiEvFixedEventDispatch ((UINT32) i);
}
}

31
sys/dev/acpi/acpica/Subsystem/evgpe.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: evgpe - General Purpose Event handling and dispatch
* $Revision: 1.2 $
* xRevision: 5 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -114,6 +114,9 @@
*
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: evgpe.c,v 1.3 2003/02/13 14:16:19 kanaoka Exp $");
#include "acpi.h"
#include "acevents.h"
#include "acnamesp.h"
@ -137,8 +140,8 @@
ACPI_STATUS
AcpiEvGpeInitialize (void)
{
NATIVE_UINT_MAX32 i;
NATIVE_UINT_MAX32 j;
ACPI_NATIVE_UINT i;
ACPI_NATIVE_UINT j;
UINT32 GpeBlock;
UINT32 GpeRegister;
UINT32 GpeNumberIndex;
@ -175,7 +178,7 @@ AcpiEvGpeInitialize (void)
AcpiGbl_GpeBlockInfo[1].BlockBaseNumber = AcpiGbl_FADT->Gpe1Base;
/*
/*
* Determine the maximum GPE number for this machine.
*
* Note: both GPE0 and GPE1 are optional, and either can exist without
@ -204,7 +207,7 @@ AcpiEvGpeInitialize (void)
{
ACPI_REPORT_ERROR ((
"GPE0 block (GPE 0 to %d) overlaps the GPE1 block (GPE %d to %d) - Ignoring GPE1\n",
AcpiGbl_GpeNumberMax, AcpiGbl_FADT->Gpe1Base,
AcpiGbl_GpeNumberMax, AcpiGbl_FADT->Gpe1Base,
AcpiGbl_FADT->Gpe1Base + ((AcpiGbl_GpeBlockInfo[1].RegisterCount * ACPI_GPE_REGISTER_WIDTH) - 1)));
/* Ignore GPE1 block by setting the register count to zero */
@ -213,11 +216,11 @@ AcpiEvGpeInitialize (void)
}
else
{
/*
/*
* GPE0 and GPE1 do not have to be contiguous in the GPE number space,
* But, GPE0 always starts at zero.
*/
AcpiGbl_GpeNumberMax = AcpiGbl_FADT->Gpe1Base +
AcpiGbl_GpeNumberMax = AcpiGbl_FADT->Gpe1Base +
((AcpiGbl_GpeBlockInfo[1].RegisterCount * ACPI_GPE_REGISTER_WIDTH) - 1);
}
}
@ -238,7 +241,7 @@ AcpiEvGpeInitialize (void)
if (AcpiGbl_GpeNumberMax > ACPI_GPE_MAX)
{
ACPI_REPORT_ERROR (("Maximum GPE number from FADT is too large: 0x%X\n",
ACPI_REPORT_ERROR (("Maximum GPE number from FADT is too large: 0x%X\n",
AcpiGbl_GpeNumberMax));
return_ACPI_STATUS (AE_BAD_VALUE);
}
@ -277,7 +280,7 @@ AcpiEvGpeInitialize (void)
* per register. Initialization to zeros is sufficient.
*/
AcpiGbl_GpeNumberInfo = ACPI_MEM_CALLOCATE (
(ACPI_SIZE) (AcpiGbl_GpeRegisterCount * ACPI_GPE_REGISTER_WIDTH) *
((ACPI_SIZE) AcpiGbl_GpeRegisterCount * ACPI_GPE_REGISTER_WIDTH) *
sizeof (ACPI_GPE_NUMBER_INFO));
if (!AcpiGbl_GpeNumberInfo)
{
@ -326,7 +329,7 @@ AcpiEvGpeInitialize (void)
for (j = 0; j < ACPI_GPE_REGISTER_WIDTH; j++)
{
GpeNumber = GpeRegisterInfo->BaseGpeNumber + j;
GpeNumber = GpeRegisterInfo->BaseGpeNumber + (UINT32) j;
AcpiGbl_GpeNumberToIndex[GpeNumber].NumberIndex = (UINT8) GpeNumberIndex;
AcpiGbl_GpeNumberInfo[GpeNumberIndex].BitMask = AcpiGbl_DecodeTo8bit[j];
@ -362,7 +365,7 @@ AcpiEvGpeInitialize (void)
ACPI_HIDWORD (ACPI_GET_ADDRESS (AcpiGbl_GpeBlockInfo[GpeBlock].BlockAddress->Address)),
ACPI_LODWORD (ACPI_GET_ADDRESS (AcpiGbl_GpeBlockInfo[GpeBlock].BlockAddress->Address))));
ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "GPE Block%d defined as GPE%d to GPE%d\n",
ACPI_REPORT_INFO (("GPE Block%d defined as GPE%d to GPE%d\n",
(INT32) GpeBlock,
(UINT32) AcpiGbl_GpeBlockInfo[GpeBlock].BlockBaseNumber,
(UINT32) (AcpiGbl_GpeBlockInfo[GpeBlock].BlockBaseNumber +
@ -415,7 +418,7 @@ AcpiEvSaveMethodInfo (
{
UINT32 GpeNumber;
UINT32 GpeNumberIndex;
NATIVE_CHAR Name[ACPI_NAME_SIZE + 1];
char Name[ACPI_NAME_SIZE + 1];
UINT8 Type;
ACPI_STATUS Status;
@ -690,7 +693,7 @@ AcpiEvAsynchExecuteGpeMethod (
if (ACPI_FAILURE (Status))
{
ACPI_REPORT_ERROR (("%s while evaluating method [%4.4s] for GPE[%2.2X]\n",
AcpiFormatException (Status),
AcpiFormatException (Status),
GpeInfo.MethodNode->Name.Ascii, GpeNumber));
}
}

22
sys/dev/acpi/acpica/Subsystem/evmisc.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: evmisc - Miscellaneous event manager support functions
* xRevision: 59 $
* xRevision: 62 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: evmisc.c,v 1.4 2002/12/23 00:22:09 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: evmisc.c,v 1.5 2003/02/13 14:16:19 kanaoka Exp $");
#include "acpi.h"
#include "acevents.h"
@ -334,7 +334,7 @@ AcpiEvQueueNotifyRequest (
{
/* There is no per-device notify handler for this device */
ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
"No notify handler for [%4.4s] node %p\n", Node->Name.Ascii, Node));
}
@ -678,7 +678,7 @@ AcpiEvReleaseGlobalLock (void)
void
AcpiEvTerminate (void)
{
NATIVE_UINT_MAX32 i;
ACPI_NATIVE_UINT i;
ACPI_STATUS Status;
@ -697,10 +697,10 @@ AcpiEvTerminate (void)
*/
for (i = 0; i < ACPI_NUM_FIXED_EVENTS; i++)
{
Status = AcpiDisableEvent(i, ACPI_EVENT_FIXED, 0);
Status = AcpiDisableEvent ((UINT32) i, ACPI_EVENT_FIXED, 0);
if (ACPI_FAILURE (Status))
{
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not disable fixed event %d\n", i));
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not disable fixed event %d\n", (UINT32) i));
}
}
@ -709,12 +709,12 @@ AcpiEvTerminate (void)
*/
for (i = 0; i < AcpiGbl_GpeNumberMax; i++)
{
if (AcpiEvGetGpeNumberIndex(i) != ACPI_GPE_INVALID)
if (AcpiEvGetGpeNumberIndex ((UINT32)i) != ACPI_GPE_INVALID)
{
Status = AcpiHwDisableGpe(i);
Status = AcpiHwDisableGpe((UINT32) i);
if (ACPI_FAILURE (Status))
{
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not disable GPE %d\n", i));
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not disable GPE %d\n", (UINT32) i));
}
}
}
@ -722,7 +722,7 @@ AcpiEvTerminate (void)
/*
* Remove SCI handler
*/
Status = AcpiEvRemoveSciHandler();
Status = AcpiEvRemoveSciHandler ();
if (ACPI_FAILURE(Status))
{
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not remove SCI handler\n"));

6
sys/dev/acpi/acpica/Subsystem/evregion.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: evregion - ACPI AddressSpace (OpRegion) handler dispatch
* xRevision: 136 $
* xRevision: 137 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: evregion.c,v 1.4 2002/12/23 00:22:09 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: evregion.c,v 1.5 2003/02/13 14:16:19 kanaoka Exp $");
#define __EVREGION_C__

6
sys/dev/acpi/acpica/Subsystem/evrgnini.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: evrgnini- ACPI AddressSpace (OpRegion) init
* xRevision: 64 $
* xRevision: 65 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: evrgnini.c,v 1.4 2002/12/23 00:22:09 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: evrgnini.c,v 1.5 2003/02/13 14:16:19 kanaoka Exp $");
#define __EVRGNINI_C__

6
sys/dev/acpi/acpica/Subsystem/evsci.c
View File

@ -2,7 +2,7 @@
*
* Module Name: evsci - System Control Interrupt configuration and
* legacy to ACPI mode state transition functions
* xRevision: 86 $
* xRevision: 87 $
*
******************************************************************************/
@ -10,7 +10,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -117,7 +117,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: evsci.c,v 1.4 2002/12/23 00:22:09 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: evsci.c,v 1.5 2003/02/13 14:16:19 kanaoka Exp $");
#include "acpi.h"
#include "acevents.h"

6
sys/dev/acpi/acpica/Subsystem/evxface.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: evxface - External interfaces for ACPI events
* xRevision: 132 $
* xRevision: 133 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: evxface.c,v 1.4 2002/12/23 00:22:09 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: evxface.c,v 1.5 2003/02/13 14:16:19 kanaoka Exp $");
#define __EVXFACE_C__

6
sys/dev/acpi/acpica/Subsystem/evxfevnt.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: evxfevnt - External Interfaces, ACPI event disable/enable
* xRevision: 59 $
* xRevision: 60 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: evxfevnt.c,v 1.4 2002/12/23 00:22:09 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: evxfevnt.c,v 1.5 2003/02/13 14:16:19 kanaoka Exp $");
#define __EVXFEVNT_C__

6
sys/dev/acpi/acpica/Subsystem/evxfregn.c
View File

@ -2,7 +2,7 @@
*
* Module Name: evxfregn - External Interfaces, ACPI Operation Regions and
* Address Spaces.
* xRevision: 52 $
* xRevision: 53 $
*
*****************************************************************************/
@ -10,7 +10,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: evxfregn.c,v 1.4 2002/12/23 00:22:10 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: evxfregn.c,v 1.5 2003/02/13 14:16:19 kanaoka Exp $");
#define __EVXFREGN_C__

6
sys/dev/acpi/acpica/Subsystem/exconfig.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: exconfig - Namespace reconfiguration (Load/Unload opcodes)
* xRevision: 69 $
* xRevision: 70 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: exconfig.c,v 1.4 2002/12/23 00:22:10 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: exconfig.c,v 1.5 2003/02/13 14:16:19 kanaoka Exp $");
#define __EXCONFIG_C__

64
sys/dev/acpi/acpica/Subsystem/exconvrt.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: exconvrt - Object conversion routines
* xRevision: 45 $
* xRevision: 49 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: exconvrt.c,v 1.6 2002/12/23 00:22:10 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: exconvrt.c,v 1.7 2003/02/13 14:16:19 kanaoka Exp $");
#define __EXCONVRT_C__
@ -312,7 +312,7 @@ AcpiExConvertToBuffer (
/*
* Create a new Buffer object.
* Need enough space for one integer
* Need enough space for one integer
*/
RetDesc = AcpiUtCreateBufferObject (AcpiGbl_IntegerByteWidth);
if (!RetDesc)
@ -345,7 +345,7 @@ AcpiExConvertToBuffer (
/* Copy the string to the buffer */
NewBuf = RetDesc->Buffer.Pointer;
ACPI_STRNCPY ((char *) NewBuf, (char *) ObjDesc->String.Pointer,
ACPI_STRNCPY ((char *) NewBuf, (char *) ObjDesc->String.Pointer,
ObjDesc->String.Length);
break;
@ -383,6 +383,7 @@ AcpiExConvertToBuffer (
* PARAMETERS: Integer - Value to be converted
* Base - 10 or 16
* String - Where the string is returned
* DataWidth - Size of data item to be converted
*
* RETURN: Actual string length
*
@ -394,7 +395,8 @@ UINT32
AcpiExConvertToAscii (
ACPI_INTEGER Integer,
UINT32 Base,
UINT8 *String)
UINT8 *String,
UINT8 DataWidth)
{
UINT32 i;
UINT32 j;
@ -402,12 +404,23 @@ AcpiExConvertToAscii (
char HexDigit;
ACPI_INTEGER Digit;
UINT32 Remainder;
UINT32 Length = sizeof (ACPI_INTEGER);
BOOLEAN LeadingZero = TRUE;
UINT32 Length;
BOOLEAN LeadingZero;
ACPI_FUNCTION_ENTRY ();
if (DataWidth < sizeof (ACPI_INTEGER))
{
LeadingZero = FALSE;
Length = DataWidth;
}
else
{
LeadingZero = TRUE;
Length = sizeof (ACPI_INTEGER);
}
switch (Base)
{
@ -475,8 +488,8 @@ AcpiExConvertToAscii (
String [0] = ACPI_ASCII_ZERO;
k = 1;
}
String [k] = 0;
String [k] = 0;
return (k);
}
@ -505,7 +518,6 @@ AcpiExConvertToString (
{
ACPI_OPERAND_OBJECT *RetDesc;
UINT32 i;
UINT32 Index;
UINT32 StringLength;
UINT8 *NewBuf;
UINT8 *Pointer;
@ -561,7 +573,7 @@ AcpiExConvertToString (
/* Convert */
i = AcpiExConvertToAscii (ObjDesc->Integer.Value, Base, NewBuf);
i = AcpiExConvertToAscii (ObjDesc->Integer.Value, Base, NewBuf, sizeof (ACPI_INTEGER));
/* Null terminate at the correct place */
@ -582,10 +594,17 @@ AcpiExConvertToString (
case ACPI_TYPE_BUFFER:
StringLength = ObjDesc->Buffer.Length * 3;
if (Base == 10)
/* Find the string length */
Pointer = ObjDesc->Buffer.Pointer;
for (StringLength = 0; StringLength < ObjDesc->Buffer.Length; StringLength++)
{
StringLength = ObjDesc->Buffer.Length * 4;
/* Exit on null terminator */
if (!Pointer[StringLength])
{
break;
}
}
if (MaxLength > ACPI_MAX_STRING_CONVERSION)
@ -621,24 +640,15 @@ AcpiExConvertToString (
return_ACPI_STATUS (AE_NO_MEMORY);
}
/*
* Convert each byte of the buffer to two ASCII characters plus a space.
*/
Pointer = ObjDesc->Buffer.Pointer;
Index = 0;
for (i = 0, Index = 0; i < ObjDesc->Buffer.Length; i++)
{
Index = AcpiExConvertToAscii ((ACPI_INTEGER) Pointer[i], Base, &NewBuf[Index]);
/* Copy the appropriate number of buffer characters */
NewBuf[Index] = ' ';
Index++;
}
ACPI_MEMCPY (NewBuf, Pointer, StringLength);
/* Null terminate */
NewBuf [Index-1] = 0;
NewBuf [StringLength] = 0;
RetDesc->Buffer.Pointer = NewBuf;
RetDesc->String.Length = (UINT32) ACPI_STRLEN ((char *) NewBuf);
RetDesc->String.Length = StringLength;
break;

10
sys/dev/acpi/acpica/Subsystem/excreate.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: excreate - Named object creation
* xRevision: 97 $
* xRevision: 99 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: excreate.c,v 1.4 2002/12/23 00:22:10 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: excreate.c,v 1.5 2003/02/13 14:16:20 kanaoka Exp $");
#define __EXCREATE_C__
@ -164,10 +164,10 @@ AcpiExCreateAlias (
if (TargetNode->Type == ACPI_TYPE_LOCAL_ALIAS)
{
/*
/*
* Dereference an existing alias so that we don't create a chain
* of aliases. With this code, we guarantee that an alias is
* always exactly one level of indirection away from the
* always exactly one level of indirection away from the
* actual aliased name.
*/
TargetNode = (ACPI_NAMESPACE_NODE *) TargetNode->Object;

14
sys/dev/acpi/acpica/Subsystem/exdump.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: exdump - Interpreter debug output routines
* xRevision: 163 $
* xRevision: 166 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: exdump.c,v 1.4 2002/12/23 00:22:10 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: exdump.c,v 1.5 2003/02/13 14:16:20 kanaoka Exp $");
#define __EXDUMP_C__
@ -499,13 +499,13 @@ void
AcpiExDumpOperands (
ACPI_OPERAND_OBJECT **Operands,
ACPI_INTERPRETER_MODE InterpreterMode,
NATIVE_CHAR *Ident,
char *Ident,
UINT32 NumLevels,
NATIVE_CHAR *Note,
NATIVE_CHAR *ModuleName,
char *Note,
char *ModuleName,
UINT32 LineNumber)
{
NATIVE_UINT i;
ACPI_NATIVE_UINT i;
ACPI_OPERAND_OBJECT **ObjDesc;

12
sys/dev/acpi/acpica/Subsystem/exfield.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: exfield - ACPI AML (p-code) execution - field manipulation
* xRevision: 116 $
* xRevision: 118 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: exfield.c,v 1.4 2002/12/23 00:22:10 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: exfield.c,v 1.5 2003/02/13 14:16:20 kanaoka Exp $");
#define __EXFIELD_C__
@ -202,7 +202,7 @@ AcpiExReadDataFromField (
* Perform the read.
* Note: Smbus protocol value is passed in upper 16-bits of Function
*/
Status = AcpiExAccessRegion (ObjDesc, 0,
Status = AcpiExAccessRegion (ObjDesc, 0,
ACPI_CAST_PTR (ACPI_INTEGER, BufferDesc->Buffer.Pointer),
ACPI_READ | (ObjDesc->Field.Attribute << 16));
AcpiExReleaseGlobalLock (Locked);
@ -368,11 +368,11 @@ AcpiExWriteDataToField (
Locked = AcpiExAcquireGlobalLock (ObjDesc->CommonField.FieldFlags);
/*
/*
* Perform the write (returns status and perhaps data in the same buffer)
* Note: SMBus protocol type is passed in upper 16-bits of Function.
*/
Status = AcpiExAccessRegion (ObjDesc, 0,
Status = AcpiExAccessRegion (ObjDesc, 0,
(ACPI_INTEGER *) Buffer,
ACPI_WRITE | (ObjDesc->Field.Attribute << 16));
AcpiExReleaseGlobalLock (Locked);

8
sys/dev/acpi/acpica/Subsystem/exfldio.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: exfldio - Aml Field I/O
* xRevision: 90 $
* xRevision: 92 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: exfldio.c,v 1.4 2002/12/23 00:22:10 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: exfldio.c,v 1.5 2003/02/13 14:16:20 kanaoka Exp $");
#define __EXFLDIO_C__
@ -262,7 +262,7 @@ AcpiExAccessRegion (
ACPI_FUNCTION_TRACE ("ExAccessRegion");
/*
/*
* Ensure that the region operands are fully evaluated and verify
* the validity of the request
*/

16
sys/dev/acpi/acpica/Subsystem/exmisc.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: exmisc - ACPI AML (p-code) execution - specific opcodes
* xRevision: 113 $
* xRevision: 115 $
*
*****************************************************************************/
@ -10,7 +10,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -117,7 +117,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: exmisc.c,v 1.4 2002/12/23 00:22:10 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: exmisc.c,v 1.5 2003/02/13 14:16:20 kanaoka Exp $");
#define __EXMISC_C__
@ -327,7 +327,7 @@ AcpiExDoConcatenate (
UINT32 i;
ACPI_INTEGER ThisInteger;
ACPI_OPERAND_OBJECT *ReturnDesc;
NATIVE_CHAR *NewBuf;
char *NewBuf;
ACPI_FUNCTION_ENTRY ();
@ -353,14 +353,14 @@ AcpiExDoConcatenate (
return (AE_NO_MEMORY);
}
NewBuf = (NATIVE_CHAR *) ReturnDesc->Buffer.Pointer;
NewBuf = (char *) ReturnDesc->Buffer.Pointer;
/* Convert the first integer */
ThisInteger = ObjDesc1->Integer.Value;
for (i = 0; i < AcpiGbl_IntegerByteWidth; i++)
{
NewBuf[i] = (NATIVE_CHAR) ThisInteger;
NewBuf[i] = (char) ThisInteger;
ThisInteger >>= 8;
}
@ -369,7 +369,7 @@ AcpiExDoConcatenate (
ThisInteger = ObjDesc2->Integer.Value;
for (; i < (ACPI_MUL_2 (AcpiGbl_IntegerByteWidth)); i++)
{
NewBuf[i] = (NATIVE_CHAR) ThisInteger;
NewBuf[i] = (char) ThisInteger;
ThisInteger >>= 8;
}
@ -424,7 +424,7 @@ AcpiExDoConcatenate (
return (AE_NO_MEMORY);
}
NewBuf = (NATIVE_CHAR *) ReturnDesc->Buffer.Pointer;
NewBuf = (char *) ReturnDesc->Buffer.Pointer;
/* Concatenate the buffers */

8
sys/dev/acpi/acpica/Subsystem/exmutex.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: exmutex - ASL Mutex Acquire/Release functions
* xRevision: 16 $
* xRevision: 18 $
*
*****************************************************************************/
@ -10,7 +10,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: exmutex.c,v 1.6 2002/12/23 00:22:11 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: exmutex.c,v 1.7 2003/02/13 14:16:20 kanaoka Exp $");
#define __EXMUTEX_C__
@ -351,7 +351,7 @@ AcpiExReleaseMutex (
ACPI_REPORT_ERROR ((
"Thread %X cannot release Mutex [%4.4s] acquired by thread %X\n",
WalkState->Thread->ThreadId,
ObjDesc->Mutex.Node->Name.Ascii,
ObjDesc->Mutex.Node->Name.Ascii,
ObjDesc->Mutex.OwnerThread->ThreadId));
return_ACPI_STATUS (AE_AML_NOT_OWNER);
}

18
sys/dev/acpi/acpica/Subsystem/exnames.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: exnames - interpreter/scanner name load/execute
* xRevision: 92 $
* xRevision: 94 $
*
*****************************************************************************/
@ -10,7 +10,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: exnames.c,v 1.4 2002/12/23 00:22:11 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: exnames.c,v 1.5 2003/02/13 14:16:20 kanaoka Exp $");
#define __EXNAMES_C__
@ -152,13 +152,13 @@ __KERNEL_RCSID(0, "$NetBSD: exnames.c,v 1.4 2002/12/23 00:22:11 kanaoka Exp $");
*
******************************************************************************/
NATIVE_CHAR *
char *
AcpiExAllocateNameString (
UINT32 PrefixCount,
UINT32 NumNameSegs)
{
NATIVE_CHAR *TempPtr;
NATIVE_CHAR *NameString;
char *TempPtr;
char *NameString;
UINT32 SizeNeeded;
ACPI_FUNCTION_TRACE ("ExAllocateNameString");
@ -248,7 +248,7 @@ AcpiExAllocateNameString (
ACPI_STATUS
AcpiExNameSegment (
UINT8 **InAmlAddress,
NATIVE_CHAR *NameString)
char *NameString)
{
char *AmlAddress = (void *) *InAmlAddress;
ACPI_STATUS Status = AE_OK;
@ -343,12 +343,12 @@ ACPI_STATUS
AcpiExGetNameString (
ACPI_OBJECT_TYPE DataType,
UINT8 *InAmlAddress,
NATIVE_CHAR **OutNameString,
char **OutNameString,
UINT32 *OutNameLength)
{
ACPI_STATUS Status = AE_OK;
UINT8 *AmlAddress = InAmlAddress;
NATIVE_CHAR *NameString = NULL;
char *NameString = NULL;
UINT32 NumSegments;
UINT32 PrefixCount = 0;
BOOLEAN HasPrefix = FALSE;

6
sys/dev/acpi/acpica/Subsystem/exoparg1.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: exoparg1 - AML execution - opcodes with 1 argument
* xRevision: 146 $
* xRevision: 147 $
*
*****************************************************************************/
@ -10,7 +10,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: exoparg1.c,v 1.3 2002/12/23 00:22:11 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: exoparg1.c,v 1.4 2003/02/13 14:16:20 kanaoka Exp $");
#define __EXOPARG1_C__

8
sys/dev/acpi/acpica/Subsystem/exoparg2.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: exoparg2 - AML execution - opcodes with 2 arguments
* xRevision: 115 $
* xRevision: 117 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: exoparg2.c,v 1.3 2002/12/23 00:22:11 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: exoparg2.c,v 1.4 2003/02/13 14:16:20 kanaoka Exp $");
#define __EXOPARG2_C__
@ -479,7 +479,7 @@ AcpiExOpcode_2A_1T_1R (
Status = AE_NO_MEMORY;
goto Cleanup;
}
/* Allocate a new string buffer (Length + 1 for null terminator) */
ReturnDesc->String.Pointer = ACPI_MEM_CALLOCATE (Length + 1);

10
sys/dev/acpi/acpica/Subsystem/exoparg3.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: exoparg3 - AML execution - opcodes with 3 arguments
* xRevision: 15 $
* xRevision: 17 $
*
*****************************************************************************/
@ -10,7 +10,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -117,7 +117,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: exoparg3.c,v 1.4 2002/12/23 00:22:11 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: exoparg3.c,v 1.5 2003/02/13 14:16:20 kanaoka Exp $");
#define __EXOPARG3_C__
@ -243,7 +243,7 @@ AcpiExOpcode_3A_1T_1R (
ACPI_OPERAND_OBJECT *ReturnDesc = NULL;
char *Buffer;
ACPI_STATUS Status = AE_OK;
NATIVE_UINT Index;
ACPI_NATIVE_UINT Index;
ACPI_SIZE Length;
@ -267,7 +267,7 @@ AcpiExOpcode_3A_1T_1R (
/* Get the Integer values from the objects */
Index = (NATIVE_UINT) Operand[1]->Integer.Value;
Index = (ACPI_NATIVE_UINT) Operand[1]->Integer.Value;
Length = (ACPI_SIZE) Operand[2]->Integer.Value;
/*

6
sys/dev/acpi/acpica/Subsystem/exoparg6.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: exoparg6 - AML execution - opcodes with 6 arguments
* xRevision: 11 $
* xRevision: 12 $
*
*****************************************************************************/
@ -10,7 +10,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -117,7 +117,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: exoparg6.c,v 1.3 2002/12/23 00:22:11 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: exoparg6.c,v 1.4 2003/02/13 14:16:20 kanaoka Exp $");
#define __EXOPARG6_C__

6
sys/dev/acpi/acpica/Subsystem/exprep.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: exprep - ACPI AML (p-code) execution - field prep utilities
* xRevision: 121 $
* xRevision: 122 $
*
*****************************************************************************/
@ -10,7 +10,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: exprep.c,v 1.4 2002/12/23 00:22:11 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: exprep.c,v 1.5 2003/02/13 14:16:20 kanaoka Exp $");
#define __EXPREP_C__

6
sys/dev/acpi/acpica/Subsystem/exregion.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: exregion - ACPI default OpRegion (address space) handlers
* xRevision: 81 $
* xRevision: 82 $
*
*****************************************************************************/
@ -10,7 +10,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: exregion.c,v 1.4 2002/12/23 00:22:11 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: exregion.c,v 1.5 2003/02/13 14:16:21 kanaoka Exp $");
#define __EXREGION_C__

6
sys/dev/acpi/acpica/Subsystem/exresnte.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: exresnte - AML Interpreter object resolution
* xRevision: 61 $
* xRevision: 62 $
*
*****************************************************************************/
@ -10,7 +10,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: exresnte.c,v 1.4 2002/12/23 00:22:11 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: exresnte.c,v 1.5 2003/02/13 14:16:21 kanaoka Exp $");
#define __EXRESNTE_C__

10
sys/dev/acpi/acpica/Subsystem/exresolv.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: exresolv - AML Interpreter object resolution
* xRevision: 117 $
* xRevision: 119 $
*
*****************************************************************************/
@ -10,7 +10,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: exresolv.c,v 1.4 2002/12/23 00:22:11 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: exresolv.c,v 1.5 2003/02/13 14:16:21 kanaoka Exp $");
#define __EXRESOLV_C__
@ -420,8 +420,8 @@ AcpiExResolveMultiple (
/*
* For reference objects created via the RefOf or Index operators,
* we need to get to the base object (as per the ACPI specification
* of the ObjectType and SizeOf operators). This means traversing
* we need to get to the base object (as per the ACPI specification
* of the ObjectType and SizeOf operators). This means traversing
* the list of possibly many nested references.
*/
while (ACPI_GET_OBJECT_TYPE (ObjDesc) == ACPI_TYPE_LOCAL_REFERENCE)

6
sys/dev/acpi/acpica/Subsystem/exresop.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: exresop - AML Interpreter operand/object resolution
* xRevision: 60 $
* xRevision: 61 $
*
*****************************************************************************/
@ -10,7 +10,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: exresop.c,v 1.6 2002/12/23 00:22:11 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: exresop.c,v 1.7 2003/02/13 14:16:21 kanaoka Exp $");
#define __EXRESOP_C__

6
sys/dev/acpi/acpica/Subsystem/exstore.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: exstore - AML Interpreter object store support
* xRevision: 174 $
* xRevision: 175 $
*
*****************************************************************************/
@ -10,7 +10,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: exstore.c,v 1.4 2002/12/23 00:22:11 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: exstore.c,v 1.5 2003/02/13 14:16:21 kanaoka Exp $");
#define __EXSTORE_C__

10
sys/dev/acpi/acpica/Subsystem/exstoren.c
View File

@ -3,7 +3,7 @@
*
* Module Name: exstoren - AML Interpreter object store support,
* Store to Node (namespace object)
* xRevision: 52 $
* xRevision: 55 $
*
*****************************************************************************/
@ -11,7 +11,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -117,7 +117,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: exstoren.c,v 1.4 2002/12/23 00:22:11 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: exstoren.c,v 1.5 2003/02/13 14:16:21 kanaoka Exp $");
#define __EXSTOREN_C__
@ -280,7 +280,7 @@ AcpiExStoreObjectToObject (
ACPI_STATUS Status = AE_OK;
ACPI_FUNCTION_TRACE_PTR ("AcpiExStoreObjectToObject", SourceDesc);
ACPI_FUNCTION_TRACE_PTR ("ExStoreObjectToObject", SourceDesc);
ActualSrcDesc = SourceDesc;
@ -315,7 +315,7 @@ AcpiExStoreObjectToObject (
if (SourceDesc == ActualSrcDesc)
{
/*
/*
* No conversion was performed. Return the SourceDesc as the
* new object.
*/

22
sys/dev/acpi/acpica/Subsystem/exstorob.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: exstorob - AML Interpreter object store support, store to object
* xRevision: 47 $
* xRevision: 50 $
*
*****************************************************************************/
@ -10,7 +10,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: exstorob.c,v 1.4 2002/12/23 00:22:11 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: exstorob.c,v 1.5 2003/02/13 14:16:21 kanaoka Exp $");
#define __EXSTOROB_C__
@ -150,7 +150,7 @@ AcpiExStoreBufferToBuffer (
UINT8 *Buffer;
ACPI_FUNCTION_NAME ("ExStoreBufferToBuffer");
ACPI_FUNCTION_TRACE_PTR ("ExStoreBufferToBuffer", SourceDesc);
/*
@ -169,7 +169,7 @@ AcpiExStoreBufferToBuffer (
TargetDesc->Buffer.Pointer = ACPI_MEM_ALLOCATE (Length);
if (!TargetDesc->Buffer.Pointer)
{
return (AE_NO_MEMORY);
return_ACPI_STATUS (AE_NO_MEMORY);
}
TargetDesc->Common.Flags &= ~AOPOBJ_STATIC_POINTER;
@ -202,7 +202,7 @@ AcpiExStoreBufferToBuffer (
/* Copy flags */
TargetDesc->Buffer.Flags = SourceDesc->Buffer.Flags;
return (AE_OK);
return_ACPI_STATUS (AE_OK);
}
@ -228,7 +228,7 @@ AcpiExStoreStringToString (
UINT8 *Buffer;
ACPI_FUNCTION_ENTRY ();
ACPI_FUNCTION_TRACE_PTR ("ExStoreStringToString", SourceDesc);
/*
@ -244,9 +244,9 @@ AcpiExStoreStringToString (
if ((Length < TargetDesc->String.Length) &&
(!(TargetDesc->Common.Flags & AOPOBJ_STATIC_POINTER)))
{
/*
/*
* String will fit in existing non-static buffer.
* Clear old string and copy in the new one
* Clear old string and copy in the new one
*/
ACPI_MEMSET (TargetDesc->String.Pointer, 0, (ACPI_SIZE) TargetDesc->String.Length + 1);
ACPI_MEMCPY (TargetDesc->String.Pointer, Buffer, Length);
@ -269,7 +269,7 @@ AcpiExStoreStringToString (
TargetDesc->String.Pointer = ACPI_MEM_CALLOCATE ((ACPI_SIZE) Length + 1);
if (!TargetDesc->String.Pointer)
{
return (AE_NO_MEMORY);
return_ACPI_STATUS (AE_NO_MEMORY);
}
TargetDesc->Common.Flags &= ~AOPOBJ_STATIC_POINTER;
@ -279,7 +279,7 @@ AcpiExStoreStringToString (
/* Set the new target length */
TargetDesc->String.Length = Length;
return (AE_OK);
return_ACPI_STATUS (AE_OK);
}

6
sys/dev/acpi/acpica/Subsystem/exsystem.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: exsystem - Interface to OS services
* xRevision: 74 $
* xRevision: 75 $
*
*****************************************************************************/
@ -10,7 +10,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: exsystem.c,v 1.4 2002/12/23 00:22:12 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: exsystem.c,v 1.5 2003/02/13 14:16:21 kanaoka Exp $");
#define __EXSYSTEM_C__

12
sys/dev/acpi/acpica/Subsystem/exutils.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: exutils - interpreter/scanner utilities
* xRevision: 106 $
* xRevision: 108 $
*
*****************************************************************************/
@ -10,7 +10,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: exutils.c,v 1.4 2002/12/23 00:22:12 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: exutils.c,v 1.5 2003/02/13 14:16:21 kanaoka Exp $");
#define __EXUTILS_C__
@ -403,7 +403,7 @@ AcpiExDigitsNeeded (
void
AcpiExEisaIdToString (
UINT32 NumericId,
NATIVE_CHAR *OutString)
char *OutString)
{
UINT32 EisaId;
@ -440,7 +440,7 @@ AcpiExEisaIdToString (
void
AcpiExUnsignedIntegerToString (
ACPI_INTEGER Value,
NATIVE_CHAR *OutString)
char *OutString)
{
UINT32 Count;
UINT32 DigitsNeeded;
@ -457,7 +457,7 @@ AcpiExUnsignedIntegerToString (
for (Count = DigitsNeeded; Count > 0; Count--)
{
(void) AcpiUtShortDivide (&Value, 10, &Quotient, &Remainder);
OutString[Count-1] = (NATIVE_CHAR) ('0' + Remainder);\
OutString[Count-1] = (char) ('0' + Remainder);\
Value = Quotient;
}
}

8
sys/dev/acpi/acpica/Subsystem/hwacpi.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: hwacpi - ACPI Hardware Initialization/Mode Interface
* xRevision: 60 $
* xRevision: 62 $
*
*****************************************************************************/
@ -10,7 +10,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: hwacpi.c,v 1.4 2002/12/23 00:22:12 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: hwacpi.c,v 1.5 2003/02/13 14:16:21 kanaoka Exp $");
#define __HWACPI_C__
@ -199,7 +199,7 @@ AcpiHwSetMode (
*/
if (!AcpiGbl_FADT->SmiCmd)
{
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "No SMI_CMD in FADT, mode transition failed.\n"));
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "No SMI_CMD in FADT, mode transition failed.\n"));
return_ACPI_STATUS (AE_NO_HARDWARE_RESPONSE);
}

6
sys/dev/acpi/acpica/Subsystem/hwgpe.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: hwgpe - Low level GPE enable/disable/clear functions
* xRevision: 42 $
* xRevision: 43 $
*
*****************************************************************************/
@ -10,7 +10,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: hwgpe.c,v 1.4 2002/12/23 00:22:12 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: hwgpe.c,v 1.5 2003/02/13 14:16:21 kanaoka Exp $");
#include "acpi.h"
#include "acevents.h"

14
sys/dev/acpi/acpica/Subsystem/hwregs.c
View File

@ -3,7 +3,7 @@
*
* Module Name: hwregs - Read/write access functions for the various ACPI
* control and status registers.
* xRevision: 137 $
* xRevision: 140 $
*
******************************************************************************/
@ -11,7 +11,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -117,7 +117,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: hwregs.c,v 1.5 2002/12/23 00:22:12 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: hwregs.c,v 1.6 2003/02/13 14:16:22 kanaoka Exp $");
#define __HWREGS_C__
@ -143,8 +143,8 @@ __KERNEL_RCSID(0, "$NetBSD: hwregs.c,v 1.5 2002/12/23 00:22:12 kanaoka Exp $");
ACPI_STATUS
AcpiHwClearAcpiStatus (void)
{
NATIVE_UINT_MAX32 i;
NATIVE_UINT GpeBlock;
ACPI_NATIVE_UINT i;
ACPI_NATIVE_UINT GpeBlock;
ACPI_STATUS Status;
@ -188,7 +188,7 @@ AcpiHwClearAcpiStatus (void)
for (i = 0; i < AcpiGbl_GpeBlockInfo[GpeBlock].RegisterCount; i++)
{
Status = AcpiHwLowLevelWrite (8, 0xFF,
AcpiGbl_GpeBlockInfo[GpeBlock].BlockAddress, i);
AcpiGbl_GpeBlockInfo[GpeBlock].BlockAddress, (UINT32) i);
if (ACPI_FAILURE (Status))
{
goto UnlockAndExit;
@ -242,7 +242,7 @@ AcpiGetSleepTypeData (
/*
* Evaluate the namespace object containing the values for this state
*/
Status = AcpiNsEvaluateByName ((NATIVE_CHAR *) AcpiGbl_DbSleepStates[SleepState],
Status = AcpiNsEvaluateByName ((char *) AcpiGbl_DbSleepStates[SleepState],
NULL, &ObjDesc);
if (ACPI_FAILURE (Status))
{

6
sys/dev/acpi/acpica/Subsystem/hwsleep.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Name: hwsleep.c - ACPI Hardware Sleep/Wake Interface
* xRevision: 48 $
* xRevision: 49 $
*
*****************************************************************************/
@ -10,7 +10,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: hwsleep.c,v 1.4 2002/12/23 00:22:12 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: hwsleep.c,v 1.5 2003/02/13 14:16:22 kanaoka Exp $");
#include "acpi.h"

11
sys/dev/acpi/acpica/Subsystem/hwtimer.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Name: hwtimer.c - ACPI Power Management Timer Interface
* xRevision: 21 $
* xRevision: 23 $
*
*****************************************************************************/
@ -10,7 +10,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: hwtimer.c,v 1.4 2002/12/23 00:22:12 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: hwtimer.c,v 1.5 2003/02/13 14:16:22 kanaoka Exp $");
#include "acpi.h"
@ -216,7 +216,10 @@ AcpiGetTimer (
* Note that this function accomodates only a single timer
* rollover. Thus for 24-bit timers, this function should only
* be used for calculating durations less than ~4.6 seconds
* (~20 hours for 32-bit timers).
* (~20 minutes for 32-bit timers) -- calculations below
*
* 2**24 Ticks / 3,600,000 Ticks/Sec = 4.66 sec
* 2**32 Ticks / 3,600,000 Ticks/Sec = 1193 sec or 19.88 minutes
*
******************************************************************************/

28
sys/dev/acpi/acpica/Subsystem/nsaccess.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: nsaccess - Top-level functions for accessing ACPI namespace
* xRevision: 165 $
* xRevision: 168 $
*
******************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nsaccess.c,v 1.4 2002/12/23 00:22:12 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: nsaccess.c,v 1.5 2003/02/13 14:16:22 kanaoka Exp $");
#define __NSACCESS_C__
@ -340,7 +340,7 @@ UnlockAndExit:
ACPI_STATUS
AcpiNsLookup (
ACPI_GENERIC_STATE *ScopeInfo,
NATIVE_CHAR *Pathname,
char *Pathname,
ACPI_OBJECT_TYPE Type,
ACPI_INTERPRETER_MODE InterpreterMode,
UINT32 Flags,
@ -348,7 +348,7 @@ AcpiNsLookup (
ACPI_NAMESPACE_NODE **ReturnNode)
{
ACPI_STATUS Status;
NATIVE_CHAR *Path = Pathname;
char *Path = Pathname;
ACPI_NAMESPACE_NODE *PrefixNode;
ACPI_NAMESPACE_NODE *CurrentNode = NULL;
ACPI_NAMESPACE_NODE *ThisNode = NULL;
@ -358,7 +358,7 @@ AcpiNsLookup (
ACPI_OBJECT_TYPE TypeToCheckFor;
ACPI_OBJECT_TYPE ThisSearchType;
UINT32 SearchParentFlag = ACPI_NS_SEARCH_PARENT;
UINT32 LocalFlags = Flags & ~(ACPI_NS_ERROR_IF_FOUND |
UINT32 LocalFlags = Flags & ~(ACPI_NS_ERROR_IF_FOUND |
ACPI_NS_SEARCH_PARENT);
@ -396,17 +396,17 @@ AcpiNsLookup (
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",
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.
* 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) &&
while (!AcpiNsOpensScope (PrefixNode->Type) &&
PrefixNode->Type != ACPI_TYPE_ANY)
{
PrefixNode = AcpiNsGetParentNode (PrefixNode);
@ -457,7 +457,7 @@ AcpiNsLookup (
Path++;
ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
"Path is absolute from root [%p]\n", ThisNode));
}
else
@ -502,7 +502,7 @@ AcpiNsLookup (
if (SearchParentFlag == ACPI_NS_NO_UPSEARCH)
{
ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
"Search scope is [%4.4s], path has %d carat(s)\n",
"Search scope is [%4.4s], path has %d carat(s)\n",
ThisNode->Name.Ascii, NumCarats));
}
}
@ -636,7 +636,7 @@ AcpiNsLookup (
ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
"Name [%4.4s] not found in scope [%4.4s] %p\n",
(char *) &SimpleName, (char *) &CurrentNode->Name,
(char *) &SimpleName, (char *) &CurrentNode->Name,
CurrentNode));
}
@ -668,7 +668,7 @@ AcpiNsLookup (
ACPI_REPORT_WARNING (
("NsLookup: Type mismatch on %4.4s (%s), searching for (%s)\n",
(char *) &SimpleName, AcpiUtGetTypeName (ThisNode->Type),
(char *) &SimpleName, AcpiUtGetTypeName (ThisNode->Type),
AcpiUtGetTypeName (TypeToCheckFor)));
}

14
sys/dev/acpi/acpica/Subsystem/nsalloc.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: nsalloc - Namespace allocation and deletion utilities
* xRevision: 77 $
* xRevision: 79 $
*
******************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nsalloc.c,v 1.4 2002/12/23 00:22:12 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: nsalloc.c,v 1.5 2003/02/13 14:16:22 kanaoka Exp $");
#define __NSALLOC_C__
@ -228,14 +228,14 @@ AcpiNsDeleteNode (
#ifdef ACPI_ALPHABETIC_NAMESPACE
/*******************************************************************************
*
* FUNCTION: AcpiNsCompareNames
* FUNCTION: AcpiNsCompareNames
*
* PARAMETERS: Name1 - First name to compare
* Name2 - Second name to compare
*
* RETURN: value from strncmp
*
* DESCRIPTION: Compare two ACPI names. Names that are prefixed with an
* DESCRIPTION: Compare two ACPI names. Names that are prefixed with an
* underscore are forced to be alphabetically first.
*
******************************************************************************/
@ -374,7 +374,7 @@ AcpiNsInstallNode (
if (!(Node->Flags & ANOBJ_END_OF_PEER_LIST))
{
/*
/*
* Loop above terminated without reaching the end-of-list.
* Insert the new node at the current location
*/
@ -415,7 +415,7 @@ AcpiNsInstallNode (
Node->Type = (UINT8) Type;
ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "%4.4s (%s) added to %4.4s (%s) %p at %p\n",
Node->Name.Ascii, AcpiUtGetTypeName (Node->Type),
Node->Name.Ascii, AcpiUtGetTypeName (Node->Type),
ParentNode->Name.Ascii, AcpiUtGetTypeName (ParentNode->Type), ParentNode, Node));
/*

8
sys/dev/acpi/acpica/Subsystem/nsdump.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: nsdump - table dumping routines for debug
* xRevision: 149 $
* xRevision: 151 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nsdump.c,v 1.6 2002/12/23 00:22:12 kanaoka Exp $");
__KERNEL_RCSID(0, "$NetBSD: nsdump.c,v 1.7 2003/02/13 14:16:22 kanaoka Exp $");
#define __NSDUMP_C__
@ -192,7 +192,7 @@ AcpiNsPrintPathname (
void
AcpiNsDumpPathname (
ACPI_HANDLE Handle,
NATIVE_CHAR *Msg,
char *Msg,
UINT32 Level,
UINT32 Component)
{

Some files were not shown because too many files have changed in this diff Show More