diff options
| author | macallan <macallan@NetBSD.org> | 2008-12-22 23:46:22 +0000 |
|---|---|---|
| committer | macallan <macallan@NetBSD.org> | 2008-12-22 23:46:22 +0000 |
| commit | 698f27a0aef065228faf7caef9e943cb7a6eae84 (patch) | |
| tree | a0b2391528ea905affc26362432324a2ca0213a4 /sys/dev/sun | |
| parent | adf8a9bf65438e956cf16d8fe62c11501adfa5e9 (diff) | |
make this compile again with NWSDISPLAY==0
Diffstat (limited to 'sys/dev/sun')
| -rw-r--r-- | sys/dev/sun/cgsix.c | 6 | ||||
| -rw-r--r-- | sys/dev/sun/cgsixvar.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/sun/cgsix.c b/sys/dev/sun/cgsix.c index 1a3bf276b94..06d00a95ac0 100644 --- a/sys/dev/sun/cgsix.c +++ b/sys/dev/sun/cgsix.c @@ -1,4 +1,4 @@ -/* $NetBSD: cgsix.c,v 1.40 2008/12/13 05:54:57 mrg Exp $ */ +/* $NetBSD: cgsix.c,v 1.41 2008/12/22 23:46:22 macallan Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -78,7 +78,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.40 2008/12/13 05:54:57 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.41 2008/12/22 23:46:22 macallan Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -566,7 +566,6 @@ cg6attach(struct cgsix_softc *sc, const char *name, int isconsole) sc->sc_fhcrev=-1; printf(", rev %d", sc->sc_fhcrev); - memcpy(sc->sc_default_cmap, rasops_cmap, 768); /* reset cursor & frame buffer controls */ cg6_reset(sc); @@ -609,6 +608,7 @@ cg6attach(struct cgsix_softc *sc, const char *name, int isconsole) #if NWSDISPLAY /* setup rasops and so on for wsdisplay */ + memcpy(sc->sc_default_cmap, rasops_cmap, 768); wsfont_init(); cg6_ras_init(sc); sc->sc_mode = WSDISPLAYIO_MODE_EMUL; diff --git a/sys/dev/sun/cgsixvar.h b/sys/dev/sun/cgsixvar.h index 5f8da4d5da8..5afb034ffc8 100644 --- a/sys/dev/sun/cgsixvar.h +++ b/sys/dev/sun/cgsixvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: cgsixvar.h,v 1.10 2008/12/12 18:39:55 macallan Exp $ */ +/* $NetBSD: cgsixvar.h,v 1.11 2008/12/22 23:46:22 macallan Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -72,8 +72,8 @@ struct cgsix_softc { int sc_mode; uint32_t sc_bg; struct vcons_data vd; -#endif uint8_t sc_default_cmap[768]; +#endif union bt_cmap sc_cmap; /* Brooktree color map */ }; |
