Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix two bugs reported by Don Koch <aardvark@poirot.krl.com> (PR#2169). 

[1] check return value from malloc() for NULL before trying to bzero it.
 [2] use "=" rather than "|=" when writing to CSR (otherwise you may
	ACK something you don't mean to!).
This commit is contained in:
chuck 1996-03-04 20:11:32 +00:00
parent 7873fac590
commit 9fee13d104
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/arch/sparc/dev/xd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: xd.c,v 1.17 1996/02/25 21:54:00 pk Exp $ */ /* $NetBSD: xd.c,v 1.18 1996/03/04 20:11:32 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 * 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> * author: Chuck Cranor <chuck@ccrc.wustl.edu>
* id: $NetBSD: xd.c,v 1.17 1996/02/25 21:54:00 pk Exp $ * id: $NetBSD: xd.c,v 1.18 1996/03/04 20:11:32 chuck Exp $
* started: 27-Feb-95 * started: 27-Feb-95
* references: [1] Xylogics Model 753 User's Manual * references: [1] Xylogics Model 753 User's Manual
* part number: 166-753-001, Revision B, May 21, 1988. * part number: 166-753-001, Revision B, May 21, 1988.
@ -143,7 +143,7 @@
(ADDR) = ((ADDR) >> 8); \ (ADDR) = ((ADDR) >> 8); \
(XDC)->xdc_iopbaddr3 = (ADDR); \ (XDC)->xdc_iopbaddr3 = (ADDR); \
(XDC)->xdc_iopbamod = XDC_ADDRMOD; \ (XDC)->xdc_iopbamod = XDC_ADDRMOD; \
(XDC)->xdc_csr |= XDC_ADDIOPB; /* go! */ \ (XDC)->xdc_csr = XDC_ADDIOPB; /* go! */ \
} }
/* /*
@ -415,9 +415,9 @@ xdcattach(parent, self, aux)
xdc->reqs = (struct xd_iorq *) xdc->reqs = (struct xd_iorq *)
malloc(XDC_MAXIOPB * sizeof(struct xd_iorq), M_DEVBUF, M_NOWAIT); malloc(XDC_MAXIOPB * sizeof(struct xd_iorq), M_DEVBUF, M_NOWAIT);
bzero(xdc->reqs, XDC_MAXIOPB * sizeof(struct xd_iorq));
if (xdc->reqs == NULL) if (xdc->reqs == NULL)
panic("xdc malloc"); 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 /* init free list, iorq to iopb pointers, and non-zero fields in the
* iopb which never change. */ * iopb which never change. */
@ -1662,7 +1662,7 @@ xdc_xdreset(xdcsc, xdsc)
if (del <= 0) if (del <= 0)
panic("xdc_reset"); panic("xdc_reset");
} else { } else {
xdcsc->xdc->xdc_csr |= XDC_CLRRIO; /* clear RIO */ xdcsc->xdc->xdc_csr = XDC_CLRRIO; /* clear RIO */
} }
bcopy(&tmpiopb, xdcsc->iopbase, sizeof(tmpiopb)); bcopy(&tmpiopb, xdcsc->iopbase, sizeof(tmpiopb));
} }
@ -1833,7 +1833,7 @@ xdc_remove_iorq(xdcsc)
* done bit. * done bit.
*/ */
if (xdc->xdc_csr & XDC_REMIOPB) { if (xdc->xdc_csr & XDC_REMIOPB) {
xdc->xdc_csr |= XDC_CLRRIO; xdc->xdc_csr = XDC_CLRRIO;
} }
for (rqno = 0; rqno < XDC_MAXIOPB; rqno++) { for (rqno = 0; rqno < XDC_MAXIOPB; rqno++) {