Module Name: src
Committed By: tsutsui
Date: Sat May 15 08:53:27 UTC 2010
Modified Files:
src/sys/arch/dreamcast/dev: pvr.c
src/sys/arch/evbppc/explora/dev: fb_elb.c
src/sys/arch/ews4800mips/sbd: fb_sbdio.c
src/sys/dev/hpc: hpcfb.c
src/sys/dev/pci: tga.c
src/sys/dev/tc: cfb.c mfb.c sfb.c sfbplus.c tfb.c xcfb.c
Log Message:
Clear RI_NO_AUTO in actual attach functions during autoconf(9)
for console devices that set the flag during consinit().
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/dreamcast/dev/pvr.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbppc/explora/dev/fb_elb.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/ews4800mips/sbd/fb_sbdio.c
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/hpc/hpcfb.c
cvs rdiff -u -r1.78 -r1.79 src/sys/dev/pci/tga.c
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/tc/cfb.c src/sys/dev/tc/tfb.c
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/tc/mfb.c
cvs rdiff -u -r1.81 -r1.82 src/sys/dev/tc/sfb.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/tc/sfbplus.c
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/tc/xcfb.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/dreamcast/dev/pvr.c
diff -u src/sys/arch/dreamcast/dev/pvr.c:1.26 src/sys/arch/dreamcast/dev/pvr.c:1.27
--- src/sys/arch/dreamcast/dev/pvr.c:1.26 Sat May 15 06:48:22 2010
+++ src/sys/arch/dreamcast/dev/pvr.c Sat May 15 08:53:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pvr.c,v 1.26 2010/05/15 06:48:22 tsutsui Exp $ */
+/* $NetBSD: pvr.c,v 1.27 2010/05/15 08:53:27 tsutsui Exp $ */
/*-
* Copyright (c) 2001 Marcus Comstedt.
@@ -35,7 +35,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pvr.c,v 1.26 2010/05/15 06:48:22 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pvr.c,v 1.27 2010/05/15 08:53:27 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -289,6 +289,7 @@
console = pvr_is_console;
if (console) {
sc->sc_dc = &pvr_console_dc;
+ sc->sc_dc->rinfo.ri_flg &= ~RI_NO_AUTO;
sc->nscreens = 1;
} else {
sc->sc_dc = malloc(sizeof(struct fb_devconfig), M_DEVBUF,
Index: src/sys/arch/evbppc/explora/dev/fb_elb.c
diff -u src/sys/arch/evbppc/explora/dev/fb_elb.c:1.10 src/sys/arch/evbppc/explora/dev/fb_elb.c:1.11
--- src/sys/arch/evbppc/explora/dev/fb_elb.c:1.10 Sat May 15 07:38:24 2010
+++ src/sys/arch/evbppc/explora/dev/fb_elb.c Sat May 15 08:53:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fb_elb.c,v 1.10 2010/05/15 07:38:24 tsutsui Exp $ */
+/* $NetBSD: fb_elb.c,v 1.11 2010/05/15 08:53:26 tsutsui Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fb_elb.c,v 1.10 2010/05/15 07:38:24 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fb_elb.c,v 1.11 2010/05/15 08:53:26 tsutsui Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -139,6 +139,7 @@
if (is_console) {
sc->sc_fb = &console_dev;
+ sc->sc_fb->fb_ri.ri_flg &= ~RI_NO_AUTO;
} else {
sc->sc_fb = malloc(sizeof(struct fb_dev), M_DEVBUF, M_WAITOK);
memset(sc->sc_fb, 0, sizeof(struct fb_dev));
Index: src/sys/arch/ews4800mips/sbd/fb_sbdio.c
diff -u src/sys/arch/ews4800mips/sbd/fb_sbdio.c:1.9 src/sys/arch/ews4800mips/sbd/fb_sbdio.c:1.10
--- src/sys/arch/ews4800mips/sbd/fb_sbdio.c:1.9 Sat May 15 06:39:06 2010
+++ src/sys/arch/ews4800mips/sbd/fb_sbdio.c Sat May 15 08:53:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fb_sbdio.c,v 1.9 2010/05/15 06:39:06 tsutsui Exp $ */
+/* $NetBSD: fb_sbdio.c,v 1.10 2010/05/15 08:53:27 tsutsui Exp $ */
/*-
* Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#define WIRED_FB_TLB
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fb_sbdio.c,v 1.9 2010/05/15 06:39:06 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fb_sbdio.c,v 1.10 2010/05/15 08:53:27 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -141,6 +141,7 @@
if (console) {
/* already initialized in fb_cnattach() */
sc->sc_ri = ri = &fb_console_ri;
+ ri->ri_flg &= ~RI_NO_AUTO;
sc->sc_ga = &fb_console_ga;
sc->sc_nscreens = 1;
} else {
Index: src/sys/dev/hpc/hpcfb.c
diff -u src/sys/dev/hpc/hpcfb.c:1.54 src/sys/dev/hpc/hpcfb.c:1.55
--- src/sys/dev/hpc/hpcfb.c:1.54 Sat May 15 06:01:12 2010
+++ src/sys/dev/hpc/hpcfb.c Sat May 15 08:53:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcfb.c,v 1.54 2010/05/15 06:01:12 tsutsui Exp $ */
+/* $NetBSD: hpcfb.c,v 1.55 2010/05/15 08:53:27 tsutsui Exp $ */
/*-
* Copyright (c) 1999
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.54 2010/05/15 06:01:12 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.55 2010/05/15 08:53:27 tsutsui Exp $");
#ifdef _KERNEL_OPT
#include "opt_hpcfb.h"
@@ -305,6 +305,7 @@
if (hpcfbconsole) {
sc->sc_dc = &hpcfb_console_dc;
+ sc->sc_dc->dc_rinfo.ri_flg &= ~RI_NO_AUTO;
hpcfb_console_dc.dc_sc = sc;
printf(": %dx%d pixels, %d colors, %dx%d chars",
sc->sc_dc->dc_rinfo.ri_width,sc->sc_dc->dc_rinfo.ri_height,
Index: src/sys/dev/pci/tga.c
diff -u src/sys/dev/pci/tga.c:1.78 src/sys/dev/pci/tga.c:1.79
--- src/sys/dev/pci/tga.c:1.78 Sat May 15 06:38:34 2010
+++ src/sys/dev/pci/tga.c Sat May 15 08:53:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: tga.c,v 1.78 2010/05/15 06:38:34 tsutsui Exp $ */
+/* $NetBSD: tga.c,v 1.79 2010/05/15 08:53:27 tsutsui Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tga.c,v 1.78 2010/05/15 06:38:34 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tga.c,v 1.79 2010/05/15 08:53:27 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -404,6 +404,7 @@
#endif
if (console) {
sc->sc_dc = &tga_console_dc;
+ sc->sc_dc->dc_rinfo.ri_flg &= ~RI_NO_AUTO;
sc->nscreens = 1;
} else {
sc->sc_dc = malloc(sizeof(struct tga_devconfig), M_DEVBUF,
Index: src/sys/dev/tc/cfb.c
diff -u src/sys/dev/tc/cfb.c:1.58 src/sys/dev/tc/cfb.c:1.59
--- src/sys/dev/tc/cfb.c:1.58 Sat May 15 07:01:37 2010
+++ src/sys/dev/tc/cfb.c Sat May 15 08:53:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cfb.c,v 1.58 2010/05/15 07:01:37 tsutsui Exp $ */
+/* $NetBSD: cfb.c,v 1.59 2010/05/15 08:53:27 tsutsui Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.58 2010/05/15 07:01:37 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.59 2010/05/15 08:53:27 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -255,6 +255,7 @@
console = (ta->ta_addr == cfb_consaddr);
if (console) {
sc->sc_ri = ri = &cfb_console_ri;
+ ri->ri_flg &= ~RI_NO_AUTO;
sc->nscreens = 1;
}
else {
Index: src/sys/dev/tc/tfb.c
diff -u src/sys/dev/tc/tfb.c:1.58 src/sys/dev/tc/tfb.c:1.59
--- src/sys/dev/tc/tfb.c:1.58 Sat May 15 07:01:37 2010
+++ src/sys/dev/tc/tfb.c Sat May 15 08:53:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: tfb.c,v 1.58 2010/05/15 07:01:37 tsutsui Exp $ */
+/* $NetBSD: tfb.c,v 1.59 2010/05/15 08:53:27 tsutsui Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tfb.c,v 1.58 2010/05/15 07:01:37 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tfb.c,v 1.59 2010/05/15 08:53:27 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -289,6 +289,7 @@
console = (ta->ta_addr == tfb_consaddr);
if (console) {
sc->sc_ri = ri = &tfb_console_ri;
+ ri->ri_flg &= ~RI_NO_AUTO;
sc->nscreens = 1;
}
else {
Index: src/sys/dev/tc/mfb.c
diff -u src/sys/dev/tc/mfb.c:1.55 src/sys/dev/tc/mfb.c:1.56
--- src/sys/dev/tc/mfb.c:1.55 Sat May 15 07:01:37 2010
+++ src/sys/dev/tc/mfb.c Sat May 15 08:53:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mfb.c,v 1.55 2010/05/15 07:01:37 tsutsui Exp $ */
+/* $NetBSD: mfb.c,v 1.56 2010/05/15 08:53:27 tsutsui Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.55 2010/05/15 07:01:37 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.56 2010/05/15 08:53:27 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -234,6 +234,7 @@
console = (ta->ta_addr == mfb_consaddr);
if (console) {
sc->sc_ri = ri = &mfb_console_ri;
+ ri->ri_flg &= ~RI_NO_AUTO;
sc->nscreens = 1;
}
else {
Index: src/sys/dev/tc/sfb.c
diff -u src/sys/dev/tc/sfb.c:1.81 src/sys/dev/tc/sfb.c:1.82
--- src/sys/dev/tc/sfb.c:1.81 Sat May 15 07:01:37 2010
+++ src/sys/dev/tc/sfb.c Sat May 15 08:53:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sfb.c,v 1.81 2010/05/15 07:01:37 tsutsui Exp $ */
+/* $NetBSD: sfb.c,v 1.82 2010/05/15 08:53:27 tsutsui Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.81 2010/05/15 07:01:37 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.82 2010/05/15 08:53:27 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -268,6 +268,7 @@
console = (ta->ta_addr == sfb_consaddr);
if (console) {
sc->sc_ri = ri = &sfb_console_ri;
+ ri->ri_flg &= ~RI_NO_AUTO;
sc->nscreens = 1;
}
else {
Index: src/sys/dev/tc/sfbplus.c
diff -u src/sys/dev/tc/sfbplus.c:1.34 src/sys/dev/tc/sfbplus.c:1.35
--- src/sys/dev/tc/sfbplus.c:1.34 Sat May 15 07:01:37 2010
+++ src/sys/dev/tc/sfbplus.c Sat May 15 08:53:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sfbplus.c,v 1.34 2010/05/15 07:01:37 tsutsui Exp $ */
+/* $NetBSD: sfbplus.c,v 1.35 2010/05/15 08:53:27 tsutsui Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sfbplus.c,v 1.34 2010/05/15 07:01:37 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sfbplus.c,v 1.35 2010/05/15 08:53:27 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -260,6 +260,7 @@
console = (ta->ta_addr == sfbp_consaddr);
if (console) {
sc->sc_ri = ri = &sfbp_console_ri;
+ ri->ri_flg &= ~RI_NO_AUTO;
sc->nscreens = 1;
}
else {
Index: src/sys/dev/tc/xcfb.c
diff -u src/sys/dev/tc/xcfb.c:1.52 src/sys/dev/tc/xcfb.c:1.53
--- src/sys/dev/tc/xcfb.c:1.52 Sat May 15 07:01:37 2010
+++ src/sys/dev/tc/xcfb.c Sat May 15 08:53:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: xcfb.c,v 1.52 2010/05/15 07:01:37 tsutsui Exp $ */
+/* $NetBSD: xcfb.c,v 1.53 2010/05/15 08:53:27 tsutsui Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xcfb.c,v 1.52 2010/05/15 07:01:37 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xcfb.c,v 1.53 2010/05/15 08:53:27 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -223,6 +223,7 @@
console = (ta->ta_addr == xcfb_consaddr);
if (console) {
sc->sc_ri = ri = &xcfb_console_ri;
+ ri->ri_flg &= ~RI_NO_AUTO;
sc->nscreens = 1;
}
else {
