BSD 4_3_Net_2 release

[unix-history] / usr / src / sys / hp300 / dev / ite_rb.c

diff --git a/usr/src/sys/hp300/dev/ite_rb.c b/usr/src/sys/hp300/dev/ite_rb.c
index d639ab9..3511d8b 100644 (file)
--- a/usr/src/sys/hp300/dev/ite_rb.c
+++ b/usr/src/sys/hp300/dev/ite_rb.c
@@ -7,30 +7,54 @@
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
  *
  * 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.

  *
  *

- * from: Utah $Hdr: ite_rb.c 1.1 90/07/09$
+ * 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.

  *
  *

- *     @(#)ite_rb.c    7.3 (Berkeley) %G%
+ * from: Utah $Hdr: ite_rb.c 1.16 91/01/21$
+ *
+ *     @(#)ite_rb.c    7.5 (Berkeley) 5/7/91

  */
 
 #include "ite.h"
 #if NITE > 0
 
  */
 
 #include "ite.h"
 #if NITE > 0
 

-#include "sys/param.h"
-#include "sys/conf.h"
-#include "sys/user.h"
-#include "sys/proc.h"
-#include "sys/ioctl.h"
-#include "sys/tty.h"
-#include "sys/systm.h"
-#include "sys/uio.h"
+#include "param.h"
+#include "conf.h"
+#include "proc.h"
+#include "ioctl.h"
+#include "tty.h"
+#include "systm.h"

 
 #include "itevar.h"
 #include "itereg.h"
 #include "grf_rbreg.h"
 
 
 #include "itevar.h"
 #include "itereg.h"
 #include "grf_rbreg.h"
 

-#include "../include/cpu.h"
+#include "machine/cpu.h"

 
 /* XXX */
 #include "grfioctl.h"
 
 /* XXX */
 #include "grfioctl.h"


@@ -46,9 +70,9 @@ rbox_init(ip)
 
        /* XXX */
        if (ip->regbase == 0) {
 
        /* XXX */
        if (ip->regbase == 0) {

-               struct grfinfo *gi = &grf_softc[ip - ite_softc].g_display;
-               ip->regbase = IOV(gi->gd_regaddr);
-               ip->fbbase = IOV(gi->gd_fbaddr);
+               struct grf_softc *gp = &grf_softc[ip - ite_softc];
+               ip->regbase = gp->g_regkva;
+               ip->fbbase = gp->g_fbkva;

        }
 
        rb_waitbusy(REGADDR);
        }
 
        rb_waitbusy(REGADDR);