d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This commit was generated by cvs2svn to compensate for changes in r70243,

Browse Source 
which included commits to RCS files with non-trunk default branches.
This commit is contained in:
Mike Smith 2000-12-21 06:56:46 +00:00
commit 7f33f28ba4
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=70244
256 changed files with 1184 additions and 1084 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/contrib/dev/acpica/Subsystem/Common/cmalloc.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: cmalloc - local memory allocation routines
* $Revision: 79 $
* $Revision: 80 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Common/cmclib.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: cmclib - Local implementation of C library functions
* $Revision: 28 $
* $Revision: 29 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

8
sys/contrib/dev/acpica/Subsystem/Common/cmcopy.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: cmcopy - Internal to external object translation utilities
* $Revision: 59 $
* $Revision: 61 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*
@ -198,7 +198,7 @@ AcpiCmBuildExternalSimpleObject (
case ACPI_TYPE_STRING:
Length = InternalObj->String.Length;
Length = InternalObj->String.Length + 1;
ExternalObj->String.Length = InternalObj->String.Length;
ExternalObj->String.Pointer = (NATIVE_CHAR *) DataSpace;
SourcePtr = (UINT8 *) InternalObj->String.Pointer;

6
sys/contrib/dev/acpica/Subsystem/Common/cmdebug.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: cmdebug - Debug print routines
* $Revision: 61 $
* $Revision: 62 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Common/cmdelete.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: cmdelete - object deletion and reference count utilities
* $Revision: 60 $
* $Revision: 61 $
*
******************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Common/cmeval.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: cmeval - Object evaluation
* $Revision: 19 $
* $Revision: 20 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

16
sys/contrib/dev/acpica/Subsystem/Common/cmglobal.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: cmglobal - Global variables for the ACPI subsystem
* $Revision: 112 $
* $Revision: 113 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*
@ -287,8 +287,6 @@ ACPI_TABLE_SUPPORT AcpiGbl_AcpiTableData[NUM_ACPI_TABLES] =
NATIVE_CHAR *MsgAcpiErrorBreak = "*** Break on ACPI_ERROR ***\n";
/*****************************************************************************
*
* FUNCTION: AcpiCmGetMutexName
@ -393,9 +391,6 @@ AcpiCmGetTypeName (
}
/* Region type decoding */
NATIVE_CHAR *AcpiGbl_RegionTypes[NUM_REGION_TYPES] =
@ -441,9 +436,6 @@ AcpiCmGetRegionName (
}
/* Data used in keeping track of fields */
NATIVE_CHAR *AcpiGbl_FENames[NUM_FIELD_NAMES] =
@ -453,7 +445,6 @@ NATIVE_CHAR *AcpiGbl_FENames[NUM_FIELD_NAMES] =
}; /* FE = Field Element */
NATIVE_CHAR *AcpiGbl_MatchOps[NUM_MATCH_OPS] =
{
"Error",
@ -492,7 +483,6 @@ NATIVE_CHAR *AcpiGbl_UpdateRules[NUM_UPDATE_RULES] =
#endif
/*****************************************************************************
*
* FUNCTION: AcpiCmValidObjectType

28
sys/contrib/dev/acpica/Subsystem/Common/cminit.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: cminit - Common ACPI subsystem initialization
* $Revision: 89 $
* $Revision: 91 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*
@ -146,7 +146,7 @@
static ACPI_STATUS
AcpiCmFadtRegisterError (
NATIVE_CHAR *RegisterName,
UINT64 Value)
UINT32 Value)
{
REPORT_ERROR (
@ -191,28 +191,28 @@ AcpiCmValidateFadt (
if (!AcpiGbl_FADT->Pm1CntLen)
{
Status = AcpiCmFadtRegisterError ("PM1_CNT_LEN",
(UINT32) AcpiGbl_FADT->Pm1CntLen);
0);
}
if (!AcpiGbl_FADT->XPm1aEvtBlk.Address)
if (!ACPI_VALID_ADDRESS (AcpiGbl_FADT->XPm1aEvtBlk.Address))
{
Status = AcpiCmFadtRegisterError ("PM1a_EVT_BLK",
AcpiGbl_FADT->XPm1aEvtBlk.Address);
0);
}
if (!AcpiGbl_FADT->XPm1aCntBlk.Address)
if (!ACPI_VALID_ADDRESS (AcpiGbl_FADT->XPm1aCntBlk.Address))
{
Status = AcpiCmFadtRegisterError ("PM1a_CNT_BLK",
AcpiGbl_FADT->XPm1aCntBlk.Address);
0);
}
if (!AcpiGbl_FADT->XPmTmrBlk.Address)
if (!ACPI_VALID_ADDRESS (AcpiGbl_FADT->XPmTmrBlk.Address))
{
Status = AcpiCmFadtRegisterError ("PM_TMR_BLK",
AcpiGbl_FADT->XPmTmrBlk.Address);
0);
}
if ((AcpiGbl_FADT->XPm2CntBlk.Address &&
if ((ACPI_VALID_ADDRESS (AcpiGbl_FADT->XPm2CntBlk.Address) &&
!AcpiGbl_FADT->Pm2CntLen))
{
Status = AcpiCmFadtRegisterError ("PM2_CNT_LEN",
@ -228,14 +228,14 @@ AcpiCmValidateFadt (
/* length of GPE blocks must be a multiple of 2 */
if (AcpiGbl_FADT->XGpe0Blk.Address &&
if (ACPI_VALID_ADDRESS (AcpiGbl_FADT->XGpe0Blk.Address) &&
(AcpiGbl_FADT->Gpe0BlkLen & 1))
{
Status = AcpiCmFadtRegisterError ("GPE0_BLK_LEN",
(UINT32) AcpiGbl_FADT->Gpe0BlkLen);
}
if (AcpiGbl_FADT->XGpe1Blk.Address &&
if (ACPI_VALID_ADDRESS (AcpiGbl_FADT->XGpe1Blk.Address) &&
(AcpiGbl_FADT->Gpe1BlkLen & 1))
{
Status = AcpiCmFadtRegisterError ("GPE1_BLK_LEN",

8
sys/contrib/dev/acpica/Subsystem/Common/cmobject.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: cmobject - ACPI object create/delete/size/cache routines
* $Revision: 32 $
* $Revision: 34 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*
@ -576,7 +576,7 @@ AcpiCmGetSimpleObjectSize (
case ACPI_TYPE_STRING:
Length += InternalObj->String.Length;
Length += InternalObj->String.Length + 1;
break;

6
sys/contrib/dev/acpica/Subsystem/Common/cmutils.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: cmutils - common utility procedures
* $Revision: 21 $
* $Revision: 22 $
*
******************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

8
sys/contrib/dev/acpica/Subsystem/Common/cmxface.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: cmxface - External interfaces for "global" ACPI functions
* $Revision: 55 $
* $Revision: 57 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*
@ -153,7 +153,7 @@ AcpiInitializeSubsystem (
FUNCTION_TRACE ("AcpiInitializeSubsystem");
DEBUG_PRINT_RAW (ACPI_OK,
("ACPI Subsystem version [%s]\n", ACPI_CA_VERSION));
("ACPI: Core Subsystem version [%s]\n", ACPI_CA_VERSION));
DEBUG_PRINT (ACPI_INFO, ("Initializing ACPI Subsystem...\n"));

6
sys/contrib/dev/acpica/Subsystem/Debugger/dbcmds.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dbcmds - debug commands and output routines
* $Revision: 42 $
* $Revision: 43 $
*
******************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Debugger/dbdisasm.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dbdisasm - parser op tree display routines
* $Revision: 34 $
* $Revision: 35 $
*
******************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

8
sys/contrib/dev/acpica/Subsystem/Debugger/dbdisply.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dbdisply - debug display commands
* $Revision: 38 $
* $Revision: 39 $
*
******************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*
@ -459,7 +459,7 @@ AcpiDbDisplayInternalObject (
else if (VALID_DESCRIPTOR_TYPE (ObjDesc, ACPI_DESC_TYPE_NAMED))
{
AcpiOsPrintf ("<Node> Name %4.4s Type-%s",
AcpiOsPrintf ("<Node> Name %4.4s Type-%s",
&((ACPI_NAMESPACE_NODE *)ObjDesc)->Name,
AcpiCmGetTypeName (((ACPI_NAMESPACE_NODE *) ObjDesc)->Type));
if (((ACPI_NAMESPACE_NODE *) ObjDesc)->Flags & ANOBJ_METHOD_ARG)

6
sys/contrib/dev/acpica/Subsystem/Debugger/dbexec.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dbexec - debugger control method execution
* $Revision: 19 $
* $Revision: 20 $
*
******************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Debugger/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)
* $Revision: 34 $
* $Revision: 35 $
*
******************************************************************************/
@ -10,8 +10,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Debugger/dbhistry.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: dbhistry - debugger HISTORY command
* $Revision: 15 $
* $Revision: 16 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Debugger/dbinput.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dbinput - user front-end to the AML debugger
* $Revision: 52 $
* $Revision: 53 $
*
******************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Debugger/dbstats.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dbstats - Generation and display of ACPI table statistics
* $Revision: 35 $
* $Revision: 36 $
*
******************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Debugger/dbutils.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dbutils - AML debugger utilities
* $Revision: 33 $
* $Revision: 34 $
*
******************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Debugger/dbxface.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dbxface - AML Debugger external interfaces
* $Revision: 32 $
* $Revision: 33 $
*
******************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Dispatcher/dsfield.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: dsfield - Dispatcher field routines
* $Revision: 29 $
* $Revision: 30 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Dispatcher/dsmethod.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: dsmethod - Parser/Interpreter interface - control method parsing
* $Revision: 53 $
* $Revision: 54 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Dispatcher/dsmthdat.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dsmthdat - control method arguments and local variables
* $Revision: 36 $
* $Revision: 37 $
*
******************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Dispatcher/dsobject.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: dsobject - Dispatcher object management routines
* $Revision: 53 $
* $Revision: 54 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Dispatcher/dsopcode.c
View File

@ -2,7 +2,7 @@
*
* Module Name: dsopcode - Dispatcher Op Region support and handling of
* "control" opcodes
* $Revision: 28 $
* $Revision: 29 $
*
*****************************************************************************/
@ -10,8 +10,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

8
sys/contrib/dev/acpica/Subsystem/Dispatcher/dsutils.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dsutils - Dispatcher utilities
* $Revision: 50 $
* $Revision: 51 $
*
******************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*
@ -241,7 +241,7 @@ AcpiDsIsResultUsed (
case OPTYPE_NAMED_OBJECT: /* Scope, method, etc. */
/*
/*
* These opcodes allow TermArg(s) as operands and therefore
* method calls. The result is used.
*/

6
sys/contrib/dev/acpica/Subsystem/Dispatcher/dswexec.c
View File

@ -2,7 +2,7 @@
*
* Module Name: dswexec - Dispatcher method execution callbacks;
* dispatch to interpreter.
* $Revision: 50 $
* $Revision: 51 $
*
*****************************************************************************/
@ -10,8 +10,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

8
sys/contrib/dev/acpica/Subsystem/Dispatcher/dswload.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: dswload - Dispatcher namespace load callbacks
* $Revision: 24 $
* $Revision: 25 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*
@ -860,7 +860,7 @@ AcpiDsLoad2EndOp (
Status = AcpiAmlExecCreateRegion (((ACPI_PARSE2_OBJECT *) Op)->Data,
((ACPI_PARSE2_OBJECT *) Op)->Length,
(ACPI_ADDRESS_SPACE_TYPE) Arg->Value.Integer,
(ACPI_ADDRESS_SPACE_TYPE) Arg->Value.Integer,
WalkState);
DEBUG_PRINT (TRACE_DISPATCH,

6
sys/contrib/dev/acpica/Subsystem/Dispatcher/dswscope.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: dswscope - Scope stack manipulation
* $Revision: 40 $
* $Revision: 41 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

25
sys/contrib/dev/acpica/Subsystem/Dispatcher/dswstate.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: dswstate - Dispatcher parse tree walk management routines
* $Revision: 35 $
* $Revision: 36 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*
@ -212,7 +212,6 @@ AcpiDsResultInsert (
}
/*******************************************************************************
*
* FUNCTION: AcpiDsResultRemove
@ -415,13 +414,12 @@ AcpiDsResultPopFromBottom (
("DsResultPopFromBottom: Obj=%p [%s], Results=%p State=%p\n",
*Object, (*Object) ? AcpiCmGetTypeName ((*Object)->Common.Type) : "NULL",
State, WalkState));
return (AE_OK);
}
/*******************************************************************************
*
* FUNCTION: AcpiDsResultPop
@ -479,8 +477,6 @@ AcpiDsResultPush (
}
/*******************************************************************************
*
* FUNCTION: AcpiDsResultStackPush
@ -490,7 +486,7 @@ AcpiDsResultPush (
*
* RETURN: Status
*
* DESCRIPTION:
* DESCRIPTION:
*
******************************************************************************/
@ -500,7 +496,7 @@ AcpiDsResultStackPush (
{
ACPI_GENERIC_STATE *State;
State = AcpiCmCreateGenericState ();
if (!State)
{
@ -508,7 +504,7 @@ AcpiDsResultStackPush (
}
AcpiCmPushGenericState (&WalkState->Results, State);
DEBUG_PRINT (TRACE_EXEC,
("DsResultStackPush: Results=%p State=%p\n",
State, WalkState));
@ -525,7 +521,7 @@ AcpiDsResultStackPush (
*
* RETURN: Status
*
* DESCRIPTION:
* DESCRIPTION:
*
******************************************************************************/
@ -559,8 +555,6 @@ AcpiDsResultStackPop (
}
/*******************************************************************************
*
* FUNCTION: AcpiDsObjStackDeleteAll
@ -1095,7 +1089,6 @@ AcpiDsDeleteWalkState (
}
/* If walk cache is full, just free this wallkstate object */
if (AcpiGbl_WalkStateCacheDepth >= MAX_WALK_CACHE_DEPTH)

34
sys/contrib/dev/acpica/Subsystem/Events/evevent.c
View File

@ -2,7 +2,7 @@
*
* Module Name: evevent - Fixed and General Purpose AcpiEvent
* handling and dispatch
* $Revision: 30 $
* $Revision: 32 $
*
*****************************************************************************/
@ -10,8 +10,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*
@ -504,10 +504,10 @@ AcpiEvGpeInitialize (void)
for (i = 0; i < Gpe0RegisterCount; i++)
{
AcpiGbl_GpeRegisters[RegisterIndex].StatusAddr =
(UINT16) (AcpiGbl_FADT->XGpe0Blk.Address + i);
(UINT16) (ACPI_GET_ADDRESS (AcpiGbl_FADT->XGpe0Blk.Address) + i);
AcpiGbl_GpeRegisters[RegisterIndex].EnableAddr =
(UINT16) (AcpiGbl_FADT->XGpe0Blk.Address + i + Gpe0RegisterCount);
(UINT16) (ACPI_GET_ADDRESS (AcpiGbl_FADT->XGpe0Blk.Address) + i + Gpe0RegisterCount);
AcpiGbl_GpeRegisters[RegisterIndex].GpeBase = (UINT8) MUL_8 (i);
@ -533,10 +533,10 @@ AcpiEvGpeInitialize (void)
for (i = 0; i < Gpe1RegisterCount; i++)
{
AcpiGbl_GpeRegisters[RegisterIndex].StatusAddr =
(UINT16) (AcpiGbl_FADT->XGpe1Blk.Address + i);
(UINT16) (ACPI_GET_ADDRESS (AcpiGbl_FADT->XGpe1Blk.Address) + i);
AcpiGbl_GpeRegisters[RegisterIndex].EnableAddr =
(UINT16) (AcpiGbl_FADT->XGpe1Blk.Address + i + Gpe1RegisterCount);
(UINT16) (ACPI_GET_ADDRESS (AcpiGbl_FADT->XGpe1Blk.Address) + i + Gpe1RegisterCount);
AcpiGbl_GpeRegisters[RegisterIndex].GpeBase =
(UINT8) (AcpiGbl_FADT->Gpe1Base + MUL_8 (i));
@ -812,8 +812,8 @@ AcpiEvAsynchExecuteGpeMethod (
FUNCTION_TRACE ("EvAsynchExecuteGpeMethod");
/*
* Take a snapshot of the GPE info for this level
/*
* Take a snapshot of the GPE info for this level
*/
AcpiCmAcquireMutex (ACPI_MTX_EVENTS);
GpeInfo = AcpiGbl_GpeInfo [GpeNumber];
@ -877,9 +877,9 @@ AcpiEvGpeDispatch (
/*DEBUG_INCREMENT_EVENT_COUNT (EVENT_GENERAL);*/
/*
/*
* Valid GPE number?
*/
*/
if (AcpiGbl_GpeValid[GpeNumber] == ACPI_GPE_INVALID)
{
DEBUG_PRINT (ACPI_ERROR, ("Invalid GPE bit [%X].\n", GpeNumber));
@ -899,7 +899,7 @@ AcpiEvGpeDispatch (
* If edge-triggered, clear the GPE status bit now. Note that
* level-triggered events are cleared after the GPE is serviced.
*/
if (GpeInfo.Type & ACPI_EVENT_EDGE_TRIGGERED)
if (GpeInfo.Type & ACPI_EVENT_EDGE_TRIGGERED)
{
AcpiHwClearGpe (GpeNumber);
}
@ -907,13 +907,13 @@ AcpiEvGpeDispatch (
/*
* Function Handler (e.g. EC)?
*/
if (GpeInfo.Handler)
if (GpeInfo.Handler)
{
/* Invoke function handler (at interrupt level). */
GpeInfo.Handler (GpeInfo.Context);
/* Level-Triggered? */
if (GpeInfo.Type & ACPI_EVENT_LEVEL_TRIGGERED)
if (GpeInfo.Type & ACPI_EVENT_LEVEL_TRIGGERED)
{
AcpiHwClearGpe (GpeNumber);
}
@ -926,7 +926,7 @@ AcpiEvGpeDispatch (
*/
else if (GpeInfo.MethodHandle)
{
if (ACPI_FAILURE(AcpiOsQueueForExecution (OSD_PRIORITY_GPE,
if (ACPI_FAILURE(AcpiOsQueueForExecution (OSD_PRIORITY_GPE,
AcpiEvAsynchExecuteGpeMethod, (void*)(NATIVE_UINT)GpeNumber)))
{
/*
@ -940,12 +940,12 @@ AcpiEvGpeDispatch (
/*
* No Handler? Report an error and leave the GPE disabled.
*/
else
else
{
REPORT_ERROR (("AcpiEvGpeDispatch: No installed handler for GPE [%X]\n", GpeNumber));
/* Level-Triggered? */
if (GpeInfo.Type & ACPI_EVENT_LEVEL_TRIGGERED)
if (GpeInfo.Type & ACPI_EVENT_LEVEL_TRIGGERED)
{
AcpiHwClearGpe (GpeNumber);
}

6
sys/contrib/dev/acpica/Subsystem/Events/evmisc.c
View File

@ -2,7 +2,7 @@
*
* Module Name: evmisc - ACPI device notification handler dispatch
* and ACPI Global Lock support
* $Revision: 20 $
* $Revision: 21 $
*
*****************************************************************************/
@ -10,8 +10,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

26
sys/contrib/dev/acpica/Subsystem/Events/evregion.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: evregion - ACPI AddressSpace (OpRegion) handler dispatch
* $Revision: 90 $
* $Revision: 93 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*
@ -418,8 +418,8 @@ AcpiEvAddressSpaceDispatch (
*
* FUNCTION: AcpiEvDisassociateRegionFromHandler
*
* PARAMETERS: HandlerObj - Handler Object
* RegionObj - Region Object
* PARAMETERS: RegionObj - Region Object
* AcpiNsIsLocked - Namespace Region Already Locked?
*
* RETURN: None
*
@ -430,7 +430,8 @@ AcpiEvAddressSpaceDispatch (
void
AcpiEvDisassociateRegionFromHandler(
ACPI_OPERAND_OBJECT *RegionObj)
ACPI_OPERAND_OBJECT *RegionObj,
BOOLEAN AcpiNsIsLocked)
{
ACPI_OPERAND_OBJECT *HandlerObj;
ACPI_OPERAND_OBJECT *ObjDesc;
@ -481,11 +482,21 @@ AcpiEvDisassociateRegionFromHandler(
*LastObjPtr = ObjDesc->Region.Next;
ObjDesc->Region.Next = NULL; /* Must clear field */
if (AcpiNsIsLocked)
{
AcpiCmReleaseMutex (ACPI_MTX_NAMESPACE);
}
/*
* Now stop region accesses by executing the _REG method
*/
AcpiEvExecuteRegMethod (RegionObj, 0);
if (AcpiNsIsLocked)
{
AcpiCmAcquireMutex (ACPI_MTX_NAMESPACE);
}
/*
* Call the setup handler with the deactivate notification
*/
@ -548,6 +559,7 @@ AcpiEvDisassociateRegionFromHandler(
*
* PARAMETERS: HandlerObj - Handler Object
* RegionObj - Region Object
* AcpiNsIsLocked - Namespace Region Already Locked?
*
* RETURN: None
*
@ -752,7 +764,7 @@ AcpiEvAddrHandlerHelper (
*
* First disconnect region for any previous handler (if any)
*/
AcpiEvDisassociateRegionFromHandler (ObjDesc);
AcpiEvDisassociateRegionFromHandler (ObjDesc, FALSE);
/*
* Then connect the region to the new handler

6
sys/contrib/dev/acpica/Subsystem/Events/evrgnini.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: evrgnini- ACPI AddressSpace (OpRegion) init
* $Revision: 31 $
* $Revision: 32 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Events/evsci.c
View File

@ -2,7 +2,7 @@
*
* Module Name: evsci - System Control Interrupt configuration and
* legacy to ACPI mode state transition functions
* $Revision: 67 $
* $Revision: 68 $
*
******************************************************************************/
@ -10,8 +10,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Events/evxface.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: evxface - External interfaces for ACPI events
* $Revision: 97 $
* $Revision: 98 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Events/evxfevnt.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: evxfevnt - External Interfaces, ACPI event disable/enable
* $Revision: 26 $
* $Revision: 27 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

8
sys/contrib/dev/acpica/Subsystem/Events/evxfregn.c
View File

@ -2,7 +2,7 @@
*
* Module Name: evxfregn - External Interfaces, ACPI Operation Regions and
* Address Spaces.
* $Revision: 24 $
* $Revision: 26 $
*
*****************************************************************************/
@ -10,8 +10,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*
@ -464,7 +464,7 @@ AcpiRemoveAddressSpaceHandler (
* The region is just inaccessible as indicated to
* the _REG method
*/
AcpiEvDisassociateRegionFromHandler(RegionObj);
AcpiEvDisassociateRegionFromHandler(RegionObj, FALSE);
/*
* Walk the list, since we took the first region and it

14
sys/contrib/dev/acpica/Subsystem/Hardware/hwacpi.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: hwacpi - ACPI hardware functions - mode and timer
* $Revision: 32 $
* $Revision: 34 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*
@ -239,7 +239,8 @@ AcpiHwInitialize (
* block is not fixed, so the buffer must be allocated with malloc
*/
if (AcpiGbl_FADT->XGpe0Blk.Address && AcpiGbl_FADT->Gpe0BlkLen)
if (ACPI_VALID_ADDRESS (AcpiGbl_FADT->XGpe0Blk.Address) &&
AcpiGbl_FADT->Gpe0BlkLen)
{
/* GPE0 specified in FADT */
@ -264,7 +265,8 @@ AcpiHwInitialize (
AcpiGbl_Gpe0EnableRegisterSave = NULL;
}
if (AcpiGbl_FADT->XGpe1Blk.Address && AcpiGbl_FADT->Gpe1BlkLen)
if (ACPI_VALID_ADDRESS (AcpiGbl_FADT->XGpe1Blk.Address) &&
AcpiGbl_FADT->Gpe1BlkLen)
{
/* GPE1 defined */
@ -460,7 +462,7 @@ AcpiHwPmtTicks (void)
FUNCTION_TRACE ("AcpiPmtTicks");
Ticks = AcpiOsIn32 ((ACPI_IO_ADDRESS) AcpiGbl_FADT->XPmTmrBlk.Address);
Ticks = AcpiOsIn32 ((ACPI_IO_ADDRESS) ACPI_GET_ADDRESS (AcpiGbl_FADT->XPmTmrBlk.Address));
return_VALUE (Ticks);
}

6
sys/contrib/dev/acpica/Subsystem/Hardware/hwcpu32.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: hwcpu32.c - CPU support for IA32 (Throttling, CxStates)
* $Revision: 39 $
* $Revision: 40 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Hardware/hwgpe.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: hwgpe - Low level GPE enable/disable/clear functions
* $Revision: 25 $
* $Revision: 26 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

40
sys/contrib/dev/acpica/Subsystem/Hardware/hwregs.c
View File

@ -3,7 +3,7 @@
*
* Module Name: hwregs - Read/write access functions for the various ACPI
* control and status registers.
* $Revision: 84 $
* $Revision: 86 $
*
******************************************************************************/
@ -11,8 +11,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*
@ -186,7 +186,7 @@ AcpiHwClearAcpiStatus (void)
DEBUG_PRINT (TRACE_IO, ("About to write %04X to %04X\n",
ALL_FIXED_STS_BITS,
(UINT16) AcpiGbl_FADT->XPm1aEvtBlk.Address));
(UINT16) ACPI_GET_ADDRESS (AcpiGbl_FADT->XPm1aEvtBlk.Address)));
AcpiCmAcquireMutex (ACPI_MTX_HARDWARE);
@ -194,9 +194,9 @@ AcpiHwClearAcpiStatus (void)
AcpiHwRegisterWrite (ACPI_MTX_DO_NOT_LOCK, PM1_STS, ALL_FIXED_STS_BITS);
if (AcpiGbl_FADT->XPm1bEvtBlk.Address)
if (ACPI_VALID_ADDRESS (AcpiGbl_FADT->XPm1bEvtBlk.Address))
{
AcpiOsOut16 ((ACPI_IO_ADDRESS) AcpiGbl_FADT->XPm1bEvtBlk.Address,
AcpiOsOut16 ((ACPI_IO_ADDRESS) ACPI_GET_ADDRESS (AcpiGbl_FADT->XPm1bEvtBlk.Address),
(UINT16) ALL_FIXED_STS_BITS);
}
@ -208,7 +208,7 @@ AcpiHwClearAcpiStatus (void)
for (Index = 0; Index < GpeLength; Index++)
{
AcpiOsOut8 ((ACPI_IO_ADDRESS) (AcpiGbl_FADT->XGpe0Blk.Address + Index),
AcpiOsOut8 ((ACPI_IO_ADDRESS) (ACPI_GET_ADDRESS (AcpiGbl_FADT->XGpe0Blk.Address) + Index),
(UINT8) 0xff);
}
}
@ -219,7 +219,7 @@ AcpiHwClearAcpiStatus (void)
for (Index = 0; Index < GpeLength; Index++)
{
AcpiOsOut8 ((ACPI_IO_ADDRESS) (AcpiGbl_FADT->XGpe1Blk.Address + Index),
AcpiOsOut8 ((ACPI_IO_ADDRESS) (ACPI_GET_ADDRESS (AcpiGbl_FADT->XGpe1Blk.Address) + Index),
(UINT8) 0xff);
}
}
@ -574,7 +574,7 @@ AcpiHwRegisterBitAccess (
RegisterValue = AcpiHwRegisterRead (ACPI_MTX_DO_NOT_LOCK, PM2_CONTROL);
DEBUG_PRINT (TRACE_IO, ("PM2 control: Read %X from %p\n",
RegisterValue, AcpiGbl_FADT->XPm2CntBlk.Address));
RegisterValue, ACPI_GET_ADDRESS (AcpiGbl_FADT->XPm2CntBlk.Address)));
if (ReadWrite == ACPI_WRITE)
{
@ -599,7 +599,7 @@ AcpiHwRegisterBitAccess (
RegisterValue = AcpiHwRegisterRead (ACPI_MTX_DO_NOT_LOCK,
PM_TIMER);
DEBUG_PRINT (TRACE_IO, ("PM_TIMER: Read %X from %p\n",
RegisterValue, AcpiGbl_FADT->XPmTmrBlk.Address));
RegisterValue, ACPI_GET_ADDRESS (AcpiGbl_FADT->XPmTmrBlk.Address)));
break;
@ -980,7 +980,7 @@ AcpiHwLowLevelRead (
* a non-zero address within
*/
if ((!Reg) ||
(!Reg->Address))
(!ACPI_VALID_ADDRESS (Reg->Address)))
{
return 0;
}
@ -995,7 +995,7 @@ AcpiHwLowLevelRead (
{
case ADDRESS_SPACE_SYSTEM_MEMORY:
MemAddress = (ACPI_PHYSICAL_ADDRESS) Reg->Address + Offset;
MemAddress = (ACPI_PHYSICAL_ADDRESS) (ACPI_GET_ADDRESS (Reg->Address) + Offset);
switch (Width)
{
@ -1014,7 +1014,7 @@ AcpiHwLowLevelRead (
case ADDRESS_SPACE_SYSTEM_IO:
IoAddress = (ACPI_IO_ADDRESS) Reg->Address + Offset;
IoAddress = (ACPI_IO_ADDRESS) (ACPI_GET_ADDRESS (Reg->Address) + Offset);
switch (Width)
{
@ -1033,8 +1033,8 @@ AcpiHwLowLevelRead (
case ADDRESS_SPACE_PCI_CONFIG:
PciDevFunc = ACPI_PCI_DEVFUN (Reg->Address);
PciRegister = ACPI_PCI_REGISTER (Reg->Address) + Offset;
PciDevFunc = ACPI_PCI_DEVFUN (ACPI_GET_ADDRESS (Reg->Address));
PciRegister = ACPI_PCI_REGISTER (ACPI_GET_ADDRESS (Reg->Address)) + Offset;
switch (Width)
{
@ -1089,7 +1089,7 @@ AcpiHwLowLevelWrite (
* a non-zero address within
*/
if ((!Reg) ||
(!Reg->Address))
(!ACPI_VALID_ADDRESS (Reg->Address)))
{
return;
}
@ -1104,7 +1104,7 @@ AcpiHwLowLevelWrite (
{
case ADDRESS_SPACE_SYSTEM_MEMORY:
MemAddress = (ACPI_PHYSICAL_ADDRESS) Reg->Address + Offset;
MemAddress = (ACPI_PHYSICAL_ADDRESS) (ACPI_GET_ADDRESS (Reg->Address) + Offset);
switch (Width)
{
@ -1123,7 +1123,7 @@ AcpiHwLowLevelWrite (
case ADDRESS_SPACE_SYSTEM_IO:
IoAddress = (ACPI_IO_ADDRESS) Reg->Address + Offset;
IoAddress = (ACPI_IO_ADDRESS) (ACPI_GET_ADDRESS (Reg->Address) + Offset);
switch (Width)
{
@ -1142,8 +1142,8 @@ AcpiHwLowLevelWrite (
case ADDRESS_SPACE_PCI_CONFIG:
PciDevFunc = ACPI_PCI_DEVFUN (Reg->Address);
PciRegister = ACPI_PCI_REGISTER (Reg->Address) + Offset;
PciDevFunc = ACPI_PCI_DEVFUN (ACPI_GET_ADDRESS (Reg->Address));
PciRegister = ACPI_PCI_REGISTER (ACPI_GET_ADDRESS (Reg->Address)) + Offset;
switch (Width)
{

6
sys/contrib/dev/acpica/Subsystem/Include/accommon.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: accommon.h -- prototypes for the common (subsystem-wide) procedures
* $Revision: 82 $
* $Revision: 83 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Include/acdebug.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acdebug.h - ACPI/AML debugger
* $Revision: 37 $
* $Revision: 38 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Include/acdispat.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acdispat.h - dispatcher (parser to interpreter interface)
* $Revision: 33 $
* $Revision: 34 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Include/acefi.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acefi.h - OS specific defines, etc.
* $Revision: 4 $
* $Revision: 5 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Include/acenv.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acenv.h - Generation environment specific items
* $Revision: 65 $
* $Revision: 66 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

9
sys/contrib/dev/acpica/Subsystem/Include/acevents.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acevents.h - Event subcomponent prototypes and defines
* $Revision: 60 $
* $Revision: 62 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*
@ -214,7 +214,8 @@ AcpiEvAddrHandlerHelper (
void
AcpiEvDisassociateRegionFromHandler(
ACPI_OPERAND_OBJECT *RegionObj);
ACPI_OPERAND_OBJECT *RegionObj,
BOOLEAN AcpiNsIsLocked);
ACPI_STATUS

6
sys/contrib/dev/acpica/Subsystem/Include/acexcep.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acexcep.h - Exception codes returned by the ACPI subsystem
* $Revision: 37 $
* $Revision: 38 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Include/acglobal.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acglobal.h - Declarations for global variables
* $Revision: 92 $
* $Revision: 93 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Include/achware.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: achware.h -- hardware specific interfaces
* $Revision: 48 $
* $Revision: 49 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Include/acinterp.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acinterp.h - Interpreter subcomponent prototypes and defines
* $Revision: 86 $
* $Revision: 87 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

22
sys/contrib/dev/acpica/Subsystem/Include/aclinux.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: aclinux.h - OS specific defines, etc.
* $Revision: 4 $
* $Revision: 6 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*
@ -139,20 +139,4 @@
#define ACPI_NO_INTEGER64_SUPPORT
#endif
#if 0
/* Use native Linux string library */
#define ACPI_USE_SYSTEM_CLIBRARY
/* Special functions */
#define strtoul simple_strtoul
/* Linux clib doesn't to strupr, but we do. */
char *
strupr(char *str);
#endif /* 0 */
#endif /* __ACLINUX_H__ */

6
sys/contrib/dev/acpica/Subsystem/Include/aclocal.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: aclocal.h - Internal data types used across the ACPI subsystem
* $Revision: 93 $
* $Revision: 94 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

22
sys/contrib/dev/acpica/Subsystem/Include/acmacros.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acmacros.h - C macros for the entire subsystem.
* $Revision: 56 $
* $Revision: 59 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*
@ -154,6 +154,15 @@
#define HI_LIMIT(b) ((UINT8) (((b) & 0x00FF0000) >> 16))
#ifdef _IA16
#define ACPI_GET_ADDRESS(a) ((a).Lo)
#define ACPI_STORE_ADDRESS(a,b) {(a).Hi=0;(a).Lo=(b);}
#define ACPI_VALID_ADDRESS(a) ((a).Hi && (a).Lo)
#else
#define ACPI_GET_ADDRESS(a) (a)
#define ACPI_STORE_ADDRESS(a,b) ((a)=(b))
#define ACPI_VALID_ADDRESS(a) (a)
#endif
/*
* Extract a byte of data using a pointer. Any more than a byte and we
* get into potential aligment issues -- see the STORE macros below
@ -258,9 +267,16 @@
#define ACPI_PCI_FUNCTION(a) (UINT32) ((((a) & ACPI_PCI_FUNCTION_MASK) >> 16))
#define ACPI_PCI_DEVICE(a) (UINT32) ((((a) & ACPI_PCI_DEVICE_MASK) >> 32))
#ifndef _IA16
#define ACPI_PCI_REGISTER(a) (UINT32) (((a) & ACPI_PCI_REGISTER_MASK))
#define ACPI_PCI_DEVFUN(a) (UINT32) ((ACPI_PCI_DEVICE(a) << 16) | ACPI_PCI_FUNCTION(a))
#else
#define ACPI_PCI_REGISTER(a) (UINT32) (((a) & 0x0000FFFF))
#define ACPI_PCI_DEVFUN(a) (UINT32) ((((a) & 0xFFFF0000) >> 16))
#endif
/*
* An ACPI_HANDLE (which is actually an ACPI_NAMESPACE_NODE *) can appear in some contexts,

6
sys/contrib/dev/acpica/Subsystem/Include/acmsvc.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acmsvc.h - VC specific defines, etc.
* $Revision: 2 $
* $Revision: 3 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Include/acnamesp.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acnamesp.h - Namespace subcomponent prototypes and defines
* $Revision: 98 $
* $Revision: 99 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Include/acobject.h
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Name: acobject.h - Definition of ACPI_OPERAND_OBJECT (Internal object only)
* $Revision: 75 $
* $Revision: 76 $
*
*****************************************************************************/
@ -10,8 +10,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Include/acoutput.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acoutput.h -- debug output
* $Revision: 66 $
* $Revision: 67 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Include/acparser.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: acparser.h - AML Parser subcomponent prototypes and defines
* $Revision: 47 $
* $Revision: 48 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

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

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acpi.h - Master include file, Publics and external data.
* $Revision: 48 $
* $Revision: 49 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

18
sys/contrib/dev/acpica/Subsystem/Include/acpiosxf.h
View File

@ -1,9 +1,9 @@
/******************************************************************************
*
* Name: acpiosd.h - All interfaces to the OS-dependent layer. These
* interfaces must be implemented by the OS-dependent
* front-end to the ACPI subsystem.
* Name: acpiosxf.h - All interfaces to the OS-dependent layer. These
* interfaces must be implemented by the OS-dependent
* front-end to the ACPI subsystem.
*
*****************************************************************************/
@ -12,8 +12,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*
@ -126,10 +126,10 @@
/* Priorities for AcpiOsQueueForExecution */
#define OSD_PRIORITY_HIGH 1
#define OSD_PRIORITY_MED 2
#define OSD_PRIORITY_LO 3
#define OSD_PRIORITY_GPE OSD_PRIORITY_HIGH
#define OSD_PRIORITY_GPE 1
#define OSD_PRIORITY_HIGH 2
#define OSD_PRIORITY_MED 3
#define OSD_PRIORITY_LO 4
#define ACPI_NO_UNIT_LIMIT ((UINT32) -1)
#define ACPI_MUTEX_SEM 1

6
sys/contrib/dev/acpica/Subsystem/Include/acresrc.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acresrc.h - Resource Manager function prototypes
* $Revision: 20 $
* $Revision: 21 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Include/actables.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: actables.h - ACPI table management
* $Revision: 27 $
* $Revision: 28 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Include/actbl.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: actbl.h - Table data structures defined in ACPI specification
* $Revision: 43 $
* $Revision: 44 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Include/actbl1.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: actbl1.h - ACPI 1.0 tables
* $Revision: 15 $
* $Revision: 16 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Include/actbl2.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: actbl2.h - ACPI Specification Revision 2.0 Tables
* $Revision: 19 $
* $Revision: 20 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Include/actbl71.h
View File

@ -3,7 +3,7 @@
* Name: actbl71.h - IA-64 Extensions to the ACPI Spec Rev. 0.71
* This file includes tables specific to this
* specification revision.
* $Revision: 7 $
* $Revision: 8 $
*
*****************************************************************************/
@ -11,8 +11,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

29
sys/contrib/dev/acpica/Subsystem/Include/actypes.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: actypes.h - Common data types for the entire ACPI subsystem
* $Revision: 155 $
* $Revision: 159 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*
@ -176,12 +176,19 @@ typedef long INT32;
typedef int INT16;
typedef unsigned long UINT32;
typedef struct
{
UINT32 Lo;
UINT32 Hi;
} UINT64;
typedef UINT16 NATIVE_UINT;
typedef INT16 NATIVE_INT;
typedef UINT32 ACPI_TBLPTR;
typedef UINT32 ACPI_IO_ADDRESS;
typedef UINT32 ACPI_PHYSICAL_ADDRESS;
typedef void *ACPI_PHYSICAL_ADDRESS;
#define ALIGNED_ADDRESS_BOUNDARY 0x00000002
#define _HW_ALIGNMENT_SUPPORT
@ -288,19 +295,23 @@ typedef void* ACPI_HANDLE; /* Actually a ptr to an
*/
#ifdef ACPI_NO_INTEGER64_SUPPORT
/* 32-bit Integers */
/* 32-bit integers only, no 64-bit support */
typedef UINT32 ACPI_INTEGER;
#define ACPI_INTEGER_MAX ACPI_UINT32_MAX;
#define ACPI_INTEGER_MAX ACPI_UINT32_MAX
#define ACPI_INTEGER_BIT_SIZE 32
#define ACPI_MAX_BCD_VALUE 99999999
#define ACPI_MAX_BCD_DIGITS 8
#else
/* 64-bit Integers */
/* 64-bit integers */
typedef UINT64 ACPI_INTEGER;
#define ACPI_INTEGER_MAX ACPI_UINT64_MAX;
#define ACPI_INTEGER_MAX ACPI_UINT64_MAX
#define ACPI_INTEGER_BIT_SIZE 64
#define ACPI_MAX_BCD_VALUE 9999999999999999
#define ACPI_MAX_BCD_DIGITS 16
#endif
@ -767,7 +778,7 @@ typedef struct
typedef struct
{
UINT64 MappedPhysicalAddress;
ACPI_PHYSICAL_ADDRESS MappedPhysicalAddress;
UINT8 *MappedLogicalAddress;
UINT32 MappedLength;
} MEM_HANDLER_CONTEXT;

6
sys/contrib/dev/acpica/Subsystem/Include/acwin.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acwin.h - OS specific defines, etc.
* $Revision: 1 $
* $Revision: 2 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

8
sys/contrib/dev/acpica/Subsystem/Include/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.
* $Revision: 42 $
* $Revision: 43 $
*
*****************************************************************************/
@ -11,8 +11,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*
@ -466,8 +466,6 @@ typedef enum
#define METHOD_FLAGS_SERIALIZED 0x08
/* Array sizes. Used for range checking also */
#define NUM_REGION_TYPES 7

6
sys/contrib/dev/acpica/Subsystem/Interpreter/amconfig.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: amconfig - Namespace reconfiguration (Load/Unload opcodes)
* $Revision: 26 $
* $Revision: 27 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

10
sys/contrib/dev/acpica/Subsystem/Interpreter/amcreate.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: amcreate - Named object creation
* $Revision: 51 $
* $Revision: 52 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*
@ -531,8 +531,8 @@ AcpiAmlExecCreateRegion (
FUNCTION_TRACE ("AmlExecCreateRegion");
/*
* Space ID must be one of the predefined IDs, or in the user-defined
/*
* Space ID must be one of the predefined IDs, or in the user-defined
* range
*/
if ((RegionSpace >= NUM_REGION_TYPES) &&

6
sys/contrib/dev/acpica/Subsystem/Interpreter/amdump.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: amdump - Interpreter debug output routines
* $Revision: 96 $
* $Revision: 97 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Interpreter/amdyadic.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: amdyadic - ACPI AML (p-code) execution for dyadic operators
* $Revision: 68 $
* $Revision: 69 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Interpreter/amfield.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: amfield - ACPI AML (p-code) execution - field manipulation
* $Revision: 74 $
* $Revision: 75 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

14
sys/contrib/dev/acpica/Subsystem/Interpreter/amfldio.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: amfldio - Aml Field I/O
* $Revision: 32 $
* $Revision: 33 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*
@ -193,7 +193,7 @@ AcpiAmlReadFieldData (
DEBUG_PRINT (TRACE_OPREGION,
("AmlReadFieldData: Region %s(%X) at %08lx width %X\n",
AcpiCmGetRegionName (RgnDesc->Region.SpaceId),
AcpiCmGetRegionName (RgnDesc->Region.SpaceId),
RgnDesc->Region.SpaceId, Address,
FieldBitWidth));
@ -207,7 +207,7 @@ AcpiAmlReadFieldData (
{
DEBUG_PRINT (ACPI_ERROR,
("AmlReadFieldData: **** Region %s(%X) not implemented\n",
AcpiCmGetRegionName (RgnDesc->Region.SpaceId),
AcpiCmGetRegionName (RgnDesc->Region.SpaceId),
RgnDesc->Region.SpaceId));
}
@ -215,7 +215,7 @@ AcpiAmlReadFieldData (
{
DEBUG_PRINT (ACPI_ERROR,
("AmlReadFieldData: **** Region %s(%X) has no handler\n",
AcpiCmGetRegionName (RgnDesc->Region.SpaceId),
AcpiCmGetRegionName (RgnDesc->Region.SpaceId),
RgnDesc->Region.SpaceId));
}
@ -487,7 +487,7 @@ AcpiAmlWriteFieldData (
DEBUG_PRINT (TRACE_OPREGION,
("AmlWriteField: Store %lx in Region %s(%X) at %p width %X\n",
Value, AcpiCmGetRegionName (RgnDesc->Region.SpaceId),
Value, AcpiCmGetRegionName (RgnDesc->Region.SpaceId),
RgnDesc->Region.SpaceId, Address,
FieldBitWidth));

6
sys/contrib/dev/acpica/Subsystem/Interpreter/ammisc.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: ammisc - ACPI AML (p-code) execution - specific opcodes
* $Revision: 71 $
* $Revision: 72 $
*
*****************************************************************************/
@ -10,8 +10,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

86
sys/contrib/dev/acpica/Subsystem/Interpreter/ammonad.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: ammonad - ACPI AML (p-code) execution for monadic operators
* $Revision: 85 $
* $Revision: 88 $
*
*****************************************************************************/
@ -10,8 +10,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*
@ -355,10 +355,9 @@ AcpiAmlExecMonadic2R (
ACPI_OPERAND_OBJECT *RetDesc2 = NULL;
UINT32 ResVal;
ACPI_STATUS Status;
UINT32 d0;
UINT32 d1;
UINT32 d2;
UINT32 d3;
UINT32 i;
UINT32 j;
ACPI_INTEGER Digit;
FUNCTION_TRACE_PTR ("AmlExecMonadic2R", WALK_OPERANDS);
@ -461,23 +460,39 @@ AcpiAmlExecMonadic2R (
case AML_FROM_BCD_OP:
/* TBD: for ACPI 2.0, expand to 64 bits */
d0 = (UINT32) (ObjDesc->Number.Value & 15);
d1 = (UINT32) (ObjDesc->Number.Value >> 4 & 15);
d2 = (UINT32) (ObjDesc->Number.Value >> 8 & 15);
d3 = (UINT32) (ObjDesc->Number.Value >> 12 & 15);
if (d0 > 9 || d1 > 9 || d2 > 9 || d3 > 9)
/*
* The 64-bit ACPI integer can hold 16 4-bit BCD integers
*/
RetDesc->Number.Value = 0;
for (i = 0; i < ACPI_MAX_BCD_DIGITS; i++)
{
DEBUG_PRINT (ACPI_ERROR,
("Monadic2R/FromBCDOp: BCD digit too large %d %d %d %d\n",
d3, d2, d1, d0));
Status = AE_AML_NUMERIC_OVERFLOW;
goto Cleanup;
}
/* Get one BCD digit */
RetDesc->Number.Value = d0 + d1 * 10 + d2 * 100 + d3 * 1000;
Digit = (ACPI_INTEGER) ((ObjDesc->Number.Value >> (i * 4)) & 0xF);
/* Check the range of the digit */
if (Digit > 9)
{
DEBUG_PRINT (ACPI_ERROR,
("Monadic2R/FromBCDOp: BCD digit too large: \n",
Digit));
Status = AE_AML_NUMERIC_OVERFLOW;
goto Cleanup;
}
if (Digit > 0)
{
/* Sum into the result with the appropriate power of 10 */
for (j = 0; j < i; j++)
{
Digit *= 10;
}
RetDesc->Number.Value += Digit;
}
}
break;
@ -485,9 +500,8 @@ AcpiAmlExecMonadic2R (
case AML_TO_BCD_OP:
/* TBD: for ACPI 2.0, expand to 64 bits */
if (ObjDesc->Number.Value > 9999)
if (ObjDesc->Number.Value > ACPI_MAX_BCD_VALUE)
{
DEBUG_PRINT (ACPI_ERROR, ("Monadic2R/ToBCDOp: BCD overflow: %d\n",
ObjDesc->Number.Value));
@ -495,12 +509,24 @@ AcpiAmlExecMonadic2R (
goto Cleanup;
}
RetDesc->Number.Value
= ACPI_MODULO (ObjDesc->Number.Value, 10)
+ (ACPI_MODULO (ACPI_DIVIDE (ObjDesc->Number.Value, 10), 10) << 4)
+ (ACPI_MODULO (ACPI_DIVIDE (ObjDesc->Number.Value, 100), 10) << 8)
+ (ACPI_MODULO (ACPI_DIVIDE (ObjDesc->Number.Value, 1000), 10) << 12);
RetDesc->Number.Value = 0;
for (i = 0; i < ACPI_MAX_BCD_DIGITS; i++)
{
/* Divide by nth factor of 10 */
Digit = ObjDesc->Number.Value;
for (j = 0; j < i; j++)
{
Digit /= 10;
}
/* Create the BCD digit */
if (Digit > 0)
{
RetDesc->Number.Value += (ACPI_MODULO (Digit, 10) << (i * 4));
}
}
break;
@ -544,7 +570,7 @@ AcpiAmlExecMonadic2R (
/* The object exists in the namespace, return TRUE */
RetDesc->Number.Value = ACPI_INTEGER_MAX
RetDesc->Number.Value = ACPI_INTEGER_MAX;
goto Cleanup;
break;

6
sys/contrib/dev/acpica/Subsystem/Interpreter/amnames.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: amnames - interpreter/scanner name load/execute
* $Revision: 71 $
* $Revision: 72 $
*
*****************************************************************************/
@ -10,8 +10,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

28
sys/contrib/dev/acpica/Subsystem/Interpreter/amprep.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: amprep - ACPI AML (p-code) execution - field prep utilities
* $Revision: 69 $
* $Revision: 72 $
*
*****************************************************************************/
@ -10,8 +10,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*
@ -142,13 +142,29 @@
static UINT32
AcpiAmlDecodeFieldAccessType (
UINT32 Access)
UINT32 Access,
UINT16 Length)
{
switch (Access)
{
case ACCESS_ANY_ACC:
return (8);
if (Length <= 8)
{
return (8);
}
else if (Length <= 16)
{
return (16);
}
else if (Length <= 32)
{
return (32);
}
else
{
return (8);
}
break;
case ACCESS_BYTE_ACC:
@ -229,7 +245,7 @@ AcpiAmlPrepCommonFieldObject (
/* Decode the access type so we can compute offsets */
Granularity = AcpiAmlDecodeFieldAccessType (ObjDesc->Field.Access);
Granularity = AcpiAmlDecodeFieldAccessType (ObjDesc->Field.Access, ObjDesc->Field.Length);
if (!Granularity)
{
return_ACPI_STATUS (AE_AML_OPERAND_VALUE);

6
sys/contrib/dev/acpica/Subsystem/Interpreter/amregion.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: amregion - ACPI default OpRegion (address space) handlers
* $Revision: 41 $
* $Revision: 42 $
*
*****************************************************************************/
@ -10,8 +10,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Interpreter/amresnte.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: amresnte - AML Interpreter object resolution
* $Revision: 25 $
* $Revision: 26 $
*
*****************************************************************************/
@ -10,8 +10,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Interpreter/amresolv.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: amresolv - AML Interpreter object resolution
* $Revision: 78 $
* $Revision: 79 $
*
*****************************************************************************/
@ -10,8 +10,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

27
sys/contrib/dev/acpica/Subsystem/Interpreter/amresop.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: amresop - AML Interpreter operand/object resolution
* $Revision: 18 $
* $Revision: 19 $
*
*****************************************************************************/
@ -10,8 +10,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*
@ -131,7 +131,6 @@
MODULE_NAME ("amresop")
/*******************************************************************************
*
* FUNCTION: AcpiAmlCheckObjectType
@ -344,8 +343,8 @@ AcpiAmlResolveOperands (
/*
* Handle cases where the object does not need to be
* resolved to a value
* Handle cases where the object does not need to be
* resolved to a value
*/
switch (ThisArgType)
@ -361,7 +360,7 @@ AcpiAmlResolveOperands (
goto NextOperand;
}
Status = AcpiAmlCheckObjectType (INTERNAL_TYPE_REFERENCE,
Status = AcpiAmlCheckObjectType (INTERNAL_TYPE_REFERENCE,
ObjectType, ObjDesc);
if (ACPI_FAILURE (Status))
{
@ -380,7 +379,7 @@ AcpiAmlResolveOperands (
AcpiCmRemoveReference (ObjDesc);
(*StackPtr) = TempHandle;
}
goto NextOperand;
break;
@ -404,7 +403,6 @@ AcpiAmlResolveOperands (
}
/*
* Resolve this object to a value
*/
@ -426,7 +424,7 @@ AcpiAmlResolveOperands (
* is allowed
*/
case ARGI_NUMBER: /* Number */
/* Need an operand of type ACPI_TYPE_NUMBER */
TypeNeeded = ACPI_TYPE_NUMBER;
@ -523,7 +521,7 @@ AcpiAmlResolveOperands (
DEBUG_PRINT (ACPI_INFO,
("AmlResolveOperands: Needed [Buf/Str/Pkg/Ref], found [%s] %p\n",
AcpiCmGetTypeName ((*StackPtr)->Common.Type), *StackPtr));
return_ACPI_STATUS (AE_AML_OPERAND_TYPE);
}
@ -574,11 +572,11 @@ AcpiAmlResolveOperands (
}
/*
/*
* Make sure that the original object was resolved to the
* required object type (Simple cases only).
*/
Status = AcpiAmlCheckObjectType (TypeNeeded,
Status = AcpiAmlCheckObjectType (TypeNeeded,
(*StackPtr)->Common.Type, *StackPtr);
if (ACPI_FAILURE (Status))
{
@ -586,8 +584,6 @@ AcpiAmlResolveOperands (
}
NextOperand:
/*
* If more operands needed, decrement StackPtr to point
@ -601,7 +597,6 @@ AcpiAmlResolveOperands (
} /* while (*Types) */
return_ACPI_STATUS (Status);
}

6
sys/contrib/dev/acpica/Subsystem/Interpreter/amstore.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: amstore - AML Interpreter object store support
* $Revision: 117 $
* $Revision: 118 $
*
*****************************************************************************/
@ -10,8 +10,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Interpreter/amstoren.c
View File

@ -3,7 +3,7 @@
*
* Module Name: amstoren - AML Interpreter object store support,
* Store to Node (namespace object)
* $Revision: 24 $
* $Revision: 25 $
*
*****************************************************************************/
@ -11,8 +11,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Interpreter/amstorob.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: amstorob - AML Interpreter object store support, store to object
* $Revision: 18 $
* $Revision: 19 $
*
*****************************************************************************/
@ -10,8 +10,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Interpreter/amsystem.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: amsystem - Interface to OS services
* $Revision: 52 $
* $Revision: 53 $
*
*****************************************************************************/
@ -10,8 +10,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

8
sys/contrib/dev/acpica/Subsystem/Interpreter/amutils.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: amutils - interpreter/scanner utilities
* $Revision: 64 $
* $Revision: 66 $
*
*****************************************************************************/
@ -10,8 +10,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*
@ -264,7 +264,7 @@ AcpiAmlTruncateFor32bitTable (
* We are running a method that exists in a 32-bit ACPI table.
* Truncate the value to 32 bits by zeroing out the upper 32-bit field
*/
ObjDesc->Number.Value &= (UINT64) ACPI_UINT32_MAX;
ObjDesc->Number.Value &= (ACPI_INTEGER) ACPI_UINT32_MAX;
}
}

6
sys/contrib/dev/acpica/Subsystem/Interpreter/amxface.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: amxface - External interpreter interfaces
* $Revision: 22 $
* $Revision: 23 $
*
*****************************************************************************/
@ -10,8 +10,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Namespace/nsaccess.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: nsaccess - Top-level functions for accessing ACPI namespace
* $Revision: 115 $
* $Revision: 116 $
*
******************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Namespace/nsalloc.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: nsalloc - Namespace allocation and deletion utilities
* $Revision: 43 $
* $Revision: 44 $
*
******************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Namespace/nsdump.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: nsdump - table dumping routines for debug
* $Revision: 82 $
* $Revision: 83 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Namespace/nseval.c
View File

@ -2,7 +2,7 @@
*
* Module Name: nseval - Object evaluation interfaces -- includes control
* method lookup and execution.
* $Revision: 79 $
* $Revision: 80 $
*
******************************************************************************/
@ -10,8 +10,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

10
sys/contrib/dev/acpica/Subsystem/Namespace/nsinit.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: nsinit - namespace initialization
* $Revision: 9 $
* $Revision: 10 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*
@ -300,7 +300,7 @@ AcpiNsInitOneObject (
if (ACPI_FAILURE (Status))
{
DEBUG_PRINT_RAW (ACPI_ERROR, ("\n"));
DEBUG_PRINT (ACPI_ERROR, ("%s while getting region arguments [%4.4s]\n",
DEBUG_PRINT (ACPI_ERROR, ("%s while getting region arguments [%4.4s]\n",
AcpiCmFormatException (Status), &Node->Name));
}
@ -321,7 +321,7 @@ AcpiNsInitOneObject (
if (ACPI_FAILURE (Status))
{
DEBUG_PRINT_RAW (ACPI_ERROR, ("\n"));
DEBUG_PRINT (ACPI_ERROR, ("%s while getting field arguments [%4.4s]\n",
DEBUG_PRINT (ACPI_ERROR, ("%s while getting field arguments [%4.4s]\n",
AcpiCmFormatException (Status), &Node->Name));
}
DEBUG_PRINT_RAW (ACPI_OK, ("."));

6
sys/contrib/dev/acpica/Subsystem/Namespace/nsload.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: nsload - namespace loading/expanding/contracting procedures
* $Revision: 33 $
* $Revision: 34 $
*
*****************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Namespace/nsnames.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: nsnames - Name manipulation and search
* $Revision: 51 $
* $Revision: 52 $
*
******************************************************************************/
@ -9,8 +9,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

6
sys/contrib/dev/acpica/Subsystem/Namespace/nsobject.c
View File

@ -2,7 +2,7 @@
*
* Module Name: nsobject - Utilities for objects attached to namespace
* table entries
* $Revision: 47 $
* $Revision: 48 $
*
******************************************************************************/
@ -10,8 +10,8 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999, Intel Corp. All rights
* reserved.
* Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
* All rights reserved.
*
* 2. License
*

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