Make ttyconsolemode() call ttsetwater() so that drivers don't have to.

This commit is contained in:
phk 2005-10-16 20:58:22 +00:00
parent 9f01990d4c
commit 10f4dbda56
7 changed files with 1 additions and 6 deletions

View File

@ -108,7 +108,6 @@ promopen(dev, flag, mode, td)
if ((tp->t_state & TS_ISOPEN) == 0) {
tp->t_state |= TS_CARR_ON;
ttyconsolemode(tp, 0);
ttsetwater(tp);
setuptimeout = 1;
} else if ((tp->t_state & TS_XCLUDE) && suser(td)) {

View File

@ -284,7 +284,6 @@ zsopen(struct cdev *dev, int flag, int mode, struct thread *td)
if ((tp->t_state & TS_ISOPEN) == 0) {
tp->t_state |= TS_CARR_ON;
ttyconsolemode(tp, 0);
ttsetwater(tp);
setuptimeout = 1;
} else if ((tp->t_state & TS_XCLUDE) && suser(td)) {
splx(s);

View File

@ -295,7 +295,6 @@ dcons_open(DEV dev, int flag, int mode, THREAD *td)
if ((tp->t_state & TS_ISOPEN) == 0) {
tp->t_state |= TS_CARR_ON;
ttyconsolemode(tp, 0);
ttsetwater(tp);
} else if ((tp->t_state & TS_XCLUDE) && suser(td)) {
splx(s);
return (EBUSY);

View File

@ -139,7 +139,6 @@ ofw_dev_open(struct cdev *dev, int flag, int mode, struct thread *td)
if ((tp->t_state & TS_ISOPEN) == 0) {
tp->t_state |= TS_CARR_ON;
ttyconsolemode(tp, 0);
ttsetwater(tp);
setuptimeout = 1;
} else if ((tp->t_state & TS_XCLUDE) && suser(td)) {

View File

@ -473,7 +473,6 @@ zsttyopen(struct cdev *dev, int flags, int mode, struct thread *td)
tp->t_ospeed = 0;
(void)zstty_param(sc, tp, &t);
ttychars(tp);
ttsetwater(tp);
/* XXX turn on DTR */

View File

@ -149,7 +149,6 @@ sscopen(struct cdev *dev, int flag, int mode, struct thread *td)
if ((tp->t_state & TS_ISOPEN) == 0) {
tp->t_state |= TS_CARR_ON;
ttyconsolemode(tp, 0);
ttsetwater(tp);
setuptimeout = 1;
} else if ((tp->t_state & TS_XCLUDE) && suser(td)) {

View File

@ -3414,6 +3414,7 @@ ttyconsolemode(struct tty *tp, int speed)
tp->t_lock_in.c_ispeed = tp->t_lock_in.c_ospeed = speed;
tp->t_init_out = tp->t_init_in;
tp->t_termios = tp->t_init_in;
ttsetwater(tp);
}
/*