diff options
author | jkim <jkim@FreeBSD.org> | 2012-08-16 20:54:52 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2012-08-16 20:54:52 +0000 |
commit | 7d706dc46f20aa3d7d386cd3f3df8e786e35e3cf (patch) | |
tree | a652303191b07ca59b5281e3606555d7db951183 /sys/contrib/dev/acpica/components/hardware | |
parent | ef6535e51ea1bac50944a3194c4e3ee845e9b696 (diff) | |
parent | 08e6f22ac3350a67c38e9b42b5dce2a7d5fa08b4 (diff) | |
download | FreeBSD-src-7d706dc46f20aa3d7d386cd3f3df8e786e35e3cf.zip FreeBSD-src-7d706dc46f20aa3d7d386cd3f3df8e786e35e3cf.tar.gz |
Merge ACPICA 20120816.
Diffstat (limited to 'sys/contrib/dev/acpica/components/hardware')
4 files changed, 19 insertions, 65 deletions
diff --git a/sys/contrib/dev/acpica/components/hardware/hwesleep.c b/sys/contrib/dev/acpica/components/hardware/hwesleep.c index ede5278..4a9b7ec 100644 --- a/sys/contrib/dev/acpica/components/hardware/hwesleep.c +++ b/sys/contrib/dev/acpica/components/hardware/hwesleep.c @@ -99,7 +99,6 @@ AcpiHwExecuteSleepMethod ( * FUNCTION: AcpiHwExtendedSleep * * PARAMETERS: SleepState - Which sleep state to enter - * Flags - ACPI_EXECUTE_GTS to run optional method * * RETURN: Status * @@ -111,8 +110,7 @@ AcpiHwExecuteSleepMethod ( ACPI_STATUS AcpiHwExtendedSleep ( - UINT8 SleepState, - UINT8 Flags) + UINT8 SleepState) { ACPI_STATUS Status; UINT8 SleepTypeValue; @@ -140,13 +138,6 @@ AcpiHwExtendedSleep ( AcpiGbl_SystemAwakeAndRunning = FALSE; - /* Optionally execute _GTS (Going To Sleep) */ - - if (Flags & ACPI_EXECUTE_GTS) - { - AcpiHwExecuteSleepMethod (METHOD_PATHNAME__GTS, SleepState); - } - /* Flush caches, as per ACPI specification */ ACPI_FLUSH_CPU_CACHE (); @@ -191,7 +182,6 @@ AcpiHwExtendedSleep ( * FUNCTION: AcpiHwExtendedWakePrep * * PARAMETERS: SleepState - Which sleep state we just exited - * Flags - ACPI_EXECUTE_BFS to run optional method * * RETURN: Status * @@ -202,8 +192,7 @@ AcpiHwExtendedSleep ( ACPI_STATUS AcpiHwExtendedWakePrep ( - UINT8 SleepState, - UINT8 Flags) + UINT8 SleepState) { ACPI_STATUS Status; UINT8 SleepTypeValue; @@ -223,12 +212,6 @@ AcpiHwExtendedWakePrep ( &AcpiGbl_FADT.SleepControl); } - /* Optionally execute _BFS (Back From Sleep) */ - - if (Flags & ACPI_EXECUTE_BFS) - { - AcpiHwExecuteSleepMethod (METHOD_PATHNAME__BFS, SleepState); - } return_ACPI_STATUS (AE_OK); } @@ -238,7 +221,6 @@ AcpiHwExtendedWakePrep ( * FUNCTION: AcpiHwExtendedWake * * PARAMETERS: SleepState - Which sleep state we just exited - * Flags - Reserved, set to zero * * RETURN: Status * @@ -249,8 +231,7 @@ AcpiHwExtendedWakePrep ( ACPI_STATUS AcpiHwExtendedWake ( - UINT8 SleepState, - UINT8 Flags) + UINT8 SleepState) { ACPI_FUNCTION_TRACE (HwExtendedWake); diff --git a/sys/contrib/dev/acpica/components/hardware/hwgpe.c b/sys/contrib/dev/acpica/components/hardware/hwgpe.c index a4aa864..39246b3 100644 --- a/sys/contrib/dev/acpica/components/hardware/hwgpe.c +++ b/sys/contrib/dev/acpica/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?) */ diff --git a/sys/contrib/dev/acpica/components/hardware/hwsleep.c b/sys/contrib/dev/acpica/components/hardware/hwsleep.c index 2a80c25..6da9e5a 100644 --- a/sys/contrib/dev/acpica/components/hardware/hwsleep.c +++ b/sys/contrib/dev/acpica/components/hardware/hwsleep.c @@ -55,7 +55,6 @@ * FUNCTION: AcpiHwLegacySleep * * PARAMETERS: SleepState - Which sleep state to enter - * Flags - ACPI_EXECUTE_GTS to run optional method * * RETURN: Status * @@ -66,8 +65,7 @@ ACPI_STATUS AcpiHwLegacySleep ( - UINT8 SleepState, - UINT8 Flags) + UINT8 SleepState) { ACPI_BIT_REGISTER_INFO *SleepTypeRegInfo; ACPI_BIT_REGISTER_INFO *SleepEnableRegInfo; @@ -117,13 +115,6 @@ AcpiHwLegacySleep ( return_ACPI_STATUS (Status); } - /* Optionally execute _GTS (Going To Sleep) */ - - if (Flags & ACPI_EXECUTE_GTS) - { - AcpiHwExecuteSleepMethod (METHOD_PATHNAME__GTS, SleepState); - } - /* Get current value of PM1A control */ Status = AcpiHwRegisterRead (ACPI_REGISTER_PM1_CONTROL, @@ -233,7 +224,6 @@ AcpiHwLegacySleep ( * FUNCTION: AcpiHwLegacyWakePrep * * PARAMETERS: SleepState - Which sleep state we just exited - * Flags - ACPI_EXECUTE_BFS to run optional method * * RETURN: Status * @@ -245,8 +235,7 @@ AcpiHwLegacySleep ( ACPI_STATUS AcpiHwLegacyWakePrep ( - UINT8 SleepState, - UINT8 Flags) + UINT8 SleepState) { ACPI_STATUS Status; ACPI_BIT_REGISTER_INFO *SleepTypeRegInfo; @@ -296,12 +285,6 @@ AcpiHwLegacyWakePrep ( } } - /* Optionally execute _BFS (Back From Sleep) */ - - if (Flags & ACPI_EXECUTE_BFS) - { - AcpiHwExecuteSleepMethod (METHOD_PATHNAME__BFS, SleepState); - } return_ACPI_STATUS (Status); } @@ -311,7 +294,6 @@ AcpiHwLegacyWakePrep ( * FUNCTION: AcpiHwLegacyWake * * PARAMETERS: SleepState - Which sleep state we just exited - * Flags - Reserved, set to zero * * RETURN: Status * @@ -322,8 +304,7 @@ AcpiHwLegacyWakePrep ( ACPI_STATUS AcpiHwLegacyWake ( - UINT8 SleepState, - UINT8 Flags) + UINT8 SleepState) { ACPI_STATUS Status; diff --git a/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c b/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c index bd7abea..e467164 100644 --- a/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c +++ b/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c @@ -52,7 +52,6 @@ static ACPI_STATUS AcpiHwSleepDispatch ( UINT8 SleepState, - UINT8 Flags, UINT32 FunctionId); /* @@ -261,7 +260,6 @@ ACPI_EXPORT_SYMBOL (AcpiEnterSleepStateS4bios) static ACPI_STATUS AcpiHwSleepDispatch ( UINT8 SleepState, - UINT8 Flags, UINT32 FunctionId) { ACPI_STATUS Status; @@ -277,13 +275,13 @@ AcpiHwSleepDispatch ( if (AcpiGbl_ReducedHardware || AcpiGbl_FADT.SleepControl.Address) { - Status = SleepFunctions->ExtendedFunction (SleepState, Flags); + Status = SleepFunctions->ExtendedFunction (SleepState); } else { /* Legacy sleep */ - Status = SleepFunctions->LegacyFunction (SleepState, Flags); + Status = SleepFunctions->LegacyFunction (SleepState); } return (Status); @@ -293,7 +291,7 @@ AcpiHwSleepDispatch ( * For the case where reduced-hardware-only code is being generated, * we know that only the extended sleep registers are available */ - Status = SleepFunctions->ExtendedFunction (SleepState, Flags); + Status = SleepFunctions->ExtendedFunction (SleepState); return (Status); #endif /* !ACPI_REDUCED_HARDWARE */ @@ -387,7 +385,6 @@ ACPI_EXPORT_SYMBOL (AcpiEnterSleepStatePrep) * FUNCTION: AcpiEnterSleepState * * PARAMETERS: SleepState - Which sleep state to enter - * Flags - ACPI_EXECUTE_GTS to run optional method * * RETURN: Status * @@ -398,8 +395,7 @@ ACPI_EXPORT_SYMBOL (AcpiEnterSleepStatePrep) ACPI_STATUS AcpiEnterSleepState ( - UINT8 SleepState, - UINT8 Flags) + UINT8 SleepState) { ACPI_STATUS Status; @@ -415,7 +411,7 @@ AcpiEnterSleepState ( return_ACPI_STATUS (AE_AML_OPERAND_VALUE); } - Status = AcpiHwSleepDispatch (SleepState, Flags, ACPI_SLEEP_FUNCTION_ID); + Status = AcpiHwSleepDispatch (SleepState, ACPI_SLEEP_FUNCTION_ID); return_ACPI_STATUS (Status); } @@ -427,7 +423,6 @@ ACPI_EXPORT_SYMBOL (AcpiEnterSleepState) * FUNCTION: AcpiLeaveSleepStatePrep * * PARAMETERS: SleepState - Which sleep state we are exiting - * Flags - ACPI_EXECUTE_BFS to run optional method * * RETURN: Status * @@ -440,8 +435,7 @@ ACPI_EXPORT_SYMBOL (AcpiEnterSleepState) ACPI_STATUS AcpiLeaveSleepStatePrep ( - UINT8 SleepState, - UINT8 Flags) + UINT8 SleepState) { ACPI_STATUS Status; @@ -449,7 +443,7 @@ AcpiLeaveSleepStatePrep ( ACPI_FUNCTION_TRACE (AcpiLeaveSleepStatePrep); - Status = AcpiHwSleepDispatch (SleepState, Flags, ACPI_WAKE_PREP_FUNCTION_ID); + Status = AcpiHwSleepDispatch (SleepState, ACPI_WAKE_PREP_FUNCTION_ID); return_ACPI_STATUS (Status); } @@ -479,7 +473,7 @@ AcpiLeaveSleepState ( ACPI_FUNCTION_TRACE (AcpiLeaveSleepState); - Status = AcpiHwSleepDispatch (SleepState, 0, ACPI_WAKE_FUNCTION_ID); + Status = AcpiHwSleepDispatch (SleepState, ACPI_WAKE_FUNCTION_ID); return_ACPI_STATUS (Status); } |