Module Name: src
Committed By: sborrill
Date: Fri Feb 7 13:22:51 UTC 2014
Modified Files:
src/sys/arch/evbmips/conf [netbsd-6]: LOONGSON
src/sys/dev/pci [netbsd-6]: sisfb.c
Log Message:
Pull up the following revisions(s) (requested by bouyer in ticket #1019):
sys/dev/pci/sisfb.c: revision 1.3
sys/arch/evbmips/conf/LOONGSON: revision 1.22
Make sysinst much more useable when used with the VGA display on
LOONGSON.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.2.1 src/sys/arch/evbmips/conf/LOONGSON
cvs rdiff -u -r1.2 -r1.2.2.1 src/sys/dev/pci/sisfb.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/evbmips/conf/LOONGSON
diff -u src/sys/arch/evbmips/conf/LOONGSON:1.8 src/sys/arch/evbmips/conf/LOONGSON:1.8.2.1
--- src/sys/arch/evbmips/conf/LOONGSON:1.8 Sun Dec 18 05:49:26 2011
+++ src/sys/arch/evbmips/conf/LOONGSON Fri Feb 7 13:22:51 2014
@@ -1,4 +1,4 @@
-# $NetBSD: LOONGSON,v 1.8 2011/12/18 05:49:26 dholland Exp $
+# $NetBSD: LOONGSON,v 1.8.2.1 2014/02/07 13:22:51 sborrill Exp $
#
# LOONGSON machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbmips/conf/std.loongson
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GDIUM-$Revision: 1.8 $"
+#ident "GDIUM-$Revision: 1.8.2.1 $"
maxusers 16
@@ -146,6 +146,7 @@ options WSEMUL_VT100
options WS_KERNEL_FG=WSCOL_GREEN
#options WSDISPLAY_DEFAULTSCREENS=4
options FONT_GALLANT12x22
+options FONT_BOLD8x16
# compatibility to other console drivers
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
#
Index: src/sys/dev/pci/sisfb.c
diff -u src/sys/dev/pci/sisfb.c:1.2 src/sys/dev/pci/sisfb.c:1.2.2.1
--- src/sys/dev/pci/sisfb.c:1.2 Mon Jan 30 19:41:23 2012
+++ src/sys/dev/pci/sisfb.c Fri Feb 7 13:22:51 2014
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sisfb.c,v 1.2 2012/01/30 19:41:23 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sisfb.c,v 1.2.2.1 2014/02/07 13:22:51 sborrill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -571,7 +571,7 @@ sisfb_setup(struct sisfb *fb)
sisfb_loadcmap(fb, 0, 256);
}
- rasops_init(ri, 30, 80);
+ rasops_init(ri, 25, 80);
rasops_reconfig(ri, ri->ri_height / ri->ri_font->fontheight,
ri->ri_width / ri->ri_font->fontwidth);
