This commit was generated by cvs2svn to compensate for changes in r126520,

which included commits to RCS files with non-trunk default branches.

5 files changed, 0 insertions, 2897 deletions

diff --git a/sys/contrib/dev/acpica/acdos16.h b/sys/contrib/dev/acpica/acdos16.h
deleted file mode 100644
index 435f293..0000000
--- a/sys/contrib/dev/acpica/acdos16.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/******************************************************************************
- *
- * Name: acdos16.h - DOS specific defines, etc.
- *       $Revision: 2 $
- *
- *****************************************************************************/
-
-/******************************************************************************
- *
- * 1. Copyright Notice
- *
- * Some or all of this work - Copyright (c) 1999 - 2002, 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.
- *
- *****************************************************************************/
-
-#ifndef __ACDOS16_H__
-#define __ACDOS16_H__
-
-#define ACPI_USE_STANDARD_HEADERS
-#define ACPI_OS_NAME                "MSDOS"
-
-/*
- * Calling conventions:
- *
- * ACPI_SYSTEM_XFACE        - Interfaces to host OS (handlers, threads)
- * ACPI_EXTERNAL_XFACE      - External ACPI interfaces 
- * ACPI_INTERNAL_XFACE      - Internal ACPI interfaces
- * ACPI_INTERNAL_VAR_XFACE  - Internal variable-parameter list interfaces
- */
-#define ACPI_SYSTEM_XFACE           __cdecl
-#define ACPI_EXTERNAL_XFACE
-#define ACPI_INTERNAL_XFACE
-#define ACPI_INTERNAL_VAR_XFACE     __cdecl
-
-#define ACPI_ASM_MACROS
-#define BREAKPOINT3
-#define ACPI_DISABLE_IRQS()
-#define ACPI_ENABLE_IRQS()
-#define halt()
-#define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq)
-#define ACPI_RELEASE_GLOBAL_LOCK(GLptr, Acq)
-
-
-
-/* This macro is used to tag functions as "printf-like" because
- * some compilers can catch printf format string problems. MSVC
- * doesn't, so this is proprocessed away.
- */
-#define ACPI_PRINTF_LIKE_FUNC
-
-#endif /* __ACDOS16_H__ */
diff --git a/sys/contrib/dev/acpica/actbl71.h b/sys/contrib/dev/acpica/actbl71.h
deleted file mode 100644
index 6a84009..0000000
--- a/sys/contrib/dev/acpica/actbl71.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/******************************************************************************
- *
- * Name: actbl71.h - IA-64 Extensions to the ACPI Spec Rev. 0.71
- *                   This file includes tables specific to this
- *                   specification revision.
- *       $Revision: 12 $
- *
- *****************************************************************************/
-
-/******************************************************************************
- *
- * 1. Copyright Notice
- *
- * Some or all of this work - Copyright (c) 1999 - 2002, 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.
- *
- *****************************************************************************/
-
-#ifndef __ACTBL71_H__
-#define __ACTBL71_H__
-
-
-/* 0.71 FADT AddressSpace data item bitmasks defines */
-/* If the associated bit is zero then it is in memory space else in io space */
-
-#define SMI_CMD_ADDRESS_SPACE       0x01
-#define PM1_BLK_ADDRESS_SPACE       0x02
-#define PM2_CNT_BLK_ADDRESS_SPACE   0x04
-#define PM_TMR_BLK_ADDRESS_SPACE    0x08
-#define GPE0_BLK_ADDRESS_SPACE      0x10
-#define GPE1_BLK_ADDRESS_SPACE      0x20
-
-/* Only for clarity in declarations */
-
-typedef UINT64              IO_ADDRESS;
-
-
-#pragma pack(1)
-typedef struct  /* Root System Descriptor Pointer */
-{
-    NATIVE_CHAR             Signature [8];          /* contains "RSD PTR " */
-    UINT8                   Checksum;               /* to make sum of struct == 0 */
-    NATIVE_CHAR             OemId [6];              /* OEM identification */
-    UINT8                   Reserved;               /* Must be 0 for 1.0, 2 for 2.0 */
-    UINT64                  RsdtPhysicalAddress;    /* 64-bit physical address of RSDT */
-} RSDP_DESCRIPTOR_REV071;
-
-
-/*****************************************/
-/* IA64 Extensions to ACPI Spec Rev 0.71 */
-/* for the Root System Description Table */
-/*****************************************/
-typedef struct
-{
-    ACPI_TABLE_HEADER   header;                 /* Table header */
-    UINT32              ReservedPad;            /* IA64 alignment, must be 0 */
-    UINT64              TableOffsetEntry [1];  /* Array of pointers to other */
-                                                /* tables' headers */
-} RSDT_DESCRIPTOR_REV071;
-
-
-/*******************************************/
-/* IA64 Extensions to ACPI Spec Rev 0.71   */
-/* for the Firmware ACPI Control Structure */
-/*******************************************/
-typedef struct
-{
-    NATIVE_CHAR         Signature[4];         /* signature "FACS" */
-    UINT32              Length;               /* length of structure, in bytes */
-    UINT32              HardwareSignature;    /* hardware configuration signature */
-    UINT32              Reserved4;            /* must be 0 */
-    UINT64              FirmwareWakingVector; /* ACPI OS waking vector */
-    UINT64              GlobalLock;           /* Global Lock */
-    UINT32_BIT          S4Bios_f      : 1;    /* Indicates if S4BIOS support is present */
-    UINT32_BIT          Reserved1     : 31;   /* must be 0 */
-    UINT8               Reserved3 [28];       /* reserved - must be zero */
-
-} FACS_DESCRIPTOR_REV071;
-
-
-/******************************************/
-/* IA64 Extensions to ACPI Spec Rev 0.71  */
-/* for the Fixed ACPI Description Table   */
-/******************************************/
-typedef struct
-{
-    ACPI_TABLE_HEADER   header;             /* table header */
-    UINT32              ReservedPad;        /* IA64 alignment, must be 0 */
-    UINT64              FirmwareCtrl;       /* 64-bit Physical address of FACS */
-    UINT64              Dsdt;               /* 64-bit Physical address of DSDT */
-    UINT8               Model;              /* System Interrupt Model */
-    UINT8               AddressSpace;       /* Address Space Bitmask */
-    UINT16              SciInt;             /* System vector of SCI interrupt */
-    UINT8               AcpiEnable;         /* value to write to smi_cmd to enable ACPI */
-    UINT8               AcpiDisable;        /* value to write to smi_cmd to disable ACPI */
-    UINT8               S4BiosReq;          /* Value to write to SMI CMD to enter S4BIOS state */
-    UINT8               Reserved2;          /* reserved - must be zero */
-    UINT64              SmiCmd;             /* Port address of SMI command port */
-    UINT64              Pm1aEvtBlk;         /* Port address of Power Mgt 1a AcpiEvent Reg Blk */
-    UINT64              Pm1bEvtBlk;         /* Port address of Power Mgt 1b AcpiEvent Reg Blk */
-    UINT64              Pm1aCntBlk;         /* Port address of Power Mgt 1a Control Reg Blk */
-    UINT64              Pm1bCntBlk;         /* Port address of Power Mgt 1b Control Reg Blk */
-    UINT64              Pm2CntBlk;          /* Port address of Power Mgt 2 Control Reg Blk */
-    UINT64              PmTmrBlk;           /* Port address of Power Mgt Timer Ctrl Reg Blk */
-    UINT64              Gpe0Blk;            /* Port addr of General Purpose AcpiEvent 0 Reg Blk */
-    UINT64              Gpe1Blk;            /* Port addr of General Purpose AcpiEvent 1 Reg Blk */
-    UINT8               Pm1EvtLen;          /* Byte Length of ports at pm1X_evt_blk */
-    UINT8               Pm1CntLen;          /* Byte Length of ports at pm1X_cnt_blk */
-    UINT8               Pm2CntLen;          /* Byte Length of ports at pm2_cnt_blk */
-    UINT8               PmTmLen;            /* Byte Length of ports at pm_tm_blk */
-    UINT8               Gpe0BlkLen;         /* Byte Length of ports at gpe0_blk */
-    UINT8               Gpe1BlkLen;         /* Byte Length of ports at gpe1_blk */
-    UINT8               Gpe1Base;           /* offset in gpe model where gpe1 events start */
-    UINT8               Reserved3;          /* reserved */
-    UINT16              Plvl2Lat;           /* worst case HW latency to enter/exit C2 state */
-    UINT16              Plvl3Lat;           /* worst case HW latency to enter/exit C3 state */
-    UINT8               DayAlrm;            /* index to day-of-month alarm in RTC CMOS RAM */
-    UINT8               MonAlrm;            /* index to month-of-year alarm in RTC CMOS RAM */
-    UINT8               Century;            /* index to century in RTC CMOS RAM */
-    UINT8               Reserved4;          /* reserved */
-    UINT32_BIT          FlushCash   : 1;    /* PAL_FLUSH_CACHE is correctly supported */
-    UINT32_BIT          Reserved5   : 1;    /* reserved - must be zero */
-    UINT32_BIT          ProcC1      : 1;    /* all processors support C1 state */
-    UINT32_BIT          Plvl2Up     : 1;    /* C2 state works on MP system */
-    UINT32_BIT          PwrButton   : 1;    /* Power button is handled as a generic feature */
-    UINT32_BIT          SleepButton : 1;    /* Sleep button is handled as a generic feature, or not present */
-    UINT32_BIT          FixedRTC    : 1;    /* RTC wakeup stat not in fixed register space */
-    UINT32_BIT          Rtcs4       : 1;    /* RTC wakeup stat not possible from S4 */
-    UINT32_BIT          TmrValExt   : 1;    /* tmr_val is 32 bits */
-    UINT32_BIT          DockCap     : 1;    /* Supports Docking */
-    UINT32_BIT          Reserved6   : 22;    /* reserved - must be zero */
-
-}  FADT_DESCRIPTOR_REV071;
-
-#pragma pack()
-
-#endif /* __ACTBL71_H__ */
-
diff --git a/sys/contrib/dev/acpica/exdyadic.c b/sys/contrib/dev/acpica/exdyadic.c
deleted file mode 100644
index ef434a2..0000000
--- a/sys/contrib/dev/acpica/exdyadic.c
+++ /dev/null
@@ -1,939 +0,0 @@
-/******************************************************************************
- *
- * Module Name: exdyadic - ACPI AML execution for dyadic (2-operand) operators
- *              $Revision: 91 $
- *
- *****************************************************************************/
-
-/******************************************************************************
- *
- * 1. Copyright Notice
- *
- * Some or all of this work - Copyright (c) 1999, 2000, 2001, 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 __EXDYADIC_C__
-
-#include "acpi.h"
-#include "acparser.h"
-#include "acnamesp.h"
-#include "acinterp.h"
-#include "acevents.h"
-#include "amlcode.h"
-#include "acdispat.h"
-
-
-#define _COMPONENT          ACPI_EXECUTER
-        MODULE_NAME         ("exdyadic")
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiExDoConcatenate
- *
- * PARAMETERS:  *ObjDesc            - Object to be converted.  Must be an
- *                                    Integer, Buffer, or String
- *              WalkState           - Current walk state
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Concatenate two objects OF THE SAME TYPE.
- *
- ******************************************************************************/
-
-ACPI_STATUS
-AcpiExDoConcatenate (
-    ACPI_OPERAND_OBJECT     *ObjDesc,
-    ACPI_OPERAND_OBJECT     *ObjDesc2,
-    ACPI_OPERAND_OBJECT     **ActualRetDesc,
-    ACPI_WALK_STATE         *WalkState)
-{
-    ACPI_STATUS             Status;
-    UINT32                  i;
-    ACPI_INTEGER            ThisInteger;
-    ACPI_OPERAND_OBJECT     *RetDesc;
-    NATIVE_CHAR             *NewBuf;
-    UINT32                  IntegerSize = sizeof (ACPI_INTEGER);
-
-
-    FUNCTION_ENTRY ();
-
-
-    /*
-     * There are three cases to handle:
-     * 1) Two Integers concatenated to produce a buffer
-     * 2) Two Strings concatenated to produce a string
-     * 3) Two Buffers concatenated to produce a buffer
-     */
-    switch (ObjDesc->Common.Type)
-    {
-    case ACPI_TYPE_INTEGER:
-
-        /* Handle both ACPI 1.0 and ACPI 2.0 Integer widths */
-
-        if (WalkState->MethodNode->Flags & ANOBJ_DATA_WIDTH_32)
-        {
-            /*
-             * We are running a method that exists in a 32-bit ACPI table.
-             * Truncate the value to 32 bits by zeroing out the upper
-             * 32-bit field
-             */
-            IntegerSize = sizeof (UINT32);
-        }
-
-        /* Result of two integers is a buffer */
-
-        RetDesc = AcpiUtCreateInternalObject (ACPI_TYPE_BUFFER);
-        if (!RetDesc)
-        {
-            return (AE_NO_MEMORY);
-        }
-
-        /* Need enough space for two integers */
-
-        RetDesc->Buffer.Length = IntegerSize * 2;
-        NewBuf = ACPI_MEM_CALLOCATE (RetDesc->Buffer.Length);
-        if (!NewBuf)
-        {
-            REPORT_ERROR
-                (("ExDoConcatenate: Buffer allocation failure\n"));
-            Status = AE_NO_MEMORY;
-            goto Cleanup;
-        }
-
-        RetDesc->Buffer.Pointer = (UINT8 *) NewBuf;
-
-        /* Convert the first integer */
-
-        ThisInteger = ObjDesc->Integer.Value;
-        for (i = 0; i < IntegerSize; i++)
-        {
-            NewBuf[i] = (UINT8) ThisInteger;
-            ThisInteger >>= 8;
-        }
-
-        /* Convert the second integer */
-
-        ThisInteger = ObjDesc2->Integer.Value;
-        for (; i < (IntegerSize * 2); i++)
-        {
-            NewBuf[i] = (UINT8) ThisInteger;
-            ThisInteger >>= 8;
-        }
-
-        break;
-
-
-    case ACPI_TYPE_STRING:
-
-        RetDesc = AcpiUtCreateInternalObject (ACPI_TYPE_STRING);
-        if (!RetDesc)
-        {
-            return (AE_NO_MEMORY);
-        }
-
-        /* Operand1 is string  */
-
-        NewBuf = ACPI_MEM_ALLOCATE (ObjDesc->String.Length +
-                                    ObjDesc2->String.Length + 1);
-        if (!NewBuf)
-        {
-            REPORT_ERROR
-                (("ExDoConcatenate: String allocation failure\n"));
-            Status = AE_NO_MEMORY;
-            goto Cleanup;
-        }
-
-        STRCPY (NewBuf, ObjDesc->String.Pointer);
-        STRCPY (NewBuf + ObjDesc->String.Length,
-                        ObjDesc2->String.Pointer);
-
-        /* Point the return object to the new string */
-
-        RetDesc->String.Pointer = NewBuf;
-        RetDesc->String.Length = ObjDesc->String.Length +=
-                                 ObjDesc2->String.Length;
-        break;
-
-
-    case ACPI_TYPE_BUFFER:
-
-        /* Operand1 is a buffer */
-
-        RetDesc = AcpiUtCreateInternalObject (ACPI_TYPE_BUFFER);
-        if (!RetDesc)
-        {
-            return (AE_NO_MEMORY);
-        }
-
-        NewBuf = ACPI_MEM_ALLOCATE (ObjDesc->Buffer.Length +
-                                    ObjDesc2->Buffer.Length);
-        if (!NewBuf)
-        {
-            REPORT_ERROR
-                (("ExDoConcatenate: Buffer allocation failure\n"));
-            Status = AE_NO_MEMORY;
-            goto Cleanup;
-        }
-
-        MEMCPY (NewBuf, ObjDesc->Buffer.Pointer,
-                        ObjDesc->Buffer.Length);
-        MEMCPY (NewBuf + ObjDesc->Buffer.Length, ObjDesc2->Buffer.Pointer,
-                        ObjDesc2->Buffer.Length);
-
-        /*
-         * Point the return object to the new buffer
-         */
-
-        RetDesc->Buffer.Pointer     = (UINT8 *) NewBuf;
-        RetDesc->Buffer.Length      = ObjDesc->Buffer.Length +
-                                      ObjDesc2->Buffer.Length;
-        break;
-
-    default:
-        Status = AE_AML_INTERNAL;
-        RetDesc = NULL;
-    }
-
-
-    *ActualRetDesc = RetDesc;
-    return (AE_OK);
-
-
-Cleanup:
-
-    AcpiUtRemoveReference (RetDesc);
-    return (Status);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiExDyadic1
- *
- * PARAMETERS:  WalkState           - Current walk state
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Execute Type 1 dyadic operator with numeric operands:
- *              NotifyOp
- *
- * ALLOCATION:  Deletes both operands
- *
- ******************************************************************************/
-
-ACPI_STATUS
-AcpiExDyadic1 (
-    ACPI_WALK_STATE         *WalkState)
-{
-    ACPI_OPERAND_OBJECT     **Operand = &WalkState->Operands[0];
-    ACPI_NAMESPACE_NODE     *Node;
-    ACPI_STATUS             Status = AE_OK;
-
-
-    FUNCTION_TRACE_PTR ("ExDyadic1", WALK_OPERANDS);
-
-
-
-    /* Examine the opcode */
-
-    switch (WalkState->Opcode)
-    {
-
-    case AML_NOTIFY_OP:         /* Notify (NotifyObject, NotifyValue) */
-
-        /* The first operand is a namespace node */
-
-        Node = (ACPI_NAMESPACE_NODE *) Operand[0];
-        Operand[0] = NULL;
-
-        /* The node must refer to a device or thermal zone */
-
-        if (Node && Operand[1])
-        {
-            switch (Node->Type)
-            {
-            case ACPI_TYPE_DEVICE:
-            case ACPI_TYPE_THERMAL:
-
-                /*
-                 * Dispatch the notify to the appropriate handler
-                 * NOTE: the request is queued for execution after this method
-                 * completes.  The notify handlers are NOT invoked synchronously
-                 * from this thread -- because handlers may in turn run other
-                 * control methods.
-                 */
-                Status = AcpiEvQueueNotifyRequest (Node,
-                                        (UINT32) Operand[1]->Integer.Value);
-                break;
-
-            default:
-                ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Unexpected notify object type %X\n",
-                    Node->Type));
-
-                Status = AE_AML_OPERAND_TYPE;
-                break;
-            }
-        }
-        break;
-
-    default:
-
-        REPORT_ERROR (("AcpiExDyadic1: Unknown dyadic opcode %X\n", WalkState->Opcode));
-        Status = AE_AML_BAD_OPCODE;
-    }
-
-
-    /* Always delete both operands */
-
-    AcpiUtRemoveReference (Operand[1]);
-    AcpiUtRemoveReference (Operand[0]);
-
-
-    return_ACPI_STATUS (Status);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiExDyadic2R
- *
- * PARAMETERS:  WalkState           - Current walk state
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Execute Type 2 dyadic operator with numeric operands and
- *              one or two result operands.
- *
- * ALLOCATION:  Deletes one operand descriptor -- other remains on stack
- *
- ******************************************************************************/
-
-ACPI_STATUS
-AcpiExDyadic2R (
-    ACPI_WALK_STATE         *WalkState)
-{
-    ACPI_OPERAND_OBJECT     **Operand = &WalkState->Operands[0];
-    ACPI_OPERAND_OBJECT     *RetDesc    = NULL;
-    ACPI_OPERAND_OBJECT     *RetDesc2   = NULL;
-    ACPI_STATUS             Status      = AE_OK;
-
-
-    FUNCTION_TRACE_U32 ("ExDyadic2R", WalkState->Opcode);
-
-
-    /* Create an internal return object if necessary */
-
-    switch (WalkState->Opcode)
-    {
-    case AML_ADD_OP:
-    case AML_BIT_AND_OP:
-    case AML_BIT_NAND_OP:
-    case AML_BIT_OR_OP:
-    case AML_BIT_NOR_OP:
-    case AML_BIT_XOR_OP:
-    case AML_DIVIDE_OP:
-    case AML_MOD_OP:
-    case AML_MULTIPLY_OP:
-    case AML_SHIFT_LEFT_OP:
-    case AML_SHIFT_RIGHT_OP:
-    case AML_SUBTRACT_OP:
-
-        RetDesc = AcpiUtCreateInternalObject (ACPI_TYPE_INTEGER);
-        if (!RetDesc)
-        {
-            Status = AE_NO_MEMORY;
-            goto Cleanup;
-        }
-
-        break;
-    }
-
-
-    /*
-     * Execute the opcode
-     */
-    switch (WalkState->Opcode)
-    {
-
-    case AML_ADD_OP:                /* Add (Operand1, Operand2, Result) */
-
-        RetDesc->Integer.Value = Operand[0]->Integer.Value +
-                                 Operand[1]->Integer.Value;
-        break;
-
-
-    case AML_BIT_AND_OP:            /* And (Operand1, Operand2, Result) */
-
-        RetDesc->Integer.Value = Operand[0]->Integer.Value &
-                                 Operand[1]->Integer.Value;
-        break;
-
-
-    case AML_BIT_NAND_OP:           /* NAnd (Operand1, Operand2, Result) */
-
-        RetDesc->Integer.Value = ~(Operand[0]->Integer.Value &
-                                   Operand[1]->Integer.Value);
-        break;
-
-
-    case AML_BIT_OR_OP:             /* Or (Operand1, Operand2, Result) */
-
-        RetDesc->Integer.Value = Operand[0]->Integer.Value |
-                                 Operand[1]->Integer.Value;
-        break;
-
-
-    case AML_BIT_NOR_OP:            /* NOr (Operand1, Operand2, Result) */
-
-        RetDesc->Integer.Value = ~(Operand[0]->Integer.Value |
-                                   Operand[1]->Integer.Value);
-        break;
-
-
-    case AML_BIT_XOR_OP:            /* XOr (Operand1, Operand2, Result) */
-
-        RetDesc->Integer.Value = Operand[0]->Integer.Value ^
-                                 Operand[1]->Integer.Value;
-        break;
-
-
-    case AML_DIVIDE_OP:             /* Divide (Dividend, Divisor, RemainderResult QuotientRsult) */
-
-        if (!Operand[1]->Integer.Value)
-        {
-            REPORT_ERROR (("DivideOp: Divide by zero\n"));
-
-            Status = AE_AML_DIVIDE_BY_ZERO;
-            goto Cleanup;
-        }
-
-        RetDesc2 = AcpiUtCreateInternalObject (ACPI_TYPE_INTEGER);
-        if (!RetDesc2)
-        {
-            Status = AE_NO_MEMORY;
-            goto Cleanup;
-        }
-
-        /* 
-         * RetDesc2 will contain the quotient, 
-         * RetDesc  will contain the remainder
-         */
-        Status = AcpiUtDivide (&Operand[0]->Integer.Value, &Operand[1]->Integer.Value,
-                        &RetDesc2->Integer.Value, &RetDesc->Integer.Value);
-
-        break;
-
-
-    case AML_MOD_OP:                /* Mod (Dividend, Divisor, RemainderResult (ACPI 2.0) */
-
-        if (!Operand[1]->Integer.Value)
-        {
-            REPORT_ERROR (("ModOp: Divide by zero\n"));
-
-            Status = AE_AML_DIVIDE_BY_ZERO;
-            goto Cleanup;
-        }
-
-        /* RetDesc will contain the remainder */
-
-        Status = AcpiUtDivide (&Operand[0]->Integer.Value, &Operand[1]->Integer.Value,
-                        NULL, &RetDesc->Integer.Value);
-
-        break;
-
-
-    case AML_MULTIPLY_OP:           /* Multiply (Operand1, Operand2, Result) */
-
-        RetDesc->Integer.Value = Operand[0]->Integer.Value *
-                                 Operand[1]->Integer.Value;
-        break;
-
-
-    case AML_SHIFT_LEFT_OP:         /* ShiftLeft (Operand, ShiftCount, Result) */
-
-        RetDesc->Integer.Value = Operand[0]->Integer.Value <<
-                                 Operand[1]->Integer.Value;
-        break;
-
-
-    case AML_SHIFT_RIGHT_OP:        /* ShiftRight (Operand, ShiftCount, Result) */
-
-        RetDesc->Integer.Value = Operand[0]->Integer.Value >>
-                                 Operand[1]->Integer.Value;
-        break;
-
-
-    case AML_SUBTRACT_OP:           /* Subtract (Operand1, Operand2, Result) */
-
-        RetDesc->Integer.Value = Operand[0]->Integer.Value -
-                                 Operand[1]->Integer.Value;
-        break;
-
-
-    case AML_CONCAT_OP:              /* Concatenate (Data1, Data2, Result) */
-
-        /*
-         * Convert the second operand if necessary.  The first operand
-         * determines the type of the second operand, (See the Data Types
-         * section of the ACPI specification.)  Both object types are
-         * guaranteed to be either Integer/String/Buffer by the operand
-         * resolution mechanism above.
-         */
-        switch (Operand[0]->Common.Type)
-        {
-        case ACPI_TYPE_INTEGER:
-            Status = AcpiExConvertToInteger (Operand[1], &Operand[1], WalkState);
-            break;
-
-        case ACPI_TYPE_STRING:
-            Status = AcpiExConvertToString (Operand[1], &Operand[1], 16, ACPI_UINT32_MAX, WalkState);
-            break;
-
-        case ACPI_TYPE_BUFFER:
-            Status = AcpiExConvertToBuffer (Operand[1], &Operand[1], WalkState);
-            break;
-
-        default:
-            Status = AE_AML_INTERNAL;
-        }
-
-        if (ACPI_FAILURE (Status))
-        {
-            goto Cleanup;
-        }
-
-        /*
-         * Both operands are now known to be the same object type
-         * (Both are Integer, String, or Buffer), and we can now perform the
-         * concatenation.
-         */
-        Status = AcpiExDoConcatenate (Operand[0], Operand[1], &RetDesc, WalkState);
-        if (ACPI_FAILURE (Status))
-        {
-            goto Cleanup;
-        }
-        break;
-
-
-    case AML_TO_STRING_OP:          /* ToString (Buffer, Length, Result) (ACPI 2.0) */
-
-        Status = AcpiExConvertToString (Operand[0], &RetDesc, 16,
-                        (UINT32) Operand[1]->Integer.Value, WalkState);
-        break;
-
-
-    case AML_CONCAT_RES_OP:         /* ConcatenateResTemplate (Buffer, Buffer, Result) (ACPI 2.0) */
-
-        Status = AE_NOT_IMPLEMENTED;
-        goto Cleanup;
-        break;
-
-
-    default:
-
-        REPORT_ERROR (("AcpiExDyadic2R: Unknown dyadic opcode %X\n",
-                WalkState->Opcode));
-        Status = AE_AML_BAD_OPCODE;
-        goto Cleanup;
-    }
-
-
-    /*
-     * Store the result of the operation (which is now in Operand[0]) into
-     * the result descriptor, or the location pointed to by the result
-     * descriptor (Operand[2]).
-     */
-    Status = AcpiExStore (RetDesc, Operand[2], WalkState);
-    if (ACPI_FAILURE (Status))
-    {
-        goto Cleanup;
-    }
-
-    if (AML_DIVIDE_OP == WalkState->Opcode)
-    {
-        Status = AcpiExStore (RetDesc2, Operand[3], WalkState);
-
-        /*
-         * Since the remainder is not returned, remove a reference to
-         * the object we created earlier
-         */
-        AcpiUtRemoveReference (RetDesc);
-        WalkState->ResultObj = RetDesc2;
-    }
-
-    else
-    {
-        WalkState->ResultObj = RetDesc;
-    }
-
-
-Cleanup:
-
-    /* Always delete the operands */
-
-    AcpiUtRemoveReference (Operand[0]);
-    AcpiUtRemoveReference (Operand[1]);
-
-
-    /* Delete return object on error */
-
-    if (ACPI_FAILURE (Status))
-    {
-        /* On failure, delete the result ops */
-
-        AcpiUtRemoveReference (Operand[2]);
-        AcpiUtRemoveReference (Operand[3]);
-
-        if (RetDesc)
-        {
-            /* And delete the internal return object */
-
-            AcpiUtRemoveReference (RetDesc);
-            RetDesc = NULL;
-        }
-    }
-
-    /* Set the return object and exit */
-
-    return_ACPI_STATUS (Status);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiExDyadic2S
- *
- * PARAMETERS:  WalkState           - Current walk state
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Execute Type 2 dyadic synchronization operator
- *
- * ALLOCATION:  Deletes one operand descriptor -- other remains on stack
- *
- ******************************************************************************/
-
-ACPI_STATUS
-AcpiExDyadic2S (
-    ACPI_WALK_STATE         *WalkState)
-{
-    ACPI_OPERAND_OBJECT     **Operand = &WalkState->Operands[0];
-    ACPI_OPERAND_OBJECT     *RetDesc = NULL;
-    ACPI_STATUS             Status;
-
-
-    FUNCTION_TRACE_PTR ("ExDyadic2S", WALK_OPERANDS);
-
-
-
-    /* Create the internal return object */
-
-    RetDesc = AcpiUtCreateInternalObject (ACPI_TYPE_INTEGER);
-    if (!RetDesc)
-    {
-        Status = AE_NO_MEMORY;
-        goto Cleanup;
-    }
-
-    /* Default return value is FALSE, operation did not time out */
-
-    RetDesc->Integer.Value = 0;
-
-
-    /* Examine the opcode */
-
-    switch (WalkState->Opcode)
-    {
-
-    case AML_ACQUIRE_OP:            /* Acquire (MutexObject, Timeout) */
-
-        Status = AcpiExAcquireMutex (Operand[1], Operand[0], WalkState);
-        break;
-
-
-    case AML_WAIT_OP:               /* Wait (EventObject, Timeout) */
-
-        Status = AcpiExSystemWaitEvent (Operand[1], Operand[0]);
-        break;
-
-
-    default:
-
-        REPORT_ERROR (("AcpiExDyadic2S: Unknown dyadic synchronization opcode %X\n", WalkState->Opcode));
-        Status = AE_AML_BAD_OPCODE;
-        goto Cleanup;
-    }
-
-
-    /*
-     * Return a boolean indicating if operation timed out
-     * (TRUE) or not (FALSE)
-     */
-    if (Status == AE_TIME)
-    {
-        RetDesc->Integer.Value = ACPI_INTEGER_MAX;   /* TRUE, op timed out */
-        Status = AE_OK;
-    }
-
-
-Cleanup:
-
-    /* Delete params */
-
-    AcpiUtRemoveReference (Operand[1]);
-    AcpiUtRemoveReference (Operand[0]);
-
-    /* Delete return object on error */
-
-    if (ACPI_FAILURE (Status) &&
-        (RetDesc))
-    {
-        AcpiUtRemoveReference (RetDesc);
-        RetDesc = NULL;
-    }
-
-
-    /* Set the return object and exit */
-
-    WalkState->ResultObj = RetDesc;
-    return_ACPI_STATUS (Status);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiExDyadic2
- *
- * PARAMETERS:  WalkState           - Current walk state
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Execute Type 2 dyadic operator with numeric operands and
- *              no result operands
- *
- * ALLOCATION:  Deletes one operand descriptor -- other remains on stack
- *              containing result value
- *
- ******************************************************************************/
-
-ACPI_STATUS
-AcpiExDyadic2 (
-    ACPI_WALK_STATE         *WalkState)
-{
-    ACPI_OPERAND_OBJECT     **Operand = &WalkState->Operands[0];
-    ACPI_OPERAND_OBJECT     *RetDesc = NULL;
-    ACPI_STATUS             Status = AE_OK;
-    BOOLEAN                 Lboolean;
-
-
-    FUNCTION_TRACE_PTR ("ExDyadic2", WALK_OPERANDS);
-
-
-    /* Create the internal return object */
-
-    RetDesc = AcpiUtCreateInternalObject (ACPI_TYPE_INTEGER);
-    if (!RetDesc)
-    {
-        Status = AE_NO_MEMORY;
-        goto Cleanup;
-    }
-
-    /*
-     * Execute the WalkState->Opcode
-     */
-    Lboolean = FALSE;
-    switch (WalkState->Opcode)
-    {
-
-    case AML_LAND_OP:               /* LAnd (Operand1, Operand2) */
-
-        Lboolean = (BOOLEAN) (Operand[0]->Integer.Value &&
-                              Operand[1]->Integer.Value);
-        break;
-
-
-    case AML_LEQUAL_OP:             /* LEqual (Operand1, Operand2) */
-
-        Lboolean = (BOOLEAN) (Operand[0]->Integer.Value ==
-                              Operand[1]->Integer.Value);
-        break;
-
-
-    case AML_LGREATER_OP:           /* LGreater (Operand1, Operand2) */
-
-        Lboolean = (BOOLEAN) (Operand[0]->Integer.Value >
-                              Operand[1]->Integer.Value);
-        break;
-
-
-    case AML_LLESS_OP:              /* LLess (Operand1, Operand2) */
-
-        Lboolean = (BOOLEAN) (Operand[0]->Integer.Value <
-                              Operand[1]->Integer.Value);
-        break;
-
-
-    case AML_LOR_OP:                 /* LOr (Operand1, Operand2) */
-
-        Lboolean = (BOOLEAN) (Operand[0]->Integer.Value ||
-                              Operand[1]->Integer.Value);
-        break;
-
-
-    case AML_COPY_OP:               /* Copy (Source, Target) (ACPI 2.0) */
-
-        Status = AE_NOT_IMPLEMENTED;
-        goto Cleanup;
-        break;
-
-
-    default:
-
-        REPORT_ERROR (("AcpiExDyadic2: Unknown dyadic opcode %X\n", WalkState->Opcode));
-        Status = AE_AML_BAD_OPCODE;
-        goto Cleanup;
-        break;
-    }
-
-
-    /* Set return value to logical TRUE (all ones) or FALSE (zero) */
-
-    if (Lboolean)
-    {
-        RetDesc->Integer.Value = ACPI_INTEGER_MAX;
-    }
-    else
-    {
-        RetDesc->Integer.Value = 0;
-    }
-
-
-Cleanup:
-
-    /* Always delete operands */
-
-    AcpiUtRemoveReference (Operand[0]);
-    AcpiUtRemoveReference (Operand[1]);
-
-
-    /* Delete return object on error */
-
-    if (ACPI_FAILURE (Status) &&
-        (RetDesc))
-    {
-        AcpiUtRemoveReference (RetDesc);
-        RetDesc = NULL;
-    }
-
-
-    /* Set the return object and exit */
-
-    WalkState->ResultObj = RetDesc;
-    return_ACPI_STATUS (Status);
-}
-
-
diff --git a/sys/contrib/dev/acpica/exmonad.c b/sys/contrib/dev/acpica/exmonad.c
deleted file mode 100644
index 3e6a969..0000000
--- a/sys/contrib/dev/acpica/exmonad.c
+++ /dev/null
@@ -1,1083 +0,0 @@
-
-/******************************************************************************
- *
- * Module Name: exmonad - ACPI AML execution for monadic (1 operand) operators
- *              $Revision: 113 $
- *
- *****************************************************************************/
-
-/******************************************************************************
- *
- * 1. Copyright Notice
- *
- * Some or all of this work - Copyright (c) 1999, 2000, 2001, 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 __EXMONAD_C__
-
-#include "acpi.h"
-#include "acparser.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-
-
-#define _COMPONENT          ACPI_EXECUTER
-        MODULE_NAME         ("exmonad")
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiExGetObjectReference
- *
- * PARAMETERS:  ObjDesc         - Create a reference to this object
- *              RetDesc         - Where to store the reference
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Obtain and return a "reference" to the target object
- *              Common code for the RefOfOp and the CondRefOfOp.
- *
- ******************************************************************************/
-
-static ACPI_STATUS
-AcpiExGetObjectReference (
-    ACPI_OPERAND_OBJECT     *ObjDesc,
-    ACPI_OPERAND_OBJECT     **RetDesc,
-    ACPI_WALK_STATE         *WalkState)
-{
-    ACPI_STATUS             Status = AE_OK;
-
-
-    FUNCTION_TRACE_PTR ("ExGetObjectReference", ObjDesc);
-
-
-    if (VALID_DESCRIPTOR_TYPE (ObjDesc, ACPI_DESC_TYPE_INTERNAL))
-    {
-        if (ObjDesc->Common.Type != INTERNAL_TYPE_REFERENCE)
-        {
-            *RetDesc = NULL;
-            Status = AE_TYPE;
-            goto Cleanup;
-        }
-
-        /*
-         * Not a Name -- an indirect name pointer would have
-         * been converted to a direct name pointer in AcpiExResolveOperands
-         */
-        switch (ObjDesc->Reference.Opcode)
-        {
-        case AML_LOCAL_OP:
-        case AML_ARG_OP:
-
-            *RetDesc = (void *) AcpiDsMethodDataGetNode (ObjDesc->Reference.Opcode,
-                                        ObjDesc->Reference.Offset, WalkState);
-            break;
-
-        default:
-
-            ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "(Internal) Unknown Ref subtype %02x\n",
-                ObjDesc->Reference.Opcode));
-            *RetDesc = NULL;
-            Status = AE_AML_INTERNAL;
-            goto Cleanup;
-        }
-
-    }
-
-    else if (VALID_DESCRIPTOR_TYPE (ObjDesc, ACPI_DESC_TYPE_NAMED))
-    {
-        /* Must be a named object;  Just return the Node */
-
-        *RetDesc = ObjDesc;
-    }
-
-    else
-    {
-        *RetDesc = NULL;
-        Status = AE_TYPE;
-    }
-
-
-Cleanup:
-
-    ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Obj=%p Ref=%p\n", ObjDesc, *RetDesc));
-    return_ACPI_STATUS (Status);
-}
-
-#define ObjDesc             Operand[0]
-#define ResDesc             Operand[1]
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiExMonadic1
- *
- * PARAMETERS:  WalkState           - Current state (contains AML opcode)
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Execute Type 1 monadic operator with numeric operand on
- *              object stack
- *
- ******************************************************************************/
-
-ACPI_STATUS
-AcpiExMonadic1 (
-    ACPI_WALK_STATE         *WalkState)
-{
-    ACPI_OPERAND_OBJECT     **Operand = &WalkState->Operands[0];
-    ACPI_STATUS             Status;
-
-
-    FUNCTION_TRACE_PTR ("ExMonadic1", WALK_OPERANDS);
-
-
-    /* Examine the opcode */
-
-    switch (WalkState->Opcode)  
-    {
-    case AML_RELEASE_OP:    /*  Release (MutexObject) */
-
-        Status = AcpiExReleaseMutex (ObjDesc, WalkState);
-        break;
-
-
-    case AML_RESET_OP:      /*  Reset (EventObject) */
-
-        Status = AcpiExSystemResetEvent (ObjDesc);
-        break;
-
-
-    case AML_SIGNAL_OP:     /*  Signal (EventObject) */
-
-        Status = AcpiExSystemSignalEvent (ObjDesc);
-        break;
-
-
-    case AML_SLEEP_OP:      /*  Sleep (MsecTime) */
-
-        AcpiExSystemDoSuspend ((UINT32) ObjDesc->Integer.Value);
-        break;
-
-
-    case AML_STALL_OP:      /*  Stall (UsecTime) */
-
-        AcpiExSystemDoStall ((UINT32) ObjDesc->Integer.Value);
-        break;
-
-
-    default:                /*  Unknown opcode  */
-
-        REPORT_ERROR (("AcpiExMonadic1: Unknown monadic opcode %X\n",
-            WalkState->Opcode));
-        Status = AE_AML_BAD_OPCODE;
-        break;
-    }
-
-
-    /* Always delete the operand */
-
-    AcpiUtRemoveReference (ObjDesc);
-
-    return_ACPI_STATUS (AE_OK);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiExMonadic2R
- *
- * PARAMETERS:  WalkState           - Current state (contains AML opcode)
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Execute Type 2 monadic operator with numeric operand and
- *              result operand on operand stack
- *
- ******************************************************************************/
-
-ACPI_STATUS
-AcpiExMonadic2R (
-    ACPI_WALK_STATE         *WalkState)
-{
-    ACPI_STATUS             Status = AE_OK;
-    ACPI_OPERAND_OBJECT     **Operand = &WalkState->Operands[0];
-    ACPI_OPERAND_OBJECT     *RetDesc = NULL;
-    ACPI_OPERAND_OBJECT     *RetDesc2 = NULL;
-    UINT32                  Temp32;
-    UINT32                  i;
-    UINT32                  j;
-    ACPI_INTEGER            Digit;
-
-
-    FUNCTION_TRACE_PTR ("ExMonadic2R", WALK_OPERANDS);
-
-
-
-
-    /* Create a return object of type NUMBER for most opcodes */
-
-    switch (WalkState->Opcode)
-    {
-    case AML_BIT_NOT_OP:
-    case AML_FIND_SET_LEFT_BIT_OP:
-    case AML_FIND_SET_RIGHT_BIT_OP:
-    case AML_FROM_BCD_OP:
-    case AML_TO_BCD_OP:
-    case AML_COND_REF_OF_OP:
-
-        RetDesc = AcpiUtCreateInternalObject (ACPI_TYPE_INTEGER);
-        if (!RetDesc)
-        {
-            Status = AE_NO_MEMORY;
-            goto Cleanup;
-        }
-
-        break;
-    }
-
-
-    switch (WalkState->Opcode)
-    {
-
-    case AML_BIT_NOT_OP:            /* Not (Operand, Result)  */
-
-        RetDesc->Integer.Value = ~ObjDesc->Integer.Value;
-        break;
-
-
-    case AML_FIND_SET_LEFT_BIT_OP:  /* FindSetLeftBit (Operand, Result) */
-
-
-        RetDesc->Integer.Value = ObjDesc->Integer.Value;
-
-        /*
-         * Acpi specification describes Integer type as a little
-         * endian unsigned value, so this boundary condition is valid.
-         */
-        for (Temp32 = 0; RetDesc->Integer.Value && Temp32 < ACPI_INTEGER_BIT_SIZE; ++Temp32)
-        {
-            RetDesc->Integer.Value >>= 1;
-        }
-
-        RetDesc->Integer.Value = Temp32;
-        break;
-
-
-    case AML_FIND_SET_RIGHT_BIT_OP: /* FindSetRightBit (Operand, Result)  */
-
-
-        RetDesc->Integer.Value = ObjDesc->Integer.Value;
-
-        /*
-         * The Acpi specification describes Integer type as a little
-         * endian unsigned value, so this boundary condition is valid.
-         */
-        for (Temp32 = 0; RetDesc->Integer.Value && Temp32 < ACPI_INTEGER_BIT_SIZE; ++Temp32)
-        {
-            RetDesc->Integer.Value <<= 1;
-        }
-
-        /* Since returns must be 1-based, subtract from 33 (65) */
-
-        RetDesc->Integer.Value = Temp32 == 0 ? 0 : (ACPI_INTEGER_BIT_SIZE + 1) - Temp32;
-        break;
-
-
-    case AML_FROM_BCD_OP:           /* FromBcd (BCDValue, Result)  */
-
-        /*
-         * The 64-bit ACPI integer can hold 16 4-bit BCD integers
-         */
-        RetDesc->Integer.Value = 0;
-        for (i = 0; i < ACPI_MAX_BCD_DIGITS; i++)
-        {
-            /* Get one BCD digit */
-
-            Digit = (ACPI_INTEGER) ((ObjDesc->Integer.Value >> (i * 4)) & 0xF);
-
-            /* Check the range of the digit */
-
-            if (Digit > 9)
-            {
-                ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "BCD digit too large: \n",
-                    Digit));
-                Status = AE_AML_NUMERIC_OVERFLOW;
-                goto Cleanup;
-            }
-
-            if (Digit > 0)
-            {
-                /* Sum into the result with the appropriate power of 10 */
-
-                for (j = 0; j < i; j++)
-                {
-                    Digit *= 10;
-                }
-
-                RetDesc->Integer.Value += Digit;
-            }
-        }
-        break;
-
-
-    case AML_TO_BCD_OP:             /* ToBcd (Operand, Result)  */
-
-        if (ObjDesc->Integer.Value > ACPI_MAX_BCD_VALUE)
-        {
-            ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "BCD overflow: %d\n",
-                ObjDesc->Integer.Value));
-            Status = AE_AML_NUMERIC_OVERFLOW;
-            goto Cleanup;
-        }
-
-        RetDesc->Integer.Value = 0;
-        for (i = 0; i < ACPI_MAX_BCD_DIGITS; i++)
-        {
-            /* Divide by nth factor of 10 */
-
-            Temp32 = 0;
-            Digit = ObjDesc->Integer.Value;
-            for (j = 0; j < i; j++)
-            {
-                AcpiUtShortDivide (&Digit, 10, &Digit, &Temp32);
-            }
-
-            /* Create the BCD digit from the remainder above */
-
-            if (Digit > 0)
-            {
-                RetDesc->Integer.Value += (Temp32 << (i * 4));
-            }
-        }
-        break;
-
-
-    case AML_COND_REF_OF_OP:        /* CondRefOf (SourceObject, Result)  */
-
-        /*
-         * This op is a little strange because the internal return value is
-         * different than the return value stored in the result descriptor
-         * (There are really two return values)
-         */
-        if ((ACPI_NAMESPACE_NODE *) ObjDesc == AcpiGbl_RootNode)
-        {
-            /*
-             * This means that the object does not exist in the namespace,
-             * return FALSE
-             */
-            RetDesc->Integer.Value = 0;
-
-            /*
-             * Must delete the result descriptor since there is no reference
-             * being returned
-             */
-            AcpiUtRemoveReference (ResDesc);
-            goto Cleanup;
-        }
-
-        /* Get the object reference and store it */
-
-        Status = AcpiExGetObjectReference (ObjDesc, &RetDesc2, WalkState);
-        if (ACPI_FAILURE (Status))
-        {
-            goto Cleanup;
-        }
-
-        Status = AcpiExStore (RetDesc2, ResDesc, WalkState);
-
-        /* The object exists in the namespace, return TRUE */
-
-        RetDesc->Integer.Value = ACPI_INTEGER_MAX;
-        goto Cleanup;
-        break;
-
-
-    case AML_STORE_OP:              /* Store (Source, Target) */
-
-        /*
-         * A store operand is typically a number, string, buffer or lvalue
-         * Be careful about deleting the source object,
-         * since the object itself may have been stored.
-         */
-        Temp32 = ObjDesc->Common.ReferenceCount;
-        Status = AcpiExStore (ObjDesc, ResDesc, WalkState);
-        if (ACPI_FAILURE (Status))
-        {
-            /* On failure, just delete the ObjDesc */
-
-            AcpiUtRemoveReference (ObjDesc);
-            return_ACPI_STATUS (Status);
-        }
-
-#if 0
-        if ((ObjDesc->Common.ReferenceCount > Temp32) &&
-            (!AcpiDsIsResultUsed (WalkState->Op, WalkState)))
-        {
-            ObjDesc->Common.ReferenceCount++;
-        }
-#endif
-
-        /*
-         * Normally, we would remove a reference on the ObjDesc parameter;
-         * But since it is being used as the internal return object
-         * (meaning we would normally increment it), the two cancel out,
-         * and we simply don't do anything.
-         */
-        WalkState->ResultObj = ObjDesc;
-        return_ACPI_STATUS (Status);
-        break;
-
-
-    /*
-     * ACPI 2.0 Opcodes
-     */
-    case AML_TO_DECSTRING_OP:       /* ToDecimalString (Data, Result) */
-
-        Status = AcpiExConvertToString (ObjDesc, &RetDesc, 10, ACPI_UINT32_MAX, WalkState);
-        break;
-
-
-    case AML_TO_HEXSTRING_OP:       /* ToHexString (Data, Result) */
-
-        Status = AcpiExConvertToString (ObjDesc, &RetDesc, 16, ACPI_UINT32_MAX, WalkState);
-        break;
-
-
-    case AML_TO_BUFFER_OP:          /* ToBuffer (Data, Result) */
-
-        Status = AcpiExConvertToBuffer (ObjDesc, &RetDesc, WalkState);
-        break;
-
-
-    case AML_TO_INTEGER_OP:         /* ToInteger (Data, Result) */
-
-        Status = AcpiExConvertToInteger (ObjDesc, &RetDesc, WalkState);
-        break;
-
-
-    /*
-     * These are two obsolete opcodes
-     */
-    case AML_SHIFT_LEFT_BIT_OP:     /*  ShiftLeftBit (Source, BitNum)  */
-    case AML_SHIFT_RIGHT_BIT_OP:    /*  ShiftRightBit (Source, BitNum) */
-
-
-        ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "%s is unimplemented\n",
-                        AcpiPsGetOpcodeName (WalkState->Opcode)));
-        Status = AE_SUPPORT;
-        goto Cleanup;
-        break;
-
-
-    default:                        /* Unknown opcode */
-
-        REPORT_ERROR (("AcpiExMonadic2R: Unknown monadic opcode %X\n",
-            WalkState->Opcode));
-        Status = AE_AML_BAD_OPCODE;
-        goto Cleanup;
-    }
-
-
-    /*
-     * Store the return value computed above into the result object 
-     */
-    Status = AcpiExStore (RetDesc, ResDesc, WalkState);
-
-
-Cleanup:
-    /* Always delete the operand object */
-
-    AcpiUtRemoveReference (ObjDesc);
-
-    /* Delete return object(s) on error */
-
-    if (ACPI_FAILURE (Status))
-    {
-        AcpiUtRemoveReference (ResDesc);     /* Result descriptor */
-        if (RetDesc)
-        {
-            AcpiUtRemoveReference (RetDesc);
-            RetDesc = NULL;
-        }
-    }
-
-    /* Set the return object and exit */
-
-    WalkState->ResultObj = RetDesc;
-    return_ACPI_STATUS (Status);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiExMonadic2
- *
- * PARAMETERS:  WalkState           - Current state (contains AML opcode)
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Execute Type 2 monadic operator with numeric operand:
- *              DerefOfOp, RefOfOp, SizeOfOp, TypeOp, IncrementOp,
- *              DecrementOp, LNotOp,
- *
- ******************************************************************************/
-
-ACPI_STATUS
-AcpiExMonadic2 (
-    ACPI_WALK_STATE         *WalkState)
-{
-    ACPI_OPERAND_OBJECT     **Operand = &WalkState->Operands[0];
-    ACPI_OPERAND_OBJECT     *TmpDesc;
-    ACPI_OPERAND_OBJECT     *RetDesc = NULL;
-    ACPI_STATUS             Status = AE_OK;
-    UINT32                  Type;
-    ACPI_INTEGER            Value;
-
-
-    FUNCTION_TRACE_PTR ("ExMonadic2", WALK_OPERANDS);
-
-
-
-
-    /* Get the operand and decode the opcode */
-
-    switch (WalkState->Opcode)
-    {
-
-    case AML_LNOT_OP:               /* LNot (Operand) */
-
-        RetDesc = AcpiUtCreateInternalObject (ACPI_TYPE_INTEGER);
-        if (!RetDesc)
-        {
-            Status = AE_NO_MEMORY;
-            goto Cleanup;
-        }
-
-        RetDesc->Integer.Value = !ObjDesc->Integer.Value;
-        break;
-
-
-    case AML_DECREMENT_OP:          /* Decrement (Operand)  */
-    case AML_INCREMENT_OP:          /* Increment (Operand)  */
-
-        /*
-         * Since we are expecting an Reference on the top of the stack, it
-         * can be either an Node or an internal object.
-         *
-         * TBD: [Future] This may be the prototype code for all cases where
-         * a Reference is expected!! 10/99
-         */
-        if (VALID_DESCRIPTOR_TYPE (ObjDesc, ACPI_DESC_TYPE_NAMED))
-        {
-            RetDesc = ObjDesc;
-        }
-
-        else
-        {
-            /*
-             * Duplicate the Reference in a new object so that we can resolve it
-             * without destroying the original Reference object
-             */
-            RetDesc = AcpiUtCreateInternalObject (INTERNAL_TYPE_REFERENCE);
-            if (!RetDesc)
-            {
-                Status = AE_NO_MEMORY;
-                goto Cleanup;
-            }
-
-            RetDesc->Reference.Opcode = ObjDesc->Reference.Opcode;
-            RetDesc->Reference.Offset = ObjDesc->Reference.Offset;
-            RetDesc->Reference.Object = ObjDesc->Reference.Object;
-        }
-
-
-        /*
-         * Convert the RetDesc Reference to a Number
-         * (This deletes the original RetDesc object)
-         */
-        Status = AcpiExResolveOperands (AML_LNOT_OP, &RetDesc, WalkState);
-        if (ACPI_FAILURE (Status))
-        {
-            ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "%s: bad operand(s) %s\n",
-                AcpiPsGetOpcodeName (WalkState->Opcode), AcpiFormatException(Status)));
-
-            goto Cleanup;
-        }
-
-        /* Do the actual increment or decrement */
-
-        if (AML_INCREMENT_OP == WalkState->Opcode)
-        {
-            RetDesc->Integer.Value++;
-        }
-        else
-        {
-            RetDesc->Integer.Value--;
-        }
-
-        /* Store the result back in the original descriptor */
-
-        Status = AcpiExStore (RetDesc, ObjDesc, WalkState);
-
-        /* Objdesc was just deleted (because it is an Reference) */
-
-        ObjDesc = NULL;
-
-        break;
-
-
-    case AML_TYPE_OP:               /* ObjectType (SourceObject) */
-
-        if (INTERNAL_TYPE_REFERENCE == ObjDesc->Common.Type)
-        {
-            /*
-             * Not a Name -- an indirect name pointer would have
-             * been converted to a direct name pointer in ResolveOperands
-             */
-            switch (ObjDesc->Reference.Opcode)
-            {
-            case AML_ZERO_OP:
-            case AML_ONE_OP:
-            case AML_ONES_OP:
-            case AML_REVISION_OP:
-
-                /* Constants are of type Number */
-
-                Type = ACPI_TYPE_INTEGER;
-                break;
-
-
-            case AML_DEBUG_OP:
-
-                /* Per 1.0b spec, Debug object is of type "DebugObject" */
-
-                Type = ACPI_TYPE_DEBUG_OBJECT;
-                break;
-
-
-            case AML_INDEX_OP:
-
-                /* Get the type of this reference (index into another object) */
-
-                Type = ObjDesc->Reference.TargetType;
-                if (Type == ACPI_TYPE_PACKAGE)
-                {
-                    /*
-                     * The main object is a package, we want to get the type
-                     * of the individual package element that is referenced by
-                     * the index.
-                     */
-                    Type = (*(ObjDesc->Reference.Where))->Common.Type;
-                }
-
-                break;
-
-
-            case AML_LOCAL_OP:
-            case AML_ARG_OP:
-
-                Type = AcpiDsMethodDataGetType (ObjDesc->Reference.Opcode,
-                                ObjDesc->Reference.Offset, WalkState);
-                break;
-
-
-            default:
-
-                REPORT_ERROR (("AcpiExMonadic2/TypeOp: Internal error - Unknown Reference subtype %X\n",
-                    ObjDesc->Reference.Opcode));
-                Status = AE_AML_INTERNAL;
-                goto Cleanup;
-            }
-        }
-
-        else
-        {
-            /*
-             * It's not a Reference, so it must be a direct name pointer.
-             */
-            Type = AcpiNsGetType ((ACPI_NAMESPACE_NODE *) ObjDesc);
-
-            /* Convert internal types to external types */
-
-            switch (Type)
-            {
-            case INTERNAL_TYPE_REGION_FIELD:
-            case INTERNAL_TYPE_BANK_FIELD:
-            case INTERNAL_TYPE_INDEX_FIELD:
-
-                Type = ACPI_TYPE_FIELD_UNIT;
-            }
-
-        }
-
-        /* Allocate a descriptor to hold the type. */
-
-        RetDesc = AcpiUtCreateInternalObject (ACPI_TYPE_INTEGER);
-        if (!RetDesc)
-        {
-            Status = AE_NO_MEMORY;
-            goto Cleanup;
-        }
-
-        RetDesc->Integer.Value = Type;
-        break;
-
-
-    case AML_SIZE_OF_OP:            /* SizeOf (SourceObject)  */
-
-        if (VALID_DESCRIPTOR_TYPE (ObjDesc, ACPI_DESC_TYPE_NAMED))
-        {
-            ObjDesc = AcpiNsGetAttachedObject ((ACPI_NAMESPACE_NODE *) ObjDesc);
-        }
-
-        if (!ObjDesc)
-        {
-            Value = 0;
-        }
-
-        else
-        {
-            switch (ObjDesc->Common.Type)
-            {
-
-            case ACPI_TYPE_BUFFER:
-
-                Value = ObjDesc->Buffer.Length;
-                break;
-
-
-            case ACPI_TYPE_STRING:
-
-                Value = ObjDesc->String.Length;
-                break;
-
-
-            case ACPI_TYPE_PACKAGE:
-
-                Value = ObjDesc->Package.Count;
-                break;
-
-            case INTERNAL_TYPE_REFERENCE:
-
-                Value = 4;
-                break;
-
-            default:
-
-                ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Not Buf/Str/Pkg - found type %X\n",
-                    ObjDesc->Common.Type));
-                Status = AE_AML_OPERAND_TYPE;
-                goto Cleanup;
-            }
-        }
-
-        /*
-         * Now that we have the size of the object, create a result
-         * object to hold the value
-         */
-        RetDesc = AcpiUtCreateInternalObject (ACPI_TYPE_INTEGER);
-        if (!RetDesc)
-        {
-            Status = AE_NO_MEMORY;
-            goto Cleanup;
-        }
-
-        RetDesc->Integer.Value = Value;
-        break;
-
-
-    case AML_REF_OF_OP:             /* RefOf (SourceObject) */
-
-        Status = AcpiExGetObjectReference (ObjDesc, &RetDesc, WalkState);
-        if (ACPI_FAILURE (Status))
-        {
-            goto Cleanup;
-        }
-        break;
-
-
-    case AML_DEREF_OF_OP:           /* DerefOf (ObjReference) */
-
-        /* Check for a method local or argument */
-
-        if (!VALID_DESCRIPTOR_TYPE (ObjDesc, ACPI_DESC_TYPE_NAMED))
-        {
-            /*
-             * Must resolve/dereference the local/arg reference first
-             */
-            switch (ObjDesc->Reference.Opcode)
-            {
-            /* Set ObjDesc to the value of the local/arg */
-
-            case AML_LOCAL_OP:
-            case AML_ARG_OP:
-
-                AcpiDsMethodDataGetValue (ObjDesc->Reference.Opcode,
-                        ObjDesc->Reference.Offset, WalkState, &TmpDesc);
-
-                /*
-                 * Delete our reference to the input object and
-                 * point to the object just retrieved
-                 */
-                AcpiUtRemoveReference (ObjDesc);
-                ObjDesc = TmpDesc;
-                break;
-
-            default:
-
-                /* Index op - handled below */
-                break;
-            }
-        }
-
-
-        /* ObjDesc may have changed from the code above */
-
-        if (VALID_DESCRIPTOR_TYPE (ObjDesc, ACPI_DESC_TYPE_NAMED))
-        {
-            /* Get the actual object from the Node (This is the dereference) */
-
-            RetDesc = ((ACPI_NAMESPACE_NODE *) ObjDesc)->Object;
-
-            /* Returning a pointer to the object, add another reference! */
-
-            AcpiUtAddReference (RetDesc);
-        }
-
-        else
-        {
-            /*
-             * This must be a reference object produced by the Index
-             * ASL operation -- check internal opcode
-             */
-            if ((ObjDesc->Reference.Opcode != AML_INDEX_OP) &&
-                (ObjDesc->Reference.Opcode != AML_REF_OF_OP))
-            {
-                ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Unknown opcode in ref(%p) - %X\n",
-                    ObjDesc, ObjDesc->Reference.Opcode));
-
-                Status = AE_TYPE;
-                goto Cleanup;
-            }
-
-
-            switch (ObjDesc->Reference.Opcode)
-            {
-            case AML_INDEX_OP:
-
-                /*
-                 * Supported target types for the Index operator are
-                 * 1) A Buffer
-                 * 2) A Package
-                 */
-                if (ObjDesc->Reference.TargetType == ACPI_TYPE_BUFFER_FIELD)
-                {
-                    /*
-                     * The target is a buffer, we must create a new object that
-                     * contains one element of the buffer, the element pointed
-                     * to by the index.
-                     *
-                     * NOTE: index into a buffer is NOT a pointer to a
-                     * sub-buffer of the main buffer, it is only a pointer to a
-                     * single element (byte) of the buffer!
-                     */
-                    RetDesc = AcpiUtCreateInternalObject (ACPI_TYPE_INTEGER);
-                    if (!RetDesc)
-                    {
-                        Status = AE_NO_MEMORY;
-                        goto Cleanup;
-                    }
-
-                    TmpDesc = ObjDesc->Reference.Object;
-                    RetDesc->Integer.Value =
-                        TmpDesc->Buffer.Pointer[ObjDesc->Reference.Offset];
-
-                    /* TBD: [Investigate] (see below) Don't add an additional
-                     * ref!
-                     */
-                }
-
-                else if (ObjDesc->Reference.TargetType == ACPI_TYPE_PACKAGE)
-                {
-                    /*
-                     * The target is a package, we want to return the referenced
-                     * element of the package.  We must add another reference to
-                     * this object, however.
-                     */
-                    RetDesc = *(ObjDesc->Reference.Where);
-                    if (!RetDesc)
-                    {
-                        /*
-                         * We can't return a NULL dereferenced value.  This is
-                         * an uninitialized package element and is thus a
-                         * severe error.
-                         */
-
-                        ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "NULL package element obj %p\n",
-                            ObjDesc));
-                        Status = AE_AML_UNINITIALIZED_ELEMENT;
-                        goto Cleanup;
-                    }
-
-                    AcpiUtAddReference (RetDesc);
-                }
-
-                else
-                {
-                    ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Unknown TargetType %X in obj %p\n",
-                        ObjDesc->Reference.TargetType, ObjDesc));
-                    Status = AE_AML_OPERAND_TYPE;
-                    goto Cleanup;
-                }
-
-                break;
-
-
-            case AML_REF_OF_OP:
-
-                RetDesc = ObjDesc->Reference.Object;
-
-                /* Add another reference to the object! */
-
-                AcpiUtAddReference (RetDesc);
-                break;
-            }
-        }
-
-        break;
-
-
-    default:
-
-        REPORT_ERROR (("AcpiExMonadic2: Unknown monadic opcode %X\n",
-            WalkState->Opcode));
-        Status = AE_AML_BAD_OPCODE;
-        goto Cleanup;
-    }
-
-
-Cleanup:
-
-    if (ObjDesc)
-    {
-        AcpiUtRemoveReference (ObjDesc);
-    }
-
-    /* Delete return object on error */
-
-    if (ACPI_FAILURE (Status) &&
-        (RetDesc))
-    {
-        AcpiUtRemoveReference (RetDesc);
-        RetDesc = NULL;
-    }
-
-    WalkState->ResultObj = RetDesc;
-    return_ACPI_STATUS (Status);
-}
-
diff --git a/sys/contrib/dev/acpica/psfind.c b/sys/contrib/dev/acpica/psfind.c
deleted file mode 100644
index 6862843..0000000
--- a/sys/contrib/dev/acpica/psfind.c
+++ /dev/null
@@ -1,485 +0,0 @@
-
-/******************************************************************************
- *
- * Module Name: psfind - Parse tree search routine
- *              $Revision: 42 $
- *
- *****************************************************************************/
-
-/******************************************************************************
- *
- * 1. Copyright Notice
- *
- * Some or all of this work - Copyright (c) 1999 - 2002, 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 __PSFIND_C__
-
-#include "acpi.h"
-#include "acparser.h"
-#include "amlcode.h"
-
-#define _COMPONENT          ACPI_PARSER
-        ACPI_MODULE_NAME    ("psfind")
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiPsGetParent
- *
- * PARAMETERS:  Op              - Get the parent of this Op
- *
- * RETURN:      The Parent op.
- *
- * DESCRIPTION: Get op's parent
- *
- ******************************************************************************/
-
-ACPI_PARSE_OBJECT*
-AcpiPsGetParent (
-    ACPI_PARSE_OBJECT       *Op)
-{
-    ACPI_PARSE_OBJECT       *Parent = Op;
-
-
-    /* Traverse the tree upward (to root if necessary) */
-
-    while (Parent)
-    {
-        switch (Parent->Common.AmlOpcode)
-        {
-        case AML_SCOPE_OP:
-        case AML_PACKAGE_OP:
-        case AML_METHOD_OP:
-        case AML_DEVICE_OP:
-        case AML_POWER_RES_OP:
-        case AML_THERMAL_ZONE_OP:
-
-            return (Parent->Common.Parent);
-
-        default:
-            break;
-        }
-
-        Parent = Parent->Common.Parent;
-    }
-
-    return (Parent);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiPsFindName
- *
- * PARAMETERS:  Scope           - Scope to search
- *              Name            - ACPI name to search for
- *              Opcode          - Opcode to search for
- *
- * RETURN:      Op containing the name
- *
- * DESCRIPTION: Find name segment from a list of acpi_ops.  Searches a single
- *              scope, no more.
- *
- ******************************************************************************/
-
-ACPI_PARSE_OBJECT *
-AcpiPsFindName (
-    ACPI_PARSE_OBJECT       *Scope,
-    UINT32                  Name,
-    UINT32                  Opcode)
-{
-    ACPI_PARSE_OBJECT       *Op;
-    ACPI_PARSE_OBJECT       *Field;
-    const ACPI_OPCODE_INFO  *OpInfo;
-
-
-    /* search scope level for matching name segment */
-
-    Op = AcpiPsGetChild (Scope);
-
-    while (Op)
-    {
-        OpInfo = AcpiPsGetOpcodeInfo (Op->Common.AmlOpcode);
-
-        /* Check AML_CREATE first (since some opcodes have AML_FIELD set also )*/
-
-        if (OpInfo->Flags & AML_CREATE)
-        {
-            if (Op->Common.AmlOpcode == AML_CREATE_FIELD_OP)
-            {
-                Field = AcpiPsGetArg (Op, 3);
-            }
-            else
-            {
-                /* CreateXXXField, check name */
-
-                Field = AcpiPsGetArg (Op, 2);
-            }
-
-            if ((Field) &&
-                (Field->Common.Value.String) &&
-                (!ACPI_STRNCMP (Field->Common.Value.String, (char *) &Name, ACPI_NAME_SIZE)))
-            {
-                return (Op);
-            }
-        }
-        else if (OpInfo->Flags & AML_FIELD)
-        {
-            /* Field, search named fields */
-
-            Field = AcpiPsGetChild (Op);
-            while (Field)
-            {
-                OpInfo = AcpiPsGetOpcodeInfo (Field->Common.AmlOpcode);
-
-                if ((OpInfo->Flags & AML_NAMED) &&
-                   AcpiPsGetName (Field) == Name &&
-                   (!Opcode || Field->Common.AmlOpcode == Opcode))
-                {
-                    return (Field);
-                }
-
-                Field = Field->Common.Next;
-            }
-        }
-        else if ((OpInfo->Flags & AML_NAMED) &&
-                 (AcpiPsGetName (Op) == Name) &&
-                 (!Opcode || Op->Common.AmlOpcode == Opcode || Opcode == AML_SCOPE_OP))
-        {
-            break;
-        }
-
-        Op = Op->Common.Next;
-    }
-
-    return (Op);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiPsFind
- *
- * PARAMETERS:  Scope           - Where to begin the search
- *              Path            - ACPI Path to the named object
- *              Opcode          - Opcode associated with the object
- *              Create          - if TRUE, create the object if not found.
- *
- * RETURN:      Op if found, NULL otherwise.
- *
- * DESCRIPTION: Find object within scope
- *
- ******************************************************************************/
-
-ACPI_PARSE_OBJECT*
-AcpiPsFind (
-    ACPI_PARSE_OBJECT       *Scope,
-    NATIVE_CHAR             *Path,
-    UINT16                  Opcode,
-    UINT32                  Create)
-{
-    UINT32                  SegCount;
-    UINT32                  Name;
-    UINT32                  NameOp;
-    ACPI_PARSE_OBJECT       *Op = NULL;
-    BOOLEAN                 Unprefixed = TRUE;
-
-
-    ACPI_FUNCTION_TRACE_PTR ("PsFind", Scope);
-
-
-    if (!Scope || !Path)
-    {
-        ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "Null path (%p) or scope (%p)!\n",
-            Path, Scope));
-        return_PTR (NULL);
-    }
-
-    AcpiGbl_PsFindCount++;
-
-#if 0 
-    if ((Create) && (Opcode == AML_SCOPE_OP))
-    {
-        Op = AcpiPsAllocOp (AML_SCOPE_OP);
-        if (Op)
-        {
-            AcpiPsSetName (Op, 'XXXX');
-            AcpiPsAppendArg (Scope, Op);
-        }
-/*        return_PTR (Op);*/
-    }
-#endif
-
-    /* Handle all prefixes in the name path */
-
-    while (AcpiPsIsPrefixChar (ACPI_GET8 (Path)))
-    {
-        switch (ACPI_GET8 (Path))
-        {
-        case '\\':
-
-            /* Could just use a global for "root scope" here */
-
-            while (Scope->Common.Parent)
-            {
-                Scope = Scope->Common.Parent;
-            }
-            break;
-
-
-        case '^':
-
-            /* Go up to the next valid scoping Op (method, scope, etc.) */
-
-            if (AcpiPsGetParent (Scope))
-            {
-                Scope = AcpiPsGetParent (Scope);
-            }
-            break;
-
-        default:
-            /* Should not get here */
-            break;
-        }
-
-        Unprefixed = FALSE;
-        Path++;
-    }
-
-
-    /* get name segment count */
-
-    switch (ACPI_GET8 (Path))
-    {
-    case 0:
-        SegCount = 0;
-
-        /* Null name case */
-
-        if (Unprefixed)
-        {
-            Op = NULL;
-        }
-        else
-        {
-            Op = Scope;
-        }
-
-
-        ACPI_DEBUG_PRINT ((ACPI_DB_PARSE,
-            "Null path, returning current root scope Op=%p\n", Op));
-        return_PTR (Op);
-
-    case AML_DUAL_NAME_PREFIX:
-        SegCount = 2;
-        Path++;
-        break;
-
-    case AML_MULTI_NAME_PREFIX_OP:
-        SegCount = ACPI_GET8 (Path + 1);
-        Path += 2;
-        break;
-
-    default:
-        SegCount = 1;
-        break;
-    }
-
-    ACPI_DEBUG_PRINT ((ACPI_DB_PARSE,
-        "Search scope %p Segs=%d Opcode=%4.4hX Create=%d\n",
-        Scope, SegCount, Opcode, Create));
-
-
-    /* match each name segment */
-
-    while (Scope && SegCount)
-    {
-        ACPI_MOVE_UNALIGNED32_TO_32 (&Name, Path);
-        Path += 4;
-        SegCount --;
-
-        if (SegCount)
-        {
-            NameOp = 0;
-        }
-        else
-        {
-            NameOp = Opcode;
-        }
-
-        Op = AcpiPsFindName (Scope, Name, NameOp);
-        if (Op)
-        {
-            ACPI_DEBUG_PRINT ((ACPI_DB_PARSE,
-                "[%4.4s] Found! Op=%p Opcode=%4.4hX\n",
-                (char *) &Name, Op, Op->Common.AmlOpcode));
-        }
-
-        if (!Op)
-        {
-            if (Create)
-            {
-                /* Create a new Scope level */
-
-                if (SegCount)
-                {
-                    Op = AcpiPsAllocOp (AML_SCOPE_OP);
-                }
-                else
-                {
-                    Op = AcpiPsAllocOp (Opcode);
-                }
-
-                if (Op)
-                {
-                    AcpiPsSetName (Op, Name);
-                    AcpiPsAppendArg (Scope, Op);
-
-                    ACPI_DEBUG_PRINT ((ACPI_DB_PARSE,
-                        "[%4.4s] Not found, created Op=%p Opcode=%4.4hX\n",
-                        (char *) &Name, Op, Opcode));
-                }
-            }
-
-            else if (Unprefixed)
-            {
-                /* Search higher scopes for unprefixed name */
-
-                while (!Op && Scope->Common.Parent)
-                {
-                    Scope = Scope->Common.Parent;
-                    Op = AcpiPsFindName (Scope, Name, Opcode);
-                    if (Op)
-                    {
-                        ACPI_DEBUG_PRINT ((ACPI_DB_PARSE,
-                            "[%4.4s] Found in parent tree! Op=%p Opcode=%4.4hX\n",
-                            (char *) &Name, Op, Op->Common.AmlOpcode));
-                    }
-                    else
-                    {
-                        ACPI_DEBUG_PRINT ((ACPI_DB_PARSE,
-                            "[%4.4s] Not found in parent=%p\n",
-                            (char *) &Name, Scope));
-                    }
-                }
-            }
-            else
-            {
-                ACPI_DEBUG_PRINT ((ACPI_DB_PARSE,
-                    "Segment [%4.4s] Not Found in scope %p!\n",
-                    (char *) &Name, Scope));
-            }
-        }
-
-        Unprefixed = FALSE;
-        Scope = Op;
-    }
-
-    return_PTR (Op);
-}
-
-