Burn TTY ioctl bridges in compat layers.

I really don't want any pieces of code to include ioctl_compat.h, so let
the ibcs2 and svr4 compat leave sgtty alone. If they want to support
sgtty, they should emulate it on top of termios, not sgtty.

The code has been marked with BURN_BRIDGES for a long time. ibcs2 and
svr4 are not really popular pieces of code anyway.

2 files changed, 2 insertions, 33 deletions

diff --git a/sys/i386/ibcs2/ibcs2_ioctl.c b/sys/i386/ibcs2/ibcs2_ioctl.c
index 0275c98..17749db 100644
--- a/sys/i386/ibcs2/ibcs2_ioctl.c
+++ b/sys/i386/ibcs2/ibcs2_ioctl.c
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/filio.h>
-#include <sys/ioctl_compat.h>
 #include <sys/kbio.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
@@ -56,34 +55,6 @@ static void btios2stios(struct termios *, struct ibcs2_termios *);
 static void stios2stio(struct ibcs2_termios *, struct ibcs2_termio *);
 static void stio2stios(struct ibcs2_termio *, struct ibcs2_termios *);
 
-
-#ifndef BURN_BRIDGES
-int
-ibcs2_gtty(struct thread *td, struct ibcs2_gtty_args *args)
-{
-	struct ioctl_args ioctl_arg;
-
-	ioctl_arg.fd = args->fd;
-	ioctl_arg.com = TIOCGETC;
-	ioctl_arg.data = (caddr_t)args->buf;
-
-	return ioctl(td, &ioctl_arg);
-}
-
-int
-ibcs2_stty(struct thread *td, struct ibcs2_stty_args *args)
-{
-	struct ioctl_args ioctl_arg;
-
-	ioctl_arg.fd = args->fd;
-	ioctl_arg.com = TIOCSETC;
-	ioctl_arg.data = (caddr_t)args->buf;
-
-	return ioctl(td, &ioctl_arg);
-}
-#endif /* BURN BRIDGES */
-
-
 /*
  * iBCS2 ioctl calls.
  */
diff --git a/sys/i386/ibcs2/syscalls.master b/sys/i386/ibcs2/syscalls.master
index 274a829..23d5853 100644
--- a/sys/i386/ibcs2/syscalls.master
+++ b/sys/i386/ibcs2/syscalls.master
@@ -79,10 +79,8 @@
 29	AUE_NULL	STD	{ int ibcs2_pause(void); }
 30	AUE_NULL	STD	{ int ibcs2_utime(char *path, \
 				    struct ibcs2_utimbuf *buf); }
-31	AUE_NULL	STD	{ int ibcs2_stty(int fd, \
-				    struct sgttyb *buf); }
-32	AUE_NULL	STD	{ int ibcs2_gtty(int fd, \
-				    struct sgttyb *buf); }
+31	AUE_NULL	UNIMPL	ibcs2_stty
+32	AUE_NULL	UNIMPL	ibcs2_gtty
 33	AUE_ACCESS	STD	{ int ibcs2_access(char *path, int flags); }
 34	AUE_NICE	STD	{ int ibcs2_nice(int incr); }
 35	AUE_STATFS	STD	{ int ibcs2_statfs(char *path, \