diff options
Diffstat (limited to 'sys/contrib/dev/acpica/hwgpe.c')
| -rw-r--r-- | sys/contrib/dev/acpica/hwgpe.c | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/sys/contrib/dev/acpica/hwgpe.c b/sys/contrib/dev/acpica/hwgpe.c index b6c71cb16c5d..09981c3ddaf2 100644 --- a/sys/contrib/dev/acpica/hwgpe.c +++ b/sys/contrib/dev/acpica/hwgpe.c @@ -2,7 +2,7 @@ /****************************************************************************** * * Module Name: hwgpe - Low level GPE enable/disable/clear functions - * $Revision: 39 $ + * $Revision: 40 $ * *****************************************************************************/ @@ -180,10 +180,10 @@ AcpiHwEnableGpe ( * Read the current value of the register, set the appropriate bit * to enable the GPE, and write out the new register. */ - InByte = 0; - AcpiOsReadPort (AcpiGbl_GpeRegisterInfo[RegisterIndex].EnableAddr, &InByte, 8); - AcpiOsWritePort (AcpiGbl_GpeRegisterInfo[RegisterIndex].EnableAddr, - (InByte | BitMask), 8); + InByte = AcpiHwLowLevelRead (8, + &AcpiGbl_GpeRegisterInfo[RegisterIndex].EnableAddress, 0); + AcpiHwLowLevelWrite (8, (InByte | BitMask), + &AcpiGbl_GpeRegisterInfo[RegisterIndex].EnableAddress, 0); } @@ -262,10 +262,10 @@ AcpiHwDisableGpe ( * Read the current value of the register, clear the appropriate bit, * and write out the new register value to disable the GPE. */ - InByte = 0; - AcpiOsReadPort (AcpiGbl_GpeRegisterInfo[RegisterIndex].EnableAddr, &InByte, 8); - AcpiOsWritePort (AcpiGbl_GpeRegisterInfo[RegisterIndex].EnableAddr, - (InByte & ~BitMask), 8); + InByte = AcpiHwLowLevelRead (8, + &AcpiGbl_GpeRegisterInfo[RegisterIndex].EnableAddress, 0); + AcpiHwLowLevelWrite (8, (InByte & ~BitMask), + &AcpiGbl_GpeRegisterInfo[RegisterIndex].EnableAddress, 0); AcpiHwDisableGpeForWakeup(GpeNumber); } @@ -345,7 +345,8 @@ AcpiHwClearGpe ( * Write a one to the appropriate bit in the status register to * clear this GPE. */ - AcpiOsWritePort (AcpiGbl_GpeRegisterInfo[RegisterIndex].StatusAddr, BitMask, 8); + AcpiHwLowLevelWrite (8, BitMask, + &AcpiGbl_GpeRegisterInfo[RegisterIndex].StatusAddress, 0); } @@ -393,8 +394,7 @@ AcpiHwGetGpeStatus ( /* GPE Enabled? */ - InByte = 0; - AcpiOsReadPort (GpeRegisterInfo->EnableAddr, &InByte, 8); + InByte = AcpiHwLowLevelRead (8, &GpeRegisterInfo->EnableAddress, 0); if (BitMask & InByte) { (*EventStatus) |= ACPI_EVENT_FLAG_ENABLED; @@ -409,8 +409,7 @@ AcpiHwGetGpeStatus ( /* GPE active (set)? */ - InByte = 0; - AcpiOsReadPort (GpeRegisterInfo->StatusAddr, &InByte, 8); + InByte = AcpiHwLowLevelRead (8, &GpeRegisterInfo->StatusAddress, 0); if (BitMask & InByte) { (*EventStatus) |= ACPI_EVENT_FLAG_SET; @@ -453,14 +452,14 @@ AcpiHwDisableNonWakeupGpes ( * Read the enabled status of all GPEs. We * will be using it to restore all the GPEs later. */ - AcpiOsReadPort (GpeRegisterInfo->EnableAddr, - &GpeRegisterInfo->Enable, 8); + GpeRegisterInfo->Enable = (UINT8) AcpiHwLowLevelRead (8, + &GpeRegisterInfo->EnableAddress, 0); /* * Disable all GPEs except wakeup GPEs. */ - AcpiOsWritePort(GpeRegisterInfo->EnableAddr, - GpeRegisterInfo->WakeEnable, 8); + AcpiHwLowLevelWrite (8, GpeRegisterInfo->WakeEnable, + &GpeRegisterInfo->EnableAddress, 0); } } @@ -496,7 +495,7 @@ AcpiHwEnableNonWakeupGpes ( * We previously stored the enabled status of all GPEs. * Blast them back in. */ - AcpiOsWritePort(GpeRegisterInfo->EnableAddr, - GpeRegisterInfo->Enable, 8); + AcpiHwLowLevelWrite (8, GpeRegisterInfo->Enable, & + GpeRegisterInfo->EnableAddress, 0); } } |