Module Name: src
Committed By: martin
Date: Mon Feb 6 16:51:00 UTC 2023
Modified Files:
src/sys/arch/vax/vsa [netbsd-9]: smg.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1585):
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.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.58.4.1 src/sys/arch/vax/vsa/smg.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/arch/vax/vsa/smg.c
diff -u src/sys/arch/vax/vsa/smg.c:1.58 src/sys/arch/vax/vsa/smg.c:1.58.4.1
--- src/sys/arch/vax/vsa/smg.c:1.58 Thu Mar 14 23:49:38 2019
+++ src/sys/arch/vax/vsa/smg.c Mon Feb 6 16:51:00 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: smg.c,v 1.58 2019/03/14 23:49:38 thorpej Exp $ */
+/* $NetBSD: smg.c,v 1.58.4.1 2023/02/06 16:51:00 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.58 2019/03/14 23:49:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smg.c,v 1.58.4.1 2023/02/06 16:51:00 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -241,6 +241,7 @@ smg_attach(device_t parent, device_t sel
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 @@ smgcninit(struct consdev *cndev)
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)
{
