summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtur Grabowski <art@cvs.openbsd.org>2002-05-23 15:31:58 +0000
committerArtur Grabowski <art@cvs.openbsd.org>2002-05-23 15:31:58 +0000
commit172dc47c27d1781bfc173062123aaa8356a4bb99 (patch)
treee7a97b5cfd07041f15d5381562d6d08d8749c3ec
parent6c9e50ba77c090063fcda9267b28c4d0b22c8344 (diff)
remove the defines for iodone -> biodone and iowait -> biowait.
Use the correct functions everywhere instead.
-rw-r--r--sys/arch/hp300/dev/ct.c4
-rw-r--r--sys/arch/hp300/dev/mt.c10
-rw-r--r--sys/arch/hp300/dev/st.c6
-rw-r--r--sys/arch/vax/uba/ts.c20
-rw-r--r--sys/sys/buf.h4
5 files changed, 21 insertions, 23 deletions
diff --git a/sys/arch/hp300/dev/ct.c b/sys/arch/hp300/dev/ct.c
index ef2b5e8ccda..979f52cd15d 100644
--- a/sys/arch/hp300/dev/ct.c
+++ b/sys/arch/hp300/dev/ct.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ct.c,v 1.8 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: ct.c,v 1.9 2002/05/23 15:31:57 art Exp $ */
/* $NetBSD: ct.c,v 1.21 1997/04/02 22:37:23 scottr Exp $ */
/*
@@ -448,7 +448,7 @@ ctcommand(dev, cmd, cnt)
#endif
}
ctstrategy(bp);
- iowait(bp);
+ biowait(bp);
}
bp->b_flags = 0;
sc->sc_flags &= ~CTF_CMD;
diff --git a/sys/arch/hp300/dev/mt.c b/sys/arch/hp300/dev/mt.c
index ff8104144bd..6c051f68670 100644
--- a/sys/arch/hp300/dev/mt.c
+++ b/sys/arch/hp300/dev/mt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mt.c,v 1.9 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: mt.c,v 1.10 2002/05/23 15:31:57 art Exp $ */
/* $NetBSD: mt.c,v 1.8 1997/03/31 07:37:29 scottr Exp $ */
/*
@@ -412,7 +412,7 @@ mtcommand(dev, cmd, cnt)
do {
bp->b_flags = B_BUSY | B_CMD;
mtstrategy(bp);
- iowait(bp);
+ biowait(bp);
if (bp->b_flags & B_ERROR) {
error = (int) (unsigned) bp->b_error;
break;
@@ -473,7 +473,7 @@ mtstrategy(bp)
#endif
bp->b_flags |= B_ERROR;
bp->b_error = EIO;
- iodone(bp);
+ biodone(bp);
return;
}
}
@@ -712,7 +712,7 @@ errdone:
bp->b_flags |= B_ERROR;
done:
sc->sc_flags &= ~(MTF_HITEOF | MTF_HITBOF);
- iodone(bp);
+ biodone(bp);
if ((dp = bp->b_actf))
dp->b_actb = bp->b_actb;
else
@@ -901,7 +901,7 @@ mtintr(arg)
cmdbuf[0] = MTE_COMPLETE | MTE_IDLE;
(void) hpibsend(sc->sc_hpibno, sc->sc_slave, MTL_ECMD, cmdbuf, 1);
bp->b_flags &= ~B_CMD;
- iodone(bp);
+ biodone(bp);
if ((dp = bp->b_actf))
dp->b_actb = bp->b_actb;
else
diff --git a/sys/arch/hp300/dev/st.c b/sys/arch/hp300/dev/st.c
index 1e6588bdaf5..eb0605196e2 100644
--- a/sys/arch/hp300/dev/st.c
+++ b/sys/arch/hp300/dev/st.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: st.c,v 1.12 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: st.c,v 1.13 2002/05/23 15:31:57 art Exp $ */
/* $NetBSD: st.c,v 1.22 1997/04/02 22:37:38 scottr Exp $ */
/*
@@ -795,7 +795,7 @@ stfinish(sc, bp)
else
sc->sc_tab.b_actb = bp->b_actb;
*bp->b_actb = dp;
- iodone(bp);
+ biodone(bp);
scsifree(sc->sc_dev.dv_parent, &sc->sc_sq);
if (sc->sc_tab.b_actf)
stustart(sc->sc_dev.dv_unit);
@@ -1190,7 +1190,7 @@ again:
bp->b_blkno = 0;
bp->b_error = 0;
ststrategy(bp);
- iowait(bp);
+ biowait(bp);
if (bp->b_flags & B_WANTED)
wakeup((caddr_t)bp);
bp->b_flags &= B_ERROR;
diff --git a/sys/arch/vax/uba/ts.c b/sys/arch/vax/uba/ts.c
index 6da9ce768b9..476ec7f3408 100644
--- a/sys/arch/vax/uba/ts.c
+++ b/sys/arch/vax/uba/ts.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ts.c,v 1.8 2002/03/14 03:16:02 millert Exp $ */
+/* $OpenBSD: ts.c,v 1.9 2002/05/23 15:31:57 art Exp $ */
/* $NetBSD: ts.c,v 1.11 1997/01/11 11:34:43 ragge Exp $ */
/*-
@@ -403,11 +403,11 @@ tscommand (dev, cmd, count)
* This is the only case where count can be 0.
*/
if (count == 0) {
- debug (("tscommand: direct return, no iowait.\n"));
+ debug (("tscommand: direct return, no biowait.\n"));
return;
}
- debug (("tscommand: calling iowait ...\n"));;
- iowait (bp);
+ debug (("tscommand: calling biowait ...\n"));;
+ biowait (bp);
if (bp->b_flags & B_WANTED)
wakeup ((caddr_t)bp);
bp->b_flags &= B_ERROR;
@@ -439,7 +439,7 @@ tsstart (sc, bp)
/* bertram: ubarelse ??? */
ts_wtab[ctlr] = NULL;
dp->b_flags |= B_ERROR;
- iodone (dp);
+ biodone (dp);
if (tsreg->tssr & TS_SC) { /* Special Condition; Error */
log (TS_PRI, "%s: tssr 0x%x, state %d\n",
@@ -567,7 +567,7 @@ tsstart (sc, bp)
/*
* we are already waiting for something ...
* this should not happen, so we have a problem now.
- * bertram: set error-flag and call iodone() ???
+ * bertram: set error-flag and call biodone() ???
*/
}
ts_wtab[ctlr] = bp;
@@ -931,9 +931,9 @@ tsintr(ctlr)
#endif
}
bp->b_resid = tsmsgp->rbpcr;
- debug (("tsintr: iodone(NORM) [%d,%d,%d]\n",
+ debug (("tsintr: biodone(NORM) [%d,%d,%d]\n",
bp->b_resid, bp->b_bcount, tsmsgp->rbpcr));
- iodone (bp); /* bertram: ioctl ??? */
+ biodone (bp); /* bertram: ioctl ??? */
}
return;
@@ -1081,8 +1081,8 @@ tsintr(ctlr)
debug (("resid:%d, count:%d, rbpcr:%d\n",
bp->b_resid, bp->b_bcount, tsmsgp->rbpcr));
bp->b_resid = tsmsgp->rbpcr; /* XXX */
- debug (("tsintr: iodone(%x)\n", bp->b_flags));
- iodone (bp);
+ debug (("tsintr: biodone(%x)\n", bp->b_flags));
+ biodone (bp);
}
if ((sr & TS_TC) > TS_TC_FR)
tsreset (ctlr);
diff --git a/sys/sys/buf.h b/sys/sys/buf.h
index 20805e5a1b1..e56e01e448c 100644
--- a/sys/sys/buf.h
+++ b/sys/sys/buf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: buf.h,v 1.40 2002/05/23 13:47:45 art Exp $ */
+/* $OpenBSD: buf.h,v 1.41 2002/05/23 15:31:57 art Exp $ */
/* $NetBSD: buf.h,v 1.25 1997/04/09 21:12:17 mycroft Exp $ */
/*
@@ -114,8 +114,6 @@ struct buf {
#define b_active b_bcount /* Driver queue head: drive active. */
#define b_data b_un.b_addr /* b_un.b_addr is not changeable. */
#define b_errcnt b_resid /* Retry count while I/O in progress. */
-#define iodone biodone /* Old name for biodone. */
-#define iowait biowait /* Old name for biowait. */
/*
* These flags are kept in b_flags.