summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2005-03-03 12:11:49 +0000
committermartin <martin@NetBSD.org>2005-03-03 12:11:49 +0000
commitb402d198516cb5eec90415594c35bf66a42153f2 (patch)
tree913410ebc5dc4b72a99b781670d5557d9645d71c /sys/dev
parenta02091146b15eac5bfae5d2dcfc34bb934091c24 (diff)
Make it (at least) compile w/o wsdisplay @ cgsix.
Pointed out by Juergen Hannken-Illjes.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/sun/cgsix.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/sys/dev/sun/cgsix.c b/sys/dev/sun/cgsix.c
index 06a1d5d7c3a..798dec776c1 100644
--- a/sys/dev/sun/cgsix.c
+++ b/sys/dev/sun/cgsix.c
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.19 2005/02/27 00:27:49 perry Exp $");
#include <dev/rasops/rasops.h>
#include "opt_wsemul.h"
+#include "rasops_glue.h"
static void cg6_unblank(struct device *);
@@ -291,6 +292,7 @@ int cgsix_use_rasterconsole = 1;
/*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_ras_do_cursor(struct rasops_info *ri)
CG6_DRAW_WAIT(fbc);
CG6_DRAIN(fbc);
}
+#endif
void
cg6attach(sc, name, isconsole)
@@ -528,9 +531,11 @@ cg6attach(sc, name, isconsole)
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 @@ cg6attach(sc, name, isconsole)
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 @@ cg6attach(sc, name, isconsole)
printf("\n");
config_found(&sc->sc_dev, &aa, wsemuldisplaydevprint);
+#endif
}