diff options
Diffstat (limited to 'sys/contrib/dev/acpica/nsload.c')
| -rw-r--r-- | sys/contrib/dev/acpica/nsload.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/sys/contrib/dev/acpica/nsload.c b/sys/contrib/dev/acpica/nsload.c index eb8cd5d..5cd5d43 100644 --- a/sys/contrib/dev/acpica/nsload.c +++ b/sys/contrib/dev/acpica/nsload.c @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: nsload - namespace loading/expanding/contracting procedures - * $Revision: 64 $ + * $Revision: 66 $ * *****************************************************************************/ @@ -153,7 +153,7 @@ AcpiNsLoadTable ( /* Check if table contains valid AML (must be DSDT, PSDT, SSDT, etc.) */ - if (!(AcpiGbl_AcpiTableData[TableDesc->Type].Flags & ACPI_TABLE_EXECUTABLE)) + if (!(AcpiGbl_TableData[TableDesc->Type].Flags & ACPI_TABLE_EXECUTABLE)) { /* Just ignore this table */ @@ -263,7 +263,7 @@ AcpiNsLoadTableByType ( ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Loading DSDT\n")); - TableDesc = &AcpiGbl_AcpiTables[ACPI_TABLE_DSDT]; + TableDesc = AcpiGbl_TableLists[ACPI_TABLE_DSDT].Next; /* If table already loaded into namespace, just return */ @@ -272,8 +272,6 @@ AcpiNsLoadTableByType ( goto UnlockAndExit; } - TableDesc->TableId = TABLE_ID_DSDT; - /* Now load the single DSDT */ Status = AcpiNsLoadTable (TableDesc, AcpiGbl_RootNode); @@ -288,13 +286,13 @@ AcpiNsLoadTableByType ( case ACPI_TABLE_SSDT: ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Loading %d SSDTs\n", - AcpiGbl_AcpiTables[ACPI_TABLE_SSDT].Count)); + AcpiGbl_TableLists[ACPI_TABLE_SSDT].Count)); /* * Traverse list of SSDT tables */ - TableDesc = &AcpiGbl_AcpiTables[ACPI_TABLE_SSDT]; - for (i = 0; i < AcpiGbl_AcpiTables[ACPI_TABLE_SSDT].Count; i++) + TableDesc = AcpiGbl_TableLists[ACPI_TABLE_SSDT].Next; + for (i = 0; i < AcpiGbl_TableLists[ACPI_TABLE_SSDT].Count; i++) { /* * Only attempt to load table if it is not @@ -319,14 +317,14 @@ AcpiNsLoadTableByType ( case ACPI_TABLE_PSDT: ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Loading %d PSDTs\n", - AcpiGbl_AcpiTables[ACPI_TABLE_PSDT].Count)); + AcpiGbl_TableLists[ACPI_TABLE_PSDT].Count)); /* * Traverse list of PSDT tables */ - TableDesc = &AcpiGbl_AcpiTables[ACPI_TABLE_PSDT]; + TableDesc = AcpiGbl_TableLists[ACPI_TABLE_PSDT].Next; - for (i = 0; i < AcpiGbl_AcpiTables[ACPI_TABLE_PSDT].Count; i++) + for (i = 0; i < AcpiGbl_TableLists[ACPI_TABLE_PSDT].Count; i++) { /* Only attempt to load table if it is not already loaded! */ |
