[src/trunk]: src/sys/dev/tc Set RI_NO_AUTO in ri_flg if *fb_common_init() is ...

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

details:   https://anonhg.NetBSD.org/src/rev/dd87f2cbbc84
branches:  trunk
changeset: 754896:dd87f2cbbc84
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat May 15 07:01:37 2010 +0000

description:
Set RI_NO_AUTO in ri_flg if *fb_common_init() is invoked from cnattach.
Untested.

diffstat:

 sys/dev/tc/cfb.c     |  6 ++++--
 sys/dev/tc/mfb.c     |  6 ++++--
 sys/dev/tc/sfb.c     |  6 ++++--
 sys/dev/tc/sfbplus.c |  6 ++++--
 sys/dev/tc/tfb.c     |  6 ++++--
 sys/dev/tc/xcfb.c    |  6 ++++--
 6 files changed, 24 insertions(+), 12 deletions(-)

diffs (162 lines):

diff -r 2e0437500e42 -r dd87f2cbbc84 sys/dev/tc/cfb.c
--- a/sys/dev/tc/cfb.c  Sat May 15 06:48:27 2010 +0000
+++ b/sys/dev/tc/cfb.c  Sat May 15 07:01:37 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cfb.c,v 1.57 2009/08/22 17:38:06 tsutsui Exp $ */
+/* $NetBSD: cfb.c,v 1.58 2010/05/15 07:01:37 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.57 2009/08/22 17:38:06 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.58 2010/05/15 07:01:37 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -319,6 +319,8 @@
        cfbhwinit(base);
 
        ri->ri_flg = RI_CENTER;
+       if (ri == &cfb_console_ri)
+               ri->ri_flg |= RI_NO_AUTO;
        ri->ri_depth = 8;
        ri->ri_width = 1024;
        ri->ri_height = 864;
diff -r 2e0437500e42 -r dd87f2cbbc84 sys/dev/tc/mfb.c
--- a/sys/dev/tc/mfb.c  Sat May 15 06:48:27 2010 +0000
+++ b/sys/dev/tc/mfb.c  Sat May 15 07:01:37 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mfb.c,v 1.54 2009/08/22 17:38:06 tsutsui Exp $ */
+/* $NetBSD: mfb.c,v 1.55 2010/05/15 07:01:37 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.54 2009/08/22 17:38:06 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.55 2010/05/15 07:01:37 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -283,6 +283,8 @@
        mfbhwinit(base);
 
        ri->ri_flg = RI_CENTER | RI_FORCEMONO;
+       if (ri == &mfb_console_ri)
+               ri->ri_flg |= RI_NO_AUTO;
        ri->ri_depth = 8;       /* !! watch out !! */
        ri->ri_width = 1280;
        ri->ri_height = 1024;
diff -r 2e0437500e42 -r dd87f2cbbc84 sys/dev/tc/sfb.c
--- a/sys/dev/tc/sfb.c  Sat May 15 06:48:27 2010 +0000
+++ b/sys/dev/tc/sfb.c  Sat May 15 07:01:37 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sfb.c,v 1.80 2009/08/22 17:38:06 tsutsui Exp $ */
+/* $NetBSD: sfb.c,v 1.81 2010/05/15 07:01:37 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.80 2009/08/22 17:38:06 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.81 2010/05/15 07:01:37 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -345,6 +345,8 @@
        sfbhwinit(base);
 
        ri->ri_flg = RI_CENTER;
+       if (ri == &sfb_console_ri)
+               ri->ri_flg |= RI_NO_AUTO;
        ri->ri_depth = 8;
        ri->ri_width = (hsetup & 0x1ff) << 2;
        ri->ri_height = (vsetup & 0x7ff);
diff -r 2e0437500e42 -r dd87f2cbbc84 sys/dev/tc/sfbplus.c
--- a/sys/dev/tc/sfbplus.c      Sat May 15 06:48:27 2010 +0000
+++ b/sys/dev/tc/sfbplus.c      Sat May 15 07:01:37 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sfbplus.c,v 1.33 2009/08/22 17:38:06 tsutsui Exp $ */
+/* $NetBSD: sfbplus.c,v 1.34 2010/05/15 07:01:37 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.33 2009/08/22 17:38:06 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sfbplus.c,v 1.34 2010/05/15 07:01:37 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -369,6 +369,8 @@
        }
 
        ri->ri_flg = RI_CENTER;
+       if (ri == &sfbp_console_ri)
+               ri->ri_flg |= RI_NO_AUTO;
        ri->ri_flg = 0;                 /* XXX 32bpp RI_CENTER fails XXX */
        ri->ri_depth = depth;
        ri->ri_width = (hsetup & 0x1ff) << 2;
diff -r 2e0437500e42 -r dd87f2cbbc84 sys/dev/tc/tfb.c
--- a/sys/dev/tc/tfb.c  Sat May 15 06:48:27 2010 +0000
+++ b/sys/dev/tc/tfb.c  Sat May 15 07:01:37 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tfb.c,v 1.57 2009/08/22 17:38:06 tsutsui Exp $ */
+/* $NetBSD: tfb.c,v 1.58 2010/05/15 07:01:37 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.57 2009/08/22 17:38:06 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tfb.c,v 1.58 2010/05/15 07:01:37 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -337,6 +337,8 @@
        tfbhwinit(base);
 
        ri->ri_flg = RI_CENTER;
+       if (ri == &tfb_console_ri)
+               ri->ri_flg |= RI_NO_AUTO;
        ri->ri_depth = 8;
        ri->ri_width = 1280;
        ri->ri_height = 1024;
diff -r 2e0437500e42 -r dd87f2cbbc84 sys/dev/tc/xcfb.c
--- a/sys/dev/tc/xcfb.c Sat May 15 06:48:27 2010 +0000
+++ b/sys/dev/tc/xcfb.c Sat May 15 07:01:37 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: xcfb.c,v 1.51 2009/08/22 17:38:06 tsutsui Exp $ */
+/* $NetBSD: xcfb.c,v 1.52 2010/05/15 07:01:37 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.51 2009/08/22 17:38:06 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xcfb.c,v 1.52 2010/05/15 07:01:37 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -280,6 +280,8 @@
        xcfbhwinit((void *)ri->ri_hw);
 
        ri->ri_flg = RI_CENTER;
+       if (ri == &xcfb_console_ri)
+               ri->ri_flg |= RI_NO_AUTO;
        ri->ri_depth = 8;
        ri->ri_width = 1024;
        ri->ri_height = 768;