BSD 4_4 release

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

diff --git a/usr/src/sys/hp/dev/hil_subr.c b/usr/src/sys/hp/dev/hil_subr.c
index 31c8577..20b463a 100644 (file)
--- a/usr/src/sys/hp/dev/hil_subr.c
+++ b/usr/src/sys/hp/dev/hil_subr.c
@@ -1,21 +1,24 @@
 /*-
  * Copyright (c) 1988 University of Utah.
 /*-
  * Copyright (c) 1988 University of Utah.

- * 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.proprietary.c%
+ * This module is believed to contain source code proprietary to AT&T.
+ * Use and redistribution is subject to the Berkeley Software License
+ * Agreement and your Software Agreement with AT&T (Western Electric).

  *
  * from: Utah $Hdr: hil_subr.c 1.1 91/11/19$
  *
  *
  * from: Utah $Hdr: hil_subr.c 1.1 91/11/19$
  *

- *     @(#)hil_subr.c  7.1 (Berkeley) %G%
+ *     @(#)hil_subr.c  8.1 (Berkeley) 6/10/93

  */
 
  */
 

-#include "sys/param.h"
-#include "sys/ioctl.h"
-#include "sys/tty.h"
-#include "sys/clist.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+#include <sys/clist.h>

 
 

-#include "hilreg.h"
+#include <hp/dev/hilreg.h>

 
 /*
  * XXX this file only exists to separate out the AT&T tainted code.
 
 /*
  * XXX this file only exists to separate out the AT&T tainted code.


@@ -49,8 +52,8 @@ hilq_to_b(q, cp, cc)
 
        while (cc) {
                nc = sizeof (struct cblock) - ((int)q->c_cf & CROUND);
 
        while (cc) {
                nc = sizeof (struct cblock) - ((int)q->c_cf & CROUND);

-               nc = MIN(nc, cc);
-               nc = MIN(nc, q->c_cc);
+               nc = min(nc, cc);
+               nc = min(nc, q->c_cc);

                (void) bcopy(q->c_cf, cp, (unsigned)nc);
                q->c_cf += nc;
                q->c_cc -= nc;
                (void) bcopy(q->c_cf, cp, (unsigned)nc);
                q->c_cf += nc;
                q->c_cc -= nc;