Clean the device configuration settings, and comment out unsupported

hardware for now.

2 files changed, 41 insertions, 75 deletions

diff --git a/sys/arch/mvmeppc/conf/files.mvmeppc b/sys/arch/mvmeppc/conf/files.mvmeppc
index 8353db357cf..d5aabe14016 100644
--- a/sys/arch/mvmeppc/conf/files.mvmeppc
+++ b/sys/arch/mvmeppc/conf/files.mvmeppc
@@ -1,7 +1,7 @@
-#	$OpenBSD: files.mvmeppc,v 1.6 2002/06/08 16:02:13 miod Exp $
+#	$OpenBSD: files.mvmeppc,v 1.7 2004/01/23 10:41:06 miod Exp $
 
 #
-# powerpc-specific configuration info
+# mvmeppc-specific configuration info
 #
 maxpartitions 16
 
@@ -23,11 +23,6 @@ file	arch/mvmeppc/mvmeppc/bus_space.c
 file	arch/mvmeppc/mvmeppc/bus_dma.c
 file	arch/mvmeppc/mvmeppc/ppc1_machdep.c
 
-#
-# Media Independent Interface (mii)
-#
-include "../../../dev/mii/files.mii"
-
 define	mainbus {}
 device	mainbus
 attach	mainbus at root
@@ -45,20 +40,28 @@ device	openpic
 attach	openpic at raven
 file	arch/mvmeppc/dev/openpic.c
 
-major   {rd = 17}
+# Various things that need to be included early...
+
+# Media Independent Interface (mii)
+include "../../../dev/mii/files.mii"
 
 # I2O
 include "../../../dev/i2o/files.i2o"
 
+#
+# ISA Bus support
+#
+
+include "dev/isa/files.isa"
+include "dev/isa/files.isapnp"
+
+file	arch/mvmeppc/isa/isa_machdep.c		isa
+
+#
 # PCI bus support
-# XXX Dummy bus needed for some multi-homed devices specified in files.isa
-define	pcmcia {}
-include "dev/pci/files.pci"	# XXX some ISA devs are 'at pci' too.
+#
 
-# Ethernet driver for DC21140A-based SBCs
-device	vde: ether, ifnet, ifmedia
-attach	vde at pci
-file	arch/mvmeppc/pci/if_vde.c		vde
+include "dev/pci/files.pci"
 
 device	mpcpcibr {} : pcibus
 attach	mpcpcibr at raven
@@ -69,47 +72,31 @@ device	pchb:	pcibus
 attach	pchb at pci
 file	arch/mvmeppc/pci/pchb.c			pchb
 
-#
-# ISA Bus devices
-#
-include "dev/isa/files.isa"
-include "dev/isa/files.isapnp"
-file	arch/mvmeppc/isa/isa_machdep.c		isa
-
 # PCI-ISA bridge chipsets
 device	pcib:	isabus
 attach	pcib at pci
 file	arch/mvmeppc/pci/pcib.c			pcib
 
-include "dev/pckbc/files.pckbc"
-
-major	{sd = 2}		# hey this was 0 but at slot 2 in bdevsw XXX
-major	{cd = 3}
-include "../../../scsi/files.scsi"
-
 #
-# "workstation console" routines
+# Input Devices (not yet)
 #
 
+#include "dev/pckbc/files.pckbc"
 #include "dev/wscons/files.wscons"
 
-# Machine-independent ATAPI drivers
-
-include "../../../dev/atapiscsi/files.atapiscsi"
-include "../../../dev/ata/files.ata"
-
-# MAC periph ??? XXX smurph
-
-#device zsc {channel = -1}
-#attach zsc at obio
-#file arch/powerpc/mac/zs.c			zsc needs-flag
-#file dev/ic/z8530sc.c				zsc
+#
+# Block Devices
+#
 
-#device zstty: tty
-#attach zstty at zsc
-#file dev/ic/z8530tty.c				zstty needs-flag
+include "../../../scsi/files.scsi"
+#include "../../../dev/atapiscsi/files.atapiscsi"
+#include "../../../dev/ata/files.ata"
 
 device bugtty: tty
 attach bugtty at mainbus
 file arch/mvmeppc/dev/bugtty.c			bugtty needs-flag
 
+#major	{wd = 0}
+major	{sd = 2}
+major	{cd = 3}
+major   {rd = 17}
diff --git a/sys/arch/mvmeppc/mvmeppc/conf.c b/sys/arch/mvmeppc/mvmeppc/conf.c
index ec9a7b65c53..d429d0bd6af 100644
--- a/sys/arch/mvmeppc/mvmeppc/conf.c
+++ b/sys/arch/mvmeppc/mvmeppc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.15 2003/05/14 00:20:37 tedu Exp $ */
+/*	$OpenBSD: conf.c,v 1.16 2004/01/23 10:41:07 miod Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -41,7 +41,11 @@
 
 #include <machine/conf.h>
 
+#if 0
 #include "wd.h"
+#else
+#define	NWD 0
+#endif
 bdev_decl(wd);
 #include "sd.h"
 #include "cd.h"
@@ -85,16 +89,10 @@ int nblkdev = sizeof bdevsw / sizeof bdevsw[0];
 #include "bugtty.h"
 cdev_decl(bugtty);
 
-cdev_decl(kbd);
-cdev_decl(ms);
-
-#include <sd.h>
-#include <st.h>
-#include <cd.h>
-#include <uk.h>
-#include <ss.h>
+#include "st.h"
+#include "uk.h"
+#include "ss.h"
 
-#include <wd.h>
 cdev_decl(wd);
 
 #include "bpfilter.h"
@@ -140,8 +138,8 @@ struct cdevsw cdevsw[] = {
 	cdev_tty_init(NBUGTTY,bugtty),  /* 14: BUGtty (ttyB) */
         cdev_notdef(),                  /* 15 */
         cdev_notdef(),                  /* 16 */
-	cdev_disk_init(NRD,rd),		/* 17 ram disk driver*/
-	cdev_disk_init(NCCD,ccd),	/* 18 concatenated disk driver */
+	cdev_disk_init(NRD,rd),		/* 17: ram disk driver*/
+	cdev_disk_init(NCCD,ccd),	/* 18: concatenated disk driver */
         cdev_disk_init(NVND,vnd),       /* 19: vnode disk */
         cdev_tape_init(NST,st),         /* 20: SCSI tape */
         cdev_fd_init(1,filedesc),       /* 21: file descriptor pseudo-dev */
@@ -173,7 +171,7 @@ struct cdevsw cdevsw[] = {
         cdev_notdef(),                  /* 47 */
         cdev_notdef(),                  /* 48 */
         cdev_notdef(),                  /* 49 */ 
-        cdev_systrace_init(NSYSTRACE,systrace),	/* 50 system call tracing */ 
+        cdev_systrace_init(NSYSTRACE,systrace),	/* 50: system call tracing */ 
 #ifdef XFS
 	cdev_xfs_init(NXFS,xfs_dev),	/* 51: xfs communication device */
 #else
@@ -182,25 +180,6 @@ struct cdevsw cdevsw[] = {
         cdev_notdef(),                  /* 52 */ 
         cdev_notdef(),                  /* 53 */ 
 	cdev_disk_init(NRAID,raid),	/* 54: RAIDframe disk driver */
-        cdev_notdef(),                  /* 55 */ 
-	/* The following slots are reserved for isdn4bsd. */
-	cdev_notdef(),			/* 56: i4b main device */
-	cdev_notdef(),			/* 57: i4b control device */
-	cdev_notdef(),			/* 58: i4b raw b-channel access */
-	cdev_notdef(),			/* 59: i4b trace device */
-	cdev_notdef(),			/* 60: i4b phone device */
-	/* End of reserved slots for isdn4bsd. */
-	cdev_notdef(),			/* 60: i4b phone device */
-	cdev_notdef(),			/* 61: i4b phone device */
-	cdev_notdef(),			/* 62: i4b phone device */
-	cdev_notdef(),			/* 63: i4b phone device */
-	cdev_notdef(),			/* 64: i4b phone device */
-	cdev_notdef(),			/* 65: i4b phone device */
-	cdev_notdef(),			/* 66: i4b phone device */
-	cdev_notdef(),			/* 67: i4b phone device */
-	cdev_notdef(),			/* 68: i4b phone device */
-	cdev_notdef(),			/* 69: i4b phone device */
-	cdev_notdef(),			/* 70: i4b phone device */
 };
 int nchrdev = sizeof cdevsw / sizeof cdevsw[0];