diff options
| author | gj <gj@FreeBSD.org> | 2003-11-10 14:20:34 +0000 |
|---|---|---|
| committer | gj <gj@FreeBSD.org> | 2003-11-10 14:20:34 +0000 |
| commit | ca0cf6afde79426753b5113ad3e6c2e289553047 (patch) | |
| tree | 03e12edf8e4dd95d8b185ec9fdaaa94253f9c90f /sys/i4b/driver/i4b_rbch.c | |
| parent | 88eb0432d98be3721e5a193c491c617d09d22035 (diff) | |
| download | FreeBSD-src-ca0cf6afde79426753b5113ad3e6c2e289553047.zip FreeBSD-src-ca0cf6afde79426753b5113ad3e6c2e289553047.tar.gz | |
Based on an excellent suggestion from tanimura@ define I4BPRI and use it
in place of TTIPRI.
Diffstat (limited to 'sys/i4b/driver/i4b_rbch.c')
| -rw-r--r-- | sys/i4b/driver/i4b_rbch.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/sys/i4b/driver/i4b_rbch.c b/sys/i4b/driver/i4b_rbch.c index 271eb66..cb68c6c 100644 --- a/sys/i4b/driver/i4b_rbch.c +++ b/sys/i4b/driver/i4b_rbch.c @@ -126,13 +126,6 @@ static struct cdevsw i4brbch_cdevsw = { static void i4brbchattach(void *); PSEUDO_SET(i4brbchattach, i4b_rbch); -#if __FreeBSD_version >= 501113 -#ifndef TTIPRI -/* don't want to include tty.h just to get this */ -#define TTIPRI (PSOCK + 1) -#endif -#endif - /*===========================================================================* * DEVICE DRIVER ROUTINES *===========================================================================*/ @@ -263,7 +256,7 @@ i4brbchread(dev_t dev, struct uio *uio, int ioflag) NDBGL4(L4_RBCHDBG, "unit %d, wait read init", unit); if((error = tsleep( &rbch_softc[unit], - TTIPRI | PCATCH, + I4BPRI | PCATCH, "rrrbch", 0 )) != 0) { CRIT_END; @@ -284,7 +277,7 @@ i4brbchread(dev_t dev, struct uio *uio, int ioflag) NDBGL4(L4_RBCHDBG, "unit %d, wait read data", unit); if((error = tsleep( &isdn_linktab[unit]->rx_queue, - TTIPRI | PCATCH, + I4BPRI | PCATCH, "rrbch", 0 )) != 0) { CRIT_END; @@ -358,7 +351,7 @@ i4brbchwrite(dev_t dev, struct uio * uio, int ioflag) NDBGL4(L4_RBCHDBG, "unit %d, write wait init", unit); error = tsleep( &rbch_softc[unit], - TTIPRI | PCATCH, + I4BPRI | PCATCH, "wrrbch", 0 ); if(error == ERESTART) { CRIT_END; @@ -376,7 +369,7 @@ i4brbchwrite(dev_t dev, struct uio * uio, int ioflag) NDBGL4(L4_RBCHDBG, "unit %d, error %d tsleep init", unit, error); return(error); } - tsleep( &rbch_softc[unit], TTIPRI | PCATCH, "xrbch", (hz*1)); + tsleep( &rbch_softc[unit], I4BPRI | PCATCH, "xrbch", (hz*1)); } while(_IF_QFULL(isdn_linktab[unit]->tx_queue) && (sc->sc_devstate & ST_ISOPEN)) @@ -386,7 +379,7 @@ i4brbchwrite(dev_t dev, struct uio * uio, int ioflag) NDBGL4(L4_RBCHDBG, "unit %d, write queue full", unit); if ((error = tsleep( &isdn_linktab[unit]->tx_queue, - TTIPRI | PCATCH, + I4BPRI | PCATCH, "wrbch", 0)) != 0) { sc->sc_devstate &= ~ST_WRWAITEMPTY; if(error == ERESTART) @@ -745,7 +738,7 @@ rbch_rx_data_rdy(int unit) { NDBGL4(L4_RBCHDBG, "unit %d, NO wakeup", unit); } - selwakeuppri(&rbch_softc[unit].selp, TTIPRI); + selwakeuppri(&rbch_softc[unit].selp, I4BPRI); } /*---------------------------------------------------------------------------* @@ -778,7 +771,7 @@ rbch_activity(int unit, int rxtx) { if (rbch_softc[unit].sc_cd) rbch_softc[unit].sc_cd->last_active_time = SECOND; - selwakeuppri(&rbch_softc[unit].selp, TTIPRI); + selwakeuppri(&rbch_softc[unit].selp, I4BPRI); } /*---------------------------------------------------------------------------* |
