From 06ce220790f4a76a4f16f3e3ba2015bb5fd0054b Mon Sep 17 00:00:00 2001
From: thorpej <thorpej@NetBSD.org>
Date: Mon, 12 Jan 1998 09:39:57 +0000
Subject: [PATCH] Update for config changes.

---
 sys/dev/ata/wd.c        |  8 +++-----
 sys/dev/ic/mb86960.c    |  6 +-----
 sys/dev/ic/mb86960var.h |  6 +-----
 sys/dev/ic/wdc.c        |  6 +-----
 sys/dev/isa/ast.c       |  6 +-----
 sys/dev/isa/boca.c      |  6 +-----
 sys/dev/isa/esp_isa.c   |  6 +-----
 sys/dev/isa/gus.c       |  7 +------
 sys/dev/isa/if_ate.c    |  6 +-----
 sys/dev/isa/if_ec.c     |  6 +-----
 sys/dev/isa/if_eg.c     |  6 +-----
 sys/dev/isa/if_el.c     |  6 +-----
 sys/dev/isa/if_fe.c     |  6 +-----
 sys/dev/isa/if_fmv.c    |  6 +-----
 sys/dev/isa/if_ie.c     |  6 +-----
 sys/dev/isa/if_iy.c     |  6 +-----
 sys/dev/isa/if_we.c     |  6 ++----
 sys/dev/isa/isa.c       | 16 +++++++---------
 sys/dev/isa/mcd.c       |  6 ++----
 sys/dev/isa/pas.c       |  6 +-----
 sys/dev/isa/pss.c       | 18 +-----------------
 sys/dev/isa/rtfps.c     |  6 +-----
 sys/dev/isa/satlink.c   |  7 +++----
 sys/dev/isa/sb.c        |  6 +-----
 sys/dev/isa/seagate.c   |  6 ++----
 sys/dev/isa/wd.c        |  8 +++-----
 sys/dev/isa/wdc.c       |  6 +-----
 sys/dev/isa/wds.c       |  6 +-----
 sys/dev/isa/wss.c       |  6 +-----
 sys/dev/isa/wt.c        |  6 ++----
 sys/dev/pci/files.pci   | 16 ++++++++--------
 sys/dev/pci/if_de.c     |  6 +-----
 sys/dev/pci/if_fpa.c    |  6 +-----
 sys/dev/pci/if_fxp.c    |  6 +-----
 sys/dev/pci/if_tl.c     |  6 +-----
 sys/dev/pci/ncr.c       |  8 ++------
 sys/dev/pci/pci.c       |  6 +-----
 sys/dev/pci/ppb.c       |  6 +-----
 38 files changed, 62 insertions(+), 206 deletions(-)

diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index c58ac2c10629..95ebf45a7323 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wd.c,v 1.166 1997/10/13 00:47:33 explorer Exp $ */
+/*	$NetBSD: wd.c,v 1.167 1998/01/12 09:43:49 thorpej Exp $ */
 
 /*
  * Copyright (c) 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -98,9 +98,7 @@ struct cfattach wd_ca = {
 	sizeof(struct wd_softc), wdprobe, wdattach
 };
 
-struct cfdriver wd_cd = {
-	NULL, "wd", DV_DISK
-};
+extern struct cfdriver wd_cd;
 
 void	wdgetdefaultlabel __P((struct wd_softc *, struct disklabel *));
 void	wdgetdisklabel	__P((struct wd_softc *));
@@ -128,7 +126,7 @@ wdprobe(parent, match, aux)
 	struct cfdata *cf = match;
 	struct wd_link *d_link = aux;
 	int drive;
-	
+
 	if (d_link == NULL)
 		return 0;
 	if (d_link->type != ATA)
diff --git a/sys/dev/ic/mb86960.c b/sys/dev/ic/mb86960.c
index ae9fa23df763..3822669b4157 100644
--- a/sys/dev/ic/mb86960.c
+++ b/sys/dev/ic/mb86960.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mb86960.c,v 1.19 1998/01/05 07:31:08 perry Exp $	*/
+/*	$NetBSD: mb86960.c,v 1.20 1998/01/12 09:43:37 thorpej Exp $	*/
 
 /*
  * All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -245,10 +245,6 @@ struct cfattach fe_ca = {
 	sizeof(struct fe_softc), feprobe, feattach
 };
 
-struct cfdriver fe_cd = {
-	NULL, "fe", DV_IFNET
-};
-
 /* Ethernet constants.  To be defined in if_ehter.h?  FIXME. */
 #define ETHER_MIN_LEN	60	/* with header, without CRC. */
 #define ETHER_MAX_LEN	1514	/* with header, without CRC. */
diff --git a/sys/dev/ic/mb86960var.h b/sys/dev/ic/mb86960var.h
index 58dedfb914e9..e5b3e9eaf319 100644
--- a/sys/dev/ic/mb86960var.h
+++ b/sys/dev/ic/mb86960var.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: mb86960var.h,v 1.19 1998/01/05 07:31:08 perry Exp $	*/
+/*	$NetBSD: mb86960var.h,v 1.20 1998/01/12 09:43:37 thorpej Exp $	*/
 
 /*
  * All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -245,10 +245,6 @@ struct cfattach fe_ca = {
 	sizeof(struct fe_softc), feprobe, feattach
 };
 
-struct cfdriver fe_cd = {
-	NULL, "fe", DV_IFNET
-};
-
 /* Ethernet constants.  To be defined in if_ehter.h?  FIXME. */
 #define ETHER_MIN_LEN	60	/* with header, without CRC. */
 #define ETHER_MAX_LEN	1514	/* with header, without CRC. */
diff --git a/sys/dev/ic/wdc.c b/sys/dev/ic/wdc.c
index c96fbed6209c..b7e500310587 100644
--- a/sys/dev/ic/wdc.c
+++ b/sys/dev/ic/wdc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wdc.c,v 1.10 1998/01/07 08:47:54 mikel Exp $ */
+/*	$NetBSD: wdc.c,v 1.11 1998/01/12 09:43:50 thorpej Exp $ */
 
 /*
  * Copyright (c) 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -93,10 +93,6 @@ struct cfattach wdc_ca = {
 	sizeof(struct wdc_softc), wdcprobe, wdcattach
 };
 
-struct cfdriver wdc_cd = {
-	NULL, "wdc", DV_DULL
-};
-
 void	wdcstart	__P((struct wdc_softc *));
 int		wdcreset	__P((struct wdc_softc *, int));
 #define VERBOSE 1
diff --git a/sys/dev/isa/ast.c b/sys/dev/isa/ast.c
index 47f02a8c2b57..50175f46d400 100644
--- a/sys/dev/isa/ast.c
+++ b/sys/dev/isa/ast.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ast.c,v 1.41 1997/10/20 18:43:05 thorpej Exp $	*/
+/*	$NetBSD: ast.c,v 1.42 1998/01/12 09:43:30 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -74,10 +74,6 @@ struct cfattach ast_ca = {
 	sizeof(struct ast_softc), astprobe, astattach
 };
 
-struct cfdriver ast_cd = {
-	NULL, "ast", DV_TTY
-};
-
 int
 astprobe(parent, self, aux)
 	struct device *parent;
diff --git a/sys/dev/isa/boca.c b/sys/dev/isa/boca.c
index a275e36f41a4..33cfb5096762 100644
--- a/sys/dev/isa/boca.c
+++ b/sys/dev/isa/boca.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: boca.c,v 1.27 1997/10/20 18:43:07 thorpej Exp $	*/
+/*	$NetBSD: boca.c,v 1.28 1998/01/12 09:43:30 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -70,10 +70,6 @@ struct cfattach boca_ca = {
 	sizeof(struct boca_softc), bocaprobe, bocaattach,
 };
 
-struct cfdriver boca_cd = {
-	NULL, "boca", DV_TTY
-};
-
 int
 bocaprobe(parent, self, aux)
 	struct device *parent;
diff --git a/sys/dev/isa/esp_isa.c b/sys/dev/isa/esp_isa.c
index 4b9bd33fea3f..3ef955a13761 100644
--- a/sys/dev/isa/esp_isa.c
+++ b/sys/dev/isa/esp_isa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: esp_isa.c,v 1.6 1997/10/20 18:43:09 thorpej Exp $	*/
+/*	$NetBSD: esp_isa.c,v 1.7 1998/01/12 09:43:31 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -168,10 +168,6 @@ struct cfattach esp_isa_ca = {
 	sizeof(struct esp_softc), esp_isa_match, esp_isa_attach
 };
 
-struct cfdriver esp_cd = {
-	NULL, "esp", DV_DULL
-};
-
 struct scsipi_adapter esp_switch = {
 	ncr53c9x_scsi_cmd,
 	minphys,		/* no max at this level; handled by DMA code */
diff --git a/sys/dev/isa/gus.c b/sys/dev/isa/gus.c
index 524f2673b7aa..71b939a6d2c4 100644
--- a/sys/dev/isa/gus.c
+++ b/sys/dev/isa/gus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gus.c,v 1.48 1997/10/19 07:42:26 augustss Exp $	*/
+/*	$NetBSD: gus.c,v 1.49 1998/01/12 09:43:32 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -443,11 +443,6 @@ struct cfattach gus_ca = {
 	sizeof(struct gus_softc), gusprobe, gusattach,
 };
 
-struct cfdriver gus_cd = {
-	NULL, "gus", DV_DULL
-};
-
-
 /*
  * A mapping from IRQ/DRQ values to the values used in the GUS's internal
  * registers.  A zero means that the referenced IRQ/DRQ is invalid
diff --git a/sys/dev/isa/if_ate.c b/sys/dev/isa/if_ate.c
index 1e8154f1c25b..582670277c97 100644
--- a/sys/dev/isa/if_ate.c
+++ b/sys/dev/isa/if_ate.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ate.c,v 1.19 1998/01/05 07:31:08 perry Exp $	*/
+/*	$NetBSD: if_ate.c,v 1.20 1998/01/12 09:43:37 thorpej Exp $	*/
 
 /*
  * All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -245,10 +245,6 @@ struct cfattach fe_ca = {
 	sizeof(struct fe_softc), feprobe, feattach
 };
 
-struct cfdriver fe_cd = {
-	NULL, "fe", DV_IFNET
-};
-
 /* Ethernet constants.  To be defined in if_ehter.h?  FIXME. */
 #define ETHER_MIN_LEN	60	/* with header, without CRC. */
 #define ETHER_MAX_LEN	1514	/* with header, without CRC. */
diff --git a/sys/dev/isa/if_ec.c b/sys/dev/isa/if_ec.c
index b0fba53ce857..5f40c0d9e477 100644
--- a/sys/dev/isa/if_ec.c
+++ b/sys/dev/isa/if_ec.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ec.c,v 1.2 1997/11/02 05:17:32 thorpej Exp $	*/
+/*	$NetBSD: if_ec.c,v 1.3 1998/01/12 09:43:34 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -122,10 +122,6 @@ struct cfattach ec_ca = {
 	sizeof(struct ec_softc), ec_probe, ec_attach
 };
 
-struct cfdriver ec_cd = {
-	NULL, "ec", DV_IFNET
-};
-
 int	ec_set_media __P((struct ec_softc *, int));
 
 int	ec_mediachange __P((struct dp8390_softc *));
diff --git a/sys/dev/isa/if_eg.c b/sys/dev/isa/if_eg.c
index c4e516eed1a6..d2531cdf5fec 100644
--- a/sys/dev/isa/if_eg.c
+++ b/sys/dev/isa/if_eg.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_eg.c,v 1.38 1997/10/19 18:57:04 thorpej Exp $	*/
+/*	$NetBSD: if_eg.c,v 1.39 1998/01/12 09:43:35 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1993 Dean Huxley <dean@fsa.ca>
@@ -130,10 +130,6 @@ struct cfattach eg_ca = {
 	sizeof(struct eg_softc), egprobe, egattach
 };
 
-struct cfdriver eg_cd = {
-	NULL, "eg", DV_IFNET
-};
-
 int egintr __P((void *));
 void eginit __P((struct eg_softc *));
 int egioctl __P((struct ifnet *, u_long, caddr_t));
diff --git a/sys/dev/isa/if_el.c b/sys/dev/isa/if_el.c
index eac56ee1b344..197836ab3331 100644
--- a/sys/dev/isa/if_el.c
+++ b/sys/dev/isa/if_el.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_el.c,v 1.50 1997/11/30 15:31:25 drochner Exp $	*/
+/*	$NetBSD: if_el.c,v 1.51 1998/01/12 09:43:36 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994, Matthew E. Kimmel.  Permission is hereby granted
@@ -117,10 +117,6 @@ struct cfattach el_ca = {
 	sizeof(struct el_softc), elprobe, elattach
 };
 
-struct cfdriver el_cd = {
-	NULL, "el", DV_IFNET
-};
-
 /*
  * Probe routine.
  *
diff --git a/sys/dev/isa/if_fe.c b/sys/dev/isa/if_fe.c
index bcee0474a5bf..45fa384f1e2d 100644
--- a/sys/dev/isa/if_fe.c
+++ b/sys/dev/isa/if_fe.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_fe.c,v 1.19 1998/01/05 07:31:08 perry Exp $	*/
+/*	$NetBSD: if_fe.c,v 1.20 1998/01/12 09:43:37 thorpej Exp $	*/
 
 /*
  * All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -245,10 +245,6 @@ struct cfattach fe_ca = {
 	sizeof(struct fe_softc), feprobe, feattach
 };
 
-struct cfdriver fe_cd = {
-	NULL, "fe", DV_IFNET
-};
-
 /* Ethernet constants.  To be defined in if_ehter.h?  FIXME. */
 #define ETHER_MIN_LEN	60	/* with header, without CRC. */
 #define ETHER_MAX_LEN	1514	/* with header, without CRC. */
diff --git a/sys/dev/isa/if_fmv.c b/sys/dev/isa/if_fmv.c
index 9391af392165..e67eb8467067 100644
--- a/sys/dev/isa/if_fmv.c
+++ b/sys/dev/isa/if_fmv.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_fmv.c,v 1.19 1998/01/05 07:31:08 perry Exp $	*/
+/*	$NetBSD: if_fmv.c,v 1.20 1998/01/12 09:43:37 thorpej Exp $	*/
 
 /*
  * All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -245,10 +245,6 @@ struct cfattach fe_ca = {
 	sizeof(struct fe_softc), feprobe, feattach
 };
 
-struct cfdriver fe_cd = {
-	NULL, "fe", DV_IFNET
-};
-
 /* Ethernet constants.  To be defined in if_ehter.h?  FIXME. */
 #define ETHER_MIN_LEN	60	/* with header, without CRC. */
 #define ETHER_MAX_LEN	1514	/* with header, without CRC. */
diff --git a/sys/dev/isa/if_ie.c b/sys/dev/isa/if_ie.c
index 5a12980d8c5f..7e0783d0abcb 100644
--- a/sys/dev/isa/if_ie.c
+++ b/sys/dev/isa/if_ie.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ie.c,v 1.62 1997/11/21 10:27:45 bouyer Exp $	*/
+/*	$NetBSD: if_ie.c,v 1.63 1998/01/12 09:43:38 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994, 1995 Charles Hannum.
@@ -344,10 +344,6 @@ struct cfattach ie_ca = {
 	sizeof(struct ie_softc), ieprobe, ieattach
 };
 
-struct cfdriver ie_cd = {
-	NULL, "ie", DV_IFNET
-};
-
 #define MK_24(base, ptr) ((caddr_t)((u_long)ptr - (u_long)base))
 #define MK_16(base, ptr) ((u_short)(u_long)MK_24(base, ptr))
 
diff --git a/sys/dev/isa/if_iy.c b/sys/dev/isa/if_iy.c
index 0e67d80ab478..01aaab6e0ea4 100644
--- a/sys/dev/isa/if_iy.c
+++ b/sys/dev/isa/if_iy.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_iy.c,v 1.18 1997/12/02 09:34:06 bouyer Exp $	*/
+/*	$NetBSD: if_iy.c,v 1.19 1998/01/12 09:43:39 thorpej Exp $	*/
 /* #define IYDEBUG */
 /* #define IYMEMDEBUG */
 /*-
@@ -179,10 +179,6 @@ struct cfattach iy_ca = {
 	sizeof(struct iy_softc), iyprobe, iyattach
 };
 
-struct cfdriver iy_cd = {
-	NULL, "iy", DV_IFNET
-};
-
 static u_int8_t eepro_irqmap[] = EEPP_INTMAP;
 static u_int8_t eepro_revirqmap[] = EEPP_RINTMAP;
 
diff --git a/sys/dev/isa/if_we.c b/sys/dev/isa/if_we.c
index d10e93cbcc14..f803fe575726 100644
--- a/sys/dev/isa/if_we.c
+++ b/sys/dev/isa/if_we.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_we.c,v 1.2 1997/11/08 06:13:53 thorpej Exp $	*/
+/*	$NetBSD: if_we.c,v 1.3 1998/01/12 09:43:40 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -131,9 +131,7 @@ struct cfattach we_ca = {
 	sizeof(struct we_softc), we_probe, we_attach
 };
 
-struct cfdriver we_cd = {
-	NULL, "we", DV_IFNET
-};
+extern struct cfdriver wd_cd;
 
 const char *we_params __P((bus_space_tag_t, bus_space_handle_t, u_int8_t *,
 	    bus_size_t *, int *, int *));
diff --git a/sys/dev/isa/isa.c b/sys/dev/isa/isa.c
index 60501e706774..015c47998086 100644
--- a/sys/dev/isa/isa.c
+++ b/sys/dev/isa/isa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: isa.c,v 1.97 1997/08/26 19:27:22 augustss Exp $	*/
+/*	$NetBSD: isa.c,v 1.98 1998/01/12 09:43:41 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994 Charles Hannum.  All rights reserved.
@@ -54,14 +54,6 @@ struct cfattach isa_ca = {
 	sizeof(struct isa_softc), isamatch, isaattach
 };
 
-struct cfdriver isa_cd = {
-#ifdef __BROKEN_INDIRECT_CONFIG
-	NULL, "isa", DV_DULL, 1
-#else
-	NULL, "isa", DV_DULL
-#endif
-};
-
 #ifdef __BROKEN_INDIRECT_CONFIG
 void	isascan __P((struct device *, void *));
 #else
@@ -103,6 +95,12 @@ isaattach(parent, self, aux)
 	struct isa_softc *sc = (struct isa_softc *)self;
 	struct isabus_attach_args *iba = aux;
 
+#ifdef __BROKEN_INDIRECT_CONFIG
+	extern struct cfdriver isa_cd;
+
+	isa_cd.cd_indirect = 1;
+#endif
+
 	isa_attach_hook(parent, self, iba);
 	printf("\n");
 
diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c
index ec0570fedf81..5cb4f305176b 100644
--- a/sys/dev/isa/mcd.c
+++ b/sys/dev/isa/mcd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mcd.c,v 1.58 1997/11/11 22:43:51 fvdl Exp $	*/
+/*	$NetBSD: mcd.c,v 1.59 1998/01/12 09:43:42 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -185,9 +185,7 @@ struct cfattach mcd_ca = {
 	sizeof(struct mcd_softc), mcdprobe, mcdattach
 };
 
-struct cfdriver mcd_cd = {
-	NULL, "mcd", DV_DISK
-};
+extern struct cfdriver mcd_cd;
 
 void	mcdgetdefaultlabel __P((struct mcd_softc *, struct disklabel *));
 void	mcdgetdisklabel __P((struct mcd_softc *));
diff --git a/sys/dev/isa/pas.c b/sys/dev/isa/pas.c
index 13ec896bde83..34d66f54ee37 100644
--- a/sys/dev/isa/pas.c
+++ b/sys/dev/isa/pas.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pas.c,v 1.36 1997/10/19 07:42:30 augustss Exp $	*/
+/*	$NetBSD: pas.c,v 1.37 1998/01/12 09:43:43 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1991-1993 Regents of the University of California.
@@ -242,10 +242,6 @@ struct cfattach pas_ca = {
 	sizeof(struct pas_softc), pasprobe, pasattach
 };
 
-struct cfdriver pas_cd = {
-	NULL, "pas", DV_DULL
-};
-
 /*
  * Probe / attach routines.
  */
diff --git a/sys/dev/isa/pss.c b/sys/dev/isa/pss.c
index df82fc07c4bd..a71fbe17bc44 100644
--- a/sys/dev/isa/pss.c
+++ b/sys/dev/isa/pss.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pss.c,v 1.37 1997/10/19 07:42:32 augustss Exp $	*/
+/*	$NetBSD: pss.c,v 1.38 1998/01/12 09:43:44 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994 John Brezak
@@ -265,34 +265,18 @@ struct cfattach pss_ca = {
 	sizeof(struct pss_softc), pssprobe, pssattach
 };
 
-struct cfdriver pss_cd = {
-	NULL, "pss", DV_DULL, 1
-};
-
 struct cfattach sp_ca = {
 	sizeof(struct ad1848_softc), spprobe, spattach
 };
 
-struct cfdriver sp_cd = {
-	NULL, "sp", DV_DULL
-};
-
 #ifdef notyet
 struct cfattach mpu_ca = {
 	sizeof(struct mpu_softc), mpuprobe, mpuattach
 };
 
-struct cfdriver mpu_cd = {
-	NULL, "mpu", DV_DULL
-};
-
 struct cfattach pcd_ca = {
 	sizeof(struct pcd_softc), pcdprobe, pcdattach
 };
-
-struct cfdriver pcd_cd = {
-	NULL, "pcd", DV_DULL
-};
 #endif
 
 struct audio_device pss_device = {
diff --git a/sys/dev/isa/rtfps.c b/sys/dev/isa/rtfps.c
index 650d7c8daaf4..35e8c987f719 100644
--- a/sys/dev/isa/rtfps.c
+++ b/sys/dev/isa/rtfps.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtfps.c,v 1.35 1997/10/20 18:43:19 thorpej Exp $	*/
+/*	$NetBSD: rtfps.c,v 1.36 1998/01/12 09:43:44 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -72,10 +72,6 @@ struct cfattach rtfps_ca = {
 	sizeof(struct rtfps_softc), rtfpsprobe, rtfpsattach
 };
 
-struct cfdriver rtfps_cd = {
-	NULL, "rtfps", DV_TTY
-};
-
 int
 rtfpsprobe(parent, self, aux)
 	struct device *parent;
diff --git a/sys/dev/isa/satlink.c b/sys/dev/isa/satlink.c
index 3d9752ac7662..9eee3db2d09a 100644
--- a/sys/dev/isa/satlink.c
+++ b/sys/dev/isa/satlink.c
@@ -1,4 +1,5 @@
-/*	$NetBSD: satlink.c,v 1.3 1997/10/19 09:05:09 thorpej Exp $	*/
+/*	$NetBSD: satlink.c,v 1.4 1998/01/12 09:43:45 thorpej Exp $	*/
+
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -107,9 +108,7 @@ struct cfattach satlink_ca = {
 	sizeof(struct satlink_softc), satlinkprobe, satlinkattach
 };
 
-struct cfdriver satlink_cd = {
-	NULL, "satlink", DV_DULL
-};
+extern struct cfdriver satlink_cd;
 
 cdev_decl(satlink);
 
diff --git a/sys/dev/isa/sb.c b/sys/dev/isa/sb.c
index 1fe4e383002b..e358b167ab11 100644
--- a/sys/dev/isa/sb.c
+++ b/sys/dev/isa/sb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sb.c,v 1.56 1997/11/12 20:28:42 augustss Exp $	*/
+/*	$NetBSD: sb.c,v 1.57 1998/01/12 09:43:46 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1991-1993 Regents of the University of California.
@@ -57,10 +57,6 @@
 #include <dev/isa/sbvar.h>
 #include <dev/isa/sbdspvar.h>
 
-struct cfdriver sb_cd = {
-	NULL, "sb", DV_DULL
-};
-
 struct audio_device sb_device = {
 	"SoundBlaster",
 	"x",
diff --git a/sys/dev/isa/seagate.c b/sys/dev/isa/seagate.c
index 258e8a58d374..934ebd223882 100644
--- a/sys/dev/isa/seagate.c
+++ b/sys/dev/isa/seagate.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: seagate.c,v 1.24 1998/01/05 07:31:10 perry Exp $	*/
+/*	$NetBSD: seagate.c,v 1.25 1998/01/12 09:43:47 thorpej Exp $	*/
 
 /*
  * ST01/02, Future Domain TMC-885, TMC-950 SCSI driver
@@ -312,9 +312,7 @@ struct cfattach sea_ca = {
 	sizeof(struct sea_softc), seaprobe, seaattach
 };
 
-struct cfdriver sea_cd = {
-	NULL, "sea", DV_DULL
-};
+extern struct cfdriver sea_cd;
 
 #ifdef SEA_DEBUGQUEUE
 void
diff --git a/sys/dev/isa/wd.c b/sys/dev/isa/wd.c
index c58ac2c10629..95ebf45a7323 100644
--- a/sys/dev/isa/wd.c
+++ b/sys/dev/isa/wd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wd.c,v 1.166 1997/10/13 00:47:33 explorer Exp $ */
+/*	$NetBSD: wd.c,v 1.167 1998/01/12 09:43:49 thorpej Exp $ */
 
 /*
  * Copyright (c) 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -98,9 +98,7 @@ struct cfattach wd_ca = {
 	sizeof(struct wd_softc), wdprobe, wdattach
 };
 
-struct cfdriver wd_cd = {
-	NULL, "wd", DV_DISK
-};
+extern struct cfdriver wd_cd;
 
 void	wdgetdefaultlabel __P((struct wd_softc *, struct disklabel *));
 void	wdgetdisklabel	__P((struct wd_softc *));
@@ -128,7 +126,7 @@ wdprobe(parent, match, aux)
 	struct cfdata *cf = match;
 	struct wd_link *d_link = aux;
 	int drive;
-	
+
 	if (d_link == NULL)
 		return 0;
 	if (d_link->type != ATA)
diff --git a/sys/dev/isa/wdc.c b/sys/dev/isa/wdc.c
index c96fbed6209c..b7e500310587 100644
--- a/sys/dev/isa/wdc.c
+++ b/sys/dev/isa/wdc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wdc.c,v 1.10 1998/01/07 08:47:54 mikel Exp $ */
+/*	$NetBSD: wdc.c,v 1.11 1998/01/12 09:43:50 thorpej Exp $ */
 
 /*
  * Copyright (c) 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -93,10 +93,6 @@ struct cfattach wdc_ca = {
 	sizeof(struct wdc_softc), wdcprobe, wdcattach
 };
 
-struct cfdriver wdc_cd = {
-	NULL, "wdc", DV_DULL
-};
-
 void	wdcstart	__P((struct wdc_softc *));
 int		wdcreset	__P((struct wdc_softc *, int));
 #define VERBOSE 1
diff --git a/sys/dev/isa/wds.c b/sys/dev/isa/wds.c
index fa14478698e5..277aace1bb2d 100644
--- a/sys/dev/isa/wds.c
+++ b/sys/dev/isa/wds.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wds.c,v 1.26 1997/11/30 15:24:00 drochner Exp $	*/
+/*	$NetBSD: wds.c,v 1.27 1998/01/12 09:43:52 thorpej Exp $	*/
 
 #undef WDSDIAG
 #ifdef DDB
@@ -230,10 +230,6 @@ struct cfattach wds_ca = {
 	sizeof(struct wds_softc), wdsprobe, wdsattach
 };
 
-struct cfdriver wds_cd = {
-	NULL, "wds", DV_DULL
-};
-
 #define	WDS_ABORT_TIMEOUT	2000	/* time to wait for abort (mSec) */
 
 /* XXX Should put this in a better place. */ 
diff --git a/sys/dev/isa/wss.c b/sys/dev/isa/wss.c
index 8ebb5cc43b90..93193867e9dc 100644
--- a/sys/dev/isa/wss.c
+++ b/sys/dev/isa/wss.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wss.c,v 1.40 1997/11/30 15:24:59 drochner Exp $	*/
+/*	$NetBSD: wss.c,v 1.41 1998/01/12 09:43:52 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994 John Brezak
@@ -195,10 +195,6 @@ struct cfattach wss_ca = {
 	sizeof(struct wss_softc), wssprobe, wssattach
 };
 
-struct cfdriver wss_cd = {
-	NULL, "wss", DV_DULL
-};
-
 /*
  * Probe for the Microsoft Sound System hardware.
  */
diff --git a/sys/dev/isa/wt.c b/sys/dev/isa/wt.c
index cf33d384bf90..ee2f20105b16 100644
--- a/sys/dev/isa/wt.c
+++ b/sys/dev/isa/wt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wt.c,v 1.41 1997/10/20 18:43:22 thorpej Exp $	*/
+/*	$NetBSD: wt.c,v 1.42 1998/01/12 09:43:53 thorpej Exp $	*/
 
 /*
  * Streamer tape driver.
@@ -181,9 +181,7 @@ struct cfattach wt_ca = {
 	sizeof(struct wt_softc), wtprobe, wtattach
 };
 
-struct cfdriver wt_cd = {
-	NULL, "wt", DV_TAPE
-};
+extern struct cfdriver wt_cd;
 
 /*
  * Probe for the presence of the device.
diff --git a/sys/dev/pci/files.pci b/sys/dev/pci/files.pci
index 7200147b561d..ef7020ee2a26 100644
--- a/sys/dev/pci/files.pci
+++ b/sys/dev/pci/files.pci
@@ -1,4 +1,4 @@
-#	$NetBSD: files.pci,v 1.31 1997/10/21 05:54:28 bouyer Exp $
+#	$NetBSD: files.pci,v 1.32 1998/01/12 09:39:57 thorpej Exp $
 #
 # Config file and device description for machine-independent PCI code.
 # Included by ports that need it.  Requires that the SCSI files be
@@ -6,7 +6,7 @@
 
 defopt	PCIVERBOSE
 
-device	pci {[dev = -1], [function = -1]}
+device	pci class dull {[dev = -1], [function = -1]}
 attach	pci at pcibus
 file	dev/pci/pci.c			pci needs-flag
 file	dev/pci/pci_map.c		pci
@@ -29,7 +29,7 @@ attach	isp at pci with isp_pci
 file	dev/pci/isp_pci.c		isp_pci
 
 # Ethernet driver for DC21040-based boards
-device	de: ether, ifnet, arp
+device	de class ifnet: ether, ifnet, arp
 attach	de at pci
 file	dev/pci/if_de.c			de
 
@@ -44,7 +44,7 @@ attach	ep at pci with ep_pci
 file	dev/pci/if_ep_pci.c		ep_pci
 
 # Digital DEFPA PCI FDDI Controller
-device	fpa: pdq, fddi, ifnet, arp
+device	fpa class ifnet: pdq, fddi, ifnet, arp
 attach	fpa at pci
 file	dev/pci/if_fpa.c		fpa
 
@@ -54,12 +54,12 @@ attach	le at pci with le_pci
 file	dev/pci/if_le_pci.c		le_pci
 
 # NCR 53c8xx SCSI chips
-device	ncr: scsi
+device	ncr class dull: scsi
 attach	ncr at pci
 file	dev/pci/ncr.c			ncr
 
 # PCI-PCI bridge chips
-device	ppb: pcibus
+device	ppb class dull: pcibus
 attach	ppb at pci
 file	dev/pci/ppb.c			ppb
 
@@ -68,7 +68,7 @@ attach	cy at pci with cy_pci
 file	dev/pci/cy_pci.c		cy_pci
 
 # Intel EtherExpress PRO 10/100B
-device	fxp: ether, ifnet, arp
+device	fxp class ifnet: ether, ifnet, arp
 attach	fxp at pci 
 file	dev/pci/if_fxp.c		fxp
 
@@ -77,6 +77,6 @@ attach	ne at pci with ne_pci
 file	dev/pci/if_ne_pci.c		ne_pci
 
 # Texas Instruments ThunderLAN Chip.
-device  tl: ether, ifnet, arp, i2c, i2c_eeprom, miibus
+device  tl class ifnet: ether, ifnet, arp, i2c, i2c_eeprom, miibus
 attach  tl at pci
 file    dev/pci/if_tl.c     tl
diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c
index 329a071dc698..e36b5b7b57a0 100644
--- a/sys/dev/pci/if_de.c
+++ b/sys/dev/pci/if_de.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_de.c,v 1.57 1997/10/27 02:10:07 thorpej Exp $	*/
+/*	$NetBSD: if_de.c,v 1.58 1998/01/12 09:39:58 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -5025,10 +5025,6 @@ struct cfattach de_ca = {
     sizeof(tulip_softc_t), tulip_pci_probe, tulip_pci_attach
 };
 
-struct cfdriver de_cd = {
-    0, "de", DV_IFNET
-};
-
 #endif /* __NetBSD__ */
 
 static void
diff --git a/sys/dev/pci/if_fpa.c b/sys/dev/pci/if_fpa.c
index fe2af6a60d6f..790406eb8503 100644
--- a/sys/dev/pci/if_fpa.c
+++ b/sys/dev/pci/if_fpa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_fpa.c,v 1.23 1997/06/09 01:23:20 thorpej Exp $	*/
+/*	$NetBSD: if_fpa.c,v 1.24 1998/01/12 09:40:01 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
@@ -502,8 +502,4 @@ struct cfattach fpa_ca = {
     sizeof(pdq_softc_t), pdq_pci_match, pdq_pci_attach
 };
 
-struct cfdriver fpa_cd = {
-    0, "fpa", DV_IFNET
-};
-
 #endif /* __NetBSD__ */
diff --git a/sys/dev/pci/if_fxp.c b/sys/dev/pci/if_fxp.c
index 568ddd8af630..c5832ba5482f 100644
--- a/sys/dev/pci/if_fxp.c
+++ b/sys/dev/pci/if_fxp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_fxp.c,v 1.6 1997/11/11 06:35:46 thorpej Exp $	*/
+/*	$NetBSD: if_fxp.c,v 1.7 1998/01/12 09:40:03 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1995, David Greenman
@@ -295,10 +295,6 @@ struct cfattach fxp_ca = {
 	sizeof(struct fxp_softc), fxp_match, fxp_attach
 };
 
-struct cfdriver fxp_cd = {
-	NULL, "fxp", DV_IFNET
-};
-
 /*
  * Check if a device is an 82557.
  */
diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c
index f85e11339f88..97923287c6c7 100644
--- a/sys/dev/pci/if_tl.c
+++ b/sys/dev/pci/if_tl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_tl.c,v 1.7 1997/11/30 15:18:58 drochner Exp $	*/
+/*	$NetBSD: if_tl.c,v 1.8 1998/01/12 09:40:04 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1997 Manuel Bouyer.  All rights reserved.
@@ -234,10 +234,6 @@ struct cfattach tl_ca = {
 	sizeof(tl_softc_t), tl_pci_match, tl_pci_attach
 };
 
-struct cfdriver tl_cd = {
-	0, "tl", DV_IFNET
-};
-
 struct tl_product_desc {
 	u_int32_t tp_product;
 	u_int32_t tp_adapter;
diff --git a/sys/dev/pci/ncr.c b/sys/dev/pci/ncr.c
index 9cd65de7a6d9..cf2dc7fa06f6 100644
--- a/sys/dev/pci/ncr.c
+++ b/sys/dev/pci/ncr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ncr.c,v 1.63 1997/09/23 02:39:15 perry Exp $	*/
+/*	$NetBSD: ncr.c,v 1.64 1998/01/12 09:40:07 thorpej Exp $	*/
 
 /**************************************************************************
 **
@@ -1440,7 +1440,7 @@ static	void	ncr_attach	(pcici_t tag, int unit);
 
 #if 0
 static char ident[] =
-	"\n$NetBSD: ncr.c,v 1.63 1997/09/23 02:39:15 perry Exp $\n";
+	"\n$NetBSD: ncr.c,v 1.64 1998/01/12 09:40:07 thorpej Exp $\n";
 #endif
 
 static const u_long	ncr_version = NCR_VERSION	* 11
@@ -1489,10 +1489,6 @@ struct	cfattach ncr_ca = {
 	sizeof(struct ncb), ncr_probe, ncr_attach
 };
 
-struct	cfdriver ncr_cd = {
-	NULL, "ncr", DV_DULL
-};
-
 #else /* !__NetBSD__ */
 
 static u_long ncr_count;
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index f31418e13146..f69d62542cb3 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci.c,v 1.29 1997/08/30 06:53:57 mycroft Exp $	*/
+/*	$NetBSD: pci.c,v 1.30 1998/01/12 09:40:11 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996, 1997
@@ -53,10 +53,6 @@ struct cfattach pci_ca = {
 	sizeof(struct device), pcimatch, pciattach
 };
 
-struct cfdriver pci_cd = {
-	NULL, "pci", DV_DULL
-};
-
 int	pciprint __P((void *, const char *));
 #ifdef __BROKEN_INDIRECT_CONFIG
 int	pcisubmatch __P((struct device *, void *, void *));
diff --git a/sys/dev/pci/ppb.c b/sys/dev/pci/ppb.c
index 40ab1cb740ac..abf8f053fcd0 100644
--- a/sys/dev/pci/ppb.c
+++ b/sys/dev/pci/ppb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ppb.c,v 1.15 1997/08/30 06:53:58 mycroft Exp $	*/
+/*	$NetBSD: ppb.c,v 1.16 1998/01/12 09:40:12 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -60,10 +60,6 @@ struct cfattach ppb_ca = {
 	sizeof(struct device), ppbmatch, ppbattach
 };
 
-struct cfdriver ppb_cd = {
-	NULL, "ppb", DV_DULL
-};
-
 int	ppbprint __P((void *, const char *pnp));
 
 int