Remove obsoleted files.

2 files changed, 0 insertions, 1801 deletions

diff --git a/sys/contrib/dev/acpica/Subsystem/Hardware/hwcpu32.c b/sys/contrib/dev/acpica/Subsystem/Hardware/hwcpu32.c
deleted file mode 100644
index 8401061..0000000
--- a/sys/contrib/dev/acpica/Subsystem/Hardware/hwcpu32.c
+++ /dev/null
@@ -1,837 +0,0 @@
-/******************************************************************************
- *
- * Name: hwcpu32.c - CPU support for IA32 (Throttling, CxStates)
- *              $Revision: 40 $
- *
- *****************************************************************************/
-
-/******************************************************************************
- *
- * 1. Copyright Notice
- *
- * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
- * All rights reserved.
- *
- * 2. License
- *
- * 2.1. This is your license from Intel Corp. under its intellectual property
- * rights.  You may have additional license terms from the party that provided
- * you this software, covering your right to use that party's intellectual
- * property rights.
- *
- * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a
- * copy of the source code appearing in this file ("Covered Code") an
- * irrevocable, perpetual, worldwide license under Intel's copyrights in the
- * base code distributed originally by Intel ("Original Intel Code") to copy,
- * make derivatives, distribute, use and display any portion of the Covered
- * Code in any form, with the right to sublicense such rights; and
- *
- * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent
- * license (with the right to sublicense), under only those claims of Intel
- * patents that are infringed by the Original Intel Code, to make, use, sell,
- * offer to sell, and import the Covered Code and derivative works thereof
- * solely to the minimum extent necessary to exercise the above copyright
- * license, and in no event shall the patent license extend to any additions
- * to or modifications of the Original Intel Code.  No other license or right
- * is granted directly or by implication, estoppel or otherwise;
- *
- * The above copyright and patent license is granted only if the following
- * conditions are met:
- *
- * 3. Conditions
- *
- * 3.1. Redistribution of Source with Rights to Further Distribute Source.
- * Redistribution of source code of any substantial portion of the Covered
- * Code or modification with rights to further distribute source must include
- * the above Copyright Notice, the above License, this list of Conditions,
- * and the following Disclaimer and Export Compliance provision.  In addition,
- * Licensee must cause all Covered Code to which Licensee contributes to
- * contain a file documenting the changes Licensee made to create that Covered
- * Code and the date of any change.  Licensee must include in that file the
- * documentation of any changes made by any predecessor Licensee.  Licensee
- * must include a prominent statement that the modification is derived,
- * directly or indirectly, from Original Intel Code.
- *
- * 3.2. Redistribution of Source with no Rights to Further Distribute Source.
- * Redistribution of source code of any substantial portion of the Covered
- * Code or modification without rights to further distribute source must
- * include the following Disclaimer and Export Compliance provision in the
- * documentation and/or other materials provided with distribution.  In
- * addition, Licensee may not authorize further sublicense of source of any
- * portion of the Covered Code, and must include terms to the effect that the
- * license from Licensee to its licensee is limited to the intellectual
- * property embodied in the software Licensee provides to its licensee, and
- * not to intellectual property embodied in modifications its licensee may
- * make.
- *
- * 3.3. Redistribution of Executable. Redistribution in executable form of any
- * substantial portion of the Covered Code or modification must reproduce the
- * above Copyright Notice, and the following Disclaimer and Export Compliance
- * provision in the documentation and/or other materials provided with the
- * distribution.
- *
- * 3.4. Intel retains all right, title, and interest in and to the Original
- * Intel Code.
- *
- * 3.5. Neither the name Intel nor any other trademark owned or controlled by
- * Intel shall be used in advertising or otherwise to promote the sale, use or
- * other dealings in products derived from or relating to the Covered Code
- * without prior written authorization from Intel.
- *
- * 4. Disclaimer and Export Compliance
- *
- * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED
- * HERE.  ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE
- * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT,  ASSISTANCE,
- * INSTALLATION, TRAINING OR OTHER SERVICES.  INTEL WILL NOT PROVIDE ANY
- * UPDATES, ENHANCEMENTS OR EXTENSIONS.  INTEL SPECIFICALLY DISCLAIMS ANY
- * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A
- * PARTICULAR PURPOSE.
- *
- * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES
- * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR
- * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT,
- * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY
- * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL
- * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES.  THESE LIMITATIONS
- * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY
- * LIMITED REMEDY.
- *
- * 4.3. Licensee shall not export, either directly or indirectly, any of this
- * software or system incorporating such software without first obtaining any
- * required license or other approval from the U. S. Department of Commerce or
- * any other agency or department of the United States Government.  In the
- * event Licensee exports any such software from the United States or
- * re-exports any such software from a foreign destination, Licensee shall
- * ensure that the distribution and export/re-export of the software is in
- * compliance with all laws, regulations, orders, or other restrictions of the
- * U.S. Export Administration Regulations. Licensee agrees that neither it nor
- * any of its subsidiaries will export/re-export any technical data, process,
- * software, or service, directly or indirectly, to any country for which the
- * United States government or any agency thereof requires an export license,
- * other governmental approval, or letter of assurance, without first obtaining
- * such license, approval or letter.
- *
- *****************************************************************************/
-
-#include "acpi.h"
-#include "acnamesp.h"
-#include "achware.h"
-
-#define _COMPONENT          HARDWARE
-        MODULE_NAME         ("Hwcpu32")
-
-
-#define BIT_4               0x10  /* TBD: [investigate] is this correct?  */
-
-
-/****************************************************************************
- *
- * FUNCTION:    AcpiHwEnterC1
- *
- * PARAMETERS:  PblkAddress     - Address of the processor control block
- *              PmTimerTicks    - Number of PM timer ticks elapsed while asleep
- *
- * RETURN:      Function status.
- *
- * DESCRIPTION: Set C1 state on IA32 processor (halt)
- *
- ****************************************************************************/
-
-ACPI_STATUS
-AcpiHwEnterC1(
-    ACPI_IO_ADDRESS         PblkAddress,
-    UINT32                  *PmTimerTicks)
-{
-    UINT32                  Timer = 0;
-
-
-    if (!PmTimerTicks)
-    {
-        /*
-         * Enter C1:
-         * ---------
-         */
-        enable();
-        halt();
-        *PmTimerTicks = ACPI_UINT32_MAX;
-    }
-    else
-    {
-        Timer = AcpiHwPmtTicks ();
-
-        /*
-         * Enter C1:
-         * ---------
-         */
-        enable ();
-        halt ();
-
-        /*
-         * Compute Time in C1:
-         * -------------------
-         */
-        Timer = AcpiHwPmtTicks () - Timer;
-
-        *PmTimerTicks = Timer;
-    }
-
-    return (AE_OK);
-}
-
-
-/****************************************************************************
- *
- * FUNCTION:    AcpiHwEnterC2
- *
- * PARAMETERS:  PblkAddress     - Address of the processor control block
- *              PmTimerTicks    - Number of PM timer ticks elapsed while asleep
- *
- * RETURN:      <none>
- *
- * DESCRIPTION: Set C2 state on IA32 processor
- *
- ****************************************************************************/
-
-ACPI_STATUS
-AcpiHwEnterC2(
-    ACPI_IO_ADDRESS         PblkAddress,
-    UINT32                  *PmTimerTicks)
-{
-    UINT32                  Timer = 0;
-
-
-    if (!PblkAddress || !PmTimerTicks)
-    {
-        return (AE_BAD_PARAMETER);
-    }
-
-    /*
-     * Disable interrupts before all C2/C3 transitions.
-     */
-    disable ();
-
-    Timer = AcpiHwPmtTicks ();
-
-    /*
-     * Enter C2:
-     * ---------
-     * Read from the P_LVL2 (P_BLK+4) register to invoke a C2 transition.
-     */
-    AcpiOsIn8 ((ACPI_IO_ADDRESS) (PblkAddress + 4));
-
-    /*
-     * Perform Dummy Op:
-     * -----------------
-     * We have to do something useless after reading LVL2 because chipsets
-     * cannot guarantee that STPCLK# gets asserted in time to freeze execution.
-     */
-    AcpiHwRegisterRead (ACPI_MTX_DO_NOT_LOCK, PM2_CONTROL);
-
-    /*
-     * Compute Time in C2:
-     * -------------------
-     */
-    Timer = AcpiHwPmtTicks () - Timer;
-
-    *PmTimerTicks = Timer;
-
-    /*
-     * Re-enable interrupts after coming out of C2/C3.
-     */
-    enable ();
-
-    return (AE_OK);
-}
-
-
-/****************************************************************************
- *
- * FUNCTION:    AcpiHwEnterC3
- *
- * PARAMETERS:  PblkAddress     - Address of the processor control block
- *              PmTimerTicks    - Number of PM timer ticks elapsed while asleep
- *
- * RETURN:      Status of function
- *
- * DESCRIPTION: Set C3 state on IA32 processor (UP only, cache coherency via
- *              disabling bus mastering)
- *
- ****************************************************************************/
-
-ACPI_STATUS
-AcpiHwEnterC3(
-    ACPI_IO_ADDRESS         PblkAddress,
-    UINT32                  *PmTimerTicks)
-{
-    UINT32                  Timer = 0;
-    UINT32                  BusMasterStatus = 0;
-
-
-    if (!PblkAddress || !PmTimerTicks)
-    {
-        return (AE_BAD_PARAMETER);
-    }
-
-    /*
-     * Check the BM_STS bit, if it is set, do not enter C3
-     *  but clear the bit (with a write) and exit, telling
-     *  the calling module that we spent zero time in C3.
-     *  If bus mastering continues, this action should
-     *  eventually cause a demotion to C2
-     */
-    if (1 == (BusMasterStatus =
-        AcpiHwRegisterBitAccess (ACPI_READ, ACPI_MTX_LOCK, BM_STS)))
-    {
-        /*
-         * Clear the BM_STS bit by setting it.
-         */
-        AcpiHwRegisterBitAccess (ACPI_WRITE, ACPI_MTX_LOCK, BM_STS, 1);
-        *PmTimerTicks = 0;
-        return (AE_OK);
-    }
-
-    /*
-     * Disable interrupts before all C2/C3 transitions.
-     */
-    disable();
-
-    /*
-     * Disable Bus Mastering:
-     * ----------------------
-     * Set the PM2_CNT.ARB_DIS bit (bit #0), preserving all other bits.
-     */
-     AcpiHwRegisterBitAccess(ACPI_WRITE, ACPI_MTX_LOCK, ARB_DIS, 1);
-
-    /*
-     * Get the timer base before entering C state
-     */
-    Timer = AcpiHwPmtTicks ();
-
-    /*
-     * Enter C3:
-     * ---------
-     * Read from the P_LVL3 (P_BLK+5) register to invoke a C3 transition.
-     */
-    AcpiOsIn8 ((ACPI_IO_ADDRESS)(PblkAddress + 5));
-
-    /*
-     * Perform Dummy Op:
-     * -----------------
-     * We have to do something useless after reading LVL3 because chipsets
-     * cannot guarantee that STPCLK# gets asserted in time to freeze execution.
-     */
-    AcpiHwRegisterRead (ACPI_MTX_DO_NOT_LOCK, PM2_CONTROL);
-    /*
-     * Immediately compute the time in the C state
-     */
-    Timer = AcpiHwPmtTicks() - Timer;
-
-    /*
-     * Re-Enable Bus Mastering:
-     * ------------------------
-     * Clear the PM2_CNT.ARB_DIS bit (bit #0), preserving all other bits.
-     */
-    AcpiHwRegisterBitAccess(ACPI_WRITE, ACPI_MTX_LOCK, ARB_DIS, 0);
-
-    /* TBD: [Unhandled]: Support 24-bit timers (this algorithm assumes 32-bit) */
-
-    *PmTimerTicks = Timer;
-
-    /*
-     * Re-enable interrupts after coming out of C2/C3.
-     */
-    enable();
-
-    return (AE_OK);
-}
-
-
-/****************************************************************************
- *
- * FUNCTION:    AcpiHwEnterCx
- *
- * PARAMETERS:  ProcessorHandle     - handle of the processor
- *
- * RETURN:      Status of function
- *
- * DESCRIPTION: Invoke the currently active processor Cx handler to put this
- *              processor to sleep.
- *
- ****************************************************************************/
-
-ACPI_STATUS
-AcpiHwEnterCx (
-    ACPI_IO_ADDRESS         PblkAddress,
-    UINT32                  *PmTimerTicks)
-{
-
-    if (!AcpiHwCxHandlers[AcpiHwActiveCxState])
-    {
-        return (AE_SUPPORT);
-    }
-
-    return (AcpiHwCxHandlers[AcpiHwActiveCxState] (PblkAddress, PmTimerTicks));
-}
-
-
-/****************************************************************************
- *
- * FUNCTION:    AcpiHwSetCx
- *
- * PARAMETERS:  State               - value (1-3) of the Cx state to 'make active'
- *
- * RETURN:      Function status.
- *
- * DESCRIPTION: Sets the state to use during calls to AcpiHwEnterCx().
- *
- ****************************************************************************/
-
-ACPI_STATUS
-AcpiHwSetCx (
-    UINT32                  CxState)
-{
-    /*
-     * Supported State?
-     * ----------------
-     */
-    if ((CxState < 1) || (CxState > 3))
-    {
-        return (AE_BAD_PARAMETER);
-    }
-
-    if (!AcpiHwCxHandlers[CxState])
-    {
-        return (AE_SUPPORT);
-    }
-
-    /*
-     * New Cx State?
-     * -------------
-     * We only care when moving from one state to another...
-     */
-    if (AcpiHwActiveCxState == CxState)
-    {
-        return (AE_OK);
-    }
-
-    /*
-     * Prepare to Use New State:
-     * -------------------------
-     * If the new CxState is C3, the BM_RLD bit must be set to allow
-     *  the generation of a bus master requets to cause the processor
-     *  in the C3 state to transition to the C0 state.
-     */
-    switch (CxState)
-    {
-    case 3:
-        AcpiHwRegisterBitAccess (ACPI_WRITE, ACPI_MTX_LOCK, BM_RLD, 1);
-        break;
-    }
-
-    /*
-     * Clean up from Old State:
-     * ------------------------
-     * If the old CxState was C3, the BM_RLD bit is reset.  When the
-     *  bit is reset, the generation of a bus master request does not
-     *  effect any processor in the C3 state.
-     */
-    switch (AcpiHwActiveCxState)
-    {
-    case 3:
-        AcpiHwRegisterBitAccess (ACPI_WRITE, ACPI_MTX_LOCK, BM_RLD, 0);
-        break;
-    }
-
-    /*
-     * Enable:
-     * -------
-     */
-    AcpiHwActiveCxState = CxState;
-
-    return (AE_OK);
-}
-
-
-/****************************************************************************
- *
- * FUNCTION:    AcpiHwGetCxInfo
- *
- * PARAMETERS:  CxStates        - Information (latencies) on all Cx states
- *
- * RETURN:      Status of function
- *
- * DESCRIPTION: This function is called both to initialize Cx handling
- *              and retrieve the current Cx information (latency values).
- *
- ****************************************************************************/
-
-ACPI_STATUS
-AcpiHwGetCxInfo (
-    UINT32                  CxStates[])
-{
-    BOOLEAN                 SMP_system = FALSE;
-
-
-    FUNCTION_TRACE("HwGetCxInfo");
-
-
-    if (!CxStates)
-    {
-        return_ACPI_STATUS(AE_BAD_PARAMETER);
-    }
-
-    /*
-     *  TBD: [Unhandled] need to init SMP_system using info from the MAPIC
-     *       table.
-     */
-
-    /*
-     * Set Defaults:
-     * -------------
-     * C0 and C1 support is implied (but what about that PROC_C1 register
-     * in the FADT?!?!).  Set C2/C3 to max. latency (not supported until
-     * proven otherwise).
-     */
-    CxStates[0] = 0;
-    CxStates[1] = 0;
-    CxStates[2] = MAX_CX_STATE_LATENCY;
-    CxStates[3] = MAX_CX_STATE_LATENCY;
-
-    /*
-     * C2 Supported?
-     * -------------
-     * We're only supporting C2 when the latency is <= 100 microseconds,
-     * and on SMP systems when P_LVL2_UP (which indicates C2 only on UP)
-     * is not set.
-     */
-    if (AcpiGbl_FADT->Plvl2Lat <= 100)
-    {
-        if (!SMP_system)
-        {
-            AcpiHwCxHandlers[2] = AcpiHwEnterC2;
-            CxStates[2] = AcpiGbl_FADT->Plvl2Lat;
-        }
-
-        else if (!AcpiGbl_FADT->Plvl2Up)
-        {
-            AcpiHwCxHandlers[2] = AcpiHwEnterC2;
-            CxStates[2] = AcpiGbl_FADT->Plvl2Lat;
-        }
-    }
-
-    /*
-     * C3 Supported?
-     * -------------
-     * We're only supporting C3 on UP systems when the latency is
-     * <= 1000 microseconds and that include the ability to disable
-     * Bus Mastering while in C3 (ARB_DIS) but allows Bus Mastering
-     * requests to wake the system from C3 (BM_RLD).  Note his method
-     * of maintaining cache coherency (disabling of bus mastering)
-     * cannot be used on SMP systems, and flushing caches (e.g. WBINVD)
-     * is simply too costly (at this time).
-     */
-    if (AcpiGbl_FADT->Plvl3Lat <= 1000)
-    {
-        if (!SMP_system && (AcpiGbl_FADT->XPm2CntBlk.Address &&
-            AcpiGbl_FADT->Pm2CntLen))
-        {
-            AcpiHwCxHandlers[3] = AcpiHwEnterC3;
-            CxStates[3] = AcpiGbl_FADT->Plvl3Lat;
-        }
-    }
-
-    return_ACPI_STATUS(AE_OK);
-}
-
-
-/****************************************************************************
- *
- * FUNCTION:    AcpiHwGetCxHandler
- *
- * PARAMETERS:  State           - the Cx state
- *              Handler         - pointer to location for the returned handler
- *
- * RETURN:      Status of function
- *
- * DESCRIPTION: This function is called to get an installed Cx state handler.
- *
- ****************************************************************************/
-
-ACPI_STATUS
-AcpiHwGetCxHandler (
-    UINT32                  CxState,
-    ACPI_C_STATE_HANDLER    *Handler)
-{
-    FUNCTION_TRACE ("HwGetCxHandler");
-
-
-    if ((CxState == 0) || (CxState >= MAX_CX_STATES) || !Handler)
-    {
-        return_ACPI_STATUS(AE_BAD_PARAMETER);
-    }
-
-    *Handler = AcpiHwCxHandlers[CxState];
-
-    return_ACPI_STATUS(AE_OK);
-}
-
-
-/****************************************************************************
- *
- * FUNCTION:    AcpiHwSetCxHandler
- *
- * PARAMETERS:  CxState         - the Cx state
- *              Handler         - new Cx state handler
- *
- * RETURN:      Status of function
- *
- * DESCRIPTION: This function is called to install a new Cx state handler.
- *
- ****************************************************************************/
-
-ACPI_STATUS
-AcpiHwSetCxHandler (
-    UINT32                  CxState,
-    ACPI_C_STATE_HANDLER    Handler)
-{
-    FUNCTION_TRACE ("HwSetCxHandler");
-
-
-    if ((CxState == 0) || (CxState >= MAX_CX_STATES) || !Handler)
-    {
-        return_ACPI_STATUS(AE_BAD_PARAMETER);
-    }
-
-    AcpiHwCxHandlers[CxState] = Handler;
-
-    return_ACPI_STATUS(AE_OK);
-}
-
-
-/**************************************************************************
- *
- *  FUNCTION:    AcpiHwLocalPow
- *
- *  PARAMETERS:  x,y operands
- *
- *  RETURN:      result
- *
- *  DESCRIPTION: Compute x ^ y
- *
- *************************************************************************/
-
-NATIVE_UINT
-AcpiHwLocalPow (
-    NATIVE_UINT             x,
-    NATIVE_UINT             y)
-{
-    NATIVE_UINT             i;
-    NATIVE_UINT             Result = 1;
-
-
-    for (i = 0; i < y; i++)
-    {
-        Result = Result * x;
-    }
-
-    return (Result);
-}
-
-
-/**************************************************************************
- *
- *  FUNCTION:    AcpiHwEnableThrottling
- *
- *  PARAMETERS:  PblkAddress        - Address of Pcnt (Processor Control)
- *                                      register
- *
- *  RETURN:      none
- *
- *  DESCRIPTION: Enable throttling by setting the THT_EN bit.
- *
- *************************************************************************/
-
-void
-AcpiHwEnableThrottling (
-    ACPI_IO_ADDRESS         PblkAddress)
-{
-    UINT32                  PblkValue;
-
-
-    FUNCTION_TRACE ("EnableThrottling");
-
-
-    PblkValue = AcpiOsIn32 (PblkAddress);
-    PblkValue = PblkValue | BIT_4;
-    AcpiOsOut32 (PblkAddress, PblkValue);
-
-    return_VOID;
-}
-
-
-/**************************************************************************
- *
- *  FUNCTION:   AcpiHwDisableThrottling
- *
- *  PARAMETERS: PblkAddress         - Address of Pcnt (Processor Control)
- *                                      register
- *
- *  RETURN:     none
- *
- *  DESCRIPTION:Disable throttling by clearing the THT_EN bit
- *
- *************************************************************************/
-
-void
-AcpiHwDisableThrottling (
-    ACPI_IO_ADDRESS         PblkAddress)
-{
-    UINT32                  PblkValue;
-
-
-    FUNCTION_TRACE ("DisableThrottling");
-
-
-    PblkValue = AcpiOsIn32 (PblkAddress);
-    PblkValue = PblkValue & (~(UINT32)BIT_4);
-    AcpiOsOut32 (PblkAddress, PblkValue);
-
-    return_VOID;
-}
-
-
-/**************************************************************************
- *
- *  FUNCTION:    AcpiHwGetDutyCycle
- *
- *  PARAMETERS:  DutyOffset          Pcnt register duty cycle field offset
- *               PblkAddress         Pcnt register address in chipset
- *               NumThrottleStates   # of CPU throttle states this system
- *                                      supports
- *
- *  RETURN:      none
- *
- *  DESCRIPTION: Get the duty cycle from the chipset
- *
- *************************************************************************/
-
-UINT32
-AcpiHwGetDutyCycle (
-    UINT8                   DutyOffset,
-    ACPI_IO_ADDRESS         PblkAddress,
-    UINT32                  NumThrottleStates)
-{
-    NATIVE_UINT             Index;
-    UINT32                  Duty32Value;
-    UINT32                  PcntMaskOffDutyField;
-
-
-    FUNCTION_TRACE ("GetDutyCycle");
-
-
-    /*
-     *  Use NumThrottleStates - 1 as mask [ex. 8 - 1 = 7 (Fh)]
-     *  and then shift it into the right position
-     */
-    PcntMaskOffDutyField = NumThrottleStates - 1;
-
-    /*
-     *  Read in the current value from the port
-     */
-    Duty32Value = AcpiOsIn32 ((ACPI_IO_ADDRESS) PblkAddress);
-
-    /*
-     *  Shift the the value to LSB
-     */
-    for (Index = 0; Index < (NATIVE_UINT) DutyOffset; Index++)
-    {
-        Duty32Value = Duty32Value >> 1;
-    }
-
-    /*
-     *  Get the duty field only
-     */
-    Duty32Value = Duty32Value & PcntMaskOffDutyField;
-
-    return_VALUE ((UINT32) Duty32Value);
-}
-
-
-/**************************************************************************
- *
- * FUNCTION:    AcpiHwProgramDutyCycle
- *
- * PARAMETERS:  DutyOffset          Pcnt register duty cycle field offset
- *              DutyCycle           duty cycle to program into chipset
- *              PblkAddress         Pcnt register address in chipset
- *              NumThrottleStates   # of CPU throttle states this system
- *                                      supports
- *
- * RETURN:      none
- *
- * DESCRIPTION: Program chipset with specified duty cycle by bit-shifting the
- *              duty cycle bits to the appropriate offset, reading the duty
- *              cycle register, OR-ing in the duty cycle, and writing it to
- *              the Pcnt register.
- *
- *************************************************************************/
-
-void
-AcpiHwProgramDutyCycle (
-    UINT8                   DutyOffset,
-    UINT32                  DutyCycle,
-    ACPI_IO_ADDRESS         PblkAddress,
-    UINT32                  NumThrottleStates)
-{
-    NATIVE_UINT             Index;
-    UINT32                  Duty32Value;
-    UINT32                  PcntMaskOffDutyField;
-    UINT32                  PortValue;
-
-
-    FUNCTION_TRACE ("HwProgramDutyCycle");
-
-
-    /*
-     *  valid DutyCycle passed
-     */
-    Duty32Value = DutyCycle;
-
-    /*
-     *  use NumThrottleStates - 1 as mask [ex. 8 - 1 = 7 (Fh)]
-     *  and then shift it into the right position
-     */
-    PcntMaskOffDutyField = NumThrottleStates - 1;
-
-    /*
-     *  Shift the mask
-     */
-    for (Index = 0; Index < (NATIVE_UINT) DutyOffset; Index++)
-    {
-        PcntMaskOffDutyField = PcntMaskOffDutyField << 1;
-        Duty32Value = Duty32Value << 1;
-    }
-
-    /*
-     *  Read in the current value from the port
-     */
-    PortValue = AcpiOsIn32 ((ACPI_IO_ADDRESS) PblkAddress);
-
-    /*
-     *  Mask off the duty field so we don't OR in junk!
-     */
-    PortValue = PortValue & (~PcntMaskOffDutyField);
-
-    /*
-     *  OR in the bits we want to write out to the port
-     */
-    PortValue = (PortValue | Duty32Value) & (~(UINT32)BIT_4);
-
-    /*
-     *  write it to the port
-     */
-    AcpiOsOut32 ((ACPI_IO_ADDRESS) PblkAddress, PortValue);
-
-    return_VOID;
-}
diff --git a/sys/contrib/dev/acpica/Subsystem/Hardware/hwxface.c b/sys/contrib/dev/acpica/Subsystem/Hardware/hwxface.c
deleted file mode 100644
index f20bd93..0000000
--- a/sys/contrib/dev/acpica/Subsystem/Hardware/hwxface.c
+++ /dev/null
@@ -1,964 +0,0 @@
-
-/******************************************************************************
- *
- * Name: hwxface.c - Hardware access external interfaces
- *              $Revision: 37 $
- *
- *****************************************************************************/
-
-/******************************************************************************
- *
- * 1. Copyright Notice
- *
- * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
- * All rights reserved.
- *
- * 2. License
- *
- * 2.1. This is your license from Intel Corp. under its intellectual property
- * rights.  You may have additional license terms from the party that provided
- * you this software, covering your right to use that party's intellectual
- * property rights.
- *
- * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a
- * copy of the source code appearing in this file ("Covered Code") an
- * irrevocable, perpetual, worldwide license under Intel's copyrights in the
- * base code distributed originally by Intel ("Original Intel Code") to copy,
- * make derivatives, distribute, use and display any portion of the Covered
- * Code in any form, with the right to sublicense such rights; and
- *
- * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent
- * license (with the right to sublicense), under only those claims of Intel
- * patents that are infringed by the Original Intel Code, to make, use, sell,
- * offer to sell, and import the Covered Code and derivative works thereof
- * solely to the minimum extent necessary to exercise the above copyright
- * license, and in no event shall the patent license extend to any additions
- * to or modifications of the Original Intel Code.  No other license or right
- * is granted directly or by implication, estoppel or otherwise;
- *
- * The above copyright and patent license is granted only if the following
- * conditions are met:
- *
- * 3. Conditions
- *
- * 3.1. Redistribution of Source with Rights to Further Distribute Source.
- * Redistribution of source code of any substantial portion of the Covered
- * Code or modification with rights to further distribute source must include
- * the above Copyright Notice, the above License, this list of Conditions,
- * and the following Disclaimer and Export Compliance provision.  In addition,
- * Licensee must cause all Covered Code to which Licensee contributes to
- * contain a file documenting the changes Licensee made to create that Covered
- * Code and the date of any change.  Licensee must include in that file the
- * documentation of any changes made by any predecessor Licensee.  Licensee
- * must include a prominent statement that the modification is derived,
- * directly or indirectly, from Original Intel Code.
- *
- * 3.2. Redistribution of Source with no Rights to Further Distribute Source.
- * Redistribution of source code of any substantial portion of the Covered
- * Code or modification without rights to further distribute source must
- * include the following Disclaimer and Export Compliance provision in the
- * documentation and/or other materials provided with distribution.  In
- * addition, Licensee may not authorize further sublicense of source of any
- * portion of the Covered Code, and must include terms to the effect that the
- * license from Licensee to its licensee is limited to the intellectual
- * property embodied in the software Licensee provides to its licensee, and
- * not to intellectual property embodied in modifications its licensee may
- * make.
- *
- * 3.3. Redistribution of Executable. Redistribution in executable form of any
- * substantial portion of the Covered Code or modification must reproduce the
- * above Copyright Notice, and the following Disclaimer and Export Compliance
- * provision in the documentation and/or other materials provided with the
- * distribution.
- *
- * 3.4. Intel retains all right, title, and interest in and to the Original
- * Intel Code.
- *
- * 3.5. Neither the name Intel nor any other trademark owned or controlled by
- * Intel shall be used in advertising or otherwise to promote the sale, use or
- * other dealings in products derived from or relating to the Covered Code
- * without prior written authorization from Intel.
- *
- * 4. Disclaimer and Export Compliance
- *
- * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED
- * HERE.  ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE
- * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT,  ASSISTANCE,
- * INSTALLATION, TRAINING OR OTHER SERVICES.  INTEL WILL NOT PROVIDE ANY
- * UPDATES, ENHANCEMENTS OR EXTENSIONS.  INTEL SPECIFICALLY DISCLAIMS ANY
- * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A
- * PARTICULAR PURPOSE.
- *
- * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES
- * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR
- * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT,
- * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY
- * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL
- * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES.  THESE LIMITATIONS
- * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY
- * LIMITED REMEDY.
- *
- * 4.3. Licensee shall not export, either directly or indirectly, any of this
- * software or system incorporating such software without first obtaining any
- * required license or other approval from the U. S. Department of Commerce or
- * any other agency or department of the United States Government.  In the
- * event Licensee exports any such software from the United States or
- * re-exports any such software from a foreign destination, Licensee shall
- * ensure that the distribution and export/re-export of the software is in
- * compliance with all laws, regulations, orders, or other restrictions of the
- * U.S. Export Administration Regulations. Licensee agrees that neither it nor
- * any of its subsidiaries will export/re-export any technical data, process,
- * software, or service, directly or indirectly, to any country for which the
- * United States government or any agency thereof requires an export license,
- * other governmental approval, or letter of assurance, without first obtaining
- * such license, approval or letter.
- *
- *****************************************************************************/
-
-#include "acpi.h"
-#include "acnamesp.h"
-#include "achware.h"
-
-#define _COMPONENT          HARDWARE
-        MODULE_NAME         ("hwxface")
-
-
-/******************************************************************************
- *
- * Hardware globals
- *
- ******************************************************************************/
-
-
-ACPI_C_STATE_HANDLER        AcpiHwCxHandlers[MAX_CX_STATES] =
-                                            {NULL, AcpiHwEnterC1, NULL, NULL};
-
-UINT32                      AcpiHwActiveCxState = 1;
-
-
-/****************************************************************************
- *
- * FUNCTION:    AcpiGetProcessorId
- *
- * PARAMETERS:  ProcessorHandle     - handle for the cpu to get info about
- *              Id                  - location to return the processor ID
- *
- * RETURN:      Status of function
- *
- * DESCRIPTION: Get the ACPI processor ID
- *
- ****************************************************************************/
-
-ACPI_STATUS
-AcpiGetProcessorId (
-    ACPI_HANDLE             ProcessorHandle,
-    UINT32                  *Id)
-{
-    ACPI_NAMESPACE_NODE     *CpuNode;
-    ACPI_OPERAND_OBJECT     *CpuObj;
-
-
-    FUNCTION_TRACE ("AcpiGetProcessorId");
-
-
-    /*
-     *  Have to at least have somewhere to return the ID
-     */
-    if (!Id)
-    {
-        return_ACPI_STATUS(AE_BAD_PARAMETER);
-    }
-
-    /*
-     *  Convert and validate the device handle
-     */
-
-    CpuNode = AcpiNsConvertHandleToEntry (ProcessorHandle);
-    if (!CpuNode)
-    {
-        return_ACPI_STATUS (AE_BAD_PARAMETER);
-    }
-
-   /*
-    *   Check for an existing internal object
-    */
-
-    CpuObj = AcpiNsGetAttachedObject ((ACPI_HANDLE) CpuNode);
-    if (!CpuObj)
-    {
-        return_ACPI_STATUS (AE_NOT_FOUND);
-    }
-
-    /*
-     * Return the ID
-     */
-    *Id = CpuObj->Processor.ProcId;
-
-    return_ACPI_STATUS (AE_OK);
-}
-
-
-/****************************************************************************
- *
- * FUNCTION:    AcpiGetProcessorThrottlingInfo
- *
- * PARAMETERS:  ProcessorHandle     - handle for the cpu to get info about
- *              UserBuffer          - caller supplied buffer
- *
- * RETURN:      Status of function
- *
- * DESCRIPTION: Get throttling capabilities for the processor, this routine
- *              builds the data directly into the callers buffer
- *
- ****************************************************************************/
-
-ACPI_STATUS
-AcpiGetProcessorThrottlingInfo (
-    ACPI_HANDLE             ProcessorHandle,
-    ACPI_BUFFER             *UserBuffer)
-{
-    NATIVE_UINT             PercentStep;
-    NATIVE_UINT             NextPercent;
-    NATIVE_UINT             NumThrottleStates;
-    NATIVE_UINT             BufferSpaceNeeded;
-    NATIVE_UINT             i;
-    UINT8                   DutyWidth;
-    ACPI_NAMESPACE_NODE     *CpuNode;
-    ACPI_OPERAND_OBJECT     *CpuObj;
-    ACPI_CPU_THROTTLING_STATE *StatePtr;
-
-
-    FUNCTION_TRACE ("AcpiGetProcessorThrottlingInfo");
-
-
-    /*
-     *  Have to at least have a buffer to return info in
-     */
-    if (!UserBuffer)
-    {
-        return_ACPI_STATUS(AE_BAD_PARAMETER);
-    }
-
-    /*
-     *  Convert and validate the device handle
-     */
-
-    CpuNode = AcpiNsConvertHandleToEntry (ProcessorHandle);
-    if (!CpuNode)
-    {
-        return_ACPI_STATUS (AE_BAD_PARAMETER);
-    }
-
-   /*
-    *   Check for an existing internal object
-    */
-
-    CpuObj = AcpiNsGetAttachedObject ((ACPI_HANDLE) CpuNode);
-    if (!CpuObj)
-    {
-        return_ACPI_STATUS (AE_NOT_FOUND);
-    }
-
-    /*
-     * (Duty Width on IA-64 is zero)
-     */
-    DutyWidth  = AcpiGbl_FADT->DutyWidth;
-
-    /*
-     *  P0 must always have a P_BLK all others may be null
-     *  in either case, we can't throttle a processor that has no P_BLK
-     *
-     *  Also if no Duty width, one state and it is 100%
-     *
-     */
-    if (!CpuObj->Processor.Length || !DutyWidth ||
-        (ACPI_UINT16_MAX < CpuObj->Processor.Address))
-    {
-        /*
-         *  AcpiEven though we can't throttle, we still have one state (100%)
-         */
-        NumThrottleStates = 1;
-    }
-
-    else
-    {
-        NumThrottleStates = (int) AcpiHwLocalPow (2,DutyWidth);
-    }
-
-    BufferSpaceNeeded = NumThrottleStates * sizeof (ACPI_CPU_THROTTLING_STATE);
-
-    if ((UserBuffer->Length < BufferSpaceNeeded) || !UserBuffer->Pointer)
-    {
-        UserBuffer->Length = BufferSpaceNeeded;
-        return_ACPI_STATUS (AE_BUFFER_OVERFLOW);
-    }
-
-    UserBuffer->Length  = BufferSpaceNeeded;
-    StatePtr            = (ACPI_CPU_THROTTLING_STATE *) UserBuffer->Pointer;
-    PercentStep         = 1000 / NumThrottleStates;
-
-    /*
-     * Build each entry in the buffer.  Note that we're using the value
-     * 1000 and dividing each state by 10 to better avoid round-off
-     * accumulation.  Also note that the throttling STATES are ordered
-     * sequentially from 100% (state 0) on down (e.g. 87.5% = state 1),
-     * which is exactly opposite from duty cycle values (12.5% = state 1).
-     */
-    for (i = 0, NextPercent = 1000; i < NumThrottleStates; i++)
-    {
-        StatePtr[i].StateNumber = i;
-        StatePtr[i].PercentOfClock = NextPercent / 10;
-        NextPercent -= PercentStep;
-    }
-
-    return_ACPI_STATUS(AE_OK);
-}
-
-
-/****************************************************************************
- *
- * FUNCTION:    AcpiGetProcessorThrottlingState
- *
- * PARAMETERS:  ProcessorHandle     - handle for the cpu to throttle
- *              ThrottleState       - throttling state to enter
- *
- * RETURN:      Status of function
- *
- * DESCRIPTION: Get current hardware throttling state
- *
- ****************************************************************************/
-
-ACPI_STATUS
-AcpiGetProcessorThrottlingState (
-    ACPI_HANDLE             ProcessorHandle,
-    UINT32                  *ThrottleState)
-{
-    ACPI_NAMESPACE_NODE     *CpuNode;
-    ACPI_OPERAND_OBJECT     *CpuObj;
-    UINT32                  NumThrottleStates;
-    UINT32                  DutyCycle;
-    UINT8                   DutyOffset;
-    UINT8                   DutyWidth;
-
-
-    FUNCTION_TRACE ("AcpiGetProcessorThrottlingState");
-
-
-    /* Convert and validate the device handle */
-
-    CpuNode = AcpiNsConvertHandleToEntry (ProcessorHandle);
-    if (!CpuNode || !ThrottleState)
-    {
-        return_ACPI_STATUS (AE_BAD_PARAMETER);
-    }
-
-   /* Check for an existing internal object */
-
-    CpuObj = AcpiNsGetAttachedObject ((ACPI_HANDLE) CpuNode);
-    if (!CpuObj)
-    {
-        return_ACPI_STATUS (AE_NOT_FOUND);
-    }
-
-    /*
-     * No Duty fields in IA64 tables
-     */
-    DutyOffset = AcpiGbl_FADT->DutyOffset;
-    DutyWidth  = AcpiGbl_FADT->DutyWidth;
-
-    /*
-     *  Must have a valid P_BLK P0 must have a P_BLK all others may be null
-     *  in either case, we can't thottle a processor that has no P_BLK
-     *  that means we are in the only supported state (0 - 100%)
-     *
-     *  also, if DutyWidth is zero there are no additional states
-     */
-    if (!CpuObj->Processor.Length || !DutyWidth ||
-        (ACPI_UINT16_MAX < CpuObj->Processor.Address))
-    {
-        *ThrottleState = 0;
-        return_ACPI_STATUS(AE_OK);
-    }
-
-    NumThrottleStates = (UINT32) AcpiHwLocalPow (2,DutyWidth);
-
-    /*
-     *  Get the current duty cycle value.
-     */
-    DutyCycle = AcpiHwGetDutyCycle (DutyOffset,
-                                    CpuObj->Processor.Address,
-                                    NumThrottleStates);
-
-    /*
-     * Convert duty cycle to throttling state (invert).
-     */
-    if (DutyCycle == 0)
-    {
-        *ThrottleState = 0;
-    }
-
-    else
-    {
-        *ThrottleState = NumThrottleStates - DutyCycle;
-    }
-
-    return_ACPI_STATUS(AE_OK);
-}
-
-
-/****************************************************************************
- *
- * FUNCTION:    AcpiSetProcessorThrottlingState
- *
- * PARAMETERS:  ProcessorHandle     - handle for the cpu to throttle
- *              ThrottleState       - throttling state to enter
- *
- * RETURN:      Status of function
- *
- * DESCRIPTION: Set hardware into requested throttling state, the handle
- *              passed in must have a valid P_BLK
- *
- ****************************************************************************/
-
-ACPI_STATUS
-AcpiSetProcessorThrottlingState (
-    ACPI_HANDLE             ProcessorHandle,
-    UINT32                  ThrottleState)
-{
-    ACPI_NAMESPACE_NODE    *CpuNode;
-    ACPI_OPERAND_OBJECT    *CpuObj;
-    UINT32                  NumThrottleStates = 0;
-    UINT8                   DutyOffset;
-    UINT8                   DutyWidth;
-    UINT32                  DutyCycle = 0;
-
-
-    FUNCTION_TRACE ("AcpiSetProcessorThrottlingState");
-
-
-    /* Convert and validate the device handle */
-
-    CpuNode = AcpiNsConvertHandleToEntry (ProcessorHandle);
-    if (!CpuNode)
-    {
-        return_ACPI_STATUS (AE_BAD_PARAMETER);
-    }
-
-   /* Check for an existing internal object */
-
-    CpuObj = AcpiNsGetAttachedObject ((ACPI_HANDLE) CpuNode);
-    if (!CpuObj)
-    {
-        return_ACPI_STATUS (AE_NOT_FOUND);
-    }
-
-    /*
-     * No Duty fields in IA64 tables
-     */
-    DutyOffset = AcpiGbl_FADT->DutyOffset;
-    DutyWidth  = AcpiGbl_FADT->DutyWidth;
-
-    /*
-     *  Must have a valid P_BLK P0 must have a P_BLK all others may be null
-     *  in either case, we can't thottle a processor that has no P_BLK
-     *  that means we are in the only supported state (0 - 100%)
-     *
-     *  also, if DutyWidth is zero there are no additional states
-     */
-    if (!CpuObj->Processor.Length || !DutyWidth ||
-        (ACPI_UINT16_MAX < CpuObj->Processor.Address))
-    {
-        /*
-         *  If caller wants to set the state to the only state we handle
-         *  we're done.
-         */
-        if (ThrottleState == 0)
-        {
-            return_ACPI_STATUS (AE_OK);
-        }
-
-        /*
-         *  Can't set this state
-         */
-        return_ACPI_STATUS (AE_SUPPORT);
-    }
-
-    NumThrottleStates = (UINT32) AcpiHwLocalPow (2,DutyWidth);
-
-    /*
-     * Convert throttling state to duty cycle (invert).
-     */
-    if (ThrottleState > 0)
-    {
-        DutyCycle = NumThrottleStates - ThrottleState;
-    }
-
-    /*
-     *  Turn off throttling (don't muck with the h/w while throttling).
-     */
-    AcpiHwDisableThrottling (CpuObj->Processor.Address);
-
-    /*
-     *  Program the throttling state.
-     */
-    AcpiHwProgramDutyCycle (DutyOffset, DutyCycle,
-                            CpuObj->Processor.Address, NumThrottleStates);
-
-    /*
-     *  Only enable throttling for non-zero states (0 - 100%)
-     */
-    if (ThrottleState)
-    {
-        AcpiHwEnableThrottling (CpuObj->Processor.Address);
-    }
-
-    return_ACPI_STATUS(AE_OK);
-}
-
-
-/****************************************************************************
- *
- * FUNCTION:    AcpiGetProcessorCxInfo
- *
- * PARAMETERS:  ProcessorHandle     - handle for the cpu return info about
- *              UserBuffer          - caller supplied buffer
- *
- * RETURN:      Status of function
- *
- * DESCRIPTION: Get Cx state latencies, this routine
- *              builds the data directly into the callers buffer
- *
- *
- ****************************************************************************/
-
-ACPI_STATUS
-AcpiGetProcessorCxInfo (
-    ACPI_HANDLE             ProcessorHandle,
-    ACPI_BUFFER             *UserBuffer)
-{
-    ACPI_STATUS             Status = AE_OK;
-    UINT32                  CxStateLatencies[4] = {0, 0, 0, 0};
-    NATIVE_UINT             BufferSpaceNeeded = 0;
-    ACPI_CX_STATE           *StatePtr = NULL;
-    NATIVE_UINT             i = 0;
-
-
-    FUNCTION_TRACE ("AcpiGetProcessorCxInfo");
-
-
-    /*
-     *  Have to at least have a buffer to return info in
-     */
-    if (!UserBuffer)
-    {
-        return_ACPI_STATUS (AE_BAD_PARAMETER);
-    }
-
-    Status = AcpiHwGetCxInfo (CxStateLatencies);
-    if (ACPI_FAILURE (Status))
-    {
-        return_ACPI_STATUS (Status);
-    }
-
-    BufferSpaceNeeded = 4 * sizeof (ACPI_CX_STATE);
-
-    if ((UserBuffer->Length < BufferSpaceNeeded) || !UserBuffer->Pointer)
-    {
-        UserBuffer->Length = BufferSpaceNeeded;
-        return_ACPI_STATUS (AE_BUFFER_OVERFLOW);
-    }
-
-    UserBuffer->Length = BufferSpaceNeeded;
-
-    StatePtr = (ACPI_CX_STATE *) UserBuffer->Pointer;
-
-    for (i = 0; i < 4; i++)
-    {
-        StatePtr[i].StateNumber = i;
-        StatePtr[i].Latency = CxStateLatencies[i];
-    }
-
-    return_ACPI_STATUS (AE_OK);
-}
-
-
-/****************************************************************************
- *
- * FUNCTION:    AcpiSetProcessorSleepState
- *
- * PARAMETERS:  ProcessorHandle     - handle for the cpu return info about
- *              CxState             - the Cx sleeping state (C1-C3) to make
- *                                      'active'
- *
- * RETURN:      Status of function
- *
- * DESCRIPTION: Sets which Cx state will be used during calls to
- *              AcpiProcessorSleep ()
- *
- ****************************************************************************/
-
-ACPI_STATUS
-AcpiSetProcessorSleepState (
-    ACPI_HANDLE             ProcessorHandle,
-    UINT32                  CxState)
-{
-    ACPI_STATUS             Status;
-
-
-    FUNCTION_TRACE ("AcpiSetProcessorSleepState");
-
-
-    Status = AcpiHwSetCx (CxState);
-
-    return_ACPI_STATUS (Status);
-}
-
-
-/****************************************************************************
- *
- * FUNCTION:    AcpiProcessorSleep
- *
- * PARAMETERS:  ProcessorHandle     - handle for the cpu to put to sleep (Cx)
- *              TimeSleeping        - time (in microseconds) elapsed while
- *                                      sleeping
- *
- * RETURN:      Status of function
- *
- * DESCRIPTION: Puts the processor into the currently active sleep state (Cx)
- *
- ****************************************************************************/
-
-ACPI_STATUS
-AcpiProcessorSleep (
-    ACPI_HANDLE             ProcessorHandle,
-    UINT32                  *PmTimerTicks)
-{
-    ACPI_NAMESPACE_NODE     *CpuNode = NULL;
-    ACPI_OPERAND_OBJECT     *CpuObj = NULL;
-    ACPI_IO_ADDRESS         Address = 0;
-
-
-    /*
-     * Convert ProcessorHandle to PblkAddres...
-     */
-
-    /* Convert and validate the device handle */
-
-    CpuNode = AcpiNsConvertHandleToEntry (ProcessorHandle);
-    if (!CpuNode)
-    {
-        return (AE_BAD_PARAMETER);
-    }
-
-   /* Check for an existing internal object */
-
-    CpuObj = AcpiNsGetAttachedObject ((ACPI_HANDLE) CpuNode);
-    if (!CpuObj)
-    {
-        return (AE_NOT_FOUND);
-    }
-
-    /* Get the processor register block (P_BLK) address */
-
-    Address = CpuObj->Processor.Address;
-    if (!CpuObj->Processor.Length)
-    {
-        /* Ensure a NULL addresss (note that P_BLK isn't required for C1) */
-
-        Address = 0;
-    }
-
-    /*
-     * Enter the currently active Cx sleep state.
-     */
-    return (AcpiHwEnterCx (Address, PmTimerTicks));
-}
-
-
-/******************************************************************************
- *
- * FUNCTION:    AcpiGetTimer
- *
- * PARAMETERS:  none
- *
- * RETURN:      Current value of the ACPI PMT (timer)
- *
- * DESCRIPTION: Obtains current value of ACPI PMT
- *
- ******************************************************************************/
-
-ACPI_STATUS
-AcpiGetTimer (
-    UINT32                  *OutTicks)
-{
-    FUNCTION_TRACE ("AcpiGetTimer");
-
-
-    if (!OutTicks)
-    {
-        return_ACPI_STATUS (AE_BAD_PARAMETER);
-    }
-
-    *OutTicks = AcpiHwPmtTicks ();
-
-    return_ACPI_STATUS (AE_OK);
-}
-
-
-/******************************************************************************
- *
- * FUNCTION:    AcpiSetFirmwareWakingVector
- *
- * PARAMETERS:  PhysicalAddress     - Physical address of ACPI real mode
- *                                    entry point.
- *
- * RETURN:      AE_OK or AE_ERROR
- *
- * DESCRIPTION: Access function for dFirmwareWakingVector field in FACS
- *
- ******************************************************************************/
-
-ACPI_STATUS
-AcpiSetFirmwareWakingVector (
-    ACPI_PHYSICAL_ADDRESS PhysicalAddress)
-{
-
-    FUNCTION_TRACE ("AcpiSetFirmwareWakingVector");
-
-
-    /* Make sure that we have an FACS */
-
-    if (!AcpiGbl_FACS)
-    {
-        return_ACPI_STATUS (AE_NO_ACPI_TABLES);
-    }
-
-    /* Set the vector */
-
-    if (AcpiGbl_FACS->VectorWidth == 32)
-    {
-        * (UINT32 *) AcpiGbl_FACS->FirmwareWakingVector = (UINT32) PhysicalAddress;
-    }
-    else
-    {
-        *AcpiGbl_FACS->FirmwareWakingVector = PhysicalAddress;
-    }
-
-    return_ACPI_STATUS (AE_OK);
-}
-
-
-/******************************************************************************
- *
- * FUNCTION:    AcpiGetFirmwareWakingVector
- *
- * PARAMETERS:  *PhysicalAddress    - Output buffer where contents of
- *                                    the FirmwareWakingVector field of
- *                                    the FACS will be stored.
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Access function for dFirmwareWakingVector field in FACS
- *
- ******************************************************************************/
-
-ACPI_STATUS
-AcpiGetFirmwareWakingVector (
-    ACPI_PHYSICAL_ADDRESS *PhysicalAddress)
-{
-
-    FUNCTION_TRACE ("AcpiGetFirmwareWakingVector");
-
-
-    if (!PhysicalAddress)
-    {
-        return_ACPI_STATUS (AE_BAD_PARAMETER);
-    }
-
-    /* Make sure that we have an FACS */
-
-    if (!AcpiGbl_FACS)
-    {
-        return_ACPI_STATUS (AE_NO_ACPI_TABLES);
-    }
-
-    /* Get the vector */
-    if (AcpiGbl_FACS->VectorWidth == 32)
-    {
-        *PhysicalAddress = * (UINT32 *) AcpiGbl_FACS->FirmwareWakingVector;
-    }
-    else
-    {
-        *PhysicalAddress = *AcpiGbl_FACS->FirmwareWakingVector;
-    }
-
-    return_ACPI_STATUS (AE_OK);
-}
-
-/****************************************************************************
- *
- * FUNCTION:    AcpiSetSystemSleepState
- *
- * PARAMETERS:  SleepState           - the Sx sleeping state (S1-S5)
- *
- * RETURN:      Status of function
- *
- * DESCRIPTION: Puts the system into the specified sleeping state.
- *              Note that currently supports only S1 and S5.
- *
- ****************************************************************************/
-
-ACPI_STATUS
-AcpiSetSystemSleepState (
-    UINT8                   SleepState)
-{
-    UINT8                   Slp_TypA, Slp_TypB;
-    UINT16                  Count;
-    ACPI_STATUS             Status;
-    ACPI_OBJECT_LIST        Arg_list;
-    ACPI_OBJECT             Arg;
-    ACPI_OBJECT             Objects[3];	/* package plus 2 number objects */
-    ACPI_BUFFER             ReturnBuffer;
-
-    FUNCTION_TRACE ("AcpiSetSystemSxState");
-
-    Slp_TypA = Slp_TypB = 0;
-
-    if (SleepState > ACPI_STATE_S5)
-    {
-        return_ACPI_STATUS (AE_BAD_PARAMETER);
-    }
-
-    Status = AcpiHwObtainSleepTypeRegisterData (SleepState, &Slp_TypA, &Slp_TypB);
-    if (ACPI_FAILURE (Status))
-    {
-        return_ACPI_STATUS (Status);
-    }
-
-    /*
-     * The value for ACPI_STATE_S5 is not 5 actually, so adjust it.
-     */
-    if (SleepState > ACPI_STATE_S4) 
-    {
-        SleepState--;
-    }
-
-    /*
-     * Evaluate the _PTS method
-     */
-    MEMSET(&Arg_list, 0, sizeof(Arg_list));
-    Arg_list.Count = 1;
-    Arg_list.Pointer = &Arg;
-
-    MEMSET(&Arg, 0, sizeof(Arg));
-    Arg.Type = ACPI_TYPE_NUMBER;
-    Arg.Number.Value = SleepState;
-
-    AcpiEvaluateObject (NULL, "\\_PTS", &Arg_list, NULL);
-
-    /*
-     * Clear wake status
-     */
-    AcpiHwRegisterBitAccess (ACPI_WRITE, ACPI_MTX_DO_NOT_LOCK, WAK_STS, 1);
-
-    /*
-     * Set ACPI_SLP_TYPA/b and ACPI_SLP_EN
-     */
-    AcpiHwRegisterBitAccess (ACPI_WRITE, ACPI_MTX_DO_NOT_LOCK, SLP_TYPE_A, Slp_TypA);
-    AcpiHwRegisterBitAccess (ACPI_WRITE, ACPI_MTX_DO_NOT_LOCK, SLP_TYPE_B, Slp_TypB);
-    AcpiHwRegisterBitAccess (ACPI_WRITE, ACPI_MTX_DO_NOT_LOCK, SLP_EN, 1);
-
-    /* 
-     *  For S0 we don't wait for the WAK_STS bit.
-     */
-    if (SleepState != ACPI_STATE_S0)
-    {
-	/*
-	 * Wait for WAK_STS bit
-	 */
-
-	Count = 0;
-	while (!(AcpiHwRegisterBitAccess (ACPI_READ, ACPI_MTX_DO_NOT_LOCK, WAK_STS)))
-	{
-#if 1
-	    AcpiOsSleepUsec(1000);	/* should we have OsdFunc for sleep or halt? */
-#endif
-	    /*
-	     * Some BIOSes don't set WAK_STS at all,
-	     * give up waiting for wakeup if we time out.
-	     */
-
-	    if (Count > 1000)
-	    {
-		break;		/* giving up */
-	    }
-	    Count++;
-	}
-    }
-
-    /*
-     * Evaluate the _WAK method
-     */
-    MEMSET(&Arg_list, 0, sizeof(Arg_list));
-    Arg_list.Count = 1;
-    Arg_list.Pointer = &Arg;
-
-    MEMSET(&Arg, 0, sizeof(Arg));
-    Arg.Type = ACPI_TYPE_NUMBER;
-    Arg.Number.Value = SleepState;
-
-    /* Set up _WAK result code buffer */
-    MEMSET(Objects, 0, sizeof(Objects));
-    ReturnBuffer.Length = sizeof(Objects);
-    ReturnBuffer.Pointer = Objects;
-
-    AcpiEvaluateObject (NULL, "\\_WAK", &Arg_list, &ReturnBuffer);
-
-    Status = AE_OK;
-    /* Check result code for _WAK */
-    if (Objects[0].Type != ACPI_TYPE_PACKAGE ||
-        Objects[1].Type != ACPI_TYPE_NUMBER  ||
-        Objects[2].Type != ACPI_TYPE_NUMBER)
-    {
-        /*
-         * In many BIOSes, _WAK doesn't return a result code.
-         * We don't need to worry about it too much :-).
-         */
-        DEBUG_PRINT (ACPI_INFO,
-            ("AcpiSetSystemSleepState: _WAK result code is corrupted, "
-             "but should be OK.\n"));
-    }
-
-    else
-    {
-        /* evaluate status code */
-        switch (Objects[1].Number.Value)
-        {
-        case 0x00000001:
-            DEBUG_PRINT (ACPI_ERROR,
-                ("AcpiSetSystemSleepState: Wake was signaled but failed "
-                 "due to lack of power.\n"));
-            Status = AE_ERROR;
-            break;
-
-        case 0x00000002:
-            DEBUG_PRINT (ACPI_ERROR,
-                ("AcpiSetSystemSleepState: Wake was signaled but failed "
-                 "due to thermal condition.\n"));
-            Status = AE_ERROR;
-            break;
-        }
-        /* evaluate PSS code */
-        if (Objects[2].Number.Value == 0)
-        {
-            DEBUG_PRINT (ACPI_ERROR,
-                ("AcpiSetSystemSleepState: The targeted S-state was not "
-                 "entered because of too much current being drawn from "
-                 "the power supply.\n"));
-            Status = AE_ERROR;
-        }
-    }
-
-    return_ACPI_STATUS (Status);
-}
-