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

Add clear-screen and cursor-row properties to allow genfb to persist 

screen state from the MD console driver.
This commit is contained in:
jmcneill 2009-02-17 02:19:33 +00:00
parent 26168b4071
commit d994f000f0
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sys/dev/wsfb/genfb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: genfb.c,v 1.20 2009/02/16 22:24:40 jmcneill Exp $ */
/* $NetBSD: genfb.c,v 1.21 2009/02/17 02:19:33 jmcneill Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.20 2009/02/16 22:24:40 jmcneill Exp $");
__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.21 2009/02/17 02:19:33 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -144,6 +144,7 @@ genfb_attach(struct genfb_softc *sc, struct genfb_ops *ops)
struct wsemuldisplaydev_attach_args aa;
prop_dictionary_t dict;
struct rasops_info *ri;
uint16_t crow;
long defattr;
int i, j;
bool console;
@ -151,6 +152,12 @@ genfb_attach(struct genfb_softc *sc, struct genfb_ops *ops)
dict = device_properties(&sc->sc_dev);
prop_dictionary_get_bool(dict, "is_console", &console);
if (prop_dictionary_get_uint16(dict, "cursor-row", &crow) == false)
crow = 0;
if (prop_dictionary_get_bool(dict, "clear-screen", &sc->sc_want_clear)
== false)
sc->sc_want_clear = true;
/* do not attach when we're not console */
if (!console) {
aprint_normal_dev(&sc->sc_dev, "no console, unable to continue\n");
@ -175,6 +182,8 @@ genfb_attach(struct genfb_softc *sc, struct genfb_ops *ops)
sc->sc_mode = WSDISPLAYIO_MODE_EMUL;
sc->sc_shadowfb = malloc(sc->sc_fbsize, M_DEVBUF, M_WAITOK);
if (sc->sc_want_clear == false)
memcpy(sc->sc_shadowfb, sc->sc_fbaddr, sc->sc_fbsize);
vcons_init(&sc->vd, sc, &sc->sc_defaultscreen_descr,
&genfb_accessops);
@ -193,11 +202,12 @@ genfb_attach(struct genfb_softc *sc, struct genfb_ops *ops)
sc->sc_defaultscreen_descr.capabilities = ri->ri_caps;
sc->sc_defaultscreen_descr.nrows = ri->ri_rows;
sc->sc_defaultscreen_descr.ncols = ri->ri_cols;
wsdisplay_cnattach(&sc->sc_defaultscreen_descr, ri, 0, 0,
wsdisplay_cnattach(&sc->sc_defaultscreen_descr, ri, 0, crow,
defattr);
/* Clear the whole screen to bring it to a known state. */
(*ri->ri_ops.eraserows)(ri, 0, ri->ri_rows, defattr);
if (sc->sc_want_clear)
(*ri->ri_ops.eraserows)(ri, 0, ri->ri_rows, defattr);
j = 0;
for (i = 0; i < (1 << sc->sc_depth); i++) {
@ -305,7 +315,9 @@ genfb_init_screen(void *cookie, struct vcons_screen *scr,
ri->ri_width = sc->sc_width;
ri->ri_height = sc->sc_height;
ri->ri_stride = sc->sc_stride;
ri->ri_flg = RI_CENTER | RI_FULLCLEAR;
ri->ri_flg = RI_CENTER;
if (sc->sc_want_clear)
ri->ri_flg |= RI_FULLCLEAR;
if (sc->sc_shadowfb != NULL) {
@ -314,7 +326,7 @@ genfb_init_screen(void *cookie, struct vcons_screen *scr,
} else
ri->ri_bits = (char *)sc->sc_fbaddr;
if (existing) {
if (existing && sc->sc_want_clear) {
ri->ri_flg |= RI_CLEAR;
}

5
sys/dev/wsfb/genfbvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: genfbvar.h,v 1.9 2009/02/16 22:24:40 jmcneill Exp $ */
/* $NetBSD: genfbvar.h,v 1.10 2009/02/17 02:19:33 jmcneill Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: genfbvar.h,v 1.9 2009/02/16 22:24:40 jmcneill Exp $");
__KERNEL_RCSID(0, "$NetBSD: genfbvar.h,v 1.10 2009/02/17 02:19:33 jmcneill Exp $");
#ifndef GENFBVAR_H
#define GENFBVAR_H
@ -74,6 +74,7 @@ struct genfb_softc {
u_char sc_cmap_red[256];
u_char sc_cmap_green[256];
u_char sc_cmap_blue[256];
bool sc_want_clear;
};
void genfb_cnattach(void);