set WOPEN on first open

SCCS-vsn: sys/hp300/dev/dcm.c 7.4
SCCS-vsn: sys/hp/dev/dca.c 7.4
SCCS-vsn: sys/tahoe/vba/vx.c 7.8
SCCS-vsn: sys/tahoe/vba/mp.c 7.13

diff --git a/usr/src/sys/hp/dev/dca.c b/usr/src/sys/hp/dev/dca.c
index 67f189e..781ae9e 100644 (file)
--- a/usr/src/sys/hp/dev/dca.c
+++ b/usr/src/sys/hp/dev/dca.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)dca.c       7.3 (Berkeley) %G%
+ *     @(#)dca.c       7.4 (Berkeley) %G%

  */
 
 #include "dca.h"
  */
 
 #include "dca.h"


@@ -142,6 +142,7 @@ dcaopen(dev, flag)
        tp->t_param = dcaparam;
        tp->t_dev = dev;
        if ((tp->t_state & TS_ISOPEN) == 0) {
        tp->t_param = dcaparam;
        tp->t_dev = dev;
        if ((tp->t_state & TS_ISOPEN) == 0) {

+               tp->t_state |= TS_WOPEN;

                ttychars(tp);
                tp->t_iflag = TTYDEF_IFLAG;
                tp->t_oflag = TTYDEF_OFLAG;
                ttychars(tp);
                tp->t_iflag = TTYDEF_IFLAG;
                tp->t_oflag = TTYDEF_OFLAG;

diff --git a/usr/src/sys/hp300/dev/dcm.c b/usr/src/sys/hp300/dev/dcm.c
index 5045aaf..2cbfdec 100644 (file)
--- a/usr/src/sys/hp300/dev/dcm.c
+++ b/usr/src/sys/hp300/dev/dcm.c
@@ -11,7 +11,7 @@
  *
  * from: $Hdr: dcm.c 1.17 89/10/01$
  *
  *
  * from: $Hdr: dcm.c 1.17 89/10/01$
  *

- *     @(#)dcm.c       7.3 (Berkeley) %G%
+ *     @(#)dcm.c       7.4 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -266,6 +266,7 @@ dcmopen(dev, flag)
        tp->t_param = dcmparam;
        tp->t_dev = dev;
        if ((tp->t_state & TS_ISOPEN) == 0) {
        tp->t_param = dcmparam;
        tp->t_dev = dev;
        if ((tp->t_state & TS_ISOPEN) == 0) {

+               tp->t_state |= TS_WOPEN;

                ttychars(tp);
                tp->t_iflag = TTYDEF_IFLAG;
                tp->t_oflag = TTYDEF_OFLAG;
                ttychars(tp);
                tp->t_iflag = TTYDEF_IFLAG;
                tp->t_oflag = TTYDEF_OFLAG;

diff --git a/usr/src/sys/tahoe/vba/mp.c b/usr/src/sys/tahoe/vba/mp.c
index 169555b..8bb5ba4 100644 (file)
--- a/usr/src/sys/tahoe/vba/mp.c
+++ b/usr/src/sys/tahoe/vba/mp.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)mp.c        7.12 (Berkeley) %G%
+ *     @(#)mp.c        7.13 (Berkeley) %G%

  */
 
 #include "mp.h"
  */
 
 #include "mp.h"

diff --git a/usr/src/sys/tahoe/vba/vx.c b/usr/src/sys/tahoe/vba/vx.c
index 7261441..c1ce194 100644 (file)
--- a/usr/src/sys/tahoe/vba/vx.c
+++ b/usr/src/sys/tahoe/vba/vx.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)vx.c        7.7 (Berkeley) %G%
+ *     @(#)vx.c        7.8 (Berkeley) %G%

  */
 
 #include "vx.h"
  */
 
 #include "vx.h"


@@ -226,8 +226,8 @@ vxopen(dev, flag)
        tp->t_param = vxparam;
        tp->t_dev = dev;
        s = spl8();
        tp->t_param = vxparam;
        tp->t_dev = dev;
        s = spl8();

-       tp->t_state |= TS_WOPEN;

        if ((tp->t_state&TS_ISOPEN) == 0) {
        if ((tp->t_state&TS_ISOPEN) == 0) {

+               tp->t_state |= TS_WOPEN;

                ttychars(tp);
                if (tp->t_ispeed == 0) {
                        tp->t_iflag = TTYDEF_IFLAG;
                ttychars(tp);
                if (tp->t_ispeed == 0) {
                        tp->t_iflag = TTYDEF_IFLAG;


@@ -242,6 +242,7 @@ vxopen(dev, flag)
        vcmodem(dev, VMOD_ON);
        while (!(flag&O_NONBLOCK) && !(tp->t_cflag&CLOCAL) && 
              (tp->t_state&TS_CARR_ON) == 0)
        vcmodem(dev, VMOD_ON);
        while (!(flag&O_NONBLOCK) && !(tp->t_cflag&CLOCAL) && 
              (tp->t_state&TS_CARR_ON) == 0)

+               tp->t_state |= TS_WOPEN;

                if ((error = tsleep((caddr_t)&tp->t_rawq, TTIPRI | PCATCH,
                                    ttopen, 0)) ||
                    (error = ttclosed(tp)))
                if ((error = tsleep((caddr_t)&tp->t_rawq, TTIPRI | PCATCH,
                                    ttopen, 0)) ||
                    (error = ttclosed(tp)))