[src/netbsd-10]: src/sys/arch/vax/vsa Pull up following revision(s) (requeste...

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

details:   https://anonhg.NetBSD.org/src/rev/e27bde515c40
branches:  netbsd-10
changeset: 373383:e27bde515c40
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Feb 06 16:48:44 2023 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #66):

        sys/arch/vax/vsa/smg.c: revision 1.62

Make sure to call wsfont_init(9) as other framebuffer drivers.
Otherwise wsfont_find(9) always fails and wsdisplay(4) is not attached.

diffstat:

 sys/arch/vax/vsa/smg.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 16e2bec342be -r e27bde515c40 sys/arch/vax/vsa/smg.c
--- a/sys/arch/vax/vsa/smg.c    Sun Feb 05 12:45:22 2023 +0000
+++ b/sys/arch/vax/vsa/smg.c    Mon Feb 06 16:48:44 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: smg.c,v 1.61 2021/08/07 16:19:07 thorpej Exp $ */
+/*     $NetBSD: smg.c,v 1.61.6.1 2023/02/06 16:48:44 martin Exp $ */
 /*
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smg.c,v 1.61 2021/08/07 16:19:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smg.c,v 1.61.6.1 2023/02/06 16:48:44 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -241,6 +241,7 @@
        callout_reset(&smg_cursor_ch, hz / 2, smg_crsr_blink, NULL);
        curcmd = CUR_CMD_HSHI;
        WRITECUR(CUR_CMD, curcmd);
+       wsfont_init();
        if ((fcookie = wsfont_find(NULL, 8, 15, 0, WSDISPLAY_FONTORDER_R2L,
            WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP)) < 0) {
                aprint_error_dev(self, "could not find 8x15 font\n");
@@ -591,6 +592,7 @@
        curscr = &smg_conscreen;
        wsdisplay_cnattach(&smg_stdscreen, &smg_conscreen, 0, 0, 0);
        cn_tab->cn_pri = CN_INTERNAL;
+       wsfont_init();
        if ((fcookie = wsfont_find(NULL, 8, 15, 0, WSDISPLAY_FONTORDER_R2L,
            WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP)) < 0)
        {