WebSVN – Kolibri OS – Diff – /drivers/devman/acpica/hardware/hwgpe.c

 /******************************************************************************
+ *
  * 1. Copyright Notice
+ *
- * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2011, Intel Corp.
  * All rights reserved.
+ *
  * 2. License
+ *
  * 2.1. This is your license from Intel Corp. under its intellectual property
 /******************************************************************************
+ *
+ * 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
+ *
+ * DESCRIPTION: Compute the register mask for this GPE. One bit is set in the
+ *              correct position for the input GPE.
+ *
+ ******************************************************************************/
+UINT32
+AcpiHwGetGpeRegisterBit (
+    ACPI_GPE_EVENT_INFO     *GpeEventInfo,
+    ACPI_GPE_REGISTER_INFO  *GpeRegisterInfo)
+{
+    return ((UINT32) 1 <<
+        (GpeEventInfo->GpeNumber - GpeRegisterInfo->BaseGpeNumber));
+}
+/******************************************************************************
  *
- * FUNCTION:    AcpiHwLowDisableGpe
+ * FUNCTION:    AcpiHwLowSetGpe
+ *
+ * PARAMETERS:  GpeEventInfo        - Info block for the GPE to be disabled
- * PARAMETERS:  GpeEventInfo        - Info block for the GPE to be disabled
+ *              Action              - Enable or disable
+ *
  * RETURN:      Status
  *
- * DESCRIPTION: Disable a single GPE in the enable register.
+ * DESCRIPTION: Enable or disable a single GPE in the parent enable register.
+ *
  ******************************************************************************/
 ACPI_STATUS
+AcpiHwLowSetGpe (
-AcpiHwLowDisableGpe (
+    ACPI_GPE_EVENT_INFO     *GpeEventInfo,
-    ACPI_GPE_EVENT_INFO     *GpeEventInfo)
+    UINT32                  Action)
+{
     ACPI_GPE_REGISTER_INFO  *GpeRegisterInfo;
+    ACPI_STATUS             Status;
+    UINT32                  EnableMask;
+    UINT32                  RegisterBit;
     ACPI_STATUS             Status;
-    UINT32                  EnableMask;
+    ACPI_FUNCTION_ENTRY ();
+    {
         return (Status);
+    }
-    /* Clear just the bit that corresponds to this GPE */
+    /* Set or clear just the bit that corresponds to this GPE */
-    ACPI_CLEAR_BIT (EnableMask, ((UINT32) 1 <<
-        (GpeEventInfo->GpeNumber - GpeRegisterInfo->BaseGpeNumber)));
-    /* Write the updated enable mask */
-    Status = AcpiHwWrite (EnableMask, &GpeRegisterInfo->EnableAddress);
-    return (Status);
-}
-/******************************************************************************
- *
- * FUNCTION:    AcpiHwWriteGpeEnableReg
- *
- * PARAMETERS:  GpeEventInfo        - Info block for the GPE to be enabled
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Write a GPE enable register.  Note: The bit for this GPE must
- *              already be cleared or set in the parent register
- *              EnableForRun mask.
- *
- ******************************************************************************/
-ACPI_STATUS
-AcpiHwWriteGpeEnableReg (
+    RegisterBit = AcpiHwGetGpeRegisterBit (GpeEventInfo, GpeRegisterInfo);
-    ACPI_GPE_EVENT_INFO     *GpeEventInfo)
+    switch (Action)
-{
+    {
-    ACPI_GPE_REGISTER_INFO  *GpeRegisterInfo;
+    case ACPI_GPE_CONDITIONAL_ENABLE:
+        /* Only enable if the EnableForRun bit is set */
-    ACPI_STATUS             Status;
+        if (!(RegisterBit & GpeRegisterInfo->EnableForRun))
+        {
+            return (AE_BAD_PARAMETER);
+        }
+        /*lint -fallthrough */
+    case ACPI_GPE_ENABLE:
+        ACPI_SET_BIT (EnableMask, RegisterBit);
-    ACPI_FUNCTION_ENTRY ();
+        break;
+    case ACPI_GPE_DISABLE:
-    /* Get the info block for the entire GPE register */
+        ACPI_CLEAR_BIT (EnableMask, RegisterBit);
+        break;
-    GpeRegisterInfo = GpeEventInfo->RegisterInfo;
-    if (!GpeRegisterInfo)
-    {
-        return (AE_NOT_EXIST);
+    default:
         ACPI_ERROR ((AE_INFO, "Invalid GPE Action, %u\n", Action));
         return (AE_BAD_PARAMETER);
 ACPI_STATUS
 AcpiHwClearGpe (
     ACPI_GPE_EVENT_INFO     *GpeEventInfo)
+{
+    ACPI_GPE_REGISTER_INFO  *GpeRegisterInfo;
     ACPI_STATUS             Status;
-    UINT8                   RegisterBit;
+    UINT32                  RegisterBit;
+    ACPI_FUNCTION_ENTRY ();
-    ACPI_FUNCTION_ENTRY ();
+    /* Get the info block for the entire GPE register */
+    GpeRegisterInfo = GpeEventInfo->RegisterInfo;
     if (!GpeRegisterInfo)
+    {
-    RegisterBit = (UINT8) (1 <<
+        return (AE_NOT_EXIST);
         (GpeEventInfo->GpeNumber - GpeEventInfo->RegisterInfo->BaseGpeNumber));
+    /*
      * Write a one to the appropriate bit in the status register to
-    /*
+     * clear this GPE.
-     * Write a one to the appropriate bit in the status register to
+     */
-     * clear this GPE.
+    RegisterBit = AcpiHwGetGpeRegisterBit (GpeEventInfo, GpeRegisterInfo);
     ACPI_GPE_EVENT_INFO     *GpeEventInfo,
     ACPI_EVENT_STATUS       *EventStatus)
+{
     UINT32                  InByte;
-    UINT8                   RegisterBit;
+    UINT32                  RegisterBit;
     ACPI_GPE_REGISTER_INFO  *GpeRegisterInfo;
-    ACPI_STATUS             Status;
+    ACPI_EVENT_STATUS       LocalEventStatus = 0;
-    ACPI_EVENT_STATUS       LocalEventStatus = 0;
     ACPI_STATUS             Status;
     GpeRegisterInfo = GpeEventInfo->RegisterInfo;
-    /* Get the register bitmask for this GPE */
+    /* Get the register bitmask for this GPE */
     RegisterBit = (UINT8) (1 <<
-        (GpeEventInfo->GpeNumber - GpeEventInfo->RegisterInfo->BaseGpeNumber));
+    RegisterBit = AcpiHwGetGpeRegisterBit (GpeEventInfo, GpeRegisterInfo);

Subversion Repositories Kolibri OS

(root)/drivers/devman/acpica/hardware/hwgpe.c – Rev 1498 → 2216