[src/trunk]: src/sys/dev/sbus Include "ioconf.h" instead of extern struct cfd...

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

details:   https://anonhg.NetBSD.org/src/rev/85c4eaf54d74
branches:  trunk
changeset: 747491:85c4eaf54d74
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Thu Sep 17 16:39:48 2009 +0000

description:
Include "ioconf.h" instead of extern struct cfdriver foo_cd decls.

diffstat:

 sys/dev/sbus/agten.c |  6 +++---
 sys/dev/sbus/magma.c |  9 ++++-----
 sys/dev/sbus/p9100.c |  8 ++++----
 sys/dev/sbus/spif.c  |  9 +++------
 sys/dev/sbus/tcx.c   |  8 ++++----
 sys/dev/sbus/zx.c    |  8 ++++----
 6 files changed, 22 insertions(+), 26 deletions(-)

diffs (216 lines):

diff -r d207364a1de5 -r 85c4eaf54d74 sys/dev/sbus/agten.c
--- a/sys/dev/sbus/agten.c      Thu Sep 17 16:28:12 2009 +0000
+++ b/sys/dev/sbus/agten.c      Thu Sep 17 16:39:48 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: agten.c,v 1.21 2009/09/17 16:28:12 tsutsui Exp $ */
+/*     $NetBSD: agten.c,v 1.22 2009/09/17 16:39:48 tsutsui Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agten.c,v 1.21 2009/09/17 16:28:12 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agten.c,v 1.22 2009/09/17 16:39:48 tsutsui Exp $");
 
 /*
  * a driver for the Fujitsu AG-10e SBus framebuffer
@@ -75,6 +75,7 @@
 #include <dev/ic/i128var.h>
 
 #include "opt_agten.h"
+#include "ioconf.h"
 
 static int     agten_match(device_t, cfdata_t, void *);
 static void    agten_attach(device_t, device_t, void *);
@@ -162,7 +163,6 @@
 };
 
 /* /dev/fb* stuff */
-extern struct cfdriver agten_cd;
 
 static int agten_fb_open(dev_t, int, int, struct lwp *);
 static int agten_fb_close(dev_t, int, int, struct lwp *);
diff -r d207364a1de5 -r 85c4eaf54d74 sys/dev/sbus/magma.c
--- a/sys/dev/sbus/magma.c      Thu Sep 17 16:28:12 2009 +0000
+++ b/sys/dev/sbus/magma.c      Thu Sep 17 16:39:48 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: magma.c,v 1.53 2009/09/17 16:28:12 tsutsui Exp $       */
+/*     $NetBSD: magma.c,v 1.54 2009/09/17 16:39:48 tsutsui Exp $       */
 
 /*-
  * Copyright (c) 1998 Iain Hibbert
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.53 2009/09/17 16:28:12 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.54 2009/09/17 16:39:48 tsutsui Exp $");
 
 #if 0
 #define MAGMA_DEBUG
@@ -67,6 +67,8 @@
 #include <dev/sbus/mbppio.h>
 #include <dev/sbus/magmareg.h>
 
+#include "ioconf.h"
+
 /* supported cards
  *
  *  The table below lists the cards that this driver is likely to
@@ -176,9 +178,6 @@
 CFATTACH_DECL(mbpp, sizeof(struct mbpp_softc),
     mbpp_match, mbpp_attach, NULL, NULL);
 
-extern struct cfdriver mtty_cd;
-extern struct cfdriver mbpp_cd;
-
 dev_type_open(mttyopen);
 dev_type_close(mttyclose);
 dev_type_read(mttyread);
diff -r d207364a1de5 -r 85c4eaf54d74 sys/dev/sbus/p9100.c
--- a/sys/dev/sbus/p9100.c      Thu Sep 17 16:28:12 2009 +0000
+++ b/sys/dev/sbus/p9100.c      Thu Sep 17 16:39:48 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: p9100.c,v 1.48 2009/09/17 16:28:12 tsutsui Exp $ */
+/*     $NetBSD: p9100.c,v 1.49 2009/09/17 16:39:48 tsutsui Exp $ */
 
 /*-
  * Copyright (c) 1998, 2005, 2006 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.48 2009/09/17 16:28:12 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.49 2009/09/17 16:39:48 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -73,6 +73,8 @@
 #include "rasops_glue.h"
 #include "opt_pnozz.h"
 
+#include "ioconf.h"
+
 #include "tctrl.h"
 #if NTCTRL > 0
 #include <machine/tctrl.h>
@@ -163,8 +165,6 @@
 CFATTACH_DECL_NEW(pnozz, sizeof(struct p9100_softc),
     p9100_sbus_match, p9100_sbus_attach, NULL, NULL);
 
-extern struct cfdriver pnozz_cd;
-
 static dev_type_open(p9100open);
 static dev_type_ioctl(p9100ioctl);
 static dev_type_mmap(p9100mmap);
diff -r d207364a1de5 -r 85c4eaf54d74 sys/dev/sbus/spif.c
--- a/sys/dev/sbus/spif.c       Thu Sep 17 16:28:12 2009 +0000
+++ b/sys/dev/sbus/spif.c       Thu Sep 17 16:39:48 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: spif.c,v 1.23 2009/05/12 14:43:59 cegger Exp $ */
+/*     $NetBSD: spif.c,v 1.24 2009/09/17 16:39:48 tsutsui Exp $        */
 /*     $OpenBSD: spif.c,v 1.12 2003/10/03 16:44:51 miod Exp $  */
 
 /*
@@ -41,7 +41,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spif.c,v 1.23 2009/05/12 14:43:59 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spif.c,v 1.24 2009/09/17 16:39:48 tsutsui Exp $");
 
 #include "spif.h"
 #if NSPIF > 0
@@ -71,6 +71,7 @@
 #include <dev/sbus/spifvar.h>
 #include <dev/sbus/spifreg.h>
 
+#include "ioconf.h"
 
 /* Autoconfig stuff */
 
@@ -83,10 +84,6 @@
 CFATTACH_DECL(sbpp, sizeof(struct sbpp_softc),
     sbpp_match, sbpp_attach, NULL, NULL);
 
-extern struct cfdriver spif_cd;
-extern struct cfdriver stty_cd;
-extern struct cfdriver sbpp_cd;
-
 dev_type_open(stty_open);
 dev_type_close(stty_close);
 dev_type_read(stty_read);
diff -r d207364a1de5 -r 85c4eaf54d74 sys/dev/sbus/tcx.c
--- a/sys/dev/sbus/tcx.c        Thu Sep 17 16:28:12 2009 +0000
+++ b/sys/dev/sbus/tcx.c        Thu Sep 17 16:39:48 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcx.c,v 1.41 2009/09/17 16:28:13 tsutsui Exp $ */
+/*     $NetBSD: tcx.c,v 1.42 2009/09/17 16:39:48 tsutsui Exp $ */
 
 /*
  *  Copyright (c) 1996, 1998, 2009 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.41 2009/09/17 16:28:13 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.42 2009/09/17 16:39:48 tsutsui Exp $");
 
 /*
  * define for cg8 emulation on S24 (24-bit version of tcx) for the SS5;
@@ -81,6 +81,8 @@
 
 #include "opt_wsemul.h"
 
+#include "ioconf.h"
+
 /* per-display variables */
 struct tcx_softc {
        device_t        sc_dev;         /* base device */
@@ -150,8 +152,6 @@
 CFATTACH_DECL_NEW(tcx, sizeof(struct tcx_softc),
     tcxmatch, tcxattach, NULL, NULL);
 
-extern struct cfdriver tcx_cd;
-
 dev_type_open(tcxopen);
 dev_type_close(tcxclose);
 dev_type_ioctl(tcxioctl);
diff -r d207364a1de5 -r 85c4eaf54d74 sys/dev/sbus/zx.c
--- a/sys/dev/sbus/zx.c Thu Sep 17 16:28:12 2009 +0000
+++ b/sys/dev/sbus/zx.c Thu Sep 17 16:39:48 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: zx.c,v 1.31 2009/09/17 16:28:13 tsutsui Exp $  */
+/*     $NetBSD: zx.c,v 1.32 2009/09/17 16:39:48 tsutsui Exp $  */
 
 /*
  *  Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zx.c,v 1.31 2009/09/17 16:28:13 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zx.c,v 1.32 2009/09/17 16:39:48 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -82,6 +82,8 @@
 
 #include <dev/wscons/wsconsio.h>
 
+#include "ioconf.h"
+
 #if (NWSDISPLAY == 0) && !defined(RASTERCONSOLE)
 #error Sorry, this driver needs WSCONS or RASTERCONSOLE
 #endif
@@ -140,8 +142,6 @@
 CFATTACH_DECL_NEW(zx, sizeof(struct zx_softc),
     zx_match, zx_attach, NULL, NULL);
 
-extern struct cfdriver zx_cd;
-
 static dev_type_open(zxopen);
 static dev_type_close(zxclose);
 static dev_type_ioctl(zxioctl);