Deleted Added
full compact
acpi_pcib_acpi.c (70468) acpi_pcib_acpi.c (71872)
1/*-
2 * Copyright (c) 2000 Michael Smith
3 * Copyright (c) 2000 BSDi
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 10 unchanged lines hidden (view full) ---

19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 *
1/*-
2 * Copyright (c) 2000 Michael Smith
3 * Copyright (c) 2000 BSDi
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 10 unchanged lines hidden (view full) ---

19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 *
27 * $FreeBSD: head/sys/dev/acpica/acpi_pcib_acpi.c 70468 2000-12-29 09:42:05Z msmith $
27 * $FreeBSD: head/sys/dev/acpica/acpi_pcib_acpi.c 71872 2001-01-31 09:30:57Z msmith $
28 */
29#include "opt_acpi.h"
30#include <sys/param.h>
31#include <sys/kernel.h>
32#include <sys/bus.h>
33
34#include "acpi.h"
35

--- 103 unchanged lines hidden (view full) ---

139 */
140 if (!acpi_DeviceIsPresent(dev))
141 return_VALUE(ENXIO);
142
143 /*
144 * Get our segment number by evaluating _SEG
145 * It's OK for this to not exist.
146 */
28 */
29#include "opt_acpi.h"
30#include <sys/param.h>
31#include <sys/kernel.h>
32#include <sys/bus.h>
33
34#include "acpi.h"
35

--- 103 unchanged lines hidden (view full) ---

139 */
140 if (!acpi_DeviceIsPresent(dev))
141 return_VALUE(ENXIO);
142
143 /*
144 * Get our segment number by evaluating _SEG
145 * It's OK for this to not exist.
146 */
147 if ((status = acpi_EvaluateNumber(sc->ap_handle, "_SEG", &sc->ap_segment)) != AE_OK) {
147 if ((status = acpi_EvaluateInteger(sc->ap_handle, "_SEG", &sc->ap_segment)) != AE_OK) {
148 if (status != AE_NOT_FOUND) {
149 device_printf(dev, "could not evaluate _SEG - %s\n", acpi_strerror(status));
150 return_VALUE(ENXIO);
151 }
152 /* if it's not found, assume 0 */
153 sc->ap_segment = 0;
154 }
155

--- 5 unchanged lines hidden (view full) ---

161 * meant to use a private configuration space mechanism for this bus,
162 * so we should dig out our resources and check to see if we have
163 * anything like that. How do we do this?
164 * XXX If we have the requisite information, and if we don't think the
165 * default PCI configuration space handlers can deal with this bus,
166 * we should attach our own handler.
167 * XXX invoke _REG on this for the PCI config space address space?
168 */
148 if (status != AE_NOT_FOUND) {
149 device_printf(dev, "could not evaluate _SEG - %s\n", acpi_strerror(status));
150 return_VALUE(ENXIO);
151 }
152 /* if it's not found, assume 0 */
153 sc->ap_segment = 0;
154 }
155

--- 5 unchanged lines hidden (view full) ---

161 * meant to use a private configuration space mechanism for this bus,
162 * so we should dig out our resources and check to see if we have
163 * anything like that. How do we do this?
164 * XXX If we have the requisite information, and if we don't think the
165 * default PCI configuration space handlers can deal with this bus,
166 * we should attach our own handler.
167 * XXX invoke _REG on this for the PCI config space address space?
168 */
169 if ((status = acpi_EvaluateNumber(sc->ap_handle, "_BBN", &sc->ap_bus)) != AE_OK) {
169 if ((status = acpi_EvaluateInteger(sc->ap_handle, "_BBN", &sc->ap_bus)) != AE_OK) {
170 if (status != AE_NOT_FOUND) {
171 device_printf(dev, "could not evaluate _BBN - %s\n", acpi_strerror(status));
172 return_VALUE(ENXIO);
173 }
174 /* if it's not found, assume 0 */
175 sc->ap_bus = 0;
176 }
177

--- 76 unchanged lines hidden ---
170 if (status != AE_NOT_FOUND) {
171 device_printf(dev, "could not evaluate _BBN - %s\n", acpi_strerror(status));
172 return_VALUE(ENXIO);
173 }
174 /* if it's not found, assume 0 */
175 sc->ap_bus = 0;
176 }
177

--- 76 unchanged lines hidden ---