| pci_pci.c (124365) | pci_pci.c (124641) |
|---|---|
| 1/*- 2 * Copyright (c) 1994,1995 Stefan Esser, Wolfgang StanglMeier 3 * Copyright (c) 2000 Michael Smith <msmith@freebsd.org> 4 * Copyright (c) 2000 BSDi 5 * All rights reserved. 6 * 7 * Redistribution and use in source and binary forms, with or without 8 * modification, are permitted provided that the following conditions --- 15 unchanged lines hidden (view full) --- 24 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 28 * SUCH DAMAGE. 29 */ 30 31#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1994,1995 Stefan Esser, Wolfgang StanglMeier 3 * Copyright (c) 2000 Michael Smith <msmith@freebsd.org> 4 * Copyright (c) 2000 BSDi 5 * All rights reserved. 6 * 7 * Redistribution and use in source and binary forms, with or without 8 * modification, are permitted provided that the following conditions --- 15 unchanged lines hidden (view full) --- 24 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 28 * SUCH DAMAGE. 29 */ 30 31#include <sys/cdefs.h> |
| 32__FBSDID("$FreeBSD: head/sys/dev/pci/pci_pci.c 124365 2004-01-11 06:52:31Z imp $"); | 32__FBSDID("$FreeBSD: head/sys/dev/pci/pci_pci.c 124641 2004-01-17 21:54:04Z imp $"); |
| 33 34/* 35 * PCI:PCI bridge support. 36 */ 37 38#include <sys/param.h> 39#include <sys/systm.h> 40#include <sys/kernel.h> --- 275 unchanged lines hidden (view full) --- 316 if (!ok) { 317 if (start < sc->iobase) 318 start = sc->iobase; 319 if (end > sc->iolimit) 320 end = sc->iolimit; 321 } 322 } else { 323 ok = 1; | 33 34/* 35 * PCI:PCI bridge support. 36 */ 37 38#include <sys/param.h> 39#include <sys/systm.h> 40#include <sys/kernel.h> --- 275 unchanged lines hidden (view full) --- 316 if (!ok) { 317 if (start < sc->iobase) 318 start = sc->iobase; 319 if (end > sc->iolimit) 320 end = sc->iolimit; 321 } 322 } else { 323 ok = 1; |
| 324#if 0 |
|
| 324 if (start < sc->iobase && end > sc->iolimit) { 325 start = sc->iobase; 326 end = sc->iolimit; 327 } | 325 if (start < sc->iobase && end > sc->iolimit) { 326 start = sc->iobase; 327 end = sc->iolimit; 328 } |
| 328 | 329#endif |
| 329 } 330 if (end < start) { 331 device_printf(dev, "ioport: end (%lx) < start (%lx)\n", end, start); 332 start = 0; 333 end = 0; 334 ok = 0; 335 } 336 if (!ok) { --- 34 unchanged lines hidden (view full) --- 371 end = sc->memlimit; 372 } else { 373 ok = 0; 374 } 375 } 376 } 377 } else if (!ok) { 378 ok = 1; /* subtractive bridge: always ok */ | 330 } 331 if (end < start) { 332 device_printf(dev, "ioport: end (%lx) < start (%lx)\n", end, start); 333 start = 0; 334 end = 0; 335 ok = 0; 336 } 337 if (!ok) { --- 34 unchanged lines hidden (view full) --- 372 end = sc->memlimit; 373 } else { 374 ok = 0; 375 } 376 } 377 } 378 } else if (!ok) { 379 ok = 1; /* subtractive bridge: always ok */ |
| 380#if 0 |
|
| 379 if (pcib_is_nonprefetch_open(sc)) { 380 if (start < sc->membase && end > sc->memlimit) { 381 start = sc->membase; 382 end = sc->memlimit; 383 } 384 } 385 if (pcib_is_prefetch_open(sc)) { 386 if (start < sc->pmembase && end > sc->pmemlimit) { 387 start = sc->pmembase; 388 end = sc->pmemlimit; 389 } 390 } | 381 if (pcib_is_nonprefetch_open(sc)) { 382 if (start < sc->membase && end > sc->memlimit) { 383 start = sc->membase; 384 end = sc->memlimit; 385 } 386 } 387 if (pcib_is_prefetch_open(sc)) { 388 if (start < sc->pmembase && end > sc->pmemlimit) { 389 start = sc->pmembase; 390 end = sc->pmemlimit; 391 } 392 } |
| 393#endif |
|
| 391 } 392 if (end < start) { 393 device_printf(dev, "memory: end (%lx) < start (%lx)\n", end, start); 394 start = 0; 395 end = 0; 396 ok = 0; 397 } 398 if (!ok && bootverbose) --- 162 unchanged lines hidden --- | 394 } 395 if (end < start) { 396 device_printf(dev, "memory: end (%lx) < start (%lx)\n", end, start); 397 start = 0; 398 end = 0; 399 ok = 0; 400 } 401 if (!ok && bootverbose) --- 162 unchanged lines hidden --- |