From ba334c3e81a843baefd5e0eedc037b004a729398 Mon Sep 17 00:00:00 2001 From: Theo de Raadt Date: Mon, 18 Dec 1995 17:04:08 +0000 Subject: cgtwo only exists on vmes; and thus only sun4 (we will deal with the sun4/600 later) --- sys/arch/sparc/conf/files.sparc | 2 +- sys/arch/sparc/dev/cgtwo.c | 32 ++++++++------------------------ 2 files changed, 9 insertions(+), 25 deletions(-) (limited to 'sys/arch/sparc') diff --git a/sys/arch/sparc/conf/files.sparc b/sys/arch/sparc/conf/files.sparc index 696255cb7ce..912d53b2e49 100644 --- a/sys/arch/sparc/conf/files.sparc +++ b/sys/arch/sparc/conf/files.sparc @@ -65,7 +65,7 @@ file arch/sparc/dev/esp.c esp device bwtwo at sbus, obio, vmes, vmel, pfour file arch/sparc/dev/bwtwo.c bwtwo needs-flag -device cgtwo at sbus, obio, vmes +device cgtwo at vmes file arch/sparc/dev/cgtwo.c cgtwo needs-flag device cgthree at sbus diff --git a/sys/arch/sparc/dev/cgtwo.c b/sys/arch/sparc/dev/cgtwo.c index e8c2f3e30bc..17be2ccbc12 100644 --- a/sys/arch/sparc/dev/cgtwo.c +++ b/sys/arch/sparc/dev/cgtwo.c @@ -66,9 +66,7 @@ #include #include #include -#if defined(SUN4) #include -#endif #include @@ -126,16 +124,11 @@ cgtwomatch(parent, vcf, aux) if (strcmp(cf->cf_driver->cd_name, ra->ra_name)) return (0); -#if defined(SUN4) - if (cputyp != CPU_SUN4 || cf->cf_unit != 0) - return (0); - /* XXX - Must do our own mapping at CG2_CTLREG_OFF */ bus_untmp(); tmp = (caddr_t)bus_tmp(ra->ra_paddr + CG2_CTLREG_OFF, ca->ca_bustype); if (probeget(tmp, 2) != -1) return 1; -#endif return (0); } @@ -151,6 +144,7 @@ cgtwoattach(parent, self, args) register struct confargs *ca = args; register int node = 0, i; register struct cgtwo_all *p; + struct eeprom *eep = (struct eeprom *)eeprom_va; int isconsole; char *nam; @@ -173,19 +167,11 @@ cgtwoattach(parent, self, args) * registers ourselves. We only need the video RAM if we are * going to print characters via rconsole. */ -#if defined(SUN4) - if (cputyp == CPU_SUN4) { - struct eeprom *eep = (struct eeprom *)eeprom_va; - /* - * Assume this is the console if there's no eeprom info - * to be found. - */ - if (eep == NULL || eep->ee_diag.eed_console == EED_CONS_COLOR) - isconsole = (fbconstty != NULL); - else - isconsole = 0; - } -#endif + if (eep == NULL || eep->ee_diag.eed_console == EED_CONS_COLOR) + isconsole = (fbconstty != NULL); + else + isconsole = 0; + sc->sc_phys = ca->ca_ra.ra_reg[0]; sc->sc_bustype = ca->ca_bustype; @@ -209,13 +195,11 @@ cgtwoattach(parent, self, args) if (isconsole) { printf(" (console)\n"); #ifdef RASTERCONSOLE - if (ca->ca_bustype != BUS_PFOUR) - fbrcons_init(&sc->sc_fb); + fbrcons_init(&sc->sc_fb); #endif } else printf("\n"); - if ((node == fbnode && cputyp != CPU_SUN4) || - (isconsole && cputyp == CPU_SUN4)) + if (isconsole) fb_attach(&sc->sc_fb); } -- cgit v1.2.3