[src/trunk]: src/sys/arch/news68k/dev Include ioconf.h to declare struct cfdr...

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

details:   https://anonhg.NetBSD.org/src/rev/d8af56ffac57
branches:  trunk
changeset: 569753:d8af56ffac57
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Sep 04 11:28:32 2004 +0000

description:
Include ioconf.h to declare struct cfdriver.

diffstat:

 sys/arch/news68k/dev/hb.c         |  8 ++++----
 sys/arch/news68k/dev/if_le.c      |  7 ++++---
 sys/arch/news68k/dev/kb_hb.c      |  8 ++++----
 sys/arch/news68k/dev/kbc.c        |  8 ++++----
 sys/arch/news68k/dev/mkclock_hb.c |  8 ++++----
 sys/arch/news68k/dev/si.c         |  7 ++++---
 sys/arch/news68k/dev/timer_hb.c   |  7 ++++---
 sys/arch/news68k/dev/zs.c         |  8 ++++----
 8 files changed, 32 insertions(+), 29 deletions(-)

diffs (284 lines):

diff -r f5256a399046 -r d8af56ffac57 sys/arch/news68k/dev/hb.c
--- a/sys/arch/news68k/dev/hb.c Sat Sep 04 10:48:57 2004 +0000
+++ b/sys/arch/news68k/dev/hb.c Sat Sep 04 11:28:32 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hb.c,v 1.12 2003/07/15 02:59:26 lukem Exp $    */
+/*     $NetBSD: hb.c,v 1.13 2004/09/04 11:28:32 tsutsui Exp $  */
 
 /*-
  * Copyright (C) 1999 Izumi Tsutsui.  All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hb.c,v 1.12 2003/07/15 02:59:26 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hb.c,v 1.13 2004/09/04 11:28:32 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -40,6 +40,8 @@
 #include <news68k/news68k/isr.h>
 #include <news68k/dev/hbvar.h>
 
+#include "ioconf.h"
+
 static int  hb_match(struct device *, struct cfdata *, void *);
 static void hb_attach(struct device *, struct device *, void *);
 static int  hb_search(struct device *, struct cfdata *, void *);
@@ -48,8 +50,6 @@
 CFATTACH_DECL(hb, sizeof(struct device),
     hb_match, hb_attach, NULL, NULL);
 
-extern struct cfdriver hb_cd;
-
 static int
 hb_match(parent, cf, aux)
        struct device *parent;
diff -r f5256a399046 -r d8af56ffac57 sys/arch/news68k/dev/if_le.c
--- a/sys/arch/news68k/dev/if_le.c      Sat Sep 04 10:48:57 2004 +0000
+++ b/sys/arch/news68k/dev/if_le.c      Sat Sep 04 11:28:32 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_le.c,v 1.8 2003/07/15 02:59:26 lukem Exp $  */
+/*     $NetBSD: if_le.c,v 1.9 2004/09/04 11:30:39 tsutsui Exp $        */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.8 2003/07/15 02:59:26 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.9 2004/09/04 11:30:39 tsutsui Exp $");
 
 #include "opt_inet.h"
 #include "bpfilter.h"
@@ -70,6 +70,8 @@
 #include <dev/ic/am7990reg.h>
 #include <dev/ic/am7990var.h>
 
+#include "ioconf.h"
+
 /*
  * LANCE registers.
  * The real stuff is in dev/ic/am7990reg.h
@@ -212,7 +214,6 @@
        int unit;
 {
        struct am7990_softc *sc;
-       extern struct cfdriver le_cd;
 
        if (unit >= le_cd.cd_ndevs)
                return 0;
diff -r f5256a399046 -r d8af56ffac57 sys/arch/news68k/dev/kb_hb.c
--- a/sys/arch/news68k/dev/kb_hb.c      Sat Sep 04 10:48:57 2004 +0000
+++ b/sys/arch/news68k/dev/kb_hb.c      Sat Sep 04 11:28:32 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kb_hb.c,v 1.5 2003/07/15 02:59:26 lukem Exp $  */
+/*     $NetBSD: kb_hb.c,v 1.6 2004/09/04 11:28:32 tsutsui Exp $        */
 
 /*
  * Copyright (c) 2001 Izumi Tsutsui.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kb_hb.c,v 1.5 2003/07/15 02:59:26 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kb_hb.c,v 1.6 2004/09/04 11:28:32 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -48,6 +48,8 @@
 
 #include <news68k/news68k/isr.h>
 
+#include "ioconf.h"
+
 #define KB_SIZE 0x10 /* XXX */
 #define KB_PRI 5
 
@@ -62,8 +64,6 @@
 
 struct console_softc kb_hb_conssc;
 
-extern struct cfdriver kb_hb_cd;
-
 int
 kb_hb_match(parent, cf, aux)
        struct device *parent;
diff -r f5256a399046 -r d8af56ffac57 sys/arch/news68k/dev/kbc.c
--- a/sys/arch/news68k/dev/kbc.c        Sat Sep 04 10:48:57 2004 +0000
+++ b/sys/arch/news68k/dev/kbc.c        Sat Sep 04 11:28:32 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kbc.c,v 1.7 2003/07/15 02:59:26 lukem Exp $    */
+/*     $NetBSD: kbc.c,v 1.8 2004/09/04 11:28:32 tsutsui Exp $  */
 
 /*-
  * Copyright (C) 2001 Izumi Tsutsui.  All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbc.c,v 1.7 2003/07/15 02:59:26 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbc.c,v 1.8 2004/09/04 11:28:32 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -43,6 +43,8 @@
 #include <news68k/dev/hbvar.h>
 #include <news68k/dev/kbcvar.h>
 
+#include "ioconf.h"
+
 #define KBC_SIZE 0x10 /* XXX */
 
 /* Definition of the driver for autoconfig. */
@@ -53,8 +55,6 @@
 CFATTACH_DECL(kbc, sizeof(struct device),
     kbc_match, kbc_attach, NULL, NULL);
 
-extern struct cfdriver kbc_cd;
-
 static int kbc_match(parent, cf, aux)
        struct device *parent;
        struct cfdata *cf;
diff -r f5256a399046 -r d8af56ffac57 sys/arch/news68k/dev/mkclock_hb.c
--- a/sys/arch/news68k/dev/mkclock_hb.c Sat Sep 04 10:48:57 2004 +0000
+++ b/sys/arch/news68k/dev/mkclock_hb.c Sat Sep 04 11:28:32 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mkclock_hb.c,v 1.8 2003/11/01 22:49:38 tsutsui Exp $   */
+/*     $NetBSD: mkclock_hb.c,v 1.9 2004/09/04 11:28:32 tsutsui Exp $   */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mkclock_hb.c,v 1.8 2003/11/01 22:49:38 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mkclock_hb.c,v 1.9 2004/09/04 11:28:32 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -55,14 +55,14 @@
 
 #include <news68k/dev/hbvar.h>
 
+#include "ioconf.h"
+
 int  mkclock_hb_match(struct device *, struct cfdata  *, void *);
 void mkclock_hb_attach(struct device *, struct device *, void *);
 
 CFATTACH_DECL(mkclock_hb, sizeof(struct mk48txx_softc),
     mkclock_hb_match, mkclock_hb_attach, NULL, NULL);
 
-extern struct cfdriver mkclock_cd;
-
 int
 mkclock_hb_match(parent, cf, aux)
        struct device *parent;
diff -r f5256a399046 -r d8af56ffac57 sys/arch/news68k/dev/si.c
--- a/sys/arch/news68k/dev/si.c Sat Sep 04 10:48:57 2004 +0000
+++ b/sys/arch/news68k/dev/si.c Sat Sep 04 11:28:32 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: si.c,v 1.14 2004/08/13 12:54:44 tsutsui Exp $  */
+/*     $NetBSD: si.c,v 1.15 2004/09/04 11:30:39 tsutsui Exp $  */
 
 /*
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: si.c,v 1.14 2004/08/13 12:54:44 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: si.c,v 1.15 2004/09/04 11:30:39 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -64,6 +64,8 @@
 #include <news68k/dev/hbvar.h>
 #include <news68k/dev/dmac_0266.h>
 
+#include "ioconf.h"
+
 #define MIN_DMA_LEN 128
 #define DMAC_BASE      0xe0e80000 /* XXX */
 #define SI_REGSIZE     8
@@ -210,7 +212,6 @@
        int unit;
 {
        struct si_softc *sc;
-       extern struct cfdriver si_cd;
 
        if (unit >= si_cd.cd_ndevs)
                return 0;
diff -r f5256a399046 -r d8af56ffac57 sys/arch/news68k/dev/timer_hb.c
--- a/sys/arch/news68k/dev/timer_hb.c   Sat Sep 04 10:48:57 2004 +0000
+++ b/sys/arch/news68k/dev/timer_hb.c   Sat Sep 04 11:28:32 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: timer_hb.c,v 1.6 2003/07/15 02:59:26 lukem Exp $       */
+/*     $NetBSD: timer_hb.c,v 1.7 2004/09/04 11:28:32 tsutsui Exp $     */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: timer_hb.c,v 1.6 2003/07/15 02:59:26 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: timer_hb.c,v 1.7 2004/09/04 11:28:32 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -56,6 +56,8 @@
 
 #include <news68k/dev/hbvar.h>
 
+#include "ioconf.h"
+
 /*
  * interrupt level for clock
  */
@@ -78,7 +80,6 @@
 static volatile u_int8_t *ctrl_timer; /* XXX */
 
 extern volatile u_char *ctrl_led; /* XXX */
-extern struct cfdriver timer_cd;
 
 int
 timer_hb_match(parent, cf, aux)
diff -r f5256a399046 -r d8af56ffac57 sys/arch/news68k/dev/zs.c
--- a/sys/arch/news68k/dev/zs.c Sat Sep 04 10:48:57 2004 +0000
+++ b/sys/arch/news68k/dev/zs.c Sat Sep 04 11:28:32 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: zs.c,v 1.18 2003/07/15 02:59:26 lukem Exp $    */
+/*     $NetBSD: zs.c,v 1.19 2004/09/04 11:28:32 tsutsui Exp $  */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.18 2003/07/15 02:59:26 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.19 2004/09/04 11:28:32 tsutsui Exp $");
 
 #include "opt_ddb.h"
 
@@ -66,6 +66,8 @@
 
 #include <news68k/dev/hbvar.h>
 
+#include "ioconf.h"
+
 int  zs_getc(void *);
 void zs_putc(void *, int);
 
@@ -151,8 +153,6 @@
 CFATTACH_DECL(zsc, sizeof(struct zsc_softc),
     zs_match, zs_attach, NULL, NULL);
 
-extern struct cfdriver zsc_cd;
-
 static int zshard(void *);
 void zssoft(void *);
 #if 0