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/si | |
| 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/si')
| -rw-r--r-- | sys/dev/si/si.c | 8 |
1 files changed, 8 insertions, 0 deletions
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); } |
