Module Name: src
Committed By: tsutsui
Date: Thu Sep 17 16:39:48 UTC 2009
Modified Files:
src/sys/dev/sbus: agten.c magma.c p9100.c spif.c tcx.c zx.c
Log Message:
Include "ioconf.h" instead of extern struct cfdriver foo_cd decls.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/sbus/agten.c
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/sbus/magma.c
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/sbus/p9100.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/sbus/spif.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/sbus/tcx.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/sbus/zx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sbus/agten.c
diff -u src/sys/dev/sbus/agten.c:1.21 src/sys/dev/sbus/agten.c:1.22
--- src/sys/dev/sbus/agten.c:1.21 Thu Sep 17 16:28:12 2009
+++ src/sys/dev/sbus/agten.c Thu Sep 17 16:39:48 2009
@@ -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 *);
Index: src/sys/dev/sbus/magma.c
diff -u src/sys/dev/sbus/magma.c:1.53 src/sys/dev/sbus/magma.c:1.54
--- src/sys/dev/sbus/magma.c:1.53 Thu Sep 17 16:28:12 2009
+++ src/sys/dev/sbus/magma.c Thu Sep 17 16:39:48 2009
@@ -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);
Index: src/sys/dev/sbus/p9100.c
diff -u src/sys/dev/sbus/p9100.c:1.48 src/sys/dev/sbus/p9100.c:1.49
--- src/sys/dev/sbus/p9100.c:1.48 Thu Sep 17 16:28:12 2009
+++ src/sys/dev/sbus/p9100.c Thu Sep 17 16:39:48 2009
@@ -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);
Index: src/sys/dev/sbus/spif.c
diff -u src/sys/dev/sbus/spif.c:1.23 src/sys/dev/sbus/spif.c:1.24
--- src/sys/dev/sbus/spif.c:1.23 Tue May 12 14:43:59 2009
+++ src/sys/dev/sbus/spif.c Thu Sep 17 16:39:48 2009
@@ -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);
Index: src/sys/dev/sbus/tcx.c
diff -u src/sys/dev/sbus/tcx.c:1.41 src/sys/dev/sbus/tcx.c:1.42
--- src/sys/dev/sbus/tcx.c:1.41 Thu Sep 17 16:28:13 2009
+++ src/sys/dev/sbus/tcx.c Thu Sep 17 16:39:48 2009
@@ -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);
Index: src/sys/dev/sbus/zx.c
diff -u src/sys/dev/sbus/zx.c:1.31 src/sys/dev/sbus/zx.c:1.32
--- src/sys/dev/sbus/zx.c:1.31 Thu Sep 17 16:28:13 2009
+++ src/sys/dev/sbus/zx.c Thu Sep 17 16:39:48 2009
@@ -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);
