Print this page
update to acpica-unix2-20140114
acpica-unix2-20130823
PANKOVs restructure
@@ -3,11 +3,11 @@
* Module Name: psxface - Parser external interfaces
*
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -148,11 +148,11 @@
{
return;
}
if ((!AcpiGbl_TraceMethodName) ||
- (AcpiGbl_TraceMethodName != Info->ResolvedNode->Name.Integer))
+ (AcpiGbl_TraceMethodName != Info->Node->Name.Integer))
{
goto Exit;
}
AcpiGbl_OriginalDbgLevel = AcpiDbgLevel;
@@ -203,11 +203,11 @@
{
return;
}
if ((!AcpiGbl_TraceMethodName) ||
- (AcpiGbl_TraceMethodName != Info->ResolvedNode->Name.Integer))
+ (AcpiGbl_TraceMethodName != Info->Node->Name.Integer))
{
goto Exit;
}
/* Disable further tracing if type is one-shot */
@@ -266,18 +266,18 @@
AcpiTbCheckDsdtHeader ();
/* Validate the Info and method Node */
- if (!Info || !Info->ResolvedNode)
+ if (!Info || !Info->Node)
{
return_ACPI_STATUS (AE_NULL_ENTRY);
}
/* Init for new method, wait on concurrency semaphore */
- Status = AcpiDsBeginMethodExecution (Info->ResolvedNode, Info->ObjDesc, NULL);
+ Status = AcpiDsBeginMethodExecution (Info->Node, Info->ObjDesc, NULL);
if (ACPI_FAILURE (Status))
{
return_ACPI_STATUS (Status);
}
@@ -293,11 +293,11 @@
/*
* Execute the method. Performs parse simultaneously
*/
ACPI_DEBUG_PRINT ((ACPI_DB_PARSE,
"**** Begin Method Parse/Execute [%4.4s] **** Node=%p Obj=%p\n",
- Info->ResolvedNode->Name.Ascii, Info->ResolvedNode, Info->ObjDesc));
+ Info->Node->Name.Ascii, Info->Node, Info->ObjDesc));
/* Create and init a Root Node */
Op = AcpiPsCreateScopeOp ();
if (!Op)
@@ -315,11 +315,11 @@
{
Status = AE_NO_MEMORY;
goto Cleanup;
}
- Status = AcpiDsInitAmlWalk (WalkState, Op, Info->ResolvedNode,
+ Status = AcpiDsInitAmlWalk (WalkState, Op, Info->Node,
Info->ObjDesc->Method.AmlStart,
Info->ObjDesc->Method.AmlLength, Info, Info->PassNumber);
if (ACPI_FAILURE (Status))
{
AcpiDsDeleteWalkState (WalkState);
@@ -346,12 +346,12 @@
AcpiDsDeleteWalkState (WalkState);
goto Cleanup;
}
/*
- * Start method evaluation with an implicit return of zero. This is done
- * for Windows compatibility.
+ * Start method evaluation with an implicit return of zero.
+ * This is done for Windows compatibility.
*/
if (AcpiGbl_EnableInterpreterSlack)
{
WalkState->ImplicitReturnObj =
AcpiUtCreateIntegerObject ((UINT64) 0);
@@ -436,7 +436,5 @@
(void) AcpiUtUpdateObjectReference (Info->Parameters[i], Action);
}
}
}
-
-