diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2006-02-12 00:04:24 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2006-02-12 00:04:24 +0000 |
| commit | 12cd95e30bb3f703a6d9b8f9154cfefb1bf035a7 (patch) | |
| tree | d116a3cf516cd1960a28471e461d62fdbbcb6807 /sys | |
| parent | 9fc05283efd34f34622e18370a64e8087bfb82f6 (diff) | |
Don't cause the screen border to be black; but we have to clear the whole
screen until console uses a low-depth plane; and if I could remember who
to thank for the Xvideo board I got via Wim, things would be even better.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/sparc/dev/tvtwo.c | 18 | ||||
| -rw-r--r-- | sys/dev/sbus/tvtwo.c | 18 |
2 files changed, 24 insertions, 12 deletions
diff --git a/sys/arch/sparc/dev/tvtwo.c b/sys/arch/sparc/dev/tvtwo.c index 01060ec0261..1b9b628507a 100644 --- a/sys/arch/sparc/dev/tvtwo.c +++ b/sys/arch/sparc/dev/tvtwo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tvtwo.c,v 1.8 2005/03/23 17:16:34 miod Exp $ */ +/* $OpenBSD: tvtwo.c,v 1.9 2006/02/12 00:04:21 miod Exp $ */ /* * Copyright (c) 2003, Miodrag Vallat. * All rights reserved. @@ -237,18 +237,24 @@ tvtwoattach(struct device *parent, struct device *self, void *args) /* Initialize a direct color map. */ tvtwo_initcmap(sc); - sc->sc_sunfb.sf_ro.ri_hw = sc; - fbwscons_init(&sc->sc_sunfb, isconsole ? 0 : RI_CLEAR); + /* + * Clear display. We can't pass RI_CLEAR to fbwscons_init + * below and have rasops do it for us as we want a white background. + */ + memset(sc->sc_sunfb.sf_ro.ri_bits, 0xff, sc->sc_sunfb.sf_fbsize); - printf("%s: %dx%d\n", self->dv_xname, - sc->sc_sunfb.sf_width, sc->sc_sunfb.sf_height); + sc->sc_sunfb.sf_ro.ri_hw = sc; + fbwscons_init(&sc->sc_sunfb, 0); if (isconsole) { - fbwscons_console_init(&sc->sc_sunfb, -1); + fbwscons_console_init(&sc->sc_sunfb, 0); } sbus_establish(&sc->sc_sd, &sc->sc_sunfb.sf_dev); + printf("%s: %dx%d\n", self->dv_xname, + sc->sc_sunfb.sf_width, sc->sc_sunfb.sf_height); + fbwscons_attach(&sc->sc_sunfb, &tvtwo_accessops, isconsole); } diff --git a/sys/dev/sbus/tvtwo.c b/sys/dev/sbus/tvtwo.c index e4d6dc0663b..ae3bbb2ad96 100644 --- a/sys/dev/sbus/tvtwo.c +++ b/sys/dev/sbus/tvtwo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tvtwo.c,v 1.5 2005/03/07 21:21:04 miod Exp $ */ +/* $OpenBSD: tvtwo.c,v 1.6 2006/02/12 00:04:23 miod Exp $ */ /* * Copyright (c) 2003, Miodrag Vallat. * All rights reserved. @@ -262,18 +262,24 @@ tvtwoattach(struct device *parent, struct device *self, void *args) /* Initialize a direct color map. */ tvtwo_initcmap(sc); - sc->sc_sunfb.sf_ro.ri_hw = sc; - fbwscons_init(&sc->sc_sunfb, isconsole ? 0 : RI_CLEAR); + /* + * Clear display. We can't pass RI_CLEAR to fbwscons_init + * below and have rasops do it for us as we want a white background. + */ + memset(sc->sc_sunfb.sf_ro.ri_bits, 0xff, sc->sc_sunfb.sf_fbsize); - printf("%s: %dx%d\n", self->dv_xname, - sc->sc_sunfb.sf_width, sc->sc_sunfb.sf_height); + sc->sc_sunfb.sf_ro.ri_hw = sc; + fbwscons_init(&sc->sc_sunfb, 0); if (isconsole) { - fbwscons_console_init(&sc->sc_sunfb, -1); + fbwscons_console_init(&sc->sc_sunfb, 0); } sbus_establish(&sc->sc_sd, &sc->sc_sunfb.sf_dev); + printf("%s: %dx%d\n", self->dv_xname, + sc->sc_sunfb.sf_width, sc->sc_sunfb.sf_height); + fbwscons_attach(&sc->sc_sunfb, &tvtwo_accessops, isconsole); } |