diff options
| author | jkim <jkim@FreeBSD.org> | 2012-08-16 17:26:22 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2012-08-16 17:26:22 +0000 |
| commit | 08e6f22ac3350a67c38e9b42b5dce2a7d5fa08b4 (patch) | |
| tree | a28a9676fa0b9e969cfd83d7a508660c754c8b3e /source/components/hardware/hwgpe.c | |
| parent | dbd90a99cde8c4a942a41f095faa72f479694173 (diff) | |
| download | FreeBSD-src-08e6f22ac3350a67c38e9b42b5dce2a7d5fa08b4.zip FreeBSD-src-08e6f22ac3350a67c38e9b42b5dce2a7d5fa08b4.tar.gz | |
Import ACPICA 20120816.
Diffstat (limited to 'source/components/hardware/hwgpe.c')
| -rw-r--r-- | source/components/hardware/hwgpe.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/source/components/hardware/hwgpe.c b/source/components/hardware/hwgpe.c index c94f17b..11cb36e 100644 --- a/source/components/hardware/hwgpe.c +++ b/source/components/hardware/hwgpe.c @@ -65,7 +65,6 @@ AcpiHwEnableWakeupGpeBlock ( * FUNCTION: AcpiHwGetGpeRegisterBit * * PARAMETERS: GpeEventInfo - Info block for the GPE - * GpeRegisterInfo - Info block for the GPE register * * RETURN: Register mask with a one in the GPE bit position * @@ -76,12 +75,11 @@ AcpiHwEnableWakeupGpeBlock ( UINT32 AcpiHwGetGpeRegisterBit ( - ACPI_GPE_EVENT_INFO *GpeEventInfo, - ACPI_GPE_REGISTER_INFO *GpeRegisterInfo) + ACPI_GPE_EVENT_INFO *GpeEventInfo) { return ((UINT32) 1 << - (GpeEventInfo->GpeNumber - GpeRegisterInfo->BaseGpeNumber)); + (GpeEventInfo->GpeNumber - GpeEventInfo->RegisterInfo->BaseGpeNumber)); } @@ -130,7 +128,7 @@ AcpiHwLowSetGpe ( /* Set or clear just the bit that corresponds to this GPE */ - RegisterBit = AcpiHwGetGpeRegisterBit (GpeEventInfo, GpeRegisterInfo); + RegisterBit = AcpiHwGetGpeRegisterBit (GpeEventInfo); switch (Action) { case ACPI_GPE_CONDITIONAL_ENABLE: @@ -199,7 +197,7 @@ AcpiHwClearGpe ( * Write a one to the appropriate bit in the status register to * clear this GPE. */ - RegisterBit = AcpiHwGetGpeRegisterBit (GpeEventInfo, GpeRegisterInfo); + RegisterBit = AcpiHwGetGpeRegisterBit (GpeEventInfo); Status = AcpiHwWrite (RegisterBit, &GpeRegisterInfo->StatusAddress); @@ -247,7 +245,7 @@ AcpiHwGetGpeStatus ( /* Get the register bitmask for this GPE */ - RegisterBit = AcpiHwGetGpeRegisterBit (GpeEventInfo, GpeRegisterInfo); + RegisterBit = AcpiHwGetGpeRegisterBit (GpeEventInfo); /* GPE currently enabled? (enabled for runtime?) */ |
