diff options
| -rw-r--r-- | source/components/debugger/dbdisply.c | 6 | ||||
| -rw-r--r-- | source/components/events/evhandler.c | 10 | ||||
| -rw-r--r-- | source/components/events/evrgnini.c | 10 | ||||
| -rw-r--r-- | source/components/events/evxfregn.c | 4 |
4 files changed, 11 insertions, 19 deletions
diff --git a/source/components/debugger/dbdisply.c b/source/components/debugger/dbdisply.c index c76e4fca1..a923b6ed6 100644 --- a/source/components/debugger/dbdisply.c +++ b/source/components/debugger/dbdisply.c @@ -1112,7 +1112,7 @@ AcpiDbDisplayHandlers ( AcpiUtGetRegionName ((UINT8) SpaceId), SpaceId); HandlerObj = AcpiEvFindRegionHandler ( - SpaceId, ObjDesc->Device.Handler); + SpaceId, ObjDesc->CommonNotify.Handler); if (HandlerObj) { AcpiOsPrintf (ACPI_HANDLER_PRESENT_STRING, @@ -1133,7 +1133,7 @@ AcpiDbDisplayHandlers ( /* Find all handlers for user-defined SpaceIDs */ - HandlerObj = ObjDesc->Device.Handler; + HandlerObj = ObjDesc->CommonNotify.Handler; while (HandlerObj) { if (HandlerObj->AddressSpace.SpaceId >= ACPI_USER_REGION_BEGIN) @@ -1244,7 +1244,7 @@ AcpiDbDisplayNonRootHandlers ( /* Display all handlers associated with this device */ - HandlerObj = ObjDesc->Device.Handler; + HandlerObj = ObjDesc->CommonNotify.Handler; while (HandlerObj) { AcpiOsPrintf (ACPI_PREDEFINED_PREFIX, diff --git a/source/components/events/evhandler.c b/source/components/events/evhandler.c index afbeabf60..088274c12 100644 --- a/source/components/events/evhandler.c +++ b/source/components/events/evhandler.c @@ -248,7 +248,7 @@ AcpiEvHasDefaultHandler ( ObjDesc = AcpiNsGetAttachedObject (Node); if (ObjDesc) { - HandlerObj = ObjDesc->Device.Handler; + HandlerObj = ObjDesc->CommonNotify.Handler; /* Walk the linked list of handlers for this object */ @@ -350,7 +350,7 @@ AcpiEvInstallHandler ( /* Check if this Device already has a handler for this address space */ NextHandlerObj = AcpiEvFindRegionHandler ( - HandlerObj->AddressSpace.SpaceId, ObjDesc->Device.Handler); + HandlerObj->AddressSpace.SpaceId, ObjDesc->CommonNotify.Handler); if (NextHandlerObj) { /* Found a handler, is it for the same address space? */ @@ -554,7 +554,7 @@ AcpiEvInstallSpaceHandler ( * the handler is not already installed. */ HandlerObj = AcpiEvFindRegionHandler (SpaceId, - ObjDesc->Device.Handler); + ObjDesc->CommonNotify.Handler); if (HandlerObj) { @@ -651,13 +651,13 @@ AcpiEvInstallSpaceHandler ( /* Install at head of Device.AddressSpace list */ - HandlerObj->AddressSpace.Next = ObjDesc->Device.Handler; + HandlerObj->AddressSpace.Next = ObjDesc->CommonNotify.Handler; /* * The Device object is the first reference on the HandlerObj. * Each region that uses the handler adds a reference. */ - ObjDesc->Device.Handler = HandlerObj; + ObjDesc->CommonNotify.Handler = HandlerObj; /* * Walk namespace for regions only if basic initialization is diff --git a/source/components/events/evrgnini.c b/source/components/events/evrgnini.c index 6f4bfb4e6..c93552687 100644 --- a/source/components/events/evrgnini.c +++ b/source/components/events/evrgnini.c @@ -704,18 +704,10 @@ AcpiEvInitializeRegion ( switch (Node->Type) { case ACPI_TYPE_DEVICE: - - HandlerObj = ObjDesc->Device.Handler; - break; - case ACPI_TYPE_PROCESSOR: - - HandlerObj = ObjDesc->Processor.Handler; - break; - case ACPI_TYPE_THERMAL: - HandlerObj = ObjDesc->ThermalZone.Handler; + HandlerObj = ObjDesc->CommonNotify.Handler; break; case ACPI_TYPE_METHOD: diff --git a/source/components/events/evxfregn.c b/source/components/events/evxfregn.c index 4b70d091d..cd8a7c7d8 100644 --- a/source/components/events/evxfregn.c +++ b/source/components/events/evxfregn.c @@ -308,8 +308,8 @@ AcpiRemoveAddressSpaceHandler ( /* Find the address handler the user requested */ - HandlerObj = ObjDesc->Device.Handler; - LastObjPtr = &ObjDesc->Device.Handler; + HandlerObj = ObjDesc->CommonNotify.Handler; + LastObjPtr = &ObjDesc->CommonNotify.Handler; while (HandlerObj) { /* We have a handler, see if user requested this one */ |