mirrors/acpica
1
0
Fork 0
mirror of https://github.com/acpica/acpica/ synced 2025-02-06 00:24:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fifth lint pass - CLEAN for 32-bit and 64-bit

Browse Source 
date	2002.04.12.20.46.00;	author rmoore1;	state Exp;
This commit is contained in:
aystarik 2005-06-29 16:41:43 +00:00
parent f8b85c84b1
commit 18120265c1
1 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
source/components/events/evregion.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: evregion - ACPI AddressSpace (OpRegion) handler dispatch
* $Revision: 1.127 $
* $Revision: 1.132 $
*
*****************************************************************************/
@ -121,7 +121,6 @@
#include "acevents.h"
#include "acnamesp.h"
#include "acinterp.h"
#include "amlcode.h"
#define _COMPONENT ACPI_EVENTS
ACPI_MODULE_NAME ("evregion")
@ -267,7 +266,7 @@ AcpiEvExecuteRegMethod (
/*
* Set up the parameter objects
*/
Params[0]->Integer.Value = RegionObj->Region.SpaceId;
Params[0]->Integer.Value = RegionObj->Region.SpaceId;
Params[1]->Integer.Value = Function;
Params[2] = NULL;
@ -310,9 +309,10 @@ AcpiEvAddressSpaceDispatch (
UINT32 Function,
ACPI_PHYSICAL_ADDRESS Address,
UINT32 BitWidth,
ACPI_INTEGER *Value)
void *Value)
{
ACPI_STATUS Status;
ACPI_STATUS Status2;
ACPI_ADR_SPACE_HANDLER Handler;
ACPI_ADR_SPACE_SETUP RegionSetup;
ACPI_OPERAND_OBJECT *HandlerDesc;
@ -372,7 +372,11 @@ AcpiEvAddressSpaceDispatch (
/* Re-enter the interpreter */
AcpiExEnterInterpreter ();
Status2 = AcpiExEnterInterpreter ();
if (ACPI_FAILURE (Status2))
{
return_ACPI_STATUS (Status2);
}
/*
* Init routine may fail
@ -401,7 +405,7 @@ AcpiEvAddressSpaceDispatch (
ACPI_DEBUG_PRINT ((ACPI_DB_OPREGION,
"Addrhandler %p (%p), Address %8.8X%8.8X\n",
&RegionObj->Region.AddrHandler->AddrHandler, Handler,
&RegionObj->Region.AddrHandler->AddrHandler, Handler,
ACPI_HIDWORD (Address), ACPI_LODWORD (Address)));
if (!(HandlerDesc->AddrHandler.Flags & ACPI_ADDR_HANDLER_DEFAULT_INSTALLED))
@ -434,7 +438,11 @@ AcpiEvAddressSpaceDispatch (
* We just returned from a non-default handler, we must re-enter the
* interpreter
*/
AcpiExEnterInterpreter ();
Status2 = AcpiExEnterInterpreter ();
if (ACPI_FAILURE (Status2))
{
return_ACPI_STATUS (Status2);
}
}
return_ACPI_STATUS (Status);
@ -474,7 +482,7 @@ AcpiEvDisassociateRegionFromHandler(
RegionObj2 = AcpiNsGetSecondaryObject (RegionObj);
if (!RegionObj2)
{
return;
return_VOID;
}
RegionContext = RegionObj2->Extra.RegionContext;
@ -525,7 +533,13 @@ AcpiEvDisassociateRegionFromHandler(
/*
* Now stop region accesses by executing the _REG method
*/
AcpiEvExecuteRegMethod (RegionObj, 0);
Status = AcpiEvExecuteRegMethod (RegionObj, 0);
if (ACPI_FAILURE (Status))
{
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "%s from region _REG, [%s]\n",
AcpiFormatException (Status),
AcpiUtGetRegionName (RegionObj->Region.SpaceId)));
}
if (AcpiNsIsLocked)
{
@ -610,7 +624,8 @@ AcpiEvAssociateRegionAndHandler (
ACPI_OPERAND_OBJECT *RegionObj,
BOOLEAN AcpiNsIsLocked)
{
ACPI_STATUS Status;
ACPI_STATUS Status;
ACPI_STATUS Status2;
ACPI_FUNCTION_TRACE ("EvAssociateRegionAndHandler");
@ -638,14 +653,22 @@ AcpiEvAssociateRegionAndHandler (
*/
if (AcpiNsIsLocked)
{
AcpiUtReleaseMutex (ACPI_MTX_NAMESPACE);
Status2 = AcpiUtReleaseMutex (ACPI_MTX_NAMESPACE);
if (ACPI_FAILURE (Status2))
{
return_ACPI_STATUS (Status2);
}
}
Status = AcpiEvExecuteRegMethod (RegionObj, 1);
if (AcpiNsIsLocked)
{
(void) AcpiUtAcquireMutex (ACPI_MTX_NAMESPACE);
Status2 = AcpiUtAcquireMutex (ACPI_MTX_NAMESPACE);
if (ACPI_FAILURE (Status2))
{
return_ACPI_STATUS (Status2);
}
}
return_ACPI_STATUS (Status);