diff options
| author | tsutsui <tsutsui@NetBSD.org> | 2010-05-15 08:53:26 +0000 |
|---|---|---|
| committer | tsutsui <tsutsui@NetBSD.org> | 2010-05-15 08:53:26 +0000 |
| commit | a9edf8145e1871dd325d936a01b72b1482a2fa91 (patch) | |
| tree | d30c9439a3597a197bb7f7a3cb3ea5e8946467e2 /sys/dev | |
| parent | 54faad2469f52c964001076ccd4355b4aca49075 (diff) | |
Clear RI_NO_AUTO in actual attach functions during autoconf(9)
for console devices that set the flag during consinit().
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/hpc/hpcfb.c | 5 | ||||
| -rw-r--r-- | sys/dev/pci/tga.c | 5 | ||||
| -rw-r--r-- | sys/dev/tc/cfb.c | 5 | ||||
| -rw-r--r-- | sys/dev/tc/mfb.c | 5 | ||||
| -rw-r--r-- | sys/dev/tc/sfb.c | 5 | ||||
| -rw-r--r-- | sys/dev/tc/sfbplus.c | 5 | ||||
| -rw-r--r-- | sys/dev/tc/tfb.c | 5 | ||||
| -rw-r--r-- | sys/dev/tc/xcfb.c | 5 |
8 files changed, 24 insertions, 16 deletions
diff --git a/sys/dev/hpc/hpcfb.c b/sys/dev/hpc/hpcfb.c index d4fd43475f0..086150a4012 100644 --- a/sys/dev/hpc/hpcfb.c +++ b/sys/dev/hpc/hpcfb.c @@ -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 @@ hpcfbattach(device_t parent, device_t self, void *aux) 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 --git a/sys/dev/pci/tga.c b/sys/dev/pci/tga.c index 64715ddaef8..6173bf08de4 100644 --- a/sys/dev/pci/tga.c +++ b/sys/dev/pci/tga.c @@ -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 @@ tgaattach(device_t parent, device_t self, void *aux) #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 --git a/sys/dev/tc/cfb.c b/sys/dev/tc/cfb.c index 743e6f6e4d8..fa11007a1f9 100644 --- a/sys/dev/tc/cfb.c +++ b/sys/dev/tc/cfb.c @@ -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 @@ cfbattach(device_t parent, device_t self, void *aux) 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 --git a/sys/dev/tc/mfb.c b/sys/dev/tc/mfb.c index 13a398b2ddb..e66fe9454bd 100644 --- a/sys/dev/tc/mfb.c +++ b/sys/dev/tc/mfb.c @@ -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 @@ mfbattach(device_t parent, device_t self, void *aux) 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 --git a/sys/dev/tc/sfb.c b/sys/dev/tc/sfb.c index 78a4323cebf..8dec624fdf2 100644 --- a/sys/dev/tc/sfb.c +++ b/sys/dev/tc/sfb.c @@ -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 @@ sfbattach(device_t parent, device_t self, void *aux) 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 --git a/sys/dev/tc/sfbplus.c b/sys/dev/tc/sfbplus.c index 46f9d794a8b..78d2b9258fc 100644 --- a/sys/dev/tc/sfbplus.c +++ b/sys/dev/tc/sfbplus.c @@ -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 @@ sfbpattach(device_t parent, device_t self, void *aux) 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 --git a/sys/dev/tc/tfb.c b/sys/dev/tc/tfb.c index eb75eb7d7f6..3737a67125c 100644 --- a/sys/dev/tc/tfb.c +++ b/sys/dev/tc/tfb.c @@ -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 @@ tfbattach(device_t parent, device_t self, void *aux) 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 --git a/sys/dev/tc/xcfb.c b/sys/dev/tc/xcfb.c index 7c1354426f1..24c5549785d 100644 --- a/sys/dev/tc/xcfb.c +++ b/sys/dev/tc/xcfb.c @@ -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 @@ xcfbattach(device_t parent, device_t self, void *aux) 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 { |
