[src/trunk]: src/sys/dev/wsfb enable font loading and screen resizing

[macallan <macallan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6fb65f2cf3d9
branches:  trunk
changeset: 824041:6fb65f2cf3d9
user:      macallan <macallan%NetBSD.org@localhost>
date:      Fri May 19 19:23:24 2017 +0000

description:
enable font loading and screen resizing

diffstat:

 sys/dev/wsfb/genfb.c |  13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diffs (48 lines):

diff -r 26eb9148c4f6 -r 6fb65f2cf3d9 sys/dev/wsfb/genfb.c
--- a/sys/dev/wsfb/genfb.c      Fri May 19 19:22:33 2017 +0000
+++ b/sys/dev/wsfb/genfb.c      Fri May 19 19:23:24 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: genfb.c,v 1.59 2017/02/25 01:11:55 nonaka Exp $ */
+/*     $NetBSD: genfb.c,v 1.60 2017/05/19 19:23:24 macallan Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.59 2017/02/25 01:11:55 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.60 2017/05/19 19:23:24 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -235,7 +235,8 @@
                0, 0,
                NULL,
                8, 16,
-               WSSCREEN_WSCOLORS | WSSCREEN_HILIT,
+               WSSCREEN_WSCOLORS | WSSCREEN_HILIT | WSSCREEN_UNDERLINE |
+                 WSSCREEN_RESIZE,
                NULL
        };
        sc->sc_screens[0] = &sc->sc_defaultscreen_descr;
@@ -538,6 +539,8 @@
        if (sc->sc_want_clear)
                ri->ri_flg |= RI_FULLCLEAR;
 
+       scr->scr_flags |= VCONS_LOADFONT;
+
        if (sc->sc_shadowfb != NULL) {
                ri->ri_hwbits = (char *)sc->sc_fbaddr;
                ri->ri_bits = (char *)sc->sc_shadowfb;
@@ -582,8 +585,8 @@
 
 
        rasops_init(ri, 0, 0);
-       ri->ri_caps = WSSCREEN_WSCOLORS;
-
+       ri->ri_caps = WSSCREEN_WSCOLORS | WSSCREEN_HILIT | WSSCREEN_UNDERLINE |
+                 WSSCREEN_RESIZE;
        rasops_reconfig(ri, sc->sc_height / ri->ri_font->fontheight,
                    sc->sc_width / ri->ri_font->fontwidth);