diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2009-12-14 22:07:33 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2009-12-14 22:07:33 +0000 |
| commit | deca274c44eb2d731761ba35813f64bdbdc734df (patch) | |
| tree | f44ff7d55387c0db90e95e80289d7ed0525b8dd8 /events | |
| parent | 1b40f7cf3cd1180573e2d9ec6cd169e887b720e0 (diff) | |
Import ACPICA 20091214.vendor/acpica/20091214
Notes
svn path=/vendor-sys/acpica/dist/; revision=200549
svn path=/vendor-sys/acpica/20091214/; revision=200550; tag=vendor/acpica/20091214
Diffstat (limited to 'events')
| -rw-r--r-- | events/evregion.c | 4 | ||||
| -rw-r--r-- | events/evrgnini.c | 14 | ||||
| -rw-r--r-- | events/evxface.c | 4 | ||||
| -rw-r--r-- | events/evxfevnt.c | 4 | ||||
| -rw-r--r-- | events/evxfregn.c | 4 |
5 files changed, 22 insertions, 8 deletions
diff --git a/events/evregion.c b/events/evregion.c index 50edaa49a399..2bdfb872fe0b 100644 --- a/events/evregion.c +++ b/events/evregion.c @@ -845,7 +845,7 @@ AcpiEvInstallHandler ( /* Convert and validate the device handle */ - Node = AcpiNsMapHandleToNode (ObjHandle); + Node = AcpiNsValidateHandle (ObjHandle); if (!Node) { return (AE_BAD_PARAMETER); @@ -1243,7 +1243,7 @@ AcpiEvRegRun ( /* Convert and validate the device handle */ - Node = AcpiNsMapHandleToNode (ObjHandle); + Node = AcpiNsValidateHandle (ObjHandle); if (!Node) { return (AE_BAD_PARAMETER); diff --git a/events/evrgnini.c b/events/evrgnini.c index 9c45ee84f028..67f6cddf66d8 100644 --- a/events/evrgnini.c +++ b/events/evrgnini.c @@ -716,6 +716,20 @@ AcpiEvInitializeRegion ( HandlerObj = ObjDesc->ThermalZone.Handler; break; + case ACPI_TYPE_METHOD: + /* + * If we are executing module level code, the original + * Node's object was replaced by this Method object and we + * saved the handler in the method object. + * + * See AcpiNsExecModuleCode + */ + if (ObjDesc->Method.Flags & AOPOBJ_MODULE_LEVEL) + { + HandlerObj = ObjDesc->Method.Extra.Handler; + } + break; + default: /* Ignore other objects */ break; diff --git a/events/evxface.c b/events/evxface.c index f816abad3a51..6eb5a14af068 100644 --- a/events/evxface.c +++ b/events/evxface.c @@ -368,7 +368,7 @@ AcpiInstallNotifyHandler ( /* Convert and validate the device handle */ - Node = AcpiNsMapHandleToNode (Device); + Node = AcpiNsValidateHandle (Device); if (!Node) { Status = AE_BAD_PARAMETER; @@ -555,7 +555,7 @@ AcpiRemoveNotifyHandler ( /* Convert and validate the device handle */ - Node = AcpiNsMapHandleToNode (Device); + Node = AcpiNsValidateHandle (Device); if (!Node) { Status = AE_BAD_PARAMETER; diff --git a/events/evxfevnt.c b/events/evxfevnt.c index bc24f18c51e2..27066a399468 100644 --- a/events/evxfevnt.c +++ b/events/evxfevnt.c @@ -805,7 +805,7 @@ AcpiInstallGpeBlock ( return (Status); } - Node = AcpiNsMapHandleToNode (GpeDevice); + Node = AcpiNsValidateHandle (GpeDevice); if (!Node) { Status = AE_BAD_PARAMETER; @@ -905,7 +905,7 @@ AcpiRemoveGpeBlock ( return (Status); } - Node = AcpiNsMapHandleToNode (GpeDevice); + Node = AcpiNsValidateHandle (GpeDevice); if (!Node) { Status = AE_BAD_PARAMETER; diff --git a/events/evxfregn.c b/events/evxfregn.c index d4f499130a4c..3b60589b71a4 100644 --- a/events/evxfregn.c +++ b/events/evxfregn.c @@ -171,7 +171,7 @@ AcpiInstallAddressSpaceHandler ( /* Convert and validate the device handle */ - Node = AcpiNsMapHandleToNode (Device); + Node = AcpiNsValidateHandle (Device); if (!Node) { Status = AE_BAD_PARAMETER; @@ -244,7 +244,7 @@ AcpiRemoveAddressSpaceHandler ( /* Convert and validate the device handle */ - Node = AcpiNsMapHandleToNode (Device); + Node = AcpiNsValidateHandle (Device); if (!Node || ((Node->Type != ACPI_TYPE_DEVICE) && (Node->Type != ACPI_TYPE_PROCESSOR) && |