From df957ee1b3335fce4fdfd1754a19dde63a76bb5d Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Wed, 27 Mar 1996 19:11:41 +0000
Subject: [PATCH] Moved the initialization of the devfs devices to after the
 initialization of the devswitch so that it actually works.

---
 sys/dev/syscons/syscons.c | 16 +++++++++-------
 sys/i386/isa/syscons.c    | 16 +++++++++-------
 sys/isa/syscons.c         | 16 +++++++++-------
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 3fe78da7d2b..367321d5b91 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.142 1996/02/13 14:15:13 phk Exp $
+ *  $Id: syscons.c,v 1.143 1996/03/02 18:24:03 peter Exp $
  */
 
 #include "sc.h"
@@ -295,7 +295,9 @@ static int
 scattach(struct isa_device *dev)
 {
     scr_stat	*scp;
+#ifdef DEVFS
     int		vc;
+#endif
 
     scinit();
     configuration = dev->id_flags;
@@ -357,17 +359,17 @@ scattach(struct isa_device *dev)
     apm_hook_establish(APM_HOOK_RESUME , &scp->r_hook);
 #endif
 
-#ifdef DEVFS
-    for ( vc = 0 ; vc < MAXCONS; vc++) {
-        sc_devfs_token[vc] = devfs_add_devswf(&scdevsw, vc,
-					DV_CHR, 0, 0, 0600, "ttyv%n", vc );
-    }
-#endif
     {
     dev_t dev = makedev(CDEV_MAJOR, 0);
 
     cdevsw_add(&dev, &scdevsw, NULL);
     }
+#ifdef DEVFS
+    for (vc = 0; vc < MAXCONS; vc++)
+        sc_devfs_token[vc] = devfs_add_devswf(&scdevsw, vc, DV_CHR,
+					      UID_ROOT, GID_WHEEL, 0600,
+					      "ttyv%n", vc);
+#endif
 
     return 0;
 }
diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c
index 3fe78da7d2b..367321d5b91 100644
--- a/sys/i386/isa/syscons.c
+++ b/sys/i386/isa/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.142 1996/02/13 14:15:13 phk Exp $
+ *  $Id: syscons.c,v 1.143 1996/03/02 18:24:03 peter Exp $
  */
 
 #include "sc.h"
@@ -295,7 +295,9 @@ static int
 scattach(struct isa_device *dev)
 {
     scr_stat	*scp;
+#ifdef DEVFS
     int		vc;
+#endif
 
     scinit();
     configuration = dev->id_flags;
@@ -357,17 +359,17 @@ scattach(struct isa_device *dev)
     apm_hook_establish(APM_HOOK_RESUME , &scp->r_hook);
 #endif
 
-#ifdef DEVFS
-    for ( vc = 0 ; vc < MAXCONS; vc++) {
-        sc_devfs_token[vc] = devfs_add_devswf(&scdevsw, vc,
-					DV_CHR, 0, 0, 0600, "ttyv%n", vc );
-    }
-#endif
     {
     dev_t dev = makedev(CDEV_MAJOR, 0);
 
     cdevsw_add(&dev, &scdevsw, NULL);
     }
+#ifdef DEVFS
+    for (vc = 0; vc < MAXCONS; vc++)
+        sc_devfs_token[vc] = devfs_add_devswf(&scdevsw, vc, DV_CHR,
+					      UID_ROOT, GID_WHEEL, 0600,
+					      "ttyv%n", vc);
+#endif
 
     return 0;
 }
diff --git a/sys/isa/syscons.c b/sys/isa/syscons.c
index 3fe78da7d2b..367321d5b91 100644
--- a/sys/isa/syscons.c
+++ b/sys/isa/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.142 1996/02/13 14:15:13 phk Exp $
+ *  $Id: syscons.c,v 1.143 1996/03/02 18:24:03 peter Exp $
  */
 
 #include "sc.h"
@@ -295,7 +295,9 @@ static int
 scattach(struct isa_device *dev)
 {
     scr_stat	*scp;
+#ifdef DEVFS
     int		vc;
+#endif
 
     scinit();
     configuration = dev->id_flags;
@@ -357,17 +359,17 @@ scattach(struct isa_device *dev)
     apm_hook_establish(APM_HOOK_RESUME , &scp->r_hook);
 #endif
 
-#ifdef DEVFS
-    for ( vc = 0 ; vc < MAXCONS; vc++) {
-        sc_devfs_token[vc] = devfs_add_devswf(&scdevsw, vc,
-					DV_CHR, 0, 0, 0600, "ttyv%n", vc );
-    }
-#endif
     {
     dev_t dev = makedev(CDEV_MAJOR, 0);
 
     cdevsw_add(&dev, &scdevsw, NULL);
     }
+#ifdef DEVFS
+    for (vc = 0; vc < MAXCONS; vc++)
+        sc_devfs_token[vc] = devfs_add_devswf(&scdevsw, vc, DV_CHR,
+					      UID_ROOT, GID_WHEEL, 0600,
+					      "ttyv%n", vc);
+#endif
 
     return 0;
 }