BSD 4_3_Net_2 release

[unix-history] / usr / src / sys / sys / conf.h

diff --git a/usr/src/sys/sys/conf.h b/usr/src/sys/sys/conf.h
index df1fde4..ac60340 100644 (file)
--- a/usr/src/sys/sys/conf.h
+++ b/usr/src/sys/sys/conf.h
@@ -1,64 +1,89 @@
-/*
- * Copyright (c) 1982, 1986, 1990 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- *     @(#)conf.h      7.5 (Berkeley) 4/4/90
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)conf.h      7.9 (Berkeley) 5/5/91

  */
 
 /*
  */
 
 /*

- * Declaration of block device
- * switch. Each entry (row) is
- * the only link between the
- * main unix code and the driver.
- * The initialization of the
- * device switches is in the
- * file conf.c.
+ * Definitions of device driver entry switches

  */
  */

-struct bdevsw
-{
-       int     (*d_open)();
-       int     (*d_close)();
-       int     (*d_strategy)();
-       int     (*d_ioctl)();
-       int     (*d_dump)();
-       int     (*d_psize)();
+
+#ifdef __STDC__
+struct tty;
+#endif
+
+struct bdevsw {
+       int     (*d_open)       __P((dev_t dev, int oflags, int devtype,
+                                    struct proc *p));
+       int     (*d_close)      __P((dev_t dev, int fflag, int devtype,
+                                    struct proc *));
+       int     (*d_strategy)   __P((struct buf *bp));
+       int     (*d_ioctl)      __P((dev_t dev, int cmd, caddr_t data,
+                                    int fflag, struct proc *p));
+       int     (*d_dump)       __P((dev_t dev));
+       int     (*d_psize)      __P((dev_t dev));

        int     d_flags;
 };
        int     d_flags;
 };

+

 #ifdef KERNEL
 #ifdef KERNEL

-struct bdevsw bdevsw[];
+struct bdevsw bdevsw[];

 #endif
 
 #endif
 

-/*
- * Character device switch.
- */
-struct cdevsw
-{
-       int     (*d_open)();
-       int     (*d_close)();
-       int     (*d_read)();
-       int     (*d_write)();
-       int     (*d_ioctl)();
-       int     (*d_stop)();
-       int     (*d_reset)();
-       struct tty *d_ttys;
-       int     (*d_select)();
-       int     (*d_mmap)();
-       int     (*d_strategy)();
+struct cdevsw {
+       int     (*d_open)       __P((dev_t dev, int oflags, int devtype,
+                                    struct proc *p));
+       int     (*d_close)      __P((dev_t dev, int fflag, int devtype,
+                                    struct proc *));
+       int     (*d_read)       __P((dev_t dev, struct uio *uio, int ioflag));
+       int     (*d_write)      __P((dev_t dev, struct uio *uio, int ioflag));
+       int     (*d_ioctl)      __P((dev_t dev, int cmd, caddr_t data,
+                                    int fflag, struct proc *p));
+       int     (*d_stop)       __P((struct tty *tp, int rw));
+       int     (*d_reset)      __P((int uban));        /* XXX */
+       struct  tty *d_ttys;
+       int     (*d_select)     __P((dev_t dev, int which, struct proc *p));
+       int     (*d_mmap)       __P(());
+       int     (*d_strategy)   __P((struct buf *bp));

 };
 };

+

 #ifdef KERNEL
 #ifdef KERNEL

-struct cdevsw cdevsw[];
+struct cdevsw cdevsw[];

 
 /* symbolic sleep message strings */
 
 /* symbolic sleep message strings */

-extern  char devopn[], devio[], devwait[];
-extern  char devin[], devout[], devioc[], devcls[];
+extern char devopn[], devio[], devwait[], devin[], devout[];
+extern char devioc[], devcls[];

 #endif
 
 #endif
 

-/*
- * tty line control switch.
- */
-struct linesw
-{
+struct linesw {

        int     (*l_open)();
        int     (*l_close)();
        int     (*l_read)();
        int     (*l_open)();
        int     (*l_close)();
        int     (*l_read)();


@@ -70,20 +95,18 @@ struct linesw
        int     (*l_start)();
        int     (*l_modem)();
 };
        int     (*l_start)();
        int     (*l_modem)();
 };

+

 #ifdef KERNEL
 #ifdef KERNEL

-struct linesw linesw[];
+struct linesw linesw[];

 #endif
 
 #endif
 

-/*
- * Swap device information
- */
-struct swdevt
-{
+struct swdevt {

        dev_t   sw_dev;
        int     sw_freed;
        int     sw_nblks;
        dev_t   sw_dev;
        int     sw_freed;
        int     sw_nblks;

-       struct vnode *sw_vp;
+       struct  vnode *sw_vp;

 };
 };

+

 #ifdef KERNEL
 #ifdef KERNEL

-struct swdevt swdevt[];
+struct swdevt swdevt[];

 #endif
 #endif