add POSIX-style byte-level record locking

[unix-history] / usr / src / sys / kern / tty_conf.c

diff --git a/usr/src/sys/kern/tty_conf.c b/usr/src/sys/kern/tty_conf.c
index 3e5269f..26ee5bc 100644 (file)
--- a/usr/src/sys/kern/tty_conf.c
+++ b/usr/src/sys/kern/tty_conf.c
@@ -1,9 +1,9 @@
 /*
 /*

- * Copyright (c) 1982 Regents of the University of California.
+ * Copyright (c) 1982, 1986 Regents of the University of California.

  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)tty_conf.c  6.7 (Berkeley) %G%
+ *     @(#)tty_conf.c  7.4 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -19,39 +19,39 @@ int nulldev();
 int    ttyopen(),ttylclose(),ttread(),ttwrite(),nullioctl(),ttstart();
 int    ttymodem(), nullmodem(), ttyinput();
 
 int    ttyopen(),ttylclose(),ttread(),ttwrite(),nullioctl(),ttstart();
 int    ttymodem(), nullmodem(), ttyinput();
 

-#include "bk.h"
-#if NBK > 0
-int    bkopen(),bkclose(),bkread(),bkinput(),bkioctl();
-#endif
+int    ottyopen(), ottylclose(), ottread(), ottwrite();
+int    ottyinput(), ottstart(), ottymodem();

 
 #include "tb.h"
 #if NTB > 0
 int    tbopen(),tbclose(),tbread(),tbinput(),tbioctl();
 #endif
 
 #include "tb.h"
 #if NTB > 0
 int    tbopen(),tbclose(),tbread(),tbinput(),tbioctl();
 #endif

+#include "sl.h"
+#if NSL > 0
+int    slopen(),slclose(),slinput(),sltioctl(),slstart();
+#endif
+

 
 struct linesw linesw[] =
 {
        ttyopen, ttylclose, ttread, ttwrite, nullioctl,
 
 struct linesw linesw[] =
 {
        ttyopen, ttylclose, ttread, ttwrite, nullioctl,

-       ttyinput, nodev, nulldev, ttstart, ttymodem,
-#if NBK > 0
-       bkopen, bkclose, bkread, ttwrite, bkioctl,
-       bkinput, nodev, nulldev, ttstart, nullmodem,
-#else
+       ttyinput, nodev, nulldev, ttstart, ttymodem,    /* 0- termios */
+
+       nodev, nodev, nodev, nodev, nodev,              /* 1- defunct */

        nodev, nodev, nodev, nodev, nodev,
        nodev, nodev, nodev, nodev, nodev,

+
+       nodev, nodev, nodev, nodev, nodev,              /* 2- defunct */

        nodev, nodev, nodev, nodev, nodev,
        nodev, nodev, nodev, nodev, nodev,

-#endif
-       ttyopen, ttylclose, ttread, ttwrite, nullioctl,
-       ttyinput, nodev, nulldev, ttstart, ttymodem,

 #if NTB > 0
        tbopen, tbclose, tbread, nodev, tbioctl,
 #if NTB > 0
        tbopen, tbclose, tbread, nodev, tbioctl,

-       tbinput, nodev, nulldev, ttstart, nullmodem,            /* 3 */
+       tbinput, nodev, nulldev, ttstart, nullmodem,    /* 3- TABLDISC */

 #else
        nodev, nodev, nodev, nodev, nodev,
        nodev, nodev, nodev, nodev, nodev,
 #endif
 #else
        nodev, nodev, nodev, nodev, nodev,
        nodev, nodev, nodev, nodev, nodev,
 #endif

-#if NTB > 0
-       tbopen, tbclose, tbread, nodev, tbioctl,
-       tbinput, nodev, nulldev, ttstart, nullmodem,            /* 4 */
+#if NSL > 0
+       slopen, slclose, nodev, nodev, sltioctl,
+       slinput, nodev, nulldev, slstart, nullmodem,    /* 4- SLIPDISC */

 #else
        nodev, nodev, nodev, nodev, nodev,
        nodev, nodev, nodev, nodev, nodev,
 #else
        nodev, nodev, nodev, nodev, nodev,
        nodev, nodev, nodev, nodev, nodev,