BSD 4_4_Lite1 release

[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 5d3c3cf..b53edb4 100644 (file)
--- a/usr/src/sys/kern/tty_conf.c
+++ b/usr/src/sys/kern/tty_conf.c
@@ -1,6 +1,11 @@
 /*-
  * Copyright (c) 1982, 1986, 1991, 1993
  *     The Regents of the University of California.  All rights reserved.
 /*-
  * Copyright (c) 1982, 1986, 1991, 1993
  *     The Regents of the University of California.  All rights reserved.

+ * (c) UNIX System Laboratories, Inc.
+ * All or some portions of this file are derived from material licensed
+ * to the University of California by American Telephone and Telegraph
+ * Co. or Unix System Laboratories, Inc. and are reproduced herein with
+ * the permission of UNIX System Laboratories, Inc.

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -30,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *

- *     @(#)tty_conf.c  8.1 (Berkeley) 6/10/93
+ *     @(#)tty_conf.c  8.4 (Berkeley) 1/21/94

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -47,16 +52,8 @@
 #define        ttyerrinput ((int (*) __P((int c, struct tty *)))enodev)
 #define        ttyerrstart ((int (*) __P((struct tty *)))enodev)
 
 #define        ttyerrinput ((int (*) __P((int c, struct tty *)))enodev)
 #define        ttyerrstart ((int (*) __P((struct tty *)))enodev)
 

-int    ttyopen __P((dev_t dev, struct tty *tp));
-int    ttylclose __P((struct tty *tp, int flags));
-int    ttread __P((struct tty *, struct uio *, int flags));
-int    ttwrite __P((struct tty *, struct uio *, int flags));

 int    nullioctl __P((struct tty *tp, int cmd, caddr_t data,
                        int flag, struct proc *p));
 int    nullioctl __P((struct tty *tp, int cmd, caddr_t data,
                        int flag, struct proc *p));

-int    ttyinput __P((int c, struct tty *tp));
-int    ttstart __P((struct tty *tp));
-int    ttymodem __P((struct tty *tp, int flags));
-int    nullmodem __P((struct tty *tp, int flags));

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


@@ -107,7 +104,7 @@ struct      linesw linesw[] =
 #endif
 };
 
 #endif
 };
 

-int    nldisp = sizeof (linesw) / sizeof (linesw[0]);
+int    nlinesw = sizeof (linesw) / sizeof (linesw[0]);

 
 /*
  * Do nothing specific version of line
 
 /*
  * Do nothing specific version of line