[src/trunk]: src/sys/arch back out my change powerpc/conf/files.ofw. Enable ...

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

details:   https://anonhg.NetBSD.org/src/rev/0de240fb82b2
branches:  trunk
changeset: 499251:0de240fb82b2
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Nov 15 00:39:31 2000 +0000

description:
back out my change powerpc/conf/files.ofw.  Enable the inclusion of
dev/ofw/files.ofw on macppc.  Add openfirm to ofppc/conf.c

diffstat:

 sys/arch/macppc/conf/files.macppc |  6 +++---
 sys/arch/ofppc/ofppc/conf.c       |  6 +++++-
 sys/arch/powerpc/conf/files.ofw   |  4 +---
 3 files changed, 9 insertions(+), 7 deletions(-)

diffs (69 lines):

diff -r 58f5f207d856 -r 0de240fb82b2 sys/arch/macppc/conf/files.macppc
--- a/sys/arch/macppc/conf/files.macppc Wed Nov 15 00:10:59 2000 +0000
+++ b/sys/arch/macppc/conf/files.macppc Wed Nov 15 00:39:31 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.macppc,v 1.36 2000/11/10 17:09:15 hannken Exp $
+#      $NetBSD: files.macppc,v 1.37 2000/11/15 00:39:32 matt Exp $
 #
 # macppc-specific configuration info
 
@@ -48,8 +48,8 @@
 #
 # Generic OpenFirmware device support
 #
-#include "dev/ofw/files.ofw"
-#major {ofdisk = 0}
+include "dev/ofw/files.ofw"
+major {ofdisk = 0}
 
 #
 # Machine-independent I2O drivers
diff -r 58f5f207d856 -r 0de240fb82b2 sys/arch/ofppc/ofppc/conf.c
--- a/sys/arch/ofppc/ofppc/conf.c       Wed Nov 15 00:10:59 2000 +0000
+++ b/sys/arch/ofppc/ofppc/conf.c       Wed Nov 15 00:39:31 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: conf.c,v 1.7 1998/11/13 04:47:07 oster Exp $   */
+/*     $NetBSD: conf.c,v 1.8 2000/11/15 00:39:31 matt Exp $    */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -74,6 +74,8 @@
 #include "bpfilter.h"
 cdev_decl(bpf);
 #include "rnd.h"
+#include "openfirm.h"
+cdev_decl(openfirm);
 
 cdev_decl(raid);
 
@@ -97,6 +99,7 @@
        cdev_bpftun_init(NBPFILTER,bpf),/* 10: Berkeley packet filter */
        cdev_rnd_init(NRND,rnd),        /* 11: random source pseudo-device */
        cdev_disk_init(NRAID,raid),     /* 12: RAIDframe disk driver */
+       cdev_openfirm_init(NOPENFIRM,openfirm),/* 13: OpenFirmware pseudo-device */
 };
 int nchrdev = sizeof cdevsw / sizeof cdevsw[0];
 
@@ -143,6 +146,7 @@
        /* 10 */        NODEV,
        /* 11 */        NODEV,
        /* 12 */        3,
+       /* 13 */        NODEV,
 };
 
 /*
diff -r 58f5f207d856 -r 0de240fb82b2 sys/arch/powerpc/conf/files.ofw
--- a/sys/arch/powerpc/conf/files.ofw   Wed Nov 15 00:10:59 2000 +0000
+++ b/sys/arch/powerpc/conf/files.ofw   Wed Nov 15 00:39:31 2000 +0000
@@ -1,10 +1,8 @@
-#      $NetBSD: files.ofw,v 1.4 2000/11/14 21:22:43 matt Exp $
+#      $NetBSD: files.ofw,v 1.5 2000/11/15 00:39:32 matt Exp $
 
 file   arch/powerpc/powerpc/ofw_machdep.c
 file   arch/powerpc/powerpc/ofwmagic.S
 file   arch/powerpc/powerpc/openfirm.c
-defpseudo openfirm
-file   dev/ofw/openfirmio.c                    openfirm needs-flag
 
 # Firmworks OpenFirmware Bug Workarounds
 file   arch/powerpc/powerpc/ofwreal.S          firmworksbugs