diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2004-12-25 23:02:27 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2004-12-25 23:02:27 +0000 |
| commit | f817c58ea799274eb832d25dc61acb5955f9b2d9 (patch) | |
| tree | d81a72a842cf99a20e3b22543a17b8e53ad25961 /sys/arch/vax/uba | |
| parent | f1b1a2a9897fb5e4903d7922e7d05f99ad07b847 (diff) | |
Use list and queue macros where applicable to make the code easier to read;
no functional change.
Diffstat (limited to 'sys/arch/vax/uba')
| -rw-r--r-- | sys/arch/vax/uba/uba.c | 4 | ||||
| -rw-r--r-- | sys/arch/vax/uba/uda.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/vax/uba/uba.c b/sys/arch/vax/uba/uba.c index b63f49547e2..4ce9b98cc04 100644 --- a/sys/arch/vax/uba/uba.c +++ b/sys/arch/vax/uba/uba.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uba.c,v 1.20 2004/07/07 23:10:46 deraadt Exp $ */ +/* $OpenBSD: uba.c,v 1.21 2004/12/25 23:02:25 miod Exp $ */ /* $NetBSD: uba.c,v 1.43 2000/01/24 02:40:36 matt Exp $ */ /* * Copyright (c) 1996 Jonathan Stone. @@ -711,7 +711,7 @@ ubarelse(uh, amr) uh->uh_mrwant = 0; wakeup((caddr_t)&uh->uh_mrwant); } - while ((uu = uh->uh_resq.sqh_first)) { + while ((uu = SIMPLEQ_FIRST(&uh->uh_resq)) != NULL) { SIMPLEQ_REMOVE_HEAD(&uh->uh_resq, uu_resq); if ((*uu->uu_ready)(uu) == 0) break; diff --git a/sys/arch/vax/uba/uda.c b/sys/arch/vax/uba/uda.c index 607f7bffaee..fd0e633c0f5 100644 --- a/sys/arch/vax/uba/uda.c +++ b/sys/arch/vax/uba/uda.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uda.c,v 1.11 2003/06/02 23:27:58 millert Exp $ */ +/* $OpenBSD: uda.c,v 1.12 2004/12/25 23:02:25 miod Exp $ */ /* $NetBSD: uda.c,v 1.25 1997/07/04 13:26:02 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -297,7 +297,7 @@ udago(usc, bp) * again. (Then we would trash the wait queue). Just queue the * buf and let the rest be done in udaready. */ - if (sc->sc_bufq.sqh_first) + if (!SIMPLEQ_EMPTY(&sc->sc_bufq)) BUFQ_INSERT_TAIL(&sc->sc_bufq, bp) else { if (ubaqueue(uu, bp)) @@ -322,7 +322,7 @@ udaready(uu) struct uda_softc *sc = uu->uu_softc; struct buf *bp; - while ((bp = sc->sc_bufq.sqh_first)) { + while ((bp = SIMPLEQ_FIRST(&sc->sc_bufq)) != NULL) { if (ubaqueue(uu, bp)) { BUFQ_REMOVE_HEAD(&sc->sc_bufq, bp); mscp_dgo(sc->sc_softc, (UBAI_ADDR(uu->uu_ubinfo) | |