Module Name: src Committed By: tsutsui Date: Sat May 15 20:31:10 UTC 2010
Modified Files: src/sys/arch/pmax/ibus: pm.c Log Message: Set RI_NO_AUTO in ri_flg if init function is invoked from cnattach. Untested. (3100 support seems somewhat broken, per gxemul output) To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/pmax/ibus/pm.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/pmax/ibus/pm.c diff -u src/sys/arch/pmax/ibus/pm.c:1.7 src/sys/arch/pmax/ibus/pm.c:1.8 --- src/sys/arch/pmax/ibus/pm.c:1.7 Mon May 26 10:31:22 2008 +++ src/sys/arch/pmax/ibus/pm.c Sat May 15 20:31:10 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pm.c,v 1.7 2008/05/26 10:31:22 nisimura Exp $ */ +/* $NetBSD: pm.c,v 1.8 2010/05/15 20:31:10 tsutsui Exp $ */ /*- * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pm.c,v 1.7 2008/05/26 10:31:22 nisimura Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pm.c,v 1.8 2010/05/15 20:31:10 tsutsui Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -171,9 +171,10 @@ ri = &pm_ri; console = (ri->ri_bits != NULL); - if (console) + if (console) { sc->sc_nscreens = 1; - else + ri->ri_flg &= ~RI_NO_AUTO; + } else pm_common_init(); printf(": %dx%d, %dbpp\n", ri->ri_width, ri->ri_height, ri->ri_depth); @@ -243,6 +244,8 @@ ri = &pm_ri; ri->ri_flg = RI_CENTER; + if (ri->ri_bits == NULL) + ri->ri_flg |= RI_NO_AUTO; ri->ri_depth = ((kn01csr & KN01_CSR_MONO) != 0 ? 1 : 8); ri->ri_width = 1024; ri->ri_height = 864;