diff options
Diffstat (limited to 'sys/arch/sun3/dev/xd.c')
| -rw-r--r-- | sys/arch/sun3/dev/xd.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/sun3/dev/xd.c b/sys/arch/sun3/dev/xd.c index 3352fd1bfe8..a4ae623c13a 100644 --- a/sys/arch/sun3/dev/xd.c +++ b/sys/arch/sun3/dev/xd.c @@ -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.4 1996/02/08 04:43:47 chuck Exp $ + * id: $Id: xd.c,v 1.5 1996/03/04 20:35:27 chuck Exp $ * started: 27-Feb-95 * references: [1] Xylogics Model 753 User's Manual * part number: 166-753-001, Revision B, May 21, 1988. @@ -143,7 +143,7 @@ (ADDR) = ((ADDR) >> 8); \ (XDC)->xdc_iopbaddr3 = (ADDR); \ (XDC)->xdc_iopbamod = XDC_ADDRMOD; \ - (XDC)->xdc_csr |= XDC_ADDIOPB; /* go! */ \ + (XDC)->xdc_csr = XDC_ADDIOPB; /* go! */ \ } /* @@ -402,9 +402,9 @@ xdcattach(parent, self, aux) dvma_kvtopa((long) xdc->iopbase, BUS_VME32); xdc->reqs = (struct xd_iorq *) malloc(XDC_MAXIOPB * sizeof(struct xd_iorq), M_DEVBUF, M_NOWAIT); - bzero(xdc->reqs, XDC_MAXIOPB * sizeof(struct xd_iorq)); if (xdc->reqs == NULL) panic("xdc malloc"); + bzero(xdc->reqs, XDC_MAXIOPB * sizeof(struct xd_iorq)); /* init free list, iorq to iopb pointers, and non-zero fields in the * iopb which never change. */ @@ -1257,8 +1257,8 @@ xdc_rqtopb(iorq, iopb, cmd, subfun) block = block / iorq->xd->nhead; iopb->cylno = block; } - dp = dvma_kvtopa((long)iorq->dbuf, BUS_VME32); - iopb->daddr = dp = (iorq->dbuf == NULL) ? 0 : dp; + iopb->daddr = dp = (iorq->dbuf == NULL) ? 0 : + dvma_kvtopa((long)iorq->dbuf, BUS_VME32); iopb->addrmod = XDC_ADDRMOD; } } @@ -1646,7 +1646,7 @@ xdc_xdreset(xdcsc, xdsc) if (del <= 0) panic("xdc_reset"); } else { - xdcsc->xdc->xdc_csr |= XDC_CLRRIO; /* clear RIO */ + xdcsc->xdc->xdc_csr = XDC_CLRRIO; /* clear RIO */ } bcopy(&tmpiopb, xdcsc->iopbase, sizeof(tmpiopb)); } @@ -1815,7 +1815,7 @@ xdc_remove_iorq(xdcsc) * done bit. */ if (xdc->xdc_csr & XDC_REMIOPB) { - xdc->xdc_csr |= XDC_CLRRIO; + xdc->xdc_csr = XDC_CLRRIO; } for (rqno = 0; rqno < XDC_MAXIOPB; rqno++) { |