d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use makedev() to hack up dev_t's early in boot, do it right

Browse Source 
with make_dev() (and avoid doing it again later).
This commit is contained in:
Poul-Henning Kamp 2004-02-12 21:32:59 +00:00
parent 40448065e8
commit f484fc6593
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/syscons/syscons.c
View File

@ -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);
}