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

Merge local changes.

Browse Source
This commit is contained in:
Mike Smith 2001-08-26 22:45:42 +00:00
parent d142fbb1b8
commit 9d7b18c207
4 changed files with 50 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/contrib/dev/acpica/acconfig.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acconfig.h - Global configuration constants
* $Revision: 66 $
* $Revision: 68 $
*
*****************************************************************************/
@ -144,7 +144,7 @@
/* Version string */
#define ACPI_CA_VERSION 0x20010717
#define ACPI_CA_VERSION 0x20010816
/* Maximum objects in the various object caches */
@ -153,7 +153,7 @@
#define MAX_PARSE_CACHE_DEPTH 96 /* Parse tree objects */
#define MAX_EXTPARSE_CACHE_DEPTH 64 /* Parse tree objects */
#define MAX_OBJECT_CACHE_DEPTH 64 /* Interpreter operand objects */
#define MAX_WALK_CACHE_DEPTH 2 /* Objects for parse tree walks (method execution) */
#define MAX_WALK_CACHE_DEPTH 4 /* Objects for parse tree walks (method execution) */
/* String size constants */

31
sys/contrib/dev/acpica/acpixf.h
View File

@ -409,34 +409,7 @@ AcpiEnterSleepState (
UINT8 SleepState);
ACPI_STATUS
AcpiGetProcessorThrottlingInfo (
ACPI_HANDLE ProcessorHandle,
ACPI_BUFFER *UserBuffer);
ACPI_STATUS
AcpiSetProcessorThrottlingState (
ACPI_HANDLE ProcessorHandle,
UINT32 ThrottleState);
ACPI_STATUS
AcpiGetProcessorThrottlingState (
ACPI_HANDLE ProcessorHandle,
UINT32 *ThrottleState);
ACPI_STATUS
AcpiGetProcessorCxInfo (
ACPI_HANDLE ProcessorHandle,
ACPI_BUFFER *UserBuffer);
ACPI_STATUS
AcpiSetProcessorSleepState (
ACPI_HANDLE ProcessorHandle,
UINT32 CxState);
ACPI_STATUS
AcpiProcessorSleep (
ACPI_HANDLE ProcessorHandle,
UINT32 *PmTimerTicks);
AcpiLeaveSleepState (
UINT8 SleepState);
#endif /* __ACXFACE_H__ */

64
sys/contrib/dev/acpica/exfldio.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: exfldio - Aml Field I/O
* $Revision: 59 $
* $Revision: 62 $
*
*****************************************************************************/
@ -155,19 +155,11 @@ AcpiExSetupField (
FUNCTION_TRACE_U32 ("ExSetupField", FieldDatumByteOffset);
/* Parameter validation */
RgnDesc = ObjDesc->CommonField.RegionObj;
if (!ObjDesc || !RgnDesc)
{
DEBUG_PRINTP (ACPI_ERROR, ("Internal error - null handle\n"));
return_ACPI_STATUS (AE_AML_NO_OPERAND);
}
if (ACPI_TYPE_REGION != RgnDesc->Common.Type)
{
DEBUG_PRINTP (ACPI_ERROR, ("Needed Region, found type %x %s\n",
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Needed Region, found type %x %s\n",
RgnDesc->Common.Type, AcpiUtGetTypeName (RgnDesc->Common.Type)));
return_ACPI_STATUS (AE_AML_OPERAND_TYPE);
}
@ -204,8 +196,8 @@ AcpiExSetupField (
* than the region itself. For example, a region of length one
* byte, and a field with Dword access specified.
*/
DEBUG_PRINTP (ACPI_ERROR,
("Field access width (%d bytes) too large for region size (%X)\n",
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
"Field access width (%d bytes) too large for region size (%X)\n",
ObjDesc->CommonField.AccessByteWidth, RgnDesc->Region.Length));
}
@ -213,8 +205,8 @@ AcpiExSetupField (
* Offset rounded up to next multiple of field width
* exceeds region length, indicate an error
*/
DEBUG_PRINTP (ACPI_ERROR,
("Field base+offset+width %X+%X+%X exceeds region size (%X bytes) field=%p region=%p\n",
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
"Field base+offset+width %X+%X+%X exceeds region size (%X bytes) field=%p region=%p\n",
ObjDesc->CommonField.BaseByteOffset, FieldDatumByteOffset,
ObjDesc->CommonField.AccessByteWidth,
RgnDesc->Region.Length, ObjDesc, RgnDesc));
@ -309,7 +301,7 @@ AcpiExReadFieldDatum (
Address = RgnDesc->Region.Address + ObjDesc->CommonField.BaseByteOffset +
FieldDatumByteOffset;
DEBUG_PRINTP (TRACE_BFIELD, ("Region %s(%X) width %X base:off %X:%X at %8.8lX%8.8lX\n",
ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD, "Region %s(%X) width %X base:off %X:%X at %8.8lX%8.8lX\n",
AcpiUtGetRegionName (RgnDesc->Region.SpaceId),
RgnDesc->Region.SpaceId, ObjDesc->CommonField.AccessBitWidth,
ObjDesc->CommonField.BaseByteOffset, FieldDatumByteOffset,
@ -322,14 +314,14 @@ AcpiExReadFieldDatum (
Address, ObjDesc->CommonField.AccessBitWidth, Value);
if (Status == AE_NOT_IMPLEMENTED)
{
DEBUG_PRINTP (ACPI_ERROR, ("Region %s(%X) not implemented\n",
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Region %s(%X) not implemented\n",
AcpiUtGetRegionName (RgnDesc->Region.SpaceId),
RgnDesc->Region.SpaceId));
}
else if (Status == AE_NOT_EXIST)
{
DEBUG_PRINTP (ACPI_ERROR, ("Region %s(%X) has no handler\n",
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Region %s(%X) has no handler\n",
AcpiUtGetRegionName (RgnDesc->Region.SpaceId),
RgnDesc->Region.SpaceId));
}
@ -338,14 +330,14 @@ AcpiExReadFieldDatum (
default:
DEBUG_PRINTP (ACPI_ERROR, ("%p, wrong source type - %s\n",
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "%p, wrong source type - %s\n",
ObjDesc, AcpiUtGetTypeName (ObjDesc->Common.Type)));
Status = AE_AML_INTERNAL;
break;
}
DEBUG_PRINTP (TRACE_BFIELD, ("Returned value=%08lX \n", *Value));
ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD, "Returned value=%08lX \n", *Value));
return_ACPI_STATUS (Status);
}
@ -473,7 +465,7 @@ AcpiExExtractFromField (
ByteFieldLength = ROUND_BITS_UP_TO_BYTES (ObjDesc->CommonField.BitLength);
if (ByteFieldLength > BufferLength)
{
DEBUG_PRINTP (ACPI_INFO, ("Field size %X (bytes) too large for buffer (%X)\n",
ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Field size %X (bytes) too large for buffer (%X)\n",
ByteFieldLength, BufferLength));
return_ACPI_STATUS (AE_BUFFER_OVERFLOW);
@ -483,8 +475,8 @@ AcpiExExtractFromField (
DatumCount = ROUND_UP_TO (ByteFieldLength, ObjDesc->CommonField.AccessByteWidth);
DEBUG_PRINT (ACPI_INFO,
("ByteLen=%x, DatumLen=%x, BitGran=%x, ByteGran=%x\n",
ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
"ByteLen=%x, DatumLen=%x, BitGran=%x, ByteGran=%x\n",
ByteFieldLength, DatumCount, ObjDesc->CommonField.AccessBitWidth,
ObjDesc->CommonField.AccessByteWidth));
@ -695,8 +687,8 @@ AcpiExWriteFieldDatum (
ObjDesc->CommonField.BaseByteOffset +
FieldDatumByteOffset;
DEBUG_PRINTP (TRACE_BFIELD,
("Store %X in Region %s(%X) at %8.8lX%8.8lX width %X\n",
ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD,
"Store %X in Region %s(%X) at %8.8lX%8.8lX width %X\n",
Value, AcpiUtGetRegionName (RgnDesc->Region.SpaceId),
RgnDesc->Region.SpaceId, HIDWORD(Address), LODWORD(Address),
ObjDesc->CommonField.AccessBitWidth));
@ -708,16 +700,16 @@ AcpiExWriteFieldDatum (
if (Status == AE_NOT_IMPLEMENTED)
{
DEBUG_PRINTP (ACPI_ERROR,
("**** Region type %s(%X) not implemented\n",
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
"**** Region type %s(%X) not implemented\n",
AcpiUtGetRegionName (RgnDesc->Region.SpaceId),
RgnDesc->Region.SpaceId));
}
else if (Status == AE_NOT_EXIST)
{
DEBUG_PRINTP (ACPI_ERROR,
("**** Region type %s(%X) does not have a handler\n",
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
"**** Region type %s(%X) does not have a handler\n",
AcpiUtGetRegionName (RgnDesc->Region.SpaceId),
RgnDesc->Region.SpaceId));
}
@ -727,14 +719,14 @@ AcpiExWriteFieldDatum (
default:
DEBUG_PRINTP (ACPI_ERROR, ("%p, wrong source type - %s\n",
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "%p, wrong source type - %s\n",
ObjDesc, AcpiUtGetTypeName (ObjDesc->Common.Type)));
Status = AE_AML_INTERNAL;
break;
}
DEBUG_PRINTP (TRACE_BFIELD, ("Value written=%08lX \n", Value));
ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD, "Value written=%08lX \n", Value));
return_ACPI_STATUS (Status);
}
@ -818,8 +810,8 @@ AcpiExWriteFieldDatumWithUpdateRule (
default:
DEBUG_PRINT (ACPI_ERROR,
("WriteWithUpdateRule: Unknown UpdateRule setting: %x\n",
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
"WriteWithUpdateRule: Unknown UpdateRule setting: %x\n",
ObjDesc->CommonField.UpdateRule));
return_ACPI_STATUS (AE_AML_OPERAND_VALUE);
break;
@ -832,7 +824,7 @@ AcpiExWriteFieldDatumWithUpdateRule (
Status = AcpiExWriteFieldDatum (ObjDesc, FieldDatumByteOffset,
MergedValue);
DEBUG_PRINTP (TRACE_BFIELD, ("Mask %X DatumOffset %X Value %X, MergedValue %X\n",
ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD, "Mask %X DatumOffset %X Value %X, MergedValue %X\n",
Mask, FieldDatumByteOffset, FieldValue, MergedValue));
return_ACPI_STATUS (Status);
@ -881,7 +873,7 @@ AcpiExInsertIntoField (
ByteFieldLength = ROUND_BITS_UP_TO_BYTES (ObjDesc->CommonField.BitLength);
if (BufferLength < ByteFieldLength)
{
DEBUG_PRINTP (ACPI_INFO, ("Buffer length %X too small for field %X\n",
ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Buffer length %X too small for field %X\n",
BufferLength, ByteFieldLength));
/* TBD: Need a better error code */
@ -893,8 +885,8 @@ AcpiExInsertIntoField (
DatumCount = ROUND_UP_TO (ByteFieldLength, ObjDesc->CommonField.AccessByteWidth);
DEBUG_PRINT (ACPI_INFO,
("ByteLen=%x, DatumLen=%x, BitGran=%x, ByteGran=%x\n",
ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
"ByteLen=%x, DatumLen=%x, BitGran=%x, ByteGran=%x\n",
ByteFieldLength, DatumCount, ObjDesc->CommonField.AccessBitWidth,
ObjDesc->CommonField.AccessByteWidth));

33
sys/contrib/dev/acpica/psparse.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: psparse - Parser top level AML parse routines
* $Revision: 87 $
* $Revision: 89 $
*
*****************************************************************************/
@ -664,12 +664,12 @@ AcpiPsParseLoop (
{
if (Status == AE_AML_NO_RETURN_VALUE)
{
DEBUG_PRINTP (ACPI_ERROR,
("Invoked method did not return a value, %s\n",
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
"Invoked method did not return a value, %s\n",
AcpiFormatException (Status)));
}
DEBUG_PRINTP (ACPI_ERROR, ("GetPredicate Failed, %s\n",
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "GetPredicate Failed, %s\n",
AcpiFormatException (Status)));
return_ACPI_STATUS (Status);
}
@ -678,7 +678,7 @@ AcpiPsParseLoop (
}
AcpiPsPopScope (ParserState, &Op, &ArgTypes, &ArgCount);
DEBUG_PRINTP (TRACE_PARSE, ("Popped scope, Op=%p\n", Op));
ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "Popped scope, Op=%p\n", Op));
}
else if (WalkState->PrevOp)
@ -737,8 +737,8 @@ AcpiPsParseLoop (
/* The opcode is unrecognized. Just skip unknown opcodes */
DEBUG_PRINTP (ACPI_ERROR,
("Found unknown opcode %lX at AML offset %X, ignoring\n",
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
"Found unknown opcode %lX at AML offset %X, ignoring\n",
Opcode, AmlOffset));
DUMP_BUFFER (ParserState->Aml, 128);
@ -879,8 +879,8 @@ AcpiPsParseLoop (
if (OpInfo)
{
DEBUG_PRINTP (TRACE_PARSE,
("Op=%p Opcode=%4.4lX Aml %p Oft=%5.5lX\n",
ACPI_DEBUG_PRINT ((ACPI_DB_PARSE,
"Op=%p Opcode=%4.4lX Aml %p Oft=%5.5lX\n",
Op, Op->Opcode, ParserState->Aml, Op->AmlOffset));
}
}
@ -900,6 +900,7 @@ AcpiPsParseLoop (
case AML_BYTE_OP: /* AML_BYTEDATA_ARG */
case AML_WORD_OP: /* AML_WORDDATA_ARG */
case AML_DWORD_OP: /* AML_DWORDATA_ARG */
case AML_QWORD_OP: /* AML_QWORDATA_ARG */
case AML_STRING_OP: /* AML_ASCIICHARLIST_ARG */
/* fill in constant or string argument directly */
@ -1120,7 +1121,7 @@ CloseThisOp:
if (AcpiPsHasCompletedScope (ParserState))
{
AcpiPsPopScope (ParserState, &Op, &ArgTypes, &ArgCount);
DEBUG_PRINTP (TRACE_PARSE, ("Popped scope, Op=%p\n", Op));
ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "Popped scope, Op=%p\n", Op));
}
else
@ -1151,7 +1152,7 @@ CloseThisOp:
* sequential closing braces). We want to terminate each one cleanly.
*/
DEBUG_PRINTP (TRACE_PARSE, ("Package complete at Op %p\n", Op));
ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "Package complete at Op %p\n", Op));
do
{
if (Op)
@ -1243,7 +1244,7 @@ AcpiPsParseAml (
FUNCTION_TRACE ("PsParseAml");
DEBUG_PRINTP (TRACE_PARSE, ("Entered with Scope=%p Aml=%p size=%lX\n",
ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "Entered with Scope=%p Aml=%p size=%lX\n",
StartScope, Aml, AmlSize));
@ -1335,7 +1336,7 @@ AcpiPsParseAml (
* handles nested control method invocations without recursion.
*/
DEBUG_PRINTP (TRACE_PARSE, ("State=%p\n", WalkState));
ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "State=%p\n", WalkState));
while (WalkState)
{
@ -1344,8 +1345,8 @@ AcpiPsParseAml (
Status = AcpiPsParseLoop (WalkState);
}
DEBUG_PRINTP (TRACE_PARSE,
("Completed one call to walk loop, State=%p\n", WalkState));
ACPI_DEBUG_PRINT ((ACPI_DB_PARSE,
"Completed one call to walk loop, State=%p\n", WalkState));
if (Status == AE_CTRL_TRANSFER)
{
@ -1387,7 +1388,7 @@ AcpiPsParseAml (
AcpiUtAddReference (EffectiveReturnDesc);
}
DEBUG_PRINTP (TRACE_PARSE, ("ReturnValue=%p, State=%p\n",
ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "ReturnValue=%p, State=%p\n",
WalkState->ReturnDesc, WalkState));
/* Reset the current scope to the beginning of scope stack */