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 e79841b..ac60340 100644 (file)
--- a/usr/src/sys/sys/conf.h
+++ b/usr/src/sys/sys/conf.h
@@ -2,20 +2,56 @@
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *

- * %sccs.include.redist.c%
+ * 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.7 (Berkeley) %G%
+ * 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
+ */
+
+/*
+ * Definitions of device driver entry switches

  */
 
  */
 

+#ifdef __STDC__
+struct tty;
+#endif
+

 struct bdevsw {
 struct bdevsw {

-       int (*d_open)   __P((dev_t dev, int mode, 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_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;

 };
 
 #ifdef KERNEL
 };
 
 #ifdef KERNEL


@@ -23,20 +59,20 @@ struct bdevsw bdevsw[];
 #endif
 
 struct cdevsw {
 #endif
 
 struct cdevsw {

-       int (*d_open)   __P((dev_t dev, int mode, 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,
-                               struct proc *p));
-       int (*d_write)  __P((dev_t dev, struct uio *uio, int ioflag,
-                               struct proc *p));
-       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((dev_t dev, ...));
-       int (*d_strategy) __P((struct buf *bp));
+       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


@@ -48,16 +84,16 @@ extern char devioc[], devcls[];
 #endif
 
 struct linesw {
 #endif
 
 struct linesw {

-       int (*l_open)();
-       int (*l_close)();
-       int (*l_read)();
-       int (*l_write)();
-       int (*l_ioctl)();
-       int (*l_rint)();
-       int (*l_rend)();
-       int (*l_meta)();
-       int (*l_start)();
-       int (*l_modem)();
+       int     (*l_open)();
+       int     (*l_close)();
+       int     (*l_read)();
+       int     (*l_write)();
+       int     (*l_ioctl)();
+       int     (*l_rint)();
+       int     (*l_rend)();
+       int     (*l_meta)();
+       int     (*l_start)();
+       int     (*l_modem)();

 };
 
 #ifdef KERNEL
 };
 
 #ifdef KERNEL


@@ -65,14 +101,10 @@ struct linesw linesw[];
 #endif
 
 struct swdevt {
 #endif
 
 struct swdevt {

-       dev_t sw_dev;
-       int sw_freed;
-       int sw_nblks;
-       struct vnode *sw_vp;
-#ifdef SECSIZE
-       int     sw_blksize;
-       int     sw_bshift;
-#endif SECSIZE
+       dev_t   sw_dev;
+       int     sw_freed;
+       int     sw_nblks;
+       struct  vnode *sw_vp;

 };
 
 #ifdef KERNEL
 };
 
 #ifdef KERNEL