Remove all traces of Julians DEVFS (incl from kern/subr_diskslice.c)

  Remove old DEVFS support fields from dev_t.

  Make uid, gid & mode members of dev_t and set them in make_dev().

  Use correct uid, gid & mode in make_dev in disk minilayer.

  Add support for registering alias names for a dev_t using the
  new function make_dev_alias().  These will show up as symlinks
  in DEVFS.

  Use makedev() rather than make_dev() for MFSs magic devices to prevent
  DEVFS from noticing this abuse.

  Add a field for DEVFS inode number in dev_t.

  Add new DEVFS in fs/devfs.

  Add devfs cloning to:
        disk minilayer (ie: ad(4), sd(4), cd(4) etc etc)
        md(4), tun(4), bpf(4), fd(4)

  If DEVFS add -d flag to /sbin/inits args to make it mount devfs.

  Add commented out DEVFS to GENERIC

5 files changed, 0 insertions, 59 deletions

diff --git a/sys/i4b/driver/i4b_ctl.c b/sys/i4b/driver/i4b_ctl.c
index a8d50cc..c88b35e 100644
--- a/sys/i4b/driver/i4b_ctl.c
+++ b/sys/i4b/driver/i4b_ctl.c
@@ -67,9 +67,6 @@
 #include "opt_devfs.h"
 #endif
 
-#ifdef DEVFS
-#include <sys/devfsext.h>
-#endif
 
 #endif /* __FreeBSD__ */
 
@@ -138,9 +135,6 @@ PSEUDO_SET(i4bctlattach, i4b_i4bctldrv);
 #endif /* __FreeBSD__ */
 
 #if defined(__FreeBSD__) && __FreeBSD__ == 3
-#ifdef DEVFS
-static void *devfs_token;
-#endif
 #endif
 
 #ifndef __FreeBSD__
@@ -219,11 +213,6 @@ i4bctlattach()
 #if defined(__FreeBSD__)
 #if __FreeBSD__ == 3
 
-#ifdef DEVFS
-	devfs_token = devfs_add_devswf(&i4bctl_cdevsw, 0, DV_CHR,
-				       UID_ROOT, GID_WHEEL, 0600,
-				       "i4bctl");
-#endif
 
 #else
 	make_dev(&i4bctl_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "i4bctl");
diff --git a/sys/i4b/driver/i4b_rbch.c b/sys/i4b/driver/i4b_rbch.c
index 855f413..0ab29d9 100644
--- a/sys/i4b/driver/i4b_rbch.c
+++ b/sys/i4b/driver/i4b_rbch.c
@@ -62,9 +62,6 @@ extern cc_t ttydefchars;
 #include "opt_devfs.h"
 #endif
 
-#ifdef DEVFS
-#include <sys/devfsext.h>
-#endif
 
 #endif /* __FreeBSD__ */
 
@@ -137,9 +134,6 @@ static struct rbch_softc {
 	struct selinfo selp;		/* select / poll	*/
 
 #if defined(__FreeBSD__) && __FreeBSD__ == 3
-#ifdef DEVFS
-	void *devfs_token;		/* device filesystem	*/
-#endif	
 #endif
 
 #if I4BRBCHACCT
@@ -298,12 +292,6 @@ i4brbchattach()
 #if defined(__FreeBSD__)
 #if __FreeBSD__ == 3
 
-#ifdef DEVFS
-		rbch_softc[i].devfs_token =
-			devfs_add_devswf(&i4brbch_cdevsw, i, DV_CHR,
-				     UID_ROOT, GID_WHEEL, 0600,
-				     "i4brbch%d", i);
-#endif
 
 #else
 		make_dev(&i4brbch_cdevsw, i,
diff --git a/sys/i4b/driver/i4b_tel.c b/sys/i4b/driver/i4b_tel.c
index 4cd1667..a9b2591 100644
--- a/sys/i4b/driver/i4b_tel.c
+++ b/sys/i4b/driver/i4b_tel.c
@@ -67,9 +67,6 @@
 #include "opt_devfs.h"
 #endif
 
-#ifdef DEVFS
-#include <sys/devfsext.h>
-#endif
 
 #endif /* __FreeBSD__ */
 
@@ -138,9 +135,6 @@ typedef struct {
 	struct selinfo		selp;		/* select / poll */
 
 #if defined(__FreeBSD__) && __FreeBSD__ == 3
-#ifdef DEVFS
-        void                    *devfs_token;   /* token for DEVFS */
-#endif
 #endif
 
 } tel_sc_t;
@@ -318,13 +312,6 @@ i4btelattach()
 #if defined(__FreeBSD__)
 #if __FreeBSD__ == 3
 
-#ifdef DEVFS
-
-/* XXX */  		tel_sc[i][j].devfs_token
-		  		= devfs_add_devswf(&i4btel_cdevsw, i, DV_CHR,
-				     UID_ROOT, GID_WHEEL, 0600,
-				     "i4btel%d", i);
-#endif
 
 #else
 			switch(j)
diff --git a/sys/i4b/driver/i4b_trace.c b/sys/i4b/driver/i4b_trace.c
index 6324dbe..c3c1688 100644
--- a/sys/i4b/driver/i4b_trace.c
+++ b/sys/i4b/driver/i4b_trace.c
@@ -72,9 +72,6 @@
 
 #ifdef __FreeBSD__
 
-#ifdef DEVFS
-#include <sys/devfsext.h>
-#endif
 
 #include <machine/i4b_trace.h>
 #include <machine/i4b_ioctl.h>
@@ -101,9 +98,6 @@ static int device_state[NI4BTRC];
 #define ST_WAITDATA	0x02
 
 #if defined(__FreeBSD__) && __FreeBSD__ == 3
-#ifdef DEVFS
-static void *devfs_token[NI4BTRC];
-#endif
 #endif
 
 static int analyzemode = 0;
@@ -244,12 +238,6 @@ i4btrcattach()
 #if defined(__FreeBSD__)
 #if __FreeBSD__ < 4
 
-#ifdef DEVFS
-	  	devfs_token[i]
-		  = devfs_add_devswf(&i4btrc_cdevsw, i, DV_CHR,
-				     UID_ROOT, GID_WHEEL, 0600,
-				     "i4btrc%d", i);
-#endif
 
 #else
 		make_dev(&i4btrc_cdevsw, i,
diff --git a/sys/i4b/layer4/i4b_i4bdrv.c b/sys/i4b/layer4/i4b_i4bdrv.c
index 1a07b95..8bc866f 100644
--- a/sys/i4b/layer4/i4b_i4bdrv.c
+++ b/sys/i4b/layer4/i4b_i4bdrv.c
@@ -77,9 +77,6 @@
 #include "opt_devfs.h"
 #endif
 
-#ifdef DEVFS
-#include <sys/devfsext.h>
-#endif
 
 #endif /* __FreeBSD__*/
 
@@ -111,9 +108,6 @@ static int selflag = 0;
 static int readflag = 0;
 
 #if defined(__FreeBSD__) && __FreeBSD__ == 3
-#ifdef DEVFS
-static void *devfs_token;
-#endif
 #endif
 
 #ifndef __FreeBSD__
@@ -255,11 +249,6 @@ i4battach()
 #if defined(__FreeBSD__)
 #if __FreeBSD__ == 3
 
-#ifdef DEVFS
-	devfs_token = devfs_add_devswf(&i4b_cdevsw, 0, DV_CHR,
-				       UID_ROOT, GID_WHEEL, 0600,
-				       "i4b");
-#endif
 
 #else
 	make_dev(&i4b_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "i4b");