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

---
 sys/dev/ofw/files.ofw | 14 +++++++-------
 sys/dev/ofw/ofbus.c   | 10 +---------
 sys/dev/ofw/ofcons.c  |  6 ++----
 sys/dev/ofw/ofdisk.c  |  6 ++----
 sys/dev/ofw/ofnet.c   |  6 +-----
 sys/dev/ofw/ofrtc.c   |  6 ++----
 6 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/sys/dev/ofw/files.ofw b/sys/dev/ofw/files.ofw
index 843e24744a7a..7cb98866e588 100644
--- a/sys/dev/ofw/files.ofw
+++ b/sys/dev/ofw/files.ofw
@@ -1,4 +1,4 @@
-#	$NetBSD: files.ofw,v 1.4 1997/07/23 18:45:03 thorpej Exp $
+#	$NetBSD: files.ofw,v 1.5 1998/01/12 09:33:30 thorpej Exp $
 #
 # First cut on Openfirmware interface
 #
@@ -6,32 +6,32 @@
 define	openfirm {}
 
 # Generic disk support
-device	ofdisk: disk
+device	ofdisk class disk: disk
 attach	ofdisk at openfirm
 file	dev/ofw/ofdisk.c		ofdisk needs-flag
 
 # Generic net support
 define	ipkdbofn { [ disable = 0 ] }
-device	ofnet: ether, ifnet, ipkdbofn, arp
+device	ofnet class ifnet: ether, ifnet, ipkdbofn, arp
 attach	ofnet at openfirm
 file	dev/ofw/ofnet.c			ofnet | ipkdb_ofn needs-flag
 attach	ipkdbif at ipkdbofn with ipkdb_ofn
 
 # Generic console support
-device	ofcons: tty
+device	ofcons class tty: tty
 attach	ofcons at openfirm
 file	dev/ofw/ofcons.c		ofcons needs-flag
 
 # Generic RTC support
-device ofrtc
+device ofrtc class dull
 attach	ofrtc at openfirm
 file	dev/ofw/ofrtc.c			ofrtc needs-flag
 
 # Generic bus support
-device	ofbus: openfirm
+device	ofbus class dull: openfirm
 attach	ofbus at openfirm
 file	dev/ofw/ofbus.c			openfirm
 
-device	ofroot: openfirm
+device	ofroot class dull: openfirm
 attach	ofroot at root
 
diff --git a/sys/dev/ofw/ofbus.c b/sys/dev/ofw/ofbus.c
index 4752e6e20336..ecabfddb1020 100644
--- a/sys/dev/ofw/ofbus.c
+++ b/sys/dev/ofw/ofbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ofbus.c,v 1.4 1997/04/16 23:32:04 thorpej Exp $	*/
+/*	$NetBSD: ofbus.c,v 1.5 1998/01/12 09:33:31 thorpej Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -44,18 +44,10 @@ struct cfattach ofbus_ca = {
 	sizeof(struct device), ofbprobe, ofbattach
 };
 
-struct cfdriver ofbus_cd = {
-	NULL, "ofbus", DV_DULL
-};
-
 struct cfattach ofroot_ca = {
 	sizeof(struct device), ofbprobe, ofbattach
 };
  
-struct cfdriver ofroot_cd = {
-	NULL, "ofroot", DV_DULL
-};
-
 static int
 ofbprint(aux, name)
 	void *aux;
diff --git a/sys/dev/ofw/ofcons.c b/sys/dev/ofw/ofcons.c
index 5f81e43a8deb..915d6c9b0e04 100644
--- a/sys/dev/ofw/ofcons.c
+++ b/sys/dev/ofw/ofcons.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ofcons.c,v 1.5 1997/04/28 18:33:57 mycroft Exp $	*/
+/*	$NetBSD: ofcons.c,v 1.6 1998/01/12 09:33:32 thorpej Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -61,9 +61,7 @@ struct cfattach ofcons_ca = {
 	sizeof(struct ofc_softc), ofcmatch, ofcattach
 };
 
-struct cfdriver ofcons_cd = {
-	NULL, "ofcons", DV_TTY
-};
+extern struct cfdriver ofcons_cd;
 
 static int ofcprobe __P((void));
 
diff --git a/sys/dev/ofw/ofdisk.c b/sys/dev/ofw/ofdisk.c
index 595b357fe67d..8fa5846959ed 100644
--- a/sys/dev/ofw/ofdisk.c
+++ b/sys/dev/ofw/ofdisk.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ofdisk.c,v 1.8 1997/10/08 23:35:41 thorpej Exp $	*/
+/*	$NetBSD: ofdisk.c,v 1.9 1998/01/12 09:33:32 thorpej Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -65,9 +65,7 @@ struct cfattach ofdisk_ca = {
 	sizeof(struct ofd_softc), ofdprobe, ofdattach
 };
 
-struct cfdriver ofdisk_cd = {
-	NULL, "ofdisk", DV_DISK
-};
+extern struct cfdriver ofdisk_cd;
 
 void ofdstrategy __P((struct buf *));
 
diff --git a/sys/dev/ofw/ofnet.c b/sys/dev/ofw/ofnet.c
index ba2dc04ebc44..4574b6a21d42 100644
--- a/sys/dev/ofw/ofnet.c
+++ b/sys/dev/ofw/ofnet.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ofnet.c,v 1.9 1997/04/28 18:32:58 mycroft Exp $	*/
+/*	$NetBSD: ofnet.c,v 1.10 1998/01/12 09:33:33 thorpej Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -83,10 +83,6 @@ struct cfattach ofnet_ca = {
 	sizeof(struct ofn_softc), ofnprobe, ofnattach
 };
 
-struct cfdriver ofnet_cd = {
-	NULL, "ofnet", DV_IFNET
-};
-
 static void ofnread __P((struct ofn_softc *));
 static void ofntimer __P((struct ofn_softc *));
 static void ofninit __P((struct ofn_softc *));
diff --git a/sys/dev/ofw/ofrtc.c b/sys/dev/ofw/ofrtc.c
index d7d5f0a7cb8b..1a8bab47ddd6 100644
--- a/sys/dev/ofw/ofrtc.c
+++ b/sys/dev/ofw/ofrtc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ofrtc.c,v 1.4 1997/04/16 23:41:53 thorpej Exp $	*/
+/*	$NetBSD: ofrtc.c,v 1.5 1998/01/12 09:33:34 thorpej Exp $	*/
 
 /*
  * Copyright (C) 1996 Wolfgang Solfrank.
@@ -49,9 +49,7 @@ struct cfattach ofrtc_ca = {
 	sizeof(struct ofrtc_softc), ofrtcprobe, ofrtcattach
 };
 
-struct cfdriver ofrtc_cd = {
-	NULL, "ofrtc", DV_DULL
-};
+extern struct cfdriver ofrtc_cd;
 
 static int
 ofrtcprobe(parent, match, aux)