Module Name: src
Committed By: tsutsui
Date: Tue Apr 13 09:51:07 UTC 2010
Modified Files:
src/sys/arch/atari/dev: clock.c grf.c hdfd.c ite.c lpt.c nvram.c
src/sys/arch/atari/vme: et4000.c leo.c
Log Message:
Include "ioconf.h" to declare struct cfdriver foo_cd.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/atari/dev/clock.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/atari/dev/grf.c
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/atari/dev/hdfd.c
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/atari/dev/ite.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/atari/dev/lpt.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/atari/dev/nvram.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/atari/vme/et4000.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/atari/vme/leo.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/arch/atari/dev/clock.c
diff -u src/sys/arch/atari/dev/clock.c:1.50 src/sys/arch/atari/dev/clock.c:1.51
--- src/sys/arch/atari/dev/clock.c:1.50 Sun Aug 23 13:46:48 2009
+++ src/sys/arch/atari/dev/clock.c Tue Apr 13 09:51:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.50 2009/08/23 13:46:48 tsutsui Exp $ */
+/* $NetBSD: clock.c,v 1.51 2010/04/13 09:51:07 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.50 2009/08/23 13:46:48 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.51 2010/04/13 09:51:07 tsutsui Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -103,6 +103,8 @@
#include <machine/profile.h>
#endif
+#include "ioconf.h"
+
static int atari_rtc_get(todr_chip_handle_t, struct clock_ymdhms *);
static int atari_rtc_set(todr_chip_handle_t, struct clock_ymdhms *);
@@ -156,8 +158,6 @@
CFATTACH_DECL(clock, sizeof(struct clock_softc),
clockmatch, clockattach, NULL, NULL);
-extern struct cfdriver clock_cd;
-
const struct cdevsw rtc_cdevsw = {
rtcopen, rtcclose, rtcread, rtcwrite, noioctl,
nostop, notty, nopoll, nommap, nokqfilter,
Index: src/sys/arch/atari/dev/grf.c
diff -u src/sys/arch/atari/dev/grf.c:1.41 src/sys/arch/atari/dev/grf.c:1.42
--- src/sys/arch/atari/dev/grf.c:1.41 Sun Jul 19 05:43:22 2009
+++ src/sys/arch/atari/dev/grf.c Tue Apr 13 09:51:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: grf.c,v 1.41 2009/07/19 05:43:22 tsutsui Exp $ */
+/* $NetBSD: grf.c,v 1.42 2010/04/13 09:51:07 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -85,7 +85,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.41 2009/07/19 05:43:22 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.42 2010/04/13 09:51:07 tsutsui Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -110,6 +110,8 @@
#include <atari/dev/viewioctl.h>
#include <atari/dev/viewvar.h>
+#include "ioconf.h"
+
#include "grfcc.h"
#include "grfet.h"
#define NGRF (NGRFCC + NGRFET)
@@ -139,8 +141,6 @@
CFATTACH_DECL(grfbus, sizeof(struct device),
grfbusmatch, grfbusattach, NULL, NULL);
-extern struct cfdriver grfbus_cd;
-
dev_type_open(grfopen);
dev_type_close(grfclose);
dev_type_ioctl(grfioctl);
Index: src/sys/arch/atari/dev/hdfd.c
diff -u src/sys/arch/atari/dev/hdfd.c:1.71 src/sys/arch/atari/dev/hdfd.c:1.72
--- src/sys/arch/atari/dev/hdfd.c:1.71 Wed Jul 8 12:23:09 2009
+++ src/sys/arch/atari/dev/hdfd.c Tue Apr 13 09:51:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hdfd.c,v 1.71 2009/07/08 12:23:09 tsutsui Exp $ */
+/* $NetBSD: hdfd.c,v 1.72 2010/04/13 09:51:07 tsutsui Exp $ */
/*-
* Copyright (c) 1996 Leo Weppelman
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.71 2009/07/08 12:23:09 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.72 2010/04/13 09:51:07 tsutsui Exp $");
#include "opt_ddb.h"
@@ -125,6 +125,7 @@
#include <atari/dev/hdfdreg.h>
#include <atari/atari/device.h>
+#include "ioconf.h"
#include "locators.h"
/*
@@ -284,8 +285,6 @@
CFATTACH_DECL(hdfd, sizeof(struct fd_softc),
fdprobe, fdattach, NULL, NULL);
-extern struct cfdriver hdfd_cd;
-
const struct bdevsw fd_bdevsw = {
fdopen, fdclose, fdstrategy, fdioctl, nodump, nosize, D_DISK
};
Index: src/sys/arch/atari/dev/ite.c
diff -u src/sys/arch/atari/dev/ite.c:1.66 src/sys/arch/atari/dev/ite.c:1.67
--- src/sys/arch/atari/dev/ite.c:1.66 Sun Jul 19 05:43:22 2009
+++ src/sys/arch/atari/dev/ite.c Tue Apr 13 09:51:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ite.c,v 1.66 2009/07/19 05:43:22 tsutsui Exp $ */
+/* $NetBSD: ite.c,v 1.67 2010/04/13 09:51:07 tsutsui Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.66 2009/07/19 05:43:22 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.67 2010/04/13 09:51:07 tsutsui Exp $");
#include "opt_ddb.h"
@@ -114,6 +114,8 @@
#include <atari/dev/viewioctl.h>
#include <atari/dev/viewvar.h>
+#include "ioconf.h"
+
#define ITEUNIT(dev) (minor(dev))
#define SUBR_INIT(ip) (ip)->grf->g_iteinit(ip)
@@ -186,8 +188,6 @@
CFATTACH_DECL(ite, sizeof(struct ite_softc),
itematch, iteattach, NULL, NULL);
-extern struct cfdriver ite_cd;
-
dev_type_open(iteopen);
dev_type_close(iteclose);
dev_type_read(iteread);
Index: src/sys/arch/atari/dev/lpt.c
diff -u src/sys/arch/atari/dev/lpt.c:1.33 src/sys/arch/atari/dev/lpt.c:1.34
--- src/sys/arch/atari/dev/lpt.c:1.33 Mon Apr 12 13:05:25 2010
+++ src/sys/arch/atari/dev/lpt.c Tue Apr 13 09:51:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt.c,v 1.33 2010/04/12 13:05:25 tsutsui Exp $ */
+/* $NetBSD: lpt.c,v 1.34 2010/04/13 09:51:07 tsutsui Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.33 2010/04/12 13:05:25 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.34 2010/04/13 09:51:07 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -77,6 +77,8 @@
#include <atari/dev/ym2149reg.h>
+#include "ioconf.h"
+
#define TIMEOUT hz*16 /* wait up to 16 seconds for a ready */
#define STEP hz/4
@@ -133,8 +135,6 @@
CFATTACH_DECL_NEW(lp, sizeof(struct lpt_softc),
lpmatch, lpattach, NULL, NULL);
-extern struct cfdriver lp_cd;
-
const struct cdevsw lp_cdevsw = {
lpopen, lpclose, noread, lpwrite, lpioctl,
nostop, notty, nopoll, nommap, nokqfilter,
Index: src/sys/arch/atari/dev/nvram.c
diff -u src/sys/arch/atari/dev/nvram.c:1.17 src/sys/arch/atari/dev/nvram.c:1.18
--- src/sys/arch/atari/dev/nvram.c:1.17 Tue Oct 20 19:10:11 2009
+++ src/sys/arch/atari/dev/nvram.c Tue Apr 13 09:51:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: nvram.c,v 1.17 2009/10/20 19:10:11 snj Exp $ */
+/* $NetBSD: nvram.c,v 1.18 2010/04/13 09:51:07 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvram.c,v 1.17 2009/10/20 19:10:11 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvram.c,v 1.18 2010/04/13 09:51:07 tsutsui Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -47,6 +47,8 @@
#include <atari/dev/clockreg.h>
#include <atari/dev/nvramvar.h>
+#include "ioconf.h"
+
#include "nvr.h"
#define MC_NVRAM_CSUM (MC_NVRAM_START + MC_NVRAM_SIZE - 2)
@@ -65,8 +67,6 @@
CFATTACH_DECL(nvr, sizeof(struct nvr_softc),
nvr_match, nvr_attach, NULL, NULL);
-extern struct cfdriver nvr_cd;
-
/*ARGSUSED*/
static int
nvr_match(struct device *pdp, struct cfdata *cfp, void *auxp)
Index: src/sys/arch/atari/vme/et4000.c
diff -u src/sys/arch/atari/vme/et4000.c:1.20 src/sys/arch/atari/vme/et4000.c:1.21
--- src/sys/arch/atari/vme/et4000.c:1.20 Sun Jul 19 05:43:23 2009
+++ src/sys/arch/atari/vme/et4000.c Tue Apr 13 09:51:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: et4000.c,v 1.20 2009/07/19 05:43:23 tsutsui Exp $ */
+/* $NetBSD: et4000.c,v 1.21 2010/04/13 09:51:07 tsutsui Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: et4000.c,v 1.20 2009/07/19 05:43:23 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: et4000.c,v 1.21 2010/04/13 09:51:07 tsutsui Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -65,6 +65,8 @@
#include <atari/dev/grfioctl.h>
#include <atari/dev/grf_etreg.h>
+#include "ioconf.h"
+
/*
* Allow a 8Kb io-region and a 1MB frame buffer to be mapped. This
* is more or less required by the XFree server. The X server also
@@ -128,8 +130,6 @@
CFATTACH_DECL(et, sizeof(struct et_softc),
et_vme_match, et_vme_attach, NULL, NULL);
-extern struct cfdriver et_cd;
-
dev_type_open(etopen);
dev_type_close(etclose);
dev_type_read(etread);
Index: src/sys/arch/atari/vme/leo.c
diff -u src/sys/arch/atari/vme/leo.c:1.16 src/sys/arch/atari/vme/leo.c:1.17
--- src/sys/arch/atari/vme/leo.c:1.16 Sat Mar 14 21:04:08 2009
+++ src/sys/arch/atari/vme/leo.c Tue Apr 13 09:51:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: leo.c,v 1.16 2009/03/14 21:04:08 dsl Exp $ */
+/* $NetBSD: leo.c,v 1.17 2010/04/13 09:51:07 tsutsui Exp $ */
/*-
* Copyright (c) 1997 maximum entropy <entr...@zippy.bernstein.com>
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: leo.c,v 1.16 2009/03/14 21:04:08 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: leo.c,v 1.17 2010/04/13 09:51:07 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -64,6 +64,8 @@
#include <atari/vme/leovar.h>
#include <atari/vme/leoioctl.h>
+#include "ioconf.h"
+
static struct leo_addresses {
u_long reg_addr;
u_int reg_size;
@@ -99,8 +101,6 @@
CFATTACH_DECL(leo, sizeof(struct leo_softc),
leo_match, leo_attach, NULL, NULL);
-extern struct cfdriver leo_cd;
-
dev_type_open(leoopen);
dev_type_close(leoclose);
dev_type_read(leomove);
