diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2017-06-29 18:42:13 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2017-06-29 18:42:13 +0000 |
| commit | 744d47ba98ced2e2a7d3aff2f894136544386e34 (patch) | |
| tree | 917f6a025e019c7b80e50a45fa783593b4e3c19e /source/tools | |
| parent | c457a42be4fca72c51fdca569271b62213d01a37 (diff) | |
Notes
Diffstat (limited to 'source/tools')
| -rw-r--r-- | source/tools/acpiexec/aeexception.c | 15 | ||||
| -rw-r--r-- | source/tools/acpiexec/aemain.c | 1 | ||||
| -rw-r--r-- | source/tools/acpinames/anmain.c | 1 | ||||
| -rw-r--r-- | source/tools/acpisrc/astable.c | 14 |
4 files changed, 20 insertions, 11 deletions
diff --git a/source/tools/acpiexec/aeexception.c b/source/tools/acpiexec/aeexception.c index a5a3293ad304..62e9db0a0122 100644 --- a/source/tools/acpiexec/aeexception.c +++ b/source/tools/acpiexec/aeexception.c @@ -259,21 +259,16 @@ AeExceptionHandler ( Cleanup: - /* Global overrides */ - if (AcpiGbl_IgnoreErrors) { + /* Global option to ignore all method errors, just return OK */ + NewAmlStatus = AE_OK; } - else if (AmlStatus == AE_AML_INTERNAL) - { - NewAmlStatus = AE_AML_INTERNAL; - AcpiOsPrintf (AE_PREFIX - "Cannot override status %s\n\n", - AcpiFormatException (NewAmlStatus)); - } - else if (NewAmlStatus != AmlStatus) + if (NewAmlStatus != AmlStatus) { + /* Request to override actual status with a different status */ + AcpiOsPrintf (AE_PREFIX "Exception override, new status %s\n\n", AcpiFormatException (NewAmlStatus)); diff --git a/source/tools/acpiexec/aemain.c b/source/tools/acpiexec/aemain.c index 2601d3369b89..3ea512100da4 100644 --- a/source/tools/acpiexec/aemain.c +++ b/source/tools/acpiexec/aemain.c @@ -792,5 +792,6 @@ NormalExit: ErrorExit: (void) AcpiOsTerminate (); + AcDeleteTableList (ListHead); return (ExitCode); } diff --git a/source/tools/acpinames/anmain.c b/source/tools/acpinames/anmain.c index ff341df328fe..256acaa97df8 100644 --- a/source/tools/acpinames/anmain.c +++ b/source/tools/acpinames/anmain.c @@ -409,5 +409,6 @@ AnDumpEntireNamespace ( Status = AcpiGetHandle (NULL, "\\_GPE", &Handle); ACPI_CHECK_OK (AcpiGetHandle, Status); + AcDeleteTableList (ListHead); return (0); } diff --git a/source/tools/acpisrc/astable.c b/source/tools/acpisrc/astable.c index fe07e44cb47f..e0215e97a459 100644 --- a/source/tools/acpisrc/astable.c +++ b/source/tools/acpisrc/astable.c @@ -488,8 +488,14 @@ ACPI_TYPED_IDENTIFIER_TABLE AcpiIdentifiers[] = { {"ACPI_RESOURCE_INFO", SRC_TYPE_STRUCT}, {"ACPI_RESOURCE_IO", SRC_TYPE_STRUCT}, {"ACPI_RESOURCE_IRQ", SRC_TYPE_STRUCT}, + {"ACPI_RESOURCE_LABEL", SRC_TYPE_STRUCT}, {"ACPI_RESOURCE_MEMORY24", SRC_TYPE_STRUCT}, {"ACPI_RESOURCE_MEMORY32", SRC_TYPE_STRUCT}, + {"ACPI_RESOURCE_PIN_CONFIG", SRC_TYPE_STRUCT}, + {"ACPI_RESOURCE_PIN_FUNCTION", SRC_TYPE_STRUCT}, + {"ACPI_RESOURCE_PIN_GROUP", SRC_TYPE_STRUCT}, + {"ACPI_RESOURCE_PIN_GROUP_CONFIG", SRC_TYPE_STRUCT}, + {"ACPI_RESOURCE_PIN_GROUP_FUNCTION", SRC_TYPE_STRUCT}, {"ACPI_RESOURCE_SOURCE", SRC_TYPE_STRUCT}, {"ACPI_RESOURCE_SPI_SERIALBUS", SRC_TYPE_STRUCT}, {"ACPI_RESOURCE_START_DEPENDENT", SRC_TYPE_STRUCT}, @@ -584,6 +590,11 @@ ACPI_TYPED_IDENTIFIER_TABLE AcpiIdentifiers[] = { {"AML_RESOURCE_LARGE_HEADER", SRC_TYPE_STRUCT}, {"AML_RESOURCE_MEMORY24", SRC_TYPE_STRUCT}, {"AML_RESOURCE_MEMORY32", SRC_TYPE_STRUCT}, + {"AML_RESOURCE_PIN_CONFIG", SRC_TYPE_STRUCT}, + {"AML_RESOURCE_PIN_FUNCTION", SRC_TYPE_STRUCT}, + {"AML_RESOURCE_PIN_GROUP", SRC_TYPE_STRUCT}, + {"AML_RESOURCE_PIN_GROUP_CONFIG", SRC_TYPE_STRUCT}, + {"AML_RESOURCE_PIN_GROUP_FUNCTION", SRC_TYPE_STRUCT}, {"AML_RESOURCE_SMALL_HEADER", SRC_TYPE_STRUCT}, {"AML_RESOURCE_SPI_SERIALBUS", SRC_TYPE_STRUCT}, {"AML_RESOURCE_START_DEPENDENT", SRC_TYPE_STRUCT}, @@ -730,8 +741,9 @@ ACPI_TYPED_IDENTIFIER_TABLE AcpiIdentifiers[] = { {"ACPI_HEST_GENERIC_DATA_V300", SRC_TYPE_STRUCT}, {"ACPI_HEST_IA_DEFERRED_CHECK", SRC_TYPE_STRUCT}, {"ACPI_HMAT_ADDRESS_RANGE", SRC_TYPE_STRUCT}, - {"ACPI_HMAT_LOCALITY", SRC_TYPE_STRUCT}, {"ACPI_HMAT_CACHE", SRC_TYPE_STRUCT}, + {"ACPI_HMAT_LOCALITY", SRC_TYPE_STRUCT}, + {"ACPI_HMAT_STRUCTURE", SRC_TYPE_STRUCT}, {"ACPI_IBFT_HEADER", SRC_TYPE_STRUCT}, {"ACPI_IBFT_CONTROL", SRC_TYPE_STRUCT}, {"ACPI_IBFT_INITIATOR", SRC_TYPE_STRUCT}, |