CVS commit: [riastradh-drm2] src/sys/dev/wsfb
Module Name:src Committed By: riastradh Date: Wed Jan 29 19:48:29 UTC 2014 Modified Files: src/sys/dev/wsfb [riastradh-drm2]: genfb.c Log Message: Make genfb_attach configure the wsemuldisplaydev attribute. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.50.8.1 src/sys/dev/wsfb/genfb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/wsfb/genfb.c diff -u src/sys/dev/wsfb/genfb.c:1.50 src/sys/dev/wsfb/genfb.c:1.50.8.1 --- src/sys/dev/wsfb/genfb.c:1.50 Thu Jan 10 22:06:59 2013 +++ src/sys/dev/wsfb/genfb.c Wed Jan 29 19:48:29 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: genfb.c,v 1.50 2013/01/10 22:06:59 jmcneill Exp $ */ +/* $NetBSD: genfb.c,v 1.50.8.1 2014/01/29 19:48:29 riastradh Exp $ */ /*- * Copyright (c) 2007 Michael Lorenz @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.50 2013/01/10 22:06:59 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.50.8.1 2014/01/29 19:48:29 riastradh Exp $"); #include #include @@ -333,7 +333,8 @@ genfb_attach(struct genfb_softc *sc, str SCREEN_DISABLE_DRAWING(&sc->sc_console_screen); #endif - config_found(sc->sc_dev, &aa, wsemuldisplaydevprint); + config_found_ia(sc->sc_dev, "wsemuldisplaydev", &aa, + wsemuldisplaydevprint); return 0; }
CVS commit: [riastradh-drm2] src/sys/dev/wsfb
Module Name:src Committed By: riastradh Date: Wed Jan 29 19:48:45 UTC 2014 Modified Files: src/sys/dev/wsfb [riastradh-drm2]: genfb.c Log Message: Make genfb replay the msgbuf only if it's becoming the console. To generate a diff of this commit: cvs rdiff -u -r1.50.8.1 -r1.50.8.2 src/sys/dev/wsfb/genfb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/wsfb/genfb.c diff -u src/sys/dev/wsfb/genfb.c:1.50.8.1 src/sys/dev/wsfb/genfb.c:1.50.8.2 --- src/sys/dev/wsfb/genfb.c:1.50.8.1 Wed Jan 29 19:48:29 2014 +++ src/sys/dev/wsfb/genfb.c Wed Jan 29 19:48:45 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: genfb.c,v 1.50.8.1 2014/01/29 19:48:29 riastradh Exp $ */ +/* $NetBSD: genfb.c,v 1.50.8.2 2014/01/29 19:48:45 riastradh Exp $ */ /*- * Copyright (c) 2007 Michael Lorenz @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.50.8.1 2014/01/29 19:48:29 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.50.8.2 2014/01/29 19:48:45 riastradh Exp $"); #include #include @@ -317,7 +317,8 @@ genfb_attach(struct genfb_softc *sc, str } #else genfb_init_palette(sc); - vcons_replay_msgbuf(&sc->sc_console_screen); + if (console) + vcons_replay_msgbuf(&sc->sc_console_screen); #endif if (genfb_softc == NULL)
