include ioctl.h separate from tty.h

SCCS-vsn: sys/kern/sys_generic.c 5.24
SCCS-vsn: sys/kern/tty_bk.c 4.8
SCCS-vsn: sys/kern/tty_pty.c 4.29
SCCS-vsn: sys/kern/tty_tb.c 4.7
SCCS-vsn: sys/kern/tty_tty.c 4.14

diff --git a/usr/src/sys/kern/sys_generic.c b/usr/src/sys/kern/sys_generic.c
index e3affed..d714c94 100644 (file)
--- a/usr/src/sys/kern/sys_generic.c
+++ b/usr/src/sys/kern/sys_generic.c
@@ -1,12 +1,12 @@
-/*     sys_generic.c   5.23    82/11/17        */
+/*     sys_generic.c   5.24    82/12/05        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 #include "../h/dir.h"
 #include "../h/user.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"
 #include "../h/dir.h"
 #include "../h/user.h"

+#include "../h/ioctl.h"

 #include "../h/tty.h"
 #include "../h/file.h"
 #include "../h/tty.h"
 #include "../h/file.h"

-#define        IDEBUG

 #include "../h/inode.h"
 #include "../h/buf.h"
 #include "../h/proc.h"
 #include "../h/inode.h"
 #include "../h/buf.h"
 #include "../h/proc.h"

diff --git a/usr/src/sys/kern/tty_bk.c b/usr/src/sys/kern/tty_bk.c
index 51bc0ed..d79ad52 100644 (file)
--- a/usr/src/sys/kern/tty_bk.c
+++ b/usr/src/sys/kern/tty_bk.c
@@ -1,4 +1,4 @@
-/*     tty_bk.c        4.7     82/10/17        */
+/*     tty_bk.c        4.8     82/12/05        */

 
 #include "bk.h"
 
 
 #include "bk.h"
 


@@ -7,6 +7,7 @@
 #include "../h/systm.h"
 #include "../h/dir.h"
 #include "../h/user.h"
 #include "../h/systm.h"
 #include "../h/dir.h"
 #include "../h/user.h"

+#include "../h/ioctl.h"

 #include "../h/tty.h"
 #include "../h/proc.h"
 #include "../h/inode.h"
 #include "../h/tty.h"
 #include "../h/proc.h"
 #include "../h/inode.h"

diff --git a/usr/src/sys/kern/tty_pty.c b/usr/src/sys/kern/tty_pty.c
index fafe5d5..4f1cb7d 100644 (file)
--- a/usr/src/sys/kern/tty_pty.c
+++ b/usr/src/sys/kern/tty_pty.c
@@ -1,4 +1,4 @@
-/*     tty_pty.c       4.28    82/10/17        */
+/*     tty_pty.c       4.29    82/12/05        */

 
 /*
  * Pseudo-teletype Driver
 
 /*
  * Pseudo-teletype Driver


@@ -9,6 +9,7 @@
 #if NPTY > 0
 #include "../h/param.h"
 #include "../h/systm.h"
 #if NPTY > 0
 #include "../h/param.h"
 #include "../h/systm.h"

+#include "../h/ioctl.h"

 #include "../h/tty.h"
 #include "../h/dir.h"
 #include "../h/user.h"
 #include "../h/tty.h"
 #include "../h/dir.h"
 #include "../h/user.h"


@@ -430,8 +431,8 @@ ptyioctl(dev, cmd, data, flag)
        error = ttioctl(tp, cmd, data, dev);
        if (error < 0)
                error = ENOTTY;
        error = ttioctl(tp, cmd, data, dev);
        if (error < 0)
                error = ENOTTY;

-       { int stop = (tp->t_un.t_chr.t_stopc == ('s'&037) &&
-                     tp->t_un.t_chr.t_startc == ('q'&037));
+       { int stop = (tp->t_stopc == ('s'&037) &&
+                     tp->t_startc == ('q'&037));

        if (pti->pt_flags & PF_NOSTOP) {
                if (stop) {
                        pti->pt_send &= TIOCPKT_NOSTOP;
        if (pti->pt_flags & PF_NOSTOP) {
                if (stop) {
                        pti->pt_send &= TIOCPKT_NOSTOP;

diff --git a/usr/src/sys/kern/tty_tb.c b/usr/src/sys/kern/tty_tb.c
index e4dc8ef..90dae83 100644 (file)
--- a/usr/src/sys/kern/tty_tb.c
+++ b/usr/src/sys/kern/tty_tb.c
@@ -1,4 +1,4 @@
-/*     tty_tb.c        4.6     82/10/17        */
+/*     tty_tb.c        4.7     82/12/05        */

 
 #include "tb.h"
 #if NTB > 0
 
 #include "tb.h"
 #if NTB > 0


@@ -7,6 +7,7 @@
 #include "../h/systm.h"
 #include "../h/dir.h"
 #include "../h/user.h"
 #include "../h/systm.h"
 #include "../h/dir.h"
 #include "../h/user.h"

+#include "../h/ioctl.h"

 #include "../h/tty.h"
 #include "../h/proc.h"
 #include "../h/inode.h"
 #include "../h/tty.h"
 #include "../h/proc.h"
 #include "../h/inode.h"

diff --git a/usr/src/sys/kern/tty_tty.c b/usr/src/sys/kern/tty_tty.c
index 914b915..4a4b415 100644 (file)
--- a/usr/src/sys/kern/tty_tty.c
+++ b/usr/src/sys/kern/tty_tty.c
@@ -1,4 +1,4 @@
-/*     tty_tty.c       4.13    82/10/17        */
+/*     tty_tty.c       4.14    82/12/05        */

 
 /*
  * Indirect driver for controlling tty.
 
 /*
  * Indirect driver for controlling tty.


@@ -10,6 +10,7 @@
 #include "../h/conf.h"
 #include "../h/dir.h"
 #include "../h/user.h"
 #include "../h/conf.h"
 #include "../h/dir.h"
 #include "../h/user.h"

+#include "../h/ioctl.h"

 #include "../h/tty.h"
 #include "../h/proc.h"
 #include "../h/uio.h"
 #include "../h/tty.h"
 #include "../h/proc.h"
 #include "../h/uio.h"