diff options
| -rw-r--r-- | sys/arch/alpha/conf/files.alpha | 4 | ||||
| -rw-r--r-- | sys/arch/alpha/pci/irongate_dma.c | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/sys/arch/alpha/conf/files.alpha b/sys/arch/alpha/conf/files.alpha index dd22a788971..fcf8d1abf92 100644 --- a/sys/arch/alpha/conf/files.alpha +++ b/sys/arch/alpha/conf/files.alpha @@ -1,4 +1,4 @@ -# $OpenBSD: files.alpha,v 1.52 2001/11/05 02:39:56 art Exp $ +# $OpenBSD: files.alpha,v 1.53 2001/11/05 02:41:01 art Exp $ # $NetBSD: files.alpha,v 1.32 1996/11/25 04:03:21 cgd Exp $ # # alpha-specific configuration info @@ -205,7 +205,7 @@ file arch/alpha/pci/cia_bus_mem.c cia file arch/alpha/pci/cia_bwx_bus_io.c cia file arch/alpha/pci/cia_bwx_bus_mem.c cia -device irongate: pcibus +device irongate: pcibus, isadma_bounce attach irongate at mainbus file arch/alpha/pci/irongate.c irongate file arch/alpha/pci/irongate_bus_io.c irongate diff --git a/sys/arch/alpha/pci/irongate_dma.c b/sys/arch/alpha/pci/irongate_dma.c index 17e286299e3..fc0c99e1900 100644 --- a/sys/arch/alpha/pci/irongate_dma.c +++ b/sys/arch/alpha/pci/irongate_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: irongate_dma.c,v 1.2 2001/04/17 14:53:33 art Exp $ */ +/* $OpenBSD: irongate_dma.c,v 1.3 2001/11/05 02:41:02 art Exp $ */ /* $NetBSD: irongate_dma.c,v 1.3 2000/06/29 08:58:47 mrg Exp $ */ /*- @@ -76,6 +76,8 @@ #include <dev/isa/isareg.h> #include <dev/isa/isavar.h> +#include "isadma.h" + bus_dma_tag_t irongate_dma_get_tag(bus_dma_tag_t, alpha_bus_t); void @@ -109,7 +111,7 @@ irongate_dma_init(struct irongate_config *icp) t->_dmamem_unmap = _bus_dmamem_unmap; t->_dmamem_mmap = _bus_dmamem_mmap; -#if 0 +#if NISADMA > 0 /* * Initialize the DMA tag used for ISA DMA. */ @@ -136,6 +138,7 @@ irongate_dma_init(struct irongate_config *icp) t->_dmamem_unmap = _bus_dmamem_unmap; t->_dmamem_mmap = _bus_dmamem_mmap; #endif + /* XXX XXX BEGIN XXX XXX */ { /* XXX */ extern paddr_t alpha_XXX_dmamap_or; /* XXX */ |