Rev 1498 | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1498 | Rev 2216 | ||
|---|---|---|---|
| Line 6... | Line 6... | ||
| 6 | 6 | ||
| 7 | /****************************************************************************** |
7 | /****************************************************************************** |
| 8 | * |
8 | * |
| 9 | * 1. Copyright Notice |
9 | * 1. Copyright Notice |
| 10 | * |
10 | * |
| 11 | * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp. |
11 | * Some or all of this work - Copyright (c) 1999 - 2011, Intel Corp. |
| 12 | * All rights reserved. |
12 | * All rights reserved. |
| 13 | * |
13 | * |
| 14 | * 2. License |
14 | * 2. License |
| 15 | * |
15 | * |
| Line 393... | Line 393... | ||
| 393 | ACPI_FREE (PciId); |
393 | ACPI_FREE (PciId); |
| 394 | return_ACPI_STATUS (AE_AML_OPERAND_TYPE); |
394 | return_ACPI_STATUS (AE_AML_OPERAND_TYPE); |
| 395 | } |
395 | } |
| Line 396... | Line 396... | ||
| 396 | 396 | ||
| 397 | /* |
397 | /* |
| 398 | * Get the PCI device and function numbers from the _ADR object contained |
398 | * Get the PCI device and function numbers from the _ADR object |
| 399 | * in the parent's scope. |
399 | * contained in the parent's scope. |
| 400 | */ |
400 | */ |
| 401 | Status = AcpiUtEvaluateNumericObject (METHOD_NAME__ADR, |
401 | Status = AcpiUtEvaluateNumericObject (METHOD_NAME__ADR, |
| Line 402... | Line 402... | ||
| 402 | PciDeviceNode, &PciValue); |
402 | PciDeviceNode, &PciValue); |
| Line 427... | Line 427... | ||
| 427 | if (ACPI_SUCCESS (Status)) |
427 | if (ACPI_SUCCESS (Status)) |
| 428 | { |
428 | { |
| 429 | PciId->Bus = ACPI_LOWORD (PciValue); |
429 | PciId->Bus = ACPI_LOWORD (PciValue); |
| 430 | } |
430 | } |
| Line 431... | Line 431... | ||
| 431 | 431 | ||
| Line 432... | Line 432... | ||
| 432 | /* Complete this device's PciId */ |
432 | /* Complete/update the PCI ID for this device */ |
| - | 433 | ||
| - | 434 | Status = AcpiHwDerivePciId (PciId, PciRootNode, RegionObj->Region.Node); |
|
| - | 435 | if (ACPI_FAILURE (Status)) |
|
| - | 436 | { |
|
| - | 437 | ACPI_FREE (PciId); |
|
| Line 433... | Line 438... | ||
| 433 | 438 | return_ACPI_STATUS (Status); |
|
| 434 | AcpiOsDerivePciId (PciRootNode, RegionObj->Region.Node, &PciId); |
439 | } |
| 435 | 440 | ||
| Line 722... | Line 727... | ||
| 722 | * Node's object was replaced by this Method object and we |
727 | * Node's object was replaced by this Method object and we |
| 723 | * saved the handler in the method object. |
728 | * saved the handler in the method object. |
| 724 | * |
729 | * |
| 725 | * See AcpiNsExecModuleCode |
730 | * See AcpiNsExecModuleCode |
| 726 | */ |
731 | */ |
| 727 | if (ObjDesc->Method.Flags & AOPOBJ_MODULE_LEVEL) |
732 | if (ObjDesc->Method.InfoFlags & ACPI_METHOD_MODULE_LEVEL) |
| 728 | { |
733 | { |
| 729 | HandlerObj = ObjDesc->Method.Extra.Handler; |
734 | HandlerObj = ObjDesc->Method.Dispatch.Handler; |
| 730 | } |
735 | } |
| 731 | break; |
736 | break; |
| Line 732... | Line 737... | ||
| 732 | 737 | ||
| 733 | default: |
738 | default: |
| Line 761... | Line 766... | ||
| 761 | { |
766 | { |
| 762 | return_ACPI_STATUS (Status); |
767 | return_ACPI_STATUS (Status); |
| 763 | } |
768 | } |
| 764 | } |
769 | } |
| Line 765... | Line 770... | ||
| 765 | 770 | ||
| Line 766... | Line 771... | ||
| 766 | Status = AcpiEvExecuteRegMethod (RegionObj, 1); |
771 | Status = AcpiEvExecuteRegMethod (RegionObj, ACPI_REG_CONNECT); |
| 767 | 772 | ||
| 768 | if (AcpiNsLocked) |
773 | if (AcpiNsLocked) |
| 769 | { |
774 | { |