[src/trunk]: src/sys Clear RI_NO_AUTO in actual attach functions during autoc...

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/17c508f9e112
branches:  trunk
changeset: 754898:17c508f9e112
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat May 15 08:53:26 2010 +0000

description:
Clear RI_NO_AUTO in actual attach functions during autoconf(9)
for console devices that set the flag during consinit().

diffstat:

 sys/arch/dreamcast/dev/pvr.c         |  5 +++--
 sys/arch/evbppc/explora/dev/fb_elb.c |  5 +++--
 sys/arch/ews4800mips/sbd/fb_sbdio.c  |  5 +++--
 sys/dev/hpc/hpcfb.c                  |  5 +++--
 sys/dev/pci/tga.c                    |  5 +++--
 sys/dev/tc/cfb.c                     |  5 +++--
 sys/dev/tc/mfb.c                     |  5 +++--
 sys/dev/tc/sfb.c                     |  5 +++--
 sys/dev/tc/sfbplus.c                 |  5 +++--
 sys/dev/tc/tfb.c                     |  5 +++--
 sys/dev/tc/xcfb.c                    |  5 +++--
 11 files changed, 33 insertions(+), 22 deletions(-)

diffs (286 lines):

diff -r 82e84079218d -r 17c508f9e112 sys/arch/dreamcast/dev/pvr.c
--- a/sys/arch/dreamcast/dev/pvr.c      Sat May 15 07:38:24 2010 +0000
+++ b/sys/arch/dreamcast/dev/pvr.c      Sat May 15 08:53:26 2010 +0000
@@ -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,
diff -r 82e84079218d -r 17c508f9e112 sys/arch/evbppc/explora/dev/fb_elb.c
--- a/sys/arch/evbppc/explora/dev/fb_elb.c      Sat May 15 07:38:24 2010 +0000
+++ b/sys/arch/evbppc/explora/dev/fb_elb.c      Sat May 15 08:53:26 2010 +0000
@@ -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));
diff -r 82e84079218d -r 17c508f9e112 sys/arch/ews4800mips/sbd/fb_sbdio.c
--- a/sys/arch/ews4800mips/sbd/fb_sbdio.c       Sat May 15 07:38:24 2010 +0000
+++ b/sys/arch/ews4800mips/sbd/fb_sbdio.c       Sat May 15 08:53:26 2010 +0000
@@ -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 {
diff -r 82e84079218d -r 17c508f9e112 sys/dev/hpc/hpcfb.c
--- a/sys/dev/hpc/hpcfb.c       Sat May 15 07:38:24 2010 +0000
+++ b/sys/dev/hpc/hpcfb.c       Sat May 15 08:53:26 2010 +0000
@@ -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,
diff -r 82e84079218d -r 17c508f9e112 sys/dev/pci/tga.c
--- a/sys/dev/pci/tga.c Sat May 15 07:38:24 2010 +0000
+++ b/sys/dev/pci/tga.c Sat May 15 08:53:26 2010 +0000
@@ -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,
diff -r 82e84079218d -r 17c508f9e112 sys/dev/tc/cfb.c
--- a/sys/dev/tc/cfb.c  Sat May 15 07:38:24 2010 +0000
+++ b/sys/dev/tc/cfb.c  Sat May 15 08:53:26 2010 +0000
@@ -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 {
diff -r 82e84079218d -r 17c508f9e112 sys/dev/tc/mfb.c
--- a/sys/dev/tc/mfb.c  Sat May 15 07:38:24 2010 +0000
+++ b/sys/dev/tc/mfb.c  Sat May 15 08:53:26 2010 +0000
@@ -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 {
diff -r 82e84079218d -r 17c508f9e112 sys/dev/tc/sfb.c
--- a/sys/dev/tc/sfb.c  Sat May 15 07:38:24 2010 +0000
+++ b/sys/dev/tc/sfb.c  Sat May 15 08:53:26 2010 +0000
@@ -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 {
diff -r 82e84079218d -r 17c508f9e112 sys/dev/tc/sfbplus.c
--- a/sys/dev/tc/sfbplus.c      Sat May 15 07:38:24 2010 +0000
+++ b/sys/dev/tc/sfbplus.c      Sat May 15 08:53:26 2010 +0000
@@ -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 {
diff -r 82e84079218d -r 17c508f9e112 sys/dev/tc/tfb.c
--- a/sys/dev/tc/tfb.c  Sat May 15 07:38:24 2010 +0000
+++ b/sys/dev/tc/tfb.c  Sat May 15 08:53:26 2010 +0000
@@ -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 {
diff -r 82e84079218d -r 17c508f9e112 sys/dev/tc/xcfb.c
--- a/sys/dev/tc/xcfb.c Sat May 15 07:38:24 2010 +0000
+++ b/sys/dev/tc/xcfb.c Sat May 15 08:53:26 2010 +0000
@@ -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 {