BSD 4_4_Lite1 release

[unix-history] / usr / src / sys / hp / dev / cons.c

diff --git a/usr/src/sys/hp/dev/cons.c b/usr/src/sys/hp/dev/cons.c
index 2e0f959..d6853a5 100644 (file)
--- a/usr/src/sys/hp/dev/cons.c
+++ b/usr/src/sys/hp/dev/cons.c
@@ -1,17 +1,43 @@
 /*
  * Copyright (c) 1988 University of Utah.
 /*
  * Copyright (c) 1988 University of Utah.

- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
  *
  *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
  *

- * %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.
+ *
+ * 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.

  *
  * from: Utah $Hdr: cons.c 1.7 92/01/21$
  *
  *
  * from: Utah $Hdr: cons.c 1.7 92/01/21$
  *

- *     @(#)cons.c      7.8 (Berkeley) %G%
+ *     @(#)cons.c      8.2 (Berkeley) 1/12/94

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


@@ -80,6 +106,7 @@ cnclose(dev, flag, mode, p)
 cnread(dev, uio, flag)
        dev_t dev;
        struct uio *uio;
 cnread(dev, uio, flag)
        dev_t dev;
        struct uio *uio;

+       int flag;

 {
        if (cn_tab == NULL)
                return (0);
 {
        if (cn_tab == NULL)
                return (0);


@@ -90,6 +117,7 @@ cnread(dev, uio, flag)
 cnwrite(dev, uio, flag)
        dev_t dev;
        struct uio *uio;
 cnwrite(dev, uio, flag)
        dev_t dev;
        struct uio *uio;

+       int flag;

 {
        if (cn_tab == NULL)
                return (0);
 {
        if (cn_tab == NULL)
                return (0);


@@ -99,6 +127,7 @@ cnwrite(dev, uio, flag)
  
 cnioctl(dev, cmd, data, flag, p)
        dev_t dev;
  
 cnioctl(dev, cmd, data, flag, p)
        dev_t dev;

+       int cmd, flag;

        caddr_t data;
        struct proc *p;
 {
        caddr_t data;
        struct proc *p;
 {