have to include proc.h before socketvar.h

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

diff --git a/usr/src/sys/hp300/dev/ite_tc.c b/usr/src/sys/hp300/dev/ite_tc.c
index 8d3bd0e..323d1ea 100644 (file)
--- a/usr/src/sys/hp300/dev/ite_tc.c
+++ b/usr/src/sys/hp300/dev/ite_tc.c
@@ -9,9 +9,9 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- * from: Utah $Hdr: ite_tc.c 1.22 89/04/11$
+ * from: Utah $Hdr: ite_tc.c 1.25 91/03/25$

  *
  *

- *     @(#)ite_tc.c    7.1 (Berkeley) %G%
+ *     @(#)ite_tc.c    7.4 (Berkeley) %G%

  */
 
 #include "ite.h"
  */
 
 #include "ite.h"


@@ -19,12 +19,10 @@
 
 #include "param.h"
 #include "conf.h"
 
 #include "param.h"
 #include "conf.h"

-#include "user.h"

 #include "proc.h"
 #include "ioctl.h"
 #include "tty.h"
 #include "systm.h"
 #include "proc.h"
 #include "ioctl.h"
 #include "tty.h"
 #include "systm.h"

-#include "uio.h"

 
 #include "grf_tcreg.h"
 #include "itereg.h"
 
 #include "grf_tcreg.h"
 #include "itereg.h"


@@ -44,9 +42,24 @@ topcat_init(ip)
 {
        /* XXX */
        if (ip->regbase == NULL) {
 {
        /* XXX */
        if (ip->regbase == NULL) {

-               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;
+       }
+
+       /*
+        * Catseye looks a lot like a topcat, but not completely.
+        * So, we set some bits to make it work.
+        */
+       if (REGBASE->fbid != GID_TOPCAT) {
+               while ((REGBASE->catseye_status & 1))
+                       ;
+               REGBASE->catseye_status = 0x0;
+               REGBASE->vb_select      = 0x0;
+               REGBASE->tcntrl         = 0x0;
+               REGBASE->acntrl         = 0x0;
+               REGBASE->pncntrl        = 0x0;
+               REGBASE->rug_cmdstat    = 0x90;

        }
 
        /*
        }
 
        /*