diff options
author | phk <phk@FreeBSD.org> | 2004-06-21 22:57:16 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2004-06-21 22:57:16 +0000 |
commit | 0033eabc1bfccaa5b6791400e4ba6ff9c191c034 (patch) | |
tree | f2e674a8767cfdecab4ee0f2ac7afc0fb32c978f /sys/dev | |
parent | a5b5031c524a9ecf5ee118337e7392768ee986c3 (diff) | |
download | FreeBSD-src-0033eabc1bfccaa5b6791400e4ba6ff9c191c034.zip FreeBSD-src-0033eabc1bfccaa5b6791400e4ba6ff9c191c034.tar.gz |
Put the pre FreeBSD-2.x tty compat code under BURN_BRIDGES.
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/cy/cy.c | 4 | ||||
-rw-r--r-- | sys/dev/digi/digi.c | 4 | ||||
-rw-r--r-- | sys/dev/rp/rp.c | 4 | ||||
-rw-r--r-- | sys/dev/si/si.c | 8 | ||||
-rw-r--r-- | sys/dev/sio/sio.c | 4 | ||||
-rw-r--r-- | sys/dev/sx/sx.c | 8 |
6 files changed, 32 insertions, 0 deletions
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c index 53e038d..50778d5 100644 --- a/sys/dev/cy/cy.c +++ b/sys/dev/cy/cy.c @@ -1539,10 +1539,12 @@ sioioctl(dev, cmd, data, flag, td) int mynor; int s; struct tty *tp; +#ifndef BURN_BRIDGES #if defined(COMPAT_43) int oldcmd; struct termios term; #endif +#endif mynor = minor(dev); com = com_addr(MINOR_TO_UNIT(mynor)); @@ -1580,6 +1582,7 @@ sioioctl(dev, cmd, data, flag, td) } } tp = com->tp; +#ifndef BURN_BRIDGES #if defined(COMPAT_43) term = tp->t_termios; oldcmd = cmd; @@ -1589,6 +1592,7 @@ sioioctl(dev, cmd, data, flag, td) if (cmd != oldcmd) data = (caddr_t)&term; #endif +#endif if (cmd == TIOCSETA || cmd == TIOCSETAW || cmd == TIOCSETAF) { int cc; struct termios *dt = (struct termios *)data; diff --git a/sys/dev/digi/digi.c b/sys/dev/digi/digi.c index 2d9184c..19b6cfe1 100644 --- a/sys/dev/digi/digi.c +++ b/sys/dev/digi/digi.c @@ -1072,10 +1072,12 @@ digiioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *t struct digi_softc *sc; struct digi_p *port; struct tty *tp; +#ifndef BURN_BRIDGES #if defined(COMPAT_43) int oldcmd; struct termios term; #endif +#endif mynor = minor(dev); unit = MINOR_TO_UNIT(mynor); @@ -1226,6 +1228,7 @@ digiioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *t } tp = port->tp; +#ifndef BURN_BRIDGES #if defined(COMPAT_43) term = tp->t_termios; oldcmd = cmd; @@ -1235,6 +1238,7 @@ digiioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *t if (cmd != oldcmd) data = (caddr_t) & term; #endif +#endif if (cmd == TIOCSETA || cmd == TIOCSETAW || cmd == TIOCSETAF) { int cc; struct termios *dt; diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c index 1219ef5..6a9eb63 100644 --- a/sys/dev/rp/rp.c +++ b/sys/dev/rp/rp.c @@ -1241,10 +1241,12 @@ rpioctl(dev, cmd, data, flag, td) int error = 0; int arg, flags, result, ChanStatus; struct termios *t; +#ifndef BURN_BRIDGES #if defined(COMPAT_43) u_long oldcmd; struct termios term; #endif +#endif umynor = (((minor(dev) >> 16) -1) * 32); /* SG */ port = (minor(dev) & 0x1f); /* SG */ @@ -1289,6 +1291,7 @@ rpioctl(dev, cmd, data, flag, td) tp = rp->rp_tty; cp = &rp->rp_channel; +#ifndef BURN_BRIDGES #if defined(COMPAT_43) term = tp->t_termios; oldcmd = cmd; @@ -1299,6 +1302,7 @@ rpioctl(dev, cmd, data, flag, td) data = (caddr_t)&term; } #endif +#endif if((cmd == TIOCSETA) || (cmd == TIOCSETAW) || (cmd == TIOCSETAF)) { int cc; struct termios *dt = (struct termios *)data; diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c index 9732108..ad7d426 100644 --- a/sys/dev/si/si.c +++ b/sys/dev/si/si.c @@ -47,9 +47,11 @@ static const char si_copyright1[] = "@(#) Copyright (C) Specialix International #include <sys/param.h> #include <sys/systm.h> +#ifndef BURN_BRIDGES #if defined(COMPAT_43) #include <sys/ioctl_compat.h> #endif +#endif #include <sys/tty.h> #include <sys/conf.h> #include <sys/fcntl.h> @@ -915,10 +917,12 @@ siioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td) int mynor = minor(dev); int oldspl; int blocked = 0; +#ifndef BURN_BRIDGES #if defined(COMPAT_43) u_long oldcmd; struct termios term; #endif +#endif if (IS_SI_IOCTL(cmd)) return(si_Sioctl(dev, cmd, data, flag, td)); @@ -964,6 +968,7 @@ siioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td) /* * Do the old-style ioctl compat routines... */ +#ifndef BURN_BRIDGES #if defined(COMPAT_43) term = tp->t_termios; oldcmd = cmd; @@ -973,6 +978,7 @@ siioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td) if (cmd != oldcmd) data = (caddr_t)&term; #endif +#endif /* * Do the initial / lock state business */ @@ -1008,9 +1014,11 @@ siioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td) case TIOCSETAW: case TIOCSETAF: case TIOCDRAIN: +#ifndef BURN_BRIDGES #ifdef COMPAT_43 case TIOCSETP: #endif +#endif blocked++; /* block writes for ttywait() and siparam() */ si_write_enable(pp, 0); } diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c index a716883..50a0ccb 100644 --- a/sys/dev/sio/sio.c +++ b/sys/dev/sio/sio.c @@ -2065,16 +2065,19 @@ sioioctl(dev, cmd, data, flag, td) int mynor; int s; struct tty *tp; +#ifndef BURN_BRIDGES #if defined(COMPAT_43) u_long oldcmd; struct termios term; #endif +#endif mynor = minor(dev); com = dev->si_drv1; if (com == NULL || com->gone) return (ENODEV); tp = com->tp; +#ifndef BURN_BRIDGES #if defined(COMPAT_43) term = tp->t_termios; oldcmd = cmd; @@ -2084,6 +2087,7 @@ sioioctl(dev, cmd, data, flag, td) if (cmd != oldcmd) data = (caddr_t)&term; #endif +#endif if (cmd == TIOCSETA || cmd == TIOCSETAW || cmd == TIOCSETAF) { int cc; struct termios *dt = (struct termios *)data; diff --git a/sys/dev/sx/sx.c b/sys/dev/sx/sx.c index 0e0687e..8a523fa 100644 --- a/sys/dev/sx/sx.c +++ b/sys/dev/sx/sx.c @@ -35,9 +35,11 @@ #include <sys/param.h> #include <sys/systm.h> +#ifndef BURN_BRIDGES #if defined(COMPAT_43) #include <sys/ioctl_compat.h> #endif +#endif #include <sys/tty.h> #include <sys/proc.h> #include <sys/conf.h> @@ -703,11 +705,13 @@ sxioctl( int mynor = minor(dev); int oldspl; int blocked = 0; +#ifndef BURN_BRIDGES #if defined(COMPAT_43) u_long oldcmd; struct termios term; #endif +#endif pp = MINOR2PP(mynor); tp = pp->sp_tty; @@ -752,6 +756,7 @@ sxioctl( /* * Do the old-style ioctl compat routines... */ +#ifndef BURN_BRIDGES #if defined(COMPAT_43) term = tp->t_termios; oldcmd = cmd; @@ -761,6 +766,7 @@ sxioctl( if (cmd != oldcmd) data = (caddr_t)&term; #endif +#endif /* * Do the initial / lock state business */ @@ -796,9 +802,11 @@ sxioctl( case TIOCSETAW: case TIOCSETAF: case TIOCDRAIN: +#ifndef BURN_BRIDGES #ifdef COMPAT_43 case TIOCSETP: #endif +#endif blocked++; /* block writes for ttywait() and sxparam() */ sx_write_enable(pp, 0); } |