diff options
Diffstat (limited to 'sys/dev/syscons')
-rw-r--r-- | sys/dev/syscons/scvesactl.c | 2 | ||||
-rw-r--r-- | sys/dev/syscons/syscons.c | 12 | ||||
-rw-r--r-- | sys/dev/syscons/syscons.h | 1 |
3 files changed, 4 insertions, 11 deletions
diff --git a/sys/dev/syscons/scvesactl.c b/sys/dev/syscons/scvesactl.c index 21295a4..9749cc2 100644 --- a/sys/dev/syscons/scvesactl.c +++ b/sys/dev/syscons/scvesactl.c @@ -59,7 +59,7 @@ vesa_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) struct tty *tp; int mode; - tp = scdevtotty(dev); + tp = dev->si_tty; if (!tp) return ENXIO; scp = SC_STAT(tp->t_dev); diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 3af6134..6ea829f 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -217,8 +217,8 @@ static struct cdevsw sc_cdevsw = { /* ioctl */ scioctl, /* stop */ nostop, /* reset */ noreset, - /* devtotty */ scdevtotty, - /* poll */ ttpoll, + /* devtotty */ nodevtotty, + /* poll */ ttypoll, /* mmap */ scmmap, /* strategy */ nostrategy, /* name */ "sc", @@ -441,13 +441,6 @@ sc_resume_unit(int unit) return 0; } -struct tty -*scdevtotty(dev_t dev) -{ - - return (dev->si_tty); -} - static int scdevtounit(dev_t dev) { @@ -488,6 +481,7 @@ scopen(dev_t dev, int flag, int mode, struct proc *p) tp = dev->si_tty = ttymalloc(dev->si_tty); tp->t_oproc = (SC_VTY(dev) == SC_MOUSE) ? scmousestart : scstart; tp->t_param = scparam; + tp->t_stop = nostop; tp->t_dev = dev; if (!(tp->t_state & TS_ISOPEN)) { ttychars(tp); diff --git a/sys/dev/syscons/syscons.h b/sys/dev/syscons/syscons.h index df9fdf3..ac38909 100644 --- a/sys/dev/syscons/syscons.h +++ b/sys/dev/syscons/syscons.h @@ -418,7 +418,6 @@ void sc_clear_screen(scr_stat *scp); void sc_set_cursor_image(scr_stat *scp); int sc_clean_up(scr_stat *scp); void sc_alloc_scr_buffer(scr_stat *scp, int wait, int discard); -struct tty *scdevtotty(dev_t dev); #ifndef SC_NO_SYSMOUSE struct tty *sc_get_mouse_tty(void); #endif /* SC_NO_SYSMOUSE */ |