Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make this compile again with NWSDISPLAY==0

Browse Source
This commit is contained in:
macallan 2008-12-22 23:46:22 +00:00
parent adf8a9bf65
commit 698f27a0ae
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/sun/cgsix.c
View File

@ -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;

4
sys/dev/sun/cgsixvar.h
View File

@ -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 */
};