summaryrefslogtreecommitdiff
path: root/sys/dev/mscp
diff options
context:
space:
mode:
authorthorpej <thorpej@NetBSD.org>2000-01-21 23:39:55 +0000
committerthorpej <thorpej@NetBSD.org>2000-01-21 23:39:55 +0000
commitdc59bc1db30221dc062e86bb7873bad0b45ca133 (patch)
treee3095a5ffd141a53bbafa4a4333cec5e0d9565ed /sys/dev/mscp
parent52242fdf9fd92890ab284190ffbe195798ae887d (diff)
Update for sys/buf.h/disksort_*() changes.
Diffstat (limited to 'sys/dev/mscp')
-rw-r--r--sys/dev/mscp/mscp_disk.c4
-rw-r--r--sys/dev/mscp/mscp_subr.c19
-rw-r--r--sys/dev/mscp/mscpvar.h4
3 files changed, 10 insertions, 17 deletions
diff --git a/sys/dev/mscp/mscp_disk.c b/sys/dev/mscp/mscp_disk.c
index 875633a3489..d063c57fa6c 100644
--- a/sys/dev/mscp/mscp_disk.c
+++ b/sys/dev/mscp/mscp_disk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp_disk.c,v 1.21 1999/06/06 19:16:18 ragge Exp $ */
+/* $NetBSD: mscp_disk.c,v 1.22 2000/01/21 23:39:59 thorpej Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* Copyright (c) 1988 Regents of the University of California.
@@ -288,7 +288,7 @@ raclose(dev, flags, fmt, p)
#if notyet
if (ra->ra_openpart == 0) {
s = splimp();
- while (udautab[unit].b_actf)
+ while (BUFQ_FIRST(&udautab[unit]) != NULL)
sleep((caddr_t)&udautab[unit], PZERO - 1);
splx(s);
ra->ra_state = CLOSED;
diff --git a/sys/dev/mscp/mscp_subr.c b/sys/dev/mscp/mscp_subr.c
index b1734897085..7cd8e1d4615 100644
--- a/sys/dev/mscp/mscp_subr.c
+++ b/sys/dev/mscp/mscp_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp_subr.c,v 1.12 1999/06/06 19:16:18 ragge Exp $ */
+/* $NetBSD: mscp_subr.c,v 1.13 2000/01/21 23:39:59 thorpej Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* Copyright (c) 1988 Regents of the University of California.
@@ -160,7 +160,7 @@ mscp_attach(parent, self, aux)
mi->mi_rsp.mri_size = NRSP;
mi->mi_rsp.mri_desc = mi->mi_uda->mp_ca.ca_rspdsc;
mi->mi_rsp.mri_ring = mi->mi_uda->mp_rsp;
- SIMPLEQ_INIT(&mi->mi_resq);
+ BUFQ_INIT(&mi->mi_resq);
if (mscp_init(mi)) {
printf("%s: can't init, controller hung\n",
@@ -451,7 +451,7 @@ mscp_intr(mi)
/*
* If there are any not-yet-handled request, try them now.
*/
- if (SIMPLEQ_FIRST(&mi->mi_resq))
+ if (BUFQ_FIRST(&mi->mi_resq))
mscp_kickaway(mi);
}
@@ -485,10 +485,7 @@ mscp_strategy(bp, usc)
struct mscp_softc *mi = (void *)usc;
int s = splimp();
-/* SIMPLEQ_INSERT_TAIL(&mi->mi_resq, bp, xxx) */
- bp->b_actf = NULL;
- *mi->mi_resq.sqh_last = bp;
- mi->mi_resq.sqh_last = &bp->b_actf;
+ BUFQ_INSERT_TAIL(&mi->mi_resq, bp);
mscp_kickaway(mi);
splx(s);
}
@@ -502,7 +499,7 @@ mscp_kickaway(mi)
struct mscp *mp;
int next;
- while ((bp = SIMPLEQ_FIRST(&mi->mi_resq))) {
+ while ((bp = BUFQ_FIRST(&mi->mi_resq)) != NULL) {
/*
* Ok; we are ready to try to start a xfer. Get a MSCP packet
* and try to start...
@@ -535,11 +532,7 @@ mscp_kickaway(mi)
bp->b_resid = next;
(*mi->mi_me->me_fillin)(bp, mp);
(*mi->mi_mc->mc_go)(mi->mi_dev.dv_parent, &mi->mi_xi[next]);
- if ((mi->mi_resq.sqh_first = bp->b_actf) == NULL)
- mi->mi_resq.sqh_last = &mi->mi_resq.sqh_first;
-#if 0
- mi->mi_w = bp->b_actf;
-#endif
+ BUFQ_REMOVE(&mi->mi_resq, bp);
}
}
diff --git a/sys/dev/mscp/mscpvar.h b/sys/dev/mscp/mscpvar.h
index 1ec0de046c0..e3c1e08ee76 100644
--- a/sys/dev/mscp/mscpvar.h
+++ b/sys/dev/mscp/mscpvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mscpvar.h,v 1.7 1999/06/06 19:16:18 ragge Exp $ */
+/* $NetBSD: mscpvar.h,v 1.8 2000/01/21 23:39:59 thorpej Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* Copyright (c) 1988 Regents of the University of California.
@@ -191,7 +191,7 @@ struct mscp_softc {
bus_space_handle_t mi_iph; /* initialisation and polling */
bus_space_handle_t mi_sah; /* status & address (read part) */
bus_space_handle_t mi_swh; /* status & address (write part) */
- SIMPLEQ_HEAD(, buf) mi_resq; /* While waiting for packets */
+ struct buf_queue mi_resq; /* While waiting for packets */
};
/* mi_flags */