Clear RI_NO_AUTO in actual attach functions during autoconf(9)

for console devices that set the flag during consinit().
This commit is contained in:
tsutsui 2010-05-15 08:53:26 +00:00
parent 54faad2469
commit a9edf8145e
11 changed files with 33 additions and 22 deletions

View File

@ -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 @@ pvr_attach(struct device *parent, struct device *self, void *aux)
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,

View File

@ -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 @@ fb_elb_attach(struct device *parent, struct device *self, void *aux)
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));

View File

@ -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 @@ fb_sbdio_attach(device_t parent, device_t self, void *aux)
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 {

View File

@ -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,

View File

@ -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,

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {