mirror of
https://github.com/acpica/acpica/
synced 2024-12-25 20:06:53 +03:00
Add new host interfaces for _OSI support.
Adds install/remove interfaces so that the host can dynamically alter the global _OSI table. Also adds support for _OSI handlers. Additional support: new debugger command (osi), and test support in the acpiexec utility. Adds new file, utilities/utosi.c. Lin Ming, Bob Moore. ACPICA bugzilla 836.
This commit is contained in:
parent
a615f17bad
commit
8ad66eb93a
@ -157,6 +157,7 @@ OBJS = \
|
||||
utresrc.o \
|
||||
utstate.o \
|
||||
uttrack.o \
|
||||
utosi.o \
|
||||
utxface.o
|
||||
|
||||
|
||||
@ -596,6 +597,9 @@ utstate.o : $(ACPICA_CORE)/utilities/utstate.c
|
||||
uttrack.o : $(ACPICA_CORE)/utilities/uttrack.c
|
||||
$(COMPILE)
|
||||
|
||||
utosi.o : $(ACPICA_CORE)/utilities/utosi.c
|
||||
$(COMPILE)
|
||||
|
||||
utxface.o : $(ACPICA_CORE)/utilities/utxface.c
|
||||
$(COMPILE)
|
||||
|
||||
|
@ -173,6 +173,10 @@ SOURCE=..\..\source\components\utilities\utobject.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\source\components\utilities\utosi.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\source\components\utilities\utresrc.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
@ -164,6 +164,10 @@ SOURCE=..\..\source\components\utilities\utobject.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\source\components\utilities\utosi.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\source\components\utilities\utresrc.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
@ -510,6 +510,10 @@ InputName=utobject
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\source\components\utilities\utosi.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\source\components\utilities\utresrc.c
|
||||
|
||||
!IF "$(CFG)" == "AcpiSubsystem64 - Win32 Release"
|
||||
|
@ -282,6 +282,10 @@ SOURCE=..\..\source_linux\COMPONENTS\utilities\utobject.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\source_linux\components\utilities\utosi.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\source_linux\components\utilities\utresrc.c
|
||||
|
||||
!IF "$(CFG)" == "AcpiSubsystem_Linux - Win32 Release"
|
||||
@ -712,6 +716,10 @@ SOURCE=..\..\source_linux\components\namespace\nsrepair.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\source_linux\components\namespace\nsrepair2.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\source_linux\COMPONENTS\NAMESPACE\nssearch.c
|
||||
|
||||
!IF "$(CFG)" == "AcpiSubsystem_Linux - Win32 Release"
|
||||
@ -1962,9 +1970,5 @@ SOURCE=..\..\source\include\acnames.h
|
||||
|
||||
SOURCE=..\..\source\include\acopcode.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\source_linux\components\namespace\nsrepair2.c
|
||||
# End Source File
|
||||
# End Target
|
||||
# End Project
|
||||
|
@ -152,6 +152,7 @@ OBJS = \
|
||||
utresrc.o \
|
||||
utstate.o \
|
||||
uttrack.o \
|
||||
utosi.o \
|
||||
utxface.o
|
||||
|
||||
|
||||
@ -591,6 +592,9 @@ utstate.o : $(ACPICA_CORE)/utilities/utstate.c
|
||||
uttrack.o : $(ACPICA_CORE)/utilities/uttrack.c
|
||||
$(COMPILE)
|
||||
|
||||
utosi.o : $(ACPICA_CORE)/utilities/utosi.c
|
||||
$(COMPILE)
|
||||
|
||||
utxface.o : $(ACPICA_CORE)/utilities/utxface.c
|
||||
$(COMPILE)
|
||||
|
||||
|
@ -1330,6 +1330,98 @@ AcpiDbDisplayObjects (
|
||||
}
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: AcpiDbDisplayInterfaces
|
||||
*
|
||||
* PARAMETERS: ActionArg - Null, "install", or "remove"
|
||||
* InterfaceNameArg - Name for install/remove options
|
||||
*
|
||||
* RETURN: None
|
||||
*
|
||||
* DESCRIPTION: Display or modify the global _OSI interface list
|
||||
*
|
||||
******************************************************************************/
|
||||
|
||||
void
|
||||
AcpiDbDisplayInterfaces (
|
||||
char *ActionArg,
|
||||
char *InterfaceNameArg)
|
||||
{
|
||||
ACPI_INTERFACE_INFO *NextInterface;
|
||||
char *SubString;
|
||||
ACPI_STATUS Status;
|
||||
|
||||
|
||||
/* If no arguments, just display current interface list */
|
||||
|
||||
if (!ActionArg)
|
||||
{
|
||||
(void) AcpiOsAcquireMutex (AcpiGbl_OsiMutex,
|
||||
ACPI_WAIT_FOREVER);
|
||||
|
||||
NextInterface = AcpiGbl_SupportedInterfaces;
|
||||
|
||||
while (NextInterface)
|
||||
{
|
||||
if (!(NextInterface->Flags & ACPI_OSI_INVALID))
|
||||
{
|
||||
AcpiOsPrintf ("%s\n", NextInterface->Name);
|
||||
}
|
||||
NextInterface = NextInterface->Next;
|
||||
}
|
||||
|
||||
AcpiOsReleaseMutex (AcpiGbl_OsiMutex);
|
||||
return;
|
||||
}
|
||||
|
||||
/* If ActionArg exists, so must InterfaceNameArg */
|
||||
|
||||
if (!InterfaceNameArg)
|
||||
{
|
||||
AcpiOsPrintf ("Missing Interface Name argument\n");
|
||||
return;
|
||||
}
|
||||
|
||||
/* Uppercase the action for match below */
|
||||
|
||||
AcpiUtStrupr (ActionArg);
|
||||
|
||||
/* Install - install an interface */
|
||||
|
||||
SubString = ACPI_STRSTR ("INSTALL", ActionArg);
|
||||
if (SubString)
|
||||
{
|
||||
Status = AcpiInstallInterface (InterfaceNameArg);
|
||||
if (ACPI_FAILURE (Status))
|
||||
{
|
||||
AcpiOsPrintf ("%s, while installing \"%s\"\n",
|
||||
AcpiFormatException (Status), InterfaceNameArg);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
/* Remove - remove an interface */
|
||||
|
||||
SubString = ACPI_STRSTR ("REMOVE", ActionArg);
|
||||
if (SubString)
|
||||
{
|
||||
Status = AcpiRemoveInterface (InterfaceNameArg);
|
||||
if (ACPI_FAILURE (Status))
|
||||
{
|
||||
AcpiOsPrintf ("%s, while removing \"%s\"\n",
|
||||
AcpiFormatException (Status), InterfaceNameArg);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
/* Invalid ActionArg */
|
||||
|
||||
AcpiOsPrintf ("Invalid action argument: %s\n", ActionArg);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: AcpiDbWalkAndMatchName
|
||||
|
@ -194,6 +194,7 @@ enum AcpiExDebuggerCommands
|
||||
CMD_NOTIFY,
|
||||
CMD_OBJECT,
|
||||
CMD_OPEN,
|
||||
CMD_OSI,
|
||||
CMD_OWNER,
|
||||
CMD_PREDEFINED,
|
||||
CMD_PREFIX,
|
||||
@ -260,6 +261,7 @@ static const COMMAND_INFO AcpiGbl_DbCommands[] =
|
||||
{"NOTIFY", 2},
|
||||
{"OBJECT", 1},
|
||||
{"OPEN", 1},
|
||||
{"OSI", 0},
|
||||
{"OWNER", 1},
|
||||
{"PREDEFINED", 0},
|
||||
{"PREFIX", 0},
|
||||
@ -333,6 +335,7 @@ AcpiDbDisplayHelp (
|
||||
AcpiOsPrintf ("History Display command history buffer\n");
|
||||
AcpiOsPrintf ("Level [<DebugLevel>] [console] Get/Set debug level for file or console\n");
|
||||
AcpiOsPrintf ("Locks Current status of internal mutexes\n");
|
||||
AcpiOsPrintf ("Osi [Install|Remove <name>] Display or modify global _OSI list\n");
|
||||
AcpiOsPrintf ("Quit or Exit Exit this command\n");
|
||||
AcpiOsPrintf ("Stats [Allocations|Memory|Misc\n");
|
||||
AcpiOsPrintf (" |Objects|Sizes|Stack|Tables] Display namespace and memory statistics\n");
|
||||
@ -455,13 +458,30 @@ AcpiDbGetNextToken (
|
||||
}
|
||||
}
|
||||
|
||||
Start = String;
|
||||
|
||||
/* Find end of token */
|
||||
|
||||
while (*String && (*String != ' '))
|
||||
if (*String == '"')
|
||||
{
|
||||
/* This is a quoted string, scan until closing quote */
|
||||
|
||||
String++;
|
||||
Start = String;
|
||||
|
||||
/* Find end of token */
|
||||
|
||||
while (*String && (*String != '"'))
|
||||
{
|
||||
String++;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Start = String;
|
||||
|
||||
/* Find end of token */
|
||||
|
||||
while (*String && (*String != ' '))
|
||||
{
|
||||
String++;
|
||||
}
|
||||
}
|
||||
|
||||
if (!(*String))
|
||||
@ -820,6 +840,10 @@ AcpiDbCommandDispatch (
|
||||
AcpiDbOpenDebugFile (AcpiGbl_DbArgs[1]);
|
||||
break;
|
||||
|
||||
case CMD_OSI:
|
||||
AcpiDbDisplayInterfaces (AcpiGbl_DbArgs[1], AcpiGbl_DbArgs[2]);
|
||||
break;
|
||||
|
||||
case CMD_OWNER:
|
||||
AcpiDbDumpNamespaceByOwner (AcpiGbl_DbArgs[1], AcpiGbl_DbArgs[2]);
|
||||
break;
|
||||
|
@ -124,139 +124,6 @@
|
||||
ACPI_MODULE_NAME ("uteval")
|
||||
|
||||
|
||||
/*
|
||||
* Strings supported by the _OSI predefined (internal) method.
|
||||
*
|
||||
* March 2009: Removed "Linux" as this host no longer wants to respond true
|
||||
* for this string. Basically, the only safe OS strings are windows-related
|
||||
* and in many or most cases represent the only test path within the
|
||||
* BIOS-provided ASL code.
|
||||
*
|
||||
* The second element of each entry is used to track the newest version of
|
||||
* Windows that the BIOS has requested.
|
||||
*/
|
||||
static const ACPI_INTERFACE_INFO AcpiInterfacesSupported[] =
|
||||
{
|
||||
/* Operating System Vendor Strings */
|
||||
|
||||
{"Windows 2000", ACPI_OSI_WIN_2000}, /* Windows 2000 */
|
||||
{"Windows 2001", ACPI_OSI_WIN_XP}, /* Windows XP */
|
||||
{"Windows 2001 SP1", ACPI_OSI_WIN_XP_SP1}, /* Windows XP SP1 */
|
||||
{"Windows 2001.1", ACPI_OSI_WINSRV_2003}, /* Windows Server 2003 */
|
||||
{"Windows 2001 SP2", ACPI_OSI_WIN_XP_SP2}, /* Windows XP SP2 */
|
||||
{"Windows 2001.1 SP1", ACPI_OSI_WINSRV_2003_SP1}, /* Windows Server 2003 SP1 - Added 03/2006 */
|
||||
{"Windows 2006", ACPI_OSI_WIN_VISTA}, /* Windows Vista - Added 03/2006 */
|
||||
{"Windows 2006.1", ACPI_OSI_WINSRV_2008}, /* Windows Server 2008 - Added 09/2009 */
|
||||
{"Windows 2006 SP1", ACPI_OSI_WIN_VISTA_SP1}, /* Windows Vista SP1 - Added 09/2009 */
|
||||
{"Windows 2009", ACPI_OSI_WIN_7}, /* Windows 7 and Server 2008 R2 - Added 09/2009 */
|
||||
|
||||
/* Feature Group Strings */
|
||||
|
||||
{"Extended Address Space Descriptor", 0}
|
||||
|
||||
/*
|
||||
* All "optional" feature group strings (features that are implemented
|
||||
* by the host) should be implemented in the host version of
|
||||
* AcpiOsValidateInterface and should not be added here.
|
||||
*/
|
||||
};
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: AcpiUtOsiImplementation
|
||||
*
|
||||
* PARAMETERS: WalkState - Current walk state
|
||||
*
|
||||
* RETURN: Status
|
||||
*
|
||||
* DESCRIPTION: Implementation of the _OSI predefined control method
|
||||
*
|
||||
******************************************************************************/
|
||||
|
||||
ACPI_STATUS
|
||||
AcpiUtOsiImplementation (
|
||||
ACPI_WALK_STATE *WalkState)
|
||||
{
|
||||
ACPI_STATUS Status;
|
||||
ACPI_OPERAND_OBJECT *StringDesc;
|
||||
ACPI_OPERAND_OBJECT *ReturnDesc;
|
||||
UINT32 ReturnValue;
|
||||
UINT32 i;
|
||||
|
||||
|
||||
ACPI_FUNCTION_TRACE (UtOsiImplementation);
|
||||
|
||||
|
||||
/* Validate the string input argument */
|
||||
|
||||
StringDesc = WalkState->Arguments[0].Object;
|
||||
if (!StringDesc || (StringDesc->Common.Type != ACPI_TYPE_STRING))
|
||||
{
|
||||
return_ACPI_STATUS (AE_TYPE);
|
||||
}
|
||||
|
||||
/* Create a return object */
|
||||
|
||||
ReturnDesc = AcpiUtCreateInternalObject (ACPI_TYPE_INTEGER);
|
||||
if (!ReturnDesc)
|
||||
{
|
||||
return_ACPI_STATUS (AE_NO_MEMORY);
|
||||
}
|
||||
|
||||
/* Default return value is 0, NOT SUPPORTED */
|
||||
|
||||
ReturnValue = 0;
|
||||
|
||||
/* Compare input string to static table of supported interfaces */
|
||||
|
||||
for (i = 0; i < ACPI_ARRAY_LENGTH (AcpiInterfacesSupported); i++)
|
||||
{
|
||||
if (!ACPI_STRCMP (StringDesc->String.Pointer,
|
||||
AcpiInterfacesSupported[i].Name))
|
||||
{
|
||||
/*
|
||||
* The interface is supported.
|
||||
* Update the OsiData if necessary. We keep track of the latest
|
||||
* version of Windows that has been requested by the BIOS.
|
||||
*/
|
||||
if (AcpiInterfacesSupported[i].Value > AcpiGbl_OsiData)
|
||||
{
|
||||
AcpiGbl_OsiData = AcpiInterfacesSupported[i].Value;
|
||||
}
|
||||
|
||||
ReturnValue = ACPI_UINT32_MAX;
|
||||
goto Exit;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Did not match the string in the static table, call the host OSL to
|
||||
* check for a match with one of the optional strings (such as
|
||||
* "Module Device", "3.0 Thermal Model", etc.)
|
||||
*/
|
||||
Status = AcpiOsValidateInterface (StringDesc->String.Pointer);
|
||||
if (ACPI_SUCCESS (Status))
|
||||
{
|
||||
/* The interface is supported */
|
||||
|
||||
ReturnValue = ACPI_UINT32_MAX;
|
||||
}
|
||||
|
||||
|
||||
Exit:
|
||||
ACPI_DEBUG_PRINT_RAW ((ACPI_DB_INFO,
|
||||
"ACPI: BIOS _OSI(%s) is %ssupported\n",
|
||||
StringDesc->String.Pointer, ReturnValue == 0 ? "not " : ""));
|
||||
|
||||
/* Complete the return value */
|
||||
|
||||
ReturnDesc->Integer.Value = ReturnValue;
|
||||
WalkState->ReturnDesc = ReturnDesc;
|
||||
return_ACPI_STATUS (AE_OK);
|
||||
}
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: AcpiUtEvaluateObject
|
||||
|
@ -905,6 +905,7 @@ AcpiUtInitGlobals (
|
||||
AcpiGbl_ExceptionHandler = NULL;
|
||||
AcpiGbl_InitHandler = NULL;
|
||||
AcpiGbl_TableHandler = NULL;
|
||||
AcpiGbl_InterfaceHandler = NULL;
|
||||
|
||||
/* Global Lock support */
|
||||
|
||||
@ -931,6 +932,7 @@ AcpiUtInitGlobals (
|
||||
AcpiGbl_DebuggerConfiguration = DEBUGGER_THREADING;
|
||||
AcpiGbl_DbOutputFlags = ACPI_DB_CONSOLE_OUTPUT;
|
||||
AcpiGbl_OsiData = 0;
|
||||
AcpiGbl_OsiMutex = NULL;
|
||||
|
||||
/* Hardware oriented */
|
||||
|
||||
|
@ -205,6 +205,10 @@ AcpiUtSubsystemShutdown (
|
||||
/* Close the AcpiEvent Handling */
|
||||
|
||||
AcpiEvTerminate ();
|
||||
|
||||
/* Delete any dynamic _OSI interfaces */
|
||||
|
||||
AcpiUtInterfaceTerminate ();
|
||||
#endif
|
||||
|
||||
/* Close the Namespace */
|
||||
|
@ -182,6 +182,13 @@ AcpiUtMutexInitialize (
|
||||
return_ACPI_STATUS (Status);
|
||||
}
|
||||
|
||||
/* Mutex for _OSI support */
|
||||
Status = AcpiOsCreateMutex (&AcpiGbl_OsiMutex);
|
||||
if (ACPI_FAILURE (Status))
|
||||
{
|
||||
return_ACPI_STATUS (Status);
|
||||
}
|
||||
|
||||
/* Create the reader/writer lock for namespace access */
|
||||
|
||||
Status = AcpiUtCreateRwLock (&AcpiGbl_NamespaceRwLock);
|
||||
@ -219,6 +226,8 @@ AcpiUtMutexTerminate (
|
||||
AcpiUtDeleteMutex (i);
|
||||
}
|
||||
|
||||
AcpiOsDeleteMutex (AcpiGbl_OsiMutex);
|
||||
|
||||
/* Delete the spinlocks */
|
||||
|
||||
AcpiOsDeleteLock (AcpiGbl_GpeLock);
|
||||
|
493
source/components/utilities/utosi.c
Normal file
493
source/components/utilities/utosi.c
Normal file
@ -0,0 +1,493 @@
|
||||
/******************************************************************************
|
||||
*
|
||||
* Module Name: utosi - Support for the _OSI predefined control method
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
/******************************************************************************
|
||||
*
|
||||
* 1. Copyright Notice
|
||||
*
|
||||
* Some or all of this work - Copyright (c) 1999 - 2010, 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 __UTOSI_C__
|
||||
|
||||
#include "acpi.h"
|
||||
#include "accommon.h"
|
||||
|
||||
|
||||
#define _COMPONENT ACPI_UTILITIES
|
||||
ACPI_MODULE_NAME ("utosi")
|
||||
|
||||
/*
|
||||
* Strings supported by the _OSI predefined control method (which is
|
||||
* implemented internally within this module.)
|
||||
*
|
||||
* March 2009: Removed "Linux" as this host no longer wants to respond true
|
||||
* for this string. Basically, the only safe OS strings are windows-related
|
||||
* and in many or most cases represent the only test path within the
|
||||
* BIOS-provided ASL code.
|
||||
*
|
||||
* The last element of each entry is used to track the newest version of
|
||||
* Windows that the BIOS has requested.
|
||||
*/
|
||||
static ACPI_INTERFACE_INFO AcpiDefaultSupportedInterfaces[] =
|
||||
{
|
||||
/* Operating System Vendor Strings */
|
||||
|
||||
{"Windows 2000", NULL, 0, ACPI_OSI_WIN_2000}, /* Windows 2000 */
|
||||
{"Windows 2001", NULL, 0, ACPI_OSI_WIN_XP}, /* Windows XP */
|
||||
{"Windows 2001 SP1", NULL, 0, ACPI_OSI_WIN_XP_SP1}, /* Windows XP SP1 */
|
||||
{"Windows 2001.1", NULL, 0, ACPI_OSI_WINSRV_2003}, /* Windows Server 2003 */
|
||||
{"Windows 2001 SP2", NULL, 0, ACPI_OSI_WIN_XP_SP2}, /* Windows XP SP2 */
|
||||
{"Windows 2001.1 SP1", NULL, 0, ACPI_OSI_WINSRV_2003_SP1}, /* Windows Server 2003 SP1 - Added 03/2006 */
|
||||
{"Windows 2006", NULL, 0, ACPI_OSI_WIN_VISTA}, /* Windows Vista - Added 03/2006 */
|
||||
{"Windows 2006.1", NULL, 0, ACPI_OSI_WINSRV_2008}, /* Windows Server 2008 - Added 09/2009 */
|
||||
{"Windows 2006 SP1", NULL, 0, ACPI_OSI_WIN_VISTA_SP1}, /* Windows Vista SP1 - Added 09/2009 */
|
||||
{"Windows 2009", NULL, 0, ACPI_OSI_WIN_7}, /* Windows 7 and Server 2008 R2 - Added 09/2009 */
|
||||
|
||||
/* Feature Group Strings */
|
||||
|
||||
{"Extended Address Space Descriptor", NULL, 0, 0}
|
||||
|
||||
/*
|
||||
* All "optional" feature group strings (features that are implemented
|
||||
* by the host) should be dynamically added by the host via
|
||||
* AcpiInstallInterface and should not be manually added here.
|
||||
*
|
||||
* Examples of optional feature group strings:
|
||||
*
|
||||
* "Module Device"
|
||||
* "Processor Device"
|
||||
* "3.0 Thermal Model"
|
||||
* "3.0 _SCP Extensions"
|
||||
* "Processor Aggregator Device"
|
||||
*/
|
||||
};
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: AcpiUtInitializeInterfaces
|
||||
*
|
||||
* PARAMETERS: None
|
||||
*
|
||||
* RETURN: Status
|
||||
*
|
||||
* DESCRIPTION: Initialize the global _OSI supported interfaces list
|
||||
*
|
||||
******************************************************************************/
|
||||
|
||||
ACPI_STATUS
|
||||
AcpiUtInitializeInterfaces (
|
||||
void)
|
||||
{
|
||||
UINT32 i;
|
||||
|
||||
|
||||
(void) AcpiOsAcquireMutex (AcpiGbl_OsiMutex, ACPI_WAIT_FOREVER);
|
||||
AcpiGbl_SupportedInterfaces = AcpiDefaultSupportedInterfaces;
|
||||
|
||||
/* Link the static list of supported interfaces */
|
||||
|
||||
for (i = 0; i < (ACPI_ARRAY_LENGTH (AcpiDefaultSupportedInterfaces) - 1); i++)
|
||||
{
|
||||
AcpiDefaultSupportedInterfaces[i].Next =
|
||||
&AcpiDefaultSupportedInterfaces[(ACPI_SIZE) i + 1];
|
||||
}
|
||||
|
||||
AcpiOsReleaseMutex (AcpiGbl_OsiMutex);
|
||||
return (AE_OK);
|
||||
}
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: AcpiUtInterfaceTerminate
|
||||
*
|
||||
* PARAMETERS: None
|
||||
*
|
||||
* RETURN: None
|
||||
*
|
||||
* DESCRIPTION: Delete all interfaces in the global list. Sets
|
||||
* AcpiGbl_SupportedInterfaces to NULL.
|
||||
*
|
||||
******************************************************************************/
|
||||
|
||||
void
|
||||
AcpiUtInterfaceTerminate (
|
||||
void)
|
||||
{
|
||||
ACPI_INTERFACE_INFO *NextInterface;
|
||||
|
||||
|
||||
(void) AcpiOsAcquireMutex (AcpiGbl_OsiMutex, ACPI_WAIT_FOREVER);
|
||||
NextInterface = AcpiGbl_SupportedInterfaces;
|
||||
|
||||
while (NextInterface)
|
||||
{
|
||||
AcpiGbl_SupportedInterfaces = NextInterface->Next;
|
||||
|
||||
/* Only interfaces added at runtime can be freed */
|
||||
|
||||
if (NextInterface->Flags & ACPI_OSI_DYNAMIC)
|
||||
{
|
||||
ACPI_FREE (NextInterface->Name);
|
||||
ACPI_FREE (NextInterface);
|
||||
}
|
||||
|
||||
NextInterface = AcpiGbl_SupportedInterfaces;
|
||||
}
|
||||
|
||||
AcpiOsReleaseMutex (AcpiGbl_OsiMutex);
|
||||
}
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: AcpiUtInstallInterface
|
||||
*
|
||||
* PARAMETERS: InterfaceName - The interface to install
|
||||
*
|
||||
* RETURN: Status
|
||||
*
|
||||
* DESCRIPTION: Install the interface into the global interface list.
|
||||
* Caller MUST hold AcpiGbl_OsiMutex
|
||||
*
|
||||
******************************************************************************/
|
||||
|
||||
ACPI_STATUS
|
||||
AcpiUtInstallInterface (
|
||||
ACPI_STRING InterfaceName)
|
||||
{
|
||||
ACPI_INTERFACE_INFO *InterfaceInfo;
|
||||
|
||||
|
||||
/* Allocate info block and space for the name string */
|
||||
|
||||
InterfaceInfo = ACPI_ALLOCATE_ZEROED (sizeof (ACPI_INTERFACE_INFO));
|
||||
if (!InterfaceInfo)
|
||||
{
|
||||
return (AE_NO_MEMORY);
|
||||
}
|
||||
|
||||
InterfaceInfo->Name = ACPI_ALLOCATE_ZEROED (ACPI_STRLEN (InterfaceName) + 1);
|
||||
if (!InterfaceInfo->Name)
|
||||
{
|
||||
ACPI_FREE (InterfaceInfo);
|
||||
return (AE_NO_MEMORY);
|
||||
}
|
||||
|
||||
/* Initialize new info and insert at the head of the global list */
|
||||
|
||||
ACPI_STRCPY (InterfaceInfo->Name, InterfaceName);
|
||||
InterfaceInfo->Flags = ACPI_OSI_DYNAMIC;
|
||||
InterfaceInfo->Next = AcpiGbl_SupportedInterfaces;
|
||||
|
||||
AcpiGbl_SupportedInterfaces = InterfaceInfo;
|
||||
return (AE_OK);
|
||||
}
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: AcpiUtRemoveInterface
|
||||
*
|
||||
* PARAMETERS: InterfaceName - The interface to remove
|
||||
*
|
||||
* RETURN: Status
|
||||
*
|
||||
* DESCRIPTION: Remove the interface from the global interface list.
|
||||
* Caller MUST hold AcpiGbl_OsiMutex
|
||||
*
|
||||
******************************************************************************/
|
||||
|
||||
ACPI_STATUS
|
||||
AcpiUtRemoveInterface (
|
||||
ACPI_STRING InterfaceName)
|
||||
{
|
||||
ACPI_INTERFACE_INFO *PreviousInterface;
|
||||
ACPI_INTERFACE_INFO *NextInterface;
|
||||
|
||||
|
||||
PreviousInterface = NextInterface = AcpiGbl_SupportedInterfaces;
|
||||
while (NextInterface)
|
||||
{
|
||||
if (!ACPI_STRCMP (InterfaceName, NextInterface->Name))
|
||||
{
|
||||
/* Found: name is in either the static list or was added at runtime */
|
||||
|
||||
if (NextInterface->Flags & ACPI_OSI_DYNAMIC)
|
||||
{
|
||||
/* Interface was added dynamically, remove and free it */
|
||||
|
||||
if (PreviousInterface == NextInterface)
|
||||
{
|
||||
AcpiGbl_SupportedInterfaces = NextInterface->Next;
|
||||
}
|
||||
else
|
||||
{
|
||||
PreviousInterface->Next = NextInterface->Next;
|
||||
}
|
||||
|
||||
ACPI_FREE (NextInterface->Name);
|
||||
ACPI_FREE (NextInterface);
|
||||
}
|
||||
else
|
||||
{
|
||||
/*
|
||||
* Interface is in static list. If marked invalid, then it
|
||||
* does not actually exist. Else, mark it invalid.
|
||||
*/
|
||||
if (NextInterface->Flags & ACPI_OSI_INVALID)
|
||||
{
|
||||
return (AE_NOT_EXIST);
|
||||
}
|
||||
|
||||
NextInterface->Flags |= ACPI_OSI_INVALID;
|
||||
}
|
||||
|
||||
return (AE_OK);
|
||||
}
|
||||
|
||||
PreviousInterface = NextInterface;
|
||||
NextInterface = NextInterface->Next;
|
||||
}
|
||||
|
||||
/* Interface was not found */
|
||||
|
||||
return (AE_NOT_EXIST);
|
||||
}
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: AcpiUtGetInterface
|
||||
*
|
||||
* PARAMETERS: InterfaceName - The interface to find
|
||||
*
|
||||
* RETURN: ACPI_INTERFACE_INFO if found. NULL if not found.
|
||||
*
|
||||
* DESCRIPTION: Search for the specified interface name in the global list.
|
||||
* Caller MUST hold AcpiGbl_OsiMutex
|
||||
*
|
||||
******************************************************************************/
|
||||
|
||||
ACPI_INTERFACE_INFO *
|
||||
AcpiUtGetInterface (
|
||||
ACPI_STRING InterfaceName)
|
||||
{
|
||||
ACPI_INTERFACE_INFO *NextInterface;
|
||||
|
||||
|
||||
NextInterface = AcpiGbl_SupportedInterfaces;
|
||||
while (NextInterface)
|
||||
{
|
||||
if (!ACPI_STRCMP (InterfaceName, NextInterface->Name))
|
||||
{
|
||||
return (NextInterface);
|
||||
}
|
||||
|
||||
NextInterface = NextInterface->Next;
|
||||
}
|
||||
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: AcpiUtOsiImplementation
|
||||
*
|
||||
* PARAMETERS: WalkState - Current walk state
|
||||
*
|
||||
* RETURN: Status
|
||||
*
|
||||
* DESCRIPTION: Implementation of the _OSI predefined control method. When
|
||||
* an invocation of _OSI is encountered in the system AML,
|
||||
* control is transferred to this function.
|
||||
*
|
||||
******************************************************************************/
|
||||
|
||||
ACPI_STATUS
|
||||
AcpiUtOsiImplementation (
|
||||
ACPI_WALK_STATE *WalkState)
|
||||
{
|
||||
ACPI_OPERAND_OBJECT *StringDesc;
|
||||
ACPI_OPERAND_OBJECT *ReturnDesc;
|
||||
ACPI_INTERFACE_INFO *InterfaceInfo;
|
||||
ACPI_INTERFACE_HANDLER InterfaceHandler;
|
||||
UINT32 ReturnValue;
|
||||
|
||||
|
||||
ACPI_FUNCTION_TRACE (UtOsiImplementation);
|
||||
|
||||
|
||||
/* Validate the string input argument (from the AML caller) */
|
||||
|
||||
StringDesc = WalkState->Arguments[0].Object;
|
||||
if (!StringDesc ||
|
||||
(StringDesc->Common.Type != ACPI_TYPE_STRING))
|
||||
{
|
||||
return_ACPI_STATUS (AE_TYPE);
|
||||
}
|
||||
|
||||
/* Create a return object */
|
||||
|
||||
ReturnDesc = AcpiUtCreateInternalObject (ACPI_TYPE_INTEGER);
|
||||
if (!ReturnDesc)
|
||||
{
|
||||
return_ACPI_STATUS (AE_NO_MEMORY);
|
||||
}
|
||||
|
||||
/* Default return value is 0, NOT SUPPORTED */
|
||||
|
||||
ReturnValue = 0;
|
||||
(void) AcpiOsAcquireMutex (AcpiGbl_OsiMutex, ACPI_WAIT_FOREVER);
|
||||
|
||||
/* Lookup the interface in the global _OSI list */
|
||||
|
||||
InterfaceInfo = AcpiUtGetInterface (StringDesc->String.Pointer);
|
||||
if (InterfaceInfo &&
|
||||
!(InterfaceInfo->Flags & ACPI_OSI_INVALID))
|
||||
{
|
||||
/*
|
||||
* The interface is supported.
|
||||
* Update the OsiData if necessary. We keep track of the latest
|
||||
* version of Windows that has been requested by the BIOS.
|
||||
*/
|
||||
if (InterfaceInfo->Value > AcpiGbl_OsiData)
|
||||
{
|
||||
AcpiGbl_OsiData = InterfaceInfo->Value;
|
||||
}
|
||||
|
||||
ReturnValue = ACPI_UINT32_MAX;
|
||||
}
|
||||
|
||||
AcpiOsReleaseMutex (AcpiGbl_OsiMutex);
|
||||
|
||||
/*
|
||||
* Invoke an optional _OSI interface handler. The host OS may wish
|
||||
* to do some interface-specific handling. For example, warn about
|
||||
* certain interfaces or override the true/false support value.
|
||||
*/
|
||||
InterfaceHandler = AcpiGbl_InterfaceHandler;
|
||||
if (InterfaceHandler)
|
||||
{
|
||||
ReturnValue = InterfaceHandler (
|
||||
StringDesc->String.Pointer, ReturnValue);
|
||||
}
|
||||
|
||||
ACPI_DEBUG_PRINT_RAW ((ACPI_DB_INFO,
|
||||
"ACPI: BIOS _OSI(\"%s\") is %ssupported\n",
|
||||
StringDesc->String.Pointer, ReturnValue == 0 ? "not " : ""));
|
||||
|
||||
/* Complete the return object */
|
||||
|
||||
ReturnDesc->Integer.Value = ReturnValue;
|
||||
WalkState->ReturnDesc = ReturnDesc;
|
||||
return_ACPI_STATUS (AE_OK);
|
||||
}
|
@ -193,6 +193,15 @@ AcpiInitializeSubsystem (
|
||||
return_ACPI_STATUS (Status);
|
||||
}
|
||||
|
||||
/* Initialize the global OSI interfaces list with the static names */
|
||||
|
||||
Status = AcpiUtInitializeInterfaces ();
|
||||
if (ACPI_FAILURE (Status))
|
||||
{
|
||||
ACPI_EXCEPTION ((AE_INFO, Status, "During OSI interfaces initialization"));
|
||||
return_ACPI_STATUS (Status);
|
||||
}
|
||||
|
||||
/* If configured, initialize the AML debugger */
|
||||
|
||||
ACPI_DEBUGGER_EXEC (Status = AcpiDbInitialize ());
|
||||
@ -730,5 +739,144 @@ AcpiPurgeCachedObjects (
|
||||
|
||||
ACPI_EXPORT_SYMBOL (AcpiPurgeCachedObjects)
|
||||
|
||||
#endif /* ACPI_ASL_COMPILER */
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* FUNCTION: AcpiInstallInterface
|
||||
*
|
||||
* PARAMETERS: InterfaceName - The interface to install
|
||||
*
|
||||
* RETURN: Status
|
||||
*
|
||||
* DESCRIPTION: Install an _OSI interface to the global list
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
ACPI_STATUS
|
||||
AcpiInstallInterface (
|
||||
ACPI_STRING InterfaceName)
|
||||
{
|
||||
ACPI_STATUS Status;
|
||||
ACPI_INTERFACE_INFO *InterfaceInfo;
|
||||
|
||||
|
||||
/* Parameter validation */
|
||||
|
||||
if (!InterfaceName || (ACPI_STRLEN (InterfaceName) == 0))
|
||||
{
|
||||
return (AE_BAD_PARAMETER);
|
||||
}
|
||||
|
||||
(void) AcpiOsAcquireMutex (AcpiGbl_OsiMutex, ACPI_WAIT_FOREVER);
|
||||
|
||||
/* Check if the interface name is already in the global list */
|
||||
|
||||
InterfaceInfo = AcpiUtGetInterface (InterfaceName);
|
||||
if (InterfaceInfo)
|
||||
{
|
||||
/*
|
||||
* The interface already exists in the list. This is OK if the
|
||||
* interface has been marked invalid -- just clear the bit.
|
||||
*/
|
||||
if (InterfaceInfo->Flags & ACPI_OSI_INVALID)
|
||||
{
|
||||
InterfaceInfo->Flags &= ~ACPI_OSI_INVALID;
|
||||
Status = AE_OK;
|
||||
}
|
||||
else
|
||||
{
|
||||
Status = AE_ALREADY_EXISTS;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
/* New interface name, install into the global list */
|
||||
|
||||
Status = AcpiUtInstallInterface (InterfaceName);
|
||||
}
|
||||
|
||||
AcpiOsReleaseMutex (AcpiGbl_OsiMutex);
|
||||
return (Status);
|
||||
}
|
||||
|
||||
ACPI_EXPORT_SYMBOL (AcpiInstallInterface)
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* FUNCTION: AcpiRemoveInterface
|
||||
*
|
||||
* PARAMETERS: InterfaceName - The interface to remove
|
||||
*
|
||||
* RETURN: Status
|
||||
*
|
||||
* DESCRIPTION: Remove an _OSI interface from the global list
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
ACPI_STATUS
|
||||
AcpiRemoveInterface (
|
||||
ACPI_STRING InterfaceName)
|
||||
{
|
||||
ACPI_STATUS Status;
|
||||
|
||||
|
||||
/* Parameter validation */
|
||||
|
||||
if (!InterfaceName || (ACPI_STRLEN (InterfaceName) == 0))
|
||||
{
|
||||
return (AE_BAD_PARAMETER);
|
||||
}
|
||||
|
||||
(void) AcpiOsAcquireMutex (AcpiGbl_OsiMutex, ACPI_WAIT_FOREVER);
|
||||
|
||||
Status = AcpiUtRemoveInterface (InterfaceName);
|
||||
|
||||
AcpiOsReleaseMutex (AcpiGbl_OsiMutex);
|
||||
return (Status);
|
||||
}
|
||||
|
||||
ACPI_EXPORT_SYMBOL (AcpiRemoveInterface)
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* FUNCTION: AcpiInstallInterfaceHandler
|
||||
*
|
||||
* PARAMETERS: Handler - The _OSI interface handler to install
|
||||
* NULL means "remove existing handler"
|
||||
*
|
||||
* RETURN: Status
|
||||
*
|
||||
* DESCRIPTION: Install a handler for the predefined _OSI ACPI method.
|
||||
* invoked during execution of the internal implementation of
|
||||
* _OSI. A NULL handler simply removes any existing handler.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
ACPI_STATUS
|
||||
AcpiInstallInterfaceHandler (
|
||||
ACPI_INTERFACE_HANDLER Handler)
|
||||
{
|
||||
ACPI_STATUS Status = AE_OK;
|
||||
|
||||
|
||||
(void) AcpiOsAcquireMutex (AcpiGbl_OsiMutex, ACPI_WAIT_FOREVER);
|
||||
|
||||
if (Handler && AcpiGbl_InterfaceHandler)
|
||||
{
|
||||
Status = AE_ALREADY_EXISTS;
|
||||
}
|
||||
else
|
||||
{
|
||||
AcpiGbl_InterfaceHandler = Handler;
|
||||
}
|
||||
|
||||
AcpiOsReleaseMutex (AcpiGbl_OsiMutex);
|
||||
return (Status);
|
||||
}
|
||||
|
||||
ACPI_EXPORT_SYMBOL (AcpiInstallInterfaceHandler)
|
||||
|
||||
#endif /* !ACPI_ASL_COMPILER */
|
||||
|
||||
|
@ -228,6 +228,11 @@ AcpiDbDisplayObjects (
|
||||
char *ObjTypeArg,
|
||||
char *DisplayCountArg);
|
||||
|
||||
void
|
||||
AcpiDbDisplayInterfaces (
|
||||
char *ActionArg,
|
||||
char *InterfaceNameArg);
|
||||
|
||||
ACPI_STATUS
|
||||
AcpiDbFindNameInNamespace (
|
||||
char *NameArg);
|
||||
|
@ -283,6 +283,10 @@ ACPI_EXTERN BOOLEAN AcpiGbl_GlobalLockPresent;
|
||||
ACPI_EXTERN ACPI_SPINLOCK AcpiGbl_GpeLock; /* For GPE data structs and registers */
|
||||
ACPI_EXTERN ACPI_SPINLOCK AcpiGbl_HardwareLock; /* For ACPI H/W except GPE registers */
|
||||
|
||||
/* Mutex for _OSI support */
|
||||
|
||||
ACPI_EXTERN ACPI_MUTEX AcpiGbl_OsiMutex;
|
||||
|
||||
/* Reader/Writer lock is used for namespace walk and dynamic table unload */
|
||||
|
||||
ACPI_EXTERN ACPI_RW_LOCK AcpiGbl_NamespaceRwLock;
|
||||
@ -311,7 +315,7 @@ ACPI_EXTERN ACPI_INIT_HANDLER AcpiGbl_InitHandler;
|
||||
ACPI_EXTERN ACPI_TABLE_HANDLER AcpiGbl_TableHandler;
|
||||
ACPI_EXTERN void *AcpiGbl_TableHandlerContext;
|
||||
ACPI_EXTERN ACPI_WALK_STATE *AcpiGbl_BreakpointWalk;
|
||||
|
||||
ACPI_EXTERN ACPI_INTERFACE_HANDLER AcpiGbl_InterfaceHandler;
|
||||
|
||||
/* Owner ID support */
|
||||
|
||||
@ -332,6 +336,7 @@ ACPI_EXTERN BOOLEAN AcpiGbl_AcpiHardwarePresent;
|
||||
ACPI_EXTERN BOOLEAN AcpiGbl_EventsInitialized;
|
||||
ACPI_EXTERN BOOLEAN AcpiGbl_SystemAwakeAndRunning;
|
||||
ACPI_EXTERN UINT8 AcpiGbl_OsiData;
|
||||
ACPI_EXTERN ACPI_INTERFACE_INFO *AcpiGbl_SupportedInterfaces;
|
||||
|
||||
|
||||
#ifndef DEFINE_ACPI_GLOBALS
|
||||
|
@ -1142,11 +1142,16 @@ typedef struct acpi_bit_register_info
|
||||
|
||||
typedef struct acpi_interface_info
|
||||
{
|
||||
char *Name;
|
||||
UINT8 Value;
|
||||
char *Name;
|
||||
struct acpi_interface_info *Next;
|
||||
UINT8 Flags;
|
||||
UINT8 Value;
|
||||
|
||||
} ACPI_INTERFACE_INFO;
|
||||
|
||||
#define ACPI_OSI_INVALID 0x01
|
||||
#define ACPI_OSI_DYNAMIC 0x02
|
||||
|
||||
typedef struct acpi_port_info
|
||||
{
|
||||
char *Name;
|
||||
|
@ -418,10 +418,6 @@ AcpiOsDerivePciId(
|
||||
/*
|
||||
* Miscellaneous
|
||||
*/
|
||||
ACPI_STATUS
|
||||
AcpiOsValidateInterface (
|
||||
char *Interface);
|
||||
|
||||
BOOLEAN
|
||||
AcpiOsReadable (
|
||||
void *Pointer,
|
||||
|
@ -203,9 +203,16 @@ ACPI_STATUS
|
||||
AcpiPurgeCachedObjects (
|
||||
void);
|
||||
|
||||
ACPI_STATUS
|
||||
AcpiInstallInterface (
|
||||
ACPI_STRING InterfaceName);
|
||||
|
||||
ACPI_STATUS
|
||||
AcpiRemoveInterface (
|
||||
ACPI_STRING InterfaceName);
|
||||
|
||||
/*
|
||||
* ACPI Memory managment
|
||||
* ACPI Memory management
|
||||
*/
|
||||
void *
|
||||
AcpiAllocate (
|
||||
@ -428,6 +435,10 @@ ACPI_STATUS
|
||||
AcpiInstallExceptionHandler (
|
||||
ACPI_EXCEPTION_HANDLER Handler);
|
||||
|
||||
ACPI_STATUS
|
||||
AcpiInstallInterfaceHandler (
|
||||
ACPI_INTERFACE_HANDLER Handler);
|
||||
|
||||
|
||||
/*
|
||||
* Event interfaces
|
||||
|
@ -1099,6 +1099,11 @@ ACPI_STATUS (*ACPI_WALK_CALLBACK) (
|
||||
void *Context,
|
||||
void **ReturnValue);
|
||||
|
||||
typedef
|
||||
UINT32 (*ACPI_INTERFACE_HANDLER) (
|
||||
ACPI_STRING InterfaceName,
|
||||
UINT32 Supported);
|
||||
|
||||
|
||||
/* Interrupt handler return values */
|
||||
|
||||
|
@ -536,10 +536,6 @@ AcpiUtDeleteInternalObjectList (
|
||||
* uteval - object evaluation
|
||||
*/
|
||||
ACPI_STATUS
|
||||
AcpiUtOsiImplementation (
|
||||
ACPI_WALK_STATE *WalkState);
|
||||
|
||||
ACPI_STATUS
|
||||
AcpiUtEvaluateObject (
|
||||
ACPI_NAMESPACE_NODE *PrefixNode,
|
||||
char *Path,
|
||||
@ -661,6 +657,34 @@ AcpiUtGetObjectSize(
|
||||
ACPI_SIZE *ObjLength);
|
||||
|
||||
|
||||
/*
|
||||
* utosi - Support for the _OSI predefined control method
|
||||
*/
|
||||
ACPI_STATUS
|
||||
AcpiUtInitializeInterfaces (
|
||||
void);
|
||||
|
||||
void
|
||||
AcpiUtInterfaceTerminate (
|
||||
void);
|
||||
|
||||
ACPI_STATUS
|
||||
AcpiUtInstallInterface (
|
||||
ACPI_STRING InterfaceName);
|
||||
|
||||
ACPI_STATUS
|
||||
AcpiUtRemoveInterface (
|
||||
ACPI_STRING InterfaceName);
|
||||
|
||||
ACPI_INTERFACE_INFO *
|
||||
AcpiUtGetInterface (
|
||||
ACPI_STRING InterfaceName);
|
||||
|
||||
ACPI_STATUS
|
||||
AcpiUtOsiImplementation (
|
||||
ACPI_WALK_STATE *WalkState);
|
||||
|
||||
|
||||
/*
|
||||
* utstate - Generic state creation/cache routines
|
||||
*/
|
||||
|
@ -919,28 +919,6 @@ AcpiOsGetTimer (void)
|
||||
}
|
||||
|
||||
|
||||
/******************************************************************************
|
||||
*
|
||||
* FUNCTION: AcpiOsValidateInterface
|
||||
*
|
||||
* PARAMETERS: Interface - Requested interface to be validated
|
||||
*
|
||||
* RETURN: AE_OK if interface is supported, AE_SUPPORT otherwise
|
||||
*
|
||||
* DESCRIPTION: Match an interface string to the interfaces supported by the
|
||||
* host. Strings originate from an AML call to the _OSI method.
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
ACPI_STATUS
|
||||
AcpiOsValidateInterface (
|
||||
char *Interface)
|
||||
{
|
||||
|
||||
return (AE_SUPPORT);
|
||||
}
|
||||
|
||||
|
||||
/******************************************************************************
|
||||
*
|
||||
* FUNCTION: AcpiOsReadPciConfiguration
|
||||
|
@ -1156,28 +1156,6 @@ AcpiOsSleep (
|
||||
}
|
||||
|
||||
|
||||
/******************************************************************************
|
||||
*
|
||||
* FUNCTION: AcpiOsValidateInterface
|
||||
*
|
||||
* PARAMETERS: Interface - Requested interface to be validated
|
||||
*
|
||||
* RETURN: AE_OK if interface is supported, AE_SUPPORT otherwise
|
||||
*
|
||||
* DESCRIPTION: Match an interface string to the interfaces supported by the
|
||||
* host. Strings originate from an AML call to the _OSI method.
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
ACPI_STATUS
|
||||
AcpiOsValidateInterface (
|
||||
char *Interface)
|
||||
{
|
||||
|
||||
return (AE_SUPPORT);
|
||||
}
|
||||
|
||||
|
||||
/******************************************************************************
|
||||
*
|
||||
* FUNCTION: AcpiOsReadPciConfiguration
|
||||
|
@ -517,6 +517,16 @@ AeMiscellaneousTests (
|
||||
|
||||
AeTestBufferArgument();
|
||||
AeTestPackageArgument ();
|
||||
|
||||
|
||||
AcpiInstallInterface ("");
|
||||
AcpiInstallInterface ("TestString");
|
||||
AcpiInstallInterface ("TestString");
|
||||
AcpiRemoveInterface ("Windows 2006");
|
||||
AcpiRemoveInterface ("TestString");
|
||||
AcpiRemoveInterface ("XXXXXX");
|
||||
AcpiInstallInterface ("AnotherTestString");
|
||||
|
||||
ExecuteOSI ("Windows 2001", 0xFFFFFFFF);
|
||||
ExecuteOSI ("MichiganTerminalSystem", 0);
|
||||
|
||||
|
@ -158,6 +158,11 @@ AeAttachedDataHandler (
|
||||
ACPI_HANDLE Object,
|
||||
void *Data);
|
||||
|
||||
UINT32
|
||||
AeInterfaceHandler (
|
||||
ACPI_STRING InterfaceName,
|
||||
UINT32 Supported);
|
||||
|
||||
UINT32 SigintCount = 0;
|
||||
AE_DEBUG_REGIONS AeRegions;
|
||||
|
||||
@ -477,6 +482,30 @@ AeAttachedDataHandler (
|
||||
}
|
||||
|
||||
|
||||
/******************************************************************************
|
||||
*
|
||||
* FUNCTION: AeInterfaceHandler
|
||||
*
|
||||
* DESCRIPTION: Handler for _OSI invocations
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
UINT32
|
||||
AeInterfaceHandler (
|
||||
ACPI_STRING InterfaceName,
|
||||
UINT32 Supported)
|
||||
{
|
||||
ACPI_FUNCTION_NAME (AeInterfaceHandler);
|
||||
|
||||
|
||||
ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
|
||||
"Received _OSI (\"%s\"), is %ssupported\n",
|
||||
InterfaceName, Supported == 0 ? "not " : ""));
|
||||
|
||||
return (Supported);
|
||||
}
|
||||
|
||||
|
||||
/******************************************************************************
|
||||
*
|
||||
* FUNCTION: AeRegionInit
|
||||
@ -531,6 +560,13 @@ AeInstallHandlers (void)
|
||||
ACPI_FUNCTION_ENTRY ();
|
||||
|
||||
|
||||
Status = AcpiInstallInterfaceHandler (AeInterfaceHandler);
|
||||
if (ACPI_FAILURE (Status))
|
||||
{
|
||||
printf ("Could not install interface handler, %s\n",
|
||||
AcpiFormatException (Status));
|
||||
}
|
||||
|
||||
Status = AcpiInstallTableHandler (AeTableHandler, NULL);
|
||||
if (ACPI_FAILURE (Status))
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user