summaryrefslogtreecommitdiff
path: root/sys/kern/tty_pty.c
diff options
context:
space:
mode:
authorBruce Evans <bde@FreeBSD.org>1998-08-23 08:26:42 +0000
committerBruce Evans <bde@FreeBSD.org>1998-08-23 08:26:42 +0000
commitcf8c7b09630c27796b1970818e7b3ba431be55aa (patch)
tree15c99bee0ff7d2b99753c675b319fc30f4de5452 /sys/kern/tty_pty.c
parent87c95fa5dc145c2f393c8baf6ec1ec82ab5cbaa6 (diff)
Notes
Diffstat (limited to 'sys/kern/tty_pty.c')
-rw-r--r--sys/kern/tty_pty.c32
1 files changed, 18 insertions, 14 deletions
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index 1f430e253ec0..214f103bb345 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)tty_pty.c 8.4 (Berkeley) 2/20/95
- * $Id: tty_pty.c,v 1.52 1998/06/07 17:11:43 dfr Exp $
+ * $Id: tty_pty.c,v 1.53 1998/07/15 12:18:30 bde Exp $
*/
/*
@@ -79,18 +79,23 @@ static d_read_t ptcread;
static d_write_t ptcwrite;
static d_poll_t ptcpoll;
-#define CDEV_MAJOR_S 5
-#define CDEV_MAJOR_C 6
-static struct cdevsw pts_cdevsw =
- { ptsopen, ptsclose, ptsread, ptswrite, /*5*/
- ptyioctl, ptsstop, nullreset, ptydevtotty,/* ttyp */
- ttpoll, nommap, NULL, "pts", NULL, -1 };
-
-static struct cdevsw ptc_cdevsw =
- { ptcopen, ptcclose, ptcread, ptcwrite, /*6*/
- ptyioctl, nullstop, nullreset, ptydevtotty,/* ptyp */
- ptcpoll, nommap, NULL, "ptc", NULL, -1 };
-
+#define CDEV_MAJOR_S 5
+static struct cdevsw pts_cdevsw = {
+ ptsopen, ptsclose, ptsread, ptswrite,
+ ptyioctl, ptsstop, nullreset, ptydevtotty,
+ ttpoll, nommap, NULL, "pts",
+ NULL, -1, nodump, nopsize,
+ D_TTY,
+};
+
+#define CDEV_MAJOR_C 6
+static struct cdevsw ptc_cdevsw = {
+ ptcopen, ptcclose, ptcread, ptcwrite,
+ ptyioctl, nullstop, nullreset, ptydevtotty,
+ ptcpoll, nommap, NULL, "ptc",
+ NULL, -1, nodump, nopsize,
+ D_TTY,
+};
#if NPTY == 1
#undef NPTY
@@ -178,7 +183,6 @@ ptsopen(dev, flag, devtype, p)
tp->t_lflag = TTYDEF_LFLAG;
tp->t_cflag = TTYDEF_CFLAG;
tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED;
- ttsetwater(tp); /* would be done in xxparam() */
} else if (tp->t_state&TS_XCLUDE && p->p_ucred->cr_uid != 0)
return (EBUSY);
if (tp->t_oproc) /* Ctrlr still around. */