X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/0d65848dbc42c2a2c00d45c121a458dddd980046..5513375c86e602a9163497b7ad7e66f860de9efb:/usr/src/sys/kern/tty.c

diff --git a/usr/src/sys/kern/tty.c b/usr/src/sys/kern/tty.c
index f5250933bd..2d61be7ad0 100644
--- a/usr/src/sys/kern/tty.c
+++ b/usr/src/sys/kern/tty.c
@@ -1,4 +1,4 @@
-/*	tty.c	3.19	%G%	*/
+/*	tty.c	4.3	%G%	*/
 
 /*
  * TTY subroutines common to more than one line discipline
@@ -197,10 +197,12 @@ register struct tty *tp;
 /*
  * Common code for tty ioctls.
  */
-ttioctl(com, tp, addr, dev, flag)
+/*ARGSUSED*/
+ttioctl(tp, com, addr, flag)
 register struct tty *tp;
 caddr_t addr;
 {
+	int dev;
 	unsigned t;
 	struct sgttyb iocb;
 	struct clist tq;
@@ -217,6 +219,7 @@ caddr_t addr;
 		return (1);
 	}
 
+	dev = tp->t_dev;
 	/*
 	 * If the ioctl involves modification,
 	 * insist on being able to write the device,
@@ -315,6 +318,9 @@ caddr_t addr;
 				wflushtty(tp);
 			while (canon(tp)>=0) 
 				;
+#ifdef notdef
+			wakeup((caddr_t)&tp->t_rawq);
+#endif
 		} else if (tp->t_line == NTTYDISC) {
 			if (tp->t_flags&RAW || iocb.sg_flags&RAW ||
 			    com == TIOCSETP)
@@ -329,9 +335,11 @@ caddr_t addr;
 					tp->t_local |= LPENDIN;
 					if (tp->t_canq.c_cc)
 						panic("ioccom canq");
+#ifdef notdef
 					if (tp->t_chan)
 						(void) sdata(tp->t_chan);
 					else
+#endif
 						wakeup((caddr_t)&tp->t_rawq);
 				}
 			}
@@ -370,15 +378,6 @@ caddr_t addr;
 		flushtty(tp, FREAD|FWRITE);
 		break;
 
-	/*
-	 * Ioctl entries to line discipline
-	 */
-	case DIOCSETP:
-	case DIOCGETP:
-		if ((*linesw[tp->t_line].l_ioctl)(com, tp, addr))
-			u.u_error = ENOTTY;
-		break;
-
 	/*
 	 * Set and fetch special characters
 	 */