Skip to content

Commit

Permalink
Update table load object initialization
Browse files Browse the repository at this point in the history
Use the common internal "initialize objects" interface
Affects:
Load()
LoadTable()
AcpiLoadTable
  • Loading branch information
acpibob committed Jun 20, 2019
1 parent 106c72a commit c7ef9f3
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
12 changes: 6 additions & 6 deletions source/components/executer/exconfig.c
Original file line number Diff line number Diff line change
Expand Up @@ -342,10 +342,9 @@ AcpiExLoadTableOp (
return_ACPI_STATUS (Status);
}

/* Complete the initialization/resolution of package objects */
/* Complete the initialization/resolution of new objects */

Status = AcpiNsWalkNamespace (ACPI_TYPE_PACKAGE, ACPI_ROOT_OBJECT,
ACPI_UINT32_MAX, 0, AcpiNsInitOnePackage, NULL, NULL, NULL);
AcpiNsInitializeObjects ();

/* Parameter Data (optional) */

Expand Down Expand Up @@ -620,10 +619,11 @@ AcpiExLoadOp (
return_ACPI_STATUS (Status);
}

/* Complete the initialization/resolution of package objects */
/* Complete the initialization/resolution of new objects */

Status = AcpiNsWalkNamespace (ACPI_TYPE_PACKAGE, ACPI_ROOT_OBJECT,
ACPI_UINT32_MAX, 0, AcpiNsInitOnePackage, NULL, NULL, NULL);
AcpiExExitInterpreter ();
AcpiNsInitializeObjects ();
AcpiExEnterInterpreter ();

/* Store the DdbHandle into the Target operand */

Expand Down
7 changes: 7 additions & 0 deletions source/components/tables/tbxfload.c
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,13 @@ AcpiLoadTable (
ACPI_INFO (("Host-directed Dynamic ACPI Table Load:"));
Status = AcpiTbInstallAndLoadTable (ACPI_PTR_TO_PHYSADDR (Table),
ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL, FALSE, &TableIndex);
if (ACPI_SUCCESS (Status))
{
/* Complete the initialization/resolution of new objects */

AcpiNsInitializeObjects ();
}

return_ACPI_STATUS (Status);
}

Expand Down

0 comments on commit c7ef9f3

Please sign in to comment.