diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-12-08 00:21:01 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-12-08 00:21:01 +0000 |
| commit | a92da5c62c369c891657c866ae655e835e619b1b (patch) | |
| tree | dc969867b8b6715fb4be99f7ce144cfaec2f5d7c /sys/arch/alpha/pci/lca.c | |
| parent | a67276bead2aa835bc93c17180c2109635ba693c (diff) | |
Merge to NetBSD 961107, i.e. mostly new bus.h
Diffstat (limited to 'sys/arch/alpha/pci/lca.c')
| -rw-r--r-- | sys/arch/alpha/pci/lca.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/sys/arch/alpha/pci/lca.c b/sys/arch/alpha/pci/lca.c index a0004181456..8ef53fda822 100644 --- a/sys/arch/alpha/pci/lca.c +++ b/sys/arch/alpha/pci/lca.c @@ -1,5 +1,5 @@ -/* $OpenBSD: lca.c,v 1.5 1996/11/23 21:44:54 kstailey Exp $ */ -/* $NetBSD: lca.c,v 1.10 1996/10/13 03:00:07 christos Exp $ */ +/* $OpenBSD: lca.c,v 1.6 1996/12/08 00:20:37 niklas Exp $ */ +/* $NetBSD: lca.c,v 1.11 1996/10/23 04:12:25 cgd Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -45,7 +45,6 @@ #include <dev/pci/pcivar.h> #include <alpha/pci/lcareg.h> #include <alpha/pci/lcavar.h> -#include <alpha/pci/apecs_lca.h> #if defined(DEC_AXPPCI_33) #include <alpha/pci/pci_axppci_33.h> #endif @@ -96,8 +95,8 @@ lca_init(lcp) * Can't set up SGMAP data here; can be called before malloc(). */ - apecs_lca_bus_io_init(&lcp->lc_bc, lcp); - apecs_lca_bus_mem_init(&lcp->lc_bc, lcp); + lcp->lc_iot = apecs_lca_bus_io_init(lcp); + lcp->lc_memt = apecs_lca_bus_mem_init(lcp); lca_pci_init(&lcp->lc_pc, lcp); /* @@ -129,6 +128,13 @@ lca_init(lcp) /* REGVAL(LCA_IOC_W_BASE0) = 0; REGVAL(LCA_IOC_W_BASE1) = 0; */ alpha_mb(); + + /* XXX XXX BEGIN XXX XXX */ + { /* XXX */ + extern vm_offset_t alpha_XXX_dmamap_or; /* XXX */ + alpha_XXX_dmamap_or = 0x40000000; /* XXX */ + } /* XXX */ + /* XXX XXX END XXX XXX */ } #ifdef notdef @@ -194,7 +200,8 @@ lcaattach(parent, self, aux) } pba.pba_busname = "pci"; - pba.pba_bc = &lcp->lc_bc; + pba.pba_iot = lcp->lc_iot; + pba.pba_memt = lcp->lc_memt; pba.pba_pc = &lcp->lc_pc; pba.pba_bus = 0; config_found(self, &pba, lcaprint); |