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

vga_cnattach: calling wsdisplay_screentype_pick with a NULL type will

Browse Source 
select the first entry in the list, which overrides the selected screen
type. Only call it a second time if the original selection is invalid.
This commit is contained in:
jmcneill 2008-10-19 17:20:38 +00:00
parent fddd6ca288
commit 0215b24d60
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/ic/vga_raster.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vga_raster.c,v 1.31 2008/06/15 13:42:03 nonaka Exp $ */
/* $NetBSD: vga_raster.c,v 1.32 2008/10/19 17:20:38 jmcneill Exp $ */
/*
* Copyright (c) 2001, 2002 Bang Jun-Young
@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: vga_raster.c,v 1.31 2008/06/15 13:42:03 nonaka Exp $");
__KERNEL_RCSID(0, "$NetBSD: vga_raster.c,v 1.32 2008/10/19 17:20:38 jmcneill Exp $");
#include "opt_wsmsgattrs.h" /* for WSDISPLAY_CUSTOM_OUTPUT */
@ -349,8 +349,9 @@ vga_cnattach(bus_space_tag_t iot, bus_space_tag_t memt, int type, int check)
else if (scr->nrows > 30)
/* Unsupported screen type, try 80x30. */
typestr = "80x30";
scr = wsdisplay_screentype_pick(vga_console_vc.hdl.vh_mono ?
&vga_screenlist_mono : &vga_screenlist, typestr);
if (typestr)
scr = wsdisplay_screentype_pick(vga_console_vc.hdl.vh_mono ?
&vga_screenlist_mono : &vga_screenlist, typestr);
if (scr != vga_console_vc.currenttype)
vga_console_vc.currenttype = scr;
#else