diff options
Diffstat (limited to 'sys/i4b/driver/i4b_tel.c')
-rw-r--r-- | sys/i4b/driver/i4b_tel.c | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/sys/i4b/driver/i4b_tel.c b/sys/i4b/driver/i4b_tel.c index 4b93970..de0833d 100644 --- a/sys/i4b/driver/i4b_tel.c +++ b/sys/i4b/driver/i4b_tel.c @@ -149,13 +149,6 @@ static void i4btelattach(void *); PSEUDO_SET(i4btelattach, i4b_tel); -#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 *===========================================================================*/ @@ -256,7 +249,7 @@ i4btelclose(dev_t dev, int flag, int fmt, struct thread *td) sc->devstate |= ST_WRWAITEMPTY; if((error = tsleep( &sc->isdn_linktab->tx_queue, - TTIPRI | PCATCH, "wtcl", 0)) != 0) + I4BPRI | PCATCH, "wtcl", 0)) != 0) { break; } @@ -353,7 +346,7 @@ i4btelioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td) while ((sc->devstate & ST_TONE) && sc->tones.duration[sc->toneidx] != 0) { if((error = tsleep( &sc->tones, - TTIPRI | PCATCH, "rtone", 0 )) != 0) { + I4BPRI | PCATCH, "rtone", 0 )) != 0) { splx(s); return(error); } @@ -426,7 +419,7 @@ i4btelread(dev_t dev, struct uio *uio, int ioflag) if((error = msleep( &sc->isdn_linktab->rx_queue, &sc->isdn_linktab->rx_queue->ifq_mtx, - TTIPRI | PCATCH, + I4BPRI | PCATCH, "rtel", 0 )) != 0) { sc->devstate &= ~ST_RDWAITDATA; @@ -492,7 +485,7 @@ i4btelread(dev_t dev, struct uio *uio, int ioflag) NDBGL4(L4_TELDBG, "i4btel%d, wait for result!", unit); if((error = tsleep( &sc->result, - TTIPRI | PCATCH, + I4BPRI | PCATCH, "rtel1", 0 )) != 0) { sc->devstate &= ~ST_RDWAITDATA; @@ -562,7 +555,7 @@ i4btelwrite(dev_t dev, struct uio * uio, int ioflag) if((error = msleep( &sc->isdn_linktab->tx_queue, &sc->isdn_linktab->tx_queue->ifq_mtx, - TTIPRI | PCATCH, "wtel", 0)) != 0) + I4BPRI | PCATCH, "wtel", 0)) != 0) { sc->devstate &= ~ST_WRWAITEMPTY; IF_UNLOCK(sc->isdn_linktab->tx_queue); @@ -798,7 +791,7 @@ tel_connect(int unit, void *cdp) sc->devstate &= ~ST_RDWAITDATA; wakeup( &sc->result); } - selwakeuppri(&sc->selp, TTIPRI); + selwakeuppri(&sc->selp, I4BPRI); } } @@ -842,7 +835,7 @@ tel_disconnect(int unit, void *cdp) sc->devstate &= ~ST_RDWAITDATA; wakeup( &sc->result); } - selwakeuppri(&sc->selp, TTIPRI); + selwakeuppri(&sc->selp, I4BPRI); if (sc->devstate & ST_TONE) { sc->devstate &= ~ST_TONE; @@ -871,7 +864,7 @@ tel_dialresponse(int unit, int status, cause_t cause) sc->devstate &= ~ST_RDWAITDATA; wakeup( &sc->result); } - selwakeuppri(&sc->selp, TTIPRI); + selwakeuppri(&sc->selp, I4BPRI); } } @@ -919,7 +912,7 @@ tel_tx_queue_empty(int unit) if(sc->devstate & ST_TONE) { tel_tone(sc); } else { - selwakeuppri(&sc->selp, TTIPRI); + selwakeuppri(&sc->selp, I4BPRI); } } |