[src/trunk]: src/sys/dev/sun Make it (at least) compile w/o wsdisplay @ cgsix.

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

details:   https://anonhg.NetBSD.org/src/rev/fda787ce1a13
branches:  trunk
changeset: 574526:fda787ce1a13
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Mar 03 12:11:49 2005 +0000

description:
Make it (at least) compile w/o wsdisplay @ cgsix.
Pointed out by Juergen Hannken-Illjes.

diffstat:

 sys/dev/sun/cgsix.c |  13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diffs (72 lines):

diff -r 7632feea8986 -r fda787ce1a13 sys/dev/sun/cgsix.c
--- a/sys/dev/sun/cgsix.c       Thu Mar 03 09:23:24 2005 +0000
+++ b/sys/dev/sun/cgsix.c       Thu Mar 03 12:11:49 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cgsix.c,v 1.19 2005/02/27 00:27:49 perry Exp $ */
+/*     $NetBSD: cgsix.c,v 1.20 2005/03/03 12:11:49 martin Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -85,7 +85,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.19 2005/02/27 00:27:49 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.20 2005/03/03 12:11:49 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -120,6 +120,7 @@
 #include <dev/rasops/rasops.h>
 
 #include "opt_wsemul.h"
+#include "rasops_glue.h"
 
 static void    cg6_unblank(struct device *);
 
@@ -291,6 +292,7 @@
                /*EMPTY*/;                                              \
 } while (0)
 
+#if NWSDISPLAY
 static void cg6_ras_init(struct cgsix_softc *);
 static void cg6_ras_copyrows(void *, int, int, int);
 static void cg6_ras_copycols(void *, int, int, int, int);
@@ -520,6 +522,7 @@
        CG6_DRAW_WAIT(fbc);
        CG6_DRAIN(fbc);
 }
+#endif
 
 void
 cg6attach(sc, name, isconsole)
@@ -528,9 +531,11 @@
        int isconsole;
 {
        struct fbdevice *fb = &sc->sc_fb;
+#if NWSDISPLAY
        struct wsemuldisplaydev_attach_args aa;
        struct rasops_info *ri = &fb->fb_rinfo;
        unsigned long defattr;
+#endif
 
        fb->fb_driver = &cg6_fbdriver;
 
@@ -574,7 +579,8 @@
 
        fb_attach(&sc->sc_fb, isconsole);
 
-/* setup rasops and so on for wsdisplay */
+#if NWSDISPLAY
+       /* setup rasops and so on for wsdisplay */
        wsfont_init();
        /* fill in rasops_info */
        ri->ri_hw=sc;
@@ -626,6 +632,7 @@
        printf("\n");
 
        config_found(&sc->sc_dev, &aa, wsemuldisplaydevprint);
+#endif
 
 }