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

Prevent modem hanging forever on close with CTS off:

Browse Source 
use 1min timeout to wakeup ttywait
This commit is contained in:
ache 1994-10-15 18:05:25 +00:00
parent 32696c9c2e
commit d2e6f2862c
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/sio/sio.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
* $Id: sio.c,v 1.53 1994/09/21 19:39:25 davidg Exp $
* $Id: sio.c,v 1.54 1994/10/12 19:49:11 bde Exp $
*/
#include "sio.h"
@ -876,7 +876,9 @@ sioclose(dev, flag, mode, p)
com = com_addr(MINOR_TO_UNIT(mynor));
tp = com->tp;
s = spltty();
timeout((timeout_func_t)wakeup, (caddr_t)&tp->t_outq, 60*hz);
(*linesw[tp->t_line].l_close)(tp, flag);
untimeout((timeout_func_t)wakeup, (caddr_t)&tp->t_outq);
siostop(tp, FREAD | FWRITE);
comhardclose(com);
ttyclose(tp);

4
sys/i386/isa/sio.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
* $Id: sio.c,v 1.53 1994/09/21 19:39:25 davidg Exp $
* $Id: sio.c,v 1.54 1994/10/12 19:49:11 bde Exp $
*/
#include "sio.h"
@ -876,7 +876,9 @@ sioclose(dev, flag, mode, p)
com = com_addr(MINOR_TO_UNIT(mynor));
tp = com->tp;
s = spltty();
timeout((timeout_func_t)wakeup, (caddr_t)&tp->t_outq, 60*hz);
(*linesw[tp->t_line].l_close)(tp, flag);
untimeout((timeout_func_t)wakeup, (caddr_t)&tp->t_outq);
siostop(tp, FREAD | FWRITE);
comhardclose(com);
ttyclose(tp);

4
sys/isa/sio.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
* $Id: sio.c,v 1.53 1994/09/21 19:39:25 davidg Exp $
* $Id: sio.c,v 1.54 1994/10/12 19:49:11 bde Exp $
*/
#include "sio.h"
@ -876,7 +876,9 @@ sioclose(dev, flag, mode, p)
com = com_addr(MINOR_TO_UNIT(mynor));
tp = com->tp;
s = spltty();
timeout((timeout_func_t)wakeup, (caddr_t)&tp->t_outq, 60*hz);
(*linesw[tp->t_line].l_close)(tp, flag);
untimeout((timeout_func_t)wakeup, (caddr_t)&tp->t_outq);
siostop(tp, FREAD | FWRITE);
comhardclose(com);
ttyclose(tp);