mirror of
https://github.com/reactos/reactos.git
synced 2024-09-10 04:42:00 +00:00
630 lines
20 KiB
C
630 lines
20 KiB
C
/******************************************************************************
|
|
*
|
|
* Module Name: nsrepair - Repair for objects returned by predefined methods
|
|
*
|
|
*****************************************************************************/
|
|
|
|
/*
|
|
* Copyright (C) 2000 - 2019, Intel Corp.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions, and the following disclaimer,
|
|
* without modification.
|
|
* 2. Redistributions in binary form must reproduce at minimum a disclaimer
|
|
* substantially similar to the "NO WARRANTY" disclaimer below
|
|
* ("Disclaimer") and any redistribution must be conditioned upon
|
|
* including a substantially similar Disclaimer requirement for further
|
|
* binary redistribution.
|
|
* 3. Neither the names of the above-listed copyright holders nor the names
|
|
* of any contributors may be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
*
|
|
* Alternatively, this software may be distributed under the terms of the
|
|
* GNU General Public License ("GPL") version 2 as published by the Free
|
|
* Software Foundation.
|
|
*
|
|
* NO WARRANTY
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
* HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
|
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
|
|
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
* POSSIBILITY OF SUCH DAMAGES.
|
|
*/
|
|
|
|
#include "acpi.h"
|
|
#include "accommon.h"
|
|
#include "acnamesp.h"
|
|
#include "acinterp.h"
|
|
#include "acpredef.h"
|
|
#include "amlresrc.h"
|
|
|
|
#define _COMPONENT ACPI_NAMESPACE
|
|
ACPI_MODULE_NAME ("nsrepair")
|
|
|
|
|
|
/*******************************************************************************
|
|
*
|
|
* This module attempts to repair or convert objects returned by the
|
|
* predefined methods to an object type that is expected, as per the ACPI
|
|
* specification. The need for this code is dictated by the many machines that
|
|
* return incorrect types for the standard predefined methods. Performing these
|
|
* conversions here, in one place, eliminates the need for individual ACPI
|
|
* device drivers to do the same. Note: Most of these conversions are different
|
|
* than the internal object conversion routines used for implicit object
|
|
* conversion.
|
|
*
|
|
* The following conversions can be performed as necessary:
|
|
*
|
|
* Integer -> String
|
|
* Integer -> Buffer
|
|
* String -> Integer
|
|
* String -> Buffer
|
|
* Buffer -> Integer
|
|
* Buffer -> String
|
|
* Buffer -> Package of Integers
|
|
* Package -> Package of one Package
|
|
*
|
|
* Additional conversions that are available:
|
|
* Convert a null return or zero return value to an EndTag descriptor
|
|
* Convert an ASCII string to a Unicode buffer
|
|
*
|
|
* An incorrect standalone object is wrapped with required outer package
|
|
*
|
|
* Additional possible repairs:
|
|
* Required package elements that are NULL replaced by Integer/String/Buffer
|
|
*
|
|
******************************************************************************/
|
|
|
|
|
|
/* Local prototypes */
|
|
|
|
static const ACPI_SIMPLE_REPAIR_INFO *
|
|
AcpiNsMatchSimpleRepair (
|
|
ACPI_NAMESPACE_NODE *Node,
|
|
UINT32 ReturnBtype,
|
|
UINT32 PackageIndex);
|
|
|
|
|
|
/*
|
|
* Special but simple repairs for some names.
|
|
*
|
|
* 2nd argument: Unexpected types that can be repaired
|
|
*/
|
|
static const ACPI_SIMPLE_REPAIR_INFO AcpiObjectRepairInfo[] =
|
|
{
|
|
/* Resource descriptor conversions */
|
|
|
|
{ "_CRS", ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING | ACPI_RTYPE_BUFFER | ACPI_RTYPE_NONE,
|
|
ACPI_NOT_PACKAGE_ELEMENT,
|
|
AcpiNsConvertToResource },
|
|
{ "_DMA", ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING | ACPI_RTYPE_BUFFER | ACPI_RTYPE_NONE,
|
|
ACPI_NOT_PACKAGE_ELEMENT,
|
|
AcpiNsConvertToResource },
|
|
{ "_PRS", ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING | ACPI_RTYPE_BUFFER | ACPI_RTYPE_NONE,
|
|
ACPI_NOT_PACKAGE_ELEMENT,
|
|
AcpiNsConvertToResource },
|
|
|
|
/* Object reference conversions */
|
|
|
|
{ "_DEP", ACPI_RTYPE_STRING, ACPI_ALL_PACKAGE_ELEMENTS,
|
|
AcpiNsConvertToReference },
|
|
|
|
/* Unicode conversions */
|
|
|
|
{ "_MLS", ACPI_RTYPE_STRING, 1,
|
|
AcpiNsConvertToUnicode },
|
|
{ "_STR", ACPI_RTYPE_STRING | ACPI_RTYPE_BUFFER,
|
|
ACPI_NOT_PACKAGE_ELEMENT,
|
|
AcpiNsConvertToUnicode },
|
|
{ {0,0,0,0}, 0, 0, NULL } /* Table terminator */
|
|
};
|
|
|
|
|
|
/*******************************************************************************
|
|
*
|
|
* FUNCTION: AcpiNsSimpleRepair
|
|
*
|
|
* PARAMETERS: Info - Method execution information block
|
|
* ExpectedBtypes - Object types expected
|
|
* PackageIndex - Index of object within parent package (if
|
|
* applicable - ACPI_NOT_PACKAGE_ELEMENT
|
|
* otherwise)
|
|
* ReturnObjectPtr - Pointer to the object returned from the
|
|
* evaluation of a method or object
|
|
*
|
|
* RETURN: Status. AE_OK if repair was successful.
|
|
*
|
|
* DESCRIPTION: Attempt to repair/convert a return object of a type that was
|
|
* not expected.
|
|
*
|
|
******************************************************************************/
|
|
|
|
ACPI_STATUS
|
|
AcpiNsSimpleRepair (
|
|
ACPI_EVALUATE_INFO *Info,
|
|
UINT32 ExpectedBtypes,
|
|
UINT32 PackageIndex,
|
|
ACPI_OPERAND_OBJECT **ReturnObjectPtr)
|
|
{
|
|
ACPI_OPERAND_OBJECT *ReturnObject = *ReturnObjectPtr;
|
|
ACPI_OPERAND_OBJECT *NewObject = NULL;
|
|
ACPI_STATUS Status;
|
|
const ACPI_SIMPLE_REPAIR_INFO *Predefined;
|
|
|
|
|
|
ACPI_FUNCTION_NAME (NsSimpleRepair);
|
|
|
|
|
|
/*
|
|
* Special repairs for certain names that are in the repair table.
|
|
* Check if this name is in the list of repairable names.
|
|
*/
|
|
Predefined = AcpiNsMatchSimpleRepair (Info->Node,
|
|
Info->ReturnBtype, PackageIndex);
|
|
if (Predefined)
|
|
{
|
|
if (!ReturnObject)
|
|
{
|
|
ACPI_WARN_PREDEFINED ((AE_INFO, Info->FullPathname,
|
|
ACPI_WARN_ALWAYS, "Missing expected return value"));
|
|
}
|
|
|
|
Status = Predefined->ObjectConverter (Info->Node, ReturnObject,
|
|
&NewObject);
|
|
if (ACPI_FAILURE (Status))
|
|
{
|
|
/* A fatal error occurred during a conversion */
|
|
|
|
ACPI_EXCEPTION ((AE_INFO, Status,
|
|
"During return object analysis"));
|
|
return (Status);
|
|
}
|
|
if (NewObject)
|
|
{
|
|
goto ObjectRepaired;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Do not perform simple object repair unless the return type is not
|
|
* expected.
|
|
*/
|
|
if (Info->ReturnBtype & ExpectedBtypes)
|
|
{
|
|
return (AE_OK);
|
|
}
|
|
|
|
/*
|
|
* At this point, we know that the type of the returned object was not
|
|
* one of the expected types for this predefined name. Attempt to
|
|
* repair the object by converting it to one of the expected object
|
|
* types for this predefined name.
|
|
*/
|
|
|
|
/*
|
|
* If there is no return value, check if we require a return value for
|
|
* this predefined name. Either one return value is expected, or none,
|
|
* for both methods and other objects.
|
|
*
|
|
* Try to fix if there was no return object. Warning if failed to fix.
|
|
*/
|
|
if (!ReturnObject)
|
|
{
|
|
if (ExpectedBtypes && (!(ExpectedBtypes & ACPI_RTYPE_NONE)))
|
|
{
|
|
if (PackageIndex != ACPI_NOT_PACKAGE_ELEMENT)
|
|
{
|
|
ACPI_WARN_PREDEFINED ((AE_INFO, Info->FullPathname,
|
|
ACPI_WARN_ALWAYS, "Found unexpected NULL package element"));
|
|
|
|
Status = AcpiNsRepairNullElement (Info, ExpectedBtypes,
|
|
PackageIndex, ReturnObjectPtr);
|
|
if (ACPI_SUCCESS (Status))
|
|
{
|
|
return (AE_OK); /* Repair was successful */
|
|
}
|
|
}
|
|
else
|
|
{
|
|
ACPI_WARN_PREDEFINED ((AE_INFO, Info->FullPathname,
|
|
ACPI_WARN_ALWAYS, "Missing expected return value"));
|
|
}
|
|
|
|
return (AE_AML_NO_RETURN_VALUE);
|
|
}
|
|
}
|
|
|
|
if (ExpectedBtypes & ACPI_RTYPE_INTEGER)
|
|
{
|
|
Status = AcpiNsConvertToInteger (ReturnObject, &NewObject);
|
|
if (ACPI_SUCCESS (Status))
|
|
{
|
|
goto ObjectRepaired;
|
|
}
|
|
}
|
|
if (ExpectedBtypes & ACPI_RTYPE_STRING)
|
|
{
|
|
Status = AcpiNsConvertToString (ReturnObject, &NewObject);
|
|
if (ACPI_SUCCESS (Status))
|
|
{
|
|
goto ObjectRepaired;
|
|
}
|
|
}
|
|
if (ExpectedBtypes & ACPI_RTYPE_BUFFER)
|
|
{
|
|
Status = AcpiNsConvertToBuffer (ReturnObject, &NewObject);
|
|
if (ACPI_SUCCESS (Status))
|
|
{
|
|
goto ObjectRepaired;
|
|
}
|
|
}
|
|
if (ExpectedBtypes & ACPI_RTYPE_PACKAGE)
|
|
{
|
|
/*
|
|
* A package is expected. We will wrap the existing object with a
|
|
* new package object. It is often the case that if a variable-length
|
|
* package is required, but there is only a single object needed, the
|
|
* BIOS will return that object instead of wrapping it with a Package
|
|
* object. Note: after the wrapping, the package will be validated
|
|
* for correct contents (expected object type or types).
|
|
*/
|
|
Status = AcpiNsWrapWithPackage (Info, ReturnObject, &NewObject);
|
|
if (ACPI_SUCCESS (Status))
|
|
{
|
|
/*
|
|
* The original object just had its reference count
|
|
* incremented for being inserted into the new package.
|
|
*/
|
|
*ReturnObjectPtr = NewObject; /* New Package object */
|
|
Info->ReturnFlags |= ACPI_OBJECT_REPAIRED;
|
|
return (AE_OK);
|
|
}
|
|
}
|
|
|
|
/* We cannot repair this object */
|
|
|
|
return (AE_AML_OPERAND_TYPE);
|
|
|
|
|
|
ObjectRepaired:
|
|
|
|
/* Object was successfully repaired */
|
|
|
|
if (PackageIndex != ACPI_NOT_PACKAGE_ELEMENT)
|
|
{
|
|
/* Update reference count of new object */
|
|
|
|
if (!(Info->ReturnFlags & ACPI_OBJECT_WRAPPED))
|
|
{
|
|
NewObject->Common.ReferenceCount =
|
|
ReturnObject->Common.ReferenceCount;
|
|
}
|
|
|
|
ACPI_DEBUG_PRINT ((ACPI_DB_REPAIR,
|
|
"%s: Converted %s to expected %s at Package index %u\n",
|
|
Info->FullPathname, AcpiUtGetObjectTypeName (ReturnObject),
|
|
AcpiUtGetObjectTypeName (NewObject), PackageIndex));
|
|
}
|
|
else
|
|
{
|
|
ACPI_DEBUG_PRINT ((ACPI_DB_REPAIR,
|
|
"%s: Converted %s to expected %s\n",
|
|
Info->FullPathname, AcpiUtGetObjectTypeName (ReturnObject),
|
|
AcpiUtGetObjectTypeName (NewObject)));
|
|
}
|
|
|
|
/* Delete old object, install the new return object */
|
|
|
|
AcpiUtRemoveReference (ReturnObject);
|
|
*ReturnObjectPtr = NewObject;
|
|
Info->ReturnFlags |= ACPI_OBJECT_REPAIRED;
|
|
return (AE_OK);
|
|
}
|
|
|
|
|
|
/******************************************************************************
|
|
*
|
|
* FUNCTION: AcpiNsMatchSimpleRepair
|
|
*
|
|
* PARAMETERS: Node - Namespace node for the method/object
|
|
* ReturnBtype - Object type that was returned
|
|
* PackageIndex - Index of object within parent package (if
|
|
* applicable - ACPI_NOT_PACKAGE_ELEMENT
|
|
* otherwise)
|
|
*
|
|
* RETURN: Pointer to entry in repair table. NULL indicates not found.
|
|
*
|
|
* DESCRIPTION: Check an object name against the repairable object list.
|
|
*
|
|
*****************************************************************************/
|
|
|
|
static const ACPI_SIMPLE_REPAIR_INFO *
|
|
AcpiNsMatchSimpleRepair (
|
|
ACPI_NAMESPACE_NODE *Node,
|
|
UINT32 ReturnBtype,
|
|
UINT32 PackageIndex)
|
|
{
|
|
const ACPI_SIMPLE_REPAIR_INFO *ThisName;
|
|
|
|
|
|
/* Search info table for a repairable predefined method/object name */
|
|
|
|
ThisName = AcpiObjectRepairInfo;
|
|
while (ThisName->ObjectConverter)
|
|
{
|
|
if (ACPI_COMPARE_NAME (Node->Name.Ascii, ThisName->Name))
|
|
{
|
|
/* Check if we can actually repair this name/type combination */
|
|
|
|
if ((ReturnBtype & ThisName->UnexpectedBtypes) &&
|
|
(ThisName->PackageIndex == ACPI_ALL_PACKAGE_ELEMENTS ||
|
|
PackageIndex == ThisName->PackageIndex))
|
|
{
|
|
return (ThisName);
|
|
}
|
|
|
|
return (NULL);
|
|
}
|
|
|
|
ThisName++;
|
|
}
|
|
|
|
return (NULL); /* Name was not found in the repair table */
|
|
}
|
|
|
|
|
|
/*******************************************************************************
|
|
*
|
|
* FUNCTION: AcpiNsRepairNullElement
|
|
*
|
|
* PARAMETERS: Info - Method execution information block
|
|
* ExpectedBtypes - Object types expected
|
|
* PackageIndex - Index of object within parent package (if
|
|
* applicable - ACPI_NOT_PACKAGE_ELEMENT
|
|
* otherwise)
|
|
* ReturnObjectPtr - Pointer to the object returned from the
|
|
* evaluation of a method or object
|
|
*
|
|
* RETURN: Status. AE_OK if repair was successful.
|
|
*
|
|
* DESCRIPTION: Attempt to repair a NULL element of a returned Package object.
|
|
*
|
|
******************************************************************************/
|
|
|
|
ACPI_STATUS
|
|
AcpiNsRepairNullElement (
|
|
ACPI_EVALUATE_INFO *Info,
|
|
UINT32 ExpectedBtypes,
|
|
UINT32 PackageIndex,
|
|
ACPI_OPERAND_OBJECT **ReturnObjectPtr)
|
|
{
|
|
ACPI_OPERAND_OBJECT *ReturnObject = *ReturnObjectPtr;
|
|
ACPI_OPERAND_OBJECT *NewObject;
|
|
|
|
|
|
ACPI_FUNCTION_NAME (NsRepairNullElement);
|
|
|
|
|
|
/* No repair needed if return object is non-NULL */
|
|
|
|
if (ReturnObject)
|
|
{
|
|
return (AE_OK);
|
|
}
|
|
|
|
/*
|
|
* Attempt to repair a NULL element of a Package object. This applies to
|
|
* predefined names that return a fixed-length package and each element
|
|
* is required. It does not apply to variable-length packages where NULL
|
|
* elements are allowed, especially at the end of the package.
|
|
*/
|
|
if (ExpectedBtypes & ACPI_RTYPE_INTEGER)
|
|
{
|
|
/* Need an Integer - create a zero-value integer */
|
|
|
|
NewObject = AcpiUtCreateIntegerObject ((UINT64) 0);
|
|
}
|
|
else if (ExpectedBtypes & ACPI_RTYPE_STRING)
|
|
{
|
|
/* Need a String - create a NULL string */
|
|
|
|
NewObject = AcpiUtCreateStringObject (0);
|
|
}
|
|
else if (ExpectedBtypes & ACPI_RTYPE_BUFFER)
|
|
{
|
|
/* Need a Buffer - create a zero-length buffer */
|
|
|
|
NewObject = AcpiUtCreateBufferObject (0);
|
|
}
|
|
else
|
|
{
|
|
/* Error for all other expected types */
|
|
|
|
return (AE_AML_OPERAND_TYPE);
|
|
}
|
|
|
|
if (!NewObject)
|
|
{
|
|
return (AE_NO_MEMORY);
|
|
}
|
|
|
|
/* Set the reference count according to the parent Package object */
|
|
|
|
NewObject->Common.ReferenceCount =
|
|
Info->ParentPackage->Common.ReferenceCount;
|
|
|
|
ACPI_DEBUG_PRINT ((ACPI_DB_REPAIR,
|
|
"%s: Converted NULL package element to expected %s at index %u\n",
|
|
Info->FullPathname, AcpiUtGetObjectTypeName (NewObject),
|
|
PackageIndex));
|
|
|
|
*ReturnObjectPtr = NewObject;
|
|
Info->ReturnFlags |= ACPI_OBJECT_REPAIRED;
|
|
return (AE_OK);
|
|
}
|
|
|
|
|
|
/******************************************************************************
|
|
*
|
|
* FUNCTION: AcpiNsRemoveNullElements
|
|
*
|
|
* PARAMETERS: Info - Method execution information block
|
|
* PackageType - An AcpiReturnPackageTypes value
|
|
* ObjDesc - A Package object
|
|
*
|
|
* RETURN: None.
|
|
*
|
|
* DESCRIPTION: Remove all NULL package elements from packages that contain
|
|
* a variable number of subpackages. For these types of
|
|
* packages, NULL elements can be safely removed.
|
|
*
|
|
*****************************************************************************/
|
|
|
|
void
|
|
AcpiNsRemoveNullElements (
|
|
ACPI_EVALUATE_INFO *Info,
|
|
UINT8 PackageType,
|
|
ACPI_OPERAND_OBJECT *ObjDesc)
|
|
{
|
|
ACPI_OPERAND_OBJECT **Source;
|
|
ACPI_OPERAND_OBJECT **Dest;
|
|
UINT32 Count;
|
|
UINT32 NewCount;
|
|
UINT32 i;
|
|
|
|
|
|
ACPI_FUNCTION_NAME (NsRemoveNullElements);
|
|
|
|
|
|
/*
|
|
* We can safely remove all NULL elements from these package types:
|
|
* PTYPE1_VAR packages contain a variable number of simple data types.
|
|
* PTYPE2 packages contain a variable number of subpackages.
|
|
*/
|
|
switch (PackageType)
|
|
{
|
|
case ACPI_PTYPE1_VAR:
|
|
case ACPI_PTYPE2:
|
|
case ACPI_PTYPE2_COUNT:
|
|
case ACPI_PTYPE2_PKG_COUNT:
|
|
case ACPI_PTYPE2_FIXED:
|
|
case ACPI_PTYPE2_MIN:
|
|
case ACPI_PTYPE2_REV_FIXED:
|
|
case ACPI_PTYPE2_FIX_VAR:
|
|
break;
|
|
|
|
default:
|
|
case ACPI_PTYPE2_VAR_VAR:
|
|
case ACPI_PTYPE1_FIXED:
|
|
case ACPI_PTYPE1_OPTION:
|
|
return;
|
|
}
|
|
|
|
Count = ObjDesc->Package.Count;
|
|
NewCount = Count;
|
|
|
|
Source = ObjDesc->Package.Elements;
|
|
Dest = Source;
|
|
|
|
/* Examine all elements of the package object, remove nulls */
|
|
|
|
for (i = 0; i < Count; i++)
|
|
{
|
|
if (!*Source)
|
|
{
|
|
NewCount--;
|
|
}
|
|
else
|
|
{
|
|
*Dest = *Source;
|
|
Dest++;
|
|
}
|
|
|
|
Source++;
|
|
}
|
|
|
|
/* Update parent package if any null elements were removed */
|
|
|
|
if (NewCount < Count)
|
|
{
|
|
ACPI_DEBUG_PRINT ((ACPI_DB_REPAIR,
|
|
"%s: Found and removed %u NULL elements\n",
|
|
Info->FullPathname, (Count - NewCount)));
|
|
|
|
/* NULL terminate list and update the package count */
|
|
|
|
*Dest = NULL;
|
|
ObjDesc->Package.Count = NewCount;
|
|
}
|
|
}
|
|
|
|
|
|
/*******************************************************************************
|
|
*
|
|
* FUNCTION: AcpiNsWrapWithPackage
|
|
*
|
|
* PARAMETERS: Info - Method execution information block
|
|
* OriginalObject - Pointer to the object to repair.
|
|
* ObjDescPtr - The new package object is returned here
|
|
*
|
|
* RETURN: Status, new object in *ObjDescPtr
|
|
*
|
|
* DESCRIPTION: Repair a common problem with objects that are defined to
|
|
* return a variable-length Package of sub-objects. If there is
|
|
* only one sub-object, some BIOS code mistakenly simply declares
|
|
* the single object instead of a Package with one sub-object.
|
|
* This function attempts to repair this error by wrapping a
|
|
* Package object around the original object, creating the
|
|
* correct and expected Package with one sub-object.
|
|
*
|
|
* Names that can be repaired in this manner include:
|
|
* _ALR, _CSD, _HPX, _MLS, _PLD, _PRT, _PSS, _TRT, _TSS,
|
|
* _BCL, _DOD, _FIX, _Sx
|
|
*
|
|
******************************************************************************/
|
|
|
|
ACPI_STATUS
|
|
AcpiNsWrapWithPackage (
|
|
ACPI_EVALUATE_INFO *Info,
|
|
ACPI_OPERAND_OBJECT *OriginalObject,
|
|
ACPI_OPERAND_OBJECT **ObjDescPtr)
|
|
{
|
|
ACPI_OPERAND_OBJECT *PkgObjDesc;
|
|
|
|
|
|
ACPI_FUNCTION_NAME (NsWrapWithPackage);
|
|
|
|
|
|
/*
|
|
* Create the new outer package and populate it. The new
|
|
* package will have a single element, the lone sub-object.
|
|
*/
|
|
PkgObjDesc = AcpiUtCreatePackageObject (1);
|
|
if (!PkgObjDesc)
|
|
{
|
|
return (AE_NO_MEMORY);
|
|
}
|
|
|
|
PkgObjDesc->Package.Elements[0] = OriginalObject;
|
|
|
|
ACPI_DEBUG_PRINT ((ACPI_DB_REPAIR,
|
|
"%s: Wrapped %s with expected Package object\n",
|
|
Info->FullPathname, AcpiUtGetObjectTypeName (OriginalObject)));
|
|
|
|
/* Return the new object in the object pointer */
|
|
|
|
*ObjDescPtr = PkgObjDesc;
|
|
Info->ReturnFlags |= ACPI_OBJECT_REPAIRED | ACPI_OBJECT_WRAPPED;
|
|
return (AE_OK);
|
|
}
|