[src/trunk]: src/sys/arch/sparc/dev throw out RASTERCONSOLE goo

[macallan <macallan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0234ef02d422
branches:  trunk
changeset: 784688:0234ef02d422
user:      macallan <macallan%NetBSD.org@localhost>
date:      Tue Feb 05 21:45:39 2013 +0000

description:
throw out RASTERCONSOLE goo

diffstat:

 sys/arch/sparc/dev/cgfourteen.c    |  54 +-------------------------------------
 sys/arch/sparc/dev/cgfourteenvar.h |   5 +--
 2 files changed, 2 insertions(+), 57 deletions(-)

diffs (108 lines):

diff -r 9dcbbf98928f -r 0234ef02d422 sys/arch/sparc/dev/cgfourteen.c
--- a/sys/arch/sparc/dev/cgfourteen.c   Tue Feb 05 21:35:18 2013 +0000
+++ b/sys/arch/sparc/dev/cgfourteen.c   Tue Feb 05 21:45:39 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cgfourteen.c,v 1.68 2012/10/27 17:18:11 chs Exp $ */
+/*     $NetBSD: cgfourteen.c,v 1.69 2013/02/05 21:45:39 macallan Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -128,8 +128,6 @@
        cgfourteenpoll, cgfourteenmmap, nokqfilter
 };
 
-extern struct tty *fbconstty;
-
 static void cg14_set_video(struct cgfourteen_softc *, int);
 static int  cg14_get_video(struct cgfourteen_softc *);
 static int  cg14_get_cmap(struct fbcmap *, union cg14cmap *, int);
@@ -149,10 +147,6 @@
                            struct wsdisplay_cursor *);
 #endif
 
-#if defined(RASTERCONSOLE) && (NWSDISPLAY > 0)
-#error "You can't have it both ways - either RASTERCONSOLE or wsdisplay"
-#endif
-
 /*
  * Match a cgfourteen.
  */
@@ -184,18 +178,6 @@
  */
 #define COLOUR_OFFSET (256*1024)
 
-#ifdef RASTERCONSOLE
-static void cg14_set_rcons_luts(struct cgfourteen_softc *sc)
-{
-       int i;
-
-       for (i=0;i<CG14_CLUT_SIZE;i++) sc->sc_xlut->xlut_lut[i] = 0x22;
-       for (i=0;i<CG14_CLUT_SIZE;i++) sc->sc_clut2->clut_lut[i] = 0x00ffffff;
-       sc->sc_clut2->clut_lut[0] = 0x00ffffff;
-       sc->sc_clut2->clut_lut[255] = 0;
-}
-#endif /* RASTERCONSOLE */
-
 #if NWSDISPLAY > 0
 static int     cg14_ioctl(void *, void *, u_long, void *, int, struct lwp *);
 static paddr_t cg14_mmap(void *, void *, off_t, int);
@@ -315,40 +297,6 @@
        /* See if we're the console */
         isconsole = fb_is_console(node);
 
-#if defined(RASTERCONSOLE)
-       if (isconsole) {
-               printf(" (console)\n");
-               /* *sbus*_bus_map?  but that's how we map the regs... */
-               if (sbus_bus_map( sc->sc_bustag,
-                                 sc->sc_physadr[CG14_PXL_IDX].sbr_slot,
-                                 sc->sc_physadr[CG14_PXL_IDX].sbr_offset +
-                                   0x03800000,
-                                 1152 * 900, BUS_SPACE_MAP_LINEAR,
-                                 &bh) != 0) {
-                       printf("%s: cannot map pixels\n",
-                           device_xname(sc->sc_dev));
-                       return;
-               }
-               sc->sc_rcfb = sc->sc_fb;
-               sc->sc_rcfb.fb_type.fb_type = FBTYPE_SUN3COLOR;
-               sc->sc_rcfb.fb_type.fb_depth = 8;
-               sc->sc_rcfb.fb_linebytes = 1152;
-               sc->sc_rcfb.fb_type.fb_size = roundup(1152*900,NBPG);
-               sc->sc_rcfb.fb_pixels = (void *)bh;
-
-               printf("vram at %p\n",(void *)bh);
-               /* XXX should use actual screen size */
-
-               for (i = 0; i < ramsize; i++)
-                   ((unsigned char *)bh)[i] = 0;
-               fbrcons_init(&sc->sc_rcfb);
-               cg14_set_rcons_luts(sc);
-               sc->sc_ctl->ctl_mctl = CG14_MCTL_ENABLEVID | 
-                   CG14_MCTL_PIXMODE_32 | CG14_MCTL_POWERCTL;
-       } else
-               printf("\n");
-#endif
-
 #if NWSDISPLAY > 0
        prom_getprop(sa->sa_node, "address", 4, &items, &ptr);
        if (fbva[1] == 0) {
diff -r 9dcbbf98928f -r 0234ef02d422 sys/arch/sparc/dev/cgfourteenvar.h
--- a/sys/arch/sparc/dev/cgfourteenvar.h        Tue Feb 05 21:35:18 2013 +0000
+++ b/sys/arch/sparc/dev/cgfourteenvar.h        Tue Feb 05 21:45:39 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cgfourteenvar.h,v 1.13 2010/08/31 21:14:57 macallan Exp $ */
+/*     $NetBSD: cgfourteenvar.h,v 1.14 2013/02/05 21:45:39 macallan Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -74,9 +74,6 @@
 struct cgfourteen_softc {
        device_t        sc_dev;         /* base device */
        struct fbdevice sc_fb;          /* frame buffer device */
-#ifdef RASTERCONSOLE
-       struct fbdevice sc_rcfb;        /* sc_fb variant for rcons */
-#endif
        bus_space_tag_t sc_bustag;
        struct sbus_reg sc_physadr[2];  /* phys addrs of h/w */
        bus_space_handle_t sc_regh;     /* register space */