diff options
| author | Dana Myers <Dana.Myers@Sun.COM> | 2009-06-26 17:26:34 -0700 |
|---|---|---|
| committer | Dana Myers <Dana.Myers@Sun.COM> | 2009-06-26 17:26:34 -0700 |
| commit | aa2aa9a662539940ddbc8610da5a3a874ebd7503 (patch) | |
| tree | d2dd92b7b5a29e1dda236a25c20d249a78c49d7c /usr/src/uts/intel/io/acpica/resources/rscreate.c | |
| parent | 4cc341244283c4f742842066f99a49422ca19bbd (diff) | |
| download | illumos-joyent-aa2aa9a662539940ddbc8610da5a3a874ebd7503.tar.gz | |
6836969 acpica: update to Intel ACPI CA 20090521
6387741 process_master_file() causes kmem panics given a bogus master file
6837274 acpica: acpi_enum.c creates non-IEEE-1275 'compatible' properties
Diffstat (limited to 'usr/src/uts/intel/io/acpica/resources/rscreate.c')
| -rw-r--r-- | usr/src/uts/intel/io/acpica/resources/rscreate.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/usr/src/uts/intel/io/acpica/resources/rscreate.c b/usr/src/uts/intel/io/acpica/resources/rscreate.c index 9665fbadd6..e9c840b64e 100644 --- a/usr/src/uts/intel/io/acpica/resources/rscreate.c +++ b/usr/src/uts/intel/io/acpica/resources/rscreate.c @@ -1,7 +1,6 @@ /******************************************************************************* * * Module Name: rscreate - Create resource lists/tables - * $Revision: 1.79 $ * ******************************************************************************/ @@ -9,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2008, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp. * All rights reserved. * * 2. License @@ -117,6 +116,7 @@ #define __RSCREATE_C__ #include "acpi.h" +#include "accommon.h" #include "acresrc.h" #include "acnamesp.h" @@ -298,7 +298,7 @@ AcpiRsCreatePciRoutingTable ( /* Each element of the top-level package must also be a package */ - if (ACPI_GET_OBJECT_TYPE (*TopObjectList) != ACPI_TYPE_PACKAGE) + if ((*TopObjectList)->Common.Type != ACPI_TYPE_PACKAGE) { ACPI_ERROR ((AE_INFO, "(PRT[%X]) Need sub-package, found %s", @@ -326,7 +326,7 @@ AcpiRsCreatePciRoutingTable ( /* 1) First subobject: Dereference the PRT.Address */ ObjDesc = SubObjectList[0]; - if (ACPI_GET_OBJECT_TYPE (ObjDesc) != ACPI_TYPE_INTEGER) + if (ObjDesc->Common.Type != ACPI_TYPE_INTEGER) { ACPI_ERROR ((AE_INFO, "(PRT[%X].Address) Need Integer, found %s", Index, AcpiUtGetObjectTypeName (ObjDesc))); @@ -338,7 +338,7 @@ AcpiRsCreatePciRoutingTable ( /* 2) Second subobject: Dereference the PRT.Pin */ ObjDesc = SubObjectList[1]; - if (ACPI_GET_OBJECT_TYPE (ObjDesc) != ACPI_TYPE_INTEGER) + if (ObjDesc->Common.Type != ACPI_TYPE_INTEGER) { ACPI_ERROR ((AE_INFO, "(PRT[%X].Pin) Need Integer, found %s", Index, AcpiUtGetObjectTypeName (ObjDesc))); @@ -354,7 +354,7 @@ AcpiRsCreatePciRoutingTable ( * other ACPI implementations. */ ObjDesc = SubObjectList[3]; - if (!ObjDesc || (ACPI_GET_OBJECT_TYPE (ObjDesc) != ACPI_TYPE_INTEGER)) + if (!ObjDesc || (ObjDesc->Common.Type != ACPI_TYPE_INTEGER)) { SubObjectList[3] = SubObjectList[2]; SubObjectList[2] = ObjDesc; @@ -371,7 +371,7 @@ AcpiRsCreatePciRoutingTable ( ObjDesc = SubObjectList[2]; if (ObjDesc) { - switch (ACPI_GET_OBJECT_TYPE (ObjDesc)) + switch (ObjDesc->Common.Type) { case ACPI_TYPE_LOCAL_REFERENCE: @@ -439,7 +439,7 @@ AcpiRsCreatePciRoutingTable ( /* 4) Fourth subobject: Dereference the PRT.SourceIndex */ ObjDesc = SubObjectList[3]; - if (ACPI_GET_OBJECT_TYPE (ObjDesc) != ACPI_TYPE_INTEGER) + if (ObjDesc->Common.Type != ACPI_TYPE_INTEGER) { ACPI_ERROR ((AE_INFO, "(PRT[%X].SourceIndex) Need Integer, found %s", |