summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorandrew <andrew@NetBSD.org>1993-06-27 06:59:20 +0000
committerandrew <andrew@NetBSD.org>1993-06-27 06:59:20 +0000
commit1b69e917eb65b8ec3eb9e953bfe99a83826fd329 (patch)
tree5d02e563324365e557216641320bd3d735303e4a /sys/dev
parentbc5f186001530afbbfe610510423081d827b1d09 (diff)
ANSIfications.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/scsipi/cd.c6
-rw-r--r--sys/dev/scsipi/sd.c6
-rw-r--r--sys/dev/scsipi/st.c12
3 files changed, 12 insertions, 12 deletions
diff --git a/sys/dev/scsipi/cd.c b/sys/dev/scsipi/cd.c
index 74feadc54fd..096f84d87bf 100644
--- a/sys/dev/scsipi/cd.c
+++ b/sys/dev/scsipi/cd.c
@@ -13,7 +13,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
- * $Id: cd.c,v 1.13 1993/06/17 12:18:29 brezak Exp $
+ * $Id: cd.c,v 1.14 1993/06/27 07:01:17 andrew Exp $
*/
#define SPLCD splbio
@@ -612,7 +612,7 @@ struct scsi_xfer *xs;
}
else /* special has finished */
{
- wakeup(xs);
+ wakeup((caddr_t)xs);
}
}
/*******************************************************\
@@ -1426,7 +1426,7 @@ retry: xs->error = XS_NOERROR;
case SUCCESSFULLY_QUEUED:
s = splbio();
while(!(xs->flags & ITSDONE))
- sleep(xs,PRIBIO+1);
+ sleep((caddr_t)xs,PRIBIO+1);
splx(s);
case HAD_ERROR:
diff --git a/sys/dev/scsipi/sd.c b/sys/dev/scsipi/sd.c
index a9657761cb1..bfd10164778 100644
--- a/sys/dev/scsipi/sd.c
+++ b/sys/dev/scsipi/sd.c
@@ -13,7 +13,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
- * $Id: sd.c,v 1.14 1993/06/16 04:31:40 deraadt Exp $
+ * $Id: sd.c,v 1.15 1993/06/27 06:59:20 andrew Exp $
*/
#include "sd.h"
@@ -594,7 +594,7 @@ sd_done(int unit, struct scsi_xfer *xs)
sd_free_xs(unit, xs, 0);
sdstart(unit); /* If there's anything waiting.. do it */
} else
- wakeup(xs);
+ wakeup((caddr_t)xs);
}
/*
@@ -1077,7 +1077,7 @@ retry:
case SUCCESSFULLY_QUEUED:
s = splbio();
while(!(xs->flags & ITSDONE))
- sleep(xs,PRIBIO+1);
+ sleep((caddr_t)xs, PRIBIO+1);
splx(s);
case HAD_ERROR:
/*printf("err = %d ", xs->error);*/
diff --git a/sys/dev/scsipi/st.c b/sys/dev/scsipi/st.c
index b9446e56cc6..7c37ecd2128 100644
--- a/sys/dev/scsipi/st.c
+++ b/sys/dev/scsipi/st.c
@@ -13,7 +13,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
- * $Id: st.c,v 1.11 1993/06/16 10:39:35 andrew Exp $
+ * $Id: st.c,v 1.12 1993/06/27 06:59:23 andrew Exp $
*/
/*
@@ -414,7 +414,7 @@ ststart(int unit)
trynext:
if(st->blockwait) {
- wakeup(&st->blockwait);
+ wakeup((caddr_t)&st->blockwait);
return;
}
@@ -488,7 +488,7 @@ trynext:
xs->targ = st->targ;
xs->lu = st->lu;
xs->retries = 1; /* can't retry on tape*/
- xs->timeout = 100000; /* allow 100 secs for retension */
+ xs->timeout = 200000; /* allow 200 secs for retension */
xs->cmd = (struct scsi_generic *)&cmd;
xs->cmdlen = sizeof(cmd);
xs->data = (u_char *)bp->b_un.b_addr;
@@ -670,7 +670,7 @@ st_done(int unit, struct scsi_xfer *xs)
xs->flags = 0; /* no longer in use */
ststart(unit); /* If there's another waiting.. do it */
} else
- wakeup(xs);
+ wakeup((caddr_t)xs);
}
/*
@@ -1111,7 +1111,7 @@ st_scsi_cmd(int unit, struct scsi_generic *scsi_cmd, int cmdlen,
s = splbio();
st->blockwait++; /* there is someone waiting */
while (xs->flags & INUSE)
- sleep(&st->blockwait, PRIBIO+1);
+ sleep((caddr_t)&st->blockwait, PRIBIO+1);
st->blockwait--;
xs->flags = INUSE;
if(!(flags & SCSI_NOMASK))
@@ -1142,7 +1142,7 @@ retry:
case SUCCESSFULLY_QUEUED:
s = splbio();
while(!(xs->flags & ITSDONE))
- sleep(xs,PRIBIO+1);
+ sleep((caddr_t)xs,PRIBIO+1);
splx(s);
case HAD_ERROR:
case COMPLETE: