diff options
author | phk <phk@FreeBSD.org> | 2004-02-14 17:56:59 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2004-02-14 17:56:59 +0000 |
commit | 9e1fc5a67845eb73b88deda13cb99261ffd586e8 (patch) | |
tree | fa652f8cf6b457f969cf5aa6bd18f2e5a24a105b /sys/dev | |
parent | ff78c06dec44aa94ce0113ebbe73c879699a3072 (diff) | |
download | FreeBSD-src-9e1fc5a67845eb73b88deda13cb99261ffd586e8.zip FreeBSD-src-9e1fc5a67845eb73b88deda13cb99261ffd586e8.tar.gz |
Try again to get rid of makedev().
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/syscons/syscons.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 0115954..88c6ade 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -389,9 +389,11 @@ sc_attach_unit(int unit, int flags) (void *)(uintptr_t)unit, SHUTDOWN_PRI_DEFAULT); for (vc = 0; vc < sc->vtys; vc++) { - dev = make_dev(&sc_cdevsw, vc + unit * MAXCONS, - UID_ROOT, GID_WHEEL, 0600, "ttyv%r", vc + unit * MAXCONS); - sc->dev[vc] = dev; + if (sc->dev[vc] == NULL) { + dev = make_dev(&sc_cdevsw, vc + unit * MAXCONS, + UID_ROOT, GID_WHEEL, 0600, "ttyv%r", vc + unit * MAXCONS); + sc->dev[vc] = dev; + } /* * The first vty already has struct tty and scr_stat initialized * in scinit(). The other vtys will have these structs when @@ -2730,7 +2732,8 @@ scinit(int unit, int flags) sc->vtys = MAXCONS; /* XXX: should be configurable */ if (flags & SC_KERNEL_CONSOLE) { sc->dev = main_devs; - sc->dev[0] = makedev(CDEV_MAJOR, unit*MAXCONS); + sc->dev[0] = make_dev(&sc_cdevsw, unit * MAXCONS, + UID_ROOT, GID_WHEEL, 0600, "ttyv%r", unit * MAXCONS); sc->dev[0]->si_tty = &main_tty; ttyregister(&main_tty); scp = &main_console; @@ -2745,7 +2748,8 @@ scinit(int unit, int flags) } else { /* assert(sc_malloc) */ sc->dev = malloc(sizeof(dev_t)*sc->vtys, M_DEVBUF, M_WAITOK|M_ZERO); - sc->dev[0] = makedev(CDEV_MAJOR, unit*MAXCONS); + sc->dev[0] = make_dev(&sc_cdevsw, unit * MAXCONS, + UID_ROOT, GID_WHEEL, 0600, "ttyv%r", unit * MAXCONS); sc->dev[0]->si_tty = ttymalloc(sc->dev[0]->si_tty); scp = alloc_scp(sc, sc->first_vty); } |