mirrors/acpica
1
0
Fork 0
mirror of https://github.com/acpica/acpica/ synced 2025-01-18 15:39:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Converted to new return macros

Browse Source 
date	99.08.13.16.59.00;	author rmoore1;	state Exp;
This commit is contained in:
aystarik 2005-06-29 17:22:34 +00:00
parent abbe2e83a0
commit 42b88f62c7
10 changed files with 174 additions and 311 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/components/executer/exdump.c
View File

@ -244,7 +244,7 @@ AmlDumpBuffer (
DEBUG_PRINT (TRACE_TABLES, ("AML from %p:\n", AmlGetPCodeHandle ()));
DumpBuffer ((UINT8 *) AmlGetPCodeHandle (), NumBytes, HEX, INTERPRETER);
FUNCTION_EXIT;
return_VOID;
}
@ -275,8 +275,7 @@ AmlDumpObjStackEntry (
if (!EntryDesc)
{
DEBUG_PRINT (ACPI_ERROR, ("AmlDumpObjStackEntry: ***NULL stack entry pointer***\n"));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
else if (IS_NS_HANDLE (EntryDesc))
@ -641,8 +640,7 @@ AmlDumpObjStackEntry (
}
}
FUNCTION_STATUS_EXIT (AE_OK);
return AE_OK;
return_ACPI_STATUS (AE_OK);
}
@ -717,7 +715,7 @@ AmlDumpObjStack (
}
}
FUNCTION_EXIT;
return_VOID;
}
@ -923,8 +921,6 @@ AmlDumpObjectDescriptor (
break;
}
FUNCTION_EXIT;
return_VOID;
}

26
source/components/executer/exfield.c
View File

@ -327,8 +327,7 @@ AmlSetupField (
}
}
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
@ -375,8 +374,7 @@ AmlReadField (
Status = AmlSetupField (ObjDesc, RgnDesc, FieldBitWidth);
if (AE_OK != Status)
{
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
/* SetupField validated RgnDesc and FieldBitWidth */
@ -429,8 +427,7 @@ AmlReadField (
DEBUG_PRINT (TRACE_OPREGION, ("AmlReadField: Returned value=%08lx \n", *Value));
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
@ -474,8 +471,7 @@ AmlWriteField (
Status = AmlSetupField (ObjDesc, RgnDesc, FieldBitWidth);
if (AE_OK != Status)
{
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
Address = RgnDesc->Region.Address
@ -511,8 +507,7 @@ AmlWriteField (
RgnDesc->Region.SpaceId));
}
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
@ -749,8 +744,7 @@ AmlAccessNamedField (
AmlReleaseGlobalLock (Locked);
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
@ -787,8 +781,7 @@ AmlSetNamedFieldValue (
Status = AmlAccessNamedField (ACPI_WRITE, NamedField, &Value);
}
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
@ -832,9 +825,6 @@ AmlGetNamedFieldValue (
Status = AmlAccessNamedField (ACPI_READ, NamedField, Value);
}
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}

107
source/components/executer/exmisc.c
View File

@ -171,9 +171,6 @@ AmlExecCreateField (
UINT32 BitOffset;
UINT32 StackIndex;
UINT8 TypeFound;
char TypeName[20];
char *TypeFoundPtr = NULL;
@ -207,8 +204,7 @@ AmlExecCreateField (
/* Invalid parameters on object stack */
AmlAppendOperandDiag (_THIS_MODULE, __LINE__, opcode, NumOperands);
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
/* Get pointers to everything that is now on the object stack */
@ -231,8 +227,7 @@ AmlExecCreateField (
if (!IS_NS_HANDLE (ResDesc))
{
DEBUG_PRINT (ACPI_ERROR, ("AmlExecCreateField (%s): destination must be a Name\n", OpName));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
@ -293,8 +288,7 @@ AmlExecCreateField (
DEBUG_PRINT (ACPI_ERROR, (
"AmlExecCreateField: Internal error - unknown field creation opcode %02x\n",
opcode));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
} /* switch */
@ -316,8 +310,7 @@ AmlExecCreateField (
DEBUG_PRINT (ACPI_ERROR, ("AmlExecCreateField: Field exceeds Buffer %d > %d\n",
BitOffset + (UINT32)BitCount,
8 * (UINT32)SrcDesc->Buffer.Length));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
/* Reuse "OffDesc" descriptor to build result */
@ -334,6 +327,8 @@ AmlExecCreateField (
break;
/* Improper object type */
default:
TypeFound = SrcDesc->Type;
@ -341,19 +336,19 @@ AmlExecCreateField (
if ((TypeFound > (UINT8) TYPE_Lvalue) ||
(BadType == NsTypeNames[TypeFound]))
{
sprintf (TypeName, "encoding %d", TypeFound);
TypeFoundPtr = TypeName;
}
else
{
TypeFoundPtr = NsTypeNames[TypeFound];
DEBUG_PRINT (ACPI_ERROR, (
"AmlExecCreateField: Tried to create field in improper object type - encoding %d\n",
TypeFound));
}
DEBUG_PRINT (ACPI_ERROR, (
"AmlExecCreateField: Tried to create field in improper object type %s\n",
TypeFoundPtr));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
else
{
DEBUG_PRINT (ACPI_ERROR, (
"AmlExecCreateField: Tried to create field in improper object type - %s\n",
NsTypeNames[TypeFound]));
}
return_ACPI_STATUS (AE_AML_ERROR);
} /* switch */
@ -404,14 +399,14 @@ AmlExecCreateField (
Status = AmlExecStore (OffDesc, ResDesc);
/* Pop off everything from the stack */
/*
* Pop off everything from the stack except the result,
* which we want to leave sitting at the stack top.
*/
AmlObjStackPop (NumOperands - 1);
AmlObjStackClearTop ();
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
@ -452,8 +447,7 @@ AmlExecFatal (void)
/* invalid parameters on object stack */
AmlAppendOperandDiag (_THIS_MODULE, __LINE__, (UINT16) AML_FatalOp, 3);
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
AmlDumpObjStack (MODE_Exec, LongOps[AML_FatalOp & 0x00ff], 3, "after AmlPrepObjStack");
@ -471,8 +465,7 @@ AmlExecFatal (void)
ArgDesc->Number.Value));
DEBUG_PRINT (ACPI_ERROR, ("AmlExecFatal: FatalOp executed\n"));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
@ -557,8 +550,7 @@ AmlExecIndex (void)
AmlObjStackPop (2);
}
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
@ -596,7 +588,7 @@ AmlExecMatch (void)
ACPI_OBJECT_INTERNAL *V2Desc;
ACPI_OBJECT_INTERNAL *StartDesc;
ACPI_STATUS Status;
UINT32 Look;
UINT32 Index;
UINT32 MatchValue = (UINT32) -1;
@ -610,10 +602,12 @@ AmlExecMatch (void)
/* invalid parameters on object stack */
AmlAppendOperandDiag (_THIS_MODULE, __LINE__, (UINT16) AML_MatchOp, 6);
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
/* Get the parameters from the object stack */
AmlDumpObjStack (MODE_Exec, ShortOps[AML_MatchOp], 6, "after AmlPrepObjStack");
StartDesc = AmlObjStackGetValue (0);
@ -629,16 +623,14 @@ AmlExecMatch (void)
Op2Desc->Number.Value < 0 || Op2Desc->Number.Value > 5)
{
DEBUG_PRINT (ACPI_ERROR, ("AmlExecMatch: operation encoding out of range\n"));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
Look = StartDesc->Number.Value;
if (Look < 0 || Look >= (UINT32) PkgDesc->Package.Count)
Index = StartDesc->Number.Value;
if (Index < 0 || Index >= (UINT32) PkgDesc->Package.Count)
{
DEBUG_PRINT (ACPI_ERROR, ("AmlExecMatch: start position value out of range\n"));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
/*
@ -651,14 +643,14 @@ AmlExecMatch (void)
* returned as a Number, this will produce the Ones value as specified.
*/
for ( ; Look < (UINT32) PkgDesc->Package.Count ; ++Look)
for ( ; Index < (UINT32) PkgDesc->Package.Count ; ++Index)
{
/*
* Treat any NULL or non-numeric elements as non-matching.
* XXX - if an element is a Name, should we examine its value?
*/
if (!PkgDesc->Package.Elements[Look] ||
TYPE_Number != PkgDesc->Package.Elements[Look]->Type)
if (!PkgDesc->Package.Elements[Index] ||
TYPE_Number != PkgDesc->Package.Elements[Index]->Type)
{
continue;
}
@ -679,7 +671,7 @@ AmlExecMatch (void)
case MATCH_MEQ: /* true if equal */
if (PkgDesc->Package.Elements[Look]->Number.Value
if (PkgDesc->Package.Elements[Index]->Number.Value
!= V1Desc->Number.Value)
{
continue;
@ -689,7 +681,7 @@ AmlExecMatch (void)
case MATCH_MLE: /* true if less than or equal */
if (PkgDesc->Package.Elements[Look]->Number.Value
if (PkgDesc->Package.Elements[Index]->Number.Value
> V1Desc->Number.Value)
{
continue;
@ -699,7 +691,7 @@ AmlExecMatch (void)
case MATCH_MLT: /* true if less than */
if (PkgDesc->Package.Elements[Look]->Number.Value
if (PkgDesc->Package.Elements[Index]->Number.Value
>= V1Desc->Number.Value)
{
continue;
@ -709,7 +701,7 @@ AmlExecMatch (void)
case MATCH_MGE: /* true if greater than or equal */
if (PkgDesc->Package.Elements[Look]->Number.Value
if (PkgDesc->Package.Elements[Index]->Number.Value
< V1Desc->Number.Value)
{
continue;
@ -719,7 +711,7 @@ AmlExecMatch (void)
case MATCH_MGT: /* true if greater than */
if (PkgDesc->Package.Elements[Look]->Number.Value
if (PkgDesc->Package.Elements[Index]->Number.Value
<= V1Desc->Number.Value)
{
continue;
@ -743,7 +735,7 @@ AmlExecMatch (void)
case MATCH_MEQ:
if (PkgDesc->Package.Elements[Look]->Number.Value
if (PkgDesc->Package.Elements[Index]->Number.Value
!= V2Desc->Number.Value)
{
continue;
@ -753,7 +745,7 @@ AmlExecMatch (void)
case MATCH_MLE:
if (PkgDesc->Package.Elements[Look]->Number.Value
if (PkgDesc->Package.Elements[Index]->Number.Value
> V2Desc->Number.Value)
{
continue;
@ -763,7 +755,7 @@ AmlExecMatch (void)
case MATCH_MLT:
if (PkgDesc->Package.Elements[Look]->Number.Value
if (PkgDesc->Package.Elements[Index]->Number.Value
>= V2Desc->Number.Value)
{
continue;
@ -773,7 +765,7 @@ AmlExecMatch (void)
case MATCH_MGE:
if (PkgDesc->Package.Elements[Look]->Number.Value
if (PkgDesc->Package.Elements[Index]->Number.Value
< V2Desc->Number.Value)
{
continue;
@ -783,7 +775,7 @@ AmlExecMatch (void)
case MATCH_MGT:
if (PkgDesc->Package.Elements[Look]->Number.Value
if (PkgDesc->Package.Elements[Index]->Number.Value
<= V2Desc->Number.Value)
{
continue;
@ -798,7 +790,7 @@ AmlExecMatch (void)
/* Match found: exit from loop */
MatchValue = Look;
MatchValue = Index;
break;
}
@ -817,6 +809,5 @@ AmlExecMatch (void)
AmlObjStackPop (5);
FUNCTION_STATUS_EXIT (AE_OK);
return AE_OK;
return_ACPI_STATUS (AE_OK);
}

19
source/components/executer/exnames.c
View File

@ -190,8 +190,7 @@ AmlAllocateNameString (
/* Allocation failure */
REPORT_ERROR ("AmlAllocateNameString: name allocation failure");
FUNCTION_EXIT;
return NULL;
return_VALUE (NULL);
}
TempPtr = NameString;
@ -233,8 +232,7 @@ AmlAllocateNameString (
*TempPtr = 0;
FUNCTION_EXIT;
return NameString;
return_VALUE (NameString);
}
@ -308,8 +306,7 @@ AmlDecodePackageLength (
NumBytes = 4;
}
FUNCTION_EXIT;
return NumBytes;
return_VALUE (NumBytes);
}
@ -415,8 +412,7 @@ AmlDoSeg (
DEBUG_PRINT (TRACE_EXEC, ("Leave AmlDoSeg %s \n", ExceptionNames[Status]));
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
@ -446,8 +442,8 @@ AmlDoName (
ACPI_HANDLE Handle;
INT32 MethodFlags;
INT32 ArgCount;
INT32 PreviousStackTop;
INT32 CurrentStackTop;
INT32 PreviousStackTop = 0;
INT32 CurrentStackTop = 0;
UINT32 StackOffset;
METHOD_INFO *MethodPtr;
ACPI_HANDLE MethodScope;
@ -833,8 +829,7 @@ BREAKPOINT3;
CmFree (NameString);
}
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}

83
source/components/executer/exoparg1.c
View File

@ -165,8 +165,7 @@ AmlExecMonadic1 (
if (Status != AE_OK)
{
AmlAppendOperandDiag (_THIS_MODULE, __LINE__, opcode, 1);
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
@ -188,13 +187,11 @@ AmlExecMonadic1 (
DEBUG_PRINT (ACPI_ERROR, (
"AmlExecMonadic1/ReleaseOp: Needed Mutex, found %d\n",
ObjDesc->Type));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
Status = OsReleaseOpRqst (ObjDesc);
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
/* DefReset := ResetOp EventObject */
@ -205,13 +202,11 @@ AmlExecMonadic1 (
{
DEBUG_PRINT (ACPI_ERROR, (
"AmlExecMonadic1/ResetOp: Needed Event, found %d\n", ObjDesc->Type));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
Status = OsResetOpRqst (ObjDesc);
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
/* DefSignal := SignalOp EventObject */
@ -222,13 +217,11 @@ AmlExecMonadic1 (
{
DEBUG_PRINT (ACPI_ERROR, (
"AmlExecMonadic1/SignalOp: Needed Event, found %d\n", ObjDesc->Type));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
Status = OsSignalOpRqst (ObjDesc);
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
/* DefSleep := SleepOp MsecTime */
@ -252,15 +245,13 @@ AmlExecMonadic1 (
default:
DEBUG_PRINT (ACPI_ERROR, ("AmlExecMonadic1: Unknown monadic opcode %02x\n", opcode));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
} /* switch */
CmFree (ObjDesc);
FUNCTION_STATUS_EXIT (AE_OK);
return AE_OK;
return_ACPI_STATUS (AE_OK);
}
@ -306,8 +297,7 @@ AmlExecMonadic2R (
if (Status != AE_OK)
{
AmlAppendOperandDiag (_THIS_MODULE, __LINE__, opcode, 2);
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
}
@ -366,8 +356,7 @@ AmlExecMonadic2R (
DEBUG_PRINT (ACPI_ERROR, (
"AmlExecMonadic2R/FromBCDOp: improper BCD digit %d %d %d %d\n",
d3, d2, d1, d0));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
ObjDesc->Number.Value = d0 + d1 * 10 + d2 * 100 + d3 * 1000;
@ -383,8 +372,7 @@ AmlExecMonadic2R (
{
DEBUG_PRINT (ACPI_ERROR, ("iExecMonadic2R/ToBCDOp: BCD overflow: %d\n",
ObjDesc->Number.Value));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
ObjDesc->Number.Value
@ -406,8 +394,7 @@ AmlExecMonadic2R (
DEBUG_PRINT (ACPI_ERROR, ("AmlExecMonadic2R: %s unimplemented\n",
(opcode > ACPI_UCHAR_MAX) ? LongOps[opcode & 0x00ff] : ShortOps[opcode]));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
case AML_StoreOp:
@ -419,8 +406,7 @@ AmlExecMonadic2R (
DEBUG_PRINT (ACPI_ERROR, ("AmlExecMonadic2R: internal error: Unknown monadic opcode %02x\n",
opcode));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
Status = AmlExecStore (ObjDesc, ResDesc);
@ -429,8 +415,7 @@ AmlExecMonadic2R (
AmlObjStackPop (1);
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
@ -472,8 +457,7 @@ AmlExecMonadic2 (
if (Status != AE_OK)
{
AmlAppendOperandDiag (_THIS_MODULE, __LINE__, opcode, 1);
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
AmlDumpObjStack (MODE_Exec, ShortOps[opcode], 1, "after AmlPrepObjStack");
@ -501,8 +485,7 @@ AmlExecMonadic2 (
if ((Status = AmlObjStackPushIfExec (MODE_Exec)) != AE_OK)
{
REPORT_ERROR ("AmlExecMonadic2/IncDec: stack overflow");
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
/* duplicate the Lvalue on TOS */
@ -519,8 +502,7 @@ AmlExecMonadic2 (
else
{
FUNCTION_STATUS_EXIT (AE_NO_MEMORY);
return AE_NO_MEMORY;
return_ACPI_STATUS (AE_NO_MEMORY);
}
/* Convert the top copy to a Number */
@ -529,8 +511,7 @@ AmlExecMonadic2 (
if (Status != AE_OK)
{
AmlAppendOperandDiag (_THIS_MODULE, __LINE__, opcode, 1);
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
/* get the Number in ObjDesc and the Lvalue in ResDesc */
@ -558,8 +539,7 @@ AmlExecMonadic2 (
AmlObjStackPop (1); /* Remove top entry */
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
@ -596,8 +576,7 @@ AmlExecMonadic2 (
case AML_IndexOp:
DEBUG_PRINT (ACPI_ERROR, ("AmlExecMonadic2/TypeOp: determining type of Index result is not implemented\n"));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
case AML_Local0: case AML_Local1: case AML_Local2: case AML_Local3:
@ -619,8 +598,7 @@ AmlExecMonadic2 (
DEBUG_PRINT (ACPI_ERROR, (
"AmlExecMonadic2/TypeOp:internal error: Unknown Lvalue subtype %02x\n",
ObjDesc->Lvalue.OpCode));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
}
@ -636,8 +614,7 @@ AmlExecMonadic2 (
ObjDesc = AllocateObjectDesc ();
if (!ObjDesc)
{
FUNCTION_STATUS_EXIT (AE_NO_MEMORY);
return AE_NO_MEMORY;
return_ACPI_STATUS (AE_NO_MEMORY);
}
/*
@ -685,8 +662,7 @@ AmlExecMonadic2 (
DEBUG_PRINT (ACPI_ERROR, (
"AmlExecMonadic2: Needed aggregate, found %d\n", ObjDesc->Type));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
break;
@ -703,8 +679,7 @@ AmlExecMonadic2 (
AmlObjStackPush (); /* dummy return value */
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
default:
@ -713,13 +688,9 @@ AmlExecMonadic2 (
"AmlExecMonadic2: Internal error, unknown monadic opcode %02x\n",
opcode));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
FUNCTION_STATUS_EXIT (AE_OK);
return AE_OK;
return_ACPI_STATUS (AE_OK);
}

45
source/components/executer/exoparg2.c
View File

@ -162,8 +162,7 @@ AmlExecDyadic1 (
/* Invalid parameters on object stack */
AmlAppendOperandDiag (_THIS_MODULE, __LINE__, opcode, 2);
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
AmlDumpObjStack (MODE_Exec, ShortOps[opcode], 2, "after AmlPrepObjStack");
@ -233,8 +232,7 @@ AmlExecDyadic1 (
AmlObjStackPop (1);
AmlObjStackClearTop ();
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
@ -306,8 +304,7 @@ AmlExecDyadic2R (
if (Status != AE_OK)
{
AmlAppendOperandDiag (_THIS_MODULE, __LINE__, opcode, NumOperands);
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
AmlDumpObjStack (MODE_Exec, ShortOps[opcode], NumOperands, "after AmlPrepObjStack");
@ -381,8 +378,7 @@ AmlExecDyadic2R (
if ((UINT32) 0 == ObjDesc2->Number.Value)
{
DEBUG_PRINT (ACPI_ERROR, ("AmlExecDyadic2R/DivideOp: divide by zero\n"));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
remain = ObjDesc->Number.Value % ObjDesc2->Number.Value;
@ -427,8 +423,7 @@ AmlExecDyadic2R (
DEBUG_PRINT (ACPI_ERROR, (
"AmlExecDyadic2R/ConcatOp: operand type mismatch %d %d\n",
ObjDesc->Type, ObjDesc2->Type));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
/* Both operands are now known to be the same */
@ -442,8 +437,7 @@ AmlExecDyadic2R (
if (!NewBuf)
{
REPORT_ERROR ("AmlExecDyadic2R/ConcatOp: String allocation failure");
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
strcpy (NewBuf, (char *) ObjDesc->String.Pointer);
@ -469,15 +463,13 @@ AmlExecDyadic2R (
if (ObjDesc->Buffer.Length + ObjDesc2->Buffer.Length < 1024)
{
REPORT_ERROR ("AmlExecDyadic2R/ConcatOp: Buffer allocation failure");
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
DEBUG_PRINT (ACPI_ERROR, (
"AmlExecDyadic2R/ConcatOp: Buffer allocation failure %d\n",
ObjDesc->Buffer.Length + ObjDesc2->Buffer.Length));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
memcpy (NewBuf, ObjDesc->Buffer.Pointer,
@ -495,16 +487,14 @@ AmlExecDyadic2R (
default:
DEBUG_PRINT (ACPI_ERROR, ("AmlExecDyadic2R: Unknown dyadic opcode %02x\n", opcode));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
if ((Status = AmlExecStore (ObjDesc, ResDesc)) != AE_OK)
{
AmlObjStackPop (NumOperands - 1);
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
if (AML_DivideOp == opcode)
@ -520,8 +510,7 @@ AmlExecDyadic2R (
CmFree (ObjDesc2);
AmlObjStackPop (NumOperands - 1);
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
@ -625,8 +614,7 @@ AmlExecDyadic2S (
}
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
@ -665,8 +653,7 @@ AmlExecDyadic2 (
/* invalid parameters on object stack */
AmlAppendOperandDiag (_THIS_MODULE, __LINE__, opcode, 2);
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
AmlDumpObjStack (MODE_Exec, ShortOps[opcode], 2, "after AmlPrepObjStack");
@ -733,8 +720,7 @@ AmlExecDyadic2 (
default:
DEBUG_PRINT (ACPI_ERROR, ("AmlExecDyadic2: Unknown dyadic opcode %02x\n", opcode));
FUNCTION_STATUS_EXIT (Status);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
@ -757,8 +743,7 @@ AmlExecDyadic2 (
/* Always return AE_OK here (AE_PENDING was handled above!) */
FUNCTION_STATUS_EXIT (AE_OK);
return AE_OK;
return_ACPI_STATUS (AE_OK);
}

15
source/components/executer/exprep.c
View File

@ -254,8 +254,7 @@ AmlPrepDefFieldValue (
(UINT8) NsGetType ((ACPI_HANDLE) AmlObjStackGetValue (0)));
}
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
@ -331,8 +330,7 @@ AmlPrepBankFieldValue (
((UINT8 *) ObjDesc)[3]));
CmFree (ObjDesc);
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
}
@ -375,8 +373,7 @@ AmlPrepBankFieldValue (
}
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
@ -440,8 +437,7 @@ AmlPrepIndexFieldValue (
ObjDesc, ((UINT8 *) ObjDesc)[0], ((UINT8 *) ObjDesc)[1], ((UINT8 *) ObjDesc)[2],
((UINT8 *) ObjDesc)[3]));
CmFree (ObjDesc);
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
}
@ -482,7 +478,6 @@ AmlPrepIndexFieldValue (
(UINT8) NsGetType ((ACPI_HANDLE) AmlObjStackGetValue (0)));
}
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}

21
source/components/executer/exregion.c
View File

@ -239,8 +239,7 @@ AmlSystemMemorySpaceHandler (
break;
}
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
@ -338,8 +337,7 @@ AmlSystemIoSpaceHandler (
break;
}
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
@ -449,8 +447,7 @@ AmlPciConfigSpaceHandler (
break;
}
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
@ -484,8 +481,7 @@ AmlEmbeddedControllerSpaceHandler (
FUNCTION_TRACE ("AmlEmbeddedControllerSpaceHandler");
DEBUG_PRINT (ACPI_ERROR, ("AmlEmbeddedControllerSpaceHandler: **** EC OpRegion not implemented\n"));
FUNCTION_STATUS_EXIT (AE_NOT_IMPLEMENTED);
return AE_NOT_IMPLEMENTED;
return_ACPI_STATUS (AE_NOT_IMPLEMENTED);
/* Decode the function parameter */
@ -503,8 +499,7 @@ AmlEmbeddedControllerSpaceHandler (
break;
}
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
@ -538,8 +533,7 @@ AmlSmBusSpaceHandler (
FUNCTION_TRACE ("AmlSmBusSpaceHandler");
DEBUG_PRINT (ACPI_ERROR, ("AmlSmBusSpaceHandler: **** SmBus OpRegion not implemented\n"));
FUNCTION_STATUS_EXIT (AE_NOT_IMPLEMENTED);
return AE_NOT_IMPLEMENTED;
return_ACPI_STATUS (AE_NOT_IMPLEMENTED);
/* Decode the function parameter */
@ -557,7 +551,6 @@ AmlSmBusSpaceHandler (
break;
}
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}

143
source/components/executer/exresolv.c
View File

@ -162,14 +162,12 @@ AmlIsMethodValue (
{
if (ObjDesc == MethodStack[MethodNestLevel][Index])
{
FUNCTION_EXIT;
return TRUE;
return_VALUE (TRUE);
}
}
}
FUNCTION_EXIT;
return FALSE;
return_VALUE (FALSE);
}
@ -285,8 +283,7 @@ AmlGetFieldUnitValue (
AmlReleaseGlobalLock (Locked);
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
@ -323,8 +320,7 @@ AmlGetRvalue (
if (!StackPtr || !*StackPtr)
{
DEBUG_PRINT (ACPI_ERROR, ("AmlGetRvalue: Internal error - null pointer\n"));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
switch ((*StackPtr)->Type)
@ -433,8 +429,7 @@ AmlGetRvalue (
if (AE_OK != Status)
{
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
break;
@ -447,8 +442,7 @@ AmlGetRvalue (
{
/* Descriptor allocation failure */
FUNCTION_STATUS_EXIT (AE_NO_MEMORY);
return AE_NO_MEMORY;
return_ACPI_STATUS (AE_NO_MEMORY);
}
if ((Status = AmlGetFieldUnitValue (*StackPtr, ObjDesc)) != AE_OK)
@ -458,8 +452,7 @@ AmlGetRvalue (
}
*StackPtr = (void *) ObjDesc;
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
case TYPE_BankField:
@ -469,8 +462,7 @@ AmlGetRvalue (
{
/* Descriptor allocation failure */
FUNCTION_STATUS_EXIT (AE_NO_MEMORY);
return AE_NO_MEMORY;
return_ACPI_STATUS (AE_NO_MEMORY);
}
if ((Status = AmlGetFieldUnitValue (*StackPtr, ObjDesc)) != AE_OK)
@ -480,8 +472,7 @@ AmlGetRvalue (
}
*StackPtr = (void *) ObjDesc;
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
break;
@ -520,8 +511,7 @@ AmlGetRvalue (
DEBUG_PRINT (TRACE_EXEC,
("leave AmlGetRvalue: NULL Package ValuePtr ==> AE_AML_ERROR\n"));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
if (AML_PackageOp == *(UINT8 *) ValDesc)
@ -534,8 +524,7 @@ AmlGetRvalue (
if (AE_OK != (Status = AmlObjStackPushIfExec (MODE_Exec))) /* ObjStack */
{
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
if (AE_OK == (Status = AmlPkgPushExec ((UINT8 *) ValDesc + 1, 0L)) && /*PkgStack*/
@ -554,16 +543,14 @@ AmlGetRvalue (
else
{
AmlObjStackPop (1);
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
}
if (!ValDesc || (TYPE_Package != ValDesc->Type))
{
DEBUG_PRINT (ACPI_ERROR, ("AmlGetRvalue:internal error - Bad package value\n"));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
ObjDesc = AllocateObjectDesc ();
@ -571,8 +558,7 @@ AmlGetRvalue (
{
/* Descriptor allocation failure */
FUNCTION_STATUS_EXIT (AE_NO_MEMORY);
return AE_NO_MEMORY;
return_ACPI_STATUS (AE_NO_MEMORY);
}
memcpy ((void *) ObjDesc, (void *) ValDesc, sizeof (*ObjDesc));
@ -586,8 +572,7 @@ AmlGetRvalue (
if (TYPE_String != ValDesc->Type)
{
DEBUG_PRINT (ACPI_ERROR, ("AmlGetRvalue: internal error - Bad string value\n"));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
ObjDesc = AllocateObjectDesc ();
@ -595,8 +580,7 @@ AmlGetRvalue (
{
/* Descriptor allocation failure */
FUNCTION_STATUS_EXIT (AE_NO_MEMORY);
return AE_NO_MEMORY;
return_ACPI_STATUS (AE_NO_MEMORY);
}
memcpy ((void *) ObjDesc, (void *) ValDesc, sizeof (*ObjDesc));
@ -608,8 +592,7 @@ AmlGetRvalue (
if (!ValDesc)
{
DEBUG_PRINT (ACPI_ERROR, ("AmlGetRvalue: internal error - null Buffer ValuePtr\n"));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
if (AML_BufferOp == *(UINT8 *) ValDesc)
@ -621,8 +604,7 @@ AmlGetRvalue (
*/
if (AE_OK != (Status = AmlObjStackPushIfExec (MODE_Exec))) /* ObjStack */
{
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
if (AE_OK == (Status = AmlPkgPushExec ((UINT8 *) ValDesc + 1, 0L)) && /*PkgStack*/
@ -641,16 +623,14 @@ AmlGetRvalue (
else
{
AmlObjStackPop (1);
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
}
if (!ValDesc || (TYPE_Buffer != ValDesc->Type))
{
DEBUG_PRINT (ACPI_ERROR, ("AmlGetRvalue: Bad buffer value\n"));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
ObjDesc = AllocateObjectDesc ();
@ -658,8 +638,7 @@ AmlGetRvalue (
{
/* Descriptor allocation failure */
FUNCTION_STATUS_EXIT (AE_NO_MEMORY);
return AE_NO_MEMORY;
return_ACPI_STATUS (AE_NO_MEMORY);
}
memcpy ((void *) ObjDesc, (void *) ValDesc, sizeof (*ObjDesc));
@ -682,8 +661,7 @@ AmlGetRvalue (
if (!ValDesc)
{
DEBUG_PRINT (ACPI_ERROR, ("AmlGetRvalue: internal error - null Number ValuePtr\n"));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
if (TYPE_Number == ValDesc->Type)
@ -693,8 +671,7 @@ AmlGetRvalue (
{
/* Descriptor allocation failure */
FUNCTION_STATUS_EXIT (AE_NO_MEMORY);
return AE_NO_MEMORY;
return_ACPI_STATUS (AE_NO_MEMORY);
}
memcpy ((void *) ObjDesc, (void *) ValDesc, sizeof (*ObjDesc));
@ -709,8 +686,7 @@ AmlGetRvalue (
if (!AmlIsInPCodeBlock ((UINT8 *) ValDesc))
{
DEBUG_PRINT (ACPI_ERROR, ("AmlGetRvalue/Number: internal error - not a Number\n"));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
ObjDesc = AllocateObjectDesc ();
@ -718,8 +694,7 @@ AmlGetRvalue (
{
/* Descriptor allocation failure */
FUNCTION_STATUS_EXIT (AE_NO_MEMORY);
return AE_NO_MEMORY;
return_ACPI_STATUS (AE_NO_MEMORY);
}
switch (*(UINT8 *) ValDesc)
@ -770,8 +745,7 @@ AmlGetRvalue (
DEBUG_PRINT (ACPI_ERROR, (
"AmlGetRvalue/Number: internal error - expected AML number, found %02x\n",
*(UINT8 *) ValDesc));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
} /* switch */
@ -792,8 +766,7 @@ AmlGetRvalue (
Status = AmlGetNamedFieldValue ((ACPI_HANDLE)* StackPtr, &TempVal);
if (AE_OK != Status)
{
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
ObjDesc = AllocateObjectDesc ();
@ -801,8 +774,7 @@ AmlGetRvalue (
{
/* Descriptor allocation failure */
FUNCTION_STATUS_EXIT (AE_NO_MEMORY);
return AE_NO_MEMORY;
return_ACPI_STATUS (AE_NO_MEMORY);
}
ObjDesc->Number.Type = (UINT8) TYPE_Number;
@ -815,8 +787,7 @@ AmlGetRvalue (
if (!ValDesc)
{
DEBUG_PRINT (ACPI_ERROR, ("AmlGetRvalue: internal error - null BankField ValuePtr\n"));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
if (TYPE_BankField != ValDesc->Type)
@ -825,8 +796,7 @@ AmlGetRvalue (
"AmlGetRvalue/BankField:internal error - Name %4.4s type %d does not match value-type %d at %p\n",
*StackPtr, TYPE_BankField, ValDesc->Type, ValDesc));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
@ -847,8 +817,7 @@ AmlGetRvalue (
if (AE_OK != Status)
{
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
/* Read Data value */
@ -856,8 +825,7 @@ AmlGetRvalue (
Status = AmlGetNamedFieldValue ((ACPI_HANDLE) ValDesc->BankField.Container, &TempVal);
if (AE_OK != Status)
{
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
ObjDesc = AllocateObjectDesc ();
@ -865,8 +833,7 @@ AmlGetRvalue (
{
/* Descriptor allocation failure */
FUNCTION_STATUS_EXIT (AE_NO_MEMORY);
return AE_NO_MEMORY;
return_ACPI_STATUS (AE_NO_MEMORY);
}
ObjDesc->Number.Type = (UINT8) TYPE_Number;
@ -879,8 +846,7 @@ AmlGetRvalue (
if (!ValDesc)
{
DEBUG_PRINT (ACPI_ERROR, ("AmlGetRvalue: internal error - null IndexField ValuePtr\n"));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
if (TYPE_IndexField != ValDesc->Type)
@ -889,8 +855,7 @@ AmlGetRvalue (
"AmlGetRvalue/IndexField: internal error - Name %4.4s type %d does not match value-type %d at %p\n",
*StackPtr, TYPE_IndexField, ValDesc->Type, ValDesc));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
@ -909,8 +874,7 @@ AmlGetRvalue (
if (AE_OK != Status)
{
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
/* Read Data value */
@ -918,8 +882,7 @@ AmlGetRvalue (
Status = AmlGetNamedFieldValue (ValDesc->IndexField.Data, &TempVal);
if (AE_OK != Status)
{
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
ObjDesc = AllocateObjectDesc ();
@ -927,8 +890,7 @@ AmlGetRvalue (
{
/* Descriptor allocation failure */
FUNCTION_STATUS_EXIT (AE_NO_MEMORY);
return AE_NO_MEMORY;
return_ACPI_STATUS (AE_NO_MEMORY);
}
ObjDesc->Number.Type = (UINT8) TYPE_Number;
@ -941,8 +903,7 @@ AmlGetRvalue (
if (!ValDesc)
{
DEBUG_PRINT (ACPI_ERROR, ("AmlGetRvalue: internal error - null FieldUnit ValuePtr\n"));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
if (ValDesc->Type != (UINT8) NsGetType ((ACPI_HANDLE)* StackPtr))
@ -952,8 +913,7 @@ AmlGetRvalue (
*StackPtr, NsGetType ((ACPI_HANDLE)* StackPtr),
ValDesc->Type, ValDesc));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
break;
}
@ -962,15 +922,13 @@ AmlGetRvalue (
{
/* Descriptor allocation failure */
FUNCTION_STATUS_EXIT (AE_NO_MEMORY);
return AE_NO_MEMORY;
return_ACPI_STATUS (AE_NO_MEMORY);
}
if ((Status = AmlGetFieldUnitValue (ValDesc, ObjDesc)) != AE_OK)
{
CmFree (ObjDesc);
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
break;
@ -980,8 +938,7 @@ AmlGetRvalue (
case TYPE_Device:
FUNCTION_STATUS_EXIT (AE_OK);
return AE_OK;
return_ACPI_STATUS (AE_OK);
break;
@ -1009,8 +966,7 @@ AmlGetRvalue (
{
/* Descriptor allocation failure */
FUNCTION_STATUS_EXIT (AE_NO_MEMORY);
return AE_NO_MEMORY;
return_ACPI_STATUS (AE_NO_MEMORY);
}
ObjDesc->Number.Type = (UINT8) Number;
@ -1021,8 +977,7 @@ AmlGetRvalue (
"AmlGetRvalue: Fetch from [%s] not implemented\n",
NsTypeNames[NsGetType ((ACPI_HANDLE)* StackPtr)]));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
#endif /* HACK */
default:
@ -1033,16 +988,12 @@ AmlGetRvalue (
DEBUG_PRINT (ACPI_ERROR, ("AmlGetRvalue: Unknown NsType %d\n",
NsGetType ((ACPI_HANDLE)* StackPtr)));
FUNCTION_STATUS_EXIT (AE_AML_ERROR);
return AE_AML_ERROR;
return_ACPI_STATUS (AE_AML_ERROR);
}
*StackPtr = (void *) ObjDesc;
}
FUNCTION_STATUS_EXIT (AE_OK);
return AE_OK;
return_ACPI_STATUS (AE_OK);
}

12
source/components/executer/exstore.c
View File

@ -241,8 +241,7 @@ AmlExecuteMethod (
AmlObjStackLevel()));
}
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}
@ -301,8 +300,7 @@ AmlExecStore (
{
/* Allocation failure */
FUNCTION_STATUS_EXIT (AE_NO_MEMORY);
return AE_NO_MEMORY;
return_ACPI_STATUS (AE_NO_MEMORY);
}
else
{
@ -358,8 +356,7 @@ AmlExecStore (
if (AE_OK != Status)
{
FUNCTION_STATUS_EXIT (Status);
return Status; /* TBD: temporary hack */
return_ACPI_STATUS (Status); /* TBD: temporary hack */
}
@ -889,8 +886,7 @@ AmlExecStore (
AmlObjStackPop (1);
}
FUNCTION_STATUS_EXIT (Status);
return Status;
return_ACPI_STATUS (Status);
}