* Completely rewrite the alpha busspace to hide the implementation from

  the drivers.
* Remove legacy inx/outx support from chipset and replace with macros
  which call busspace.
* Rework pci config accesses to route through the pcib device instead of
  calling a MD function directly.

With these changes it is possible to cleanly support machines which have
more than one independantly numbered PCI busses. As a bonus, the new
busspace implementation should be measurably faster than the old one.

4 files changed, 4 insertions, 1 deletions

diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c
index cbb5a34..fc89297 100644
--- a/sys/dev/ata/ata-all.c
+++ b/sys/dev/ata/ata-all.c
@@ -519,7 +519,7 @@ ata_pci_alloc_resource(device_t dev, device_t child, int type, int *rid,
 {
     struct ata_pci_softc *sc = device_get_softc(dev);
     int masterdev = pci_get_progif(dev) & PCIP_STORAGE_IDE_MASTERDEV;
-    int unit = (int)device_get_ivars(child);
+    int unit = (intptr_t)device_get_ivars(child);
     int myrid;
 
     if (type == SYS_RES_IOPORT) {
diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c
index e0f89c6..86d945c 100644
--- a/sys/dev/ata/ata-disk.c
+++ b/sys/dev/ata/ata-disk.c
@@ -48,6 +48,7 @@
 #include <vm/vm_object.h>
 #include <machine/clock.h>
 #include <machine/md_var.h>
+#include <machine/bus.h>
 #include <dev/ata/ata-all.h>
 #include <dev/ata/ata-disk.h>
 
diff --git a/sys/dev/ata/ata-dma.c b/sys/dev/ata/ata-dma.c
index ad542024..838495d 100644
--- a/sys/dev/ata/ata-dma.c
+++ b/sys/dev/ata/ata-dma.c
@@ -43,6 +43,7 @@
 #endif
 #include <dev/ata/ata-all.h>
 #include <dev/ata/ata-disk.h>
+#include <machine/bus.h>
 
 #if NPCI > 0
 
diff --git a/sys/dev/ata/atapi-all.c b/sys/dev/ata/atapi-all.c
index 1862ccf..b8ee8ae 100644
--- a/sys/dev/ata/atapi-all.c
+++ b/sys/dev/ata/atapi-all.c
@@ -39,6 +39,7 @@
 #include <sys/bus.h>
 #include <sys/malloc.h>
 #include <machine/clock.h>
+#include <machine/bus.h>
 #include <dev/ata/ata-all.h>
 #include <dev/ata/atapi-all.h>