diff options
author | mjacob <mjacob@FreeBSD.org> | 2002-10-11 17:18:54 +0000 |
---|---|---|
committer | mjacob <mjacob@FreeBSD.org> | 2002-10-11 17:18:54 +0000 |
commit | 89ee3553f82e20daa697f61e79c568eceb2e93b8 (patch) | |
tree | 4837cb8956189e73c243f70f3bacfe5f9304d11c /sys/dev/bge/if_bge.c | |
parent | 17d5c600123150647e4ea0ef660087faeccaae54 (diff) | |
download | FreeBSD-src-89ee3553f82e20daa697f61e79c568eceb2e93b8.zip FreeBSD-src-89ee3553f82e20daa697f61e79c568eceb2e93b8.tar.gz |
Fix the code so that it no longer on alpha refers to the now nonexistent
pci_cvt_to_bwx.
This doesn't necessarily make bge(4) now actually *work* on an alpha.
It loads, configures, and then about 30 seconds later, my XP1000 hard
freezes. But, hey, it's a start.
Obtained from: gallatin@freebsd.org
Diffstat (limited to 'sys/dev/bge/if_bge.c')
-rw-r--r-- | sys/dev/bge/if_bge.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c index 55bc011..3c50cc5 100644 --- a/sys/dev/bge/if_bge.c +++ b/sys/dev/bge/if_bge.c @@ -1480,7 +1480,7 @@ bge_attach(dev) rid = BGE_PCI_BAR0; sc->bge_res = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid, - 0, ~0, 1, RF_ACTIVE); + 0, ~0, 1, RF_ACTIVE|PCI_RF_DENSE); if (sc->bge_res == NULL) { printf ("bge%d: couldn't map memory\n", unit); @@ -1492,22 +1492,6 @@ bge_attach(dev) sc->bge_bhandle = rman_get_bushandle(sc->bge_res); sc->bge_vhandle = (vm_offset_t)rman_get_virtual(sc->bge_res); - /* - * XXX FIXME: rman_get_virtual() on the alpha is currently - * broken and returns a physical address instead of a kernel - * virtual address. Consequently, we need to do a little - * extra mangling of the vhandle on the alpha. This should - * eventually be fixed! The whole idea here is to get rid - * of platform dependencies. - */ -#ifdef __alpha__ - if (pci_cvt_to_bwx(sc->bge_vhandle)) - sc->bge_vhandle = pci_cvt_to_bwx(sc->bge_vhandle); - else - sc->bge_vhandle = pci_cvt_to_dense(sc->bge_vhandle); - sc->bge_vhandle = ALPHA_PHYS_TO_K0SEG(sc->bge_vhandle); -#endif - /* Allocate interrupt */ rid = 0; |