diff options
Diffstat (limited to 'sys/arch/vax')
| -rw-r--r-- | sys/arch/vax/if/if_de.c | 4 | ||||
| -rw-r--r-- | sys/arch/vax/uba/uba.c | 4 | ||||
| -rw-r--r-- | sys/arch/vax/uba/uda.c | 6 | ||||
| -rw-r--r-- | sys/arch/vax/vax/bus_dma.c | 8 | ||||
| -rw-r--r-- | sys/arch/vax/vax/rootfil.c | 7 |
5 files changed, 14 insertions, 15 deletions
diff --git a/sys/arch/vax/if/if_de.c b/sys/arch/vax/if/if_de.c index 3b4a4ec94d5..fba8c7ebf4f 100644 --- a/sys/arch/vax/if/if_de.c +++ b/sys/arch/vax/if/if_de.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_de.c,v 1.15 2004/09/15 17:46:43 grange Exp $ */ +/* $OpenBSD: if_de.c,v 1.16 2004/12/25 23:02:25 miod Exp $ */ /* $NetBSD: if_de.c,v 1.27 1997/04/19 15:02:29 ragge Exp $ */ /* @@ -256,7 +256,7 @@ deinit(ds) int s,incaddr; /* not yet, if address still unknown */ - if (ifp->if_addrlist.tqh_first == (struct ifaddr *)0) + if (TAILQ_EMPTY(&ifp->if_addrlist)) return; if (ds->ds_flags & DSF_RUNNING) 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) | diff --git a/sys/arch/vax/vax/bus_dma.c b/sys/arch/vax/vax/bus_dma.c index 181a96120fe..ceb7fe94f73 100644 --- a/sys/arch/vax/vax/bus_dma.c +++ b/sys/arch/vax/vax/bus_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bus_dma.c,v 1.13 2004/11/09 19:17:01 claudio Exp $ */ +/* $OpenBSD: bus_dma.c,v 1.14 2004/12/25 23:02:26 miod Exp $ */ /* $NetBSD: bus_dma.c,v 1.5 1999/11/13 00:32:20 thorpej Exp $ */ /*- @@ -714,16 +714,16 @@ _bus_dmamem_alloc_range(t, size, alignment, boundary, segs, nsegs, rsegs, * Compute the location, size, and number of segments actually * returned by the VM code. */ - m = mlist.tqh_first; + m = TAILQ_FIRST(&mlist); curseg = 0; lastaddr = segs[curseg].ds_addr = VM_PAGE_TO_PHYS(m); segs[curseg].ds_len = PAGE_SIZE; #ifdef DEBUG_DMA printf("alloc: page %lx\n", lastaddr); #endif /* DEBUG_DMA */ - m = m->pageq.tqe_next; + m = TAILQ_NEXT(m, pageq); - for (; m != NULL; m = m->pageq.tqe_next) { + for (; m != TAILQ_END(&mlist); m = TAILQ_NEXT(m, pageq)) { curaddr = VM_PAGE_TO_PHYS(m); #ifdef DIAGNOSTIC if (curaddr < low || curaddr >= high) { diff --git a/sys/arch/vax/vax/rootfil.c b/sys/arch/vax/vax/rootfil.c index a481700a8d2..237d27346af 100644 --- a/sys/arch/vax/vax/rootfil.c +++ b/sys/arch/vax/vax/rootfil.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rootfil.c,v 1.16 2003/06/02 23:27:59 millert Exp $ */ +/* $OpenBSD: rootfil.c,v 1.17 2004/12/25 23:02:26 miod Exp $ */ /* $NetBSD: rootfil.c,v 1.14 1996/10/13 03:35:58 christos Exp $ */ /* @@ -334,8 +334,7 @@ getdisk(str, len, defpart, devp) #ifdef RAMDISK_HOOKS printf(" %s[a-p]", fakerdrootdev.dv_xname); #endif - for (dv = alldevs.tqh_first; dv != NULL; - dv = dv->dv_list.tqe_next) { + TAILQ_FOREACH(dv, &alldevs, dv_list) { if (dv->dv_class == DV_DISK) printf(" %s[a-p]", dv->dv_xname); #ifdef NFSCLIENT @@ -375,7 +374,7 @@ parsedisk(str, len, defpart, devp) } #endif - for (dv = alldevs.tqh_first; dv != NULL; dv = dv->dv_list.tqe_next) { + TAILQ_FOREACH(dv, &alldevs, dv_list) { if (dv->dv_class == DV_DISK && strcmp(str, dv->dv_xname) == 0) { #ifdef RAMDISK_HOOKS |