Remove files that removed on the vendor branch.

2 files changed, 0 insertions, 1549 deletions

diff --git a/sys/contrib/dev/acpica/aeexec.c b/sys/contrib/dev/acpica/aeexec.c
deleted file mode 100644
index 12ba7b2..0000000
--- a/sys/contrib/dev/acpica/aeexec.c
+++ /dev/null
@@ -1,947 +0,0 @@
-/******************************************************************************
- *
- * Module Name: aeexec - Support routines for AcpiExec utility
- *              $Revision: 1.88 $
- *
- *****************************************************************************/
-
-/******************************************************************************
- *
- * 1. Copyright Notice
- *
- * Some or all of this work - Copyright (c) 1999 - 2005, 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 <contrib/dev/acpica/aecommon.h>
-
-#define _COMPONENT          ACPI_TOOLS
-        ACPI_MODULE_NAME    ("aeexec")
-
-
-ACPI_PARSE_OBJECT           *AcpiGbl_ParsedNamespaceRoot;
-ACPI_PARSE_OBJECT           *root;
-UINT8                       *AmlStart;
-UINT32                      AmlLength;
-UINT8                       *DsdtPtr;
-UINT32                      AcpiDsdtLength;
-
-DEBUG_REGIONS               AeRegions;
-RSDP_DESCRIPTOR             LocalRsdp;
-
-/*
- * Misc ACPI tables to be installed
- */
-unsigned char Ssdt1Code[] =
-{
-    0x53,0x53,0x44,0x54,0x30,0x00,0x00,0x00,  /* 00000000    "SSDT0..." */
-    0x01,0xB8,0x49,0x6E,0x74,0x65,0x6C,0x00,  /* 00000008    "..Intel." */
-    0x4D,0x61,0x6E,0x79,0x00,0x00,0x00,0x00,  /* 00000010    "Many...." */
-    0x01,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C,  /* 00000018    "....INTL" */
-    0x24,0x04,0x03,0x20,0x14,0x0B,0x5F,0x54,  /* 00000020    "$.. .._T" */
-    0x39,0x38,0x00,0x70,0x0A,0x04,0x60,0xA4,  /* 00000028    "98.p..`." */
-};
-
-unsigned char Ssdt2Code[] =
-{
-    0x53,0x53,0x44,0x54,0x30,0x00,0x00,0x00,  /* 00000000    "SSDT0..." */
-    0x01,0xB7,0x49,0x6E,0x74,0x65,0x6C,0x00,  /* 00000008    "..Intel." */
-    0x4D,0x61,0x6E,0x79,0x00,0x00,0x00,0x00,  /* 00000010    "Many...." */
-    0x01,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C,  /* 00000018    "....INTL" */
-    0x24,0x04,0x03,0x20,0x14,0x0B,0x5F,0x54,  /* 00000020    "$.. .._T" */
-    0x39,0x39,0x00,0x70,0x0A,0x04,0x60,0xA4,  /* 00000028    "99.p..`." */
-};
-
-unsigned char Oem1Code[] =
-{
-    0x4F,0x45,0x4D,0x31,0x38,0x00,0x00,0x00,  /* 00000000    "OEM18..." */
-    0x01,0x4B,0x49,0x6E,0x74,0x65,0x6C,0x00,  /* 00000008    ".KIntel." */
-    0x4D,0x61,0x6E,0x79,0x00,0x00,0x00,0x00,  /* 00000010    "Many...." */
-    0x01,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C,  /* 00000018    "....INTL" */
-    0x18,0x09,0x03,0x20,0x08,0x5F,0x58,0x54,  /* 00000020    "... ._XT" */
-    0x32,0x0A,0x04,0x14,0x0C,0x5F,0x58,0x54,  /* 00000028    "2...._XT" */
-    0x31,0x00,0x70,0x01,0x5F,0x58,0x54,0x32,  /* 00000030    "1.p._XT2" */
-
-};
-
-/*
- * We need a local FADT so that the hardware subcomponent will function,
- * even though the underlying OSD HW access functions don't do
- * anything.
- */
-RSDP_DESCRIPTOR             LocalRSDP;
-FADT_DESCRIPTOR_REV1        LocalFADT;
-FACS_DESCRIPTOR_REV1        LocalFACS;
-ACPI_TABLE_HEADER           LocalDSDT;
-ACPI_TABLE_HEADER           LocalTEST;
-ACPI_TABLE_HEADER           LocalBADTABLE;
-
-RSDT_DESCRIPTOR_REV1        *LocalRSDT;
-
-#define RSDT_TABLES         7
-#define RSDT_SIZE           (sizeof (RSDT_DESCRIPTOR_REV1) + ((RSDT_TABLES -1) * sizeof (UINT32)))
-
-
-/******************************************************************************
- *
- * FUNCTION:    AeCtrlCHandler
- *
- * PARAMETERS:  Sig
- *
- * RETURN:      none
- *
- * DESCRIPTION: Control-C handler.  Abort running control method if any.
- *
- *****************************************************************************/
-
-void
-AeCtrlCHandler (
-    int                     Sig)
-{
-
-    signal (SIGINT, SIG_IGN);
-
-    AcpiOsPrintf ("Caught a ctrl-c\n\n");
-
-    if (AcpiGbl_MethodExecuting)
-    {
-        AcpiGbl_AbortMethod = TRUE;
-        signal (SIGINT, AeCtrlCHandler);
-    }
-    else
-    {
-        exit (0);
-    }
-}
-
-
-/******************************************************************************
- *
- * FUNCTION:    AeBuildLocalTables
- *
- * PARAMETERS:
- *
- * RETURN:      Status
- *
- * DESCRIPTION:
- *
- *****************************************************************************/
-
-ACPI_STATUS
-AeBuildLocalTables (
-    ACPI_TABLE_HEADER       *UserTable)
-{
-
-
-    /* Build an RSDT */
-
-    LocalRSDT = AcpiOsAllocate (RSDT_SIZE);
-    if (!LocalRSDT)
-    {
-        return AE_NO_MEMORY;
-    }
-
-    ACPI_MEMSET (LocalRSDT, 0, RSDT_SIZE);
-    ACPI_STRNCPY (LocalRSDT->Signature, RSDT_SIG, 4);
-    LocalRSDT->Length = RSDT_SIZE;
-
-    LocalRSDT->TableOffsetEntry[0] = ACPI_PTR_TO_PHYSADDR (&LocalTEST);
-    LocalRSDT->TableOffsetEntry[1] = ACPI_PTR_TO_PHYSADDR (&LocalBADTABLE);
-    LocalRSDT->TableOffsetEntry[2] = ACPI_PTR_TO_PHYSADDR (&LocalFADT);
-    LocalRSDT->TableOffsetEntry[3] = ACPI_PTR_TO_PHYSADDR (&LocalTEST);  /* Just a placeholder for a user SSDT */
-
-    /* Install two SSDTs to test multiple table support */
-
-    LocalRSDT->TableOffsetEntry[4] = ACPI_PTR_TO_PHYSADDR (&Ssdt1Code);
-    LocalRSDT->TableOffsetEntry[5] = ACPI_PTR_TO_PHYSADDR (&Ssdt2Code);
-
-    /* Install the OEM1 table to test LoadTable */
-
-    LocalRSDT->TableOffsetEntry[6] = ACPI_PTR_TO_PHYSADDR (&Oem1Code);
-
-    /* Build an RSDP */
-
-    ACPI_MEMSET (&LocalRSDP, 0, sizeof (RSDP_DESCRIPTOR));
-    ACPI_STRNCPY (LocalRSDP.Signature, RSDP_SIG, 8);
-    LocalRSDP.Revision            = 1;
-    LocalRSDP.RsdtPhysicalAddress = ACPI_PTR_TO_PHYSADDR (LocalRSDT);
-
-    AcpiGbl_RSDP = &LocalRSDP;
-
-    /*
-     * Examine the incoming user table.  At this point, it has been verified
-     * to be either a DSDT, SSDT, or a PSDT, but they must be handled differently
-     */
-    if (!ACPI_STRNCMP ((char *) UserTable->Signature, DSDT_SIG, 4))
-    {
-        /* User DSDT is installed directly into the FADT */
-
-        AcpiGbl_DSDT = UserTable;
-    }
-    else
-    {
-        /* Build a local DSDT because incoming table is an SSDT or PSDT */
-
-        ACPI_MEMSET (&LocalDSDT, 0, sizeof (ACPI_TABLE_HEADER));
-        ACPI_STRNCPY (LocalDSDT.Signature, DSDT_SIG, 4);
-        LocalDSDT.Revision   = 1;
-        LocalDSDT.Length     = sizeof (ACPI_TABLE_HEADER);
-        LocalDSDT.Checksum   = (UINT8) (0 - AcpiTbGenerateChecksum (&LocalDSDT, LocalDSDT.Length));
-
-        AcpiGbl_DSDT = &LocalDSDT;
-
-        /* Install incoming table (SSDT or PSDT) directly into the RSDT */
-
-        LocalRSDT->TableOffsetEntry[3] = ACPI_PTR_TO_PHYSADDR (UserTable);
-    }
-
-    /* Set checksums for both RSDT and RSDP */
-
-    LocalRSDT->Checksum = (UINT8) (0 - AcpiTbGenerateChecksum (LocalRSDT, LocalRSDT->Length));
-    LocalRSDP.Checksum  = (UINT8) (0 - AcpiTbGenerateChecksum (&LocalRSDP, ACPI_RSDP_CHECKSUM_LENGTH));
-
-    /* Build a FADT so we can test the hardware/event init */
-
-    ACPI_MEMSET (&LocalFADT, 0, sizeof (FADT_DESCRIPTOR_REV1));
-    ACPI_STRNCPY (LocalFADT.Signature, FADT_SIG, 4);
-
-    LocalFADT.FirmwareCtrl      = ACPI_PTR_TO_PHYSADDR (&LocalFACS);
-    LocalFADT.Dsdt              = ACPI_PTR_TO_PHYSADDR (AcpiGbl_DSDT);
-    LocalFADT.Revision          = 1;
-    LocalFADT.Length            = sizeof (FADT_DESCRIPTOR_REV1);
-    LocalFADT.Gpe0BlkLen        = 16;
-    LocalFADT.Gpe1BlkLen        = 6;
-    LocalFADT.Gpe1Base          = 96;
-
-    LocalFADT.Pm1EvtLen         = 4;
-    LocalFADT.Pm1CntLen         = 4;
-    LocalFADT.PmTmLen           = 8;
-
-    LocalFADT.Gpe0Blk           = 0x12340000;
-    LocalFADT.Gpe1Blk           = 0x56780000;
-
-    LocalFADT.Pm1aEvtBlk        = 0x1aaa0000;
-    LocalFADT.Pm1bEvtBlk        = 0;
-    LocalFADT.PmTmrBlk          = 0xA0;
-    LocalFADT.Pm1aCntBlk        = 0xB0;
-
-    /* Complete the FADT with the checksum */
-
-    LocalFADT.Checksum = (UINT8) (0 - AcpiTbGenerateChecksum (&LocalFADT, LocalFADT.Length));
-
-    /* Build a FACS */
-
-    ACPI_MEMSET (&LocalFACS, 0, sizeof (FACS_DESCRIPTOR_REV1));
-    ACPI_STRNCPY (LocalFACS.Signature, FACS_SIG, 4);
-    LocalFACS.Length = sizeof (FACS_DESCRIPTOR_REV1);
-    LocalFACS.GlobalLock = 0x11AA0011;
-
-    /* Build a fake table so that we make sure that the CA core ignores it */
-
-    ACPI_MEMSET (&LocalTEST, 0, sizeof (ACPI_TABLE_HEADER));
-    ACPI_STRNCPY (LocalTEST.Signature, "TEST", 4);
-
-    LocalTEST.Revision   = 1;
-    LocalTEST.Length     = sizeof (ACPI_TABLE_HEADER);
-
-    /* Build a fake table with a bad signature so that we make sure that the CA core ignores it */
-
-    ACPI_MEMSET (&LocalBADTABLE, 0, sizeof (ACPI_TABLE_HEADER));
-    ACPI_STRNCPY (LocalBADTABLE.Signature, "BAD!", 4);
-
-    LocalBADTABLE.Revision   = 1;
-    LocalBADTABLE.Length     = sizeof (ACPI_TABLE_HEADER);
-
-    return (AE_OK);
-}
-
-
-/******************************************************************************
- *
- * FUNCTION:    AeInstallTables
- *
- * PARAMETERS:  None
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Install the various ACPI tables
- *
- *****************************************************************************/
-
-ACPI_STATUS
-AeInstallTables (void)
-{
-    ACPI_STATUS             Status;
-
-
-    Status = AcpiLoadTables ();
-
-    /* Test the code that ignores multiple loads of same SSDT */
-
-    (void) AcpiLoadTable ((ACPI_TABLE_HEADER *) Ssdt1Code);
-
-#if 0
-    Status = AcpiLoadTable ((ACPI_TABLE_HEADER *) &LocalFADT);
-    if (ACPI_FAILURE (Status))
-    {
-        printf ("**** Could not load local FADT, %s\n", AcpiFormatException (Status));
-        return (Status);
-    }
-
-    Status = AcpiLoadTable ((ACPI_TABLE_HEADER *) &LocalFACS);
-    if (ACPI_FAILURE (Status))
-    {
-        printf ("**** Could not load local FACS, %s\n", AcpiFormatException (Status));
-        return (Status);
-    }
-#endif
-
-    return (Status);
-}
-
-
-/******************************************************************************
- *
- * FUNCTION:    AeLocalGetRootPointer
- *
- * PARAMETERS:  Flags       - not used
- *              Address     - Where the root pointer is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Return a local RSDP, used to dynamically load tables via the
- *              standard ACPI mechanism.
- *
- *****************************************************************************/
-
-ACPI_STATUS
-AeLocalGetRootPointer (
-    UINT32                  Flags,
-    ACPI_POINTER            *Address)
-{
-
-    Address->PointerType     = ACPI_LOGICAL_POINTER;
-    Address->Pointer.Logical = &LocalRSDP;
-    return (AE_OK);
-}
-
-
-/******************************************************************************
- *
- * FUNCTION:    AeRegionHandler
- *
- * PARAMETERS:  Standard region handler parameters
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Test handler - Handles some dummy regions via memory that can
- *              be manipulated in Ring 3.
- *
- *****************************************************************************/
-
-ACPI_STATUS
-AeRegionHandler (
-    UINT32                  Function,
-    ACPI_PHYSICAL_ADDRESS   Address,
-    UINT32                  BitWidth,
-    ACPI_INTEGER            *Value,
-    void                    *HandlerContext,
-    void                    *RegionContext)
-{
-
-    ACPI_OPERAND_OBJECT     *RegionObject = (ACPI_OPERAND_OBJECT*) RegionContext;
-    ACPI_PHYSICAL_ADDRESS   BaseAddress;
-    ACPI_SIZE               Length;
-    BOOLEAN                 BufferExists;
-    REGION                  *RegionElement;
-    void                    *BufferValue;
-    UINT32                  ByteWidth;
-    UINT32                  i;
-
-
-    ACPI_FUNCTION_NAME ("AeRegionHandler");
-
-    /*
-     * If the object is not a region, simply return
-     */
-    if (RegionObject->Region.Type != ACPI_TYPE_REGION)
-    {
-        return AE_OK;
-    }
-
-    /*
-     * Find the region's address space and length before searching
-     * the linked list.
-     */
-    BaseAddress = RegionObject->Region.Address;
-    Length = (ACPI_SIZE) RegionObject->Region.Length;
-
-    ACPI_DEBUG_PRINT ((ACPI_DB_OPREGION, "Operation Region request on %s at 0x%X\n",
-            AcpiUtGetRegionName (RegionObject->Region.SpaceId),
-            (UINT32) Address));
-
-    if (RegionObject->Region.SpaceId == ACPI_ADR_SPACE_SMBUS)
-    {
-        Length = 0;
-
-        switch (Function & ACPI_IO_MASK)
-        {
-        case ACPI_READ:
-            switch (Function >> 16)
-            {
-            case AML_FIELD_ATTRIB_SMB_QUICK:
-            case AML_FIELD_ATTRIB_SMB_SEND_RCV:
-            case AML_FIELD_ATTRIB_SMB_BYTE:
-                Length = 1;
-                break;
-
-            case AML_FIELD_ATTRIB_SMB_WORD:
-            case AML_FIELD_ATTRIB_SMB_WORD_CALL:
-                Length = 2;
-                break;
-
-            case AML_FIELD_ATTRIB_SMB_BLOCK:
-            case AML_FIELD_ATTRIB_SMB_BLOCK_CALL:
-                Length = 32;
-                break;
-
-            default:
-                break;
-            }
-            break;
-
-        case ACPI_WRITE:
-            switch (Function >> 16)
-            {
-            case AML_FIELD_ATTRIB_SMB_QUICK:
-            case AML_FIELD_ATTRIB_SMB_SEND_RCV:
-            case AML_FIELD_ATTRIB_SMB_BYTE:
-            case AML_FIELD_ATTRIB_SMB_WORD:
-            case AML_FIELD_ATTRIB_SMB_BLOCK:
-                Length = 0;
-                break;
-
-            case AML_FIELD_ATTRIB_SMB_WORD_CALL:
-                Length = 2;
-                break;
-
-            case AML_FIELD_ATTRIB_SMB_BLOCK_CALL:
-                Length = 32;
-                break;
-
-            default:
-                break;
-            }
-            break;
-
-        default:
-            break;
-        }
-
-        for (i = 0; i < Length; i++)
-        {
-            ((UINT8 *) Value)[i+2] = (UINT8) (0xA0 + i);
-        }
-
-        ((UINT8 *) Value)[0] = 0x7A;
-        ((UINT8 *) Value)[1] = (UINT8) Length;
-
-        return AE_OK;
-    }
-
-    /*
-     * Search through the linked list for this region's buffer
-     */
-    BufferExists = FALSE;
-    RegionElement = AeRegions.RegionList;
-
-    if (AeRegions.NumberOfRegions)
-    {
-        while (!BufferExists && RegionElement)
-        {
-            if (RegionElement->Address == BaseAddress &&
-                RegionElement->Length == Length)
-            {
-                BufferExists = TRUE;
-            }
-            else
-            {
-                RegionElement = RegionElement->NextRegion;
-            }
-        }
-    }
-
-    /*
-     * If the Region buffer does not exist, create it now
-     */
-    if (!BufferExists)
-    {
-        /*
-         * Do the memory allocations first
-         */
-        RegionElement = AcpiOsAllocate (sizeof (REGION));
-        if (!RegionElement)
-        {
-            return AE_NO_MEMORY;
-        }
-
-        RegionElement->Buffer = AcpiOsAllocate (Length);
-        if (!RegionElement->Buffer)
-        {
-            AcpiOsFree (RegionElement);
-            return AE_NO_MEMORY;
-        }
-
-        ACPI_MEMSET (RegionElement->Buffer, 0, Length);
-        RegionElement->Address      = BaseAddress;
-        RegionElement->Length       = Length;
-        RegionElement->NextRegion   = NULL;
-
-        /*
-         * Increment the number of regions and put this one
-         *  at the head of the list as it will probably get accessed
-         *  more often anyway.
-         */
-        AeRegions.NumberOfRegions += 1;
-
-        if (NULL != AeRegions.RegionList)
-        {
-            RegionElement->NextRegion = AeRegions.RegionList->NextRegion;
-        }
-
-        AeRegions.RegionList = RegionElement;
-    }
-
-    /*
-     * Calculate the size of the memory copy
-     */
-    ByteWidth = (BitWidth / 8);
-
-    if (BitWidth % 8)
-    {
-        ByteWidth += 1;
-    }
-
-    /*
-     * The buffer exists and is pointed to by RegionElement.
-     * We now need to verify the request is valid and perform the operation.
-     *
-     * NOTE: RegionElement->Length is in bytes, therefore it we compare against
-     * ByteWidth (see above)
-     */
-    if (((ACPI_INTEGER) Address + ByteWidth) >
-        ((ACPI_INTEGER)(RegionElement->Address) + RegionElement->Length))
-    {
-        ACPI_DEBUG_PRINT ((ACPI_DB_WARN,
-            "Request on [%4.4s] is beyond region limit Req-%X+%X, Base=%X, Len-%X\n",
-            (RegionObject->Region.Node)->Name.Ascii, (UINT32) Address,
-            ByteWidth, (UINT32)(RegionElement->Address),
-            RegionElement->Length));
-
-        return AE_AML_REGION_LIMIT;
-    }
-
-    /*
-     * Get BufferValue to point to the "address" in the buffer
-     */
-    BufferValue = ((UINT8 *) RegionElement->Buffer +
-                    ((ACPI_INTEGER) Address - (ACPI_INTEGER) RegionElement->Address));
-
-    /*
-     * Perform a read or write to the buffer space
-     */
-    switch (Function)
-    {
-    case ACPI_READ:
-        /*
-         * Set the pointer Value to whatever is in the buffer
-         */
-        ACPI_MEMCPY (Value, BufferValue, ByteWidth);
-        break;
-
-    case ACPI_WRITE:
-        /*
-         * Write the contents of Value to the buffer
-         */
-        ACPI_MEMCPY (BufferValue, Value, ByteWidth);
-        break;
-
-    default:
-        return AE_BAD_PARAMETER;
-    }
-    return AE_OK;
-}
-
-
-/******************************************************************************
- *
- * FUNCTION:    AeRegionInit
- *
- * PARAMETERS:  None
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Opregion init function.
- *
- *****************************************************************************/
-
-ACPI_STATUS
-AeRegionInit (
-    ACPI_HANDLE                 RegionHandle,
-    UINT32                      Function,
-    void                        *HandlerContext,
-    void                        **RegionContext)
-{
-    /*
-     * Real simple, set the RegionContext to the RegionHandle
-     */
-    *RegionContext = RegionHandle;
-
-    return AE_OK;
-}
-
-
-/******************************************************************************
- *
- * FUNCTION:    AeNotifyHandler
- *
- * PARAMETERS:  Standard notify handler parameters
- *
- * RETURN:      Status
- *
- * DESCRIPTION: System notify handler for AcpiExec utility.  Used by the ASL
- *              test suite(s) to communicate errors and other information to
- *              this utility via the Notify() operator.
- *
- *****************************************************************************/
-
-void
-AeNotifyHandler (
-    ACPI_HANDLE                 Device,
-    UINT32                      Value,
-    void                        *Context)
-{
-
-    switch (Value)
-    {
-#if 0
-    case 0:
-        printf ("**** Method Error 0x%X: Results not equal\n", Value);
-        if (AcpiGbl_DebugFile)
-        {
-            AcpiOsPrintf ("**** Method Error: Results not equal\n");
-        }
-        break;
-
-
-    case 1:
-        printf ("**** Method Error: Incorrect numeric result\n");
-        if (AcpiGbl_DebugFile)
-        {
-            AcpiOsPrintf ("**** Method Error: Incorrect numeric result\n");
-        }
-        break;
-
-
-    case 2:
-        printf ("**** Method Error: An operand was overwritten\n");
-        if (AcpiGbl_DebugFile)
-        {
-            AcpiOsPrintf ("**** Method Error: An operand was overwritten\n");
-        }
-        break;
-
-#endif
-
-    default:
-        printf ("**** Received a Notify on Device [%4.4s] %p value 0x%X\n",
-            AcpiUtGetNodeName (Device), Device, Value);
-        if (AcpiGbl_DebugFile)
-        {
-            AcpiOsPrintf ("**** Received a notify, value 0x%X\n", Value);
-        }
-        break;
-    }
-
-}
-
-
-/******************************************************************************
- *
- * FUNCTION:    AeExceptionHandler
- *
- * PARAMETERS:  Standard exception handler parameters
- *
- * RETURN:      Status
- *
- * DESCRIPTION: System exception handler for AcpiExec utility.
- *
- *****************************************************************************/
-
-ACPI_STATUS
-AeExceptionHandler (
-    ACPI_STATUS             AmlStatus,
-    ACPI_NAME               Name,
-    UINT16                  Opcode,
-    UINT32                  AmlOffset,
-    void                    *Context)
-{
-    ACPI_STATUS             Status;
-    ACPI_BUFFER             ReturnObj;
-    ACPI_OBJECT_LIST        ArgList;
-    ACPI_OBJECT             Arg[2];
-    const char              *Exception;
-
-
-    Exception = AcpiFormatException (AmlStatus);
-    AcpiOsPrintf (
-        "**** AcpiExec Exception: %s during execution of method [%4.4s] Opcode [%s] @%X\n",
-        Exception, (char *) &Name, AcpiPsGetOpcodeName (Opcode), AmlOffset);
-
-    /*
-     * Invoke the _ERR method if present
-     *
-     * Setup parameter object
-     */
-    ArgList.Count = 2;
-    ArgList.Pointer = Arg;
-
-    Arg[0].Type = ACPI_TYPE_INTEGER;
-    Arg[0].Integer.Value = AmlStatus;
-
-    Arg[1].Type = ACPI_TYPE_STRING;
-    Arg[1].String.Pointer = (char *) Exception;
-    Arg[1].String.Length = ACPI_STRLEN (Exception);
-
-    /* Setup return buffer */
-
-    ReturnObj.Pointer = NULL;
-    ReturnObj.Length = ACPI_ALLOCATE_BUFFER;
-
-    Status = AcpiEvaluateObject (NULL, "\\_ERR", &ArgList, &ReturnObj);
-    if (ACPI_SUCCESS (Status) &&
-        ReturnObj.Pointer)
-    {
-        /* Override original status */
-
-        AmlStatus = (ACPI_STATUS)
-            ((ACPI_OBJECT *) ReturnObj.Pointer)->Integer.Value;
-
-        AcpiOsFree (ReturnObj.Pointer);
-    }
-    return (AmlStatus);
-}
-
-
-/******************************************************************************
- *
- * FUNCTION:    AeInstallHandlers
- *
- * PARAMETERS:  None
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Install handlers for the AcpiExec utility.
- *              NOTE: Currently only a system notify handler is installed.
- *
- *****************************************************************************/
-
-ACPI_ADR_SPACE_TYPE         SpaceId[] = {0, 1, 2, 3, 4, 0x80};
-#define AEXEC_NUM_REGIONS   6
-
-ACPI_STATUS
-AeInstallHandlers (void)
-{
-    ACPI_STATUS             Status;
-    UINT32                  i;
-    ACPI_HANDLE             Handle;
-
-
-    ACPI_FUNCTION_NAME ("AeInstallHandlers");
-
-
-    Status = AcpiInstallExceptionHandler (AeExceptionHandler);
-    if (ACPI_FAILURE (Status))
-    {
-        printf ("Could not install exception handler, %s\n",
-            AcpiFormatException (Status));
-    }
-
-    Status = AcpiInstallNotifyHandler (ACPI_ROOT_OBJECT, ACPI_SYSTEM_NOTIFY,
-                                        AeNotifyHandler, NULL);
-    if (ACPI_FAILURE (Status))
-    {
-        printf ("Could not install a global notify handler, %s\n",
-            AcpiFormatException (Status));
-    }
-
-    Status = AcpiGetHandle (NULL, "\\_SB_", &Handle);
-    if (ACPI_SUCCESS (Status))
-    {
-        Status = AcpiInstallNotifyHandler (Handle, ACPI_SYSTEM_NOTIFY,
-                                            AeNotifyHandler, NULL);
-        if (ACPI_FAILURE (Status))
-        {
-            printf ("Could not install a notify handler, %s\n",
-                AcpiFormatException (Status));
-        }
-
-        Status = AcpiRemoveNotifyHandler (Handle, ACPI_SYSTEM_NOTIFY,
-                                            AeNotifyHandler);
-        if (ACPI_FAILURE (Status))
-        {
-            printf ("Could not remove a notify handler, %s\n",
-                AcpiFormatException (Status));
-        }
-
-        Status = AcpiInstallNotifyHandler (Handle, ACPI_ALL_NOTIFY,
-                                            AeNotifyHandler, NULL);
-        Status = AcpiRemoveNotifyHandler (Handle, ACPI_ALL_NOTIFY,
-                                            AeNotifyHandler);
-        Status = AcpiInstallNotifyHandler (Handle, ACPI_ALL_NOTIFY,
-                                            AeNotifyHandler, NULL);
-        if (ACPI_FAILURE (Status))
-        {
-            printf ("Could not install a notify handler, %s\n",
-                AcpiFormatException (Status));
-        }
-
-    }
-
-    for (i = 0; i < AEXEC_NUM_REGIONS; i++)
-    {
-        if (i == 2)
-        {
-            continue;
-        }
-
-        Status = AcpiRemoveAddressSpaceHandler (AcpiGbl_RootNode,
-                        SpaceId[i], AeRegionHandler);
-
-        /* Install handler at the root object.
-         * TBD: all default handlers should be installed here!
-         */
-        Status = AcpiInstallAddressSpaceHandler (AcpiGbl_RootNode,
-                        SpaceId[i], AeRegionHandler, AeRegionInit, NULL);
-        if (ACPI_FAILURE (Status))
-        {
-            ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-                "Could not install an OpRegion handler for %s space(%d), %s\n",
-                AcpiUtGetRegionName((UINT8) SpaceId[i]), SpaceId[i],
-                AcpiFormatException (Status)));
-            return (Status);
-        }
-    }
-
-    /*
-     * Initialize the global Region Handler space
-     * MCW 3/23/00
-     */
-    AeRegions.NumberOfRegions = 0;
-    AeRegions.RegionList = NULL;
-
-    return Status;
-}
-
-
diff --git a/sys/contrib/dev/acpica/tbget.c b/sys/contrib/dev/acpica/tbget.c
deleted file mode 100644
index e361166..0000000
--- a/sys/contrib/dev/acpica/tbget.c
+++ /dev/null
@@ -1,602 +0,0 @@
-/******************************************************************************
- *
- * Module Name: tbget - ACPI Table get* routines
- *              $Revision: 90 $
- *
- *****************************************************************************/
-
-/******************************************************************************
- *
- * 1. Copyright Notice
- *
- * Some or all of this work - Copyright (c) 1999 - 2005, 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.
- *
- *****************************************************************************/
-
-#define __TBGET_C__
-
-#include <contrib/dev/acpica/acpi.h>
-#include <contrib/dev/acpica/actables.h>
-
-
-#define _COMPONENT          ACPI_TABLES
-        ACPI_MODULE_NAME    ("tbget")
-
-/* Local prototypes */
-
-static ACPI_STATUS
-AcpiTbGetThisTable (
-    ACPI_POINTER            *Address,
-    ACPI_TABLE_HEADER       *Header,
-    ACPI_TABLE_DESC         *TableInfo);
-
-static ACPI_STATUS
-AcpiTbTableOverride (
-    ACPI_TABLE_HEADER       *Header,
-    ACPI_TABLE_DESC         *TableInfo);
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiTbGetTable
- *
- * PARAMETERS:  Address             - Address of table to retrieve.  Can be
- *                                    Logical or Physical
- *              TableInfo           - Where table info is returned
- *
- * RETURN:      None
- *
- * DESCRIPTION: Get entire table of unknown size.
- *
- ******************************************************************************/
-
-ACPI_STATUS
-AcpiTbGetTable (
-    ACPI_POINTER            *Address,
-    ACPI_TABLE_DESC         *TableInfo)
-{
-    ACPI_STATUS             Status;
-    ACPI_TABLE_HEADER       Header;
-
-
-    ACPI_FUNCTION_TRACE ("TbGetTable");
-
-
-    /* Get the header in order to get signature and table size */
-
-    Status = AcpiTbGetTableHeader (Address, &Header);
-    if (ACPI_FAILURE (Status))
-    {
-        return_ACPI_STATUS (Status);
-    }
-
-    /* Get the entire table */
-
-    Status = AcpiTbGetTableBody (Address, &Header, TableInfo);
-    if (ACPI_FAILURE (Status))
-    {
-        ACPI_REPORT_ERROR (("Could not get ACPI table (size %X), %s\n",
-            Header.Length, AcpiFormatException (Status)));
-        return_ACPI_STATUS (Status);
-    }
-
-    return_ACPI_STATUS (AE_OK);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiTbGetTableHeader
- *
- * PARAMETERS:  Address             - Address of table to retrieve.  Can be
- *                                    Logical or Physical
- *              ReturnHeader        - Where the table header is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Get an ACPI table header.  Works in both physical or virtual
- *              addressing mode.  Works with both physical or logical pointers.
- *              Table is either copied or mapped, depending on the pointer
- *              type and mode of the processor.
- *
- ******************************************************************************/
-
-ACPI_STATUS
-AcpiTbGetTableHeader (
-    ACPI_POINTER            *Address,
-    ACPI_TABLE_HEADER       *ReturnHeader)
-{
-    ACPI_STATUS             Status = AE_OK;
-    ACPI_TABLE_HEADER       *Header = NULL;
-
-
-    ACPI_FUNCTION_TRACE ("TbGetTableHeader");
-
-
-    /*
-     * Flags contains the current processor mode (Virtual or Physical
-     * addressing) The PointerType is either Logical or Physical
-     */
-    switch (Address->PointerType)
-    {
-    case ACPI_PHYSMODE_PHYSPTR:
-    case ACPI_LOGMODE_LOGPTR:
-
-        /* Pointer matches processor mode, copy the header */
-
-        ACPI_MEMCPY (ReturnHeader, Address->Pointer.Logical,
-            sizeof (ACPI_TABLE_HEADER));
-        break;
-
-
-    case ACPI_LOGMODE_PHYSPTR:
-
-        /* Create a logical address for the physical pointer*/
-
-        Status = AcpiOsMapMemory (Address->Pointer.Physical,
-                    sizeof (ACPI_TABLE_HEADER), (void *) &Header);
-        if (ACPI_FAILURE (Status))
-        {
-            ACPI_REPORT_ERROR ((
-                "Could not map memory at %8.8X%8.8X for length %X\n",
-                ACPI_FORMAT_UINT64 (Address->Pointer.Physical),
-                sizeof (ACPI_TABLE_HEADER)));
-            return_ACPI_STATUS (Status);
-        }
-
-        /* Copy header and delete mapping */
-
-        ACPI_MEMCPY (ReturnHeader, Header, sizeof (ACPI_TABLE_HEADER));
-        AcpiOsUnmapMemory (Header, sizeof (ACPI_TABLE_HEADER));
-        break;
-
-
-    default:
-
-        ACPI_REPORT_ERROR (("Invalid address flags %X\n",
-            Address->PointerType));
-        return_ACPI_STATUS (AE_BAD_PARAMETER);
-    }
-
-    ACPI_DEBUG_PRINT ((ACPI_DB_TABLES, "Table Signature: [%4.4s]\n",
-        ReturnHeader->Signature));
-
-    return_ACPI_STATUS (AE_OK);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiTbGetTableBody
- *
- * PARAMETERS:  Address             - Address of table to retrieve.  Can be
- *                                    Logical or Physical
- *              Header              - Header of the table to retrieve
- *              TableInfo           - Where the table info is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Get an entire ACPI table with support to allow the host OS to
- *              replace the table with a newer version (table override.)
- *              Works in both physical or virtual
- *              addressing mode.  Works with both physical or logical pointers.
- *              Table is either copied or mapped, depending on the pointer
- *              type and mode of the processor.
- *
- ******************************************************************************/
-
-ACPI_STATUS
-AcpiTbGetTableBody (
-    ACPI_POINTER            *Address,
-    ACPI_TABLE_HEADER       *Header,
-    ACPI_TABLE_DESC         *TableInfo)
-{
-    ACPI_STATUS             Status;
-
-
-    ACPI_FUNCTION_TRACE ("TbGetTableBody");
-
-
-    if (!TableInfo || !Address)
-    {
-        return_ACPI_STATUS (AE_BAD_PARAMETER);
-    }
-
-    /* Attempt table override. */
-
-    Status = AcpiTbTableOverride (Header, TableInfo);
-    if (ACPI_SUCCESS (Status))
-    {
-        /* Table was overridden by the host OS */
-
-        return_ACPI_STATUS (Status);
-    }
-
-    /* No override, get the original table */
-
-    Status = AcpiTbGetThisTable (Address, Header, TableInfo);
-    return_ACPI_STATUS (Status);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiTbTableOverride
- *
- * PARAMETERS:  Header              - Pointer to table header
- *              TableInfo           - Return info if table is overridden
- *
- * RETURN:      None
- *
- * DESCRIPTION: Attempts override of current table with a new one if provided
- *              by the host OS.
- *
- ******************************************************************************/
-
-static ACPI_STATUS
-AcpiTbTableOverride (
-    ACPI_TABLE_HEADER       *Header,
-    ACPI_TABLE_DESC         *TableInfo)
-{
-    ACPI_TABLE_HEADER       *NewTable;
-    ACPI_STATUS             Status;
-    ACPI_POINTER            Address;
-
-
-    ACPI_FUNCTION_TRACE ("TbTableOverride");
-
-
-    /*
-     * The OSL will examine the header and decide whether to override this
-     * table.  If it decides to override, a table will be returned in NewTable,
-     * which we will then copy.
-     */
-    Status = AcpiOsTableOverride (Header, &NewTable);
-    if (ACPI_FAILURE (Status))
-    {
-        /* Some severe error from the OSL, but we basically ignore it */
-
-        ACPI_REPORT_ERROR (("Could not override ACPI table, %s\n",
-            AcpiFormatException (Status)));
-        return_ACPI_STATUS (Status);
-    }
-
-    if (!NewTable)
-    {
-        /* No table override */
-
-        return_ACPI_STATUS (AE_NO_ACPI_TABLES);
-    }
-
-    /*
-     * We have a new table to override the old one.  Get a copy of
-     * the new one.  We know that the new table has a logical pointer.
-     */
-    Address.PointerType     = ACPI_LOGICAL_POINTER | ACPI_LOGICAL_ADDRESSING;
-    Address.Pointer.Logical = NewTable;
-
-    Status = AcpiTbGetThisTable (&Address, NewTable, TableInfo);
-    if (ACPI_FAILURE (Status))
-    {
-        ACPI_REPORT_ERROR (("Could not copy override ACPI table, %s\n",
-            AcpiFormatException (Status)));
-        return_ACPI_STATUS (Status);
-    }
-
-    /* Copy the table info */
-
-    ACPI_REPORT_INFO (("Table [%4.4s] replaced by host OS\n",
-        TableInfo->Pointer->Signature));
-
-    return_ACPI_STATUS (AE_OK);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiTbGetThisTable
- *
- * PARAMETERS:  Address             - Address of table to retrieve.  Can be
- *                                    Logical or Physical
- *              Header              - Header of the table to retrieve
- *              TableInfo           - Where the table info is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Get an entire ACPI table.  Works in both physical or virtual
- *              addressing mode.  Works with both physical or logical pointers.
- *              Table is either copied or mapped, depending on the pointer
- *              type and mode of the processor.
- *
- ******************************************************************************/
-
-static ACPI_STATUS
-AcpiTbGetThisTable (
-    ACPI_POINTER            *Address,
-    ACPI_TABLE_HEADER       *Header,
-    ACPI_TABLE_DESC         *TableInfo)
-{
-    ACPI_TABLE_HEADER       *FullTable = NULL;
-    UINT8                   Allocation;
-    ACPI_STATUS             Status = AE_OK;
-
-
-    ACPI_FUNCTION_TRACE ("TbGetThisTable");
-
-
-    /*
-     * Flags contains the current processor mode (Virtual or Physical
-     * addressing) The PointerType is either Logical or Physical
-     */
-    switch (Address->PointerType)
-    {
-    case ACPI_PHYSMODE_PHYSPTR:
-    case ACPI_LOGMODE_LOGPTR:
-
-        /* Pointer matches processor mode, copy the table to a new buffer */
-
-        FullTable = ACPI_MEM_ALLOCATE (Header->Length);
-        if (!FullTable)
-        {
-            ACPI_REPORT_ERROR ((
-                "Could not allocate table memory for [%4.4s] length %X\n",
-                Header->Signature, Header->Length));
-            return_ACPI_STATUS (AE_NO_MEMORY);
-        }
-
-        /* Copy the entire table (including header) to the local buffer */
-
-        ACPI_MEMCPY (FullTable, Address->Pointer.Logical, Header->Length);
-
-        /* Save allocation type */
-
-        Allocation = ACPI_MEM_ALLOCATED;
-        break;
-
-
-    case ACPI_LOGMODE_PHYSPTR:
-
-        /*
-         * Just map the table's physical memory
-         * into our address space.
-         */
-        Status = AcpiOsMapMemory (Address->Pointer.Physical,
-                    (ACPI_SIZE) Header->Length, (void *) &FullTable);
-        if (ACPI_FAILURE (Status))
-        {
-            ACPI_REPORT_ERROR ((
-                "Could not map memory for table [%4.4s] at %8.8X%8.8X for length %X\n",
-                Header->Signature,
-                ACPI_FORMAT_UINT64 (Address->Pointer.Physical),
-                Header->Length));
-            return (Status);
-        }
-
-        /* Save allocation type */
-
-        Allocation = ACPI_MEM_MAPPED;
-        break;
-
-
-    default:
-
-        ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Invalid address flags %X\n",
-            Address->PointerType));
-        return_ACPI_STATUS (AE_BAD_PARAMETER);
-    }
-
-    /*
-     * Validate checksum for _most_ tables,
-     * even the ones whose signature we don't recognize
-     */
-    if (TableInfo->Type != ACPI_TABLE_FACS)
-    {
-        Status = AcpiTbVerifyTableChecksum (FullTable);
-
-#if (!ACPI_CHECKSUM_ABORT)
-        if (ACPI_FAILURE (Status))
-        {
-            /* Ignore the error if configuration says so */
-
-            Status = AE_OK;
-        }
-#endif
-    }
-
-    /* Return values */
-
-    TableInfo->Pointer      = FullTable;
-    TableInfo->Length       = (ACPI_SIZE) Header->Length;
-    TableInfo->Allocation   = Allocation;
-
-    ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
-        "Found table [%4.4s] at %8.8X%8.8X, mapped/copied to %p\n",
-        FullTable->Signature,
-        ACPI_FORMAT_UINT64 (Address->Pointer.Physical), FullTable));
-
-    return_ACPI_STATUS (Status);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiTbGetTablePtr
- *
- * PARAMETERS:  TableType       - one of the defined table types
- *              Instance        - Which table of this type
- *              TablePtrLoc     - pointer to location to place the pointer for
- *                                return
- *
- * RETURN:      Status
- *
- * DESCRIPTION: This function is called to get the pointer to an ACPI table.
- *
- ******************************************************************************/
-
-ACPI_STATUS
-AcpiTbGetTablePtr (
-    ACPI_TABLE_TYPE         TableType,
-    UINT32                  Instance,
-    ACPI_TABLE_HEADER       **TablePtrLoc)
-{
-    ACPI_TABLE_DESC         *TableDesc;
-    UINT32                  i;
-
-
-    ACPI_FUNCTION_TRACE ("TbGetTablePtr");
-
-
-    if (!AcpiGbl_DSDT)
-    {
-        return_ACPI_STATUS (AE_NO_ACPI_TABLES);
-    }
-
-    if (TableType > ACPI_TABLE_MAX)
-    {
-        return_ACPI_STATUS (AE_BAD_PARAMETER);
-    }
-
-    /*
-     * For all table types (Single/Multiple), the first
-     * instance is always in the list head.
-     */
-    if (Instance == 1)
-    {
-        /* Get the first */
-
-        *TablePtrLoc = NULL;
-        if (AcpiGbl_TableLists[TableType].Next)
-        {
-            *TablePtrLoc = AcpiGbl_TableLists[TableType].Next->Pointer;
-        }
-        return_ACPI_STATUS (AE_OK);
-    }
-
-    /* Check for instance out of range */
-
-    if (Instance > AcpiGbl_TableLists[TableType].Count)
-    {
-        return_ACPI_STATUS (AE_NOT_EXIST);
-    }
-
-    /* Walk the list to get the desired table
-     * Since the if (Instance == 1) check above checked for the
-     * first table, setting TableDesc equal to the .Next member
-     * is actually pointing to the second table.  Therefore, we
-     * need to walk from the 2nd table until we reach the Instance
-     * that the user is looking for and return its table pointer.
-     */
-    TableDesc = AcpiGbl_TableLists[TableType].Next;
-    for (i = 2; i < Instance; i++)
-    {
-        TableDesc = TableDesc->Next;
-    }
-
-    /* We are now pointing to the requested table's descriptor */
-
-    *TablePtrLoc = TableDesc->Pointer;
-
-    return_ACPI_STATUS (AE_OK);
-}
-