From 31cb734598d043a960e85414937be0cd5a5dc0c5 Mon Sep 17 00:00:00 2001 From: tsutsui Date: Sat, 19 Feb 2005 16:31:49 +0000 Subject: [PATCH] Include "ioconf.h" for struct cfdriver *_cd decls. --- sys/arch/hp300/dev/grf.c | 8 ++++---- sys/arch/hp300/dev/hil.c | 8 ++++---- sys/arch/hp300/dev/hpib.c | 8 ++++---- sys/arch/hp300/dev/ite.c | 8 ++++---- sys/arch/hp300/dev/mt.c | 8 ++++---- sys/arch/hp300/dev/ppi.c | 8 ++++---- sys/arch/hp300/dev/rd.c | 8 ++++---- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/sys/arch/hp300/dev/grf.c b/sys/arch/hp300/dev/grf.c index a3ef1b3dcae6..633d689f5a7d 100644 --- a/sys/arch/hp300/dev/grf.c +++ b/sys/arch/hp300/dev/grf.c @@ -1,4 +1,4 @@ -/* $NetBSD: grf.c,v 1.56 2004/08/28 17:37:00 thorpej Exp $ */ +/* $NetBSD: grf.c,v 1.57 2005/02/19 16:31:49 tsutsui Exp $ */ /* * Copyright (c) 1990, 1993 @@ -83,7 +83,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.56 2004/08/28 17:37:00 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.57 2005/02/19 16:31:49 tsutsui Exp $"); #include "opt_compat_hpux.h" @@ -123,14 +123,14 @@ __KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.56 2004/08/28 17:37:00 thorpej Exp $"); #define iteoff(u,f) #endif /* NITE > 0 */ +#include "ioconf.h" + static int grfmatch(struct device *, struct cfdata *, void *); static void grfattach(struct device *, struct device *, void *); CFATTACH_DECL(grf, sizeof(struct grf_softc), grfmatch, grfattach, NULL, NULL); -extern struct cfdriver grf_cd; - static dev_type_open(grfopen); static dev_type_close(grfclose); static dev_type_ioctl(grfioctl); diff --git a/sys/arch/hp300/dev/hil.c b/sys/arch/hp300/dev/hil.c index 86cf92811ffc..20f6615f18e8 100644 --- a/sys/arch/hp300/dev/hil.c +++ b/sys/arch/hp300/dev/hil.c @@ -1,4 +1,4 @@ -/* $NetBSD: hil.c,v 1.64 2004/08/28 17:37:01 thorpej Exp $ */ +/* $NetBSD: hil.c,v 1.65 2005/02/19 16:31:49 tsutsui Exp $ */ /* * Copyright (c) 1990, 1993 @@ -77,7 +77,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: hil.c,v 1.64 2004/08/28 17:37:01 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hil.c,v 1.65 2005/02/19 16:31:49 tsutsui Exp $"); #include "opt_compat_hpux.h" #include "ite.h" @@ -113,6 +113,8 @@ __KERNEL_RCSID(0, "$NetBSD: hil.c,v 1.64 2004/08/28 17:37:01 thorpej Exp $"); #include #include +#include "ioconf.h" + static int hilmatch(struct device *, struct cfdata *, void *); static void hilattach(struct device *, struct device *, void *); @@ -141,8 +143,6 @@ extern struct kbdmap kbd_map[]; /* symbolic sleep message strings */ static const char hilin[] = "hilin"; -extern struct cfdriver hil_cd; - static dev_type_open(hilopen); static dev_type_close(hilclose); static dev_type_read(hilread); diff --git a/sys/arch/hp300/dev/hpib.c b/sys/arch/hp300/dev/hpib.c index d1bf2421d10c..ac5abf31664b 100644 --- a/sys/arch/hp300/dev/hpib.c +++ b/sys/arch/hp300/dev/hpib.c @@ -1,4 +1,4 @@ -/* $NetBSD: hpib.c,v 1.27 2004/08/28 17:37:01 thorpej Exp $ */ +/* $NetBSD: hpib.c,v 1.28 2005/02/19 16:31:49 tsutsui Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -72,7 +72,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: hpib.c,v 1.27 2004/08/28 17:37:01 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hpib.c,v 1.28 2005/02/19 16:31:49 tsutsui Exp $"); #include #include @@ -87,14 +87,14 @@ __KERNEL_RCSID(0, "$NetBSD: hpib.c,v 1.27 2004/08/28 17:37:01 thorpej Exp $"); #include #include +#include "ioconf.h" + static int hpibbusmatch(struct device *, struct cfdata *, void *); static void hpibbusattach(struct device *, struct device *, void *); CFATTACH_DECL(hpibbus, sizeof(struct hpibbus_softc), hpibbusmatch, hpibbusattach, NULL, NULL); -extern struct cfdriver hpibbus_cd; - static void hpibbus_attach_children(struct hpibbus_softc *); static int hpibbussearch(struct device *, struct cfdata *, void *); static int hpibbusprint(void *, const char *); diff --git a/sys/arch/hp300/dev/ite.c b/sys/arch/hp300/dev/ite.c index 4643f55d8e00..93728f20500c 100644 --- a/sys/arch/hp300/dev/ite.c +++ b/sys/arch/hp300/dev/ite.c @@ -1,4 +1,4 @@ -/* $NetBSD: ite.c,v 1.65 2004/08/28 17:37:01 thorpej Exp $ */ +/* $NetBSD: ite.c,v 1.66 2005/02/19 16:31:49 tsutsui Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -119,7 +119,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.65 2004/08/28 17:37:01 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.66 2005/02/19 16:31:49 tsutsui Exp $"); #include "hil.h" @@ -144,6 +144,8 @@ __KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.65 2004/08/28 17:37:01 thorpej Exp $"); #include #include +#include "ioconf.h" + #define set_attr(ip, attr) ((ip)->attribute |= (attr)) #define clr_attr(ip, attr) ((ip)->attribute &= ~(attr)) @@ -164,8 +166,6 @@ CFATTACH_DECL(ite, sizeof(struct ite_softc), /* XXX this has always been global, but shouldn't be */ static struct kbdmap *ite_km; -extern struct cfdriver ite_cd; - static dev_type_open(iteopen); static dev_type_close(iteclose); static dev_type_read(iteread); diff --git a/sys/arch/hp300/dev/mt.c b/sys/arch/hp300/dev/mt.c index 8b0b0c9e9777..b6662198615e 100644 --- a/sys/arch/hp300/dev/mt.c +++ b/sys/arch/hp300/dev/mt.c @@ -1,4 +1,4 @@ -/* $NetBSD: mt.c,v 1.27 2004/10/28 07:07:36 yamt Exp $ */ +/* $NetBSD: mt.c,v 1.28 2005/02/19 16:31:49 tsutsui Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -67,7 +67,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.27 2004/10/28 07:07:36 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.28 2005/02/19 16:31:49 tsutsui Exp $"); #include #include @@ -90,6 +90,8 @@ __KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.27 2004/10/28 07:07:36 yamt Exp $"); #include +#include "ioconf.h" + static const struct mtinfo { u_short hwid; char *desc; @@ -140,8 +142,6 @@ static void mtattach(struct device *, struct device *, void *); CFATTACH_DECL(mt, sizeof(struct mt_softc), mtmatch, mtattach, NULL, NULL); -extern struct cfdriver mt_cd; - static dev_type_open(mtopen); static dev_type_close(mtclose); static dev_type_read(mtread); diff --git a/sys/arch/hp300/dev/ppi.c b/sys/arch/hp300/dev/ppi.c index 1b99937aa879..8504e29a7fc0 100644 --- a/sys/arch/hp300/dev/ppi.c +++ b/sys/arch/hp300/dev/ppi.c @@ -1,4 +1,4 @@ -/* $NetBSD: ppi.c,v 1.29 2004/08/28 17:37:02 thorpej Exp $ */ +/* $NetBSD: ppi.c,v 1.30 2005/02/19 16:31:49 tsutsui Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -72,7 +72,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ppi.c,v 1.29 2004/08/28 17:37:02 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ppi.c,v 1.30 2005/02/19 16:31:49 tsutsui Exp $"); #include #include @@ -88,6 +88,8 @@ __KERNEL_RCSID(0, "$NetBSD: ppi.c,v 1.29 2004/08/28 17:37:02 thorpej Exp $"); #include +#include "ioconf.h" + struct ppi_softc { struct device sc_dev; int sc_flags; @@ -115,8 +117,6 @@ static void ppiattach(struct device *, struct device *, void *); CFATTACH_DECL(ppi, sizeof(struct ppi_softc), ppimatch, ppiattach, NULL, NULL); -extern struct cfdriver ppi_cd; - static dev_type_open(ppiopen); static dev_type_close(ppiclose); static dev_type_read(ppiread); diff --git a/sys/arch/hp300/dev/rd.c b/sys/arch/hp300/dev/rd.c index a97e6eedf9a4..1bf99ecedfd9 100644 --- a/sys/arch/hp300/dev/rd.c +++ b/sys/arch/hp300/dev/rd.c @@ -1,4 +1,4 @@ -/* $NetBSD: rd.c,v 1.66 2005/02/05 16:19:35 chs Exp $ */ +/* $NetBSD: rd.c,v 1.67 2005/02/19 16:31:49 tsutsui Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -117,7 +117,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.66 2005/02/05 16:19:35 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.67 2005/02/19 16:31:49 tsutsui Exp $"); #include "opt_useleds.h" #include "rnd.h" @@ -148,6 +148,8 @@ __KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.66 2005/02/05 16:19:35 chs Exp $"); #include #endif +#include "ioconf.h" + int rderrthresh = RDRETRY-1; /* when to start reporting errors */ #ifdef DEBUG @@ -318,8 +320,6 @@ static void rdattach(struct device *, struct device *, void *); CFATTACH_DECL(rd, sizeof(struct rd_softc), rdmatch, rdattach, NULL, NULL); -extern struct cfdriver rd_cd; - static dev_type_open(rdopen); static dev_type_close(rdclose); static dev_type_read(rdread);