we no longer need to add in the offset to the mapped VA to get the correct

device address (bus_tmp, bus_map, and mapiodev now do this for us).

also, we handle all our mappings, so don't have obio.c do any for us
(i.e. don't set ra->ra_len in xdcmatch).
This commit is contained in:
chuck 1996-01-12 22:43:55 +00:00
parent 8068d9eeb2
commit d14b5cb80e
1 changed files with 2 additions and 8 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: xd.c,v 1.11 1996/01/07 22:03:02 thorpej Exp $ */
/* $NetBSD: xd.c,v 1.12 1996/01/12 22:43:55 chuck Exp $ */
/*
*
@ -36,7 +36,7 @@
* x d . c x y l o g i c s 7 5 3 / 7 0 5 3 v m e / s m d d r i v e r
*
* author: Chuck Cranor <chuck@ccrc.wustl.edu>
* id: $Id: xd.c,v 1.11 1996/01/07 22:03:02 thorpej Exp $
* id: $Id: xd.c,v 1.12 1996/01/12 22:43:55 chuck Exp $
* started: 27-Feb-95
* references: [1] Xylogics Model 753 User's Manual
* part number: 166-753-001, Revision B, May 21, 1988.
@ -360,8 +360,6 @@ int xdcmatch(parent, match, aux)
if (cputyp == CPU_SUN4) {
vaddr = ra->ra_vaddr;
if ((u_long) ra->ra_paddr & PGOFSET)
(u_long) vaddr |= ((u_long) ra->ra_paddr & PGOFSET);
xdc = (struct xdc *) vaddr;
if (probeget(&xdc->xdc_csr, 1) == -1)
return (0);
@ -369,7 +367,6 @@ int xdcmatch(parent, match, aux)
XDC_WAIT(xdc, del, XDC_RESETUSEC, XDC_RESET);
if (del <= 0)
return (0);
ra->ra_len = NBPG;
}
return (1);
}
@ -394,9 +391,6 @@ xdcattach(parent, self, aux)
ca->ca_ra.ra_vaddr = mapiodev(ca->ca_ra.ra_reg, 0,
ca->ca_ra.ra_len, ca->ca_bustype);
if ((u_long) ca->ca_ra.ra_paddr & PGOFSET)
(u_long) ca->ca_ra.ra_vaddr |=
((u_long) ca->ca_ra.ra_paddr & PGOFSET);
xdc->xdc = (struct xdc *) ca->ca_ra.ra_vaddr;
pri = ca->ca_ra.ra_intr[0].int_pri;