o xfs is in the house (thanks art, for getting me started)

o all but vax are major 51

17 files changed, 325 insertions, 15 deletions

diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c
index 09baf9f7af1..85c624258e0 100644
--- a/sys/arch/alpha/alpha/conf.c
+++ b/sys/arch/alpha/alpha/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.17 1998/08/24 05:29:46 millert Exp $	*/
+/*	$OpenBSD: conf.c,v 1.18 1998/09/25 09:20:52 todd Exp $	*/
 /*	$NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $	*/
 
 /*-
@@ -124,6 +124,10 @@ cdev_decl(wd);
 cdev_decl(acd);
 #include "cy.h"
 cdev_decl(cy);
+#ifdef XFS
+#include <xfs/nxfs.h>
+cdev_decl(xfs_dev);
+#endif
 #include "ksyms.h"
 cdev_decl(ksyms);
 
@@ -169,6 +173,22 @@ struct cdevsw	cdevsw[] =
 	cdev_disk_init(NACD,acd),	/* 37: ATAPI CD-ROM */
         cdev_tty_init(NCY,cy),          /* 38: Cyclom serial port */
 	cdev_ksyms_init(NKSYMS,ksyms),	/* 39: Kernel symbols device */
+	cdev_notdef(),			/* 40 */
+	cdev_notdef(),			/* 41 */
+	cdev_notdef(),			/* 42 */
+	cdev_notdef(),			/* 43 */
+	cdev_notdef(),			/* 44 */
+	cdev_notdef(),			/* 45 */
+	cdev_notdef(),			/* 46 */
+	cdev_notdef(),			/* 47 */
+	cdev_notdef(),			/* 48 */
+	cdev_notdef(),			/* 49 */
+	cdev_notdef(),			/* 50 */
+#ifdef XFS
+	cdev_xfs_init(NXFS,xfs_dev),	/* 51: xfs communication device */
+#else
+	cdev_notdef(),			/* 51 */
+#endif
 };
 int	nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]);
 
diff --git a/sys/arch/amiga/amiga/conf.c b/sys/arch/amiga/amiga/conf.c
index a04998c3819..925522aede9 100644
--- a/sys/arch/amiga/amiga/conf.c
+++ b/sys/arch/amiga/amiga/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.24 1998/08/24 05:30:06 millert Exp $	*/
+/*	$OpenBSD: conf.c,v 1.25 1998/09/25 09:20:52 todd Exp $	*/
 /*	$NetBSD: conf.c,v 1.42 1997/01/07 11:35:03 mrg Exp $	*/
 
 /*-
@@ -62,6 +62,10 @@
 #include "acd.h"
 #include "rd.h"
 #include "ch.h"
+#ifdef XFS
+#include <xfs/nxfs.h>
+cdev_decl(xfs_dev);
+#endif
 #include "ksyms.h"
 
 struct bdevsw	bdevsw[] =
@@ -150,6 +154,20 @@ struct cdevsw	cdevsw[] =
 	cdev_ch_init(NCH,ch),		/* 40: SCSI autochanger */
 	cdev_disk_init(NRD,rd),		/* 41: RAM disk */
 	cdev_ksyms_init(NKSYMS,ksyms),	/* 42: Kernel symbols device */
+	cdev_notdef(),			/* 43 */
+	cdev_notdef(),			/* 44 */
+	cdev_notdef(),			/* 45 */
+	cdev_notdef(),			/* 46 */
+	cdev_notdef(),			/* 46 */
+	cdev_notdef(),			/* 47 */
+	cdev_notdef(),			/* 48 */
+	cdev_notdef(),			/* 49 */
+	cdev_notdef(),			/* 50 */
+#ifdef XFS
+	cdev_xfs_init(NXFS,xfs_dev),	/* 51: xfs communication device */
+#else
+	cdev_notdef(),			/* 51 */
+#endif
 };
 int	nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
 
diff --git a/sys/arch/arc/arc/conf.c b/sys/arch/arc/arc/conf.c
index 99c744d5d37..7d8f0348eba 100644
--- a/sys/arch/arc/arc/conf.c
+++ b/sys/arch/arc/arc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.24 1998/08/29 11:14:08 niklas Exp $ */
+/*	$OpenBSD: conf.c,v 1.25 1998/09/25 09:20:52 todd Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)conf.c	8.2 (Berkeley) 11/14/93
- *      $Id: conf.c,v 1.24 1998/08/29 11:14:08 niklas Exp $
+ *      $Id: conf.c,v 1.25 1998/09/25 09:20:52 todd Exp $
  */
 
 #include <sys/param.h>
@@ -163,6 +163,10 @@ cdev_decl(wd);
 cdev_decl(acd);
 #include "joy.h"
 cdev_decl(joy);
+#ifdef XFS
+#include <xfs/nxfs.h>
+cdev_decl(xfs_dev);
+#endif
 #include "ksyms.h"
 cdev_decl(ksyms);
 
@@ -211,6 +215,25 @@ struct cdevsw	cdevsw[] =
 	cdev_ss_init(NSS,ss),		/* 34: SCSI scanner */
 	cdev_kyms_init(NKSYMS,ksyms),	/* 35: Kernel symbols device */
 	cdev_ch_init(NCH,ch),		/* 36: SCSI autochanger */
+	cdev_notdef(),			/* 37: */
+	cdev_notdef(),			/* 38: */
+	cdev_notdef(),			/* 39: */
+	cdev_notdef(),			/* 40: */
+	cdev_notdef(),			/* 41: */
+	cdev_notdef(),			/* 42: */
+	cdev_notdef(),			/* 33: */
+	cdev_notdef(),			/* 44: */
+	cdev_notdef(),			/* 45: */
+	cdev_notdef(),			/* 46: */
+	cdev_notdef(),			/* 47: */
+	cdev_notdef(),			/* 48: */
+	cdev_notdef(),			/* 49: */
+	cdev_notdef(),			/* 50: */
+#ifdef XFS
+	cdev_xfs_init(NXFS,xfs_dev),	/* 51: xfs communication device */
+#else
+	cdev_notdef(),			/* 51: */
+#endif
 };
 
 int	nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]);
diff --git a/sys/arch/arm32/arm32/conf.c b/sys/arch/arm32/arm32/conf.c
index 4c7959ad525..a6ad96a5f28 100644
--- a/sys/arch/arm32/arm32/conf.c
+++ b/sys/arch/arm32/arm32/conf.c
@@ -248,6 +248,10 @@ cdev_decl(rtc);
 cdev_decl(random);
 /* Temporary hack for ATAPI CDROM */
 cdev_decl(wcd);
+#ifdef XFS
+#include <xfs/nxfs.h>
+cdev_decl(xfs_dev);
+#endif
 
 /* Character devices */
 
@@ -297,6 +301,17 @@ struct cdevsw cdevsw[] = {
 	cdev_iic_init(NIIC, iic),	/* 42: IIC bus driver */
 	cdev_rtc_init(NRTC, rtc),	/* 43: RTC driver */
 	cdev_random_init(1, random),	/* 44: random data source */
+	cdev_notdef(),			/* 45: */
+	cdev_notdef(),			/* 46: */
+	cdev_notdef(),			/* 47: */
+	cdev_notdef(),			/* 48: */
+	cdev_notdef(),			/* 49: */
+	cdev_notdef(),			/* 50: */
+#ifdef XFS
+	cdev_xfs_init(NXFS,xfs_dev),	/* 51: xfs communication device */
+#else
+	cdev_lkm_dummy(),		/* 51: */
+#endif
 };
 
 int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
diff --git a/sys/arch/atari/atari/conf.c b/sys/arch/atari/atari/conf.c
index a04ce8240ba..f7f892ee11b 100644
--- a/sys/arch/atari/atari/conf.c
+++ b/sys/arch/atari/atari/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.12 1998/07/07 06:56:00 deraadt Exp $	*/
+/*	$OpenBSD: conf.c,v 1.13 1998/09/25 09:20:52 todd Exp $	*/
 
 /*
  * Copyright (c) 1991 The Regents of the University of California.
@@ -127,6 +127,10 @@ cdev_decl(fd);
 dev_decl(fd,open);
 #include "bpfilter.h"
 #include "tun.h"
+#ifdef XFS
+#include <xfs/nxfs.h>
+cdev_dec(xfs_dev);
+#endif
 
 #ifdef IPFILTER
 #define NIPF 1
@@ -171,6 +175,29 @@ struct cdevsw	cdevsw[] =
 	cdev_random_init(1,random),	/* 30: random data source */
 	cdev_uk_init(NUK,uk),		/* 31: unknown SCSI */
 	cdev_ss_init(NSS,ss),           /* 32: SCSI scanner */
+	cdev_notdef(),			/* 33 */
+	cdev_notdef(),			/* 34 */
+	cdev_notdef(),			/* 35 */
+	cdev_notdef(),			/* 36 */
+	cdev_notdef(),			/* 37 */
+	cdev_notdef(),			/* 38 */
+	cdev_notdef(),			/* 39 */
+	cdev_notdef(),			/* 40 */
+	cdev_notdef(),			/* 41 */
+	cdev_notdef(),			/* 42 */
+	cdev_notdef(),			/* 43 */
+	cdev_notdef(),			/* 44 */
+	cdev_notdef(),			/* 45 */
+	cdev_notdef(),			/* 46 */
+	cdev_notdef(),			/* 47 */
+	cdev_notdef(),			/* 48 */
+	cdev_notdef(),			/* 49 */
+	cdev_notdef(),			/* 50 */
+#ifdef XFS
+	cdev_xfs_init(NXFS,xfs_dev),	/* 51: xfs communication device */
+#else
+	cdev_notdef(),			/* 51 */
+#endif
 };
 int	nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
 
diff --git a/sys/arch/hp300/hp300/conf.c b/sys/arch/hp300/hp300/conf.c
index 58b46b9a569..0388c45f344 100644
--- a/sys/arch/hp300/hp300/conf.c
+++ b/sys/arch/hp300/hp300/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.21 1998/08/24 05:29:52 millert Exp $	*/
+/*	$OpenBSD: conf.c,v 1.22 1998/09/25 09:20:53 todd Exp $	*/
 /*	$NetBSD: conf.c,v 1.39 1997/05/12 08:17:53 thorpej Exp $	*/
 
 /*-
@@ -147,6 +147,10 @@ cdev_decl(random);
 cdev_decl(rd);
 #include "ksyms.h"
 cdev_decl(ksyms);   
+#ifdef XFS
+#include <xfs/nxfs.h>
+cdev_decl(xfs_dev);
+#endif
 
 #ifdef IPFILTER
 #define NIPF 1
@@ -193,6 +197,25 @@ struct cdevsw	cdevsw[] =
 	cdev_disk_init(NRD,rd),		/* 34: RAM disk */
 	cdev_tty_init(NAPCI,apci),	/* 35: Apollo APCI UARTs */
 	cdev_ksyms_init(NKSYMS,ksyms),	/* 36: Kernel symbols device */
+	cdev_notdef(),			/* 37 */
+	cdev_notdef(),			/* 38 */
+	cdev_notdef(),			/* 39 */
+	cdev_notdef(),			/* 40 */
+	cdev_notdef(),			/* 41 */
+	cdev_notdef(),			/* 42 */
+	cdev_notdef(),			/* 43 */
+	cdev_notdef(),			/* 44 */
+	cdev_notdef(),			/* 45 */
+	cdev_notdef(),			/* 46 */
+	cdev_notdef(),			/* 47 */
+	cdev_notdef(),			/* 48 */
+	cdev_notdef(),			/* 49 */
+	cdev_notdef(),			/* 50 */
+#ifdef XFS
+	cdev_xfs_init(NXFS,xfs_dev),	/* 51: xfs communication device */
+#else
+	cdev_notdef(),			/* 51 */
+#endif
 };
 int	nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
 
diff --git a/sys/arch/kbus/kbus/conf.c b/sys/arch/kbus/kbus/conf.c
index 861c80ca782..859b9a41e8d 100644
--- a/sys/arch/kbus/kbus/conf.c
+++ b/sys/arch/kbus/kbus/conf.c
@@ -68,6 +68,10 @@
 
 #include "zsc.h"
 #include "xd.h"
+#ifdef XFS
+#include <xfs/nxfs.h>
+cdev_decl(xfs_dev);
+#endif
 
 #if 0
 #include "bwtwo.h"
@@ -168,7 +172,11 @@ struct cdevsw	cdevsw[] =
 	cdev_notdef(),			/* 48 */
 	cdev_notdef(),			/* 49 */
 	cdev_notdef(),			/* 50 */
+#ifdef XFS
+	cdev_xfs_init(NXFS,xfs_dev),	/* 51: xfs communication device */
+#else
 	cdev_notdef(),			/* 51 */
+#endif
 	cdev_notdef(),			/* 52 */
 	cdev_notdef(),			/* 53 */
 	cdev_notdef(),			/* 54: floppy disk */
diff --git a/sys/arch/mac68k/mac68k/conf.c b/sys/arch/mac68k/mac68k/conf.c
index f827152c2b3..cd783251c66 100644
--- a/sys/arch/mac68k/mac68k/conf.c
+++ b/sys/arch/mac68k/mac68k/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.19 1998/08/18 15:03:26 ryker Exp $	*/
+/*	$OpenBSD: conf.c,v 1.20 1998/09/25 09:20:53 todd Exp $	*/
 /*	$NetBSD: conf.c,v 1.41 1997/02/11 07:35:49 scottr Exp $	*/
 
 /*
@@ -112,6 +112,10 @@ cdev_decl(ch);
 dev_decl(filedesc,open);
 #include "asc.h"
 cdev_decl(asc);
+#ifdef XFS
+#include <xfs/nxfs.h>
+cdev_decl(xfs_dev);
+#endif
 
 #ifdef IPFILTER
 #define NIPF 1
@@ -158,6 +162,25 @@ struct cdevsw	cdevsw[] =
 	cdev_uk_init(NUK,uk),		/* 34: SCSI unknown */
 	cdev_gen_ipf(NIPF,ipl),         /* 35: IP filter log */
 	cdev_audio_init(NASC,asc),      /* 36: ASC audio device */
+	cdev_notdef(),			/* 37 */
+	cdev_notdef(),			/* 38 */
+	cdev_notdef(),			/* 39 */
+	cdev_notdef(),			/* 40 */
+	cdev_notdef(),			/* 41 */
+	cdev_notdef(),			/* 42 */
+	cdev_notdef(),			/* 43 */
+	cdev_notdef(),			/* 44 */
+	cdev_notdef(),			/* 45 */
+	cdev_notdef(),			/* 46 */
+	cdev_notdef(),			/* 47 */
+	cdev_notdef(),			/* 48 */
+	cdev_notdef(),			/* 49 */
+	cdev_notdef(),			/* 50 */
+#ifdef XFS
+	cdev_xfs_init(NXFS,xfs_dev),	/* 51: xfs communication device */
+#else
+	cdev_notdef(),			/* 51 */
+#endif
 };
 int	nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
 
diff --git a/sys/arch/mvme68k/mvme68k/conf.c b/sys/arch/mvme68k/mvme68k/conf.c
index ba46e7c6232..e09c1aa239e 100644
--- a/sys/arch/mvme68k/mvme68k/conf.c
+++ b/sys/arch/mvme68k/mvme68k/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.18 1998/08/24 05:29:57 millert Exp $ */
+/*	$OpenBSD: conf.c,v 1.19 1998/09/25 09:20:53 todd Exp $ */
 
 /*-
  * Copyright (c) 1995 Theo de Raadt
@@ -144,6 +144,7 @@ cdev_decl(wl);
 #include "bugtty.h"
 cdev_decl(bugtty);
 
+
 /* open, close, write, ioctl */
 #define	cdev_lp_init(c,n) { \
 	dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
@@ -161,6 +162,10 @@ cdev_decl(bugtty);
 cdev_decl(lp);
 #include "lptwo.h"
 cdev_decl(lptwo);
+#ifdef XFS
+#include <xfs/nxfs.h>
+cdev_decl(xfs_dev);
+#endif
 #include "ksyms.h"
 cdev_decl(ksyms);
 
@@ -225,6 +230,18 @@ struct cdevsw	cdevsw[] =
 	cdev_uk_init(NUK,uk),		/* 41: unknown SCSI */
 	cdev_ss_init(NSS,ss),           /* 42: SCSI scanner */
 	cdev_ksyms_init(NKSYMS,ksyms),	/* 43: Kernel symbols device */
+	cdev_lkm_dummy(),		/* 44 */
+	cdev_lkm_dummy(),		/* 45 */
+	cdev_lkm_dummy(),		/* 46 */
+	cdev_lkm_dummy(),		/* 47 */
+	cdev_lkm_dummy(),		/* 48 */
+	cdev_lkm_dummy(),		/* 49 */
+	cdev_lkm_dummy(),		/* 50 */
+#ifdef XFS
+	cdev_xfs_init(NXFS,xfs_dev),	/* 51: xfs communication device */
+#else
+	cdev_lkm_dummy(),		/* 51 */
+#endif
 };
 int	nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
 
diff --git a/sys/arch/mvme88k/mvme88k/conf.c b/sys/arch/mvme88k/mvme88k/conf.c
index 2e4f06a6700..51b12df8fb6 100644
--- a/sys/arch/mvme88k/mvme88k/conf.c
+++ b/sys/arch/mvme88k/mvme88k/conf.c
@@ -173,6 +173,11 @@ cdev_decl(bpf);
 #include "tun.h"
 cdev_decl(tun);
 
+#ifdef XFS
+#include <xfs/nxfs.h>
+#cdev_decl(xfs_dev);
+#endif
+
 #ifdef LKM
 #define NLKM 1
 #else
@@ -246,6 +251,23 @@ struct cdevsw	cdevsw[] =
 	cdev_lkm_dummy(),		/* 36 */
 	cdev_lkm_dummy(),		/* 37 */
 	cdev_lkm_dummy(),		/* 38 */
+	cdev_notdef(),			/* 39 */
+	cdev_notdef(),			/* 40 */
+	cdev_notdef(),			/* 41 */
+	cdev_notdef(),			/* 42 */
+	cdev_notdef(),			/* 43 */
+	cdev_notdef(),			/* 44 */
+	cdev_notdef(),			/* 45 */
+	cdev_notdef(),			/* 46 */
+	cdev_notdef(),			/* 47 */
+	cdev_notdef(),			/* 48 */
+	cdev_notdef(),			/* 49 */
+	cdev_notdef(),			/* 50 */
+#ifdef XFS
+	cde_xfs_init(NXFS,xfs_dev),	/* 51: xfs communication device */
+#else
+	cdev_notdef(),			/* 51 */
+#endif
 };
 int	nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
 
diff --git a/sys/arch/pc532/pc532/conf.c b/sys/arch/pc532/pc532/conf.c
index da135e5c7fc..b159b906b0a 100644
--- a/sys/arch/pc532/pc532/conf.c
+++ b/sys/arch/pc532/pc532/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.10 1998/07/07 06:56:08 deraadt Exp $	*/
+/*	$OpenBSD: conf.c,v 1.11 1998/09/25 09:20:54 todd Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -88,6 +88,10 @@ cdev_decl(fd);
 #include "tun.h"
 #include "lpt.h"
 cdev_decl(lpt);
+#ifdef XFS
+#include <xfs/nxfs.h>
+cdev_decl(xfs_dev);
+#endif
 
 #ifdef IPFILTER
 #define NIPF 1
@@ -120,6 +124,39 @@ struct cdevsw	cdevsw[] =
 	cdev_random_init(1,random),	/* 20: random data source */
 	cdev_uk_init(NUK,uk),		/* 21: unknown SCSI */
 	cdev_ss_init(NSS,ss),           /* 22: SCSI scanner */
+	cdev_notdef(),			/* 23 */
+	cdev_notdef(),			/* 24 */
+	cdev_notdef(),			/* 25 */
+	cdev_notdef(),			/* 26 */
+	cdev_notdef(),			/* 27 */
+	cdev_notdef(),			/* 28 */
+	cdev_notdef(),			/* 29 */
+	cdev_notdef(),			/* 30 */
+	cdev_notdef(),			/* 31 */
+	cdev_notdef(),			/* 32 */
+	cdev_notdef(),			/* 33 */
+	cdev_notdef(),			/* 34 */
+	cdev_notdef(),			/* 35 */
+	cdev_notdef(),			/* 36 */
+	cdev_notdef(),			/* 37 */
+	cdev_notdef(),			/* 38 */
+	cdev_notdef(),			/* 39 */
+	cdev_notdef(),			/* 40 */
+	cdev_notdef(),			/* 41 */
+	cdev_notdef(),			/* 42 */
+	cdev_notdef(),			/* 43 */
+	cdev_notdef(),			/* 44 */
+	cdev_notdef(),			/* 45 */
+	cdev_notdef(),			/* 46 */
+	cdev_notdef(),			/* 47 */
+	cdev_notdef(),			/* 48 */
+	cdev_notdef(),			/* 49 */
+	cdev_notdef(),			/* 50 */
+#ifdef XFS
+	cdev_xfs_init(NXFS,xfs_dev),	/* 51: xfs communication device */
+#else
+	cdev_notdef(),			/* 51 */
+#endif
 };
 int	nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
 
diff --git a/sys/arch/pmax/pmax/conf.c b/sys/arch/pmax/pmax/conf.c
index a847aad329d..861d6a5a422 100644
--- a/sys/arch/pmax/pmax/conf.c
+++ b/sys/arch/pmax/pmax/conf.c
@@ -129,6 +129,11 @@ cdev_decl(xcfb);
 cdev_decl(mfb);
 dev_decl(filedesc,open);
 
+#ifdef XFS
+#include <xfs/nxfs.h>
+cdev_decl(xfs_dev);
+#endif
+
 #ifdef IPFILTER
 #define NIPF 1
 #else
@@ -209,7 +214,11 @@ struct cdevsw	cdevsw[] =
 	cdev_notdef(),		/* 48: Ultrix /dev/trace */
 	cdev_notdef(),		/* 49: sm (sysV shm?) */
 	cdev_notdef(),		/* 50 sg */
+#ifdef XFS
+	cdev_xfs_init(NXFS,xfs_dev), /* 51: xfs communication device */
+#else
 	cdev_notdef(),		/* 51: sh tty */
+#endif
 	cdev_notdef(),		/* 52: its */
 	cdev_notdef(),		/* 53: nodev */
 	cdev_notdef(),		/* 54: nodev */
diff --git a/sys/arch/powerpc/powerpc/conf.c b/sys/arch/powerpc/powerpc/conf.c
index 93c850fd8e7..7890663639a 100644
--- a/sys/arch/powerpc/powerpc/conf.c
+++ b/sys/arch/powerpc/powerpc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.11 1998/09/16 04:18:09 rahnds Exp $ */
+/*	$OpenBSD: conf.c,v 1.12 1998/09/25 09:20:54 todd Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -125,6 +125,11 @@ cdev_decl(bpf);
 cdev_decl(tun);
 cdev_decl(random); 
 
+#ifdef XFS
+#include <xfs/nxfs.h>
+cdev_decl(xfs_dev);
+#endef
+
 #ifdef LKM
 #define NLKM 1
 #else
@@ -187,6 +192,18 @@ struct cdevsw cdevsw[] = {
 	cdev_uk_init(NUK,uk),		/* 41: unknown SCSI */
 	cdev_ss_init(NSS,ss),           /* 42: SCSI scanner */
 	cdev_ksyms_init(NKSYMS,ksyms),	/* 43: Kernel symbols device */
+        cdev_notdef(),                  /* 44 */
+        cdev_notdef(),                  /* 45 */
+        cdev_notdef(),                  /* 46 */
+        cdev_notdef(),                  /* 47 */
+        cdev_notdef(),                  /* 48 */
+        cdev_notdef(),                  /* 49 */ 
+        cdev_notdef(),                  /* 50 */ 
+#ifdef XFS
+	cdev_xfs_init(NXFS,xfs_dev),	/* 51: xfs communication device */
+#else
+        cdev_notdef(),                  /* 51 */
+#endif
 	/* If adding devs, don't forget to expand 'chrtoblktbl' below! */
 };
 int nchrdev = sizeof cdevsw / sizeof cdevsw[0];
diff --git a/sys/arch/sparc/sparc/conf.c b/sys/arch/sparc/sparc/conf.c
index 3cf1892ab5d..8bd5afb24fc 100644
--- a/sys/arch/sparc/sparc/conf.c
+++ b/sys/arch/sparc/sparc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.18 1998/08/24 05:30:02 millert Exp $	*/
+/*	$OpenBSD: conf.c,v 1.19 1998/09/25 09:20:54 todd Exp $	*/
 /*	$NetBSD: conf.c,v 1.40 1996/04/11 19:20:03 thorpej Exp $ */
 
 /*
@@ -82,6 +82,10 @@
 #include "xd.h"
 #include "xy.h"
 #include "magma.h"		/* has NMTTY and NMBPP */
+#ifdef XFS
+#include <xfs/nxfs.h>
+cdev_decl(xfs_dev);
+#endif
 #include "ksyms.h"
 
 struct bdevsw	bdevsw[] =
@@ -167,7 +171,11 @@ struct cdevsw	cdevsw[] =
 	cdev_notdef(),			/* 48 */
 	cdev_notdef(),			/* 49 */
 	cdev_notdef(),			/* 50 */
+#ifdef XFS
+	cdev_xfs_init(NXFS,xfs_dev),	/* 51: xfs communication device */
+#else
 	cdev_notdef(),			/* 51 */
+#endif
 	cdev_notdef(),			/* 52 */
 	cdev_notdef(),			/* 53 */
 	cdev_disk_init(NFD,fd),		/* 54: floppy disk */
diff --git a/sys/arch/sun3/sun3/conf.c b/sys/arch/sun3/sun3/conf.c
index 9a021640ec9..0a738675e0c 100644
--- a/sys/arch/sun3/sun3/conf.c
+++ b/sys/arch/sun3/sun3/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.22 1998/07/07 06:56:12 deraadt Exp $	*/
+/*	$OpenBSD: conf.c,v 1.23 1998/09/25 09:20:54 todd Exp $	*/
 /*	$NetBSD: conf.c,v 1.51 1996/11/04 16:16:09 gwr Exp $	*/
 
 /*-
@@ -65,6 +65,10 @@ int	ttselect	__P((dev_t, int, struct proc *));
 #include "xd.h"
 #include "xy.h"
 #include "zstty.h"
+#ifdef XFS
+#include <xfs/nxfs.h>
+cdev_decl(xfs_dev);
+#endif
 
 struct bdevsw	bdevsw[] =
 {
@@ -148,7 +152,11 @@ struct cdevsw	cdevsw[] =
 	cdev_notdef(),			/* 48: (tbi) */
 	cdev_notdef(),			/* 49: (chat) */
 	cdev_notdef(),			/* 50: (chut) */
+#ifdef XFS
+	cdev_xfs_init(NXFS,xfs_dev),	/* 51: xfs communication device */
+#else
 	cdev_notdef(),			/* 51: (chut) */
+#endif
 	cdev_disk_init(NRD,rd),		/* 52: RAM disk - for install tape */
 	cdev_notdef(),			/* 53: (hd - N/A) */
 	cdev_notdef(),			/* 54: (fd - N/A) */
diff --git a/sys/arch/vax/vax/conf.c b/sys/arch/vax/vax/conf.c
index b2f44ed602a..b4158343e35 100644
--- a/sys/arch/vax/vax/conf.c
+++ b/sys/arch/vax/vax/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.16 1998/07/07 06:56:14 deraadt Exp $ */
+/*	$OpenBSD: conf.c,v 1.17 1998/09/25 09:20:54 todd Exp $ */
 /*	$NetBSD: conf.c,v 1.28 1997/02/04 19:13:17 ragge Exp $	*/
 
 /*-
@@ -357,6 +357,11 @@ cdev_decl(ss);
 #include "uk.h"
 cdev_decl(uk);
 
+#ifdef XFS
+#include <xfs/nxfs.h>
+cdev_decl(xfs_dev);
+#endif
+
 cdev_decl(random);
 
 dev_decl(filedesc,open);
@@ -417,7 +422,11 @@ struct cdevsw	cdevsw[] =
 	cdev_notdef(),			/* 47 */
 	cdev_notdef(),			/* 48 */
 	cdev_notdef(),			/* 49 */
+#ifdef XFS
+	cdev_xfs_init(NXFS,xfs_dev),	/* 50: xfs communication device */
+#else
 	cdev_notdef(),			/* 50 */
+#endif
 	cdev_cnstore_init(NCRX,crx),	/* 51: Console RX50 at 8200 */
 	cdev_notdef(),			/* 52: was: KDB50/RA?? */
 	cdev_fd_init(1,filedesc),	/* 53: file descriptor pseudo-device */
diff --git a/sys/arch/wgrisc/wgrisc/conf.c b/sys/arch/wgrisc/wgrisc/conf.c
index 44d3f3a3c2c..60ab6a1004d 100644
--- a/sys/arch/wgrisc/wgrisc/conf.c
+++ b/sys/arch/wgrisc/wgrisc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.6 1998/07/07 06:56:15 deraadt Exp $ */
+/*	$OpenBSD: conf.c,v 1.7 1998/09/25 09:20:55 todd Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)conf.c	8.2 (Berkeley) 11/14/93
- *      $Id: conf.c,v 1.6 1998/07/07 06:56:15 deraadt Exp $
+ *      $Id: conf.c,v 1.7 1998/09/25 09:20:55 todd Exp $
  */
 
 #include <sys/param.h>
@@ -131,6 +131,10 @@ cdev_decl(wd);
 cdev_decl(acd);
 cdev_decl(fl);
 
+#ifdef XFS
+#include <xfs/nxfs.h>
+cdev_decl(xfs_dev);
+#endif
 
 #ifdef IPFILTER
 #define NIPF 1
@@ -174,6 +178,28 @@ struct cdevsw	cdevsw[] =
 	cdev_gen_ipf(NIPF,ipl),         /* 31: IP filter log */
 	cdev_uk_init(NUK,uk),		/* 32: unknown SCSI */
 	cdev_random_init(1,random),	/* 33: random data source */
+	cdev_notdef(),			/* 34: */
+	cdev_notdef(),			/* 35: */
+	cdev_notdef(),			/* 36: */
+	cdev_notdef(),			/* 37: */
+	cdev_notdef(),			/* 38: */
+	cdev_notdef(),			/* 39: */
+	cdev_notdef(),			/* 30: */
+	cdev_notdef(),			/* 41: */
+	cdev_notdef(),			/* 42: */
+	cdev_notdef(),			/* 43: */
+	cdev_notdef(),			/* 44: */
+	cdev_notdef(),			/* 45: */
+	cdev_notdef(),			/* 46: */
+	cdev_notdef(),			/* 47: */
+	cdev_notdef(),			/* 48: */
+	cdev_notdef(),			/* 49: */
+	cdev_notdef(),			/* 50: */
+#ifdef XFS
+	cdev_xfs_init(NXFS,xfs_dev),	/* 51: xfs communication device */
+#else
+	cdev_notdef(),			/* 51: */
+#endif
 };
 
 int	nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]);