diff options
| author | bouyer <bouyer@NetBSD.org> | 2003-10-29 22:05:15 +0000 |
|---|---|---|
| committer | bouyer <bouyer@NetBSD.org> | 2003-10-29 22:05:15 +0000 |
| commit | 14cd9d8cff673424fa1f3f166fa1843052b5f250 (patch) | |
| tree | b009554ab6568a5ec1ecbe203e3befc344e55cf3 /sys/dev | |
| parent | b94b22f9f590978cb6a8f209c60e0b624ad119a8 (diff) | |
freese->freeze, as pointed out by Frederick Bruck.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ata/ata_wdc.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/wdc.c | 30 | ||||
| -rw-r--r-- | sys/dev/ic/wdcvar.h | 4 | ||||
| -rw-r--r-- | sys/dev/scsipi/atapi_wdc.c | 6 |
4 files changed, 23 insertions, 23 deletions
diff --git a/sys/dev/ata/ata_wdc.c b/sys/dev/ata/ata_wdc.c index 3fab100dc37..ff06126c32d 100644 --- a/sys/dev/ata/ata_wdc.c +++ b/sys/dev/ata/ata_wdc.c @@ -1,4 +1,4 @@ -/* $NetBSD: ata_wdc.c,v 1.41 2003/10/08 10:58:12 bouyer Exp $ */ +/* $NetBSD: ata_wdc.c,v 1.42 2003/10/29 22:05:15 bouyer Exp $ */ /* * Copyright (c) 1998, 2001, 2003 Manuel Bouyer. @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ata_wdc.c,v 1.41 2003/10/08 10:58:12 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ata_wdc.c,v 1.42 2003/10/29 22:05:15 bouyer Exp $"); #ifndef WDCDEBUG #define WDCDEBUG @@ -224,7 +224,7 @@ wdc_ata_bio_start(chp, xfer) /* If it's not a polled command, we need the kenrel thread */ if ((xfer->c_flags & C_POLL) == 0 && (chp->ch_flags & WDCF_TH_RUN) == 0) { - chp->ch_queue->queue_freese++; + chp->ch_queue->queue_freeze++; wakeup(&chp->thread); return; } diff --git a/sys/dev/ic/wdc.c b/sys/dev/ic/wdc.c index 5744c00db66..1f363b532ec 100644 --- a/sys/dev/ic/wdc.c +++ b/sys/dev/ic/wdc.c @@ -1,4 +1,4 @@ -/* $NetBSD: wdc.c,v 1.147 2003/10/29 21:44:41 bouyer Exp $ */ +/* $NetBSD: wdc.c,v 1.148 2003/10/29 22:05:15 bouyer Exp $ */ /* * Copyright (c) 1998, 2001, 2003 Manuel Bouyer. All rights reserved. @@ -70,7 +70,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.147 2003/10/29 21:44:41 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.148 2003/10/29 22:05:15 bouyer Exp $"); #ifndef WDCDEBUG #define WDCDEBUG @@ -272,7 +272,7 @@ atabus_thread(arg) s = splbio(); if ((chp->ch_flags & (WDCF_TH_RESET | WDCF_SHUTDOWN)) == 0 && ((chp->ch_flags & WDCF_ACTIVE) == 0 || - chp->ch_queue->queue_freese == 0)) { + chp->ch_queue->queue_freeze == 0)) { chp->ch_flags &= ~WDCF_TH_RUN; tsleep(&chp->thread, PRIBIO, "atath", 0); chp->ch_flags |= WDCF_TH_RUN; @@ -288,22 +288,22 @@ atabus_thread(arg) chp->ch_drive[drive].state = 0; } chp->ch_flags &= ~WDCF_TH_RESET; - chp->ch_queue->queue_freese--; + chp->ch_queue->queue_freeze--; wdcstart(chp); } else if ((chp->ch_flags & WDCF_ACTIVE) != 0 && - chp->ch_queue->queue_freese == 1) { + chp->ch_queue->queue_freeze == 1) { /* - * caller has bumped queue_freese, decrease it + * caller has bumped queue_freeze, decrease it */ - chp->ch_queue->queue_freese--; + chp->ch_queue->queue_freeze--; xfer = chp->ch_queue->sc_xfer.tqh_first; #ifdef DIAGNOSTIC if (xfer == NULL) panic("channel active with no xfer ?"); #endif xfer->c_start(chp, xfer); - } else if (chp->ch_queue->queue_freese > 1) { - panic("queue_freese"); + } else if (chp->ch_queue->queue_freeze > 1) { + panic("queue_freeze"); } splx(s); } @@ -784,7 +784,7 @@ wdcattach(chp) inited++; } TAILQ_INIT(&chp->ch_queue->sc_xfer); - chp->ch_queue->queue_freese = 0; + chp->ch_queue->queue_freeze = 0; chp->atabus = config_found(&chp->wdc->sc_dev, chp, atabusprint); } @@ -988,7 +988,7 @@ wdcstart(chp) if ((chp->ch_flags & WDCF_ACTIVE) != 0 ) { return; /* channel aleady active */ } - if (__predict_false(chp->ch_queue->queue_freese > 0)) { + if (__predict_false(chp->ch_queue->queue_freeze > 0)) { return; /* queue froozen */ } #ifdef DIAGNOSTIC @@ -1083,7 +1083,7 @@ wdc_reset_channel(drvp, flags) DEBUG_FUNCS); if ((flags & AT_POLL) == 0) { chp->ch_flags |= WDCF_TH_RESET; - chp->ch_queue->queue_freese++; + chp->ch_queue->queue_freeze++; wakeup(&chp->thread); return; } @@ -1319,10 +1319,10 @@ wdcwait(chp, mask, bits, timeout, flags) * ask the thread to come back here */ #ifdef DIAGNOSTIC - if (chp->ch_queue->queue_freese > 0) - panic("wdcwait: queue_freese"); + if (chp->ch_queue->queue_freeze > 0) + panic("wdcwait: queue_freeze"); #endif - chp->ch_queue->queue_freese++; + chp->ch_queue->queue_freeze++; wakeup(&chp->thread); return(WDCWAIT_THR); } diff --git a/sys/dev/ic/wdcvar.h b/sys/dev/ic/wdcvar.h index 406f82e5f14..d4109445a0b 100644 --- a/sys/dev/ic/wdcvar.h +++ b/sys/dev/ic/wdcvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: wdcvar.h,v 1.41 2003/10/08 10:58:12 bouyer Exp $ */ +/* $NetBSD: wdcvar.h,v 1.42 2003/10/29 22:05:15 bouyer Exp $ */ /*- * Copyright (c) 1998, 2003 The NetBSD Foundation, Inc. @@ -47,7 +47,7 @@ struct channel_queue { /* per channel queue (may be shared) */ TAILQ_HEAD(xferhead, wdc_xfer) sc_xfer; - int queue_freese; + int queue_freeze; }; struct channel_softc { /* Per channel data */ diff --git a/sys/dev/scsipi/atapi_wdc.c b/sys/dev/scsipi/atapi_wdc.c index ad731376b7a..ed9b6620139 100644 --- a/sys/dev/scsipi/atapi_wdc.c +++ b/sys/dev/scsipi/atapi_wdc.c @@ -1,4 +1,4 @@ -/* $NetBSD: atapi_wdc.c,v 1.60 2003/10/15 19:54:32 bouyer Exp $ */ +/* $NetBSD: atapi_wdc.c,v 1.61 2003/10/29 22:05:15 bouyer Exp $ */ /* * Copyright (c) 1998, 2001 Manuel Bouyer. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: atapi_wdc.c,v 1.60 2003/10/15 19:54:32 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: atapi_wdc.c,v 1.61 2003/10/29 22:05:15 bouyer Exp $"); #ifndef WDCDEBUG #define WDCDEBUG @@ -420,7 +420,7 @@ wdc_atapi_start(chp, xfer) /* If it's not a polled command, we need the kenrel thread */ if ((sc_xfer->xs_control & XS_CTL_POLL) == 0 && (chp->ch_flags & WDCF_TH_RUN) == 0) { - chp->ch_queue->queue_freese++; + chp->ch_queue->queue_freeze++; wakeup(&chp->thread); return; } |
