diff options
| author | njl <njl@FreeBSD.org> | 2003-12-09 02:45:16 +0000 |
|---|---|---|
| committer | njl <njl@FreeBSD.org> | 2003-12-09 02:45:16 +0000 |
| commit | 2a9caa496cc3521e5c9352c255b827c90efb3839 (patch) | |
| tree | 24e5ad5d8b4fb5681ddaa34c6ae30814c80ffe56 /sys/contrib/dev/acpica/exstoren.c | |
| parent | dc49a5b908c59c6ae7c8b069908225dd6c21c041 (diff) | |
| download | FreeBSD-src-2a9caa496cc3521e5c9352c255b827c90efb3839.zip FreeBSD-src-2a9caa496cc3521e5c9352c255b827c90efb3839.tar.gz | |
Import ACPI-CA 20031203
Diffstat (limited to 'sys/contrib/dev/acpica/exstoren.c')
| -rw-r--r-- | sys/contrib/dev/acpica/exstoren.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/contrib/dev/acpica/exstoren.c b/sys/contrib/dev/acpica/exstoren.c index 22c5d1f..0f380d8 100644 --- a/sys/contrib/dev/acpica/exstoren.c +++ b/sys/contrib/dev/acpica/exstoren.c @@ -3,7 +3,7 @@ * * Module Name: exstoren - AML Interpreter object store support, * Store to Node (namespace object) - * $Revision: 55 $ + * $Revision: 56 $ * *****************************************************************************/ @@ -120,6 +120,7 @@ #include "acpi.h" #include "acinterp.h" +#include "amlcode.h" #define _COMPONENT ACPI_EXECUTER @@ -191,9 +192,10 @@ AcpiExResolveObject ( /* * Must have a Integer, Buffer, or String */ - if ((ACPI_GET_OBJECT_TYPE (SourceDesc) != ACPI_TYPE_INTEGER) && - (ACPI_GET_OBJECT_TYPE (SourceDesc) != ACPI_TYPE_BUFFER) && - (ACPI_GET_OBJECT_TYPE (SourceDesc) != ACPI_TYPE_STRING)) + if ((ACPI_GET_OBJECT_TYPE (SourceDesc) != ACPI_TYPE_INTEGER) && + (ACPI_GET_OBJECT_TYPE (SourceDesc) != ACPI_TYPE_BUFFER) && + (ACPI_GET_OBJECT_TYPE (SourceDesc) != ACPI_TYPE_STRING) && + !((ACPI_GET_OBJECT_TYPE (SourceDesc) == ACPI_TYPE_LOCAL_REFERENCE) && (SourceDesc->Reference.Opcode == AML_LOAD_OP))) { /* * Conversion successful but still not a valid type |
