diff options
| author | Robert Moore <Robert.Moore@intel.com> | 2018-12-06 07:29:13 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-06 07:29:13 -0800 |
| commit | e87e175555ac7df470378291fa392ccc6afe6282 (patch) | |
| tree | 64bc3c1bf3c2aab15da90cd3474b489d08802279 | |
| parent | d42ec8616721dd450f74f229070b5b3fc89dd644 (diff) | |
| parent | 142bd6f57c5bfadebf99b8f8bbb68d5d1477a16d (diff) | |
| download | acpica-e87e175555ac7df470378291fa392ccc6afe6282.tar.gz | |
Merge pull request #431 from SchmErik/oemx
disassembler: disassemble OEMx tables as AML
| -rw-r--r-- | source/components/utilities/utmisc.c | 3 | ||||
| -rw-r--r-- | source/include/actbl.h | 1 | ||||
| -rw-r--r-- | source/include/actypes.h | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/source/components/utilities/utmisc.c b/source/components/utilities/utmisc.c index 0e04aff06..c6dbf915c 100644 --- a/source/components/utilities/utmisc.c +++ b/source/components/utilities/utmisc.c @@ -217,7 +217,8 @@ AcpiUtIsAmlTable ( if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_DSDT) || ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_PSDT) || ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_SSDT) || - ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_OSDT)) + ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_OSDT) || + ACPI_IS_OEM_SIG (Table->Signature)) { return (TRUE); } diff --git a/source/include/actbl.h b/source/include/actbl.h index 58a9b7345..f6a2f7c50 100644 --- a/source/include/actbl.h +++ b/source/include/actbl.h @@ -182,6 +182,7 @@ #define ACPI_SIG_XSDT "XSDT" /* Extended System Description Table */ #define ACPI_SIG_SSDT "SSDT" /* Secondary System Description Table */ #define ACPI_RSDP_NAME "RSDP" /* Short name for RSDP, not signature */ +#define ACPI_OEM_NAME "OEM" /* Short name for OEM, not signature */ /* diff --git a/source/include/actypes.h b/source/include/actypes.h index a6d520fc0..396fb5244 100644 --- a/source/include/actypes.h +++ b/source/include/actypes.h @@ -678,6 +678,10 @@ typedef UINT64 ACPI_INTEGER; #define ACPI_VALIDATE_RSDP_SIG(a) (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_SIG_RSDP, 8)) #define ACPI_MAKE_RSDP_SIG(dest) (memcpy (ACPI_CAST_PTR (char, (dest)), ACPI_SIG_RSDP, 8)) +/* Support for OEMx signature (x can be any character) */ +#define ACPI_IS_OEM_SIG(a) (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_OEM_NAME, 3) &&\ + strnlen (a, ACPI_NAME_SIZE) == ACPI_NAME_SIZE) + /* * Algorithm to obtain access bit width. * Can be used with AccessWidth of ACPI_GENERIC_ADDRESS and AccessSize of |