aboutsummaryrefslogtreecommitdiff
path: root/source/components/events
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2012-08-16 17:26:22 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2012-08-16 17:26:22 +0000
commitfc8e34d9a95f87b780f9ee3d400dd995aba2ce27 (patch)
treea28a9676fa0b9e969cfd83d7a508660c754c8b3e /source/components/events
parent8724452f676e45bfd39cfb47234f7def5551f067 (diff)
downloadsrc-fc8e34d9a95f87b780f9ee3d400dd995aba2ce27.tar.gz
src-fc8e34d9a95f87b780f9ee3d400dd995aba2ce27.zip
Import ACPICA 20120816.vendor/acpica/20120816
Notes
Notes: svn path=/vendor-sys/acpica/dist/; revision=239332 svn path=/vendor-sys/acpica/20120816/; revision=239333; tag=vendor/acpica/20120816
Diffstat (limited to 'source/components/events')
-rw-r--r--source/components/events/evgpe.c18
-rw-r--r--source/components/events/evxfgpe.c2
2 files changed, 16 insertions, 4 deletions
diff --git a/source/components/events/evgpe.c b/source/components/events/evgpe.c
index 623795a83619..7c572b74f15d 100644
--- a/source/components/events/evgpe.c
+++ b/source/components/events/evgpe.c
@@ -92,7 +92,7 @@ AcpiEvUpdateGpeEnableMask (
return_ACPI_STATUS (AE_NOT_EXIST);
}
- RegisterBit = AcpiHwGetGpeRegisterBit (GpeEventInfo, GpeRegisterInfo);
+ RegisterBit = AcpiHwGetGpeRegisterBit (GpeEventInfo);
/* Clear the run bit up front */
@@ -431,6 +431,13 @@ AcpiEvGpeDetect (
if (!(GpeRegisterInfo->EnableForRun |
GpeRegisterInfo->EnableForWake))
{
+ ACPI_DEBUG_PRINT ((ACPI_DB_INTERRUPTS,
+ "Ignore disabled registers for GPE%02X-GPE%02X: "
+ "RunEnable=%02X, WakeEnable=%02X\n",
+ GpeRegisterInfo->BaseGpeNumber,
+ GpeRegisterInfo->BaseGpeNumber + (ACPI_GPE_REGISTER_WIDTH - 1),
+ GpeRegisterInfo->EnableForRun,
+ GpeRegisterInfo->EnableForWake));
continue;
}
@@ -451,8 +458,13 @@ AcpiEvGpeDetect (
}
ACPI_DEBUG_PRINT ((ACPI_DB_INTERRUPTS,
- "Read GPE Register at GPE%02X: Status=%02X, Enable=%02X\n",
- GpeRegisterInfo->BaseGpeNumber, StatusReg, EnableReg));
+ "Read registers for GPE%02X-GPE%02X: Status=%02X, Enable=%02X, "
+ "RunEnable=%02X, WakeEnable=%02X\n",
+ GpeRegisterInfo->BaseGpeNumber,
+ GpeRegisterInfo->BaseGpeNumber + (ACPI_GPE_REGISTER_WIDTH - 1),
+ StatusReg, EnableReg,
+ GpeRegisterInfo->EnableForRun,
+ GpeRegisterInfo->EnableForWake));
/* Check if there is anything active at all in this register */
diff --git a/source/components/events/evxfgpe.c b/source/components/events/evxfgpe.c
index 4194651def8e..1e83d1dacd6d 100644
--- a/source/components/events/evxfgpe.c
+++ b/source/components/events/evxfgpe.c
@@ -480,7 +480,7 @@ AcpiSetGpeWakeMask (
goto UnlockAndExit;
}
- RegisterBit = AcpiHwGetGpeRegisterBit (GpeEventInfo, GpeRegisterInfo);
+ RegisterBit = AcpiHwGetGpeRegisterBit (GpeEventInfo);
/* Perform the action */