diff options
Diffstat (limited to 'sys/contrib/dev/acpica/evxface.c')
| -rw-r--r-- | sys/contrib/dev/acpica/evxface.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/sys/contrib/dev/acpica/evxface.c b/sys/contrib/dev/acpica/evxface.c index b50e19e..d566c95 100644 --- a/sys/contrib/dev/acpica/evxface.c +++ b/sys/contrib/dev/acpica/evxface.c @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: evxface - External interfaces for ACPI events - * $Revision: 132 $ + * $Revision: 135 $ * *****************************************************************************/ @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp. * All rights reserved. * * 2. License @@ -608,7 +608,7 @@ AcpiInstallGpeHandler ( void *Context) { ACPI_STATUS Status; - UINT32 GpeNumberIndex; + ACPI_GPE_EVENT_INFO *GpeEventInfo; ACPI_FUNCTION_TRACE ("AcpiInstallGpeHandler"); @@ -623,8 +623,8 @@ AcpiInstallGpeHandler ( /* Ensure that we have a valid GPE number */ - GpeNumberIndex = AcpiEvGetGpeNumberIndex (GpeNumber); - if (GpeNumberIndex == ACPI_GPE_INVALID) + GpeEventInfo = AcpiEvGetGpeEventInfo (GpeNumber); + if (!GpeEventInfo) { return_ACPI_STATUS (AE_BAD_PARAMETER); } @@ -637,7 +637,7 @@ AcpiInstallGpeHandler ( /* Make sure that there isn't a handler there already */ - if (AcpiGbl_GpeNumberInfo[GpeNumberIndex].Handler) + if (GpeEventInfo->Handler) { Status = AE_ALREADY_EXISTS; goto Cleanup; @@ -645,19 +645,19 @@ AcpiInstallGpeHandler ( /* Install the handler */ - AcpiGbl_GpeNumberInfo[GpeNumberIndex].Handler = Handler; - AcpiGbl_GpeNumberInfo[GpeNumberIndex].Context = Context; - AcpiGbl_GpeNumberInfo[GpeNumberIndex].Type = (UINT8) Type; + GpeEventInfo->Handler = Handler; + GpeEventInfo->Context = Context; + GpeEventInfo->Type = (UINT8) Type; /* Clear the GPE (of stale events), the enable it */ - Status = AcpiHwClearGpe (GpeNumber); + Status = AcpiHwClearGpe (GpeEventInfo); if (ACPI_FAILURE (Status)) { goto Cleanup; } - Status = AcpiHwEnableGpe (GpeNumber); + Status = AcpiHwEnableGpe (GpeEventInfo); Cleanup: @@ -685,7 +685,7 @@ AcpiRemoveGpeHandler ( ACPI_GPE_HANDLER Handler) { ACPI_STATUS Status; - UINT32 GpeNumberIndex; + ACPI_GPE_EVENT_INFO *GpeEventInfo; ACPI_FUNCTION_TRACE ("AcpiRemoveGpeHandler"); @@ -700,15 +700,15 @@ AcpiRemoveGpeHandler ( /* Ensure that we have a valid GPE number */ - GpeNumberIndex = AcpiEvGetGpeNumberIndex (GpeNumber); - if (GpeNumberIndex == ACPI_GPE_INVALID) + GpeEventInfo = AcpiEvGetGpeEventInfo (GpeNumber); + if (!GpeEventInfo) { return_ACPI_STATUS (AE_BAD_PARAMETER); } /* Disable the GPE before removing the handler */ - Status = AcpiHwDisableGpe (GpeNumber); + Status = AcpiHwDisableGpe (GpeEventInfo); if (ACPI_FAILURE (Status)) { return_ACPI_STATUS (Status); @@ -722,17 +722,17 @@ AcpiRemoveGpeHandler ( /* Make sure that the installed handler is the same */ - if (AcpiGbl_GpeNumberInfo[GpeNumberIndex].Handler != Handler) + if (GpeEventInfo->Handler != Handler) { - (void) AcpiHwEnableGpe (GpeNumber); + (void) AcpiHwEnableGpe (GpeEventInfo); Status = AE_BAD_PARAMETER; goto Cleanup; } /* Remove the handler */ - AcpiGbl_GpeNumberInfo[GpeNumberIndex].Handler = NULL; - AcpiGbl_GpeNumberInfo[GpeNumberIndex].Context = NULL; + GpeEventInfo->Handler = NULL; + GpeEventInfo->Context = NULL; Cleanup: |
