diff options
author | Lv Zheng <lv.zheng@intel.com> | 2016-05-26 08:44:31 +0800 |
---|---|---|
committer | Lv Zheng <lv.zheng@intel.com> | 2016-06-06 12:58:27 +0800 |
commit | 9fcf90766f26bef08ae06d0aefa975ad18b64ba7 (patch) | |
tree | 21637e6f6605048da4852fb206e7b476f0e6a59f | |
parent | 3a81e13d1640464df04a0454a9b5bb12abd101f4 (diff) | |
download | acpica-9fcf90766f26bef08ae06d0aefa975ad18b64ba7.tar.gz |
EFI/acpidump: Remove Gbl_DumpCustomizedTables awareness
EFI environment doesn't support any table customization mechanism, and
acpidump defaults to use "-c on", it then is a problem that in UEFI
environment, user can obtain nothing by just type "acpidump.efi". This
patch removes Gbl_DumpCustomizedTables awaness to fix this issue. Lv Zheng.
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
-rw-r--r-- | source/os_specific/service_layers/osefitbl.c | 80 |
1 files changed, 30 insertions, 50 deletions
diff --git a/source/os_specific/service_layers/osefitbl.c b/source/os_specific/service_layers/osefitbl.c index ec2161915..42924053d 100644 --- a/source/os_specific/service_layers/osefitbl.c +++ b/source/os_specific/service_layers/osefitbl.c @@ -305,18 +305,7 @@ AcpiOsGetTableByName ( /* Not a main ACPI table, attempt to extract it from the RSDT/XSDT */ - if (!Gbl_DumpCustomizedTables) - { - /* Attempt to get the table from the memory */ - - Status = OslGetTable (Signature, Instance, Table, Address); - } - else - { - /* Attempt to get the table from the static directory */ - - Status = AE_SUPPORT; - } + Status = OslGetTable (Signature, Instance, Table, Address); return (Status); } @@ -650,56 +639,47 @@ OslTableInitialize ( return (Status); } - if (!Gbl_DumpCustomizedTables) + /* Add mandatory tables to global table list first */ + + Status = OslAddTableToList (ACPI_RSDP_NAME, 0); + if (ACPI_FAILURE (Status)) { - /* Add mandatory tables to global table list first */ + return (Status); + } - Status = OslAddTableToList (ACPI_RSDP_NAME, 0); - if (ACPI_FAILURE (Status)) - { - return (Status); - } + Status = OslAddTableToList (ACPI_SIG_RSDT, 0); + if (ACPI_FAILURE (Status)) + { + return (Status); + } - Status = OslAddTableToList (ACPI_SIG_RSDT, 0); + if (Gbl_Revision == 2) + { + Status = OslAddTableToList (ACPI_SIG_XSDT, 0); if (ACPI_FAILURE (Status)) { return (Status); } + } - if (Gbl_Revision == 2) - { - Status = OslAddTableToList (ACPI_SIG_XSDT, 0); - if (ACPI_FAILURE (Status)) - { - return (Status); - } - } - - Status = OslAddTableToList (ACPI_SIG_DSDT, 0); - if (ACPI_FAILURE (Status)) - { - return (Status); - } + Status = OslAddTableToList (ACPI_SIG_DSDT, 0); + if (ACPI_FAILURE (Status)) + { + return (Status); + } - Status = OslAddTableToList (ACPI_SIG_FACS, 0); - if (ACPI_FAILURE (Status)) - { - return (Status); - } + Status = OslAddTableToList (ACPI_SIG_FACS, 0); + if (ACPI_FAILURE (Status)) + { + return (Status); + } - /* Add all tables found in the memory */ + /* Add all tables found in the memory */ - Status = OslListTables (); - if (ACPI_FAILURE (Status)) - { - return (Status); - } - } - else + Status = OslListTables (); + if (ACPI_FAILURE (Status)) { - /* Add all tables found in the static directory */ - - Status = AE_SUPPORT; + return (Status); } Gbl_TableListInitialized = TRUE; |