summaryrefslogtreecommitdiffstats
path: root/sys/isa
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1996-03-27 19:11:41 +0000
committerbde <bde@FreeBSD.org>1996-03-27 19:11:41 +0000
commit4719eb46e21f83ca4bf7df51a89ef3d5e22782c9 (patch)
treefdcf1e8d3a6e70ab144c625ae2f412feaf195907 /sys/isa
parentb0e8c63dac5a7f8bad4dcddb78ce1248f7a514a6 (diff)
downloadFreeBSD-src-4719eb46e21f83ca4bf7df51a89ef3d5e22782c9.zip
FreeBSD-src-4719eb46e21f83ca4bf7df51a89ef3d5e22782c9.tar.gz
Moved the initialization of the devfs devices to after the initialization
of the devswitch so that it actually works.
Diffstat (limited to 'sys/isa')
-rw-r--r--sys/isa/syscons.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/sys/isa/syscons.c b/sys/isa/syscons.c
index 3fe78da..367321d 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;
}
OpenPOWER on IntegriCloud