summaryrefslogtreecommitdiffstats
path: root/sys/alpha/pci/tsunami.c
diff options
context:
space:
mode:
authordfr <dfr@FreeBSD.org>2001-05-23 19:44:17 +0000
committerdfr <dfr@FreeBSD.org>2001-05-23 19:44:17 +0000
commit2434332d91b4f39ff3786b3aab3122174307715e (patch)
tree61074a40ef2eba99c2d03a6241a1a87ab4851204 /sys/alpha/pci/tsunami.c
parent3f4e4d353ca694c8535f3410280128fde8e1cc06 (diff)
downloadFreeBSD-src-2434332d91b4f39ff3786b3aab3122174307715e.zip
FreeBSD-src-2434332d91b4f39ff3786b3aab3122174307715e.tar.gz
Make sure that all resource allocation is handled in the pcib device, not
the chipset. This is already how the multi-hose systems handle resource allocation and it fixes a bug where dense and bwx memory allocations were not handled properly. Reviewed by: gallatin
Diffstat (limited to 'sys/alpha/pci/tsunami.c')
-rw-r--r--sys/alpha/pci/tsunami.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/alpha/pci/tsunami.c b/sys/alpha/pci/tsunami.c
index feacfa2..3aac951 100644
--- a/sys/alpha/pci/tsunami.c
+++ b/sys/alpha/pci/tsunami.c
@@ -44,7 +44,6 @@
#include <alpha/isa/isavar.h>
#include <alpha/pci/tsunamireg.h>
#include <alpha/pci/tsunamivar.h>
-#include <alpha/pci/pcibus.h>
#include <machine/bwx.h>
#include <machine/intr.h>
#include <machine/intrcnt.h>
@@ -248,8 +247,8 @@ tsunami_init()
bwx_init_space(&io_space, KV(TSUNAMI_IO(0)));
bwx_init_space(&mem_space, KV(TSUNAMI_MEM(0)));
- busspace_isa_io = (kobj_t) &io_space;
- busspace_isa_mem = (kobj_t) &mem_space;
+ busspace_isa_io = (struct alpha_busspace *) &io_space;
+ busspace_isa_mem = (struct alpha_busspace *) &mem_space;
chipset = tsunami_chipset;
platform.pci_intr_enable = tsunami_intr_enable;
@@ -274,7 +273,6 @@ tsunami_probe(device_t dev)
else
tsunami_num_pchips = 1;
- pci_init_resources();
isa_init_intr();
for(i = 0; i < tsunami_num_pchips; i++) {
OpenPOWER on IntegriCloud