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

fix error in previous

This commit is contained in:
mrg 2003-08-28 16:36:22 +00:00
parent 43d69358c2
commit 7f2b4aa8bd
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/vme/xd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: xd.c,v 1.52 2003/08/27 15:41:03 mrg Exp $ */ /* $NetBSD: xd.c,v 1.53 2003/08/28 16:36:22 mrg Exp $ */
/* /*
* *
@ -51,7 +51,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.52 2003/08/27 15:41:03 mrg Exp $"); __KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.53 2003/08/28 16:36:22 mrg Exp $");
#undef XDC_DEBUG /* full debug */ #undef XDC_DEBUG /* full debug */
#define XDC_DIAG /* extra sanity checks */ #define XDC_DIAG /* extra sanity checks */
@ -588,7 +588,7 @@ xdcattach(parent, self, aux)
xdc->sc_dev.dv_xname, error); xdc->sc_dev.dv_xname, error);
return; return;
} }
xdc->dvmaiopb = BUS_ADDR_PADDR(busaddr); xdc->dvmaiopb = (struct xd_iopb *)(u_long)BUS_ADDR_PADDR(busaddr);
bzero(xdc->iopbase, XDC_MAXIOPB * sizeof(struct xd_iopb)); bzero(xdc->iopbase, XDC_MAXIOPB * sizeof(struct xd_iopb));
@ -784,7 +784,7 @@ xdattach(parent, self, aux)
xdc->sc_dev.dv_xname, error); xdc->sc_dev.dv_xname, error);
return; return;
} }
dmaddr = BUS_ADDR_PADDR(busaddr); dmaddr = (caddr_t)(u_long)BUS_ADDR_PADDR(busaddr);
/* first try and reset the drive */ /* first try and reset the drive */
@ -2484,7 +2484,7 @@ xdc_ioctlcmd(xd, dev, xio)
&busbuf)) != 0) { &busbuf)) != 0) {
return (error); return (error);
} }
dvmabuf = BUS_ADDR_PADDR(busbuf); dvmabuf = (caddr_t)(u_long)BUS_ADDR_PADDR(busbuf);
if (xio->cmd == XDCMD_WR || xio->cmd == XDCMD_XWR) { if (xio->cmd == XDCMD_WR || xio->cmd == XDCMD_XWR) {
if ((error = copyin(xio->dptr, buf, xio->dlen)) != 0) { if ((error = copyin(xio->dptr, buf, xio->dlen)) != 0) {

10
sys/dev/vme/xy.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: xy.c,v 1.52 2003/08/27 15:41:04 mrg Exp $ */ /* $NetBSD: xy.c,v 1.53 2003/08/28 16:36:22 mrg Exp $ */
/* /*
* *
@ -51,7 +51,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.52 2003/08/27 15:41:04 mrg Exp $"); __KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.53 2003/08/28 16:36:22 mrg Exp $");
#undef XYC_DEBUG /* full debug */ #undef XYC_DEBUG /* full debug */
#undef XYC_DIAG /* extra sanity checks */ #undef XYC_DIAG /* extra sanity checks */
@ -492,7 +492,7 @@ xycattach(parent, self, aux)
xyc->sc_dev.dv_xname, error); xyc->sc_dev.dv_xname, error);
return; return;
} }
xyc->dvmaiopb = BUS_ADDR_PADDR(busaddr); xyc->dvmaiopb = (struct xy_iopb *)(u_long)BUS_ADDR_PADDR(busaddr);
bzero(xyc->iopbase, XYC_MAXIOPB * sizeof(struct xy_iopb)); bzero(xyc->iopbase, XYC_MAXIOPB * sizeof(struct xy_iopb));
@ -687,7 +687,7 @@ xyattach(parent, self, aux)
xyc->sc_dev.dv_xname, error); xyc->sc_dev.dv_xname, error);
return; return;
} }
dmaddr = BUS_ADDR_PADDR(busaddr); dmaddr = (caddr_t)(u_long)BUS_ADDR_PADDR(busaddr);
/* first try and reset the drive */ /* first try and reset the drive */
error = xyc_cmd(xyc, XYCMD_RST, 0, xy->xy_drive, 0, 0, 0, fmode); error = xyc_cmd(xyc, XYCMD_RST, 0, xy->xy_drive, 0, 0, 0, fmode);
@ -2249,7 +2249,7 @@ xyc_ioctlcmd(xy, dev, xio)
&busbuf)) != 0) { &busbuf)) != 0) {
return (error); return (error);
} }
dvmabuf = BUS_ADDR_PADDR(busbuf); dvmabuf = (caddr_t)(u_long)BUS_ADDR_PADDR(busbuf);
if (xio->cmd == XYCMD_WR) { if (xio->cmd == XYCMD_WR) {
if ((error = copyin(xio->dptr, buf, xio->dlen)) != 0) { if ((error = copyin(xio->dptr, buf, xio->dlen)) != 0) {