pci_boot.c (9896aa55) | pci_boot.c (5cff7825) |
---|---|
1/* 2 * CDDL HEADER START 3 * 4 * The contents of this file are subject to the terms of the 5 * Common Development and Distribution License (the "License"). 6 * You may not use this file except in compliance with the License. 7 * 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE --- 101 unchanged lines hidden (view full) --- 110 ACPI_BUFFER rb; 111 ACPI_RESOURCE *rp; 112 int rv; 113 114 if (pci_bus_res[bus].dip == NULL) { 115 /* non-used bus # */ 116 return (AE_ERROR); 117 } | 1/* 2 * CDDL HEADER START 3 * 4 * The contents of this file are subject to the terms of the 5 * Common Development and Distribution License (the "License"). 6 * You may not use this file except in compliance with the License. 7 * 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE --- 101 unchanged lines hidden (view full) --- 110 ACPI_BUFFER rb; 111 ACPI_RESOURCE *rp; 112 int rv; 113 114 if (pci_bus_res[bus].dip == NULL) { 115 /* non-used bus # */ 116 return (AE_ERROR); 117 } |
118 if (acpica_find_pciobj(pci_bus_res[bus].dip, &hdl) != AE_OK) { | 118 if (acpica_get_handle(pci_bus_res[bus].dip, &hdl) != AE_OK) { |
119 cmn_err(CE_WARN, "!No ACPI obj for bus%d, ACPI OFF?\n", bus); 120 return (AE_ERROR); 121 } 122 123 rb.Length = ACPI_ALLOCATE_BUFFER; 124 if (AcpiGetCurrentResources(hdl, &rb) != AE_OK) { 125 cmn_err(CE_WARN, "!_CRS failed on pci%d\n", bus); 126 return (AE_ERROR); --- 108 unchanged lines hidden (view full) --- 235 ACPI_HANDLE hdl; 236 ACPI_BUFFER rb; 237 int rv; 238 239 /* no dip means no _BBN */ 240 if (pci_bus_res[bus].dip == NULL) 241 return (0); 242 | 119 cmn_err(CE_WARN, "!No ACPI obj for bus%d, ACPI OFF?\n", bus); 120 return (AE_ERROR); 121 } 122 123 rb.Length = ACPI_ALLOCATE_BUFFER; 124 if (AcpiGetCurrentResources(hdl, &rb) != AE_OK) { 125 cmn_err(CE_WARN, "!_CRS failed on pci%d\n", bus); 126 return (AE_ERROR); --- 108 unchanged lines hidden (view full) --- 235 ACPI_HANDLE hdl; 236 ACPI_BUFFER rb; 237 int rv; 238 239 /* no dip means no _BBN */ 240 if (pci_bus_res[bus].dip == NULL) 241 return (0); 242 |
243 rv = acpica_find_pciobj(pci_bus_res[bus].dip, &hdl); | 243 rv = acpica_get_handle(pci_bus_res[bus].dip, &hdl); |
244 if (rv != AE_OK) 245 return (-1); 246 247 rb.Length = ACPI_ALLOCATE_BUFFER; 248 249 rv = AcpiEvaluateObject(hdl, "_BBN", NULL, &rb); 250 251 if (rb.Length > 0) --- 1753 unchanged lines hidden --- | 244 if (rv != AE_OK) 245 return (-1); 246 247 rb.Length = ACPI_ALLOCATE_BUFFER; 248 249 rv = AcpiEvaluateObject(hdl, "_BBN", NULL, &rb); 250 251 if (rb.Length > 0) --- 1753 unchanged lines hidden --- |