diff options
| -rw-r--r-- | sys/alpha/alpha/cons.c | 10 | ||||
| -rw-r--r-- | sys/i386/i386/cons.c | 11 | ||||
| -rw-r--r-- | sys/kern/tty_cons.c | 11 |
3 files changed, 19 insertions, 13 deletions
diff --git a/sys/alpha/alpha/cons.c b/sys/alpha/alpha/cons.c index 7194a33..3df65ef 100644 --- a/sys/alpha/alpha/cons.c +++ b/sys/alpha/alpha/cons.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)cons.c 7.2 (Berkeley) 5/9/91 - * $Id: cons.c,v 1.10 1999/06/01 20:26:04 dt Exp $ + * $Id: cons.c,v 1.11 1999/06/22 14:13:16 yokota Exp $ */ #include "opt_devfs.h" @@ -82,7 +82,7 @@ static struct cdevsw cn_cdevsw = { /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, - /* flags */ 0, + /* flags */ D_TTY, /* maxio */ 0, /* bmaj */ -1 }; @@ -184,7 +184,7 @@ cninit_finish() cn_phys_open = cdp->d_open; cdp->d_open = cnopen; cn_tp = (*cdp->d_devtotty)(cn_tab->cn_dev); - cn_dev_t = cn_tp->t_dev; + cn_dev_t = cn_tab->cn_dev; cn_udev_t = dev2udev(cn_dev_t); } @@ -205,8 +205,8 @@ cnuninit(void) cdp->d_open = cn_phys_open; cn_phys_open = NULL; cn_tp = NULL; - cn_dev_t = 0; - cn_udev_t = dev2udev(cn_dev_t); + cn_dev_t = NODEV; + cn_udev_t = NOUDEV; } /* diff --git a/sys/i386/i386/cons.c b/sys/i386/i386/cons.c index b319ae8..92544f8 100644 --- a/sys/i386/i386/cons.c +++ b/sys/i386/i386/cons.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)cons.c 7.2 (Berkeley) 5/9/91 - * $Id: cons.c,v 1.68 1999/06/22 14:12:54 yokota Exp $ + * $Id: cons.c,v 1.69 1999/06/26 12:19:03 peter Exp $ */ #include "opt_devfs.h" @@ -88,8 +88,9 @@ static struct cdevsw cn_cdevsw = { }; static dev_t cn_dev_t; /* seems to be never really used */ +static udev_t cn_udev_t; SYSCTL_OPAQUE(_machdep, CPU_CONSDEV, consdev, CTLFLAG_RD, - &cn_dev_t, sizeof cn_dev_t, "T,dev_t", ""); + &cn_udev_t, sizeof cn_udev_t, "T,dev_t", ""); static int cn_mute; @@ -182,7 +183,8 @@ cninit_finish() cn_phys_open = cdp->d_open; cdp->d_open = cnopen; cn_tp = (*cdp->d_devtotty)(cn_tab->cn_dev); - cn_dev_t = cn_tp->t_dev; + cn_dev_t = cn_tab->cn_dev; + cn_udev_t = dev2udev(cn_dev_t); } static void @@ -202,7 +204,8 @@ cnuninit(void) cdp->d_open = cn_phys_open; cn_phys_open = NULL; cn_tp = NULL; - cn_dev_t = 0; + cn_dev_t = NODEV; + cn_udev_t = NOUDEV; } /* diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c index b319ae8..92544f8 100644 --- a/sys/kern/tty_cons.c +++ b/sys/kern/tty_cons.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)cons.c 7.2 (Berkeley) 5/9/91 - * $Id: cons.c,v 1.68 1999/06/22 14:12:54 yokota Exp $ + * $Id: cons.c,v 1.69 1999/06/26 12:19:03 peter Exp $ */ #include "opt_devfs.h" @@ -88,8 +88,9 @@ static struct cdevsw cn_cdevsw = { }; static dev_t cn_dev_t; /* seems to be never really used */ +static udev_t cn_udev_t; SYSCTL_OPAQUE(_machdep, CPU_CONSDEV, consdev, CTLFLAG_RD, - &cn_dev_t, sizeof cn_dev_t, "T,dev_t", ""); + &cn_udev_t, sizeof cn_udev_t, "T,dev_t", ""); static int cn_mute; @@ -182,7 +183,8 @@ cninit_finish() cn_phys_open = cdp->d_open; cdp->d_open = cnopen; cn_tp = (*cdp->d_devtotty)(cn_tab->cn_dev); - cn_dev_t = cn_tp->t_dev; + cn_dev_t = cn_tab->cn_dev; + cn_udev_t = dev2udev(cn_dev_t); } static void @@ -202,7 +204,8 @@ cnuninit(void) cdp->d_open = cn_phys_open; cn_phys_open = NULL; cn_tp = NULL; - cn_dev_t = 0; + cn_dev_t = NODEV; + cn_udev_t = NOUDEV; } /* |
