From 2827e383d552774c11bb806510c3468678d07994 Mon Sep 17 00:00:00 2001 From: jkim Date: Fri, 19 Apr 2013 05:49:53 +0000 Subject: Import ACPICA 20130418. --- source/components/namespace/nsprepkg.c | 75 +++++++++++++++++----------------- 1 file changed, 38 insertions(+), 37 deletions(-) (limited to 'source/components/namespace/nsprepkg.c') diff --git a/source/components/namespace/nsprepkg.c b/source/components/namespace/nsprepkg.c index d18205c..5177c3d 100644 --- a/source/components/namespace/nsprepkg.c +++ b/source/components/namespace/nsprepkg.c @@ -55,14 +55,14 @@ static ACPI_STATUS AcpiNsCheckPackageList ( - ACPI_PREDEFINED_DATA *Data, + ACPI_EVALUATE_INFO *Info, const ACPI_PREDEFINED_INFO *Package, ACPI_OPERAND_OBJECT **Elements, UINT32 Count); static ACPI_STATUS AcpiNsCheckPackageElements ( - ACPI_PREDEFINED_DATA *Data, + ACPI_EVALUATE_INFO *Info, ACPI_OPERAND_OBJECT **Elements, UINT8 Type1, UINT32 Count1, @@ -75,7 +75,7 @@ AcpiNsCheckPackageElements ( * * FUNCTION: AcpiNsCheckPackage * - * PARAMETERS: Data - Pointer to validation data structure + * PARAMETERS: Info - Method execution information block * ReturnObjectPtr - Pointer to the object returned from the * evaluation of a method or object * @@ -88,7 +88,7 @@ AcpiNsCheckPackageElements ( ACPI_STATUS AcpiNsCheckPackage ( - ACPI_PREDEFINED_DATA *Data, + ACPI_EVALUATE_INFO *Info, ACPI_OPERAND_OBJECT **ReturnObjectPtr) { ACPI_OPERAND_OBJECT *ReturnObject = *ReturnObjectPtr; @@ -105,17 +105,18 @@ AcpiNsCheckPackage ( /* The package info for this name is in the next table entry */ - Package = Data->Predefined + 1; + Package = Info->Predefined + 1; ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "%s Validating return Package of Type %X, Count %X\n", - Data->Pathname, Package->RetInfo.Type, ReturnObject->Package.Count)); + Info->FullPathname, Package->RetInfo.Type, + ReturnObject->Package.Count)); /* * For variable-length Packages, we can safely remove all embedded * and trailing NULL package elements */ - AcpiNsRemoveNullElements (Data, Package->RetInfo.Type, ReturnObject); + AcpiNsRemoveNullElements (Info, Package->RetInfo.Type, ReturnObject); /* Extract package count and elements array */ @@ -133,7 +134,7 @@ AcpiNsCheckPackage ( return (AE_OK); } - ACPI_WARN_PREDEFINED ((AE_INFO, Data->Pathname, Data->NodeFlags, + ACPI_WARN_PREDEFINED ((AE_INFO, Info->FullPathname, Info->NodeFlags, "Return Package has no elements (empty)")); return (AE_AML_OPERAND_VALUE); @@ -165,12 +166,12 @@ AcpiNsCheckPackage ( ACPI_DEBUG_PRINT ((ACPI_DB_REPAIR, "%s: Return Package is larger than needed - " "found %u, expected %u\n", - Data->Pathname, Count, ExpectedCount)); + Info->FullPathname, Count, ExpectedCount)); } /* Validate all elements of the returned package */ - Status = AcpiNsCheckPackageElements (Data, Elements, + Status = AcpiNsCheckPackageElements (Info, Elements, Package->RetInfo.ObjectType1, Package->RetInfo.Count1, Package->RetInfo.ObjectType2, Package->RetInfo.Count2, 0); break; @@ -184,7 +185,7 @@ AcpiNsCheckPackage ( */ for (i = 0; i < Count; i++) { - Status = AcpiNsCheckObjectType (Data, Elements, + Status = AcpiNsCheckObjectType (Info, Elements, Package->RetInfo.ObjectType1, i); if (ACPI_FAILURE (Status)) { @@ -218,7 +219,7 @@ AcpiNsCheckPackage ( { /* These are the required package elements (0, 1, or 2) */ - Status = AcpiNsCheckObjectType (Data, Elements, + Status = AcpiNsCheckObjectType (Info, Elements, Package->RetInfo3.ObjectType[i], i); if (ACPI_FAILURE (Status)) { @@ -229,7 +230,7 @@ AcpiNsCheckPackage ( { /* These are the optional package elements */ - Status = AcpiNsCheckObjectType (Data, Elements, + Status = AcpiNsCheckObjectType (Info, Elements, Package->RetInfo3.TailObjectType, i); if (ACPI_FAILURE (Status)) { @@ -245,7 +246,7 @@ AcpiNsCheckPackage ( /* First element is the (Integer) revision */ - Status = AcpiNsCheckObjectType (Data, Elements, + Status = AcpiNsCheckObjectType (Info, Elements, ACPI_RTYPE_INTEGER, 0); if (ACPI_FAILURE (Status)) { @@ -257,7 +258,7 @@ AcpiNsCheckPackage ( /* Examine the sub-packages */ - Status = AcpiNsCheckPackageList (Data, Package, Elements, Count); + Status = AcpiNsCheckPackageList (Info, Package, Elements, Count); break; @@ -265,7 +266,7 @@ AcpiNsCheckPackage ( /* First element is the (Integer) count of sub-packages to follow */ - Status = AcpiNsCheckObjectType (Data, Elements, + Status = AcpiNsCheckObjectType (Info, Elements, ACPI_RTYPE_INTEGER, 0); if (ACPI_FAILURE (Status)) { @@ -287,7 +288,7 @@ AcpiNsCheckPackage ( /* Examine the sub-packages */ - Status = AcpiNsCheckPackageList (Data, Package, Elements, Count); + Status = AcpiNsCheckPackageList (Info, Package, Elements, Count); break; @@ -311,7 +312,7 @@ AcpiNsCheckPackage ( { /* Create the new outer package and populate it */ - Status = AcpiNsWrapWithPackage (Data, ReturnObject, ReturnObjectPtr); + Status = AcpiNsWrapWithPackage (Info, ReturnObject, ReturnObjectPtr); if (ACPI_FAILURE (Status)) { return (Status); @@ -326,7 +327,7 @@ AcpiNsCheckPackage ( /* Examine the sub-packages */ - Status = AcpiNsCheckPackageList (Data, Package, Elements, Count); + Status = AcpiNsCheckPackageList (Info, Package, Elements, Count); break; @@ -334,7 +335,7 @@ AcpiNsCheckPackage ( /* Should not get here if predefined info table is correct */ - ACPI_WARN_PREDEFINED ((AE_INFO, Data->Pathname, Data->NodeFlags, + ACPI_WARN_PREDEFINED ((AE_INFO, Info->FullPathname, Info->NodeFlags, "Invalid internal return type in table entry: %X", Package->RetInfo.Type)); @@ -348,7 +349,7 @@ PackageTooSmall: /* Error exit for the case with an incorrect package count */ - ACPI_WARN_PREDEFINED ((AE_INFO, Data->Pathname, Data->NodeFlags, + ACPI_WARN_PREDEFINED ((AE_INFO, Info->FullPathname, Info->NodeFlags, "Return Package is too small - found %u elements, expected %u", Count, ExpectedCount)); @@ -360,7 +361,7 @@ PackageTooSmall: * * FUNCTION: AcpiNsCheckPackageList * - * PARAMETERS: Data - Pointer to validation data structure + * PARAMETERS: Info - Method execution information block * Package - Pointer to package-specific info for method * Elements - Element list of parent package. All elements * of this list should be of type Package. @@ -374,7 +375,7 @@ PackageTooSmall: static ACPI_STATUS AcpiNsCheckPackageList ( - ACPI_PREDEFINED_DATA *Data, + ACPI_EVALUATE_INFO *Info, const ACPI_PREDEFINED_INFO *Package, ACPI_OPERAND_OBJECT **Elements, UINT32 Count) @@ -398,11 +399,11 @@ AcpiNsCheckPackageList ( { SubPackage = *Elements; SubElements = SubPackage->Package.Elements; - Data->ParentPackage = SubPackage; + Info->ParentPackage = SubPackage; /* Each sub-object must be of type Package */ - Status = AcpiNsCheckObjectType (Data, &SubPackage, + Status = AcpiNsCheckObjectType (Info, &SubPackage, ACPI_RTYPE_PACKAGE, i); if (ACPI_FAILURE (Status)) { @@ -411,7 +412,7 @@ AcpiNsCheckPackageList ( /* Examine the different types of expected sub-packages */ - Data->ParentPackage = SubPackage; + Info->ParentPackage = SubPackage; switch (Package->RetInfo.Type) { case ACPI_PTYPE2: @@ -426,7 +427,7 @@ AcpiNsCheckPackageList ( goto PackageTooSmall; } - Status = AcpiNsCheckPackageElements (Data, SubElements, + Status = AcpiNsCheckPackageElements (Info, SubElements, Package->RetInfo.ObjectType1, Package->RetInfo.Count1, Package->RetInfo.ObjectType2, @@ -449,7 +450,7 @@ AcpiNsCheckPackageList ( goto PackageTooSmall; } - Status = AcpiNsCheckPackageElements (Data, SubElements, + Status = AcpiNsCheckPackageElements (Info, SubElements, Package->RetInfo.ObjectType1, Package->RetInfo.Count1, Package->RetInfo.ObjectType2, @@ -475,7 +476,7 @@ AcpiNsCheckPackageList ( for (j = 0; j < ExpectedCount; j++) { - Status = AcpiNsCheckObjectType (Data, &SubElements[j], + Status = AcpiNsCheckObjectType (Info, &SubElements[j], Package->RetInfo2.ObjectType[j], j); if (ACPI_FAILURE (Status)) { @@ -497,7 +498,7 @@ AcpiNsCheckPackageList ( /* Check the type of each sub-package element */ - Status = AcpiNsCheckPackageElements (Data, SubElements, + Status = AcpiNsCheckPackageElements (Info, SubElements, Package->RetInfo.ObjectType1, SubPackage->Package.Count, 0, 0, 0); if (ACPI_FAILURE (Status)) @@ -513,7 +514,7 @@ AcpiNsCheckPackageList ( * First element is the (Integer) count of elements, including * the count field (the ACPI name is NumElements) */ - Status = AcpiNsCheckObjectType (Data, SubElements, + Status = AcpiNsCheckObjectType (Info, SubElements, ACPI_RTYPE_INTEGER, 0); if (ACPI_FAILURE (Status)) { @@ -548,7 +549,7 @@ AcpiNsCheckPackageList ( /* Check the type of each sub-package element */ - Status = AcpiNsCheckPackageElements (Data, (SubElements + 1), + Status = AcpiNsCheckPackageElements (Info, (SubElements + 1), Package->RetInfo.ObjectType1, (ExpectedCount - 1), 0, 0, 1); if (ACPI_FAILURE (Status)) @@ -573,7 +574,7 @@ PackageTooSmall: /* The sub-package count was smaller than required */ - ACPI_WARN_PREDEFINED ((AE_INFO, Data->Pathname, Data->NodeFlags, + ACPI_WARN_PREDEFINED ((AE_INFO, Info->FullPathname, Info->NodeFlags, "Return Sub-Package[%u] is too small - found %u elements, expected %u", i, SubPackage->Package.Count, ExpectedCount)); @@ -585,7 +586,7 @@ PackageTooSmall: * * FUNCTION: AcpiNsCheckPackageElements * - * PARAMETERS: Data - Pointer to validation data structure + * PARAMETERS: Info - Method execution information block * Elements - Pointer to the package elements array * Type1 - Object type for first group * Count1 - Count for first group @@ -602,7 +603,7 @@ PackageTooSmall: static ACPI_STATUS AcpiNsCheckPackageElements ( - ACPI_PREDEFINED_DATA *Data, + ACPI_EVALUATE_INFO *Info, ACPI_OPERAND_OBJECT **Elements, UINT8 Type1, UINT32 Count1, @@ -622,7 +623,7 @@ AcpiNsCheckPackageElements ( */ for (i = 0; i < Count1; i++) { - Status = AcpiNsCheckObjectType (Data, ThisElement, + Status = AcpiNsCheckObjectType (Info, ThisElement, Type1, i + StartIndex); if (ACPI_FAILURE (Status)) { @@ -633,7 +634,7 @@ AcpiNsCheckPackageElements ( for (i = 0; i < Count2; i++) { - Status = AcpiNsCheckObjectType (Data, ThisElement, + Status = AcpiNsCheckObjectType (Info, ThisElement, Type2, (i + Count1 + StartIndex)); if (ACPI_FAILURE (Status)) { -- cgit v1.1