Cleanups for 4.4BSD-Lite

[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 1fa0484..11e6c17 100644 (file)
--- a/usr/src/sys/kern/tty_conf.c
+++ b/usr/src/sys/kern/tty_conf.c
@@ -1,18 +1,19 @@
 /*-
 /*-

- * Copyright (c) 1982, 1986, 1991 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.

  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tty_conf.c  7.7 (Berkeley) %G%
+ *     @(#)tty_conf.c  8.2 (Berkeley) %G%

  */
 
  */
 

-#include "param.h"
-#include "systm.h"
-#include "buf.h"
-#include "ioctl.h"
-#include "tty.h"
-#include "conf.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/buf.h>
+#include <sys/ioctl.h>
+#include <sys/proc.h>
+#include <sys/tty.h>
+#include <sys/conf.h>

 
 #define        ttynodisc ((int (*) __P((dev_t, struct tty *)))enodev)
 #define        ttyerrclose ((int (*) __P((struct tty *, int flags)))enodev)
 
 #define        ttynodisc ((int (*) __P((dev_t, struct tty *)))enodev)
 #define        ttyerrclose ((int (*) __P((struct tty *, int flags)))enodev)


@@ -20,16 +21,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


@@ -54,29 +47,29 @@ int slstart __P((struct tty *tp));
 
 struct linesw linesw[] =
 {
 
 struct linesw linesw[] =
 {

-       ttyopen, ttylclose, ttread, ttwrite, nullioctl,
-       ttyinput, ttstart, ttymodem,                    /* 0- termios */
+       { ttyopen, ttylclose, ttread, ttwrite, nullioctl,
+         ttyinput, ttstart, ttymodem },                /* 0- termios */

 
 

-       ttynodisc, ttyerrclose, ttyerrio, ttyerrio, nullioctl,
-       ttyerrinput, ttyerrstart, nullmodem,            /* 1- defunct */
+       { ttynodisc, ttyerrclose, ttyerrio, ttyerrio, nullioctl,
+         ttyerrinput, ttyerrstart, nullmodem },        /* 1- defunct */

 
 

-       ttynodisc, ttyerrclose, ttyerrio, ttyerrio, nullioctl,
-       ttyerrinput, ttyerrstart, nullmodem,            /* 2- defunct */
+       { ttynodisc, ttyerrclose, ttyerrio, ttyerrio, nullioctl,
+         ttyerrinput, ttyerrstart, nullmodem },        /* 2- defunct */

 
 #if NTB > 0
 
 #if NTB > 0

-       tbopen, tbclose, tbread, enodev, tbioctl,
-       tbinput, ttstart, nullmodem,                    /* 3- TABLDISC */
+       { tbopen, tbclose, tbread, enodev, tbioctl,
+         tbinput, ttstart, nullmodem },                /* 3- TABLDISC */

 #else
 #else

-       ttynodisc, ttyerrclose, ttyerrio, ttyerrio, nullioctl,
-       ttyerrinput, ttyerrstart, nullmodem,
+       { ttynodisc, ttyerrclose, ttyerrio, ttyerrio, nullioctl,
+         ttyerrinput, ttyerrstart, nullmodem },

 #endif
 
 #if NSL > 0
 #endif
 
 #if NSL > 0

-       slopen, slclose, ttyerrio, ttyerrio, sltioctl,
-       slinput, slstart, nullmodem,                    /* 4- SLIPDISC */
+       { slopen, slclose, ttyerrio, ttyerrio, sltioctl,
+         slinput, slstart, nullmodem },                /* 4- SLIPDISC */

 #else
 #else

-       ttynodisc, ttyerrclose, ttyerrio, ttyerrio, nullioctl,
-       ttyerrinput, ttyerrstart, nullmodem,
+       { ttynodisc, ttyerrclose, ttyerrio, ttyerrio, nullioctl,
+         ttyerrinput, ttyerrstart, nullmodem },

 #endif
 };
 
 #endif
 };